Merge pull request InsightSoftwareConsortium#5985 from hjmjohnson/convert-WindowConvergenceMonitoringFunction-to-gtest

ENH: Convert itkWindowConvergenceMonitoringFunctionTest to GTest

Author: hjmjohnson

Modules/Numerics/Optimizersv4/test/CMakeLists.txt

@@ -17,7 +17,6 @@ set(
   itkRegistrationParameterScalesFromJacobianTest.cxx
   itkAutoScaledGradientDescentRegistrationTest.cxx
   itkAutoScaledGradientDescentRegistrationOnVectorTest.cxx
-  itkWindowConvergenceMonitoringFunctionTest.cxx
   itkQuasiNewtonOptimizerv4Test.cxx
   itkObjectToObjectMetricBaseTest.cxx
   itkLBFGSOptimizerv4Test.cxx
@@ -36,12 +35,8 @@ set(TEMP ${ITK_TEST_OUTPUT_DIR})
 
 createtestdriver(ITKOptimizersv4 "${ITKOptimizersv4-Test_LIBRARIES}" "${ITKOptimizersv4Tests}")
 
-itk_add_test(
-  NAME itkWindowConvergenceMonitoringFunctionTest
-  COMMAND
-    ITKOptimizersv4TestDriver
-    itkWindowConvergenceMonitoringFunctionTest
-)
+set(ITKOptimizersv4GTests itkWindowConvergenceMonitoringFunctionGTest.cxx)
+creategoogletestdriver(ITKOptimizersv4 "${ITKOptimizersv4-Test_LIBRARIES}" "${ITKOptimizersv4GTests}")
 
 itk_add_test(
   NAME itkObjectToObjectOptimizerBaseTest

…dowConvergenceMonitoringFunctionTest.cxx …owConvergenceMonitoringFunctionGTest.cxxModules/Numerics/Optimizersv4/test/itkWindowConvergenceMonitoringFunctionTest.cxx renamed to Modules/Numerics/Optimizersv4/test/itkWindowConvergenceMonitoringFunctionGTest.cxx Modules/Numerics/Optimizersv4/test/itkWindowConvergenceMonitoringFunctionTest.cxx renamed to Modules/Numerics/Optimizersv4/test/itkWindowConvergenceMonitoringFunctionGTest.cxx

@@ -17,9 +17,9 @@
  *=========================================================================*/
 
 #include "itkWindowConvergenceMonitoringFunction.h"
+#include "itkGTest.h"
 
-int
-itkWindowConvergenceMonitoringFunctionTest(int itkNotUsed(argc), char *[])
+TEST(WindowConvergenceMonitoringFunction, ConvertedLegacyTest)
 {
   using RealType = float;
 
@@ -31,19 +31,11 @@ itkWindowConvergenceMonitoringFunctionTest(int itkNotUsed(argc), char *[])
   for (RealType x = 0.0; x < 20; x += 1.0)
   {
     convergenceMonitoring->AddEnergyValue(std::pow(static_cast<RealType>(2.0), -x));
-    try
-    {
-      std::cout << "convergence value: " << convergenceMonitoring->GetConvergenceValue() << std::endl;
-    }
-    catch (...)
-    {
-      std::cout << "GetConvergenceValue() failed." << std::endl;
-      return EXIT_FAILURE;
-    }
+    RealType convergenceValue{};
+    EXPECT_NO_THROW(convergenceValue = convergenceMonitoring->GetConvergenceValue());
+    std::cout << "convergence value: " << convergenceValue << std::endl;
   }
 
   convergenceMonitoring->GetWindowSize();
   convergenceMonitoring->Print(std::cout, 3);
-
-  return EXIT_SUCCESS;
 }