[openrtm-commit:01592] r2658 - in trunk/OpenRTM-aist/src/lib/rtm/tests: ExtTrigExecutionContext InPortBase Manager ManagerServant ModuleManager OutPortBase OutPortConnector PublisherNew RTObject
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2015年 9月 11日 (金) 17:04:52 JST
Author: irie
Date: 2015-09-11 17:04:52 +0900 (Fri, 11 Sep 2015)
New Revision: 2658
Modified:
trunk/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/InPortBase/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortBase/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortBase/OutPortBaseTests.cpp
trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/OutPortConnectorTests.cpp
trunk/OpenRTM-aist/src/lib/rtm/tests/PublisherNew/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am
Log:
[compat,test] Change Tests.cpp of OutPortBase and OutPortConnector. Add source files to Makefile.am. refs #3208
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ExtTrigExecutionContext/Makefile.am 2015-09-11 08:04:52 UTC (rev 2658)
@@ -49,6 +49,8 @@
nodist_ExtTrigExecutionContextTests_SOURCES = \
../TestRunner.cpp \
$(IDL_SOURCES:.idl=Skel.cpp) \
+ $(top_srcdir)/src/lib/rtm/InPortDirectProvider.cpp \
+ $(top_srcdir)/src/lib/rtm/InPortDirectConsumer.cpp \
$(top_srcdir)/src/lib/rtm/NVUtil.cpp \
$(top_srcdir)/src/lib/coil/common/stringutil.cpp \
$(top_srcdir)/src/lib/coil/common/Properties.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/InPortBase/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/InPortBase/Makefile.am 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/InPortBase/Makefile.am 2015-09-11 08:04:52 UTC (rev 2658)
@@ -43,6 +43,8 @@
nodist_InPortBaseTests_SOURCES = \
../TestRunner.cpp \
$(IDL_SOURCES:.idl=Skel.cpp) \
+ $(top_srcdir)/src/lib/rtm/InPortDirectProvider.cpp \
+ $(top_srcdir)/src/lib/rtm/InPortDirectConsumer.cpp \
$(top_srcdir)/src/lib/rtm/PortConnectListener.cpp \
$(top_srcdir)/src/lib/rtm/ConfigurationListener.cpp \
$(top_srcdir)/src/lib/rtm/ExecutionContextProfile.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am 2015-09-11 08:04:52 UTC (rev 2658)
@@ -40,6 +40,8 @@
noinst_LTLIBRARIES = DummyLib.la DummyModule.la DummyModule2.la
nodist_DummyLib_la_SOURCES = \
$(IDL_SOURCES:.idl=Skel.cpp) \
+ $(top_srcdir)/src/lib/rtm/InPortDirectProvider.cpp \
+ $(top_srcdir)/src/lib/rtm/InPortDirectConsumer.cpp \
$(top_srcdir)/src/lib/rtm/ConfigurationListener.cpp \
$(top_srcdir)/src/lib/rtm/RTObjectStateMachine.cpp \
$(top_srcdir)/src/lib/rtm/ExecutionContextProfile.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2015-09-11 08:04:52 UTC (rev 2658)
@@ -51,6 +51,8 @@
noinst_LTLIBRARIES = DummyLib.la DummyModule1.la DummyModule2.la
nodist_DummyLib_la_SOURCES = \
$(IDL_SOURCES:.idl=Skel.cpp) \
+ $(top_srcdir)/src/lib/rtm/InPortDirectProvider.cpp \
+ $(top_srcdir)/src/lib/rtm/InPortDirectConsumer.cpp \
$(top_srcdir)/src/lib/rtm/ConfigurationListener.cpp \
$(top_srcdir)/src/lib/rtm/RTObjectStateMachine.cpp \
$(top_srcdir)/src/lib/rtm/ExecutionContextProfile.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am 2015-09-11 08:04:52 UTC (rev 2658)
@@ -43,6 +43,8 @@
noinst_LTLIBRARIES = DummyLib.la DummyModule1.la
nodist_DummyLib_la_SOURCES = \
$(IDL_SOURCES:.idl=Skel.cpp) \
+ $(top_srcdir)/src/lib/rtm/InPortDirectProvider.cpp \
+ $(top_srcdir)/src/lib/rtm/InPortDirectConsumer.cpp \
$(top_srcdir)/src/lib/rtm/ConfigurationListener.cpp \
$(top_srcdir)/src/lib/rtm/RTObjectStateMachine.cpp \
$(top_srcdir)/src/lib/rtm/ExecutionContextProfile.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortBase/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortBase/Makefile.am 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortBase/Makefile.am 2015-09-11 08:04:52 UTC (rev 2658)
@@ -57,6 +57,8 @@
nodist_OutPortBaseTests_SOURCES = \
../TestRunner.cpp \
$(IDL_SOURCES:.idl=Skel.cpp) \
+ $(top_srcdir)/src/lib/rtm/InPortDirectProvider.cpp \
+ $(top_srcdir)/src/lib/rtm/InPortDirectConsumer.cpp \
$(top_srcdir)/src/lib/rtm/ConfigurationListener.cpp \
$(top_srcdir)/src/lib/rtm/LocalServiceAdmin.cpp \
$(top_srcdir)/src/lib/rtm/RTObjectStateMachine.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortBase/OutPortBaseTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortBase/OutPortBaseTests.cpp 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortBase/OutPortBaseTests.cpp 2015-09-11 08:04:52 UTC (rev 2658)
@@ -2488,7 +2488,7 @@
InPortConsumer* consumer,
ConnectorListeners& listeners,
CdrBufferBase* buffer)
- : OutPortConnector(info),
+ : OutPortConnector(info, listeners),
m_consumer(consumer), m_publisher(0), m_listeners(listeners), m_buffer(buffer)
{
if(info.properties["OutPortBaseTests"]=="bad_alloc")
@@ -2603,7 +2603,7 @@
OutPortProvider* provider,
ConnectorListeners& listeners,
CdrBufferBase* buffer)
- : OutPortConnector(info), m_provider(provider), m_listeners(listeners),
+ : OutPortConnector(info, listeners), m_provider(provider), m_listeners(listeners),
m_buffer(buffer)
{
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/Makefile.am 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/Makefile.am 2015-09-11 08:04:52 UTC (rev 2658)
@@ -43,6 +43,8 @@
nodist_OutPortConnectorTests_SOURCES = \
../TestRunner.cpp \
$(IDL_SOURCES:.idl=Skel.cpp) \
+ $(top_srcdir)/src/lib/rtm/InPortDirectProvider.cpp \
+ $(top_srcdir)/src/lib/rtm/InPortDirectConsumer.cpp \
$(top_srcdir)/src/lib/rtm/ConfigurationListener.cpp \
$(top_srcdir)/src/lib/rtm/LocalServiceAdmin.cpp \
$(top_srcdir)/src/lib/rtm/RTObjectStateMachine.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/OutPortConnectorTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/OutPortConnectorTests.cpp 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/OutPortConnectorTests.cpp 2015-09-11 08:04:52 UTC (rev 2658)
@@ -86,8 +86,8 @@
: public RTC::OutPortConnector
{
public:
- OutPortConnectorMock(RTC::ConnectorInfo& info)
- : RTC::OutPortConnector(info)
+ OutPortConnectorMock(RTC::ConnectorInfo& info, RTC::ConnectorListeners& listeners)
+ : RTC::OutPortConnector(info, listeners)
{
}
virtual ~OutPortConnectorMock()
@@ -205,8 +205,9 @@
NVUtil::copyToProperties(prop, cprof.properties);
RTC::ConnectorInfo info(cprof.name, cprof.connector_id,
CORBA_SeqUtil::refToVstring(cprof.ports), prop);
+ RTC::ConnectorListeners m_listeners;
- OutPortConnectorMock connector(info);
+ OutPortConnectorMock connector(info, m_listeners);
CPPUNIT_ASSERT_EQUAL(std::string(cprof.connector_id), std::string(connector.id()));
CPPUNIT_ASSERT_EQUAL(std::string(cprof.name), std::string(connector.name()));
connector.setEndian(false);
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/PublisherNew/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/PublisherNew/Makefile.am 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/PublisherNew/Makefile.am 2015-09-11 08:04:52 UTC (rev 2658)
@@ -58,6 +58,8 @@
nodist_PublisherNewTests_SOURCES = \
../TestRunner.cpp \
$(IDL_SOURCES:.idl=Skel.cpp) \
+ $(top_srcdir)/src/lib/rtm/InPortDirectProvider.cpp \
+ $(top_srcdir)/src/lib/rtm/InPortDirectConsumer.cpp \
$(top_srcdir)/src/lib/rtm/ConfigurationListener.cpp \
$(top_srcdir)/src/lib/rtm/LocalServiceAdmin.cpp \
$(top_srcdir)/src/lib/rtm/RTObjectStateMachine.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am 2015-09-10 07:29:50 UTC (rev 2657)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/Makefile.am 2015-09-11 08:04:52 UTC (rev 2658)
@@ -50,6 +50,8 @@
nodist_RTObjectTests_SOURCES = \
../TestRunner.cpp \
$(IDL_SOURCES:.idl=Skel.cpp) \
+ $(top_srcdir)/src/lib/rtm/InPortDirectProvider.cpp \
+ $(top_srcdir)/src/lib/rtm/InPortDirectConsumer.cpp \
$(top_srcdir)/src/lib/rtm/ConfigurationListener.cpp \
$(top_srcdir)/src/lib/rtm/RTObjectStateMachine.cpp \
$(top_srcdir)/src/lib/rtm/ExecutionContextProfile.cpp \
More information about the openrtm-commit
mailing list