STYLE: Prefer using exception checking macros in tests

Use the `ITK_TRY_EXPECT_EXCEPTION` and the `ITK_TRY_EXPECT_NO_EXCEPTION` exception checking macros in tests in lieu of `try/catch` blocks for the sake of readability and compactness, and to save typing/avoid boilerplate code.
InsightSoftwareConsortium · Sep 2, 2022 · 5f737c0 · 5f737c0
1 parent 2127b6d
commit 5f737c0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 96 deletions.
diff --git a/Modules/Core/Common/test/itkMatrixTest.cxx b/Modules/Core/Common/test/itkMatrixTest.cxx
@@ -20,6 +20,7 @@
 
 #include "itkMatrix.h"
 #include "itkMath.h"
+#include "itkTestingMacros.h"
 
 int
 itkMatrixTest(int, char *[])
@@ -334,34 +335,10 @@ itkMatrixTest(int, char *[])
   using LargeMatrixType = itk::Matrix<NumericType, 7, 7>;
   LargeMatrixType matrixBad;
   matrixBad.Fill(2.0);
-  bool caught = false;
-  try
-  {
-    matrixBad.GetInverse();
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cout << "Caught expected exception!" << std::endl;
-    std::cout << excp;
-    caught = true;
-  }
-  if (!caught)
-  {
-    std::cout << "Failed to catch expected exception!" << std::endl;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_EXCEPTION(matrixBad.GetInverse());
 
   matrixBad.SetIdentity();
-  try
-  {
-    matrixBad.GetInverse();
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cout << "Caught unexpected exception!" << std::endl;
-    std::cout << excp;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(matrixBad.GetInverse());
 
   {
     /*

diff --git a/Modules/Numerics/Optimizersv4/test/itkGradientDescentLineSearchOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkGradientDescentLineSearchOptimizerv4Test.cxx
@@ -265,25 +265,9 @@ itkGradientDescentLineSearchOptimizerv4Test(int, char *[])
   std::cout << "Stop description   = " << itkOptimizer->GetStopConditionDescription() << std::endl;
 
   auto badOptimizer = OptimizerType::New();
-  bool caught = false;
-  try
-  {
-    badOptimizer->GetCurrentPosition();
-  }
-  catch (const itk::ExceptionObject & e)
-  {
-    std::cout << "Caught expected exception!";
-    std::cout << e << std::endl;
-    caught = true;
-  }
 
-  if (!caught)
-  {
-    std::cout << "Failed to catch expected exception! " << std::endl;
-    return EXIT_FAILURE;
-  }
-  std::cout << "Printing self.. " << std::endl;
-  std::cout << itkOptimizer << std::endl;
+  ITK_TRY_EXPECT_EXCEPTION(badOptimizer->GetCurrentPosition());
+
 
   std::cout << "Test passed." << std::endl;
   return EXIT_SUCCESS;

diff --git a/Modules/Numerics/Statistics/test/itkGaussianMembershipFunctionTest.cxx b/Modules/Numerics/Statistics/test/itkGaussianMembershipFunctionTest.cxx
@@ -44,22 +44,8 @@ itkGaussianMembershipFunctionTest(int, char *[])
 
   // Test if an exception will be thrown if we try to resize the measurement vector
   // size
-  std::cout << "***" << std::endl;
-  std::cout << "Exception TEST: " << std::endl;
-  try
-  {
-    MeasurementVectorSizeType measurementVector2 = MeasurementVectorSize + 1;
-    function->SetMeasurementVectorSize(measurementVector2);
-    std::cerr << "Exception should have been thrown since we are trying to resize\
-                  non-resizeable measurement vector type "
-              << std::endl;
-    // return EXIT_FAILURE;
-  }
-  catch (const itk::ExceptionObject & excp)
-  {
-    std::cerr << "Caughted expected exception: " << excp << std::endl;
-  }
-
+  MeasurementVectorSizeType measurementVector2 = MeasurementVectorSize + 1;
+  ITK_TRY_EXPECT_EXCEPTION(function->SetMeasurementVectorSize(measurementVector2));
 
   // Test if the membership function value computed is correct
   MembershipFunctionType::MeanVectorType mean;

diff --git a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx
@@ -316,47 +316,16 @@ ImageToImageMetricv4TestRunSingleTest(const ImageToImageMetricv4TestMetricPointe
   ImageToImageMetricv4TestMetricType::DerivativeType derivativeReturn;
 
   // Initialize.
-  try
-  {
-    metric->Initialize();
-  }
-  catch (const itk::ExceptionObject & exc)
-  {
-    std::cerr << "Caught unexpected exception during Initialize: " << exc;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(metric->Initialize());
 
   // Evaluate using GetValue
-  try
-  {
-    valueReturn1 = metric->GetValue();
-  }
-  catch (const itk::ExceptionObject & exc)
-  {
-    std::cerr << "Caught unexpected exception during GetValue: " << exc;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(valueReturn1 = metric->GetValue());
 
   // Re-initialize.
-  try
-  {
-    metric->Initialize();
-  }
-  catch (const itk::ExceptionObject & exc)
-  {
-    std::cerr << "Caught unexpected exception during re-initialize: " << exc;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(metric->Initialize());
+
   // Evaluate using GetValueAndDerivative
-  try
-  {
-    metric->GetValueAndDerivative(valueReturn2, derivativeReturn);
-  }
-  catch (const itk::ExceptionObject & exc)
-  {
-    std::cerr << "Caught unexpected exception during GetValueAndDerivative: " << exc;
-    return EXIT_FAILURE;
-  }
+  ITK_TRY_EXPECT_NO_EXCEPTION(metric->GetValueAndDerivative(valueReturn2, derivativeReturn));
 
   // Test same value returned by different methods
   std::cout << "Check Value return values..." << std::endl;