STYLE: Prefer using ITK_TRY_EXPECT_NO_EXCEPTION macro in tests

Use the `ITK_TRY_EXPECT_NO_EXCEPTION` macro in tests in lieu of `try/catch` blocks for the sake of readability and compactness, and to save typing/avoid boilerplate code.
InsightSoftwareConsortium · Apr 16, 2022 · 5ff58ba · 5ff58ba
1 parent 4b0a501
commit 5ff58ba
Show file tree

Hide file tree

Showing 18 changed files with 97 additions and 284 deletions.
diff --git a/Modules/Core/Mesh/test/itkWarpMeshFilterTest.cxx b/Modules/Core/Mesh/test/itkWarpMeshFilterTest.cxx
@@ -110,15 +110,8 @@ itkWarpMeshFilterTest(int, char *[])
 
   warpFilter->SetDisplacementField(deformationField);
 
-  try
-  {
-    warpFilter->Update();
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cerr << "Exception: " << excp << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(warpFilter->Update());
+
 
   MeshType::Pointer      outputMesh = warpFilter->GetOutput();
   MeshType::ConstPointer inputMesh = warpFilter->GetInput();

diff --git a/Modules/Core/QuadEdgeMesh/test/itkVTKPolyDataIOQuadEdgeMeshTest.cxx b/Modules/Core/QuadEdgeMesh/test/itkVTKPolyDataIOQuadEdgeMeshTest.cxx
@@ -45,33 +45,19 @@ itkVTKPolyDataIOQuadEdgeMeshTest(int argc, char * argv[])
 
   std::cout << "polyDataReader:" << std::endl;
   std::cout << polyDataReader << std::endl;
-  try
-  {
-    polyDataReader->Update();
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cerr << "Error during Update() " << std::endl;
-    std::cerr << excp << std::endl;
-    return EXIT_FAILURE;
-  }
+
+  ITK_TRY_EXPECT_NO_EXCEPTION(polyDataReader->Update());
+
 
   MeshType::Pointer mesh = polyDataReader->GetOutput();
 
   polyDataWriter->SetInput(mesh);
 
   std::cout << "polyDataWriter:" << std::endl;
   std::cout << polyDataWriter << std::endl;
-  try
-  {
-    polyDataWriter->Update();
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cerr << "Error during Update() " << std::endl;
-    std::cerr << excp << std::endl;
-    return EXIT_FAILURE;
-  }
+
+  ITK_TRY_EXPECT_NO_EXCEPTION(polyDataWriter->Update());
+
 
   // Should make a diff
 

diff --git a/...es/Filtering/FastMarching/test/itkFastMarchingImageFilterRealWithNumberOfElementsTest.cxx b/...es/Filtering/FastMarching/test/itkFastMarchingImageFilterRealWithNumberOfElementsTest.cxx
@@ -22,6 +22,7 @@
 
 #include "itkBinaryThresholdImageFilter.h"
 #include "itkImageRegionConstIterator.h"
+#include "itkTestingMacros.h"
 
 
 int
@@ -123,16 +124,8 @@ itkFastMarchingImageFilterRealWithNumberOfElementsTest(int, char *[])
 
   marcher->SetInput(speedImage);
 
-  try
-  {
-    // update the marcher
-    marcher->Update();
-  }
-  catch (const itk::ExceptionObject & excep)
-  {
-    std::cerr << excep << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(marcher->Update());
+
 
   using OutputPixelType = char;
 
@@ -148,16 +141,8 @@ itkFastMarchingImageFilterRealWithNumberOfElementsTest(int, char *[])
   thresholder->SetInsideValue(1);
   thresholder->SetInput(marcher->GetOutput());
 
-  try
-  {
-    thresholder->Update();
-  }
-  catch (const itk::ExceptionObject & excep)
-  {
-    std::cerr << "Exception caught !" << std::endl;
-    std::cerr << excep << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(thresholder->Update());
+
 
   OutputImageType::Pointer output = thresholder->GetOutput();
 

diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingQuadEdgeMeshFilterBaseTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingQuadEdgeMeshFilterBaseTest.cxx
@@ -21,6 +21,7 @@
 #include "itkRegularSphereMeshSource.h"
 #include "itkFastMarchingThresholdStoppingCriterion.h"
 #include "itkMeshFileWriter.h"
+#include "itkTestingMacros.h"
 
 int
 itkFastMarchingQuadEdgeMeshFilterBaseTest(int, char *[])
@@ -84,16 +85,8 @@ itkFastMarchingQuadEdgeMeshFilterBaseTest(int, char *[])
   fmm_filter->SetTrialPoints(trial);
   fmm_filter->SetStoppingCriterion(criterion);
 
-  try
-  {
-    fmm_filter->Update();
-  }
-  catch (const itk::ExceptionObject & excep)
-  {
-    std::cerr << "Exception caught !" << std::endl;
-    std::cerr << excep << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(fmm_filter->Update());
+
 
   using WriterType = itk::MeshFileWriter<MeshType>;
   auto writer = WriterType::New();

diff --git a/...Filtering/FastMarching/test/itkFastMarchingQuadEdgeMeshFilterWithNumberOfElementsTest.cxx b/...Filtering/FastMarching/test/itkFastMarchingQuadEdgeMeshFilterWithNumberOfElementsTest.cxx
@@ -20,6 +20,7 @@
 #include "itkQuadEdgeMeshExtendedTraits.h"
 #include "itkRegularSphereMeshSource.h"
 #include "itkFastMarchingNumberOfElementsStoppingCriterion.h"
+#include "itkTestingMacros.h"
 
 int
 itkFastMarchingQuadEdgeMeshFilterWithNumberOfElementsTest(int, char *[])
@@ -83,16 +84,8 @@ itkFastMarchingQuadEdgeMeshFilterWithNumberOfElementsTest(int, char *[])
   fmm_filter->SetTrialPoints(trial);
   fmm_filter->SetStoppingCriterion(criterion);
 
-  try
-  {
-    fmm_filter->Update();
-  }
-  catch (const itk::ExceptionObject & excep)
-  {
-    std::cerr << "Exception caught !" << std::endl;
-    std::cerr << excep << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(fmm_filter->Update());
+
 
   MeshType::Pointer output = fmm_filter->GetOutput();
 

diff --git a/Modules/Filtering/ImageGrid/test/itkTileImageFilterTest.cxx b/Modules/Filtering/ImageGrid/test/itkTileImageFilterTest.cxx
@@ -79,17 +79,11 @@ itkTileImageFilterTest(int argc, char * argv[])
 
   writer->SetSeriesFormat(argv[argc - 1]);
 
-  try
-  {
-    writer->SetInput(tiler->GetOutput());
-    writer->Update();
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cerr << "Error while writing the series with SeriesFileNames generator" << std::endl;
-    std::cerr << excp << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(writer->SetInput(tiler->GetOutput()));
+
+  ITK_TRY_EXPECT_NO_EXCEPTION(writer->Update());
+
+
   std::cout << "Test passed." << std::endl;
   return EXIT_SUCCESS;
 }
diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx
@@ -49,16 +49,8 @@ itkCleanQuadEdgeMeshFilterTest(int argc, char * argv[])
   auto reader = ReaderType::New();
   reader->SetFileName(argv[1]);
 
-  try
-  {
-    reader->Update();
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cerr << "Exception thrown while reading the input file " << std::endl;
-    std::cerr << excp << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(reader->Update());
+
 
   MeshType::Pointer mesh = reader->GetOutput();
 

diff --git a/...geMeshFiltering/test/itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraintsTest.cxx b/...geMeshFiltering/test/itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraintsTest.cxx
@@ -106,15 +106,8 @@ itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraintsTest(int argc, char
     ++it;
   }
 
-  try
-  {
-    filter->Update();
-  }
-  catch (const itk::ExceptionObject & except)
-  {
-    std::cerr << "Failure: " << except.what();
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(filter->Update());
+
 
   using WriterType = itk::MeshFileWriter<MeshType>;
   auto writer = WriterType::New();

diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkRegularSphereQuadEdgeMeshSourceTest.cxx b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkRegularSphereQuadEdgeMeshSourceTest.cxx
@@ -53,16 +53,8 @@ itkRegularSphereQuadEdgeMeshSourceTest(int argc, char * argv[])
 
   mySphereMeshSource->Modified();
 
-  try
-  {
-    mySphereMeshSource->Update();
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cerr << "Error during Update() " << std::endl;
-    std::cerr << excp << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(mySphereMeshSource->Update());
+
 
   std::cout << "mySphereMeshSource: " << mySphereMeshSource;
 

diff --git a/Modules/IO/BioRad/test/itkBioRadImageIOTest.cxx b/Modules/IO/BioRad/test/itkBioRadImageIOTest.cxx
@@ -48,35 +48,16 @@ itkBioRadImageIOTest(int argc, char * argv[])
   auto bioradImageIO = ImageIOType::New();
   reader->SetImageIO(bioradImageIO);
 
-  try
-  {
-    reader->Update();
-  }
-  catch (const itk::ExceptionObject & e)
-  {
-    std::cerr << "exception in file reader " << std::endl;
-    std::cerr << e.GetDescription() << std::endl;
-    std::cerr << e.GetLocation() << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(reader->Update());
+
 
   using WriterType = itk::ImageFileWriter<InputImageType>;
   auto writer = WriterType::New();
   writer->SetFileName(outfilename);
   writer->SetInput(reader->GetOutput());
   writer->SetImageIO(bioradImageIO);
 
-  try
-  {
-    writer->Update();
-  }
-  catch (const itk::ExceptionObject & e)
-  {
-    std::cerr << "exception in file writer " << std::endl;
-    std::cerr << e.GetDescription() << std::endl;
-    std::cerr << e.GetLocation() << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(writer->Update());
 
   bioradImageIO->Print(std::cout);
 

diff --git a/Modules/IO/MeshVTK/test/itkMeshFileWriteReadTensorTest.cxx b/Modules/IO/MeshVTK/test/itkMeshFileWriteReadTensorTest.cxx
@@ -79,15 +79,9 @@ itkMeshFileWriteReadTensorTest(int argc, char * argv[])
 
   mesh2dWriter->SetInput(mesh2d);
 
-  try
-  {
-    mesh2dWriter->Update();
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cerr << "Failed the VTKPolyDataMeshIO 2d test" << excp;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(mesh2dWriter->Update());
+
+
   std::cout << "End of VTKPolyDataMeshIO 2D test. Completed successfully!" << std::endl << std::endl;
 
 
@@ -118,15 +112,9 @@ itkMeshFileWriteReadTensorTest(int argc, char * argv[])
 
   mesh3dWriter->SetInput(mesh3d);
 
-  try
-  {
-    mesh3dWriter->Update();
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cerr << "Failed the VTKPolyDataMeshIO 3D test" << excp;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(mesh3dWriter->Update());
+
+
   std::cout << "End of VTKPolyDataMeshIO 3D test. Completed successfully!" << std::endl << std::endl;
 
   return EXIT_SUCCESS;

diff --git a/Modules/IO/Stimulate/test/itkStimulateImageIOTest2.cxx b/Modules/IO/Stimulate/test/itkStimulateImageIOTest2.cxx
@@ -48,16 +48,9 @@ itkStimulateImageIOTest2(int argc, char * argv[])
   std::cout << "Filename: " << argv[1] << std::endl;
   reader->SetFileName(argv[1]);
   reader->SetImageIO(io);
-  try
-  {
-    reader->Update();
-  }
-  catch (const itk::ExceptionObject & e)
-  {
-    std::cout << "Exception in file reader " << std::endl;
-    std::cout << e << std::endl;
-    return EXIT_FAILURE;
-  }
+
+  ITK_TRY_EXPECT_NO_EXCEPTION(reader->Update());
+
 
   myImage::Pointer image = reader->GetOutput();
   image->Print(std::cout);