diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt index 0b2bfd8befc0b00e0fba4be08f426b8348b29563..5718ca82a5ace1610d9f2b938eca4e97e40907de 100644 --- a/Testing/Code/Common/CMakeLists.txt +++ b/Testing/Code/Common/CMakeLists.txt @@ -827,7 +827,7 @@ ENDIF(OTB_USE_MAPNIK) IF(OTB_USE_PQXX) ADD_TEST(coTuPostGISConnectionImplementationNew ${COMMON_TESTS10} -otbPostGISConnectionImplementationNew + otbPostGISConnectionImplementationNew ) #This test need a runing PostGIS server on the localhost with trusted potgres user and an ecisting testgis base @@ -849,17 +849,18 @@ ADD_TEST(coTvPostGISConnectionImplementationPerformTransaction ${COMMON_TESTS10} ADD_TEST(coTuGISTableNew ${COMMON_TESTS10} -otbGISTableNew + otbGISTableNew ) ADD_TEST(coTuPostGISTableNew ${COMMON_TESTS10} -otbPostGISTableNew + otbPostGISTableNew ) ADD_TEST(coTuVectorDataToGISTableFilterNew ${COMMON_TESTS10} -otbVectorDataToGISTableFilterNew + otbVectorDataToGISTableFilterNew ) + # ADD_TEST(coTuVectorDataToGISTableFilter ${COMMON_TESTS10} # otbVectorDataToGISTableFilter # ${INPUTDATA}/ToulousePoints-examples.shp @@ -868,25 +869,30 @@ otbVectorDataToGISTableFilterNew # postgres # ) +ADD_TEST(coTuGISTableToGISTableFilterNew ${COMMON_TESTS10} + otbGISTableToGISTableFilterNew +) + + ADD_TEST(coTuLabelMapToGISTableFilterNew ${COMMON_TESTS10} -otbLabelMapToGISTableFilterNew + otbLabelMapToGISTableFilterNew ) ADD_TEST(coTuGISTableToLabelMapFilterNew ${COMMON_TESTS10} -otbGISTableToLabelMapFilterNew + otbGISTableToLabelMapFilterNew ) ADD_TEST(coTuGISTableToVectorDataFilterNew ${COMMON_TESTS10} -otbGISTableToVectorDataFilterNew + otbGISTableToVectorDataFilterNew ) ADD_TEST(coTvLabelMapToGISTableFilter ${COMMON_TESTS10} -otbLabelMapToGISTableFilter -${INPUTDATA}/rcc8_mire1.png -orfeotoolbox_test -labelmaptogis_test_table -orfeotoolbox_test_user -Bidfeud0 + otbLabelMapToGISTableFilter + ${INPUTDATA}/rcc8_mire1.png + orfeotoolbox_test + labelmaptogis_test_table + orfeotoolbox_test_user + Bidfeud0 ) @@ -1112,6 +1118,7 @@ otbGISTableNew.cxx otbPostGISTableNew.cxx otbVectorDataToGISTableFilterNew.cxx # otbVectorDataToGISTableFilter.cxx +otbGISTableToGISTableFilterNew.cxx otbLabelMapToGISTableFilterNew.cxx otbGISTableToLabelMapFilterNew.cxx otbGISTableToVectorDataFilterNew.cxx diff --git a/Testing/Code/Common/otbCommonTests10.cxx b/Testing/Code/Common/otbCommonTests10.cxx index bc9ae7b05826f7a67ae56c47d28deaa8c3ec8829..512e1f4ab38a17365275f31f225c8c7ca0b219a2 100644 --- a/Testing/Code/Common/otbCommonTests10.cxx +++ b/Testing/Code/Common/otbCommonTests10.cxx @@ -33,6 +33,7 @@ void RegisterTests() REGISTER_TEST(otbPostGISTableNew); REGISTER_TEST(otbVectorDataToGISTableFilterNew); // REGISTER_TEST(otbVectorDataToGISTableFilter); + REGISTER_TEST(otbGISTableToGISTableFilterNew); REGISTER_TEST(otbLabelMapToGISTableFilterNew); REGISTER_TEST(otbGISTableToVectorDataFilterNew); REGISTER_TEST(otbGISTableToLabelMapFilterNew); diff --git a/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx b/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx new file mode 100644 index 0000000000000000000000000000000000000000..dc73d8396653fda9cc5d6d3e1fa1ec7e5f2d47e0 --- /dev/null +++ b/Testing/Code/Common/otbGISTableToGISTableFilterNew.cxx @@ -0,0 +1,35 @@ +/*========================================================================= + + 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. + +=========================================================================*/ +#include "itkExceptionObject.h" +#include "otbMacro.h" + +#include "otbGISTable.h" +#include "otbPostGISConnectionImplementation.h" +#include "otbGISTableToGISTableFilter.h" + +int otbGISTableToGISTableFilterNew(int argc, char * argv[]) +{ + typedef otb::PostGISConnectionImplementation GISConnectionType; + typedef otb::GISTable<GISConnectionType, double, 2> GISTableType; + typedef otb::GISTableToGISTableFilter<GISTableType, GISTableType> GISFilterType; + + //Instantiation + GISFilterType::Pointer data = GISFilterType::New(); + + return EXIT_SUCCESS; +}