Merge pull request InsightSoftwareConsortium#5879 from hjmjohnson/convert-itkabortprocessobjecttest-to-itkabortprocessobjectgtest

ENH: Convert itkAbortProcessObjectTest to itkAbortProcessObjectGTest

Author: hjmjohnson

Modules/Core/Common/test/CMakeLists.txt

@@ -2,7 +2,6 @@ itk_module_test()
 set(
   ITKCommon1Tests
   itkImageRegionExplicitTest.cxx
-  itkAbortProcessObjectTest.cxx
   itkCommandObserverObjectTest.cxx
   itkAdaptorComparisonTest.cxx
   itkCovariantVectorGeometryTest.cxx
@@ -223,12 +222,6 @@ if(ITK_BUILD_SHARED_LIBS)
   add_dependencies(ITKCommon2TestDriver FactoryTestLib)
 endif()
 
-itk_add_test(
-  NAME itkAbortProcessObjectTest
-  COMMAND
-    ITKCommon1TestDriver
-    itkAbortProcessObjectTest
-)
 itk_add_test(
   NAME itkCommandObserverObjectTest
   COMMAND
@@ -1774,6 +1767,7 @@ set(
   itkAutoPointerGTest.cxx
   itkStdStreamStateSaveGTest.cxx
   itkDecoratorGTest.cxx
+  itkAbortProcessObjectGTest.cxx
 )
 creategoogletestdriver(ITKCommon "${ITKCommon-Test_LIBRARIES}" "${ITKCommonGTests}")
 # If `-static` was passed to CMAKE_EXE_LINKER_FLAGS, compilation fails. No need to

…ommon/test/itkAbortProcessObjectTest.cxx …mmon/test/itkAbortProcessObjectGTest.cxxModules/Core/Common/test/itkAbortProcessObjectTest.cxx renamed to Modules/Core/Common/test/itkAbortProcessObjectGTest.cxx Modules/Core/Common/test/itkAbortProcessObjectTest.cxx renamed to Modules/Core/Common/test/itkAbortProcessObjectGTest.cxx

@@ -16,12 +16,12 @@
  *
  *=========================================================================*/
 
-#include <iostream>
 #include "itkExtractImageFilter.h"
-#include "itkTestingMacros.h"
-
+#include "itkGTest.h"
 #include "itkCommand.h"
 
+#include <iostream>
+
 //
 // This test ensures the abort event occurs and the ProcessAborted
 // exception occurs.
@@ -56,8 +56,7 @@ onAbort(itk::Object *, const itk::EventObject &, void *)
 
 } // namespace
 
-int
-itkAbortProcessObjectTest(int, char *[])
+TEST(AbortProcessObject, ConvertedLegacyTest)
 {
   // type alias to simplify the syntax
   using ShortImage = itk::Image<short, 2>;
@@ -99,19 +98,7 @@ itkAbortProcessObjectTest(int, char *[])
   extract->AddObserver(itk::AbortEvent(), abortCmd);
 
   std::cout << extract << std::endl;
-  try
-  {
-    extract->UpdateLargestPossibleRegion();
-  }
-  catch (const itk::ProcessAborted &)
-  {
-    if (onAbortCalled)
-    {
-      std::cout << "PASS: Abort event occurred and exception was thrown." << std::endl;
-      return EXIT_SUCCESS;
-    }
-    std::cout << "Caught expected abort exception, but didn't get Abort Event!";
-  }
-  std::cout << "Test FAILED!" << std::endl;
-  return EXIT_FAILURE;
+
+  EXPECT_THROW(extract->UpdateLargestPossibleRegion(), itk::ProcessAborted);
+  EXPECT_TRUE(onAbortCalled) << "Expected Abort Event callback to be called.";
 }