[openrtm-commit:01290] r2485 - in branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests: ExecutionContextServiceProxy ModeCapableProxy RTObjectProxy SDOSystemElementProxy unitTest/ConfigurationServant unitTest/stubs

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-02-13 15:44:56 +0900 (Thu, 13 Feb 2014)
New Revision: 2485

Modified:
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextServiceProxy/ExecutionContextServiceProxyTests.cpp
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ModeCapableProxy/ModeCapableProxyTests.cpp
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTObjectProxy/RTObjectProxyTests.cpp
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/SDOSystemElementProxy/SDOSystemElementProxyTests.cpp
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ConfigurationServant/ConfigurationServantTests.cpp
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ConfigurationImpl.cpp
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ConfigurationImpl.h
Log:
Daily work.

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextServiceProxy/ExecutionContextServiceProxyTests.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextServiceProxy/ExecutionContextServiceProxyTests.cpp	2014-02-12 17:16:54 UTC (rev 2484)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ExecutionContextServiceProxy/ExecutionContextServiceProxyTests.cpp	2014-02-13 06:44:56 UTC (rev 2485)
@@ -101,7 +101,11 @@
              ::SDOPackage::InternalError)
      {
         if (m_logger != NULL) m_logger->log("get_profile");
-        return NULL;
+
+
+        ::RTC::ExecutionContextProfile_var prof;
+        prof = new ::RTC::ExecutionContextProfile();
+        return prof._retn();
      }
     /*! 
      *
@@ -305,8 +309,8 @@
       obj->setLogger(&logger);
 
       CPPUNIT_ASSERT_EQUAL(0, logger.countLog("get_profile"));
-      const ::SDOPackage::Local::DeviceProfile porf;
-      ap->get_profile();
+      ::RTC::Local::ExecutionContextProfile prof;
+      prof = ap->get_profile();
       CPPUNIT_ASSERT_EQUAL(1, logger.countLog("get_profile"));
 
       

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ModeCapableProxy/ModeCapableProxyTests.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ModeCapableProxy/ModeCapableProxyTests.cpp	2014-02-12 17:16:54 UTC (rev 2484)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/ModeCapableProxy/ModeCapableProxyTests.cpp	2014-02-13 06:44:56 UTC (rev 2485)
@@ -73,6 +73,7 @@
   protected:
       ::std::vector<std::string> m_log;
   private:
+        ::RTC::Mode_var m_varMode;
   public :
       ModeCapableMock(){}
       virtual ~ModeCapableMock()
@@ -90,6 +91,11 @@
      ::RTC::Mode_ptr get_default_mode()
      {
         if (m_logger != NULL) m_logger->log("get_default_mode");
+        //::RTC::MODE_var mode;
+        //mode = new ::RTC::MODE();
+        //return mode._retn();
+        return m_varMode._retn();
+
      }
     /*! 
      *

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTObjectProxy/RTObjectProxyTests.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTObjectProxy/RTObjectProxyTests.cpp	2014-02-12 17:16:54 UTC (rev 2484)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTObjectProxy/RTObjectProxyTests.cpp	2014-02-13 06:44:56 UTC (rev 2485)
@@ -62,6 +62,8 @@
     std::vector<std::string> m_log;
   };
 
+
+
   /*!
    * 
    * 
@@ -90,6 +92,9 @@
      ::RTC::ComponentProfile* get_component_profile()
      {
         if (m_logger != NULL) m_logger->log("get_component_profile");
+        ::RTC::ComponentProfile_var prof;
+        prof = new ::RTC::ComponentProfile();
+        return prof._retn();
      }
     /*! 
      *
@@ -97,6 +102,9 @@
      ::RTC::PortServiceList* get_ports()
      {
         if (m_logger != NULL) m_logger->log("get_ports");
+        ::RTC::PortServiceList_var ports;
+        ports = new ::RTC::PortServiceList();
+        return ports._retn();
      }
     /*! 
      *

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/SDOSystemElementProxy/SDOSystemElementProxyTests.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/SDOSystemElementProxy/SDOSystemElementProxyTests.cpp	2014-02-12 17:16:54 UTC (rev 2484)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/SDOSystemElementProxy/SDOSystemElementProxyTests.cpp	2014-02-13 06:44:56 UTC (rev 2485)
@@ -90,6 +90,9 @@
      ::SDOPackage::OrganizationList* get_owned_organizations()
      {
         if (m_logger != NULL) m_logger->log("get_owned_organizationse");
+        ::SDOPackage::OrganizationList_var org;
+        org = new ::SDOPackage::OrganizationList();
+        return org._retn();
      }
   private:
     Logger* m_logger;

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ConfigurationServant/ConfigurationServantTests.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ConfigurationServant/ConfigurationServantTests.cpp	2014-02-12 17:16:54 UTC (rev 2484)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ConfigurationServant/ConfigurationServantTests.cpp	2014-02-13 06:44:56 UTC (rev 2485)
@@ -43,7 +43,7 @@
   {
     CPPUNIT_TEST_SUITE(ConfigurationServantTests);
     CPPUNIT_TEST(test_call_set_device_profile);
-    CPPUNIT_TEST(test_call_set_service_profile);
+    CPPUNIT_TEST(test_call_add_service_profile);
     CPPUNIT_TEST(test_call_add_organization);
     CPPUNIT_TEST(test_call_remove_service_profile);
     CPPUNIT_TEST(test_call_remove_organization);
@@ -132,14 +132,14 @@
      * @brief Impl‚̃ƒ\ƒh‚ªŒÄ‚яo‚³‚ê‚Ä‚¢‚邱‚Æ
      * @brief –ß‚è’l‚ª‘Ó–‚Å‚ ‚邱‚Æ
      */
-    void test_call_set_service_profile()
+    void test_call_add_service_profile()
     {
       CPPUNIT_ASSERT(CServant);
 
-      std::string str("set_service_profile");
+      std::string str("add_service_profile");
       ::SDOPackage::ServiceProfile sp;
       ::CORBA::Boolean result;
-      result = CServant->set_service_profile(sp);
+      result = CServant->add_service_profile(sp);
       CPPUNIT_ASSERT_EQUAL_MESSAGE("not true", true, result);
       CPPUNIT_ASSERT_EQUAL_MESSAGE("not method name", Log.pop(), str);
     }
@@ -319,7 +319,7 @@
       std::string config_id("hoge");
       ::SDOPackage::ConfigurationSet set;
       ::CORBA::Boolean result;
-      result = CServant->set_configuration_set_values(config_id.c_str(), set);
+      result = CServant->set_configuration_set_values(set);
       CPPUNIT_ASSERT_EQUAL_MESSAGE("not true", true, result);
       CPPUNIT_ASSERT_EQUAL_MESSAGE("not method name", Log.pop(), str);
       CPPUNIT_ASSERT_EQUAL_MESSAGE("not argument", Log.pop(), config_id);

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ConfigurationImpl.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ConfigurationImpl.cpp	2014-02-12 17:16:54 UTC (rev 2484)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ConfigurationImpl.cpp	2014-02-13 06:44:56 UTC (rev 2485)
@@ -59,7 +59,7 @@
       return true;
     }
 
-     bool ConfigurationImpl::set_service_profile(const ::SDOPackage::Local::ServiceProfile& sProfile)
+     bool ConfigurationImpl::add_service_profile(const ::SDOPackage::Local::ServiceProfile& sProfile)
       throw (::SDOPackage::Local::InvalidParameter,
              ::SDOPackage::Local::NotAvailable,
              ::SDOPackage::Local::InternalError)
@@ -155,13 +155,12 @@
       return result;
     }
 
-     bool ConfigurationImpl::set_configuration_set_values(const ::std::string&config_id, const ::SDOPackage::Local::ConfigurationSet& configuration_set)
+     bool ConfigurationImpl::set_configuration_set_values(const ::SDOPackage::Local::ConfigurationSet& configuration_set)
       throw (::SDOPackage::Local::InvalidParameter,
              ::SDOPackage::Local::NotAvailable,
              ::SDOPackage::Local::InternalError)
     {
       m_logger->push("set_configuration_set_values");
-      m_logger->push(config_id.c_str());
       return true;
     }
 

Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ConfigurationImpl.h
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ConfigurationImpl.h	2014-02-12 17:16:54 UTC (rev 2484)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ConfigurationImpl.h	2014-02-13 06:44:56 UTC (rev 2485)
@@ -44,7 +44,7 @@
              ::SDOPackage::Local::NotAvailable,
              ::SDOPackage::Local::InternalError);
 
-    virtual bool set_service_profile(const ::SDOPackage::Local::ServiceProfile& sProfile)
+    virtual bool add_service_profile(const ::SDOPackage::Local::ServiceProfile& sProfile)
       throw (::SDOPackage::Local::InvalidParameter,
              ::SDOPackage::Local::NotAvailable,
              ::SDOPackage::Local::InternalError);
@@ -90,7 +90,7 @@
       throw (::SDOPackage::Local::NotAvailable,
              ::SDOPackage::Local::InternalError);
 
-    virtual bool set_configuration_set_values(const ::std::string&config_id, const ::SDOPackage::Local::ConfigurationSet& configuration_set)
+    virtual bool set_configuration_set_values(const ::SDOPackage::Local::ConfigurationSet& configuration_set)
       throw (::SDOPackage::Local::InvalidParameter,
              ::SDOPackage::Local::NotAvailable,
              ::SDOPackage::Local::InternalError);