diff --git a/Modules/Core/Common/test/CMakeLists.txt b/Modules/Core/Common/test/CMakeLists.txt index d66c5032e45..7012520d4df 100644 --- a/Modules/Core/Common/test/CMakeLists.txt +++ b/Modules/Core/Common/test/CMakeLists.txt @@ -5,13 +5,10 @@ set( itkDataObjectTest.cxx itkDirectoryTest.cxx itkExceptionObjectTest.cxx - itkExtractImage3Dto2DTest.cxx - itkExtractImageTest.cxx itkFileOutputWindowTest.cxx itkFixedArrayTest2.cxx itkFloatingPointExceptionsTest.cxx itkGaussianSpatialFunctionTest.cxx - itkImageAdaptorPipeLineTest.cxx itkImageComputeOffsetAndIndexTest.cxx itkImageDuplicatorTest.cxx itkImageDuplicatorTest2.cxx @@ -111,7 +108,6 @@ set( itkObjectFactoryTest2.cxx itkObjectFactoryTest3.cxx itkObjectFactoryOnlyNewTest.cxx - itkMinimumMaximumImageCalculatorTest.cxx itkSliceIteratorTest.cxx itkImageRegionExclusionIteratorWithIndexTest.cxx itkImageFillBufferTest.cxx @@ -191,24 +187,6 @@ if(ITK_BUILD_SHARED_LIBS) add_dependencies(ITKCommon2TestDriver FactoryTestLib) endif() -itk_add_test( - NAME itkImageAdaptorPipeLineTest - COMMAND - ITKCommon1TestDriver - itkImageAdaptorPipeLineTest -) -itk_add_test( - NAME itkExtractImage3Dto2DTest - COMMAND - ITKCommon1TestDriver - itkExtractImage3Dto2DTest -) -itk_add_test( - NAME itkExtractImageTest - COMMAND - ITKCommon1TestDriver - itkExtractImageTest -) itk_add_test( NAME itkColorTableTest1 COMMAND @@ -254,12 +232,6 @@ itk_add_test( itkMultipleLogOutputTest ${TEMP}/test_multi.txt ) -itk_add_test( - NAME itkMinimumMaximumImageCalculatorTest - COMMAND - ITKCommon2TestDriver - itkMinimumMaximumImageCalculatorTest -) itk_add_test( NAME itkFixedArrayTest2 COMMAND @@ -1510,6 +1482,8 @@ set( itkDiffusionTensor3DGTest.cxx itkEventObjectGTest.cxx itkExceptionObjectGTest.cxx + itkExtractImage3Dto2DGTest.cxx + itkExtractImageGTest.cxx itkFilterDispatchGTest.cxx itkFixedArrayGTest.cxx itkFloodFilledSpatialFunctionGTest.cxx @@ -1517,6 +1491,7 @@ set( itkGaussianDerivativeOperatorGTest.cxx itkHashTableGTest.cxx itkHeavisideStepFunctionGTest.cxx + itkImageAdaptorPipeLineGTest.cxx itkImageBaseGTest.cxx itkImageBufferRangeGTest.cxx itkImageGTest.cxx @@ -1541,6 +1516,7 @@ set( itkMatrixGTest.cxx itkMersenneTwisterRandomVariateGeneratorGTest.cxx itkMetaDataDictionaryGTest.cxx + itkMinimumMaximumImageCalculatorGTest.cxx itkModifiedTimeGTest.cxx itkNeighborhoodAllocatorGTest.cxx itkNumberToStringGTest.cxx diff --git a/Modules/Core/Common/test/itkExtractImage3Dto2DTest.cxx b/Modules/Core/Common/test/itkExtractImage3Dto2DGTest.cxx similarity index 82% rename from Modules/Core/Common/test/itkExtractImage3Dto2DTest.cxx rename to Modules/Core/Common/test/itkExtractImage3Dto2DGTest.cxx index ba16c724264..21e05337fb4 100644 --- a/Modules/Core/Common/test/itkExtractImage3Dto2DTest.cxx +++ b/Modules/Core/Common/test/itkExtractImage3Dto2DGTest.cxx @@ -16,13 +16,11 @@ * *=========================================================================*/ -#include #include "itkExtractImageFilter.h" #include "itkRandomImageSource.h" -#include "itkMath.h" +#include "itkGTest.h" -int -itkExtractImage3Dto2DTest(int, char *[]) +TEST(ExtractImage3Dto2D, ConvertedLegacyTest) { using Image3DType = itk::Image; using Image2DType = itk::Image; @@ -65,10 +63,7 @@ itkExtractImage3Dto2DTest(int, char *[]) const Image2DType::Pointer extractedImage = extract->GetOutput(); Image2DType::DirectionType identity; identity.SetIdentity(); - if (extractedImage->GetDirection() != identity) - { - return EXIT_FAILURE; - } + EXPECT_EQ(extractedImage->GetDirection(), identity); // check CollapseToSubmatrix extract = ExtractType::New(); @@ -86,13 +81,8 @@ itkExtractImage3Dto2DTest(int, char *[]) // remove first column/row, should obtain : // 0 1 // 1 0 - if (itk::Math::NotExactlyEquals(extract->GetOutput()->GetDirection()[0][0], 0) || - itk::Math::NotExactlyEquals(extract->GetOutput()->GetDirection()[1][1], 0) || - itk::Math::NotExactlyEquals(extract->GetOutput()->GetDirection()[0][1], 1) || - itk::Math::NotExactlyEquals(extract->GetOutput()->GetDirection()[1][0], 1)) - { - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; + EXPECT_EQ(extract->GetOutput()->GetDirection()[0][0], 0); + EXPECT_EQ(extract->GetOutput()->GetDirection()[1][1], 0); + EXPECT_EQ(extract->GetOutput()->GetDirection()[0][1], 1); + EXPECT_EQ(extract->GetOutput()->GetDirection()[1][0], 1); } diff --git a/Modules/Core/Common/test/itkExtractImageTest.cxx b/Modules/Core/Common/test/itkExtractImageGTest.cxx similarity index 92% rename from Modules/Core/Common/test/itkExtractImageTest.cxx rename to Modules/Core/Common/test/itkExtractImageGTest.cxx index 58e80c1c769..57528a17542 100644 --- a/Modules/Core/Common/test/itkExtractImageTest.cxx +++ b/Modules/Core/Common/test/itkExtractImageGTest.cxx @@ -16,18 +16,17 @@ * *=========================================================================*/ -#include #include "itkExtractImageFilter.h" #include "itkFileOutputWindow.h" #include "itkStreamingImageFilter.h" #include "itkRandomImageSource.h" #include "itkCastImageFilter.h" -#include "itkTestingMacros.h" +#include "itkGTest.h" #include namespace { -bool +void ExtractImageInPlaceTest() { // This is to test the InPlace option @@ -54,7 +53,7 @@ ExtractImageInPlaceTest() extract->UpdateLargestPossibleRegion(); // check that the it was not run in-place - ITK_TEST_EXPECT_TRUE(source->GetOutput()->GetBufferedRegion().GetSize() != zeroSize); + EXPECT_NE(source->GetOutput()->GetBufferedRegion().GetSize(), zeroSize); // add a filter between which will produce the requested region, and // enable in-place operation @@ -68,10 +67,10 @@ ExtractImageInPlaceTest() // this buffer should still be ok - ITK_TEST_EXPECT_TRUE(source->GetOutput()->GetBufferedRegion().GetSize() != zeroSize); + EXPECT_NE(source->GetOutput()->GetBufferedRegion().GetSize(), zeroSize); // this should have been taken by the in-place; - ITK_TEST_EXPECT_TRUE(filter->GetOutput()->GetBufferedRegion().GetSize() == zeroSize); + EXPECT_EQ(filter->GetOutput()->GetBufferedRegion().GetSize(), zeroSize); // try with in-place disabled extract->InPlaceOff(); @@ -79,15 +78,12 @@ ExtractImageInPlaceTest() // these buffers should still be ok - ITK_TEST_EXPECT_TRUE(source->GetOutput()->GetBufferedRegion().GetSize() != zeroSize); - ITK_TEST_EXPECT_TRUE(filter->GetOutput()->GetBufferedRegion().GetSize() != zeroSize); - - return EXIT_SUCCESS; + EXPECT_NE(source->GetOutput()->GetBufferedRegion().GetSize(), zeroSize); + EXPECT_NE(filter->GetOutput()->GetBufferedRegion().GetSize(), zeroSize); } } // namespace -int -itkExtractImageTest(int, char *[]) +TEST(ExtractImage, ConvertedLegacyTest) { const itk::FileOutputWindow::Pointer fow = itk::FileOutputWindow::New(); fow->SetInstance(fow); @@ -204,8 +200,7 @@ itkExtractImageTest(int, char *[]) } else { - std::cout << "ExtractImageFilter case 1 failed." << std::endl; - return EXIT_FAILURE; + FAIL() << "ExtractImageFilter case 1 failed."; } extract->GetOutput()->Print(std::cout); @@ -284,8 +279,7 @@ itkExtractImageTest(int, char *[]) } else { - std::cout << "ExtractImageFilter case 2 failed." << std::endl; - return EXIT_FAILURE; + FAIL() << "ExtractImageFilter case 2 failed."; } // Case 3: Try extracting a single row @@ -329,8 +323,7 @@ itkExtractImageTest(int, char *[]) } else { - std::cout << "ExtractImageFilter case 3 failed." << std::endl; - return EXIT_FAILURE; + FAIL() << "ExtractImageFilter case 3 failed."; } // Test streaming enumeration for ExtractImageFilterEnums::DirectionCollapseStrategy elements @@ -345,5 +338,5 @@ itkExtractImageTest(int, char *[]) std::cout << "STREAMED ENUM VALUE ExtractImageFilterEnums::DirectionCollapseStrategy: " << ee << std::endl; } - return ExtractImageInPlaceTest(); + ExtractImageInPlaceTest(); } diff --git a/Modules/Core/Common/test/itkImageAdaptorPipeLineTest.cxx b/Modules/Core/Common/test/itkImageAdaptorPipeLineGTest.cxx similarity index 96% rename from Modules/Core/Common/test/itkImageAdaptorPipeLineTest.cxx rename to Modules/Core/Common/test/itkImageAdaptorPipeLineGTest.cxx index 96a114bdd73..3941b7cd660 100644 --- a/Modules/Core/Common/test/itkImageAdaptorPipeLineTest.cxx +++ b/Modules/Core/Common/test/itkImageAdaptorPipeLineGTest.cxx @@ -30,9 +30,9 @@ #include "itkRedPixelAccessor.h" #include "itkAddImageFilter.h" #include "itkStdStreamStateSave.h" +#include "itkGTest.h" -int -itkImageAdaptorPipeLineTest(int, char *[]) +TEST(ImageAdaptorPipeLine, ConvertedLegacyTest) { // Save the format stream variables for std::cout // They will be restored when coutState goes out of scope @@ -231,10 +231,5 @@ itkImageAdaptorPipeLineTest(int, char *[]) //------------------------------------------------------------- auto myGraftedAdaptor = myAdaptorType::New(); myGraftedAdaptor->Graft(myAdaptor); - if (myGraftedAdaptor->GetPixelContainer() != myAdaptor->GetPixelContainer()) - { - std::cerr << "Graft test failed." << std::endl; - return EXIT_FAILURE; - } - return EXIT_SUCCESS; + EXPECT_EQ(myGraftedAdaptor->GetPixelContainer(), myAdaptor->GetPixelContainer()) << "Graft test failed."; } diff --git a/Modules/Core/Common/test/itkMinimumMaximumImageCalculatorTest.cxx b/Modules/Core/Common/test/itkMinimumMaximumImageCalculatorGTest.cxx similarity index 81% rename from Modules/Core/Common/test/itkMinimumMaximumImageCalculatorTest.cxx rename to Modules/Core/Common/test/itkMinimumMaximumImageCalculatorGTest.cxx index 4e42a711922..f70e9708e9d 100644 --- a/Modules/Core/Common/test/itkMinimumMaximumImageCalculatorTest.cxx +++ b/Modules/Core/Common/test/itkMinimumMaximumImageCalculatorGTest.cxx @@ -18,10 +18,9 @@ #include "itkMinimumMaximumImageCalculator.h" #include "itkObject.h" -#include "itkTestingMacros.h" +#include "itkGTest.h" -int -itkMinimumMaximumImageCalculatorTest(int, char *[]) +TEST(MinimumMaximumImageCalculator, ConvertedLegacyTest) { using SizeType = itk::Size<3>; @@ -83,18 +82,18 @@ itkMinimumMaximumImageCalculatorTest(int, char *[]) // Create and initialize the calculator auto calculator = MinMaxCalculatorType::New(); - ITK_EXERCISE_BASIC_OBJECT_METHODS(calculator, MinimumMaximumImageCalculator, Object); + ITK_GTEST_EXERCISE_BASIC_OBJECT_METHODS(calculator, MinimumMaximumImageCalculator, Object); calculator->SetImage(image); calculator->Compute(); // Test minimum of intensity - ITK_TEST_SET_GET_VALUE(minimum, calculator->GetMinimum()); - ITK_TEST_SET_GET_VALUE(minIntensityValueIndex, calculator->GetIndexOfMinimum()); + EXPECT_EQ(minimum, calculator->GetMinimum()); + EXPECT_EQ(minIntensityValueIndex, calculator->GetIndexOfMinimum()); // Test maximum of intensity - ITK_TEST_SET_GET_VALUE(maximum, calculator->GetMaximum()); - ITK_TEST_SET_GET_VALUE(maxIntensityValueIndex, calculator->GetIndexOfMaximum()); + EXPECT_EQ(maximum, calculator->GetMaximum()); + EXPECT_EQ(maxIntensityValueIndex, calculator->GetIndexOfMaximum()); // Set the region over which perform the computations constexpr itk::Size<3> regionSize{ { 4, 4, 4 } }; @@ -118,15 +117,12 @@ itkMinimumMaximumImageCalculatorTest(int, char *[]) calculator->ComputeMinimum(); // Test minimum of intensity - ITK_TEST_SET_GET_VALUE(minimum, calculator->GetMinimum()); - ITK_TEST_SET_GET_VALUE(minIntensityValueIndex, calculator->GetIndexOfMinimum()); + EXPECT_EQ(minimum, calculator->GetMinimum()); + EXPECT_EQ(minIntensityValueIndex, calculator->GetIndexOfMinimum()); calculator->ComputeMaximum(); // Test maximum of intensity - ITK_TEST_SET_GET_VALUE(maximum, calculator->GetMaximum()); - ITK_TEST_SET_GET_VALUE(maxIntensityValueIndex, calculator->GetIndexOfMaximum()); - - - return EXIT_SUCCESS; + EXPECT_EQ(maximum, calculator->GetMaximum()); + EXPECT_EQ(maxIntensityValueIndex, calculator->GetIndexOfMaximum()); }