Merge pull request InsightSoftwareConsortium#5903 from hjmjohnson/convert-itkthreadedimageregionpartitionertest-to-gtest

ENH: Convert itkThreadedImageRegionPartitionerTest to GTest

Author: hjmjohnson

Modules/Core/Common/test/CMakeLists.txt

@@ -83,7 +83,6 @@ set(
   itkThreadedIteratorRangePartitionerTest.cxx
   itkThreadedIteratorRangePartitionerTest2.cxx
   itkThreadedIteratorRangePartitionerTest3.cxx
-  itkThreadedImageRegionPartitionerTest.cxx
   itkThreadLoggerTest.cxx
   itkLoggerThreadWrapperTest.cxx
   itkThreadDefsTest.cxx
@@ -237,12 +236,6 @@ itk_add_test(
     ITKCommon1TestDriver
     itkImageAdaptorPipeLineTest
 )
-itk_add_test(
-  NAME itkThreadedImageRegionPartitionerTest
-  COMMAND
-    ITKCommon2TestDriver
-    itkThreadedImageRegionPartitionerTest
-)
 itk_add_test(
   NAME itkCovariantVectorGeometryTest
   COMMAND
@@ -1669,6 +1662,7 @@ set(
   itkFloodFillIteratorGTest.cxx
   itkDerivativeOperatorGTest.cxx
   itkFloodFilledSpatialFunctionGTest.cxx
+  itkThreadedImageRegionPartitionerGTest.cxx
 )
 creategoogletestdriver(ITKCommon "${ITKCommon-Test_LIBRARIES}" "${ITKCommonGTests}")
 # If `-static` was passed to CMAKE_EXE_LINKER_FLAGS, compilation fails. No need to

…tkThreadedImageRegionPartitionerTest.cxx …kThreadedImageRegionPartitionerGTest.cxxModules/Core/Common/test/itkThreadedImageRegionPartitionerTest.cxx renamed to Modules/Core/Common/test/itkThreadedImageRegionPartitionerGTest.cxx Modules/Core/Common/test/itkThreadedImageRegionPartitionerTest.cxx renamed to Modules/Core/Common/test/itkThreadedImageRegionPartitionerGTest.cxx

@@ -16,21 +16,20 @@
  *
  *=========================================================================*/
 #include "itkThreadedImageRegionPartitioner.h"
-#include "itkTestingMacros.h"
+#include "itkGTest.h"
 
-/*
- * Main test entry function
- */
-int
-itkThreadedImageRegionPartitionerTest(int, char *[])
+#include <vector>
+
+
+TEST(ThreadedImageRegionPartitioner, PartitionDomain)
 {
   constexpr unsigned int Dimension{ 2 };
 
   using ThreadedImageRegionPartitionerType = itk::ThreadedImageRegionPartitioner<Dimension>;
   const ThreadedImageRegionPartitionerType::Pointer threadedImageRegionPartitioner =
     ThreadedImageRegionPartitionerType::New();
 
-  ITK_EXERCISE_BASIC_OBJECT_METHODS(
+  ITK_GTEST_EXERCISE_BASIC_OBJECT_METHODS(
     threadedImageRegionPartitioner, ThreadedImageRegionPartitioner, ThreadedDomainPartitioner);
 
 
@@ -71,14 +70,6 @@ itkThreadedImageRegionPartitionerTest(int, char *[])
   {
     threadedImageRegionPartitioner->PartitionDomain(i, totalThreads, completeRegion, subRegion);
     std::cout << "The resulting subregion for thread: " << i << " is : " << subRegion << std::endl;
-
-    if (expectedSubRegions[i] != subRegion)
-    {
-      std::cerr << "The calculated sub-region, " << subRegion
-                << " did not match the expected region: " << expectedSubRegions[i] << std::endl;
-      return EXIT_FAILURE;
-    }
+    EXPECT_EQ(subRegion, expectedSubRegions[i]) << "Mismatch at thread " << i;
   }
-
-  return EXIT_SUCCESS;
 }