Modif de nom de test dans les IO.

Testing/Code/Visu/CMakeLists.txt

@@ -13,80 +13,87 @@ SET(TOL 0.0)
 SET(EPSILON 0.000001)
 
 
-SET(VISU_TESTS ${CXX_TEST_PATH}/otbVisuTests)
+SET(VISU_TESTS1 ${CXX_TEST_PATH}/otbVisuTests1)
+SET(VISU_TESTS2 ${CXX_TEST_PATH}/otbVisuTests2)
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbVISU_Tests1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
 # -------       otb::ImageWidgetBase -----------------------------------
 
-ADD_TEST(viTuImageWidgetBaseNew ${VISU_TESTS} 
+ADD_TEST(viTuImageWidgetBaseNew ${VISU_TESTS1} 
         otbImageWidgetBaseNew
         )
 
 # -------       otb::FixedSizeFullImageWidget -----------------------------------
 
-ADD_TEST(viTuFixedSizeFullImageWidgetNew ${VISU_TESTS} 
+ADD_TEST(viTuFixedSizeFullImageWidgetNew ${VISU_TESTS1} 
         otbFixedSizeFullImageWidgetNew
         )
 
-ADD_TEST(viTvFixedSizFullImageWidget ${VISU_TESTS} 
+ADD_TEST(viTvFixedSizFullImageWidget ${VISU_TESTS1} 
         otbFixedSizeFullImageWidget
 	${INPUTDATA}/poupees.png
         )
 
 # -------       otb::FullResolutionImageWidget -----------------------------------
 
-ADD_TEST(viTuFullResolutionImageWidgetNew ${VISU_TESTS} 
+ADD_TEST(viTuFullResolutionImageWidgetNew ${VISU_TESTS1} 
         otbFullResolutionImageWidgetNew
         )
 
-ADD_TEST(viTvFullResolutionImageWidget ${VISU_TESTS} 
+ADD_TEST(viTvFullResolutionImageWidget ${VISU_TESTS1} 
         otbFullResolutionImageWidget
 	${INPUTDATA}/poupees.png
         )
 
 # -------   otb::ZoomableImageWidget  -----------------------------------
 
-ADD_TEST(viTuZoomableImageWidgetNew ${VISU_TESTS} 
+ADD_TEST(viTuZoomableImageWidgetNew ${VISU_TESTS1} 
         otbZoomableImageWidgetNew
         )
 
-ADD_TEST(viTvZoomableImageWidget ${VISU_TESTS} 
+ADD_TEST(viTvZoomableImageWidget ${VISU_TESTS1} 
         otbZoomableImageWidget
 	${INPUTDATA}/poupees.png
         )
 
 # -------   otb::ImageViewer  -----------------------------------
 
-ADD_TEST(viTuImageViewerNew ${VISU_TESTS} 
+ADD_TEST(viTuImageViewerNew ${VISU_TESTS1} 
         otbImageViewerNew
         )
 
-ADD_TEST(viTvImageViewerWithOtbVectorImage ${VISU_TESTS} 
+ADD_TEST(viTvImageViewerWithOtbVectorImage ${VISU_TESTS1} 
         otbImageViewer
 	${INPUTDATA}/couleurs.jpg
         )
 
-ADD_TEST(viTvImageViewerWithLargeOtbVectorImage ${VISU_TESTS} 
+ADD_TEST(viTvImageViewerWithLargeOtbVectorImage ${VISU_TESTS1} 
         otbImageViewer
 	${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
         )
 
 
-ADD_TEST(viTvImageViewerWithOtbImage ${VISU_TESTS} 
+ADD_TEST(viTvImageViewerWithOtbImage ${VISU_TESTS1} 
         otbImageViewerWithOtbImage
 	${INPUTDATA}/ROI_IKO_PAN_LesHalles.tif
         )
 
-ADD_TEST(viTvImageViewerWithLargeOtbImage ${VISU_TESTS} 
+ADD_TEST(viTvImageViewerWithLargeOtbImage ${VISU_TESTS1} 
         otbImageViewerWithOtbImage
 	${IMAGEDATA}/TOULOUSE/QuickBird/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
         )
 
-ADD_TEST(viTvImageViewerWithMultiBandFilter ${VISU_TESTS} 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbVISU_Tests2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
+ADD_TEST(viTvImageViewerWithMultiBandFilter ${VISU_TESTS2} 
         otbImageViewerWithMultiBandFilter
 	${INPUTDATA}/couleurs.jpg
         )
 
-ADD_TEST(viTvDoubleImageViewerWithLink ${VISU_TESTS} 
+ADD_TEST(viTvDoubleImageViewerWithLink ${VISU_TESTS2} 
         otbDoubleImageViewerWithLink
 	${INPUTDATA}/couleurs.jpg
 	${INPUTDATA}/couleurs.jpg
@@ -94,11 +101,11 @@ ADD_TEST(viTvDoubleImageViewerWithLink ${VISU_TESTS}
 
 # -------   otb::ImageToGrayscaleAnaglyphImageFilter  -----------------------------------
 
-ADD_TEST(viTuImageToGrayscaleAnaglyphImageFilterNew ${VISU_TESTS}
+ADD_TEST(viTuImageToGrayscaleAnaglyphImageFilterNew ${VISU_TESTS2}
 	otbImageToGrayscaleAnaglyphImageFilterNew
 )
 
-ADD_TEST(viTvImageToGrayscaleAnaglyphImageFilter ${VISU_TESTS}
+ADD_TEST(viTvImageToGrayscaleAnaglyphImageFilter ${VISU_TESTS2}
 	--compare-image  ${EPSILON} 
 	${BASELINE}/viTvGrayscaleAnaglyphFilterResult.tif
 	${TEMP}/viTvGrayscaleAnaglyphFilterResult.tif
@@ -110,11 +117,11 @@ ADD_TEST(viTvImageToGrayscaleAnaglyphImageFilter ${VISU_TESTS}
 
 # -------   otb::VectorImageToColorAnaglyphVectorImageFilter  ---------------------------
 
-ADD_TEST(viTuVectorImageToColorAnaglyphVectorImageFilterNew ${VISU_TESTS}
+ADD_TEST(viTuVectorImageToColorAnaglyphVectorImageFilterNew ${VISU_TESTS2}
 	otbVectorImageToColorAnaglyphVectorImageFilterNew
 )
 
-ADD_TEST(viTvVectorImageToColorAnaglyphVectorImageFilter ${VISU_TESTS}
+ADD_TEST(viTvVectorImageToColorAnaglyphVectorImageFilter ${VISU_TESTS2}
 	--compare-image ${EPSILON}  
 	${BASELINE}/viTvColorAnaglyphFilterResult.tif
 	${TEMP}/viTvColorAnaglyphFilterResult.tif
@@ -125,7 +132,7 @@ ADD_TEST(viTvVectorImageToColorAnaglyphVectorImageFilter ${VISU_TESTS}
 )
 
 # -------       Fichiers sources CXX -----------------------------------
-SET(BasicVisu_SRCS
+SET(BasicVisu_SRCS1
 otbImageWidgetBaseNew.cxx
 otbFixedSizeFullImageWidgetNew.cxx
 otbFixedSizeFullImageWidget.cxx
@@ -135,8 +142,10 @@ otbZoomableImageWidgetNew.cxx
 otbZoomableImageWidget.cxx
 otbImageViewer.cxx
 otbImageViewerWithOtbImage.cxx
-otbImageViewerWithMultiBandFilter.cxx
 otbImageViewerNew.cxx
+)
+SET(BasicVisu_SRCS2
+otbImageViewerWithMultiBandFilter.cxx
 otbDoubleImageViewerWithLink.cxx
 otbImageToGrayscaleAnaglyphImageFilterNew.cxx
 otbImageToGrayscaleAnaglyphImageFilter.cxx
@@ -147,9 +156,10 @@ otbAlternateViewerTest.cxx
 
 INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}") 
 
-ADD_EXECUTABLE(otbVisuTests otbVisuTests.cxx ${BasicVisu_SRCS})
-TARGET_LINK_LIBRARIES(otbVisuTests OTBVisu OTBGui OTBIO gdal ITKIO ITKCommon)
-
+ADD_EXECUTABLE(otbVisuTests1 otbVisuTests1.cxx ${BasicVisu_SRCS1})
+TARGET_LINK_LIBRARIES(otbVisuTests1 OTBVisu OTBGui OTBIO gdal ITKIO ITKCommon)
+ADD_EXECUTABLE(otbVisuTests2 otbVisuTests2.cxx ${BasicVisu_SRCS2})
+TARGET_LINK_LIBRARIES(otbVisuTests2 OTBVisu OTBGui OTBIO gdal ITKIO ITKCommon)
 
 ENDIF( NOT OTB_DISABLE_CXX_TESTING )
 

Testing/Code/Visu/otbVisuTests.cxx → Testing/Code/Visu/otbVisuTests1.cxx

@@ -35,12 +35,6 @@ REGISTER_TEST(otbZoomableImageWidgetNew);
 REGISTER_TEST(otbZoomableImageWidget); 
 REGISTER_TEST(otbImageViewer);
 REGISTER_TEST(otbImageViewerWithOtbImage);
-REGISTER_TEST(otbImageViewerWithMultiBandFilter);
-REGISTER_TEST(otbDoubleImageViewerWithLink);
 REGISTER_TEST(otbImageViewerNew);
-REGISTER_TEST(otbImageToGrayscaleAnaglyphImageFilterNew);
-REGISTER_TEST(otbImageToGrayscaleAnaglyphImageFilter);
-REGISTER_TEST(otbVectorImageToColorAnaglyphVectorImageFilterNew);
-REGISTER_TEST(otbVectorImageToColorAnaglyphVectorImageFilter);
-REGISTER_TEST(otbAlternateViewerTest);
+
 }

Testing/Code/Visu/otbVisuTests2.cxx

+/*=========================================================================
+
+  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 otbCommonTest 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(otbImageViewerWithMultiBandFilter);
+REGISTER_TEST(otbDoubleImageViewerWithLink);
+REGISTER_TEST(otbImageToGrayscaleAnaglyphImageFilterNew);
+REGISTER_TEST(otbImageToGrayscaleAnaglyphImageFilter);
+REGISTER_TEST(otbVectorImageToColorAnaglyphVectorImageFilterNew);
+REGISTER_TEST(otbVectorImageToColorAnaglyphVectorImageFilter);
+REGISTER_TEST(otbAlternateViewerTest);
+}