[openrtm-commit:01566] r2633 - trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject

[openrtm ＠ openrtm.org]

Author: irie
Date: 2015-06-22 09:04:03 +0900 (Mon, 22 Jun 2015)
New Revision: 2633

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am
   trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/RTObjectTests.cpp
Log:
[compat,test] Change RTC::PeriodicExecutioneContext to RTC_exp::... and Add source files to Makefile.am. refs #3208

Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am	2015-06-18 00:45:23 UTC (rev 2632)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am	2015-06-22 00:04:03 UTC (rev 2633)
@@ -50,6 +50,16 @@
 nodist_RTObjectTests_SOURCES = \
 	../TestRunner.cpp \
 	$(IDL_SOURCES:.idl=Skel.cpp) \
+	$(top_srcdir)/src/lib/rtm/ConfigurationListener.cpp \
+	$(top_srcdir)/src/lib/rtm/RTObjectStateMachine.cpp \
+	$(top_srcdir)/src/lib/rtm/ExecutionContextProfile.cpp \
+	$(top_srcdir)/src/lib/rtm/ExecutionContextWorker.cpp \
+	$(top_srcdir)/src/lib/rtm/ComponentActionListener.cpp \
+	$(top_srcdir)/src/lib/rtm/SdoServiceAdmin.cpp \
+	$(top_srcdir)/src/lib/rtm/LocalServiceAdmin.cpp \
+	$(top_srcdir)/src/lib/rtm/ExecutionContextBase.cpp \
+	$(top_srcdir)/src/lib/rtm/ManagerActionListener.cpp \
+	$(top_srcdir)/src/lib/rtm/PortConnectListener.cpp \
 	$(top_srcdir)/src/lib/rtm/NVUtil.cpp \
 	$(top_srcdir)/src/lib/rtm/CORBA_IORUtil.cpp \
 	$(top_srcdir)/src/lib/coil/common/stringutil.cpp \

Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/RTObjectTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/RTObjectTests.cpp	2015-06-18 00:45:23 UTC (rev 2632)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/RTObjectTests.cpp	2015-06-22 00:04:03 UTC (rev 2633)
@@ -651,8 +651,8 @@
       RTObjectMock* rto = new RTObjectMock(m_pORB, m_pPOA); // will be deleted automatically
 			
       // ExecutionContextを生成する
-      RTC::PeriodicExecutionContext* ec
-	= new RTC::PeriodicExecutionContext(); // will be deleted automatically
+      RTC_exp::PeriodicExecutionContext* ec
+	= new RTC_exp::PeriodicExecutionContext(); // will be deleted automatically
 			
       // ExecutionContextにattachしておく
       RTC::UniqueId id = rto->attach_context(ec->_this());
@@ -692,10 +692,10 @@
       RTObjectMock* rto = new RTObjectMock(m_pORB, m_pPOA); // will be deleted automatically
 			
       // ExecutionContextを生成する
-      RTC::PeriodicExecutionContext* ec1
-	= new RTC::PeriodicExecutionContext(); // will be deleted automatically
-      RTC::PeriodicExecutionContext* ec2
-	= new RTC::PeriodicExecutionContext(); // will be deleted automatically
+      RTC_exp::PeriodicExecutionContext* ec1
+	= new RTC_exp::PeriodicExecutionContext(); // will be deleted automatically
+      RTC_exp::PeriodicExecutionContext* ec2
+	= new RTC_exp::PeriodicExecutionContext(); // will be deleted automatically
 			
       // ExecutionContextにattachしておく
       RTC::UniqueId id1 = rto->attach_context(ec1->_this());
@@ -732,10 +732,10 @@
       RTObjectMock* rto = new RTObjectMock(m_pORB, m_pPOA); // will be deleted automatically
 			
       // ExecutionContextを生成する
-      RTC::PeriodicExecutionContext* ec1
-	= new RTC::PeriodicExecutionContext(); // will be deleted automatically
-      RTC::PeriodicExecutionContext* ec2
-	= new RTC::PeriodicExecutionContext(); // will be deleted automatically
+      RTC_exp::PeriodicExecutionContext* ec1
+	= new RTC_exp::PeriodicExecutionContext(); // will be deleted automatically
+      RTC_exp::PeriodicExecutionContext* ec2
+	= new RTC_exp::PeriodicExecutionContext(); // will be deleted automatically
 
       // ExecutionContextにattachしておく
       RTC::UniqueId id1 = rto->attach_context(ec1->_this());
@@ -1072,10 +1072,10 @@
       RTObjectMock* rto = new RTObjectMock(m_pORB, m_pPOA); // will be deleted automatically
 
       // ExecutionContextを生成する
-      RTC::PeriodicExecutionContext* ec1
-	= new RTC::PeriodicExecutionContext(); // will be deleted automatically
-      RTC::PeriodicExecutionContext* ec2
-	= new RTC::PeriodicExecutionContext(); // will be deleted automatically
+      RTC_exp::PeriodicExecutionContext* ec1
+	= new RTC_exp::PeriodicExecutionContext(); // will be deleted automatically
+      RTC_exp::PeriodicExecutionContext* ec2
+	= new RTC_exp::PeriodicExecutionContext(); // will be deleted automatically
 
       // ExecutionContextにattachしておく
       RTC::UniqueId id1 = rto->attach_context(ec1->_this());
@@ -1800,7 +1800,7 @@
       CPPUNIT_ASSERT_EQUAL(-1, id);
 
       // m_ecMine 未登録の場合、m_ecMineの番号を返すか？
-      RTC::PeriodicExecutionContext* pec = new RTC::PeriodicExecutionContext();
+      RTC_exp::PeriodicExecutionContext* pec = new RTC_exp::PeriodicExecutionContext();
       ec = pec->getObjRef();
       id = (int)(rto->bindContext(ec));
 
@@ -1813,7 +1813,7 @@
       // m_ecMine 登録済みで nil の場合、m_ecMineの番号を返すか？
       rto->ecMine[0] = RTC::ExecutionContextService::_nil();
       rto->set_ecMine();
-      RTC::PeriodicExecutionContext* pec2 = new RTC::PeriodicExecutionContext();
+      RTC_exp::PeriodicExecutionContext* pec2 = new RTC_exp::PeriodicExecutionContext();
       ec = pec2->getObjRef();
       id = (int)(rto->bindContext(ec));