diff --git a/Testing/Code/DisparityMap/CMakeLists.txt b/Testing/Code/DisparityMap/CMakeLists.txt
index 3431aecec8786aa055de737a078af5cfcd29d28c..159a59f1dd9d8dce78188be7bd6c3c9c737f6f5e 100644
--- a/Testing/Code/DisparityMap/CMakeLists.txt
+++ b/Testing/Code/DisparityMap/CMakeLists.txt
@@ -14,15 +14,19 @@ SET(TOL 0.0)
#EPSILON loose tolerance for multiplatform support.
SET(EPSILON 0.0000000001)
-SET(DISPARITYMAP_TESTS ${CXX_TEST_PATH}/otbDisparityMapTests)
-
+SET(DISPARITYMAP_TESTS1 ${CXX_TEST_PATH}/otbDisparityMapTests1)
+SET(DISPARITYMAP_TESTS2 ${CXX_TEST_PATH}/otbDisparityMapTests2)
+SET(DISPARITYMAP_TESTS3 ${CXX_TEST_PATH}/otbDisparityMapTests3)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbDisparityMapTests1 ~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ------- otb::DisparityMapEstimationMethod ----------
-ADD_TEST(dmTuDisparityMapEstimationMethodNew ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTuDisparityMapEstimationMethodNew ${DISPARITYMAP_TESTS1}
otbDisparityMapEstimationMethodNew)
-ADD_TEST(dmTvDisparityMapEstimationMethod ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvDisparityMapEstimationMethod ${DISPARITYMAP_TESTS1}
--compare-ascii ${TOL}
${BASELINE_FILES}/dmDisparityMapEstimationOutput1.txt
${TEMP}/dmDisparityMapEstimationOutput1.txt
@@ -36,15 +40,15 @@ ADD_TEST(dmTvDisparityMapEstimationMethod ${DISPARITYMAP_TESTS}
# ------- otb::PointSetToDeformationFieldGenerator ----------
-ADD_TEST(dmTuPointSetToDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTuPointSetToDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS1}
otbPointSetToDeformationFieldGeneratorNew)
# ------- otb::NearestPointDeformationFieldGenerator ----------
-ADD_TEST(dmTuNearestPointDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTuNearestPointDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS1}
otbNearestPointDeformationFieldGeneratorNew)
-ADD_TEST(dmTvNearestPointDeformationFieldGenerator ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvNearestPointDeformationFieldGenerator ${DISPARITYMAP_TESTS1}
--compare-image ${EPSILON}
${BASELINE}/dmTvNearestPointDeformationField.hdr
${TEMP}/dmTvNearestPointDeformationField.hdr
@@ -54,10 +58,10 @@ ADD_TEST(dmTvNearestPointDeformationFieldGenerator ${DISPARITYMAP_TESTS}
# ------- otb::NNearestPointsLinearInterpolateDeformationFieldGenerator ----------
-ADD_TEST(dmTuNNearestPointsLinearInterpolateDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTuNNearestPointsLinearInterpolateDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS1}
otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew)
-ADD_TEST(dmTvNNearestPointsLinearInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvNNearestPointsLinearInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS1}
--compare-image ${EPSILON}
${BASELINE}/dmTvNNearestPointsLinearInterpolateDeformationField.hdr
${TEMP}/dmTvNNearestPointsLinearInterpolateDeformationField.hdr
@@ -68,10 +72,10 @@ ADD_TEST(dmTvNNearestPointsLinearInterpolateDeformationFieldGenerator ${DISPARIT
# ------- otb::BSplinesInterpolateDeformationFieldGenerator ----------
-ADD_TEST(dmTuBSplinesInterpolateDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTuBSplinesInterpolateDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS1}
otbNNearestPointsLinearInterpolateDeformationFieldGeneratorNew)
-ADD_TEST(dmTvBSplinesInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvBSplinesInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS1}
--compare-image ${EPSILON}
${BASELINE}/dmTvBSplinesInterpolateDeformationField.hdr
${TEMP}/dmTvBSplinesInterpolateDeformationField.hdr
@@ -82,16 +86,20 @@ ADD_TEST(dmTvBSplinesInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS}
# ------- otb::PointSetWithTransformToDeformationFieldGenerator ----------
-ADD_TEST(dmTuPointSetWithTransformToDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTuPointSetWithTransformToDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS1}
otbPointSetWithTransformToDeformationFieldGeneratorNew)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbDisparityMapTests2 ~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
# ------- otb::NearestTransformDeformationFieldGenerator ----------
-ADD_TEST(dmTuNearestTransformDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTuNearestTransformDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS2}
otbNearestTransformDeformationFieldGeneratorNew)
-ADD_TEST(dmTvNearestTransformDeformationFieldGenerator ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvNearestTransformDeformationFieldGenerator ${DISPARITYMAP_TESTS2}
--compare-image ${EPSILON}
${BASELINE}/dmTvNearestTransformDeformationField.hdr
${TEMP}/dmTvNearestTransformDeformationField.hdr
@@ -102,10 +110,10 @@ ADD_TEST(dmTvNearestTransformDeformationFieldGenerator ${DISPARITYMAP_TESTS}
# ------- otb::NNearestTransformsLinearInterpolateDeformationFieldGenerator ----------
-ADD_TEST(dmTuNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTuNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS2}
otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew)
-ADD_TEST(dmTvNNearestTransformsLinearInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvNNearestTransformsLinearInterpolateDeformationFieldGenerator ${DISPARITYMAP_TESTS2}
--compare-image ${EPSILON}
${BASELINE}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
${TEMP}/dmTvNNearestTransformsLinearInterpolateDeformationField.hdr
@@ -115,10 +123,10 @@ ADD_TEST(dmTvNNearestTransformsLinearInterpolateDeformationFieldGenerator ${DISP
# ------- otb::BSplinesInterpolateTransformDeformationFieldGenerator ----------
-ADD_TEST(dmTuBSplinesInterpolateTransformDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTuBSplinesInterpolateTransformDeformationFieldGeneratorNew ${DISPARITYMAP_TESTS2}
otbBSplinesInterpolateTransformDeformationFieldGeneratorNew)
-ADD_TEST(dmTvBSplinesInterpolateTransformDeformationFieldGenerator ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvBSplinesInterpolateTransformDeformationFieldGenerator ${DISPARITYMAP_TESTS2}
--compare-image ${EPSILON}
${BASELINE}/dmTvBSplinesInterpolateTransformDeformationFieldGenerator.hdr
${TEMP}/dmTvBSplinesInterpolateTransformDeformationFieldGenerator.hdr
@@ -128,7 +136,7 @@ ADD_TEST(dmTvBSplinesInterpolateTransformDeformationFieldGenerator ${DISPARITYMA
# ------- Additional tests for deformation fields estimation ----------
-ADD_TEST(dmTvTranslationDeformationFieldEstimation ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvTranslationDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
--compare-n-images ${EPSILON} 12
${BASELINE}/dmTvTranslationDeformationFieldEstimationOutput_bs_df.hdr
${TEMP}/dmTvTranslationDeformationFieldEstimationOutput_bs_df.hdr
@@ -161,7 +169,7 @@ ADD_TEST(dmTvTranslationDeformationFieldEstimation ${DISPARITYMAP_TESTS}
15 10 10 250 0.95 4 50
)
-ADD_TEST(dmTvEuler2DDeformationFieldEstimation ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvEuler2DDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
--compare-n-images ${EPSILON} 12
${BASELINE}/dmTvEuler2DDeformationFieldEstimationOutput_bs_df.hdr
${TEMP}/dmTvEuler2DDeformationFieldEstimationOutput_bs_df.hdr
@@ -194,7 +202,7 @@ ADD_TEST(dmTvEuler2DDeformationFieldEstimation ${DISPARITYMAP_TESTS}
15 10 0.01 250 0.95 4 50 128 128
)
-ADD_TEST(dmTvCenteredRigidDeformationFieldEstimation ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvCenteredRigidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
--compare-n-images ${EPSILON} 12
${BASELINE}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_df.hdr
${TEMP}/dmTvCenteredRigidDeformationFieldEstimationOutput_bs_df.hdr
@@ -227,7 +235,7 @@ ADD_TEST(dmTvCenteredRigidDeformationFieldEstimation ${DISPARITYMAP_TESTS}
15 5 0.01 250 0.95 4 50 127 65
)
-ADD_TEST(dmTvSinusoidDeformationFieldEstimation ${DISPARITYMAP_TESTS}
+ADD_TEST(dmTvSinusoidDeformationFieldEstimation ${DISPARITYMAP_TESTS2}
--compare-n-images ${EPSILON} 12
${BASELINE}/dmTvSinusoidDeformationFieldEstimationOutput_bs_df.hdr
${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput_bs_df.hdr
@@ -259,8 +267,14 @@ ADD_TEST(dmTvSinusoidDeformationFieldEstimation ${DISPARITYMAP_TESTS}
${TEMP}/dmTvSinusoidDeformationFieldEstimationOutput
15 10 10 250 0.95 4 25
)
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbDisparityMapTests3 ~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
# ------- Fichiers sources CXX -----------------------------------
-SET(BasicDisparityMap_SRCS
+SET(BasicDisparityMap_SRCS1
otbDisparityMapEstimationMethodNew.cxx
otbDisparityMapEstimationMethod.cxx
otbPointSetToDeformationFieldGeneratorNew.cxx
@@ -271,6 +285,8 @@ otbNNearestPointsLinearInterpolateDeformationFieldGenerator.cxx
otbBSplinesInterpolateDeformationFieldGeneratorNew.cxx
otbBSplinesInterpolateDeformationFieldGenerator.cxx
otbPointSetWithTransformToDeformationFieldGeneratorNew.cxx
+)
+SET(BasicDisparityMap_SRCS2
otbNearestTransformDeformationFieldGeneratorNew.cxx
otbNearestTransformDeformationFieldGenerator.cxx
otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew.cxx
@@ -281,10 +297,16 @@ otbCenteredRigidDeformationFieldEstimation.cxx
otbBSplinesInterpolateTransformDeformationFieldGeneratorNew.cxx
otbBSplinesInterpolateTransformDeformationFieldGenerator.cxx
)
+SET(BasicDisparityMap_SRCS3
+)
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
-ADD_EXECUTABLE(otbDisparityMapTests otbDisparityMapTests.cxx ${BasicDisparityMap_SRCS})
-TARGET_LINK_LIBRARIES(otbDisparityMapTests OTBIO OTBDisparityMap gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon ITKNumerics itkvnl)
+ADD_EXECUTABLE(otbDisparityMapTests1 otbDisparityMapTests1.cxx ${BasicDisparityMap_SRCS1})
+TARGET_LINK_LIBRARIES(otbDisparityMapTests1 OTBIO OTBDisparityMap gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon ITKNumerics itkvnl)
+ADD_EXECUTABLE(otbDisparityMapTests2 otbDisparityMapTests2.cxx ${BasicDisparityMap_SRCS2})
+TARGET_LINK_LIBRARIES(otbDisparityMapTests2 OTBIO OTBDisparityMap gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon ITKNumerics itkvnl)
+ADD_EXECUTABLE(otbDisparityMapTests3 otbDisparityMapTests3.cxx ${BasicDisparityMap_SRCS3})
+TARGET_LINK_LIBRARIES(otbDisparityMapTests3 OTBIO OTBDisparityMap gdal ITKIO ITKAlgorithms ITKStatistics ITKCommon ITKNumerics itkvnl)
ENDIF( NOT OTB_DISABLE_CXX_TESTING )
diff --git a/Testing/Code/DisparityMap/otbDisparityMapTests.cxx b/Testing/Code/DisparityMap/otbDisparityMapTests1.cxx
similarity index 70%
rename from Testing/Code/DisparityMap/otbDisparityMapTests.cxx
rename to Testing/Code/DisparityMap/otbDisparityMapTests1.cxx
index a678c27431c6202893f0ec15f0d7f23e7d29d55b..5e1d66cd3ee630f68ad131b8a10a9464983b5253 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapTests.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapTests1.cxx
@@ -36,13 +36,4 @@ REGISTER_TEST(otbNNearestPointsLinearInterpolateDeformationFieldGenerator);
REGISTER_TEST(otbBSplinesInterpolateDeformationFieldGeneratorNew);
REGISTER_TEST(otbBSplinesInterpolateDeformationFieldGenerator);
REGISTER_TEST(otbPointSetWithTransformToDeformationFieldGeneratorNew);
-REGISTER_TEST(otbNearestTransformDeformationFieldGeneratorNew);
-REGISTER_TEST(otbNearestTransformDeformationFieldGenerator);
-REGISTER_TEST(otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew);
-REGISTER_TEST(otbNNearestTransformsLinearInterpolateDeformationFieldGenerator);
-REGISTER_TEST(otbBSplinesInterpolateTransformDeformationFieldGeneratorNew);
-REGISTER_TEST(otbBSplinesInterpolateTransformDeformationFieldGenerator);
-REGISTER_TEST(otbTranslationDeformationFieldEstimation);
-REGISTER_TEST(otbEuler2DDeformationFieldEstimation);
-REGISTER_TEST(otbCenteredRigidDeformationFieldEstimation);
}
diff --git a/Testing/Code/DisparityMap/otbDisparityMapTests2.cxx b/Testing/Code/DisparityMap/otbDisparityMapTests2.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..18a3565fbb7852cba8efcd4c0f34904f1a7b7c13
--- /dev/null
+++ b/Testing/Code/DisparityMap/otbDisparityMapTests2.cxx
@@ -0,0 +1,38 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+// this file defines the otbMultiScaleTest for the test driver
+// and all it expects is that you have a function called RegisterTests
+#if defined(_MSC_VER)
+#pragma warning ( disable : 4786 )
+#endif
+#include <iostream>
+#include "otbTestMain.h"
+
+void RegisterTests()
+{
+REGISTER_TEST(otbNearestTransformDeformationFieldGeneratorNew);
+REGISTER_TEST(otbNearestTransformDeformationFieldGenerator);
+REGISTER_TEST(otbNNearestTransformsLinearInterpolateDeformationFieldGeneratorNew);
+REGISTER_TEST(otbNNearestTransformsLinearInterpolateDeformationFieldGenerator);
+REGISTER_TEST(otbBSplinesInterpolateTransformDeformationFieldGeneratorNew);
+REGISTER_TEST(otbBSplinesInterpolateTransformDeformationFieldGenerator);
+REGISTER_TEST(otbTranslationDeformationFieldEstimation);
+REGISTER_TEST(otbEuler2DDeformationFieldEstimation);
+REGISTER_TEST(otbCenteredRigidDeformationFieldEstimation);
+}
diff --git a/Testing/Code/DisparityMap/otbDisparityMapTests3.cxx b/Testing/Code/DisparityMap/otbDisparityMapTests3.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..e2bba57dcda668b526089d58073ae2be883f71ed
--- /dev/null
+++ b/Testing/Code/DisparityMap/otbDisparityMapTests3.cxx
@@ -0,0 +1,29 @@
+/*=========================================================================
+
+ Program: ORFEO Toolbox
+ Language: C++
+ Date: $Date$
+ Version: $Revision$
+
+
+ Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+ See OTBCopyright.txt for details.
+
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+// this file defines the otbMultiScaleTest for the test driver
+// and all it expects is that you have a function called RegisterTests
+#if defined(_MSC_VER)
+#pragma warning ( disable : 4786 )
+#endif
+#include <iostream>
+#include "otbTestMain.h"
+
+void RegisterTests()
+{
+}