BUG: Migrate Python tests into their modules

This patch fixes test execution when CMake is configured with ITK_BUILD_DEFAULT_MODULES=OFF. Move unit tests in their appropriate module -- they are only enabled if the module is enabled. Integration tests are only added if ITK_BUILD_DEFAULT_MODULES=OFF. Change-Id: I901cbcf5a8690173facf41fa8a8eed459b804655
fbudin69500 · Nov 2, 2018 · 391d98a · 391d98a
1 parent fc53495
commit 391d98a
Show file tree

Hide file tree

Showing 127 changed files with 441 additions and 418 deletions.
diff --git a/Modules/Core/SpatialObjects/test/CMakeLists.txt b/Modules/Core/SpatialObjects/test/CMakeLists.txt
@@ -106,3 +106,10 @@ itk_add_test(NAME itkSpatialObjectTreeContainerIteratorTest
 itk_add_test(NAME itkNewMetaObjectTypeTest
       COMMAND ITKSpatialObjectsTestDriver itkNewMetaObjectTypeTest
       ${ITK_TEST_OUTPUT_DIR}/NewMetaObjectType.meta)
+
+if(ITK_WRAP_float AND WRAP_2)
+  itk_python_add_test(NAME PythonSpatialObjectTest
+    TEST_DRIVER_ARGS
+    COMMAND SpatialObjectTest.py
+    )
+endif()
diff --git a/...erators/Python/Tests/SpatialObjectTest.py → .../SpatialObjects/test/SpatialObjectTest.py b/...erators/Python/Tests/SpatialObjectTest.py → .../SpatialObjects/test/SpatialObjectTest.py
@@ -16,35 +16,12 @@
 #
 #==========================================================================*/
 
-#     INPUTS: {BrainProtonDensitySlice.png}
-#     OUTPUTS: {ResampleImageFilterOutput1.png}
-#     0
-
-#     INPUTS: {BrainProtonDensitySlice.png}
-#     OUTPUTS: {ResampleImageFilterOutput2.png}
-#     1
-
-#     INPUTS: {BrainProtonDensitySlice.png}
-#     OUTPUTS: {ResampleImageFilterOutput3.png}
-#     2
-
-#     INPUTS: {BrainProtonDensitySlice.png}
-#     OUTPUTS: {ResampleImageFilterOutput4.png}
-#     3
-
 from __future__ import print_function
 
 import itk
-from sys import argv, stderr, exit
 
 itk.auto_progress(2)
 
-# if( len(argv) < 3 ):
-#   print("""Missing Parameters
-# Usage: ResampleImageFilter.py inputImageFile outputImageFile
-# [exampleAction={0,1,2,3}]""", file=stderr)
-#   exit(1)
-
 dim = 2
 SOType = itk.SpatialObject[dim]
 InternalImageType = itk.Image[itk.F, dim]
@@ -69,15 +46,6 @@
 group.AddSpatialObject(box)
 group.AddSpatialObject(gaussian)
 
-filter = itk.SpatialObjectToImageFilter[SOType, InternalImageType].New(
+filter_ = itk.SpatialObjectToImageFilter[SOType, InternalImageType].New(
     group, Size=[100, 100], UseObjectValue=True)
-filter.Update()  # required ?!
-
-rescale = itk.RescaleIntensityImageFilter[
-    InternalImageType,
-    OutputImageType].New(
-    filter,
-    OutputMinimum=itk.NumericTraits[OutputPixelType].NonpositiveMin(),
-    OutputMaximum=itk.NumericTraits[OutputPixelType].max())
-
-itk.imwrite(rescale, argv[1])
+filter_.Update()
diff --git a/...ntAnisotropicDiffusionImageFilter.png.md5 → ...isotropicDiffusionImageFilterTest.png.md5 b/...ntAnisotropicDiffusionImageFilter.png.md5 → ...isotropicDiffusionImageFilterTest.png.md5
diff --git a/...nisotropicDiffusionImageFilter.png.sha512 → ...tropicDiffusionImageFilterTest.png.sha512 b/...nisotropicDiffusionImageFilter.png.sha512 → ...tropicDiffusionImageFilterTest.png.sha512
diff --git a/Modules/Filtering/AnisotropicSmoothing/test/CMakeLists.txt b/Modules/Filtering/AnisotropicSmoothing/test/CMakeLists.txt
@@ -22,3 +22,27 @@ itk_add_test(NAME itkGradientAnisotropicDiffusionImageFilterTest2
     --compare DATA{${ITK_DATA_ROOT}/Baseline/BasicFilters/GradientAnisotropicDiffusionImageFilterTest2.png}
               ${ITK_TEST_OUTPUT_DIR}/GradientAnisotropicDiffusionImageFilterTest2.png
     itkGradientAnisotropicDiffusionImageFilterTest2 DATA{${ITK_DATA_ROOT}/Input/cake_easy.png} ${ITK_TEST_OUTPUT_DIR}/GradientAnisotropicDiffusionImageFilterTest2.png)
+
+if(ITK_WRAP_float AND WRAP_2)
+  itk_python_add_test(NAME PythonCurvatureAnisotropicDiffusionImageFilterTest
+    COMMAND CurvatureAnisotropicDiffusionImageFilterTest.py
+      DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/CurvatureAnisotropicDiffusionImageFilterTest.png
+      5 0.125 3
+    )
+  itk_python_add_test(NAME PythonSmoothingRecursiveGaussianImageFilterTest
+    COMMAND SmoothingRecursiveGaussianImageFilter.py
+      DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/SmoothingRecursiveGaussianImageFilterTest.png
+      3
+    )
+  itk_python_add_test(NAME PythonGradientAnisotropicDiffusionImageFilterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonGradientAnisotropicDiffusionImageFilterTest.png
+                DATA{Baseline/PythonGradientAnisotropicDiffusionImageFilterTest.png}
+    COMMAND GradientAnisotropicDiffusionImageFilterTest.py
+      DATA{${WrapITK_SOURCE_DIR}/images/BrainProtonDensitySlice.png}
+      ${ITK_TEST_OUTPUT_DIR}/GradientAnisotropicDiffusionImageFilter.png
+      5 0.125 1.0
+    )
+endif()
diff --git a/...rvatureAnisotropicDiffusionImageFilter.py → ...ureAnisotropicDiffusionImageFilterTest.py b/...rvatureAnisotropicDiffusionImageFilter.py → ...ureAnisotropicDiffusionImageFilterTest.py
diff --git a/...radientAnisotropicDiffusionImageFilter.py → ...entAnisotropicDiffusionImageFilterTest.py b/...radientAnisotropicDiffusionImageFilter.py → ...entAnisotropicDiffusionImageFilterTest.py
diff --git a/...ython/Tests/AntiAliasBinaryImageFilter.py → ...tiAlias/AntiAliasBinaryImageFilterTest.py b/...ython/Tests/AntiAliasBinaryImageFilter.py → ...tiAlias/AntiAliasBinaryImageFilterTest.py
diff --git a/...images/AntiAliasBinaryImageFilter.png.md5 → ...honAntiAliasBinaryImageFilterTest.png.md5 b/...images/AntiAliasBinaryImageFilter.png.md5 → ...honAntiAliasBinaryImageFilterTest.png.md5
diff --git a/...ges/AntiAliasBinaryImageFilter.png.sha512 → ...AntiAliasBinaryImageFilterTest.png.sha512 b/...ges/AntiAliasBinaryImageFilter.png.sha512 → ...AntiAliasBinaryImageFilterTest.png.sha512
diff --git a/Modules/Filtering/AntiAlias/test/CMakeLists.txt b/Modules/Filtering/AntiAlias/test/CMakeLists.txt
@@ -6,8 +6,22 @@ itkAntiAliasBinaryImageFilterTest.cxx
 CreateTestDriver(ITKAntiAlias  "${ITKAntiAlias-Test_LIBRARIES}" "${ITKAntiAliasTests}")
 
 itk_add_test(NAME itkAntiAliasBinaryImageFilterTest
-      COMMAND ITKAntiAliasTestDriver
-      --compare DATA{Baseline/itkAntiAliasBinaryImageFilterTestBaseline.mha}
-                ${ITK_TEST_OUTPUT_DIR}/itkAntiAliasBinaryImageFilterTest.mha
-      itkAntiAliasBinaryImageFilterTest
-      ${ITK_TEST_OUTPUT_DIR}/itkAntiAliasBinaryImageFilterTest.mha)
+  COMMAND ITKAntiAliasTestDriver
+  --compare DATA{Baseline/itkAntiAliasBinaryImageFilterTestBaseline.mha}
+            ${ITK_TEST_OUTPUT_DIR}/itkAntiAliasBinaryImageFilterTest.mha
+  itkAntiAliasBinaryImageFilterTest
+  ${ITK_TEST_OUTPUT_DIR}/itkAntiAliasBinaryImageFilterTest.mha
+  )
+
+list(FIND "${ITK_WRAP_IMAGE_DIMS}" 3 wrap_3_index)
+if(ITK_WRAP_float AND wrap_3_index GREATER -1)
+  itk_python_add_test(NAME PythonAntiAliasBinaryImageFilterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonAntiAliasBinaryImageFilterTest.png
+                DATA{Baseline/PythonAntiAliasBinaryImageFilterTest.png}
+    COMMAND AntiAliasBinaryImageFilterTest.py
+      DATA{Input/VentricleModel.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonAntiAliasBinaryImageFilterTest.png
+      .001 50
+    )
+endif()
diff --git a/Modules/Filtering/AntiAlias/test/Input/VentricleModel.png.md5 b/Modules/Filtering/AntiAlias/test/Input/VentricleModel.png.md5
@@ -0,0 +1 @@
+d4ef4e7e6da2533d09bcd2b8b075332e
diff --git a/Modules/Filtering/AntiAlias/test/Input/VentricleModel.png.sha512 b/Modules/Filtering/AntiAlias/test/Input/VentricleModel.png.sha512
@@ -0,0 +1 @@
+802a92b9ae1c5f7bd855359faa838a52a58e033a443836850614b6ba84586cd358bfacf1bff751aee06cb15511df2a3f161e67d44ba17e0d9675a86ac4fabe15
diff --git a/...ng/images/BinaryDilateImageFilter.png.md5 → ...PythonBinaryDilateImageFilterTest.png.md5 b/...ng/images/BinaryDilateImageFilter.png.md5 → ...PythonBinaryDilateImageFilterTest.png.md5
diff --git a/...images/BinaryDilateImageFilter.png.sha512 → ...honBinaryDilateImageFilterTest.png.sha512 b/...images/BinaryDilateImageFilter.png.sha512 → ...honBinaryDilateImageFilterTest.png.sha512
diff --git a/...ing/images/BinaryErodeImageFilter.png.md5 → .../PythonBinaryErodeImageFilterTest.png.md5 b/...ing/images/BinaryErodeImageFilter.png.md5 → .../PythonBinaryErodeImageFilterTest.png.md5
diff --git a/.../images/BinaryErodeImageFilter.png.sha512 → ...thonBinaryErodeImageFilterTest.png.sha512 b/.../images/BinaryErodeImageFilter.png.sha512 → ...thonBinaryErodeImageFilterTest.png.sha512
diff --git a/...s/Python/Tests/BinaryDilateImageFilter.py → ...ology/test/BinaryDilateImageFilterTest.py b/...s/Python/Tests/BinaryDilateImageFilter.py → ...ology/test/BinaryDilateImageFilterTest.py
diff --git a/...rs/Python/Tests/BinaryErodeImageFilter.py → ...hology/test/BinaryErodeImageFilterTest.py b/...rs/Python/Tests/BinaryErodeImageFilter.py → ...hology/test/BinaryErodeImageFilterTest.py
diff --git a/Modules/Filtering/BinaryMathematicalMorphology/test/CMakeLists.txt b/Modules/Filtering/BinaryMathematicalMorphology/test/CMakeLists.txt
@@ -133,3 +133,25 @@ itk_add_test(NAME itkBinaryThinningImageFilterTest
     --compare DATA{${ITK_DATA_ROOT}/Baseline/Algorithms/BinaryThinningImageFilterTest.png}
               ${ITK_TEST_OUTPUT_DIR}/BinaryThinningImageFilterTest.png
     itkBinaryThinningImageFilterTest DATA{${ITK_DATA_ROOT}/Input/Shapes.png} ${ITK_TEST_OUTPUT_DIR}/BinaryThinningImageFilterTest.png)
+
+# some tests will fail if dim=2 and unsigned short are not wrapped
+list(FIND "${ITK_WRAP_IMAGE_DIMS}" 2 wrap_2_index)
+if(ITK_WRAP_unsigned_char AND wrap_2_index GREATER -1)
+  itk_python_add_test(NAME PythonBinaryDilateImageFilterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonBinaryDilateImageFilterTest.png DATA{Baseline/PythonBinaryDilateImageFilterTest.png}
+    COMMAND BinaryDilateImageFilterTest.py
+    DATA{${ITK_DATA_ROOT}/Input/2th_cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonBinaryDilateImageFilterTest.png
+      5
+    )
+  itk_python_add_test(NAME PythonBinaryErodeImageFilterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonBinaryErodeImageFilterTest.png
+      DATA{Baseline/PythonBinaryErodeImageFilterTest.png}
+    COMMAND BinaryErodeImageFilterTest.py
+    DATA{${ITK_DATA_ROOT}/Input/2th_cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonBinaryErodeImageFilterTest.png
+      5
+    )
+endif()
diff --git a/Modules/Filtering/CurvatureFlow/test/CMakeLists.txt b/Modules/Filtering/CurvatureFlow/test/CMakeLists.txt
@@ -10,3 +10,12 @@ itk_add_test(NAME itkBinaryMinMaxCurvatureFlowImageFilterTest
       COMMAND ITKCurvatureFlowTestDriver itkBinaryMinMaxCurvatureFlowImageFilterTest)
 itk_add_test(NAME itkCurvatureFlowTesti
       COMMAND ITKCurvatureFlowTestDriver itkCurvatureFlowTest ${ITK_TEST_OUTPUT_DIR}/itkCurvatureFlowTest.vtk)
+
+if(ITK_WRAP_float AND WRAP_2)
+  itk_python_add_test(NAME PythonCurvatureFlowImageFilterTest
+    COMMAND CurvatureFlowImageFilterTest.py
+      DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/CurvatureFlowImageFilterTest.png
+      5 0.125 1.0
+    )
+endif()
diff --git a/.../Python/Tests/CurvatureFlowImageFilter.py → ...Flow/test/CurvatureFlowImageFilterTest.py b/.../Python/Tests/CurvatureFlowImageFilter.py → ...Flow/test/CurvatureFlowImageFilterTest.py
diff --git a/...ng/images/FFTImageFilterImaginary.png.md5 → ...PythonFFTImageFilterImaginaryTest.png.md5 b/...ng/images/FFTImageFilterImaginary.png.md5 → ...PythonFFTImageFilterImaginaryTest.png.md5
diff --git a/...images/FFTImageFilterImaginary.png.sha512 → ...honFFTImageFilterImaginaryTest.png.sha512 b/...images/FFTImageFilterImaginary.png.sha512 → ...honFFTImageFilterImaginaryTest.png.sha512
diff --git a/Wrapping/images/FFTImageFilterReal.png.md5 → ...line/PythonFFTImageFilterRealTest.png.md5 b/Wrapping/images/FFTImageFilterReal.png.md5 → ...line/PythonFFTImageFilterRealTest.png.md5
diff --git a/...ping/images/FFTImageFilterReal.png.sha512 → ...e/PythonFFTImageFilterRealTest.png.sha512 b/...ping/images/FFTImageFilterReal.png.sha512 → ...e/PythonFFTImageFilterRealTest.png.sha512
diff --git a/Modules/Filtering/FFT/test/CMakeLists.txt b/Modules/Filtering/FFT/test/CMakeLists.txt
@@ -269,3 +269,15 @@ endforeach()
 add_executable(ITKFFTTestCircularDependency itkTestCircularDependency.cxx)
 target_link_libraries(ITKFFTTestCircularDependency ${ITKFFT-Test_LIBRARIES})
 itk_add_test(NAME itkFFTTestCircularDependency COMMAND ITKFFTTestCircularDependency)
+
+if(ITK_WRAP_float AND WRAP_2)
+  itk_python_add_test(NAME PythonFFTImageFilterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonFFTImageFilterRealTest.png DATA{Baseline/FFTImageFilterReal.png}
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonFFTImageFilterImaginaryTest.png DATA{Baseline/FFTImageFilterImaginary.png}
+    COMMAND FFTImageFilterTest.py
+      DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonFFTImageFilterRealTest.png
+      ${ITK_TEST_OUTPUT_DIR}/PythonFFTImageFilterImaginaryTest.png
+  )
+endif()
diff --git a/...Generators/Python/Tests/FFTImageFilter.py → .../Filtering/FFT/test/FFTImageFilterTest.py b/...Generators/Python/Tests/FFTImageFilter.py → .../Filtering/FFT/test/FFTImageFilterTest.py
diff --git a/...images/FastMarchingGrayMatterTest.png.md5 → ...seline/FastMarchingGrayMatterTest.png.md5 b/...images/FastMarchingGrayMatterTest.png.md5 → ...seline/FastMarchingGrayMatterTest.png.md5
diff --git a/...ges/FastMarchingGrayMatterTest.png.sha512 → ...ine/FastMarchingGrayMatterTest.png.sha512 b/...ges/FastMarchingGrayMatterTest.png.sha512 → ...ine/FastMarchingGrayMatterTest.png.sha512
diff --git a/...ges/FastMarchingLeftVentricleTest.png.md5 → ...ine/FastMarchingLeftVentricleTest.png.md5 b/...ges/FastMarchingLeftVentricleTest.png.md5 → ...ine/FastMarchingLeftVentricleTest.png.md5
diff --git a/.../FastMarchingLeftVentricleTest.png.sha512 → .../FastMarchingLeftVentricleTest.png.sha512 b/.../FastMarchingLeftVentricleTest.png.sha512 → .../FastMarchingLeftVentricleTest.png.sha512
diff --git a/...es/FastMarchingRightVentricleTest.png.md5 → ...ne/FastMarchingRightVentricleTest.png.md5 b/...es/FastMarchingRightVentricleTest.png.md5 → ...ne/FastMarchingRightVentricleTest.png.md5
diff --git a/...FastMarchingRightVentricleTest.png.sha512 → ...FastMarchingRightVentricleTest.png.sha512 b/...FastMarchingRightVentricleTest.png.sha512 → ...FastMarchingRightVentricleTest.png.sha512
diff --git a/...mages/FastMarchingWhiteMatterTest.png.md5 → ...eline/FastMarchingWhiteMatterTest.png.md5 b/...mages/FastMarchingWhiteMatterTest.png.md5 → ...eline/FastMarchingWhiteMatterTest.png.md5
diff --git a/...es/FastMarchingWhiteMatterTest.png.sha512 → ...ne/FastMarchingWhiteMatterTest.png.sha512 b/...es/FastMarchingWhiteMatterTest.png.sha512 → ...ne/FastMarchingWhiteMatterTest.png.sha512
diff --git a/Modules/Filtering/FastMarching/test/CMakeLists.txt b/Modules/Filtering/FastMarching/test/CMakeLists.txt
@@ -245,3 +245,45 @@ itk_add_test( NAME itkFastMarchingImageFilterTest_wm_multipleSeeds_NoHandlesTopo
     2
 )
 set_property(TEST itkFastMarchingImageFilterTest_wm_multipleSeeds_NoHandlesTopo APPEND PROPERTY LABELS RUNS_LONG)
+
+if(ITK_WRAP_float AND WRAP_2)
+  itk_python_add_test(NAME PythonFastMarchingLeftVentricleTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/FastMarchingLeftVentricleTest.png
+                DATA{Baseline/FastMarchingLeftVentricleTest.png}
+    COMMAND FastMarchingImageFilterTest.py
+    DATA{Input/BrainProtonDensitySlice.png}
+      ${ITK_TEST_OUTPUT_DIR}/FastMarchingLeftVentricleTest.png
+      81 114 1.0 -0.5 3.0 100 100
+    )
+
+  itk_python_add_test(NAME PythonFastMarchingRightVentricleTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/FastMarchingRightVentricleTest.png
+                DATA{Baseline/FastMarchingRightVentricleTest.png}
+    COMMAND FastMarchingImageFilterTest.py
+      DATA{Input/BrainProtonDensitySlice.png}
+      ${ITK_TEST_OUTPUT_DIR}/FastMarchingRightVentricleTest.png
+      99 114 1.0 -0.5 3.0 100 100
+    )
+
+  itk_python_add_test(NAME PythonFastMarchingWhiteMatterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/FastMarchingWhiteMatterTest.png
+                DATA{Baseline/FastMarchingWhiteMatterTest.png}
+    COMMAND FastMarchingImageFilterTest.py
+      DATA{Input/BrainProtonDensitySlice.png}
+      ${ITK_TEST_OUTPUT_DIR}/FastMarchingWhiteMatterTest.png
+      56 92 1.0 -0.3 2.0 200 100
+    )
+
+  itk_python_add_test(NAME PythonFastMarchingGrayMatterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/FastMarchingGrayMatterTest.png
+                DATA{Baseline/FastMarchingGrayMatterTest.png}
+    COMMAND FastMarchingImageFilterTest.py
+      DATA{Input/BrainProtonDensitySlice.png}
+      ${ITK_TEST_OUTPUT_DIR}/FastMarchingGrayMatterTest.png
+      40 90 .5 -0.3 2.0 200 100
+    )
+endif()
diff --git a/...s/Python/Tests/FastMarchingImageFilter.py → ...ching/test/FastMarchingImageFilterTest.py b/...s/Python/Tests/FastMarchingImageFilter.py → ...ching/test/FastMarchingImageFilterTest.py
diff --git a/Modules/Filtering/FastMarching/test/Input/BrainProtonDensitySlice.png.md5 b/Modules/Filtering/FastMarching/test/Input/BrainProtonDensitySlice.png.md5
@@ -0,0 +1 @@
+113606df5bf3bea295e3ed83d6a4f3c4
diff --git a/Modules/Filtering/FastMarching/test/Input/BrainProtonDensitySlice.png.sha512 b/Modules/Filtering/FastMarching/test/Input/BrainProtonDensitySlice.png.sha512
@@ -0,0 +1 @@
+86cbe2a809e90d72fb464868449477fe6d83809ddd0493cfca92033d7d3dd4bc3e0b831b17735926ed990735234a4eb8034aeaca70a3f5ba18fffe8f3c8e7eaa
diff --git a/...ges/CannyEdgeDetectionImageFilter.png.md5 → ...CannyEdgeDetectionImageFilterTest.png.md5 b/...ges/CannyEdgeDetectionImageFilter.png.md5 → ...CannyEdgeDetectionImageFilterTest.png.md5
diff --git a/.../CannyEdgeDetectionImageFilter.png.sha512 → ...nyEdgeDetectionImageFilterTest.png.sha512 b/.../CannyEdgeDetectionImageFilter.png.sha512 → ...nyEdgeDetectionImageFilterTest.png.sha512
diff --git a/Modules/Filtering/ImageFeature/test/CMakeLists.txt b/Modules/Filtering/ImageFeature/test/CMakeLists.txt
@@ -227,3 +227,21 @@ itk_python_add_test(NAME itkGradientVectorFlowImageFilterPythonTest
       ${ITK_TEST_OUTPUT_DIR}/itkGradientVectorFlowImageFilterPythonTestX.png
       ${ITK_TEST_OUTPUT_DIR}/itkGradientVectorFlowImageFilterPythonTestY.png
       50 50000.0 0.001)
+
+if(ITK_WRAP_float AND WRAP_2)
+  itk_python_add_test(NAME PythonLaplacianImageFilterTest
+    COMMAND LaplacianImageFilterTest.py
+    DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/LaplacianImageFilterTest.png
+    )
+  itk_python_add_test(NAME PythonCannyEdgeDetectionImageFilterTest
+    TEST_DRIVER_ARGS
+      --compareNumberOfPixelsTolerance 1
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonCannyEdgeDetectionImageFilterTest.png
+        DATA{Baseline/PythonCannyEdgeDetectionImageFilterTest.png}
+    COMMAND CannyEdgeDetectionImageFilterTest.py
+      DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonCannyEdgeDetectionImageFilterTest.png
+      9
+    )
+endif()
diff --git a/...on/Tests/CannyEdgeDetectionImageFilter.py → ...test/CannyEdgeDetectionImageFilterTest.py b/...on/Tests/CannyEdgeDetectionImageFilter.py → ...test/CannyEdgeDetectionImageFilterTest.py
diff --git a/...tors/Python/Tests/LaplacianImageFilter.py → ...eFeature/test/LaplacianImageFilterTest.py b/...tors/Python/Tests/LaplacianImageFilter.py → ...eFeature/test/LaplacianImageFilterTest.py
diff --git a/Modules/Filtering/ImageFilterBase/test/CMakeLists.txt b/Modules/Filtering/ImageFilterBase/test/CMakeLists.txt
@@ -40,3 +40,15 @@ set(ITKImageFilterBaseGTests
       itkGeneratorImageFilterGTest.cxx
 )
 CreateGoogleTestDriver(ITKImageFilterBase "${ITKImageFilterBase-Test_LIBRARIES}" "${ITKImageFilterBaseGTests}")
+
+# some tests will fail if dim=2 and unsigned short are not wrapped
+list(FIND "${ITK_WRAP_IMAGE_DIMS}" 2 wrap_2_index)
+if(ITK_WRAP_unsigned_char AND wrap_2_index GREATER -1)
+  itk_python_add_test(NAME PythonCastImageFilterTest
+    TEST_DRIVER_ARGS
+    --compare ${ITK_TEST_OUTPUT_DIR}/PythonCastImageFilterTest.png DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+    COMMAND CastImageFilterTest.py
+      DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonCastImageFilterTest.png
+    )
+endif()
diff --git a/...enerators/Python/Tests/CastImageFilter.py → ...ageFilterBase/test/CastImageFilterTest.py b/...enerators/Python/Tests/CastImageFilter.py → ...ageFilterBase/test/CastImageFilterTest.py
diff --git a/...itudeRecursiveGaussianImageFilter.png.md5 → ...eRecursiveGaussianImageFilterTest.png.md5 b/...itudeRecursiveGaussianImageFilter.png.md5 → ...eRecursiveGaussianImageFilterTest.png.md5
diff --git a/...deRecursiveGaussianImageFilter.png.sha512 → ...cursiveGaussianImageFilterTest.png.sha512 b/...deRecursiveGaussianImageFilter.png.sha512 → ...cursiveGaussianImageFilterTest.png.sha512
diff --git a/Modules/Filtering/ImageGradient/test/CMakeLists.txt b/Modules/Filtering/ImageGradient/test/CMakeLists.txt
@@ -90,3 +90,15 @@ itk_add_test(NAME itkGradientRecursiveGaussianFilterTest4
 itk_add_test(NAME itkDifferenceOfGaussiansGradientTest
 
       COMMAND ITKImageGradientTestDriver itkDifferenceOfGaussiansGradientTest)
+
+if(ITK_WRAP_float AND WRAP_2)
+  itk_python_add_test(NAME PythonGradientMagnitudeRecursiveGaussianImageFilterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/GradientMagnitudeRecursiveGaussianImageFilterTest.png
+              DATA{Baseline/PythonGradientMagnitudeRecursiveGaussianImageFilterTest.png}
+    COMMAND GradientMagnitudeRecursiveGaussianImageFilterTest.py
+      DATA{Input/BrainProtonDensitySlice.png}
+      ${ITK_TEST_OUTPUT_DIR}/GradientMagnitudeRecursiveGaussianImageFilterTest.png
+      5
+    )
+endif()
diff --git a/...tMagnitudeRecursiveGaussianImageFilter.py → ...nitudeRecursiveGaussianImageFilterTest.py b/...tMagnitudeRecursiveGaussianImageFilter.py → ...nitudeRecursiveGaussianImageFilterTest.py
diff --git a/Modules/Filtering/ImageGradient/test/Input/BrainProtonDensitySlice.png.md5 b/Modules/Filtering/ImageGradient/test/Input/BrainProtonDensitySlice.png.md5
@@ -0,0 +1 @@
+113606df5bf3bea295e3ed83d6a4f3c4
diff --git a/Modules/Filtering/ImageGradient/test/Input/BrainProtonDensitySlice.png.sha512 b/Modules/Filtering/ImageGradient/test/Input/BrainProtonDensitySlice.png.sha512
@@ -0,0 +1 @@
+86cbe2a809e90d72fb464868449477fe6d83809ddd0493cfca92033d7d3dd4bc3e0b831b17735926ed990735234a4eb8034aeaca70a3f5ba18fffe8f3c8e7eaa
diff --git a/...g/images/ResampleImageFilterTest1.png.md5 → ...ne/PythonResampleImageFilterTest1.png.md5 b/...g/images/ResampleImageFilterTest1.png.md5 → ...ne/PythonResampleImageFilterTest1.png.md5
diff --git a/...mages/ResampleImageFilterTest1.png.sha512 → ...PythonResampleImageFilterTest1.png.sha512 b/...mages/ResampleImageFilterTest1.png.sha512 → ...PythonResampleImageFilterTest1.png.sha512
diff --git a/...g/images/ResampleImageFilterTest2.png.md5 → ...ne/PythonResampleImageFilterTest2.png.md5 b/...g/images/ResampleImageFilterTest2.png.md5 → ...ne/PythonResampleImageFilterTest2.png.md5
diff --git a/...mages/ResampleImageFilterTest2.png.sha512 → ...PythonResampleImageFilterTest2.png.sha512 b/...mages/ResampleImageFilterTest2.png.sha512 → ...PythonResampleImageFilterTest2.png.sha512
diff --git a/...g/images/ResampleImageFilterTest3.png.md5 → ...ne/PythonResampleImageFilterTest3.png.md5 b/...g/images/ResampleImageFilterTest3.png.md5 → ...ne/PythonResampleImageFilterTest3.png.md5
diff --git a/...mages/ResampleImageFilterTest3.png.sha512 → ...PythonResampleImageFilterTest3.png.sha512 b/...mages/ResampleImageFilterTest3.png.sha512 → ...PythonResampleImageFilterTest3.png.sha512
diff --git a/...g/images/ResampleImageFilterTest4.png.md5 → ...ne/PythonResampleImageFilterTest4.png.md5 b/...g/images/ResampleImageFilterTest4.png.md5 → ...ne/PythonResampleImageFilterTest4.png.md5
diff --git a/...mages/ResampleImageFilterTest4.png.sha512 → ...PythonResampleImageFilterTest4.png.sha512 b/...mages/ResampleImageFilterTest4.png.sha512 → ...PythonResampleImageFilterTest4.png.sha512
diff --git a/Modules/Filtering/ImageGrid/test/CMakeLists.txt b/Modules/Filtering/ImageGrid/test/CMakeLists.txt
@@ -297,3 +297,47 @@ set( ITKImageGridGTests
   itkTileImageFilterGTest.cxx )
 
 CreateGoogleTestDriver(ITKImageGrid "${ITKImageGrid-Test_LIBRARIES}" "${ITKImageGridGTests}")
+
+# some tests will fail if dim=2 and unsigned short are not wrapped
+list(FIND "${ITK_WRAP_IMAGE_DIMS}" 2 wrap_2_index)
+if(ITK_WRAP_unsigned_char AND wrap_2_index GREATER -1)
+  itk_python_add_test(NAME PythonResampleImageFilterTest1
+    TEST_DRIVER_ARGS
+    --compare ${ITK_TEST_OUTPUT_DIR}/PythonResampleImageFilterTest1.png
+              DATA{Baseline/PythonResampleImageFilterTest1.png}
+    COMMAND ResampleImageFilterTest.py
+      DATA{Input/BrainProtonDensitySlice.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonResampleImageFilterTest1.png
+      0
+    )
+
+  itk_python_add_test(NAME PythonResampleImageFilterTest2
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonResampleImageFilterTest2.png
+                DATA{Baseline/ResampleImageFilterTest2.png}
+    COMMAND ResampleImageFilterTest.py
+      DATA{Input/BrainProtonDensitySlice.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonResampleImageFilterTest2.png
+      1
+    )
+
+  itk_python_add_test(NAME PythonResampleImageFilterTest3
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonResampleImageFilterTest3.png
+      DATA{Input/ResampleImageFilterTest3.png}
+    COMMAND ResampleImageFilterTest.py
+      DATA{Input/BrainProtonDensitySlice.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonResampleImageFilterTest3.png
+      2
+    )
+
+  itk_python_add_test(NAME PythonResampleImageFilterTest4
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonResampleImageFilterTest4.png
+                DATA{Baseline/ResampleImageFilterTest4.png}
+    COMMAND ResampleImageFilterTest.py
+      DATA{Input/BrainProtonDensitySlice.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonResampleImageFilterTest4.png
+      3
+    )
+endif()
diff --git a/Modules/Filtering/ImageGrid/test/Input/BrainProtonDensitySlice.png.md5 b/Modules/Filtering/ImageGrid/test/Input/BrainProtonDensitySlice.png.md5
@@ -0,0 +1 @@
+113606df5bf3bea295e3ed83d6a4f3c4
diff --git a/Modules/Filtering/ImageGrid/test/Input/BrainProtonDensitySlice.png.sha512 b/Modules/Filtering/ImageGrid/test/Input/BrainProtonDensitySlice.png.sha512
@@ -0,0 +1 @@
+86cbe2a809e90d72fb464868449477fe6d83809ddd0493cfca92033d7d3dd4bc3e0b831b17735926ed990735234a4eb8034aeaca70a3f5ba18fffe8f3c8e7eaa
diff --git a/...ators/Python/Tests/ResampleImageFilter.py → ...ImageGrid/test/ResampleImageFilterTest.py b/...ators/Python/Tests/ResampleImageFilter.py → ...ImageGrid/test/ResampleImageFilterTest.py
diff --git a/Wrapping/images/SigmoidImageFilter.png.md5 → ...line/PythonSigmoidImageFilterTest.png.md5 b/Wrapping/images/SigmoidImageFilter.png.md5 → ...line/PythonSigmoidImageFilterTest.png.md5
diff --git a/...ping/images/SigmoidImageFilter.png.sha512 → ...e/PythonSigmoidImageFilterTest.png.sha512 b/...ping/images/SigmoidImageFilter.png.sha512 → ...e/PythonSigmoidImageFilterTest.png.sha512
diff --git a/Modules/Filtering/ImageIntensity/test/CMakeLists.txt b/Modules/Filtering/ImageIntensity/test/CMakeLists.txt
@@ -337,3 +337,17 @@ if(MSVC)
 endif()
 
 CreateGoogleTestDriver(ITKImageIntensity "${ITKImageIntensity-Test_LIBRARIES}" "${ITKImageIntensityGTests}")
+
+# some tests will fail if dim=2 and unsigned short are not wrapped
+list(FIND "${ITK_WRAP_IMAGE_DIMS}" 2 wrap_2_index)
+if(ITK_WRAP_unsigned_char AND wrap_2_index GREATER -1)
+  itk_python_add_test(NAME PythonSigmoidImageFilterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonSigmoidImageFilterTest.png
+      DATA{Baseline/PythonSigmoidImageFilterTest.png}
+    COMMAND SigmoidImageFilterTest.py
+      DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonSigmoidImageFilterTest.png
+      10 240 10 170
+    )
+endif()
diff --git a/...rators/Python/Tests/SigmoidImageFilter.py → ...eIntensity/test/SigmoidImageFilterTest.py b/...rators/Python/Tests/SigmoidImageFilter.py → ...eIntensity/test/SigmoidImageFilterTest.py
diff --git a/...ython/Tests/GrayscaleDilateImageFilter.py → ...phology/GrayscaleDilateImageFilterTest.py b/...ython/Tests/GrayscaleDilateImageFilter.py → ...phology/GrayscaleDilateImageFilterTest.py
diff --git a/...Python/Tests/GrayscaleErodeImageFilter.py → ...rphology/GrayscaleErodeImageFilterTest.py b/...Python/Tests/GrayscaleErodeImageFilter.py → ...rphology/GrayscaleErodeImageFilterTest.py
diff --git a/...ges/BoxGrayscaleDilateImageFilter.png.md5 → ...BoxGrayscaleDilateImageFilterTest.png.md5 b/...ges/BoxGrayscaleDilateImageFilter.png.md5 → ...BoxGrayscaleDilateImageFilterTest.png.md5
diff --git a/.../BoxGrayscaleDilateImageFilter.png.sha512 → ...GrayscaleDilateImageFilterTest.png.sha512 b/.../BoxGrayscaleDilateImageFilter.png.sha512 → ...GrayscaleDilateImageFilterTest.png.sha512
diff --git a/...images/GrayscaleDilateImageFilter.png.md5 → ...honGrayscaleDilateImageFilterTest.png.md5 b/...images/GrayscaleDilateImageFilter.png.md5 → ...honGrayscaleDilateImageFilterTest.png.md5
diff --git a/...ges/GrayscaleDilateImageFilter.png.sha512 → ...GrayscaleDilateImageFilterTest.png.sha512 b/...ges/GrayscaleDilateImageFilter.png.sha512 → ...GrayscaleDilateImageFilterTest.png.sha512
diff --git a/.../images/GrayscaleErodeImageFilter.png.md5 → ...thonGrayscaleErodeImageFilterTest.png.md5 b/.../images/GrayscaleErodeImageFilter.png.md5 → ...thonGrayscaleErodeImageFilterTest.png.md5
diff --git a/...ages/GrayscaleErodeImageFilter.png.sha512 → ...nGrayscaleErodeImageFilterTest.png.sha512 b/...ages/GrayscaleErodeImageFilter.png.sha512 → ...nGrayscaleErodeImageFilterTest.png.sha512
diff --git a/...on/Tests/BoxGrayscaleDilateImageFilter.py → ...test/BoxGrayscaleDilateImageFilterTest.py b/...on/Tests/BoxGrayscaleDilateImageFilter.py → ...test/BoxGrayscaleDilateImageFilterTest.py
diff --git a/Modules/Filtering/MathematicalMorphology/test/CMakeLists.txt b/Modules/Filtering/MathematicalMorphology/test/CMakeLists.txt
@@ -520,3 +520,35 @@ itk_add_test(NAME itkRankImageFilterTest10
     --compare DATA{Baseline/itkRankImageFilter10.png}
               ${ITK_TEST_OUTPUT_DIR}/itkRankImageFilter10.png
     itkRankImageFilterTest DATA{${ITK_DATA_ROOT}/Input/cthead1.png} ${ITK_TEST_OUTPUT_DIR}/itkRankImageFilter10.png 10)
+
+# some tests will fail if dim=2 and unsigned short are not wrapped
+list(FIND "${ITK_WRAP_IMAGE_DIMS}" 2 wrap_2_index)
+if(ITK_WRAP_unsigned_char AND wrap_2_index GREATER -1)
+  itk_python_add_test(NAME PythonGrayscaleDilateImageFilterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonGrayscaleDilateImageFilterTest.png
+      DATA{Baseline/PythonGrayscaleDilateImageFilterTest.png}
+    COMMAND GrayscaleDilateImageFilter.py
+      DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonGrayscaleDilateImageFilterTest.png
+      5
+    )
+  itk_python_add_test(NAME PythonGrayscaleErodeImageFilterTest
+    TEST_DRIVER_ARGS
+      --compare ${ITK_TEST_OUTPUT_DIR}/PythonGrayscaleErodeImageFilterTest.png
+      DATA{Baseline/PythonGrayscaleErodeImageFilterTest.png}
+    COMMAND GrayscaleErodeImageFilter.py
+      DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/PythonGrayscaleErodeImageFilterTest.png
+      5
+    )
+  itk_python_add_test(NAME PythonBoxGrayscaleDilateImageFilterTest
+    TEST_DRIVER_ARGS
+      --compare
+      ${ITK_TEST_OUTPUT_DIR}/PythonBoxGrayscaleDilateImageFilterTest.png
+      DATA{Baseline/PythonBoxGrayscaleDilateImageFilterTest.png}
+    COMMAND BoxGrayscaleDilateImageFilterTest.py
+      DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+      ${ITK_TEST_OUTPUT_DIR}/BoxGrayscaleDilateImageFilter.png
+    )
+endif()
diff --git a/...mages/MeanImageFilterFunctionCall.png.md5 → ...onMeanImageFilterFunctionCallTest.png.md5 b/...mages/MeanImageFilterFunctionCall.png.md5 → ...onMeanImageFilterFunctionCallTest.png.md5
diff --git a/...es/MeanImageFilterFunctionCall.png.sha512 → ...eanImageFilterFunctionCallTest.png.sha512 b/...es/MeanImageFilterFunctionCall.png.sha512 → ...eanImageFilterFunctionCallTest.png.sha512
diff --git a/Wrapping/images/MeanImageFilter.png.md5 → ...aseline/PythonMeanImageFilterTest.png.md5 b/Wrapping/images/MeanImageFilter.png.md5 → ...aseline/PythonMeanImageFilterTest.png.md5
diff --git a/Wrapping/images/MeanImageFilter.png.sha512 → ...line/PythonMeanImageFilterTest.png.sha512 b/Wrapping/images/MeanImageFilter.png.sha512 → ...line/PythonMeanImageFilterTest.png.sha512
diff --git a/Wrapping/images/MedianImageFilter.png.md5 → ...eline/PythonMedianImageFilterTest.png.md5 b/Wrapping/images/MedianImageFilter.png.md5 → ...eline/PythonMedianImageFilterTest.png.md5
diff --git a/Wrapping/images/MedianImageFilter.png.sha512 → ...ne/PythonMedianImageFilterTest.png.sha512 b/Wrapping/images/MedianImageFilter.png.sha512 → ...ne/PythonMedianImageFilterTest.png.sha512