[openrtm-commit:01578] r2645 - trunk/OpenRTM-aist/src/lib/rtm/tests/ECFactory

[openrtm ＠ openrtm.org]

Author: irie
Date: 2015-06-29 10:34:51 +0900 (Mon, 29 Jun 2015)
New Revision: 2645

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/tests/ECFactory/ECFactoryTests.cpp
Log:
[compat,test] Change RTC::PeriodicExecutionContext to RTC::ExecutionContextBase. refs #3232

Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ECFactory/ECFactoryTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ECFactory/ECFactoryTests.cpp	2015-06-29 01:13:00 UTC (rev 2644)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ECFactory/ECFactoryTests.cpp	2015-06-29 01:34:51 UTC (rev 2645)
@@ -94,8 +94,8 @@
       std::auto_ptr<RTC::ECFactoryBase> factory(
 		new RTC::ECFactoryCXX(
 				      name.c_str(),
-				      RTC::ECCreate<RTC::PeriodicExecutionContext>,
-				      RTC::ECDelete<RTC::PeriodicExecutionContext>));
+				      RTC::ECCreate<RTC::ExecutionContextBase>,
+				      RTC::ECDelete<RTC::ExecutionContextBase>));
 			
       // コンストラクタで指定した名称を、name()メソッドで正しく取得できるか？
       CPPUNIT_ASSERT_EQUAL(name, std::string(factory->name()));
@@ -112,17 +112,17 @@
       std::auto_ptr<RTC::ECFactoryBase> factory(
 		new RTC::ECFactoryCXX(
 				      "name of execution context",
-				      RTC::ECCreate<RTC::PeriodicExecutionContext>,
-				      RTC::ECDelete<RTC::PeriodicExecutionContext>));
+				      RTC::ECCreate<RTC::ExecutionContextBase>,
+				      RTC::ECDelete<RTC::ExecutionContextBase>));
 			
       // create()呼出しにより、所定のExcecutionContextのインスタンスが生成されるか？
       RTC::ExecutionContextBase* ec = factory->create();
-      CPPUNIT_ASSERT(dynamic_cast<RTC::PeriodicExecutionContext*>(ec) != 0);
+      CPPUNIT_ASSERT(dynamic_cast<RTC::ExecutionContextBase*>(ec) != 0);
 			
       // destroy()呼出しにより、所定のExecutionContextインスタンスが削除されるか？
       m_pPOA->deactivate_object(*m_pPOA->servant_to_id(ec));
       factory->destroy(ec);
-      CPPUNIT_ASSERT(dynamic_cast<RTC::PeriodicExecutionContext*>(ec) == 0);
+      CPPUNIT_ASSERT(dynamic_cast<RTC::ExecutionContextBase*>(ec) == 0);
     }
 		
   };