ENH:initial tests for otbWrapperParameter class

Code/Core/otbWrapperApplication.cxx

@@ -20,12 +20,12 @@
 
 namespace otb
 {
-namespace wrapper
+namespace Wrapper
 {
 
 Application::Application()
 {
-  m_ParameterList = ParameterList::New();
+  //m_ParameterList = ParameterList::New();
 }
 
 Application::~Application()

Code/Core/otbWrapperApplication.h

@@ -24,7 +24,7 @@
 
 namespace otb
 {
-namespace wrapper
+namespace Wrapper
 {
 
 /** \class Application
@@ -45,7 +45,7 @@ public:
   itkNewMacro(Self);
 
   /** RTTI support */
-  itkTypeMacro(Parameter,itk::LightObject);
+  itkTypeMacro(Application,itk::Object);
 
   std::string GetName()
   {
@@ -59,12 +59,16 @@ public:
 
   ParameterList* GetParameterList();
 
-  virtual int Execute() = 0;
+  virtual int Execute() { return 0;}
 
 protected:
   Application();
   virtual ~Application();
 
+private:
+  Application(const Application &); //purposely not implemented
+  void operator =(const Application&); //purposely not implemented
+
   void SetName(std::string s)
   {
     m_Name = s;

Code/Core/otbWrapperParameter.h

@@ -105,7 +105,7 @@ public:
   /** Reset to the the default value. Default implementation does
    * nothing 
    */
-  virtual void Reset();
+  virtual void Reset() {}
 
 protected:
   /** Constructor */

Code/Core/otbWrapperParameterList.h

@@ -24,13 +24,13 @@
 
 namespace otb
 {
-namespace wrapper
+namespace Wrapper
 {
 
 /**
  * \class WrapperParameterList
  */
-class ITK_EXPORT ParameterList : public itk::LightObject
+class ITK_EXPORT ParameterList : public itk::Object
 {
 public:
   /** Standard class typedefs. */
@@ -38,12 +38,21 @@ public:
   typedef itk::Object                          Superclass;
   typedef itk::SmartPointer<Self>              Pointer;
   typedef itk::SmartPointer<const Self>        ConstPointer;
+  typedef Parameter                            ParameterType;
 
   void AddParameter();
 
-  Parameter* GetParameter(Key& key);
+  ParameterType * GetParameter(std::string & key);
 
 protected:
+  ParameterList()
+  {}
+  virtual ~ParameterList()
+  {}
+
+private:
+  ParameterList(const ParameterList &); //purposely not implemented
+  void operator =(const ParameterList&); //purposely not implemented
 
   std::vector<Parameter::Pointer> m_ParameterList;
 

Testing/otbWrapperParameterTest.cxx

@@ -26,7 +26,7 @@ int otbWrapperParameterNew(int argc, char* argv[])
   typedef otb::Wrapper::Parameter ParameterBaseType;
   ParameterBaseType::Pointer parameter = ParameterBaseType::New();
 
-  std::cout << parameter << std::endl;
+  //std::cout << parameter << std::endl;
 
   return EXIT_SUCCESS;
 }
@@ -36,7 +36,7 @@ int otbWrapperParameterTest1(int argc, char* argv[])
   typedef otb::Wrapper::Parameter ParameterBaseType;
   ParameterBaseType::Pointer parameter = ParameterBaseType::New();
 
-  const string name = argv[1];
+  const std::string name = argv[1];
 
   parameter->SetName(name);
 

Testing/otbWrapperTests.cxx

@@ -27,4 +27,5 @@
 void RegisterTests()
 {
   REGISTER_TEST(otbWrapperParameterNew);
+  REGISTER_TEST(otbWrapperParameterTest1);
 }