ENH: correct some troubles in tests

Testing/Core/CMakeLists.txt

@@ -25,11 +25,6 @@ add_test(owTuNumericalParameter ${OTB_WRAPPER_TESTS}
 	otbWrapperNumericalParameterNew
   )
 
-# EmptyParameter class test
-add_test(owTuEmptyParameter ${OTB_WRAPPER_TESTS}
-	otbWrapperEmptyParameterNew
-  )
-
 # NumericalParameter class test
 add_test(owTuNumericalParameter ${OTB_WRAPPER_TESTS}
 	otbWrapperNumericalParameterNew
@@ -42,6 +37,37 @@ add_test(owTvNumericalParameter ${OTB_WRAPPER_TESTS}
 	"my description"
   )
 
+# String parameter class test
+add_test(owTuStringParameter ${OTB_WRAPPER_TESTS}
+    otbWrapperStringParameterNew
+  )
+
+add_test(owTvStringParameter ${OTB_WRAPPER_TESTS}
+    otbWrapperStringParameterTest1
+    "value1"
+    "mykey"
+    "my description"
+  )
+
+# String list parameter class test
+add_test(owTuStringListParameter ${OTB_WRAPPER_TESTS}
+    otbWrapperStringListParameterNew
+  )
+
+add_test(owTvStringListParameter ${OTB_WRAPPER_TESTS}
+    otbWrapperStringListParameterTest1
+    "value1"
+    "value2"
+    "value3"
+    "mykey"
+    "my description"
+  )
+
+# EmptyParameter class test
+add_test(owTuEmptyParameter ${OTB_WRAPPER_TESTS}
+	otbWrapperEmptyParameterNew
+  )
+
 # Input Image parameter class test
 add_test(owTuInputImageParameter ${OTB_WRAPPER_TESTS}
 	otbWrapperInputImageParameterNew
@@ -58,21 +84,6 @@ add_test(owTuInputVectorDataParameter ${OTB_WRAPPER_TESTS}
     otbWrapperInputVectorDataParameterNew
   )
 
-# Application class test
-add_test(owTuApplication ${OTB_WRAPPER_TESTS}
-	otbWrapperApplicationNew
-  )
-
-# Application class test
-add_test(owTvApplicationRegistry ${OTB_WRAPPER_TESTS}
-    otbWrapperApplicationRegistry
-  )
-
-# ParameterKey class test
-add_test(owTvParameterKey ${OTB_WRAPPER_TESTS}
-    otbWrapperParameterKey
-  )
-
 # Input image list parameter class test
 add_test(owTuInputImageListParameter ${OTB_WRAPPER_TESTS}
     otbWrapperInputImageListParameterNew
@@ -85,6 +96,18 @@ add_test(owTvInputImageListParameter ${OTB_WRAPPER_TESTS}
     "mykey"
     "my description"
   )
+# Output image parameter class test
+add_test(owTuOutputImageParameter ${OTB_WRAPPER_TESTS}
+    otbWrapperOutputImageParameterNew
+  )
+
+add_test(owTvOutputImageParameter ${OTB_WRAPPER_TESTS}
+    otbWrapperOutputImageParameterTest1
+    ${INPUTDATA}/poupees.tif
+    ${TEMP}/owTvOutputImageParameter2.tif
+    "mykey"
+    "my description"
+  )
 
 # Output image list parameter class test
 add_test(owTuOutputImageListParameter ${OTB_WRAPPER_TESTS}
@@ -95,12 +118,27 @@ add_test(owTvOutputImageListParameter ${OTB_WRAPPER_TESTS}
     otbWrapperOutputImageListParameterTest1
     ${INPUTDATA}/poupees_c1.hdr
     ${INPUTDATA}/poupees.tif
-    ${TEMP}/owTvInputImageListParameter1.tif
-    ${TEMP}/owTvInputImageListParameter2.tif
+    ${TEMP}/owTvOutputImageListParameter1.tif
+    ${TEMP}/owTvOutputImageListParameter2.tif
     "mykey"
     "my description"
   )
 
+# Application class test
+add_test(owTuApplication ${OTB_WRAPPER_TESTS}
+	otbWrapperApplicationNew
+  )
+
+# Application class test
+add_test(owTvApplicationRegistry ${OTB_WRAPPER_TESTS}
+    otbWrapperApplicationRegistry
+  )
+
+# ParameterKey class test
+add_test(owTvParameterKey ${OTB_WRAPPER_TESTS}
+    otbWrapperParameterKey
+  )
+
 
 # ----------------Source files CXX -----------------------------------
 
@@ -112,14 +150,17 @@ otbWrapperChoiceParameterTest.cxx
 otbWrapperEmptyParameterTest.cxx
 otbWrapperInputImageParameterTest.cxx
 otbWrapperInputVectorDataParameterTest.cxx
-otbWrapperNumericalParameterTest.cxx
+otbWrapperInputImageListParameterTest.cxx
 otbWrapperOutputImageParameterTest.cxx
+otbWrapperOutputImageListParameterTest.cxx
+otbWrapperNumericalParameterTest.cxx
 otbWrapperParameterListTest.cxx
 otbWrapperParameterTest.cxx
 otbWrapperApplicationRegistryTest.cxx
 otbWrapperParameterKeyTest.cxx
-otbWrapperInputImageListParameterTest.cxx
-otbWrapperOutputImageListParameterTest.cxx
+
+otbWrapperStringParameterTest.cxx
+otbWrapperStringListParameterTest.cxx
 )
 
 include_directories(${CMAKE_SOURCE_DIR}/Code/Core)

Testing/Core/otbWrapperCoreTests.cxx

@@ -36,14 +36,19 @@ void RegisterTests()
   REGISTER_TEST(otbWrapperEmptyParameterNew);
   REGISTER_TEST(otbWrapperInputImageParameterNew);
   REGISTER_TEST(otbWrapperInputImageParameterTest1);
+  REGISTER_TEST(otbWrapperInputImageListParameterNew);
+  REGISTER_TEST(otbWrapperInputImageListParameterTest1);
   REGISTER_TEST(otbWrapperInputVectorDataParameterNew);
+  REGISTER_TEST(otbWrapperOutputImageParameterNew);
+  REGISTER_TEST(otbWrapperOutputImageParameterTest1);
+  REGISTER_TEST(otbWrapperOutputImageListParameterNew);
+  REGISTER_TEST(otbWrapperOutputImageListParameterTest1);
   REGISTER_TEST(otbWrapperStringParameterNew);
   REGISTER_TEST(otbWrapperStringParameterTest1);
+  REGISTER_TEST(otbWrapperStringListParameterNew);
+  REGISTER_TEST(otbWrapperStringListParameterTest1);
   REGISTER_TEST(otbWrapperParameterListNew);
   REGISTER_TEST(otbWrapperApplicationRegistry);
   REGISTER_TEST(otbWrapperParameterKey);
-  REGISTER_TEST(otbWrapperInputImageListParameterNew);
-  REGISTER_TEST(otbWrapperInputImageListParameterTest1);
-  REGISTER_TEST(otbWrapperOutputImageListParameterNew);
-  REGISTER_TEST(otbWrapperOutputImageListParameterTest1);
 }
+

Testing/Core/otbWrapperOutputImageParameterTest.cxx

@@ -19,29 +19,38 @@
 #pragma warning ( disable : 4786 )
 #endif
 
-#include "otbWrapperStringParameter.h"
+#include "otbWrapperOutputImageParameter.h"
+#include "otbImageFileReader.h"
+#include "otbWrapperTypes.h"
 
-int otbWrapperStringParameterNew(int argc, char* argv[])
+int otbWrapperOutputImageParameterNew(int argc, char* argv[])
 {
-  typedef otb::Wrapper::StringParameter StringParameterType;
-  StringParameterType::Pointer parameter = StringParameterType::New();
+  typedef otb::Wrapper::OutputImageParameter OutputImageParameterType;
+  OutputImageParameterType::Pointer parameter = OutputImageParameterType::New();
 
   return EXIT_SUCCESS;
 }
 
 
-int otbWrapperStringParameterTest1(int argc, char* argv[])
+int otbWrapperOutputImageParameterTest1(int argc, char* argv[])
 {
-  typedef otb::Wrapper::StringParameter StringParameterType;
-  StringParameterType::Pointer numParam = StringParameterType::New();
+  typedef otb::Wrapper::OutputImageParameter OutputImageParameterType;
+  OutputImageParameterType::Pointer param = OutputImageParameterType::New();
+  
+ typedef otb::ImageFileReader< otb::Wrapper::VectorImageType > ReaderType;
 
-  const std::string value = argv[1];
-  const std::string key   = argv[2];
-  const std::string desc  = argv[3];
+  ReaderType::Pointer reader = ReaderType::New();
 
-  numParam->SetValue(value);
-  numParam->SetKey(key);
-  numParam->SetDescription(desc);
+  reader->SetFileName( argv[1] );
+  reader->UpdateOutputInformation();
+
+  param->SetValue(reader->GetOutput());
+  param->SetFileName( argv[2] );
+
+  param->SetKey(argv[3]);
+  param->SetDescription(argv[4]);
+
+  param->Write();
 
   return EXIT_SUCCESS;
 }