[openrtm-commit:01594] r2660 - trunk/OpenRTM-aist/src/lib/rtm/tests/InPortBase

[openrtm ＠ openrtm.org]

Author: irie
Date: 2015-09-16 10:23:24 +0900 (Wed, 16 Sep 2015)
New Revision: 2660

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/tests/InPortBase/InPortBaseTests.cpp
Log:
[compat,test] Change Tests.cpp of InPortBase. refs #3309

Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/InPortBase/InPortBaseTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/InPortBase/InPortBaseTests.cpp	2015-09-16 00:33:07 UTC (rev 2659)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/InPortBase/InPortBaseTests.cpp	2015-09-16 01:23:24 UTC (rev 2660)
@@ -993,7 +993,7 @@
         //getPortProfileのpropertiesに以下が追加される
         CPPUNIT_ASSERT_EQUAL(std::string("push,pull"),
                              prop["dataport.dataflow_type"]);
-        CPPUNIT_ASSERT_EQUAL(std::string("corba_cdr"),
+        CPPUNIT_ASSERT_EQUAL(std::string("corba_cdr, direct"),
                              prop["dataport.interface_type"]);
  
         //ProviderTypes,ConsumerTypesが取得される
@@ -1090,7 +1090,7 @@
         //getPortProfileのpropertiesに以下が追加される
         CPPUNIT_ASSERT_EQUAL(std::string("push,pull"),
                              prop["dataport.dataflow_type"]);
-        CPPUNIT_ASSERT_EQUAL(std::string("corba_cdr"),
+        CPPUNIT_ASSERT_EQUAL(std::string("corba_cdr, direct"),
                              prop["dataport.interface_type"]);
  
         //ProviderTypes,ConsumerTypesが取得される
@@ -1183,7 +1183,7 @@
         //getPortProfileのpropertiesに以下が追加される
         CPPUNIT_ASSERT_EQUAL(std::string("push,pull"),
                              prop["dataport.dataflow_type"]);
-        CPPUNIT_ASSERT_EQUAL(std::string("corba_cdr"),
+        CPPUNIT_ASSERT_EQUAL(std::string("corba_cdr, direct"),
                              prop["dataport.interface_type"]);
  
         //ProviderTypes,ConsumerTypesが取得される
@@ -1265,7 +1265,7 @@
         //getPortProfileのpropertiesに以下が追加される
         CPPUNIT_ASSERT_EQUAL(std::string("push"),
                              prop["dataport.dataflow_type"]);
-        CPPUNIT_ASSERT_EQUAL(std::string("corba_cdr"),
+        CPPUNIT_ASSERT_EQUAL(std::string("corba_cdr, direct"),
                              prop["dataport.interface_type"]);
  
         //ProviderTypes,ConsumerTypesが取得される
@@ -1335,14 +1335,14 @@
         prop = NVUtil::toProperties(profile.properties);
 
         //getPortProfileのpropertiesに以下が追加される
-        CPPUNIT_ASSERT_EQUAL(std::string(""),
+        CPPUNIT_ASSERT_EQUAL(std::string("push"),
                              prop["dataport.dataflow_type"]);
-        CPPUNIT_ASSERT_EQUAL(std::string(""),
+        CPPUNIT_ASSERT_EQUAL(std::string("direct"),
                              prop["dataport.interface_type"]);
 
         //ProviderTypes,ConsumerTypesが取得される
         pstr = inport.getProviderTypes();
-        CPPUNIT_ASSERT((size_t)0== pstr.size());
+        CPPUNIT_ASSERT((size_t)0!= pstr.size());
 
         portAdmin.deletePort(inport);
     }