[openrtm-commit:01591] r2657 - in trunk/OpenRTM-aist/src/lib/rtm/tests: InPort InPortConnector

[openrtm ＠ openrtm.org]

Author: irie
Date: 2015-09-10 16:29:50 +0900 (Thu, 10 Sep 2015)
New Revision: 2657

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/tests/InPort/InPortTests.cpp
   trunk/OpenRTM-aist/src/lib/rtm/tests/InPortConnector/InPortConnectorTests.cpp
   trunk/OpenRTM-aist/src/lib/rtm/tests/InPortConnector/Makefile.am
Log:
[compat,test] Change Tests.cpp of InPort and InPortConnector. Add source files to Makefile.am. refs #3208

Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/InPort/InPortTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/InPort/InPortTests.cpp	2015-09-09 05:07:35 UTC (rev 2656)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/InPort/InPortTests.cpp	2015-09-10 07:29:50 UTC (rev 2657)
@@ -674,7 +674,7 @@
                                            InPortProvider* provider,
 					   ConnectorListeners& listeners,
                                            CdrBufferBase* buffer)
-    : InPortConnector(profile, buffer),
+    : InPortConnector(profile, listeners, buffer),
       m_listeners(listeners)
   {
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/InPortConnector/InPortConnectorTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/InPortConnector/InPortConnectorTests.cpp	2015-09-09 05:07:35 UTC (rev 2656)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/InPortConnector/InPortConnectorTests.cpp	2015-09-10 07:29:50 UTC (rev 2657)
@@ -48,8 +48,9 @@
   {
   public:
       InPortConnectorMock(RTC::ConnectorInfo& info,
+			  RTC::ConnectorListeners& listeners,
                           RTC::CdrBufferBase* buffer)
-        : RTC::InPortConnector(info, buffer)
+        : RTC::InPortConnector(info, listeners, buffer)
       {
       }
       virtual ~InPortConnectorMock()
@@ -148,8 +149,9 @@
                                 prop); 
         RTC::CdrBufferBase* m_thebuffer;
         m_thebuffer = RTC::CdrBufferFactory::instance().createObject("ring_buffer");
+        RTC::ConnectorListeners m_listeners;
 
-        InPortConnector::InPortConnectorMock connector(info, m_thebuffer);
+        InPortConnector::InPortConnectorMock connector(info, m_listeners, m_thebuffer);
         CPPUNIT_ASSERT_EQUAL(std::string(cprof.connector_id), std::string(connector.id()));
         CPPUNIT_ASSERT_EQUAL(std::string(cprof.name), std::string(connector.name()));
         CPPUNIT_ASSERT_EQUAL(m_thebuffer, connector.getBuffer());

Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/InPortConnector/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/InPortConnector/Makefile.am	2015-09-09 05:07:35 UTC (rev 2656)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/InPortConnector/Makefile.am	2015-09-10 07:29:50 UTC (rev 2657)
@@ -43,6 +43,8 @@
 nodist_InPortConnectorTests_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 \