ENH: Automatic move of files to module Core/ObjectList

Modules/Core/ImageBase/otb-module.cmake

@@ -15,7 +15,6 @@ otb_module(OTBImageBase
     OTBImageIO
     OTBImageManipulation
     OTBMoments
-    OTBOssim
     OTBStatistics
     OTBTestKernel
 

Modules/Core/ObjectList/otb-module.cmake

@@ -12,6 +12,7 @@ otb_module(OTBObjectList
     OTBImageBase
     OTBImageIO
     OTBTestKernel
+    OTBVectorDataBase
 
   DESCRIPTION
     "${DOCUMENTATION}"

Modules/Core/ObjectList/test/CMakeLists.txt

@@ -12,6 +12,8 @@ set(OTBObjectListTests
   otbImageListToVectorImageFilter2.cxx
   otbImageListToVectorImageFilter.cxx
   otbImageListToVectorImageFilterNew.cxx
+  otbObjectList2.cxx
+  otbObjectListToObjectListFilterNew.cxx
   otbObjectListTestDriver.cxx  )
 
 add_executable(otbObjectListTestDriver ${OTBObjectListTests})
@@ -76,3 +78,8 @@ otb_add_test(NAME coTvImageListToVectorImageFilter COMMAND otbImageBaseTestDrive
   )
 otb_add_test(NAME coTuImageListToVectorImageFilterNew COMMAND otbImageBaseTestDriver
   otbImageListToVectorImageFilterNew)
+otb_add_test(NAME coTvObjectListTestNotValid COMMAND otbVectorDataBaseTestDriver
+  otbObjectList2
+  )
+otb_add_test(NAME coTuObjectListToObjectListFilterNew COMMAND otbVectorDataBaseTestDriver
+  otbObjectListToObjectListFilterNew)

Modules/Core/ObjectList/test/otbObjectListTestDriver.cxx

@@ -13,4 +13,6 @@ void RegisterTests()
   REGISTER_TEST(otbImageListToVectorImageFilter2);
   REGISTER_TEST(otbImageListToVectorImageFilter);
   REGISTER_TEST(otbImageListToVectorImageFilterNew);
+  REGISTER_TEST(otbObjectList2);
+  REGISTER_TEST(otbObjectListToObjectListFilterNew);
 }

Modules/Core/VectorDataBase/test/CMakeLists.txt

@@ -6,13 +6,11 @@ otbVectorData.cxx
 otbVectorDataKeywordlistTest.cxx
 otbPolygon.cxx
 otbVectorDataSourceNew.cxx
-otbObjectList2.cxx
 otbDataNodeTest.cxx
 otbRemoteSensingRegion.cxx
 otbPolygonNew.cxx
 otbPolyLineParametricPathWithValueNew.cxx
 otbRemoteSensingRegionNew.cxx
-otbObjectListToObjectListFilterNew.cxx
 otbVectorDataNew.cxx
 )
 
@@ -58,9 +56,6 @@ otb_add_test(NAME coTuVectorDataSource COMMAND otbVectorDataBaseTestDriver
   otbVectorDataSourceNew
   )
 
-otb_add_test(NAME coTvObjectListTestNotValid COMMAND otbVectorDataBaseTestDriver
-  otbObjectList2
-  )
 
 otb_add_test(NAME coTvDataNode COMMAND otbVectorDataBaseTestDriver
   otbDataNodeTest
@@ -81,8 +76,6 @@ otb_add_test(NAME coTuPolyLineParametricPathWithValueNew COMMAND otbVectorDataBa
 otb_add_test(NAME coTuRemoteSensingRegionNew COMMAND otbVectorDataBaseTestDriver
   otbRemoteSensingRegionNew )
 
-otb_add_test(NAME coTuObjectListToObjectListFilterNew COMMAND otbVectorDataBaseTestDriver
-  otbObjectListToObjectListFilterNew)
 
 otb_add_test(NAME coTuVectorData COMMAND otbVectorDataBaseTestDriver
   otbVectorDataNew

Modules/Core/VectorDataBase/test/otbVectorDataBaseTestDriver.cxx

@@ -6,12 +6,10 @@ void RegisterTests()
   REGISTER_TEST(otbVectorDataKeywordlist);
   REGISTER_TEST(otbPolygon);
   REGISTER_TEST(otbVectorDataSourceNew);
-  REGISTER_TEST(otbObjectList2);
   REGISTER_TEST(otbDataNodeTest);
   REGISTER_TEST(otbRemoteSensingRegion);
   REGISTER_TEST(otbPolygonNew);
   REGISTER_TEST(otbPolyLineParametricPathWithValueNew);
   REGISTER_TEST(otbRemoteSensingRegionNew);
-  REGISTER_TEST(otbObjectListToObjectListFilterNew);
   REGISTER_TEST(otbVectorDataNew);
 }