Merge pull request InsightSoftwareConsortium#5947 from hjmjohnson/convert-filtering-tests-to-gtest

ENH: Convert Filtering tests to GTest

Author: hjmjohnson

Modules/Filtering/BiasCorrection/itk-module.cmake

@@ -19,6 +19,7 @@ itk_module(
     ITKImageGrid
     ITKPolynomials
   TEST_DEPENDS
+    ITKGoogleTest
     ITKTestKernel
     ITKOptimizers
     ITKPolynomials

Modules/Filtering/BiasCorrection/test/CMakeLists.txt

@@ -1,19 +1,16 @@
 itk_module_test()
 set(
   ITKBiasCorrectionTests
-  itkCompositeValleyFunctionTest.cxx
   itkMRIBiasFieldCorrectionFilterTest.cxx
   itkN4BiasFieldCorrectionImageFilterTest.cxx
 )
 
 createtestdriver(ITKBiasCorrection "${ITKBiasCorrection-Test_LIBRARIES}" "${ITKBiasCorrectionTests}")
 
-itk_add_test(
-  NAME itkCompositeValleyFunctionTest
-  COMMAND
-    ITKBiasCorrectionTestDriver
-    itkCompositeValleyFunctionTest
-)
+set(ITKBiasCorrectionGTests itkCompositeValleyFunctionGTest.cxx)
+
+creategoogletestdriver(ITKBiasCorrection "${ITKBiasCorrection-Test_LIBRARIES}" "${ITKBiasCorrectionGTests}")
+
 itk_add_test(
   NAME itkMRIBiasFieldCorrectionFilterTest
   COMMAND

Modules/Filtering/BiasCorrection/test/itkCompositeValleyFunctionGTest.cxx

@@ -0,0 +1,61 @@
+/*=========================================================================
+ *
+ *  Copyright NumFOCUS
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *         https://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *=========================================================================*/
+
+#include "itkCompositeValleyFunction.h"
+#include "itkMath.h"
+#include <gtest/gtest.h>
+
+TEST(CompositeValleyFunction, BoundsAndInterval)
+{
+  itk::Array<double> means(2);
+  itk::Array<double> sigmas(2);
+
+  means[0] = 0.0;
+  means[1] = 100.0;
+  sigmas[0] = 20.0;
+  sigmas[1] = 20.0;
+
+  itk::CompositeValleyFunction function(means, sigmas);
+
+  EXPECT_DOUBLE_EQ(function.GetUpperBound(), 280.0);
+  EXPECT_DOUBLE_EQ(function.GetLowerBound(), -180.0);
+
+  const double interval1 = function.GetInterval();
+  const double interval2 = (function.GetUpperBound() - function.GetLowerBound()) / (1000000.0 - 1.0);
+  EXPECT_NEAR(interval1, interval2, itk::NumericTraits<double>::epsilon());
+}
+
+TEST(CompositeValleyFunction, EvaluateMatchesCallOperator)
+{
+  itk::Array<double> means(2);
+  itk::Array<double> sigmas(2);
+
+  means[0] = 0.0;
+  means[1] = 100.0;
+  sigmas[0] = 20.0;
+  sigmas[1] = 20.0;
+
+  itk::CompositeValleyFunction function(means, sigmas);
+
+  const long   numberOfSamples = function.GetNumberOfSamples();
+  const double measure = function.GetLowerBound() + function.GetInterval() * numberOfSamples * 0.5;
+  const double value1 = function(measure);
+  const double value2 = function.Evaluate(measure);
+
+  EXPECT_NEAR(value1, value2, itk::NumericTraits<double>::epsilon());
+}

Modules/Filtering/BiasCorrection/test/itkCompositeValleyFunctionTest.cxx

@@ -10,6 +10,7 @@ itk_module(
     ITKConvolution
     ITKImageSources
   TEST_DEPENDS
+    ITKGoogleTest
     ITKTestKernel
   DESCRIPTION "${DOCUMENTATION}"
 )

Modules/Filtering/Deconvolution/itk-module.cmake

@@ -3,16 +3,22 @@ set(
   ITKDeconvolutionTests
   itkInverseDeconvolutionImageFilterTest.cxx
   itkLandweberDeconvolutionImageFilterTest.cxx
-  itkProjectedIterativeDeconvolutionImageFilterTest.cxx
+  itkParametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx
   itkProjectedLandweberDeconvolutionImageFilterTest.cxx
   itkRichardsonLucyDeconvolutionImageFilterTest.cxx
   itkTikhonovDeconvolutionImageFilterTest.cxx
   itkWienerDeconvolutionImageFilterTest.cxx
-  itkParametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx
 )
 
 createtestdriver(ITKDeconvolution "${ITKDeconvolution-Test_LIBRARIES}" "${ITKDeconvolutionTests}")
 
+set(
+  ITKDeconvolutionGTests
+  itkProjectedIterativeDeconvolutionImageFilterGTest.cxx
+)
+
+creategoogletestdriver(ITKDeconvolution "${ITKDeconvolution-Test_LIBRARIES}" "${ITKDeconvolutionGTests}")
+
 itk_add_test(
   NAME itkRichardsonLucyDeconvolutionImageFilterGaussianKernelTest
   COMMAND
@@ -81,12 +87,6 @@ itk_add_test(
     1
     2.0
 )
-itk_add_test(
-  NAME itkProjectedIterativeDeconvolutionimageFilterTest
-  COMMAND
-    ITKDeconvolutionTestDriver
-    itkProjectedIterativeDeconvolutionImageFilterTest
-)
 itk_add_test(
   NAME itkProjectedLandweberDeconvolutionImageFilterGaussianKernelTest
   COMMAND

Modules/Filtering/Deconvolution/test/CMakeLists.txt

@@ -19,25 +19,27 @@
 #include "itkImage.h"
 #include "itkLandweberDeconvolutionImageFilter.h"
 #include "itkProjectedIterativeDeconvolutionImageFilter.h"
-#include "itkSimpleFilterWatcher.h"
+#include "itkGTest.h"
+#include "itkTestDriverIncludeRequiredFactories.h"
 
-int
-itkProjectedIterativeDeconvolutionImageFilterTest(int, char *[])
+class ProjectedIterativeDeconvolutionImageFilterTest : public ::testing::Test
 {
-  // Declare the image type
-  using ImageType = itk::Image<float, 2>;
+protected:
+  void
+  SetUp() override
+  {
+    RegisterRequiredFactories();
+  }
+};
 
-  // Declare the base deconvolution filter choice
+TEST_F(ProjectedIterativeDeconvolutionImageFilterTest, BasicObjectMethods)
+{
+  using ImageType = itk::Image<float, 2>;
   using BaseDeconvolutionFilterType = itk::LandweberDeconvolutionImageFilter<ImageType>;
-
-  // Declare a projected version of the base deconvolution image filter
   using ProjectedDeconvolutionFilterType = itk::ProjectedIterativeDeconvolutionImageFilter<BaseDeconvolutionFilterType>;
 
-  // Just instantiate the filter and print it
   auto deconvolutionFilter = ProjectedDeconvolutionFilterType::New();
-  deconvolutionFilter->Print(std::cout);
-
-  const itk::SimpleFilterWatcher watcher(deconvolutionFilter);
 
-  return EXIT_SUCCESS;
+  ITK_GTEST_EXERCISE_BASIC_OBJECT_METHODS(
+    deconvolutionFilter, ProjectedIterativeDeconvolutionImageFilter, LandweberDeconvolutionImageFilter);
 }

…terativeDeconvolutionImageFilterTest.cxx …erativeDeconvolutionImageFilterGTest.cxxModules/Filtering/Deconvolution/test/itkProjectedIterativeDeconvolutionImageFilterTest.cxx renamed to Modules/Filtering/Deconvolution/test/itkProjectedIterativeDeconvolutionImageFilterGTest.cxx Modules/Filtering/Deconvolution/test/itkProjectedIterativeDeconvolutionImageFilterTest.cxx renamed to Modules/Filtering/Deconvolution/test/itkProjectedIterativeDeconvolutionImageFilterGTest.cxx

@@ -12,6 +12,7 @@ itk_module(
   DEPENDS
     ITKImageIntensity
   TEST_DEPENDS
+    ITKGoogleTest
     ITKTestKernel
   DESCRIPTION "${DOCUMENTATION}"
 )

Modules/Filtering/ImageLabel/itk-module.cmake

@@ -1,19 +1,16 @@
 itk_module_test()
 set(
   ITKImageLabelTests
-  itkChangeLabelImageFilterTest.cxx
-  itkLabelContourImageFilterTest.cxx
   itkBinaryContourImageFilterTest.cxx
+  itkLabelContourImageFilterTest.cxx
 )
 
 createtestdriver(ITKImageLabel "${ITKImageLabel-Test_LIBRARIES}" "${ITKImageLabelTests}")
 
-itk_add_test(
-  NAME itkChangeLabelImageFilterTest
-  COMMAND
-    ITKImageLabelTestDriver
-    itkChangeLabelImageFilterTest
-)
+set(ITKImageLabelGTests itkChangeLabelImageFilterGTest.cxx)
+
+creategoogletestdriver(ITKImageLabel "${ITKImageLabel-Test_LIBRARIES}" "${ITKImageLabelGTests}")
+
 itk_add_test(
   NAME itkLabelContourImageFilterTest0
   COMMAND