[openrtm-commit:01308] r2503 - branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTObjectProxy

[openrtm ＠ openrtm.org]

Author: win-ei
Date: 2014-02-16 09:55:08 +0900 (Sun, 16 Feb 2014)
New Revision: 2503

Modified:
   branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTObjectProxy/RTObjectProxyTests.cpp
Log:
Daily work. 

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-15 18:38:42 UTC (rev 2502)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/RTObjectProxy/RTObjectProxyTests.cpp	2014-02-16 00:55:08 UTC (rev 2503)
@@ -609,26 +609,30 @@
      */
     char* get_sdo_id()
     {
-        char m_str[] = "bar";
-        char *ret = m_str;
         if (m_logger != NULL) 
           {
             m_logger->push("get_sdo_id");
           }
-        return ret;
+        char m_str[] = "bar";
+        char *ret = m_str;
+	CORBA::String_var sdo_id;
+	sdo_id = CORBA::string_dup(m_str);
+	return sdo_id._retn();
     }
     /*! 
      *
      */
     char* get_sdo_type()
     {
-        char str[] = "bar";
-        char *ret = str;
         if (m_logger != NULL) 
           {
             m_logger->push("get_sdo_type");
           }
-        return ret;
+        char m_str[] = "bar";
+        char *ret = m_str;
+	CORBA::String_var sdo_id;
+	sdo_id = CORBA::string_dup(m_str);
+	return sdo_id._retn();
     }
     /*! 
      *
@@ -1670,8 +1674,7 @@
       std::string str2("bar");
 
       std::string result;
-      //result = ap->get_sdo_id();
-      //ap->get_sdo_id();
+      result = ap->get_sdo_id();
       CPPUNIT_ASSERT_EQUAL_MESSAGE("not method name", logger.pop(), str);
       CPPUNIT_ASSERT_EQUAL_MESSAGE("not true", str2, result);
 
@@ -1708,11 +1711,9 @@
       std::string str2("bar");
 
       std::string result;
-      //result = ap->get_sdo_type();
-      //ap->get_sdo_type();
+      result = ap->get_sdo_type();
       CPPUNIT_ASSERT_EQUAL_MESSAGE("not method name", logger.pop(), str);
       CPPUNIT_ASSERT_EQUAL_MESSAGE("not true", str2, result);
-
       delete ap;
       CORBA::release(ref);
     }