From 1f866e70176a33bda3fd71286f0402e2f4063549 Mon Sep 17 00:00:00 2001 From: "Hans J. Johnson" Date: Sat, 9 May 2026 09:34:01 -0500 Subject: [PATCH] ENH: Convert 18 Modules/Core/Common tests from CTest to GoogleTest Mechanical CTest -> GTest conversion of 18 no-argument tests in Modules/Core/Common/test, using git mv + minimal-diff wrap-and-call: the original itkFooTest(int, char*[]) function body is preserved verbatim (including comments, std::cout output, and blank-line layout), wrapped in an anonymous namespace as DoFooTest, and invoked from a single TEST(Foo, ConvertedLegacyTest) block. #include "itkGTest.h" is added; no other content edits. Each renamed file is above git's 50% similarity threshold so git log --follow tracks through the conversion. Converted (alphabetical): itkBSplineInterpolationWeightFunctionTest itkConicShellInteriorExteriorSpatialFunctionTest itkEllipsoidInteriorExteriorSpatialFunctionTest itkFileOutputWindowTest itkFiniteCylinderSpatialFunctionTest itkFrustumSpatialFunctionTest itkRealTimeClockTest itkSTLContainerAdaptorTest itkSimpleFilterWatcherTest itkSparseFieldLayerTest itkSparseImageTest itkSpatialFunctionTest itkSpatialOrientationTest itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest itkTorusInteriorExteriorSpatialFunctionTest itkVariableSizeMatrixTest itkVNLSparseLUSolverTraitsTest itkZeroFluxBoundaryConditionTest CMakeLists.txt updated: legacy entries removed from ITKCommon{1,2}Tests and itk_add_test blocks dropped; new *GTest.cxx entries inserted alphabetically into ITKCommonGTests. --- Modules/Core/Common/test/CMakeLists.txt | 144 +++--------------- ...t.cxx => VNLSparseLUSolverTraitsGTest.cxx} | 9 +- ...plineInterpolationWeightFunctionGTest.cxx} | 12 +- ...lInteriorExteriorSpatialFunctionGTest.cxx} | 12 +- ...dInteriorExteriorSpatialFunctionGTest.cxx} | 12 +- ...wTest.cxx => itkFileOutputWindowGTest.cxx} | 9 +- ...itkFiniteCylinderSpatialFunctionGTest.cxx} | 12 +- ...cxx => itkFrustumSpatialFunctionGTest.cxx} | 9 +- ...lockTest.cxx => itkRealTimeClockGTest.cxx} | 9 +- ...st.cxx => itkSTLContainerAdaptorGTest.cxx} | 9 +- ...st.cxx => itkSimpleFilterWatcherGTest.cxx} | 9 +- ...rTest.cxx => itkSparseFieldLayerGTest.cxx} | 9 +- ...eImageTest.cxx => itkSparseImageGTest.cxx} | 9 +- ...onTest.cxx => itkSpatialFunctionGTest.cxx} | 9 +- ...est.cxx => itkSpatialOrientationGTest.cxx} | 9 +- ...dInteriorExteriorSpatialFunctionGTest.cxx} | 12 +- ...sInteriorExteriorSpatialFunctionGTest.cxx} | 12 +- ...est.cxx => itkVariableSizeMatrixGTest.cxx} | 9 +- ... => itkZeroFluxBoundaryConditionGTest.cxx} | 9 +- 19 files changed, 180 insertions(+), 144 deletions(-) rename Modules/Core/Common/test/{VNLSparseLUSolverTraitsTest.cxx => VNLSparseLUSolverTraitsGTest.cxx} (96%) rename Modules/Core/Common/test/{itkBSplineInterpolationWeightFunctionTest.cxx => itkBSplineInterpolationWeightFunctionGTest.cxx} (97%) rename Modules/Core/Common/test/{itkConicShellInteriorExteriorSpatialFunctionTest.cxx => itkConicShellInteriorExteriorSpatialFunctionGTest.cxx} (96%) rename Modules/Core/Common/test/{itkEllipsoidInteriorExteriorSpatialFunctionTest.cxx => itkEllipsoidInteriorExteriorSpatialFunctionGTest.cxx} (95%) rename Modules/Core/Common/test/{itkFileOutputWindowTest.cxx => itkFileOutputWindowGTest.cxx} (90%) rename Modules/Core/Common/test/{itkFiniteCylinderSpatialFunctionTest.cxx => itkFiniteCylinderSpatialFunctionGTest.cxx} (95%) rename Modules/Core/Common/test/{itkFrustumSpatialFunctionTest.cxx => itkFrustumSpatialFunctionGTest.cxx} (97%) rename Modules/Core/Common/test/{itkRealTimeClockTest.cxx => itkRealTimeClockGTest.cxx} (95%) rename Modules/Core/Common/test/{itkSTLContainerAdaptorTest.cxx => itkSTLContainerAdaptorGTest.cxx} (97%) rename Modules/Core/Common/test/{itkSimpleFilterWatcherTest.cxx => itkSimpleFilterWatcherGTest.cxx} (96%) rename Modules/Core/Common/test/{itkSparseFieldLayerTest.cxx => itkSparseFieldLayerGTest.cxx} (93%) rename Modules/Core/Common/test/{itkSparseImageTest.cxx => itkSparseImageGTest.cxx} (92%) rename Modules/Core/Common/test/{itkSpatialFunctionTest.cxx => itkSpatialFunctionGTest.cxx} (91%) rename Modules/Core/Common/test/{itkSpatialOrientationTest.cxx => itkSpatialOrientationGTest.cxx} (97%) rename Modules/Core/Common/test/{itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest.cxx => itkSymmetricEllipsoidInteriorExteriorSpatialFunctionGTest.cxx} (94%) rename Modules/Core/Common/test/{itkTorusInteriorExteriorSpatialFunctionTest.cxx => itkTorusInteriorExteriorSpatialFunctionGTest.cxx} (93%) rename Modules/Core/Common/test/{itkVariableSizeMatrixTest.cxx => itkVariableSizeMatrixGTest.cxx} (97%) rename Modules/Core/Common/test/{itkZeroFluxBoundaryConditionTest.cxx => itkZeroFluxBoundaryConditionGTest.cxx} (97%) diff --git a/Modules/Core/Common/test/CMakeLists.txt b/Modules/Core/Common/test/CMakeLists.txt index 2a95b04714c..40f9cd58153 100644 --- a/Modules/Core/Common/test/CMakeLists.txt +++ b/Modules/Core/Common/test/CMakeLists.txt @@ -5,7 +5,6 @@ set( itkDataObjectTest.cxx itkDirectoryTest.cxx itkExceptionObjectTest.cxx - itkFileOutputWindowTest.cxx itkFixedArrayTest2.cxx itkFloatingPointExceptionsTest.cxx itkGaussianSpatialFunctionTest.cxx @@ -43,26 +42,19 @@ set( itkPointSetTest.cxx itkPointSetToImageFilterTest1.cxx itkPointSetToImageFilterTest2.cxx - itkRealTimeClockTest.cxx itkRGBPixelTest.cxx - itkSimpleFilterWatcherTest.cxx itkSobelOperatorImageConvolutionTest.cxx itkSobelOperatorImageFilterTest.cxx - itkSparseFieldLayerTest.cxx - itkSparseImageTest.cxx - itkSpatialOrientationTest.cxx itkStreamingImageFilterTest.cxx itkStreamingImageFilterTest2.cxx itkStreamingImageFilterTest3.cxx itkSymmetricEigenAnalysisTest.cxx - itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest.cxx itkSymmetricSecondRankTensorImageReadTest.cxx itkSymmetricSecondRankTensorImageWriteReadTest.cxx itkTimeProbeTest.cxx itkTimeProbeTest2.cxx itkVectorContainerTest.cxx itkVectorTest.cxx - VNLSparseLUSolverTraitsTest.cxx ) set( ITKCommon2Tests @@ -83,25 +75,16 @@ set( itkOctreeTest.cxx itkTimeProbesTest.cxx itkVariableLengthVectorTest.cxx - itkSpatialFunctionTest.cxx itkPeriodicBoundaryConditionTest.cxx itkSmartPointerTest.cxx - itkVariableSizeMatrixTest.cxx - itkConicShellInteriorExteriorSpatialFunctionTest.cxx - itkEllipsoidInteriorExteriorSpatialFunctionTest.cxx - itkFrustumSpatialFunctionTest.cxx - itkTorusInteriorExteriorSpatialFunctionTest.cxx itkConstNeighborhoodIteratorTest.cxx itkShapedNeighborhoodIteratorTest.cxx itkMatrixTest.cxx itkNeighborhoodIteratorTest.cxx itkLoggerManagerTest.cxx - itkBSplineInterpolationWeightFunctionTest.cxx itkSymmetricSecondRankTensorTest.cxx itkConstShapedNeighborhoodIteratorTest.cxx itkConstShapedNeighborhoodIteratorTest2.cxx - itkSTLContainerAdaptorTest.cxx - itkFiniteCylinderSpatialFunctionTest.cxx itkLoggerOutputTest.cxx itkNeighborhoodTest.cxx itkVersorTest.cxx @@ -114,7 +97,6 @@ set( itkMemoryLeakTest.cxx itkVectorGeometryTest.cxx itkVNLRoundProfileTest1.cxx - itkZeroFluxBoundaryConditionTest.cxx itkMemoryProbesCollecterBaseTest.cxx itkImageAlgorithmCopyTest.cxx itkImageAlgorithmCopyTest2.cxx @@ -238,24 +220,6 @@ itk_add_test( ITKCommon1TestDriver itkFixedArrayTest2 ) -itk_add_test( - NAME itkBSplineInterpolationWeightFunctionTest - COMMAND - ITKCommon2TestDriver - itkBSplineInterpolationWeightFunctionTest -) -itk_add_test( - NAME itkSpatialOrientationTest - COMMAND - ITKCommon1TestDriver - itkSpatialOrientationTest -) -itk_add_test( - NAME VNLSparseLUSolverTraitsTest - COMMAND - ITKCommon1TestDriver - VNLSparseLUSolverTraitsTest -) itk_add_test( NAME itkSobelOperatorImageConvolutionHorizTest COMMAND @@ -368,18 +332,6 @@ itk_add_test( ITKCommon1TestDriver itkExceptionObjectTest ) -itk_add_test( - NAME itkFileOutputWindowTest - COMMAND - ITKCommon1TestDriver - itkFileOutputWindowTest -) -itk_add_test( - NAME itkFiniteCylinderSpatialFunctionTest - COMMAND - ITKCommon2TestDriver - itkFiniteCylinderSpatialFunctionTest -) itk_add_test( NAME itkGaussianSpatialFunctionTest1 COMMAND @@ -596,12 +548,6 @@ itk_add_test( DATA{${ITK_DATA_ROOT}/Input/VascularTreePointSet.txt} ${ITK_TEST_OUTPUT_DIR}/itkPointSetToImageFilterTest2.mha ) -itk_add_test( - NAME itkSparseFieldLayerTest - COMMAND - ITKCommon1TestDriver - itkSparseFieldLayerTest -) itk_add_test( NAME itkDataObjectTest COMMAND @@ -987,12 +933,6 @@ itk_add_test( ITKCommon1TestDriver itkPhasedArray3DSpecialCoordinatesImageTest ) -itk_add_test( - NAME itkRealTimeClockTest - COMMAND - ITKCommon1TestDriver - itkRealTimeClockTest -) itk_add_test( NAME itkTimeProbeTest COMMAND @@ -1011,18 +951,6 @@ itk_add_test( ITKCommon1TestDriver itkRGBPixelTest ) -itk_add_test( - NAME itkSparseImageTest - COMMAND - ITKCommon1TestDriver - itkSparseImageTest -) -itk_add_test( - NAME itkSimpleFilterWatcherTest - COMMAND - ITKCommon1TestDriver - itkSimpleFilterWatcherTest -) itk_add_test( NAME itkSliceIteratorTest COMMAND @@ -1043,18 +971,6 @@ itk_add_test( ITKCommon2TestDriver itkSmartPointerTest ) -itk_add_test( - NAME itkSpatialFunctionTest - COMMAND - ITKCommon2TestDriver - itkSpatialFunctionTest -) -itk_add_test( - NAME itkSTLContainerAdaptorTest - COMMAND - ITKCommon2TestDriver - itkSTLContainerAdaptorTest -) itk_add_test( NAME itkStdStreamLogOutputTest COMMAND @@ -1087,36 +1003,6 @@ itk_add_test( ITKCommon2TestDriver itkVersorTest ) -itk_add_test( - NAME itkConicShellInteriorExteriorSpatialFunctionTest - COMMAND - ITKCommon2TestDriver - itkConicShellInteriorExteriorSpatialFunctionTest -) -itk_add_test( - NAME itkEllipsoidInteriorExteriorSpatialFunctionTest - COMMAND - ITKCommon2TestDriver - itkEllipsoidInteriorExteriorSpatialFunctionTest -) -itk_add_test( - NAME itkFrustumSpatialFunctionTest - COMMAND - ITKCommon2TestDriver - itkFrustumSpatialFunctionTest -) -itk_add_test( - NAME itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest - COMMAND - ITKCommon1TestDriver - itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest -) -itk_add_test( - NAME itkTorusInteriorExteriorSpatialFunctionTest - COMMAND - ITKCommon2TestDriver - itkTorusInteriorExteriorSpatialFunctionTest -) itk_add_test( NAME itkSymmetricSecondRankTensorImageReadTest COMMAND @@ -1191,12 +1077,6 @@ itk_add_test( ITKCommon2TestDriver itkVariableLengthVectorTest ) -itk_add_test( - NAME itkVariableSizeMatrixTest - COMMAND - ITKCommon2TestDriver - itkVariableSizeMatrixTest -) #itk_add_test(NAME itkQuaternionOrientationAdapterTest COMMAND ITKCommon2TestDriver itkQuaternionOrientationAdapterTest) itk_add_test( NAME itkVectorGeometryTest @@ -1204,12 +1084,6 @@ itk_add_test( ITKCommon2TestDriver itkVectorGeometryTest ) -itk_add_test( - NAME itkZeroFluxBoundaryConditionTest - COMMAND - ITKCommon2TestDriver - itkZeroFluxBoundaryConditionTest -) itk_add_test( NAME itkConstantBoundaryConditionTest COMMAND @@ -1502,12 +1376,14 @@ set( itkBoundaryConditionGTest.cxx itkBoundingBoxGTest.cxx itkBresenhamLineGTest.cxx + itkBSplineInterpolationWeightFunctionGTest.cxx itkBSplineKernelFunctionGTest.cxx itkBuildInformationGTest.cxx itkByteSwapGTest.cxx itkCommandObserverObjectGTest.cxx itkCommonTypeTraitsGTest.cxx itkCompensatedSummationGTest.cxx + itkConicShellInteriorExteriorSpatialFunctionGTest.cxx itkConnectedImageNeighborhoodShapeGTest.cxx itkConstantBoundaryImageNeighborhoodPixelAccessPolicyGTest.cxx itkCopyGTest.cxx @@ -1518,14 +1394,18 @@ set( itkDerefGTest.cxx itkDerivativeOperatorGTest.cxx itkDiffusionTensor3DGTest.cxx + itkEllipsoidInteriorExteriorSpatialFunctionGTest.cxx itkEventObjectGTest.cxx itkExceptionObjectGTest.cxx itkExtractImage3Dto2DGTest.cxx itkExtractImageGTest.cxx + itkFileOutputWindowGTest.cxx itkFilterDispatchGTest.cxx + itkFiniteCylinderSpatialFunctionGTest.cxx itkFixedArrayGTest.cxx itkFloodFilledSpatialFunctionGTest.cxx itkFloodFillIteratorGTest.cxx + itkFrustumSpatialFunctionGTest.cxx itkGaussianDerivativeOperatorGTest.cxx itkHashTableGTest.cxx itkHeavisideStepFunctionGTest.cxx @@ -1567,17 +1447,25 @@ set( itkPointSetGTest.cxx itkPrintHelperGTest.cxx itkPriorityQueueGTest.cxx + itkRealTimeClockGTest.cxx itkRealTimeIntervalGTest.cxx itkRealTimeStampGTest.cxx itkRGBAPixelGTest.cxx itkRGBPixelGTest.cxx itkShapedImageNeighborhoodRangeGTest.cxx + itkSimpleFilterWatcherGTest.cxx itkSizeGTest.cxx itkSmartPointerGTest.cxx itkSobelOperatorGTest.cxx + itkSparseFieldLayerGTest.cxx + itkSparseImageGTest.cxx + itkSpatialFunctionGTest.cxx itkSpatialOrientationAdaptorGTest.cxx + itkSpatialOrientationGTest.cxx itkStdStreamStateSaveGTest.cxx + itkSTLContainerAdaptorGTest.cxx itkStringConvertGTest.cxx + itkSymmetricEllipsoidInteriorExteriorSpatialFunctionGTest.cxx itkSymmetricSecondRankTensorGTest.cxx itkThreadedImageRegionPartitionerGTest.cxx itkThreadedIndexedContainerPartitionerGTest.cxx @@ -1585,11 +1473,15 @@ set( itkThreadedIteratorRangePartitionerGTest2.cxx itkThreadedIteratorRangePartitionerGTest3.cxx itkTimeStampGTest.cxx + itkTorusInteriorExteriorSpatialFunctionGTest.cxx itkVariableLengthVectorGTest.cxx + itkVariableSizeMatrixGTest.cxx itkVectorContainerGTest.cxx itkVectorGTest.cxx itkVersionGTest.cxx itkWeakPointerGTest.cxx + itkZeroFluxBoundaryConditionGTest.cxx + VNLSparseLUSolverTraitsGTest.cxx ) creategoogletestdriver(ITKCommon "${ITKCommon-Test_LIBRARIES}" "${ITKCommonGTests}") # If `-static` was passed to CMAKE_EXE_LINKER_FLAGS, compilation fails. No need to diff --git a/Modules/Core/Common/test/VNLSparseLUSolverTraitsTest.cxx b/Modules/Core/Common/test/VNLSparseLUSolverTraitsGTest.cxx similarity index 96% rename from Modules/Core/Common/test/VNLSparseLUSolverTraitsTest.cxx rename to Modules/Core/Common/test/VNLSparseLUSolverTraitsGTest.cxx index 992579d7900..934d18e79ca 100644 --- a/Modules/Core/Common/test/VNLSparseLUSolverTraitsTest.cxx +++ b/Modules/Core/Common/test/VNLSparseLUSolverTraitsGTest.cxx @@ -17,6 +17,7 @@ *=========================================================================*/ #include "VNLSparseLUSolverTraits.h" +#include "itkGTest.h" #include "itkMath.h" // itk::Math::Absolute #include @@ -44,8 +45,10 @@ VectorsEquals(const TVector & v1, const TVector & v2, const typename TVector::el return true; } +namespace +{ int -VNLSparseLUSolverTraitsTest(int, char *[]) +DoVNLSparseLUSolverTraitsTest(int, char *[]) { /** * Define an sparse LU solver traits type that operates over sparse matrices and @@ -226,3 +229,7 @@ VNLSparseLUSolverTraitsTest(int, char *[]) return EXIT_SUCCESS; } +} // namespace + + +TEST(VNLSparseLUSolverTraits, ConvertedLegacyTest) { EXPECT_EQ(0, DoVNLSparseLUSolverTraitsTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx b/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionGTest.cxx similarity index 97% rename from Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx rename to Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionGTest.cxx index 4dccfc344cd..ff8b212d58f 100644 --- a/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx +++ b/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionGTest.cxx @@ -17,6 +17,7 @@ *=========================================================================*/ #include "itkBSplineInterpolationWeightFunction.h" +#include "itkGTest.h" #include "itkImageRegionConstIteratorWithIndex.h" #include "itkTestingMacros.h" @@ -40,8 +41,10 @@ static_assert((itk::BSplineInterpolationWeightFunction::NumberOfWei * This test exercises methods in the * BSplineInterpolationWeightFunction class. */ +namespace +{ int -itkBSplineInterpolationWeightFunctionTest(int, char *[]) +DoBSplineInterpolationWeightFunctionTest(int, char *[]) { { // Creating a local scope @@ -306,3 +309,10 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[]) } return EXIT_SUCCESS; } +} // namespace + + +TEST(BSplineInterpolationWeightFunction, ConvertedLegacyTest) +{ + EXPECT_EQ(0, DoBSplineInterpolationWeightFunctionTest(0, nullptr)); +} diff --git a/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionGTest.cxx similarity index 96% rename from Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx rename to Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionGTest.cxx index 10645741ac7..b260ac9c1e6 100644 --- a/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionGTest.cxx @@ -17,12 +17,15 @@ *=========================================================================*/ #include "itkConicShellInteriorExteriorSpatialFunction.h" +#include "itkGTest.h" #include "itkMath.h" #include "itkTestingMacros.h" +namespace +{ int -itkConicShellInteriorExteriorSpatialFunctionTest(int, char *[]) +DoConicShellInteriorExteriorSpatialFunctionTest(int, char *[]) { int testStatus = EXIT_SUCCESS; @@ -167,3 +170,10 @@ itkConicShellInteriorExteriorSpatialFunctionTest(int, char *[]) return testStatus; } +} // namespace + + +TEST(ConicShellInteriorExteriorSpatialFunction, ConvertedLegacyTest) +{ + EXPECT_EQ(0, DoConicShellInteriorExteriorSpatialFunctionTest(0, nullptr)); +} diff --git a/Modules/Core/Common/test/itkEllipsoidInteriorExteriorSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkEllipsoidInteriorExteriorSpatialFunctionGTest.cxx similarity index 95% rename from Modules/Core/Common/test/itkEllipsoidInteriorExteriorSpatialFunctionTest.cxx rename to Modules/Core/Common/test/itkEllipsoidInteriorExteriorSpatialFunctionGTest.cxx index 591cd0a1cb5..996df36986d 100644 --- a/Modules/Core/Common/test/itkEllipsoidInteriorExteriorSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkEllipsoidInteriorExteriorSpatialFunctionGTest.cxx @@ -17,9 +17,12 @@ *=========================================================================*/ #include "itkEllipsoidInteriorExteriorSpatialFunction.h" +#include "itkGTest.h" +namespace +{ int -itkEllipsoidInteriorExteriorSpatialFunctionTest(int, char *[]) +DoEllipsoidInteriorExteriorSpatialFunctionTest(int, char *[]) { std::cout << "itkEllipsoidInteriorExteriorSpatialFunction test start" << std::endl; @@ -140,3 +143,10 @@ itkEllipsoidInteriorExteriorSpatialFunctionTest(int, char *[]) << "itkEllipsoidSpatialFunction failed :(" << std::endl; return EXIT_FAILURE; } +} // namespace + + +TEST(EllipsoidInteriorExteriorSpatialFunction, ConvertedLegacyTest) +{ + EXPECT_EQ(0, DoEllipsoidInteriorExteriorSpatialFunctionTest(0, nullptr)); +} diff --git a/Modules/Core/Common/test/itkFileOutputWindowTest.cxx b/Modules/Core/Common/test/itkFileOutputWindowGTest.cxx similarity index 90% rename from Modules/Core/Common/test/itkFileOutputWindowTest.cxx rename to Modules/Core/Common/test/itkFileOutputWindowGTest.cxx index f679f56f0d2..519c9e7b451 100644 --- a/Modules/Core/Common/test/itkFileOutputWindowTest.cxx +++ b/Modules/Core/Common/test/itkFileOutputWindowGTest.cxx @@ -17,12 +17,15 @@ *=========================================================================*/ #include "itkFileOutputWindow.h" +#include "itkGTest.h" #include +namespace +{ int -itkFileOutputWindowTest(int, char *[]) +DoFileOutputWindowTest(int, char *[]) { // Declare the type for the morphology Filter @@ -59,3 +62,7 @@ itkFileOutputWindowTest(int, char *[]) return EXIT_SUCCESS; } +} // namespace + + +TEST(FileOutputWindow, ConvertedLegacyTest) { EXPECT_EQ(0, DoFileOutputWindowTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkFiniteCylinderSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkFiniteCylinderSpatialFunctionGTest.cxx similarity index 95% rename from Modules/Core/Common/test/itkFiniteCylinderSpatialFunctionTest.cxx rename to Modules/Core/Common/test/itkFiniteCylinderSpatialFunctionGTest.cxx index 35daa8f494e..fd861bcc26e 100644 --- a/Modules/Core/Common/test/itkFiniteCylinderSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkFiniteCylinderSpatialFunctionGTest.cxx @@ -17,10 +17,13 @@ *=========================================================================*/ #include "itkFiniteCylinderSpatialFunction.h" +#include "itkGTest.h" #include "itkTestingMacros.h" +namespace +{ int -itkFiniteCylinderSpatialFunctionTest(int, char *[]) +DoFiniteCylinderSpatialFunctionTest(int, char *[]) { std::cout << "itkFiniteCylinderSpatialFunction test start" << std::endl; @@ -140,3 +143,10 @@ itkFiniteCylinderSpatialFunctionTest(int, char *[]) << "itkFiniteCylinderSpatialFunction test failed :(" << std::endl; return EXIT_FAILURE; } +} // namespace + + +TEST(FiniteCylinderSpatialFunction, ConvertedLegacyTest) +{ + EXPECT_EQ(0, DoFiniteCylinderSpatialFunctionTest(0, nullptr)); +} diff --git a/Modules/Core/Common/test/itkFrustumSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkFrustumSpatialFunctionGTest.cxx similarity index 97% rename from Modules/Core/Common/test/itkFrustumSpatialFunctionTest.cxx rename to Modules/Core/Common/test/itkFrustumSpatialFunctionGTest.cxx index a50a50a48c4..241e8c94bfd 100644 --- a/Modules/Core/Common/test/itkFrustumSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkFrustumSpatialFunctionGTest.cxx @@ -17,12 +17,15 @@ *=========================================================================*/ #include "itkFrustumSpatialFunction.h" +#include "itkGTest.h" #include "itkTestingMacros.h" #include +namespace +{ int -itkFrustumSpatialFunctionTest(int, char *[]) +DoFrustumSpatialFunctionTest(int, char *[]) { // Define the dimensionality @@ -214,3 +217,7 @@ itkFrustumSpatialFunctionTest(int, char *[]) return testStatus; } +} // namespace + + +TEST(FrustumSpatialFunction, ConvertedLegacyTest) { EXPECT_EQ(0, DoFrustumSpatialFunctionTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkRealTimeClockTest.cxx b/Modules/Core/Common/test/itkRealTimeClockGTest.cxx similarity index 95% rename from Modules/Core/Common/test/itkRealTimeClockTest.cxx rename to Modules/Core/Common/test/itkRealTimeClockGTest.cxx index 20e13b3fa3b..fd7a0604bbc 100644 --- a/Modules/Core/Common/test/itkRealTimeClockTest.cxx +++ b/Modules/Core/Common/test/itkRealTimeClockGTest.cxx @@ -20,11 +20,14 @@ #include #include "itkMath.h" #include "itkRealTimeClock.h" +#include "itkGTest.h" #include "itkStdStreamStateSave.h" #include "itkTestingMacros.h" +namespace +{ int -itkRealTimeClockTest(int, char *[]) +DoRealTimeClockTest(int, char *[]) { // Save the format stream variables for std::cout // They will be restored when coutState goes out of scope @@ -100,3 +103,7 @@ itkRealTimeClockTest(int, char *[]) std::cout << "[PASSED]" << std::endl; return EXIT_SUCCESS; } +} // namespace + + +TEST(RealTimeClock, ConvertedLegacyTest) { EXPECT_EQ(0, DoRealTimeClockTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkSTLContainerAdaptorTest.cxx b/Modules/Core/Common/test/itkSTLContainerAdaptorGTest.cxx similarity index 97% rename from Modules/Core/Common/test/itkSTLContainerAdaptorTest.cxx rename to Modules/Core/Common/test/itkSTLContainerAdaptorGTest.cxx index cd4b1bf8a35..48358ad88f0 100644 --- a/Modules/Core/Common/test/itkSTLContainerAdaptorTest.cxx +++ b/Modules/Core/Common/test/itkSTLContainerAdaptorGTest.cxx @@ -20,11 +20,14 @@ #include "itkMapContainer.h" #include "itkSTLContainerAdaptor.h" +#include "itkGTest.h" #include "itkSTLConstContainerAdaptor.h" +namespace +{ int -itkSTLContainerAdaptorTest(int, char *[]) +DoSTLContainerAdaptorTest(int, char *[]) { using IndexType = unsigned long; @@ -283,3 +286,7 @@ itkSTLContainerAdaptorTest(int, char *[]) return EXIT_SUCCESS; } +} // namespace + + +TEST(STLContainerAdaptor, ConvertedLegacyTest) { EXPECT_EQ(0, DoSTLContainerAdaptorTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx b/Modules/Core/Common/test/itkSimpleFilterWatcherGTest.cxx similarity index 96% rename from Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx rename to Modules/Core/Common/test/itkSimpleFilterWatcherGTest.cxx index f2eed947b24..ee3cf269c09 100644 --- a/Modules/Core/Common/test/itkSimpleFilterWatcherTest.cxx +++ b/Modules/Core/Common/test/itkSimpleFilterWatcherGTest.cxx @@ -18,6 +18,7 @@ #include #include "itkSimpleFilterWatcher.h" +#include "itkGTest.h" #include "itkUnaryFunctorImageFilter.h" namespace itk @@ -80,8 +81,10 @@ class TanHelperImageFilter } // namespace itk +namespace +{ int -itkSimpleFilterWatcherTest(int, char *[]) +DoSimpleFilterWatcherTest(int, char *[]) { // Test out the code using WatcherType = itk::SimpleFilterWatcher; @@ -157,3 +160,7 @@ itkSimpleFilterWatcherTest(int, char *[]) std::cout << "SimpleFilterWatcher test PASSED ! " << std::endl; return EXIT_SUCCESS; } +} // namespace + + +TEST(SimpleFilterWatcher, ConvertedLegacyTest) { EXPECT_EQ(0, DoSimpleFilterWatcherTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkSparseFieldLayerTest.cxx b/Modules/Core/Common/test/itkSparseFieldLayerGTest.cxx similarity index 93% rename from Modules/Core/Common/test/itkSparseFieldLayerTest.cxx rename to Modules/Core/Common/test/itkSparseFieldLayerGTest.cxx index 5bf7f485169..1825dec5060 100644 --- a/Modules/Core/Common/test/itkSparseFieldLayerTest.cxx +++ b/Modules/Core/Common/test/itkSparseFieldLayerGTest.cxx @@ -17,6 +17,7 @@ *=========================================================================*/ #include "itkSparseFieldLayer.h" +#include "itkGTest.h" #include @@ -28,8 +29,10 @@ struct node_type }; +namespace +{ int -itkSparseFieldLayerTest(int, char *[]) +DoSparseFieldLayerTest(int, char *[]) { auto * store = new node_type[4000]; @@ -115,3 +118,7 @@ itkSparseFieldLayerTest(int, char *[]) return EXIT_SUCCESS; } +} // namespace + + +TEST(SparseFieldLayer, ConvertedLegacyTest) { EXPECT_EQ(0, DoSparseFieldLayerTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkSparseImageTest.cxx b/Modules/Core/Common/test/itkSparseImageGTest.cxx similarity index 92% rename from Modules/Core/Common/test/itkSparseImageTest.cxx rename to Modules/Core/Common/test/itkSparseImageGTest.cxx index 83ae10914d7..342db3a73a1 100644 --- a/Modules/Core/Common/test/itkSparseImageTest.cxx +++ b/Modules/Core/Common/test/itkSparseImageGTest.cxx @@ -17,6 +17,7 @@ *=========================================================================*/ #include "itkSparseImage.h" +#include "itkGTest.h" #include /* This test exercises the itkSparseImage class. */ @@ -38,8 +39,10 @@ class NodeClass } // namespace itk +namespace +{ int -itkSparseImageTest(int, char *[]) +DoSparseImageTest(int, char *[]) { using DummyImageType = itk::Image; using NodeType = itk::NodeClass; @@ -78,3 +81,7 @@ itkSparseImageTest(int, char *[]) return EXIT_SUCCESS; } +} // namespace + + +TEST(SparseImage, ConvertedLegacyTest) { EXPECT_EQ(0, DoSparseImageTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkSpatialFunctionGTest.cxx similarity index 91% rename from Modules/Core/Common/test/itkSpatialFunctionTest.cxx rename to Modules/Core/Common/test/itkSpatialFunctionGTest.cxx index eb04f5cc778..b9b1d0e99da 100644 --- a/Modules/Core/Common/test/itkSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkSpatialFunctionGTest.cxx @@ -20,9 +20,12 @@ // Spatial function stuff #include "itkSphereSpatialFunction.h" +#include "itkGTest.h" +namespace +{ int -itkSpatialFunctionTest(int, char *[]) +DoSpatialFunctionTest(int, char *[]) { // Change this parameter (and the positions, below) to work in higher or lower dimensions constexpr unsigned int dim{ 3 }; @@ -64,3 +67,7 @@ itkSpatialFunctionTest(int, char *[]) return EXIT_FAILURE; } +} // namespace + + +TEST(SpatialFunction, ConvertedLegacyTest) { EXPECT_EQ(0, DoSpatialFunctionTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkSpatialOrientationTest.cxx b/Modules/Core/Common/test/itkSpatialOrientationGTest.cxx similarity index 97% rename from Modules/Core/Common/test/itkSpatialOrientationTest.cxx rename to Modules/Core/Common/test/itkSpatialOrientationGTest.cxx index 3edf6696579..4aef40f3b1f 100644 --- a/Modules/Core/Common/test/itkSpatialOrientationTest.cxx +++ b/Modules/Core/Common/test/itkSpatialOrientationGTest.cxx @@ -17,12 +17,15 @@ *=========================================================================*/ #include "itkSpatialOrientation.h" +#include "itkGTest.h" #include #include +namespace +{ int -itkSpatialOrientationTest(int, char *[]) +DoSpatialOrientationTest(int, char *[]) { // Test streaming enumeration for SpatialOrientationEnums::CoordinateTerms elements @@ -112,3 +115,7 @@ itkSpatialOrientationTest(int, char *[]) std::cout << "Test finished." << std::endl; return EXIT_SUCCESS; } +} // namespace + + +TEST(SpatialOrientation, ConvertedLegacyTest) { EXPECT_EQ(0, DoSpatialOrientationTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkSymmetricEllipsoidInteriorExteriorSpatialFunctionGTest.cxx similarity index 94% rename from Modules/Core/Common/test/itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest.cxx rename to Modules/Core/Common/test/itkSymmetricEllipsoidInteriorExteriorSpatialFunctionGTest.cxx index 25bcb729f84..2db82e17863 100644 --- a/Modules/Core/Common/test/itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkSymmetricEllipsoidInteriorExteriorSpatialFunctionGTest.cxx @@ -17,9 +17,12 @@ *=========================================================================*/ #include "itkSymmetricEllipsoidInteriorExteriorSpatialFunction.h" +#include "itkGTest.h" +namespace +{ int -itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest(int, char *[]) +DoSymmetricEllipsoidInteriorExteriorSpatialFunctionTest(int, char *[]) { std::cout << "itkSymmetricEllipsoidInteriorExteriorSpatialFunction test start" << std::endl; @@ -128,3 +131,10 @@ itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest(int, char *[]) << "itkSymmetricEllipsoidSpatialFunction failed :(" << std::endl; return EXIT_FAILURE; } +} // namespace + + +TEST(SymmetricEllipsoidInteriorExteriorSpatialFunction, ConvertedLegacyTest) +{ + EXPECT_EQ(0, DoSymmetricEllipsoidInteriorExteriorSpatialFunctionTest(0, nullptr)); +} diff --git a/Modules/Core/Common/test/itkTorusInteriorExteriorSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkTorusInteriorExteriorSpatialFunctionGTest.cxx similarity index 93% rename from Modules/Core/Common/test/itkTorusInteriorExteriorSpatialFunctionTest.cxx rename to Modules/Core/Common/test/itkTorusInteriorExteriorSpatialFunctionGTest.cxx index 50247a1c1ae..7042af2b64f 100644 --- a/Modules/Core/Common/test/itkTorusInteriorExteriorSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkTorusInteriorExteriorSpatialFunctionGTest.cxx @@ -17,11 +17,14 @@ *=========================================================================*/ #include "itkTorusInteriorExteriorSpatialFunction.h" +#include "itkGTest.h" #include "itkTestingMacros.h" +namespace +{ int -itkTorusInteriorExteriorSpatialFunctionTest(int, char *[]) +DoTorusInteriorExteriorSpatialFunctionTest(int, char *[]) { // Define the dimensionality @@ -96,3 +99,10 @@ itkTorusInteriorExteriorSpatialFunctionTest(int, char *[]) return testStatus; } +} // namespace + + +TEST(TorusInteriorExteriorSpatialFunction, ConvertedLegacyTest) +{ + EXPECT_EQ(0, DoTorusInteriorExteriorSpatialFunctionTest(0, nullptr)); +} diff --git a/Modules/Core/Common/test/itkVariableSizeMatrixTest.cxx b/Modules/Core/Common/test/itkVariableSizeMatrixGTest.cxx similarity index 97% rename from Modules/Core/Common/test/itkVariableSizeMatrixTest.cxx rename to Modules/Core/Common/test/itkVariableSizeMatrixGTest.cxx index 8fa8e6e5824..82caaf6bf45 100644 --- a/Modules/Core/Common/test/itkVariableSizeMatrixTest.cxx +++ b/Modules/Core/Common/test/itkVariableSizeMatrixGTest.cxx @@ -18,9 +18,12 @@ #include #include "itkVariableSizeMatrix.h" +#include "itkGTest.h" +namespace +{ int -itkVariableSizeMatrixTest(int, char *[]) +DoVariableSizeMatrixTest(int, char *[]) { using FloatVariableSizeMatrixType = itk::VariableSizeMatrix; using DoubleVariableSizeMatrixType = itk::VariableSizeMatrix; @@ -233,3 +236,7 @@ itkVariableSizeMatrixTest(int, char *[]) return EXIT_SUCCESS; } +} // namespace + + +TEST(VariableSizeMatrix, ConvertedLegacyTest) { EXPECT_EQ(0, DoVariableSizeMatrixTest(0, nullptr)); } diff --git a/Modules/Core/Common/test/itkZeroFluxBoundaryConditionTest.cxx b/Modules/Core/Common/test/itkZeroFluxBoundaryConditionGTest.cxx similarity index 97% rename from Modules/Core/Common/test/itkZeroFluxBoundaryConditionTest.cxx rename to Modules/Core/Common/test/itkZeroFluxBoundaryConditionGTest.cxx index 113e649408f..74c94a253d4 100644 --- a/Modules/Core/Common/test/itkZeroFluxBoundaryConditionTest.cxx +++ b/Modules/Core/Common/test/itkZeroFluxBoundaryConditionGTest.cxx @@ -19,6 +19,7 @@ #include #include "itkConstNeighborhoodIterator.h" +#include "itkGTest.h" #include "itkVectorImage.h" using ImageType = itk::Image; @@ -118,8 +119,10 @@ CheckInputRequestedRegion(const RegionType & imageRegion, return true; } +namespace +{ int -itkZeroFluxBoundaryConditionTest(int, char *[]) +DoZeroFluxBoundaryConditionTest(int, char *[]) { // Test an image to cover one operator() method. auto image = ImageType::New(); @@ -268,3 +271,7 @@ itkZeroFluxBoundaryConditionTest(int, char *[]) return EXIT_SUCCESS; } +} // namespace + + +TEST(ZeroFluxBoundaryCondition, ConvertedLegacyTest) { EXPECT_EQ(0, DoZeroFluxBoundaryConditionTest(0, nullptr)); }