ENH: Automatic move of files to module Core/Common

Modules/Core/Common/otb-module.cmake

@@ -7,6 +7,8 @@ otb_module(OTBCommon
     OTBITKPendingPatches
 
   TEST_DEPENDS
+    OTBImageBase
+    OTBImageIO
     OTBTestKernel
 
   DESCRIPTION

Modules/Core/Common/test/CMakeLists.txt

@@ -14,6 +14,9 @@ otbImageRegionTileMapSplitterNew.cxx
 otbImageRegionNonUniformMultidimensionalSplitter.cxx
 otbRectangleNew.cxx
 otbConfigurationManagerTest.cxx
+otbStandardFilterWatcherNew.cxx
+otbStandardOneLineFilterWatcherTest.cxx
+otbStandardWriterWatcher.cxx
 )
 
 add_executable(otbCommonTestDriver ${OTBCommonTests})
@@ -173,3 +176,17 @@ otb_add_test(NAME coTvConfigurationManagerEnvVar COMMAND otbTestDriver
   Execute $<TARGET_FILE:otbCommonTestDriver>
   otbConfigurationManagerTest
   256 /path/to/dem/ /path/to/geoid.file)
+otb_add_test(NAME coTuStandardFilterWatcherNew COMMAND otbImageBaseTestDriver
+  otbStandardFilterWatcherNew
+  ${INPUTDATA}/qb_RoadExtract.img
+  )
+otb_add_test(NAME coTuStandardOneLineFilterWatcher COMMAND otbImageBaseTestDriver
+  otbStandardOneLineFilterWatcherTest
+  ${INPUTDATA}/qb_RoadExtract.img
+  )
+otb_add_test(NAME coTvStandardWriterWatcher COMMAND otbImageBaseTestDriver
+  otbStandardWriterWatcher
+  ${INPUTDATA}/couleurs.tif
+  ${TEMP}/coTvStandardWriterWatcherOutput.tif
+  20
+  )

Modules/Core/Common/test/otbCommonTestDriver.cxx

@@ -18,4 +18,7 @@ void RegisterTests()
   REGISTER_TEST(otbImageRegionNonUniformMultidimensionalSplitter);
   REGISTER_TEST(otbRectangleNew);
   REGISTER_TEST(otbConfigurationManagerTest);
+  REGISTER_TEST(otbStandardFilterWatcherNew);
+  REGISTER_TEST(otbStandardOneLineFilterWatcherTest);
+  REGISTER_TEST(otbStandardWriterWatcher);
 }

Modules/Core/ImageBase/test/CMakeLists.txt

@@ -5,7 +5,6 @@ otbImageBaseTestDriver.cxx
 otbFlexibleDistanceWithMissingValue.cxx
 otbImageAndVectorImageOperationFilterNew.cxx
 otbImagePCAShapeModelEstimatorTest.cxx
-otbStandardOneLineFilterWatcherTest.cxx
 otbFunctionToImageFilter.cxx
 otbOssimElevManagerTest.cxx
 otbExtractROI2.cxx
@@ -23,13 +22,11 @@ otbImageOfVectorsToMonoChannelExtractROINew.cxx
 otbExtractROINew.cxx
 otbExtractROI_RGB.cxx
 otbComplexToIntensityFilterTest.cxx
-otbStandardFilterWatcherNew.cxx
 otbMultiToMonoChannelExtractROINew.cxx
 otbMultiToMonoChannelExtractROI.cxx
 otbImageTest.cxx
 otbFlexibleDistanceWithMissingValueNew.cxx
 otbImageFunctionAdaptor.cxx
-otbStandardWriterWatcher.cxx
 otbMultiChannelExtractROINew.cxx
 )
 
@@ -69,10 +66,6 @@ otb_add_test(NAME bfTvItkImagePCAShapeModelEstimatorTest COMMAND otbImageBaseTes
   )
 set_property(TEST bfTvItkImagePCAShapeModelEstimatorTest PROPERTY DEPENDS bfTvInnerProductPCAImageFilterAllsOutputsWithoutUnbiasedEstimator)
 
-otb_add_test(NAME coTuStandardOneLineFilterWatcher COMMAND otbImageBaseTestDriver
-  otbStandardOneLineFilterWatcherTest
-  ${INPUTDATA}/qb_RoadExtract.img
-  )
 
 
 
@@ -365,10 +358,6 @@ otb_add_test(NAME coTvExtractROI_QB COMMAND otbImageBaseTestDriver
 otb_add_test(NAME bfTvComplexToIntensityFilterTest COMMAND otbImageBaseTestDriver
   otbComplexToIntensityFilterTest)
 
-otb_add_test(NAME coTuStandardFilterWatcherNew COMMAND otbImageBaseTestDriver
-  otbStandardFilterWatcherNew
-  ${INPUTDATA}/qb_RoadExtract.img
-  )
 
 otb_add_test(NAME coTuMultiToMonoROINew COMMAND otbImageBaseTestDriver
   otbMultiToMonoChannelExtractROINew)
@@ -408,12 +397,6 @@ otb_add_test(NAME feTuImageFunctionAdaptorNew COMMAND otbImageBaseTestDriver
   otbImageFunctionAdaptorNew
   )
 
-otb_add_test(NAME coTvStandardWriterWatcher COMMAND otbImageBaseTestDriver
-  otbStandardWriterWatcher
-  ${INPUTDATA}/couleurs.tif
-  ${TEMP}/coTvStandardWriterWatcherOutput.tif
-  20
-  )
 
 otb_add_test(NAME coTuMultiChannelROINew COMMAND otbImageBaseTestDriver
   otbMultiChannelExtractROINew)

Modules/Core/ImageBase/test/otbImageBaseTestDriver.cxx

@@ -4,7 +4,6 @@ void RegisterTests()
   REGISTER_TEST(otbFlexibleDistanceWithMissingValue);
   REGISTER_TEST(otbImageAndVectorImageOperationFilterNew);
   REGISTER_TEST(otbImagePCAShapeModelEstimatorTest);
-  REGISTER_TEST(otbStandardOneLineFilterWatcherTest);
   REGISTER_TEST(otbFunctionToImageFilter);
   REGISTER_TEST(otbOssimElevManagerTest);
   REGISTER_TEST(otbExtractROI2);
@@ -24,13 +23,11 @@ void RegisterTests()
   REGISTER_TEST(otbExtractROINew);
   REGISTER_TEST(otbExtractROI_RGB);
   REGISTER_TEST(otbComplexToIntensityFilterTest);
-  REGISTER_TEST(otbStandardFilterWatcherNew);
   REGISTER_TEST(otbMultiToMonoChannelExtractROINew);
   REGISTER_TEST(otbMultiToMonoChannelExtractROI);
   REGISTER_TEST(otbImageTest);
   REGISTER_TEST(otbFlexibleDistanceWithMissingValueNew);
   REGISTER_TEST(otbImageFunctionAdaptorNew);
   REGISTER_TEST(otbImageFunctionAdaptor);
-  REGISTER_TEST(otbStandardWriterWatcher);
   REGISTER_TEST(otbMultiChannelExtractROINew);
 }