diff --git a/Modules/Core/CommandLineParser/test/CMakeLists.txt b/Modules/Core/CommandLineParser/test/CMakeLists.txt
index 30fc431f9d67d0bdcb3877ad7615769a1c0bee92..77a19f2d3cb4cb352ba6f8e948cfb28c1e663e8f 100644
--- a/Modules/Core/CommandLineParser/test/CMakeLists.txt
+++ b/Modules/Core/CommandLineParser/test/CMakeLists.txt
@@ -9,36 +9,36 @@ set(OTBCommandLineParserTests
add_executable(otbCommandLineParserTestDriver ${OTBCommandLineParserTests})
target_link_libraries(otbCommandLineParserTestDriver ${OTBCommandLineParser-Test_LIBRARIES})
otb_module_target_label(otbCommandLineParserTestDriver)
-otb_add_test(NAME coTuCmdLineArgParserDeuxEntiers_ExactNumberArg COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParserDeuxEntiers_ExactNumberArg COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParser
-image image.png -entier 150 -double 12.25 -deuxentiers 78 56 )
-otb_add_test(NAME coTuCmdLineArgParserHelpWithArg COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParserHelpWithArg COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParserHelp
--help -image image.png)
-otb_add_test(NAME coTuCmdLineArgParserHelpWithoutArg COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParserHelpWithoutArg COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParserHelp
--help)
-otb_add_test(NAME coTuCmdLineArgParser_List2Arg COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParser_List2Arg COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParserList
-image image.png -entier 150 -double 12.25 -deuxentiers 78 56 -doubles 1.0 2.0)
-otb_add_test(NAME coTuCmdLineArgParser_List2ArgBis COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParser_List2ArgBis COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParserList
-image image.png -entier 150 -double 12.25 -doubles 1.0 2.0 -deuxentiers 78 56 )
-otb_add_test(NAME coTuCmdLineArgParser_EmptyList COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParser_EmptyList COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParserList
-image image.png -entier 150 -double 12.25 -deuxentiers 78 56 -doubles)
-otb_add_test(NAME coTuCmdLineArgParser_List1Arg COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParser_List1Arg COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParserList
-image image.png -entier 150 -double 12.25 -deuxentiers 78 56 -doubles 1.0 2.5)
-otb_add_test(NAME coTuCmdLineArgParser_List3ArgWithError COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParser_List3ArgWithError COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParserList
-image image.png -entier 150 -double 12.25 -deuxentiers 78 56 -doubles 1.0 2.5 -3.5)
-otb_add_test(NAME coTuCmdLineArgParserDeuxEntier_LessArg COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParserDeuxEntier_LessArg COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParserWithError
-image image.png -entier 150 -double 12.25 -deuxentiers 78 )
-otb_add_test(NAME coTuCmdLineArgParser_MissingObligatoryArg COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParser_MissingObligatoryArg COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParserWithError
-entier 150 -double 12.25 -deuxentiers 78 56 32)
-otb_add_test(NAME coTuCmdLineArgParserDeuxEntier_MoreArg COMMAND otbCommonTestDriver
+otb_add_test(NAME coTuCmdLineArgParserDeuxEntier_MoreArg COMMAND otbCommandLineParserTestDriver
otbTestCommandLineArgumentParserWithError
-image image.png -entier 150 -double 12.25 -deuxentiers 78 56 32)
diff --git a/Modules/Core/Common/test/CMakeLists.txt b/Modules/Core/Common/test/CMakeLists.txt
index dadb47f8d56e49d8c0d9da7229afcc176713ef6b..bb461ac8d111c43884f6508fa32210be5c8366f9 100644
--- a/Modules/Core/Common/test/CMakeLists.txt
+++ b/Modules/Core/Common/test/CMakeLists.txt
@@ -169,22 +169,22 @@ otb_add_test(NAME coTvConfigurationManagerDefault COMMAND otbCommonTestDriver
-otb_add_test(NAME coTvConfigurationManagerEnvVar COMMAND otbTestDriver
+otb_add_test(NAME coTvConfigurationManagerEnvVar COMMAND otbCommonTestDriver
--add-before-env OTB_MAX_RAM_HINT "256"
--add-before-env OTB_DEM_DIRECTORY "/path/to/dem/"
--add-before-env OTB_GEOID_FILE "/path/to/geoid.file"
Execute $<TARGET_FILE:otbCommonTestDriver>
otbConfigurationManagerTest
256 /path/to/dem/ /path/to/geoid.file)
-otb_add_test(NAME coTuStandardFilterWatcherNew COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTuStandardFilterWatcherNew COMMAND otbCommonTestDriver
otbStandardFilterWatcherNew
${INPUTDATA}/qb_RoadExtract.img
)
-otb_add_test(NAME coTuStandardOneLineFilterWatcher COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTuStandardOneLineFilterWatcher COMMAND otbCommonTestDriver
otbStandardOneLineFilterWatcherTest
${INPUTDATA}/qb_RoadExtract.img
)
-otb_add_test(NAME coTvStandardWriterWatcher COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTvStandardWriterWatcher COMMAND otbCommonTestDriver
otbStandardWriterWatcher
${INPUTDATA}/couleurs.tif
${TEMP}/coTvStandardWriterWatcherOutput.tif
diff --git a/Modules/Core/ComplexImage/test/CMakeLists.txt b/Modules/Core/ComplexImage/test/CMakeLists.txt
index 471a1ba7850f7880d57f7940802048a14b49fce1..37bc9f27c6369679ab9fe2024a8b20a7e10dc4cf 100644
--- a/Modules/Core/ComplexImage/test/CMakeLists.txt
+++ b/Modules/Core/ComplexImage/test/CMakeLists.txt
@@ -7,7 +7,7 @@ set(OTBComplexImageTests
add_executable(otbComplexImageTestDriver ${OTBComplexImageTests})
target_link_libraries(otbComplexImageTestDriver ${OTBComplexImage-Test_LIBRARIES})
otb_module_target_label(otbComplexImageTestDriver)
-otb_add_test(NAME bfTvAmplitudePhaseToRGBFunctor COMMAND otbColorMapTestDriver
+otb_add_test(NAME bfTvAmplitudePhaseToRGBFunctor COMMAND otbComplexImageTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvAmplitudePhaseToRGBFunctor.png
${TEMP}/bfTvAmplitudePhaseToRGBFunctor.png
@@ -15,5 +15,5 @@ otb_add_test(NAME bfTvAmplitudePhaseToRGBFunctor COMMAND otbColorMapTestDriver
${INPUTDATA}/RSAT_imagery_HH.tif
${TEMP}/bfTvAmplitudePhaseToRGBFunctor.png
)
-otb_add_test(NAME bfTuAmplitudePhaseToRGBFunctorNew COMMAND otbColorMapTestDriver
+otb_add_test(NAME bfTuAmplitudePhaseToRGBFunctorNew COMMAND otbComplexImageTestDriver
otbAmplitudePhaseToRGBFunctorNew)
diff --git a/Modules/Core/ImageBase/test/CMakeLists.txt b/Modules/Core/ImageBase/test/CMakeLists.txt
index ebd8ff48b4d42eb3eb1a07e6fd6e9f26637464c9..cccb846b35f099b08e13fc9281a303be8891ac16 100644
--- a/Modules/Core/ImageBase/test/CMakeLists.txt
+++ b/Modules/Core/ImageBase/test/CMakeLists.txt
@@ -377,7 +377,7 @@ otb_add_test(NAME feTuImageFunctionAdaptorNew COMMAND otbImageBaseTestDriver
otb_add_test(NAME coTuMultiChannelROINew COMMAND otbImageBaseTestDriver
otbMultiChannelExtractROINew)
-otb_add_test(NAME feTvMetaImageFunction COMMAND otbMomentsTestDriver
+otb_add_test(NAME feTvMetaImageFunction COMMAND otbImageBaseTestDriver
--compare-ascii ${EPSILON_8}
${BASELINE_FILES}/feTvMetaImageFunction.txt
${TEMP}/feTvMetaImageFunction.txt
@@ -386,6 +386,6 @@ otb_add_test(NAME feTvMetaImageFunction COMMAND otbMomentsTestDriver
${TEMP}/feTvMetaImageFunction.txt
451846.014047961 5412466.57452216
)
-otb_add_test(NAME feTuMetaImageFunctionNew COMMAND otbMomentsTestDriver
+otb_add_test(NAME feTuMetaImageFunctionNew COMMAND otbImageBaseTestDriver
otbMetaImageFunctionNew
)
diff --git a/Modules/Core/Interpolation/test/CMakeLists.txt b/Modules/Core/Interpolation/test/CMakeLists.txt
index c8b7af9031d9426089dd602a29394188f379bb89..c5eb5e016b7ba5765a34e1da39d177a1c18217a7 100644
--- a/Modules/Core/Interpolation/test/CMakeLists.txt
+++ b/Modules/Core/Interpolation/test/CMakeLists.txt
@@ -209,7 +209,7 @@ otb_add_test(NAME bfTuStreamingTraitsImage COMMAND otbInterpolationTestDriver
otbStreamingTraitsImage
)
-otb_add_test(NAME bfTvBCOInterpolateImageFunctionVectorImageTest COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvBCOInterpolateImageFunctionVectorImageTest COMMAND otbInterpolationTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvBCOInterpolateImageFunctionVectorImageTest.tif
${TEMP}/bfTvBCOInterpolateImageFunctionVectorImageTest.tif
@@ -219,7 +219,7 @@ otb_add_test(NAME bfTvBCOInterpolateImageFunctionVectorImageTest COMMAND otbImag
4 # radius
-0.5 # optimised bicubic
)
-otb_add_test(NAME bfTvBCOInterpolateImageFunctionTest COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvBCOInterpolateImageFunctionTest COMMAND otbInterpolationTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvBCOInterpolateImageFunctionTest.tif
${TEMP}/bfTvBCOInterpolateImageFunctionTest.tif
@@ -229,10 +229,10 @@ otb_add_test(NAME bfTvBCOInterpolateImageFunctionTest COMMAND otbImageManipulati
3 # radius
-0.5 # optimised bicubic
)
-otb_add_test(NAME bfTuBCOInterpolateImageFunctionNew COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTuBCOInterpolateImageFunctionNew COMMAND otbInterpolationTestDriver
otbBCOInterpolateImageFunctionNew
)
-otb_add_test(NAME bfTvBCOInterpolateImageFunctionOverVectorImage COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvBCOInterpolateImageFunctionOverVectorImage COMMAND otbInterpolationTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfTvBCOInterpolateImageFunctionOverVectorImageOutput.txt
${TEMP}/bfTvBCOInterpolateImageFunctionOverVectorImageOutput.txt
@@ -250,9 +250,9 @@ otb_add_test(NAME bfTvBCOInterpolateImageFunctionOverVectorImage COMMAND otbImag
127.255 128.73
-1 -1
)
-otb_add_test(NAME bfTuBCOInterpolateImageFunctionOverVectorImageNew COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTuBCOInterpolateImageFunctionOverVectorImageNew COMMAND otbInterpolationTestDriver
otbBCOInterpolateImageFunctionOverVectorImageNew)
-otb_add_test(NAME bfTvBCOInterpolateImageFunction2 COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvBCOInterpolateImageFunction2 COMMAND otbInterpolationTestDriver
otbBCOInterpolateImageFunction2
3 # radius
-0.5 # optimised bicubic
@@ -265,7 +265,7 @@ otb_add_test(NAME bfTvBCOInterpolateImageFunction2 COMMAND otbImageManipulationT
127.255 128.73
-1 -1
)
-otb_add_test(NAME bfTvBCOInterpolateImageFunction COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvBCOInterpolateImageFunction COMMAND otbInterpolationTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfTvBCOInterpolateImageFunctionOutput.txt
${TEMP}/bfTvBCOInterpolateImageFunctionOutput.txt
@@ -283,7 +283,7 @@ otb_add_test(NAME bfTvBCOInterpolateImageFunction COMMAND otbImageManipulationTe
127.255 128.73
-1 -1
)
-otb_add_test(NAME bfTvProlateInterpolateImageFunction COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvProlateInterpolateImageFunction COMMAND otbInterpolationTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfProlateInterpolateImageFunctionOutput.txt
${TEMP}/bfProlateInterpolateImageFunctionOutput.txt
@@ -303,7 +303,7 @@ otb_add_test(NAME bfTvProlateInterpolateImageFunction COMMAND otbImageManipulati
127.255 128.73
-1 -1
)
-otb_add_test(NAME bfTvProlateValidationTest COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvProlateValidationTest COMMAND otbInterpolationTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvProlateValidationTest.tif
${TEMP}/bfTvProlateValidationTest.tif
diff --git a/Modules/Core/LabelMap/test/CMakeLists.txt b/Modules/Core/LabelMap/test/CMakeLists.txt
index d78f743e3cf4d6123099f61c4c89a6ab0cf99c48..6e18a99eef94d0341027a597b0d00dc3bec480a5 100644
--- a/Modules/Core/LabelMap/test/CMakeLists.txt
+++ b/Modules/Core/LabelMap/test/CMakeLists.txt
@@ -74,34 +74,34 @@ otb_add_test(NAME obTuLabelMapSourceNew COMMAND otbLabelMapTestDriver
otb_add_test(NAME obTuLabelMapToAttributeImageFilterNew COMMAND otbLabelMapTestDriver
otbLabelMapToAttributeImageFilterNew)
-otb_add_test(NAME obTvImageToLabelMapWithAttributesFilter COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTvImageToLabelMapWithAttributesFilter COMMAND otbLabelMapTestDriver
otbImageToLabelMapWithAttributesFilter
${INPUTDATA}/maur.tif
${INPUTDATA}/maur_labelled.tif)
-otb_add_test(NAME obTuImageToLabelMapWithAttributesFilterNew COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTuImageToLabelMapWithAttributesFilterNew COMMAND otbLabelMapTestDriver
otbImageToLabelMapWithAttributesFilterNew)
-otb_add_test(NAME obTvKMeansAttributesLabelMapFilter COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTvKMeansAttributesLabelMapFilter COMMAND otbLabelMapTestDriver
otbKMeansAttributesLabelMapFilter
${INPUTDATA}/maur.tif
${INPUTDATA}/maur_labelled.tif
${TEMP}/obTvKMeansAttributesLabelMapFilter.txt)
-otb_add_test(NAME obTuKMeansAttributesLabelMapFilterNew COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTuKMeansAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
otbKMeansAttributesLabelMapFilterNew)
-otb_add_test(NAME obTvLabelMapToSampleListFilter COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTvLabelMapToSampleListFilter COMMAND otbLabelMapTestDriver
otbLabelMapToSampleListFilter
${OTB_DATA_ROOT}/Input/rcc8_mire1.png
SHAPE::Flusser01 SHAPE::Flusser02 SHAPE::Flusser03 SHAPE::Flusser04
SHAPE::Flusser05 SHAPE::Flusser06 SHAPE::Flusser07 SHAPE::Flusser08
SHAPE::Flusser09 SHAPE::Flusser10 SHAPE::Flusser11)
-otb_add_test(NAME obTvLabelMapWithClassLabelToLabeledSampleListFilter COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTvLabelMapWithClassLabelToLabeledSampleListFilter COMMAND otbLabelMapTestDriver
otbLabelMapWithClassLabelToLabeledSampleListFilter
${OTB_DATA_ROOT}/Input/rcc8_mire1.png
SHAPE::Flusser01 SHAPE::Flusser02 SHAPE::Flusser03 SHAPE::Flusser04
SHAPE::Flusser05 SHAPE::Flusser06 SHAPE::Flusser07 SHAPE::Flusser08
SHAPE::Flusser09 SHAPE::Flusser10 SHAPE::Flusser11)
-otb_add_test(NAME obTuMinMaxAttributesLabelMapFilterNew COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTuMinMaxAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
otbMinMaxAttributesLabelMapFilterNew)
-otb_add_test(NAME obTvMinMaxAttributesLabelMapFilter COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTvMinMaxAttributesLabelMapFilter COMMAND otbLabelMapTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/obTvMinMaxAttributesLabelMapFilter.txt
${TEMP}/obTvMinMaxAttributesLabelMapFilter.txt
@@ -109,9 +109,9 @@ otb_add_test(NAME obTvMinMaxAttributesLabelMapFilter COMMAND otbMomentsTestDrive
${INPUTDATA}/maur.tif
${INPUTDATA}/maur_labelled.tif
${TEMP}/obTvMinMaxAttributesLabelMapFilter.txt)
-otb_add_test(NAME obTuNormalizeAttributesLabelMapFilterNew COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTuNormalizeAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
otbNormalizeAttributesLabelMapFilterNew)
-otb_add_test(NAME obTvNormalizeAttributesLabelMapFilter COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTvNormalizeAttributesLabelMapFilter COMMAND otbLabelMapTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/obTvNormalizeAttributesLabelMapFilter.txt
${TEMP}/obTvNormalizeAttributesLabelMapFilter.txt
@@ -119,11 +119,11 @@ otb_add_test(NAME obTvNormalizeAttributesLabelMapFilter COMMAND otbMomentsTestDr
${INPUTDATA}/maur.tif
${INPUTDATA}/maur_labelled.tif
${TEMP}/obTvNormalizeAttributesLabelMapFilter.txt)
-otb_add_test(NAME obTuShapeAttributesLabelMapFilterNew COMMAND otbMomentsTestDriver
+otb_add_test(NAME obTuShapeAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
otbShapeAttributesLabelMapFilterNew)
-otb_add_test(NAME obTuBandsStatisticsAttributesLabelMapFilterNew COMMAND otbStatisticsTestDriver
+otb_add_test(NAME obTuBandsStatisticsAttributesLabelMapFilterNew COMMAND otbLabelMapTestDriver
otbBandsStatisticsAttributesLabelMapFilterNew)
-otb_add_test(NAME obTvBandsStatisticsAttributesLabelMapFilter COMMAND otbStatisticsTestDriver
+otb_add_test(NAME obTvBandsStatisticsAttributesLabelMapFilter COMMAND otbLabelMapTestDriver
otbBandsStatisticsAttributesLabelMapFilter
${INPUTDATA}/maur.tif
${INPUTDATA}/maur_labelled.tif
diff --git a/Modules/Core/ObjectList/test/CMakeLists.txt b/Modules/Core/ObjectList/test/CMakeLists.txt
index 46d4aa36b7a343e4c7497dd578567a427dd5be08..520796e405f323923f65d003ef7d879792ee47a1 100644
--- a/Modules/Core/ObjectList/test/CMakeLists.txt
+++ b/Modules/Core/ObjectList/test/CMakeLists.txt
@@ -22,28 +22,28 @@ set(OTBObjectListTests
add_executable(otbObjectListTestDriver ${OTBObjectListTests})
target_link_libraries(otbObjectListTestDriver ${OTBObjectList-Test_LIBRARIES})
otb_module_target_label(otbObjectListTestDriver)
-otb_add_test(NAME coTvObjectList COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTvObjectList COMMAND otbObjectListTestDriver
otbObjectList
${INPUTDATA}/couleurs.jpg
${INPUTDATA}/poupees.png
${INPUTDATA}/couleurs_extrait.png
)
-otb_add_test(NAME coTuObjectListNew COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTuObjectListNew COMMAND otbObjectListTestDriver
otbObjectListNew)
-otb_add_test(NAME coTvImageList COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTvImageList COMMAND otbObjectListTestDriver
--compare-image ${NOTOL} ${INPUTDATA}/amst.png
${TEMP}/amst.png
otbImageList
${INPUTDATA}/amst.png
${TEMP}/amst.png
)
-otb_add_test(NAME coTuImageListNew COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTuImageListNew COMMAND otbObjectListTestDriver
otbImageListNew)
-otb_add_test(NAME coTuImageListSourceNew COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTuImageListSourceNew COMMAND otbObjectListTestDriver
otbImageListSourceNew)
-otb_add_test(NAME coTuImageListToImageFilterNew COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTuImageListToImageFilterNew COMMAND otbObjectListTestDriver
otbImageListToImageFilterNew)
-otb_add_test(NAME bfTvImageListToImageListApplyFilter COMMAND otbImageBaseTestDriver
+otb_add_test(NAME bfTvImageListToImageListApplyFilter COMMAND otbObjectListTestDriver
--compare-n-images ${EPSILON_7} 3
${BASELINE}/bfTvImageListToImageListApplyFilterBand1.png
${TEMP}/bfTvImageListToImageListApplyFilterBand1.png
@@ -59,17 +59,17 @@ otb_add_test(NAME bfTvImageListToImageListApplyFilter COMMAND otbImageBaseTestDr
${TEMP}/bfTvImageListToImageListApplyFilterBand2.png
${TEMP}/bfTvImageListToImageListApplyFilterBand3.png
)
-otb_add_test(NAME bfTuImageListToImageListApplyFilterNew COMMAND otbImageBaseTestDriver
+otb_add_test(NAME bfTuImageListToImageListApplyFilterNew COMMAND otbObjectListTestDriver
otbImageListToImageListApplyFilterNew)
-otb_add_test(NAME coTvImageListToImageListFilterNew COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTvImageListToImageListFilterNew COMMAND otbObjectListTestDriver
otbImageListToImageListFilterNew)
-otb_add_test(NAME coTvImageListToVectorImageFilter2 COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTvImageListToVectorImageFilter2 COMMAND otbObjectListTestDriver
otbImageListToVectorImageFilter2
${INPUTDATA}/poupees_c1.hdr
${INPUTDATA}/poupees_c2.hdr
${INPUTDATA}/poupees_c3.hdr
)
-otb_add_test(NAME coTvImageListToVectorImageFilter COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTvImageListToVectorImageFilter COMMAND otbObjectListTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvImageListToVectorImageFilter.png
${TEMP}/coTvImageListToVectorImageFilter.png
@@ -79,16 +79,16 @@ otb_add_test(NAME coTvImageListToVectorImageFilter COMMAND otbImageBaseTestDrive
${INPUTDATA}/poupees_c3.hdr
${TEMP}/coTvImageListToVectorImageFilter.png
)
-otb_add_test(NAME coTuImageListToVectorImageFilterNew COMMAND otbImageBaseTestDriver
+otb_add_test(NAME coTuImageListToVectorImageFilterNew COMMAND otbObjectListTestDriver
otbImageListToVectorImageFilterNew)
-otb_add_test(NAME coTvObjectListTestNotValid COMMAND otbVectorDataBaseTestDriver
+otb_add_test(NAME coTvObjectListTestNotValid COMMAND otbObjectListTestDriver
otbObjectList2
)
-otb_add_test(NAME coTuObjectListToObjectListFilterNew COMMAND otbVectorDataBaseTestDriver
+otb_add_test(NAME coTuObjectListToObjectListFilterNew COMMAND otbObjectListTestDriver
otbObjectListToObjectListFilterNew)
-otb_add_test(NAME coTuImageToImageListFilterNew COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME coTuImageToImageListFilterNew COMMAND otbObjectListTestDriver
otbImageToImageListFilterNew)
-otb_add_test(NAME bfTvVectorImageToImageListFilter COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvVectorImageToImageListFilter COMMAND otbObjectListTestDriver
--compare-n-images ${EPSILON_7} 3
${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
${TEMP}/bfTvVectorImageToImageListFilterBand1.png
@@ -102,7 +102,7 @@ otb_add_test(NAME bfTvVectorImageToImageListFilter COMMAND otbImageManipulationT
${TEMP}/bfTvVectorImageToImageListFilterBand2.png
${TEMP}/bfTvVectorImageToImageListFilterBand3.png
)
-otb_add_test(NAME bfTvVectorImageToImageListFilterIt COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvVectorImageToImageListFilterIt COMMAND otbObjectListTestDriver
--compare-n-images ${EPSILON_7} 3
${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
${TEMP}/bfTvVectorImageToImageListFilterItBand1.png
@@ -115,7 +115,7 @@ otb_add_test(NAME bfTvVectorImageToImageListFilterIt COMMAND otbImageManipulatio
${TEMP}/bfTvVectorImageToImageListFilterIt
png
)
-otb_add_test(NAME bfTvVectorImageToImageListFilterIt2 COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvVectorImageToImageListFilterIt2 COMMAND otbObjectListTestDriver
--compare-n-images ${EPSILON_7} 3
${BASELINE}/bfTvVectorImageToImageListFilterBand1.png
${TEMP}/bfTvVectorImageToImageListFilterIt2Band1.tif
@@ -128,5 +128,5 @@ otb_add_test(NAME bfTvVectorImageToImageListFilterIt2 COMMAND otbImageManipulati
${TEMP}/bfTvVectorImageToImageListFilterIt2
tif
)
-otb_add_test(NAME bfTuVectorImageToImageListFilterNew COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTuVectorImageToImageListFilterNew COMMAND otbObjectListTestDriver
otbVectorImageToImageListFilterNew)
diff --git a/Modules/Core/Streaming/test/CMakeLists.txt b/Modules/Core/Streaming/test/CMakeLists.txt
index 3b88edc8dae8a639214f9a712a3803b77ec22d94..96a46d0c7bef01830cf04913fb4bf2b74e821d0f 100644
--- a/Modules/Core/Streaming/test/CMakeLists.txt
+++ b/Modules/Core/Streaming/test/CMakeLists.txt
@@ -56,7 +56,7 @@ otb_add_test(NAME coTvTileDimensionTiledStreamingManager COMMAND otbStreamingTes
${TEMP}/coTvTileDimensionTiledStreamingManager.txt
)
-otb_add_test(NAME coTvPipelineMemoryPrintCalculator COMMAND otbStatisticsTestDriver
+otb_add_test(NAME coTvPipelineMemoryPrintCalculator COMMAND otbStreamingTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/coTvPipelineMemoryPrintCalculatorOutput.txt
${TEMP}/coTvPipelineMemoryPrintCalculatorOutput.txt
@@ -64,6 +64,6 @@ otb_add_test(NAME coTvPipelineMemoryPrintCalculator COMMAND otbStatisticsTestDri
${INPUTDATA}/qb_RoadExtract.img
${TEMP}/coTvPipelineMemoryPrintCalculatorOutput.txt
)
-otb_add_test(NAME coTuPipelineMemoryPrintCalculatorNew COMMAND otbStatisticsTestDriver
+otb_add_test(NAME coTuPipelineMemoryPrintCalculatorNew COMMAND otbStreamingTestDriver
otbPipelineMemoryPrintCalculatorNew
)
diff --git a/Modules/Core/Transform/test/CMakeLists.txt b/Modules/Core/Transform/test/CMakeLists.txt
index 7e341f4dcf67f2b98acdc6ed4ec8ffdf2be68ff6..8dc22c91809c50af15dd4a950df2c71715e957f3 100644
--- a/Modules/Core/Transform/test/CMakeLists.txt
+++ b/Modules/Core/Transform/test/CMakeLists.txt
@@ -394,7 +394,7 @@ foreach( file ${SARSENSORMODEL_TYPES})
10 10
)
endforeach()
-otb_add_test(NAME bfTvInverseLogPolarTransform COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvInverseLogPolarTransform COMMAND otbTransformTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfInverseLogPolarTransformResults.txt
${TEMP}/bfInverseLogPolarTransformResults.txt
@@ -403,21 +403,21 @@ otb_add_test(NAME bfTvInverseLogPolarTransform COMMAND otbImageManipulationTestD
${TEMP}/bfInverseLogPolarTransformResults.txt
6 0 0 10 20 45 60 3.14 3.14 1 0 0 1
)
-otb_add_test(NAME bfTuInverseLogPolarTransformNew COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTuInverseLogPolarTransformNew COMMAND otbTransformTestDriver
otbInverseLogPolarTransformNew)
-otb_add_test(NAME bfTvInverseLogPolarTransformResample COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvInverseLogPolarTransformResample COMMAND otbTransformTestDriver
--compare-image ${NOTOL} ${BASELINE}/bfInverseLogPolarTransformResampleOutput.hdr
${TEMP}/bfInverseLogPolarTransformResampleOutput.hdr
otbInverseLogPolarTransformResample
${BASELINE}/bfLogPolarTransformResampleOutput.hdr
${TEMP}/bfInverseLogPolarTransformResampleOutput.hdr
)
-otb_add_test(NAME bfTvStreamingResampleImageFilterWithAffineTransform COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvStreamingResampleImageFilterWithAffineTransform COMMAND otbTransformTestDriver
otbStreamingResampleImageFilterWithAffineTransform
LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF}
500
${TEMP}/bfTvotbStreamingResampledImageWithAffineTransform.tif
)
-otb_add_test(NAME bfTuStreamingResampleImageFilterWithAffineTransformNew COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTuStreamingResampleImageFilterWithAffineTransformNew COMMAND otbTransformTestDriver
otbStreamingResampleImageFilterWithAffineTransform
)
diff --git a/Modules/Detection/RoadExtraction/test/CMakeLists.txt b/Modules/Detection/RoadExtraction/test/CMakeLists.txt
index 4d2e643f0322f2e2c133e68a7f34224ec042d634..f5f3ebd32fcaa21cd415e3fed8d69dd30cbc10c8 100644
--- a/Modules/Detection/RoadExtraction/test/CMakeLists.txt
+++ b/Modules/Detection/RoadExtraction/test/CMakeLists.txt
@@ -229,5 +229,5 @@ otb_add_test(NAME feTvDrawPathTestAlign COMMAND otbRoadExtractionTestDriver
${INPUTDATA}/DeuxTraits.png
${TEMP}/feDrawPathAlignDeuxTraits.png)
-otb_add_test(NAME feTuBreakAngularPathListFilterNew COMMAND otbPathTestDriver
+otb_add_test(NAME feTuBreakAngularPathListFilterNew COMMAND otbRoadExtractionTestDriver
otbBreakAngularPathListFilterNew)
diff --git a/Modules/Feature/Edge/test/CMakeLists.txt b/Modules/Feature/Edge/test/CMakeLists.txt
index 48bde4a400aed0124ee1a2785d801c4a92136123..e647bf8bcca134584a64c51a9c6deea9d01c3750 100644
--- a/Modules/Feature/Edge/test/CMakeLists.txt
+++ b/Modules/Feature/Edge/test/CMakeLists.txt
@@ -328,12 +328,12 @@ otb_add_test(NAME feTvLineCorrelationLinear COMMAND otbEdgeTestDriver
otb_add_test(NAME feTuLineDetectorBaseNew COMMAND otbEdgeTestDriver
otbLineDetectorBaseNew)
-otb_add_test(NAME feTvFillGapsFilter COMMAND otbSpatialObjectsTestDriver
+otb_add_test(NAME feTvFillGapsFilter COMMAND otbEdgeTestDriver
--compare-image ${EPSILON_8}
${BASELINE}/feTvFillGapfilter.png
${TEMP}/feTvFillGapfilter.png
otbFillGapsFilter
${INPUTDATA}/ImageLine.bsq.hdr
${TEMP}/feTvFillGapfilter.png)
-otb_add_test(NAME feTuFillGapsFilterNew COMMAND otbSpatialObjectsTestDriver
+otb_add_test(NAME feTuFillGapsFilterNew COMMAND otbEdgeTestDriver
otbFillGapsFilterNew)
diff --git a/Modules/Feature/SeamCarving/test/CMakeLists.txt b/Modules/Feature/SeamCarving/test/CMakeLists.txt
index ce75bf4a1da6c2ece70deef90716f24493008226..51be0087d18e0e5adf948fbf39da39eaa6d6771a 100644
--- a/Modules/Feature/SeamCarving/test/CMakeLists.txt
+++ b/Modules/Feature/SeamCarving/test/CMakeLists.txt
@@ -19,5 +19,5 @@ otb_add_test(NAME feTuRemoveCarvingPathFilterNew COMMAND otbSeamCarvingTestDrive
otb_add_test(NAME feTuImageToCarvingPathFilterNew COMMAND otbSeamCarvingTestDriver
otbImageToCarvingPathFilterNew)
-otb_add_test(NAME feTuAddCarvingPathFilterNew COMMAND otbPathTestDriver
+otb_add_test(NAME feTuAddCarvingPathFilterNew COMMAND otbSeamCarvingTestDriver
otbAddCarvingPathFilterNew)
diff --git a/Modules/Filtering/Convolution/test/CMakeLists.txt b/Modules/Filtering/Convolution/test/CMakeLists.txt
index f09d6ec65b54c50450fe15c692f0dee00e8c4eb4..b223820c6689a9d44e85487cacd260a491c75a23 100644
--- a/Modules/Filtering/Convolution/test/CMakeLists.txt
+++ b/Modules/Filtering/Convolution/test/CMakeLists.txt
@@ -41,7 +41,7 @@ otb_add_test(NAME bfTvOverlapSaveConvolutionImageFilter COMMAND otbConvolutionTe
${TEMP}/bfTvOverlapSaveConvolutionImageFilter.tif
)
-otb_add_test(NAME bfTvCompareOverlapSaveAndClassicalConvolutionWithGaborFilter COMMAND otbEdgeTestDriver
+otb_add_test(NAME bfTvCompareOverlapSaveAndClassicalConvolutionWithGaborFilter COMMAND otbConvolutionTestDriver
--compare-image ${EPSILON_7}
${TEMP}/bfTvCompareConvolutionOutput.tif
${TEMP}/bfTvCompareOSConvolutionoutput.tif
@@ -55,7 +55,7 @@ otb_add_test(NAME bfTvCompareOverlapSaveAndClassicalConvolutionWithGaborFilter C
0.0125 0.0125 #u0 v0
0
)
-otb_add_test(NAME bfTvGaborFilterGenerator COMMAND otbEdgeTestDriver
+otb_add_test(NAME bfTvGaborFilterGenerator COMMAND otbConvolutionTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfGaborFilterGeneratorTest.tif
${TEMP}/bfGaborFilterGeneratorTest.tif
@@ -67,6 +67,6 @@ otb_add_test(NAME bfTvGaborFilterGenerator COMMAND otbEdgeTestDriver
0.0125 0.0125 #u0 v0
0
)
-otb_add_test(NAME bfTuGaborFilterGeneratorNew COMMAND otbEdgeTestDriver
+otb_add_test(NAME bfTuGaborFilterGeneratorNew COMMAND otbConvolutionTestDriver
otbGaborFilterGeneratorNew
)
diff --git a/Modules/Filtering/DEM/test/CMakeLists.txt b/Modules/Filtering/DEM/test/CMakeLists.txt
index 2c3d12f1cd65927f6477934c693fbe9fb8793691..80cd2fdd46da462615cfb339ef9cb034090ab395 100644
--- a/Modules/Filtering/DEM/test/CMakeLists.txt
+++ b/Modules/Filtering/DEM/test/CMakeLists.txt
@@ -10,7 +10,7 @@ set(OTBDEMTests
add_executable(otbDEMTestDriver ${OTBDEMTests})
target_link_libraries(otbDEMTestDriver ${OTBDEM-Test_LIBRARIES})
otb_module_target_label(otbDEMTestDriver)
-otb_add_test(NAME ioTvDEMToImageGeneratorFromImageTest_SensorModel COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME ioTvDEMToImageGeneratorFromImageTest_SensorModel COMMAND otbDEMTestDriver
--compare-n-images ${EPSILON_5} 2
${BASELINE}/ioTvDEMToImageGeneratorFromImageTest_SM.tif
${TEMP}/ioTvDEMToImageGeneratorFromImage_Extract_DEM.tif
@@ -23,7 +23,7 @@ otb_add_test(NAME ioTvDEMToImageGeneratorFromImageTest_SensorModel COMMAND otbIm
${TEMP}/ioTvDEMToImageGeneratorFromImage_DEM_Extract.tif
2600 4300 512 128
)
-otb_add_test(NAME ioTvDEMToImageGeneratorFromImageTest COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME ioTvDEMToImageGeneratorFromImageTest COMMAND otbDEMTestDriver
--compare-image ${EPSILON_5}
${BASELINE}/ioTvDEMToImageGeneratorFromImageTest.tif
${TEMP}/ioTvDEMToImageGeneratorFromImage.tif
@@ -32,7 +32,7 @@ otb_add_test(NAME ioTvDEMToImageGeneratorFromImageTest COMMAND otbImageManipulat
${INPUTDATA}/DEM/srtm_directory
${TEMP}/ioTvDEMToImageGeneratorFromImage.tif
)
-otb_add_test(NAME ioTvDEMToImageGeneratorFromImageTest2 COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME ioTvDEMToImageGeneratorFromImageTest2 COMMAND otbDEMTestDriver
--compare-n-images ${EPSILON_5} 2
${BASELINE}/ioTvDEMToImageGeneratorFromImageTest_Ortho.tif
${TEMP}/ioTvDEMToImageGeneratorFromImage_Extract_DEM2.tif
@@ -45,8 +45,8 @@ otb_add_test(NAME ioTvDEMToImageGeneratorFromImageTest2 COMMAND otbImageManipula
${TEMP}/ioTvDEMToImageGeneratorFromImage_DEM_Extract2.tif
10 15 16 64
)
-otb_add_test(NAME ioTuDEMToImageGeneratorNew COMMAND otbImageManipulationTestDriver otbDEMToImageGeneratorNew )
-otb_add_test(NAME ioTvDEMToImageGeneratorTest2 COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME ioTuDEMToImageGeneratorNew COMMAND otbDEMTestDriver otbDEMToImageGeneratorNew )
+otb_add_test(NAME ioTvDEMToImageGeneratorTest2 COMMAND otbDEMTestDriver
--compare-image ${EPSILON_5} ${BASELINE}/ioTvDEMToImageGenerator2.tif
${TEMP}/ioTvDEMToImageGenerator2.tif
otbDEMToImageGeneratorTest
@@ -54,7 +54,7 @@ otb_add_test(NAME ioTvDEMToImageGeneratorTest2 COMMAND otbImageManipulationTestD
${TEMP}/ioTvDEMToImageGenerator2.tif
-1.8 52 232 422 0.02 -0.018
)
-otb_add_test(NAME ioTvDEMToImageGeneratorTest1 COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME ioTvDEMToImageGeneratorTest1 COMMAND otbDEMTestDriver
--compare-image ${EPSILON_5}
${BASELINE}/ioTvDEMToImageGenerator1.tif
${TEMP}/ioTvDEMToImageGenerator1.tif
@@ -63,7 +63,7 @@ otb_add_test(NAME ioTvDEMToImageGeneratorTest1 COMMAND otbImageManipulationTestD
${TEMP}/ioTvDEMToImageGenerator1.tif
1.437371 43.559045 512 128 0.000032 -0.000024
)
-otb_add_test(NAME ioTvDEMToImageGeneratorTest COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME ioTvDEMToImageGeneratorTest COMMAND otbDEMTestDriver
--compare-image ${EPSILON_5} ${BASELINE}/ioTvDEMToImageGenerator.tif
${TEMP}/ioTvDEMToImageGenerator.tif
otbDEMToImageGeneratorTest
@@ -76,7 +76,7 @@ otb_add_test(NAME ioTvDEMToImageGeneratorTest COMMAND otbImageManipulationTestDr
0.002
-0.002
)
-otb_add_test(NAME raTvDEMCaracteristicsExtractor COMMAND otbStatisticsTestDriver
+otb_add_test(NAME raTvDEMCaracteristicsExtractor COMMAND otbDEMTestDriver
--compare-n-images ${EPSILON_12} 4
${BASELINE}/raTvDEMCaracteristicsExtractorSlop.tif
${TEMP}/raTvDEMCaracteristicsExtractorSlop.tif
@@ -97,6 +97,6 @@ otb_add_test(NAME raTvDEMCaracteristicsExtractor COMMAND otbStatisticsTestDriver
${TEMP}/raTvDEMCaracteristicsExtractorIncidence.tif
${TEMP}/raTvDEMCaracteristicsExtractorExitance.tif
)
-otb_add_test(NAME raTuDEMCaracteristicsExtractorNew COMMAND otbStatisticsTestDriver
+otb_add_test(NAME raTuDEMCaracteristicsExtractorNew COMMAND otbDEMTestDriver
otbDEMCaracteristicsExtractorNew
)
diff --git a/Modules/Filtering/DimensionalityReduction/test/CMakeLists.txt b/Modules/Filtering/DimensionalityReduction/test/CMakeLists.txt
index b7e4a9715ba3a4c1e41243f2c6e28c568febcf1a..7d846c04cab432c4ce4f0dffe3f19d9e20d5a045 100644
--- a/Modules/Filtering/DimensionalityReduction/test/CMakeLists.txt
+++ b/Modules/Filtering/DimensionalityReduction/test/CMakeLists.txt
@@ -387,9 +387,9 @@ otb_add_test(NAME bfTuSparseWvltToAngleMapperListFilterNew COMMAND otbDimensiona
otb_add_test(NAME bfTuAngularProjectionImageFilterNew COMMAND otbDimensionalityReductionTestDriver
otbAngularProjectionImageFilterNew)
-otb_add_test(NAME bfTuLocalActivityVectorImageFilterNew COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTuLocalActivityVectorImageFilterNew COMMAND otbDimensionalityReductionTestDriver
otbLocalActivityVectorImageFilterNewTest)
-otb_add_test(NAME bfTvLocalActivityVectorImageFilter COMMAND otbImageManipulationTestDriver
+otb_add_test(NAME bfTvLocalActivityVectorImageFilter COMMAND otbDimensionalityReductionTestDriver
--compare-image ${EPSILON_7}
${BASELINE}/bfTvLocalActivityVectorImageFilter.tif
${TEMP}/bfTvLocalActivityVectorImageFilter.tif
diff --git a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
index 0ce55f662864a22ea33ce166aed5ae87c2eb7e2d..0eb9ea1a7e7324705e11663b449c341e0b64835a 100644
--- a/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
+++ b/Modules/Filtering/ImageManipulation/test/CMakeLists.txt
@@ -656,7 +656,7 @@ otb_add_test(NAME bfTvFunctionWithNeighborhoodToImageFilterNew COMMAND otbImageM
otbFunctionWithNeighborhoodToImageFilterNew
)
-otb_add_test(NAME bfTvEuclideanDistanceMetricWithMissingValue COMMAND otbImageBaseTestDriver
+otb_add_test(NAME bfTvEuclideanDistanceMetricWithMissingValue COMMAND otbImageManipulationTestDriver
otbEuclideanDistanceMetricWithMissingValue)
-otb_add_test(NAME bfTuEuclideanDistanceMetricWithMissingValueNew COMMAND otbImageBaseTestDriver
+otb_add_test(NAME bfTuEuclideanDistanceMetricWithMissingValueNew COMMAND otbImageManipulationTestDriver
otbEuclideanDistanceMetricWithMissingValueNew)
diff --git a/Modules/Filtering/MathParserX/test/CMakeLists.txt b/Modules/Filtering/MathParserX/test/CMakeLists.txt
index e594e0e5785b8988b3f395a0e55fce2f0167bba6..156416008e14af2c6e209eb891000b6abae1f965 100644
--- a/Modules/Filtering/MathParserX/test/CMakeLists.txt
+++ b/Modules/Filtering/MathParserX/test/CMakeLists.txt
@@ -7,27 +7,27 @@ set(OTBMathParserXTests
add_executable(otbMathParserXTestDriver ${OTBMathParserXTests})
target_link_libraries(otbMathParserXTestDriver ${OTBMathParserX-Test_LIBRARIES})
otb_module_target_label(otbMathParserXTestDriver)
-otb_add_test(NAME coTvParserX COMMAND otbMathParserTestDriver
+otb_add_test(NAME coTvParserX COMMAND otbMathParserXTestDriver
otbParserXTest
)
-otb_add_test(NAME coTuParserX COMMAND otbMathParserTestDriver
+otb_add_test(NAME coTuParserX COMMAND otbMathParserXTestDriver
otbParserXTestNew
)
-otb_add_test(NAME bfTuBandMathXImageFilterNew COMMAND otbMathParserTestDriver
+otb_add_test(NAME bfTuBandMathXImageFilterNew COMMAND otbMathParserXTestDriver
otbBandMathXImageFilterNew)
-otb_add_test(NAME bfTvBandMathXImageFilterConv COMMAND otbMathParserTestDriver
+otb_add_test(NAME bfTvBandMathXImageFilterConv COMMAND otbMathParserXTestDriver
otbBandMathXImageFilterConv
${BASELINE_FILES}/bfTvExportBandMathX.txt
${TEMP}/bfTvExportBandMathXOut.txt
)
-otb_add_test(NAME bfTvBandMathXImageFilter COMMAND otbMathParserTestDriver
+otb_add_test(NAME bfTvBandMathXImageFilter COMMAND otbMathParserXTestDriver
otbBandMathXImageFilter)
-otb_add_test(NAME bfTvBandMathXImageFilterWithIdx COMMAND otbMathParserTestDriver
+otb_add_test(NAME bfTvBandMathXImageFilterWithIdx COMMAND otbMathParserXTestDriver
otbBandMathXImageFilterWithIdx
${TEMP}/bfTvBandMathImageFilterWithIdx1.tif
${TEMP}/bfTvBandMathImageFilterWithIdx2.tif
)
-otb_add_test(NAME bfTvBandMathXImageFilterTxt COMMAND otbMathParserTestDriver
+otb_add_test(NAME bfTvBandMathXImageFilterTxt COMMAND otbMathParserXTestDriver
--compare-ascii ${NOTOL}
${BASELINE_FILES}/bfTvExportBandMathX.txt
${TEMP}/bfTvExportBandMathXOut.txt
diff --git a/Modules/Filtering/Projection/test/CMakeLists.txt b/Modules/Filtering/Projection/test/CMakeLists.txt
index 9c9c63045bfdffd4c3582f76e4d79dbff282d6aa..fb604d3cb355f1a0ac91fcd57a7b663df7b4e3d3 100644
--- a/Modules/Filtering/Projection/test/CMakeLists.txt
+++ b/Modules/Filtering/Projection/test/CMakeLists.txt
@@ -1271,7 +1271,7 @@ foreach( file ${GenericConversionChecking_INPUTS} )
list(GET GenericConversionChecking_TOL_M ${GenericConversionChecking_TESTNB} current_tol_m )
math(EXPR GenericConversionChecking_TESTNB "${GenericConversionChecking_TESTNB} + 1")
- otb_add_test(NAME prTvGenericRSTransformGenericConversionCheckingFromGCP_${current_type} COMMAND otbTransformTestDriver
+ otb_add_test(NAME prTvGenericRSTransformGenericConversionCheckingFromGCP_${current_type} COMMAND otbProjectionTestDriver
otbGenericRSTransformGenericConversionCheckingFromGCP
${file}
${INPUTDATA}/DEM/srtm_directory/
diff --git a/Modules/Filtering/TimeSeries/test/CMakeLists.txt b/Modules/Filtering/TimeSeries/test/CMakeLists.txt
index f29ad47b90021426d1ca22ddd60ffd7c862b07d2..7b130d337e18717168e64ad6501bca3361fe7ad6 100644
--- a/Modules/Filtering/TimeSeries/test/CMakeLists.txt
+++ b/Modules/Filtering/TimeSeries/test/CMakeLists.txt
@@ -12,30 +12,30 @@ set(OTBTimeSeriesTests
add_executable(otbTimeSeriesTestDriver ${OTBTimeSeriesTests})
target_link_libraries(otbTimeSeriesTestDriver ${OTBTimeSeries-Test_LIBRARIES})
otb_module_target_label(otbTimeSeriesTestDriver)
-otb_add_test(NAME mtTvEnvelopeSavitzkyGolayInterpolationFunctorTest COMMAND otbSmoothingTestDriver
+otb_add_test(NAME mtTvEnvelopeSavitzkyGolayInterpolationFunctorTest COMMAND otbTimeSeriesTestDriver
otbEnvelopeSavitzkyGolayInterpolationFunctorTest
)
-otb_add_test(NAME mtTvPolynomialTimeSeriesTest1 COMMAND otbSmoothingTestDriver
+otb_add_test(NAME mtTvPolynomialTimeSeriesTest1 COMMAND otbTimeSeriesTestDriver
otbPolynomialTimeSeriesTest
)
-otb_add_test(NAME mtTuSavitzkyGolayInterpolationFunctor COMMAND otbSmoothingTestDriver
+otb_add_test(NAME mtTuSavitzkyGolayInterpolationFunctor COMMAND otbTimeSeriesTestDriver
otbSavitzkyGolayInterpolationFunctorNew
)
-otb_add_test(NAME mtTvSavitzkyGolayInterpolationFunctorTest COMMAND otbSmoothingTestDriver
+otb_add_test(NAME mtTvSavitzkyGolayInterpolationFunctorTest COMMAND otbTimeSeriesTestDriver
otbSavitzkyGolayInterpolationFunctorTest
)
-otb_add_test(NAME mtTuTimeSeriesLeastSquaresFittingFunctor COMMAND otbSmoothingTestDriver
+otb_add_test(NAME mtTuTimeSeriesLeastSquaresFittingFunctor COMMAND otbTimeSeriesTestDriver
otbTimeSeriesLeastSquareFittingFunctorNew
)
-otb_add_test(NAME mtTvTimeSeriesLeastSquaresFittingFunctor2 COMMAND otbSmoothingTestDriver
+otb_add_test(NAME mtTvTimeSeriesLeastSquaresFittingFunctor2 COMMAND otbTimeSeriesTestDriver
otbTimeSeriesLeastSquareFittingFunctorTest
10 0.3 3.123
)
-otb_add_test(NAME mtTvTimeSeriesLeastSquaresFittingFunctor COMMAND otbSmoothingTestDriver
+otb_add_test(NAME mtTvTimeSeriesLeastSquaresFittingFunctor COMMAND otbTimeSeriesTestDriver
otbTimeSeriesLeastSquareFittingFunctorTest
1 2 3
)
-otb_add_test(NAME mtTvTimeSeriesLeastSquaresFittingFunctorWeights COMMAND otbSmoothingTestDriver
+otb_add_test(NAME mtTvTimeSeriesLeastSquaresFittingFunctorWeights COMMAND otbTimeSeriesTestDriver
otbTimeSeriesLeastSquareFittingFunctorWeightsTest
1 2 3
)
diff --git a/Modules/Filtering/VectorDataManipulation/test/CMakeLists.txt b/Modules/Filtering/VectorDataManipulation/test/CMakeLists.txt
index 7fe6cfd73a72c81ce2dcfb51a0c6055d172f8a25..ca405088394d48d69d07bbd28c86680ffcbeef4b 100644
--- a/Modules/Filtering/VectorDataManipulation/test/CMakeLists.txt
+++ b/Modules/Filtering/VectorDataManipulation/test/CMakeLists.txt
@@ -101,7 +101,7 @@ otb_add_test(NAME bfTvConcatenateVectorDataFilter COMMAND otbVectorDataManipulat
otb_add_test(NAME coTuVectorDataExtractROINew COMMAND otbVectorDataManipulationTestDriver
otbVectorDataExtractROINew)
-otb_add_test(NAME bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_Polygon COMMAND otbProjectionTestDriver
+otb_add_test(NAME bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_Polygon COMMAND otbVectorDataManipulationTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionOutput_Polygon.shp
${TEMP}/bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionOutput_Polygon.shp
@@ -111,10 +111,10 @@ otb_add_test(NAME bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctio
${INPUTDATA}/DEM/srtm_directory
${TEMP}/bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionOutput_Polygon.shp
0 )
-otb_add_test(NAME bfTuRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionNew COMMAND otbProjectionTestDriver
+otb_add_test(NAME bfTuRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionNew COMMAND otbVectorDataManipulationTestDriver
otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionNew
)
-otb_add_test(NAME bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_Line COMMAND otbProjectionTestDriver
+otb_add_test(NAME bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_Line COMMAND otbVectorDataManipulationTestDriver
--compare-ogr ${NOTOL}
${BASELINE_FILES}/bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionOutput_Line.shp
${TEMP}/bfTvRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunctionOutput_Line.shp
diff --git a/Modules/IO/TestKernel/test/CMakeLists.txt b/Modules/IO/TestKernel/test/CMakeLists.txt
index ffdae3bde90f5efc1a7be17be9a09e75755d62e0..343470ce017e5c46fb257331c3337c4362bf0ac8 100644
--- a/Modules/IO/TestKernel/test/CMakeLists.txt
+++ b/Modules/IO/TestKernel/test/CMakeLists.txt
@@ -12,7 +12,7 @@ set(OTBTestKernelTests
add_executable(otbTestKernelTestDriver ${OTBTestKernelTests})
target_link_libraries(otbTestKernelTestDriver ${OTBTestKernel-Test_LIBRARIES})
otb_module_target_label(otbTestKernelTestDriver)
-otb_add_test(NAME tsTvCompareAscii2 COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAscii2 COMMAND otbTestKernelTestDriver
--compare-ascii ${NOTOL}
${TEMP}/tsTvCompareAsciiRef2.txt
${TEMP}/tsTvCompareAsciiTest2.txt
@@ -21,7 +21,7 @@ otb_add_test(NAME tsTvCompareAscii2 COMMAND otbCommonTestDriver
${TEMP}/tsTvCompareAsciiTest2.txt
)
set_property(TEST tsTvCompareAscii2 PROPERTY WILL_FAIL true)
-otb_add_test(NAME tsTvCompareAscii2reverse COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAscii2reverse COMMAND otbTestKernelTestDriver
--compare-ascii ${NOTOL}
${TEMP}/tsTvCompareAsciiRef2reverse.txt
${TEMP}/tsTvCompareAsciiTest2reverse.txt
@@ -30,7 +30,7 @@ otb_add_test(NAME tsTvCompareAscii2reverse COMMAND otbCommonTestDriver
${TEMP}/tsTvCompareAsciiRef2reverse.txt
)
set_property(TEST tsTvCompareAscii2reverse PROPERTY WILL_FAIL true)
-otb_add_test(NAME tsTvCompareAscii3order COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAscii3order COMMAND otbTestKernelTestDriver
--compare-ascii ${NOTOL}
${TEMP}/tsTvCompareAsciiRef3order.txt
${TEMP}/tsTvCompareAsciiTest3order.txt
@@ -39,7 +39,7 @@ otb_add_test(NAME tsTvCompareAscii3order COMMAND otbCommonTestDriver
${TEMP}/tsTvCompareAsciiTest3order.txt
)
set_property(TEST tsTvCompareAscii3order PROPERTY WILL_FAIL true)
-otb_add_test(NAME tsTvCompareAscii3 COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAscii3 COMMAND otbTestKernelTestDriver
--ignore-order --compare-ascii ${NOTOL}
${TEMP}/tsTvCompareAsciiRef3.txt
${TEMP}/tsTvCompareAsciiTest3.txt
@@ -47,7 +47,7 @@ otb_add_test(NAME tsTvCompareAscii3 COMMAND otbCommonTestDriver
${TEMP}/tsTvCompareAsciiRef3.txt
${TEMP}/tsTvCompareAsciiTest3.txt
)
-otb_add_test(NAME tsTvCompareAscii4 COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAscii4 COMMAND otbTestKernelTestDriver
--compare-ascii ${NOTOL}
${TEMP}/tsTvCompareAsciiRef4.txt
${TEMP}/tsTvCompareAsciiTest4.txt
@@ -56,7 +56,7 @@ otb_add_test(NAME tsTvCompareAscii4 COMMAND otbCommonTestDriver
${TEMP}/tsTvCompareAsciiTest4.txt
)
set_property(TEST tsTvCompareAscii4 PROPERTY WILL_FAIL true)
-otb_add_test(NAME tsTvCompareAscii4epsilon2 COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAscii4epsilon2 COMMAND otbTestKernelTestDriver
--compare-ascii ${EPSILON_2}
${TEMP}/tsTvCompareAsciiRef4epsilon2.txt
${TEMP}/tsTvCompareAsciiTest4epsilon2.txt
@@ -64,7 +64,7 @@ otb_add_test(NAME tsTvCompareAscii4epsilon2 COMMAND otbCommonTestDriver
${TEMP}/tsTvCompareAsciiRef4epsilon2.txt
${TEMP}/tsTvCompareAsciiTest4epsilon2.txt
)
-otb_add_test(NAME tsTvCompareAscii4epsilon3 COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAscii4epsilon3 COMMAND otbTestKernelTestDriver
--compare-ascii ${EPSILON_3}
${TEMP}/tsTvCompareAsciiRef4epsilon3.txt
${TEMP}/tsTvCompareAsciiTest4epsilon3.txt
@@ -73,7 +73,7 @@ otb_add_test(NAME tsTvCompareAscii4epsilon3 COMMAND otbCommonTestDriver
${TEMP}/tsTvCompareAsciiTest4epsilon3.txt
)
set_property(TEST tsTvCompareAscii4epsilon3 PROPERTY WILL_FAIL true)
-otb_add_test(NAME tsTvCompareAscii5epsilon2 COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAscii5epsilon2 COMMAND otbTestKernelTestDriver
--ignore-order --compare-ascii ${EPSILON_2}
${TEMP}/tsTvCompareAsciiRef5epsilon2.txt
${TEMP}/tsTvCompareAsciiTest5epsilon2.txt
@@ -81,7 +81,7 @@ otb_add_test(NAME tsTvCompareAscii5epsilon2 COMMAND otbCommonTestDriver
${TEMP}/tsTvCompareAsciiRef5epsilon2.txt
${TEMP}/tsTvCompareAsciiTest5epsilon2.txt
)
-otb_add_test(NAME tsTvCompareAsciiScientificNotation COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAsciiScientificNotation COMMAND otbTestKernelTestDriver
--compare-ascii ${EPSILON_2}
${TEMP}/tsTvCompareAsciiRef_SN.txt
${TEMP}/tsTvCompareAsciiTest_SN.txt
@@ -89,7 +89,7 @@ otb_add_test(NAME tsTvCompareAsciiScientificNotation COMMAND otbCommonTestDriver
${TEMP}/tsTvCompareAsciiRef_SN.txt
${TEMP}/tsTvCompareAsciiTest_SN.txt
)
-otb_add_test(NAME tsTvCompareAscii COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAscii COMMAND otbTestKernelTestDriver
--compare-ascii ${NOTOL}
${TEMP}/tsTvCompareAsciiRef.txt
${TEMP}/tsTvCompareAsciiTest.txt
@@ -97,7 +97,7 @@ otb_add_test(NAME tsTvCompareAscii COMMAND otbCommonTestDriver
${TEMP}/tsTvCompareAsciiRef.txt
${TEMP}/tsTvCompareAsciiTest.txt
)
-otb_add_test(NAME tsTvCompareAsciiepsilon3_WhiteSpaceOK COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAsciiepsilon3_WhiteSpaceOK COMMAND otbTestKernelTestDriver
--compare-ascii ${EPSILON_3}
${BASELINE_FILES}/tsTvCompareAsciiEpsilon3_Base.txt
${TEMP}/tsTvCompareAsciiEpsilon3_TestOK.txt
@@ -105,7 +105,7 @@ otb_add_test(NAME tsTvCompareAsciiepsilon3_WhiteSpaceOK COMMAND otbCommonTestDri
${INPUTDATA}/tsTvCompareAsciiEpsilon3_TestOK.txt
${TEMP}/tsTvCompareAsciiEpsilon3_TestOK.txt
)
-otb_add_test(NAME tsTvCompareAsciiepsilon3_WhiteSpaceKO COMMAND otbCommonTestDriver
+otb_add_test(NAME tsTvCompareAsciiepsilon3_WhiteSpaceKO COMMAND otbTestKernelTestDriver
--compare-ascii ${EPSILON_3}
${BASELINE_FILES}/tsTvCompareAsciiEpsilon3_Base.txt
${TEMP}/tsTvCompareAsciiEpsilon3_TestKO.txt
diff --git a/Modules/Radiometry/LandSatClassifier/test/CMakeLists.txt b/Modules/Radiometry/LandSatClassifier/test/CMakeLists.txt
index 170522cb7ad7dd99dcd2ccf389d3bb3d27a8981e..aae092b59f2c35cbe47b76e7321fd6236265b789 100644
--- a/Modules/Radiometry/LandSatClassifier/test/CMakeLists.txt
+++ b/Modules/Radiometry/LandSatClassifier/test/CMakeLists.txt
@@ -6,7 +6,7 @@ set(OTBLandSatClassifierTests
add_executable(otbLandSatClassifierTestDriver ${OTBLandSatClassifierTests})
target_link_libraries(otbLandSatClassifierTestDriver ${OTBLandSatClassifier-Test_LIBRARIES})
otb_module_target_label(otbLandSatClassifierTestDriver)
-otb_add_test(NAME raTvLandsatTMSpectralRuleBasedClassifierTest COMMAND otbOpticalCalibrationTestDriver
+otb_add_test(NAME raTvLandsatTMSpectralRuleBasedClassifierTest COMMAND otbLandSatClassifierTestDriver
otbLandsatTMSpectralRuleBasedClassifierTest
${INPUTDATA}/L5Strip.tif
${TEMP}/raTvLandsatTMSpectralRuleBasedClassifierTest_Image.tif
diff --git a/Modules/Registration/DisparityMap/test/CMakeLists.txt b/Modules/Registration/DisparityMap/test/CMakeLists.txt
index f6afa640840809f9a2838cfa3546109bf19c86ee..63b716e988c9f2523e7796611d5fb46679ab1117 100644
--- a/Modules/Registration/DisparityMap/test/CMakeLists.txt
+++ b/Modules/Registration/DisparityMap/test/CMakeLists.txt
@@ -152,10 +152,10 @@ otb_add_test(NAME dmTvMultiDisparityMapTo3DFilter COMMAND otbDisparityMapTestDri
${TEMP}/dmTvMultiDisparityMapTo3DFilterResidue.tif
)
-otb_add_test(NAME dmTuFineRegistrationImageFilterNew COMMAND otbStereoTestDriver
+otb_add_test(NAME dmTuFineRegistrationImageFilterNew COMMAND otbDisparityMapTestDriver
otbFineRegistrationImageFilterNew
)
-otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithMeanSquare COMMAND otbStereoTestDriver
+otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithMeanSquare COMMAND otbDisparityMapTestDriver
--compare-n-images ${EPSILON_10} 2
${BASELINE}/feTvFineRegistrationImageFilterTestWithMeanSquareMetric.tif
${TEMP}/feTvFineRegistrationImageFilterTestWithMeanSquareMetric.tif
@@ -175,7 +175,7 @@ otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithMeanSquare COMMAND otbS
0 # Initial offset y
0 0 80 65 # region to proceed
)
-otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithMeanReciprocalDifference COMMAND otbStereoTestDriver
+otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithMeanReciprocalDifference COMMAND otbDisparityMapTestDriver
--compare-n-images ${EPSILON_10} 2
${BASELINE}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceMetric.tif
${TEMP}/feTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenceMetric.tif
@@ -195,7 +195,7 @@ otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithMeanReciprocalDifferenc
0 # Initial offset y
0 0 80 130 # region to proceed
)
-otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithNormalizedCorrelation COMMAND otbStereoTestDriver
+otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithNormalizedCorrelation COMMAND otbDisparityMapTestDriver
--compare-n-images ${EPSILON_10} 2
${BASELINE}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationMetric.tif
${TEMP}/feTvFineRegistrationImageFilterTestWithNormalizedCorrelationMetric.tif
@@ -215,7 +215,7 @@ otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithNormalizedCorrelation C
0 # Initial offset y
0 0 80 130 # region to proceed
)
-otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithCorrelation COMMAND otbStereoTestDriver
+otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithCorrelation COMMAND otbDisparityMapTestDriver
--compare-n-images ${EPSILON_10} 2
${BASELINE}/feTvFineRegistrationImageFilterTestWithCorrelationMetric.tif
${TEMP}/feTvFineRegistrationImageFilterTestWithCorrelationMetric.tif
@@ -235,7 +235,7 @@ otb_add_test(NAME dmTvFineRegistrationImageFilterTestWithCorrelation COMMAND otb
0 # Initial offset y
0 0 80 130 # region to proceed
)
-otb_add_test(NAME dmTvNCCRegistrationFilter COMMAND otbStereoTestDriver
+otb_add_test(NAME dmTvNCCRegistrationFilter COMMAND otbDisparityMapTestDriver
--compare-image ${EPSILON_10}
${BASELINE}/dmNCCRegistrationFilterOutput.tif
${TEMP}/dmNCCRegistrationFilterOutput.tif
@@ -244,11 +244,11 @@ otb_add_test(NAME dmTvNCCRegistrationFilter COMMAND otbStereoTestDriver
${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub_warped_sinus.tif
${TEMP}/dmNCCRegistrationFilterOutput.tif
5 1.0 2)
-otb_add_test(NAME dmTuNCCRegistrationFilterNew COMMAND otbStereoTestDriver
+otb_add_test(NAME dmTuNCCRegistrationFilterNew COMMAND otbDisparityMapTestDriver
otbNCCRegistrationFilterNew)
-otb_add_test(NAME dmTuPixelWiseBlockMatchingImageFilterNew COMMAND otbStereoTestDriver
+otb_add_test(NAME dmTuPixelWiseBlockMatchingImageFilterNew COMMAND otbDisparityMapTestDriver
otbPixelWiseBlockMatchingImageFilterNew)
-otb_add_test(NAME dmTvPixelWiseBlockMatchingImageFilterNCC COMMAND otbStereoTestDriver
+otb_add_test(NAME dmTvPixelWiseBlockMatchingImageFilterNCC COMMAND otbDisparityMapTestDriver
--compare-n-images ${NOTOL} 2
${BASELINE}/dmTvPixelWiseBlockMatchingImageFilterNCCOutputDisparity.tif
${TEMP}/dmTvPixelWiseBlockMatchingImageFilterNCCOutputDisparity.tif
@@ -262,7 +262,7 @@ otb_add_test(NAME dmTvPixelWiseBlockMatchingImageFilterNCC COMMAND otbStereoTest
2
-10 +10
)
-otb_add_test(NAME dmTvPixelWiseBlockMatchingImageFilter COMMAND otbStereoTestDriver
+otb_add_test(NAME dmTvPixelWiseBlockMatchingImageFilter COMMAND otbDisparityMapTestDriver
--compare-n-images ${NOTOL} 2
${BASELINE}/dmTvPixelWiseBlockMatchingImageFilterOutputDisparity.tif
${TEMP}/dmTvPixelWiseBlockMatchingImageFilterOutputDisparity.tif
diff --git a/Modules/Registration/Stereo/test/CMakeLists.txt b/Modules/Registration/Stereo/test/CMakeLists.txt
index 943de40242f1b67a41bbef3ae355280f0edc0edf..9619a93b67697d7dec012af8e72eef52a018098f 100644
--- a/Modules/Registration/Stereo/test/CMakeLists.txt
+++ b/Modules/Registration/Stereo/test/CMakeLists.txt
@@ -288,7 +288,7 @@ otb_add_test(NAME dmTvStereoSensorModelToElevationFilter COMMAND otbStereoTestDr
3
)
-otb_add_test(NAME dmTvStereorectificationDisplacementFieldSource COMMAND otbDisplacementFieldTestDriver
+otb_add_test(NAME dmTvStereorectificationDisplacementFieldSource COMMAND otbStereoTestDriver
--compare-n-images ${EPSILON_10} 2
${BASELINE}/feTvStereorectificationDeformationFieldSourceOutput1.tif
${TEMP}/feTvStereorectificationDisplacementFieldSourceOutput1.tif
@@ -303,5 +303,5 @@ otb_add_test(NAME dmTvStereorectificationDisplacementFieldSource COMMAND otbDisp
0.5
5
)
-otb_add_test(NAME dmTuStereorectificationDisplacementFieldSourceNew COMMAND otbDisplacementFieldTestDriver
+otb_add_test(NAME dmTuStereorectificationDisplacementFieldSourceNew COMMAND otbStereoTestDriver
otbStereorectificationDisplacementFieldSourceNew)