diff --git a/Testing/Code/BasicFilters/CMakeLists.txt b/Testing/Code/BasicFilters/CMakeLists.txt index bab294fabc9a172828963cdef5a1c7ce13c56094..fde17c112594c18f36aeadad95fd7116a92743c5 100644 --- a/Testing/Code/BasicFilters/CMakeLists.txt +++ b/Testing/Code/BasicFilters/CMakeLists.txt @@ -1635,6 +1635,9 @@ ADD_TEST(bfTvImageAndVectorImageOperationFilterTest ${BASICFILTERS_TESTS12} IF(OTB_COMPILE_MUPARSER) ADD_TEST(bfTuNaryParserImageFilter ${BASICFILTERS_TESTS13} + otbNaryParserImageFilterNew) + +ADD_TEST(bfTvNaryParserImageFilter ${BASICFILTERS_TESTS13} otbNaryParserImageFilter) ENDIF(OTB_COMPILE_MUPARSER) diff --git a/Testing/Code/BasicFilters/otbBasicFiltersTests13.cxx b/Testing/Code/BasicFilters/otbBasicFiltersTests13.cxx index 055f85ea821e4bdd7ff3c2d8fe6622c41894070f..52cb1eff1b29b4d3a7bdb3d56c61745081d56af5 100644 --- a/Testing/Code/BasicFilters/otbBasicFiltersTests13.cxx +++ b/Testing/Code/BasicFilters/otbBasicFiltersTests13.cxx @@ -26,5 +26,6 @@ void RegisterTests() { + REGISTER_TEST(otbNaryParserImageFilterNew); REGISTER_TEST(otbNaryParserImageFilter); } diff --git a/Testing/Code/BasicFilters/otbNaryParserImageFilter.cxx b/Testing/Code/BasicFilters/otbNaryParserImageFilter.cxx index 29d45a4de8b154e493dfa17502a79abe78bd7505..826079312b03fb6fe756e5dd9b8ae67061f2e50b 100644 --- a/Testing/Code/BasicFilters/otbNaryParserImageFilter.cxx +++ b/Testing/Code/BasicFilters/otbNaryParserImageFilter.cxx @@ -27,6 +27,18 @@ #include "otbImage.h" #include "otbNaryParserImageFilter.h" +int otbNaryParserImageFilterNew( int argc, char* argv[]) +{ + typedef double PixelType; + //typedef float PixelType; + typedef otb::Image<PixelType, 2> ImageType; + typedef otb::NaryParserImageFilter<ImageType> FilterType; + + FilterType::Pointer filter = FilterType::New(); + + return EXIT_SUCCESS; +} + int otbNaryParserImageFilter( int argc, char* argv[]) { typedef double PixelType; diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt index 7e20073d8f5e9a37af901c33f661bbe43b638c46..7859d8afecb9ca4eaf3bfa6e63d6770be27e21fc 100644 --- a/Testing/Code/Common/CMakeLists.txt +++ b/Testing/Code/Common/CMakeLists.txt @@ -993,8 +993,11 @@ otbVectorDataToLabelMapFilter # ---------------- otbParser ---------------------# IF(OTB_COMPILE_MUPARSER) - ADD_TEST(coTuParser ${COMMON_TESTS12} + otbParserTestNew + ) + + ADD_TEST(coTvParser ${COMMON_TESTS12} otbParserTest ) ENDIF(OTB_COMPILE_MUPARSER) diff --git a/Testing/Code/Common/otbCommonTests12.cxx b/Testing/Code/Common/otbCommonTests12.cxx index d296c9c738314791b7bd569fd257fd38d838d655..f11a9e0d157059ec6a313038d2676948567b9706 100644 --- a/Testing/Code/Common/otbCommonTests12.cxx +++ b/Testing/Code/Common/otbCommonTests12.cxx @@ -26,5 +26,6 @@ void RegisterTests() { + REGISTER_TEST(otbParserTestNew); REGISTER_TEST(otbParserTest); } diff --git a/Testing/Code/Common/otbParserTest.cxx b/Testing/Code/Common/otbParserTest.cxx index e72b013fabf56a5101e252fbb3ed3772233ca1ee..d70a211e2031244002dbfd4de930b09290745dec 100644 --- a/Testing/Code/Common/otbParserTest.cxx +++ b/Testing/Code/Common/otbParserTest.cxx @@ -21,6 +21,16 @@ #include "otbParser.h" +int otbParserTestNew(int argc, char * argv[]) +{ + typedef otb::Parser ParserType; + + // Instantiating object + ParserType::Pointer parser = ParserType::New(); + + return EXIT_SUCCESS; +} + int otbParserTest(int argc, char * argv[]) { double result; @@ -107,7 +117,7 @@ int otbParserTest(int argc, char * argv[]) if(error > 10E-5) { - itkGenericExceptionMacro( << "Cumulated Error > 10E-3 -> Test Failled" << std::endl ); + itkGenericExceptionMacro( << "Cumulated Error > 10E-5 -> Test Failled" << std::endl ); } /* Exception Tests */