[openrtm-commit:00368] r2219 - in trunk/OpenRTM-aist/src/lib/rtm/tests: InPortProvider Manager ManagerServant ModuleManager OutPort OutPortConnector OutPortProvider OutPortPushConnector RTObject
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 8月 24日 (水) 07:31:13 JST
Author: n-ando
Date: 2011-08-24 07:31:13 +0900 (Wed, 24 Aug 2011)
New Revision: 2219
Modified:
trunk/OpenRTM-aist/src/lib/rtm/tests/InPortProvider/InPortProviderTests.cpp
trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/DummyModule.cpp
trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule1.h
trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule2.h
trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/DummyModule1.h
trunk/OpenRTM-aist/src/lib/rtm/tests/OutPort/OutPortTests.cpp
trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/OutPortConnectorTests.cpp
trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortProvider/OutPortProviderTests.cpp
trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortPushConnector/OutPortPushConnectorTests.cpp
trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/RTObjectTests.cpp
Log:
Some trivial modifications (virtual dtor, duplicated semicolons, missing headers)
have been applied.
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/InPortProvider/InPortProviderTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/InPortProvider/InPortProviderTests.cpp 2011-08-22 08:05:53 UTC (rev 2218)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/InPortProvider/InPortProviderTests.cpp 2011-08-23 22:31:13 UTC (rev 2219)
@@ -58,6 +58,7 @@
setDataFlowType(dataFlowType.c_str());
setSubscriptionType(subscriptionType.c_str());
}
+ virtual ~InPortProviderMock(){};
void setDummydataInProperties(void)
{
NVUtil::appendStringValue(m_properties, "KEY1", "VALUE1");
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/DummyModule.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/DummyModule.cpp 2011-08-22 08:05:53 UTC (rev 2218)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/DummyModule.cpp 2011-08-23 22:31:13 UTC (rev 2219)
@@ -14,7 +14,7 @@
: RTC::DataFlowComponentBase(manager)
{
};
- ~DummyModule(){};
+ virtual ~DummyModule(){};
static void InitProc(Manager* manager) { m_counter++; }
static int getInitProcCount() { return m_counter; }
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule1.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule1.h 2011-08-22 08:05:53 UTC (rev 2218)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule1.h 2011-08-23 22:31:13 UTC (rev 2219)
@@ -34,7 +34,7 @@
{
public:
DummyModule1(RTC::Manager* manager);
- ~DummyModule1();
+ virtual ~DummyModule1();
// The initialize action (on CREATED->ALIVE transition)
// formaer rtc_init_entry()
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule2.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule2.h 2011-08-22 08:05:53 UTC (rev 2218)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/DummyModule2.h 2011-08-23 22:31:13 UTC (rev 2219)
@@ -34,7 +34,7 @@
{
public:
DummyModule2(RTC::Manager* manager);
- ~DummyModule2();
+ virtual ~DummyModule2();
// The initialize action (on CREATED->ALIVE transition)
// formaer rtc_init_entry()
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/DummyModule1.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/DummyModule1.h 2011-08-22 08:05:53 UTC (rev 2218)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/DummyModule1.h 2011-08-23 22:31:13 UTC (rev 2219)
@@ -34,7 +34,7 @@
{
public:
DummyModule1(RTC::Manager* manager);
- ~DummyModule1();
+ virtual ~DummyModule1();
// The initialize action (on CREATED->ALIVE transition)
// formaer rtc_init_entry()
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/OutPort/OutPortTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/OutPort/OutPortTests.cpp 2011-08-22 08:05:53 UTC (rev 2218)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/OutPort/OutPortTests.cpp 2011-08-23 22:31:13 UTC (rev 2219)
@@ -29,6 +29,8 @@
#ifndef OutPort_cpp
#define OutPort_cpp
+#include <sys/time.h>
+
#include <cppunit/ui/text/TestRunner.h>
#include <cppunit/TextOutputter.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
@@ -184,7 +186,7 @@
bool subscribeInterface(const SDOPackage::NVList& properties)
{
- return true;;
+ return true;
}
/*!
@@ -270,7 +272,7 @@
bool subscribeInterface(const SDOPackage::NVList& properties)
{
- return true;;
+ return true;
}
/*!
@@ -535,7 +537,7 @@
{
m_logger = NULL;
}
- ~PublisherFlushMock()
+ virtual ~PublisherFlushMock()
{
}
/*!
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/OutPortConnectorTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/OutPortConnectorTests.cpp 2011-08-22 08:05:53 UTC (rev 2218)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortConnector/OutPortConnectorTests.cpp 2011-08-23 22:31:13 UTC (rev 2219)
@@ -71,6 +71,7 @@
public:
OutPortMock(const char* name, const char* value)
: OutPortBase(name, value) {}
+ virtual ~OutPortMock() {}
/*!
*
*/
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortProvider/OutPortProviderTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortProvider/OutPortProviderTests.cpp 2011-08-22 08:05:53 UTC (rev 2218)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortProvider/OutPortProviderTests.cpp 2011-08-23 22:31:13 UTC (rev 2219)
@@ -152,6 +152,7 @@
setSubscriptionType(subscriptionType.c_str());
}
+ virtual ~OutPortProviderMock() {}
void setDummydataInProperties(void)
{
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortPushConnector/OutPortPushConnectorTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortPushConnector/OutPortPushConnectorTests.cpp 2011-08-22 08:05:53 UTC (rev 2218)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/OutPortPushConnector/OutPortPushConnectorTests.cpp 2011-08-23 22:31:13 UTC (rev 2219)
@@ -22,6 +22,8 @@
#ifndef OutPortPushConnector_cpp
#define OutPortPushConnector_cpp
+#include <omniORB4/cdrStream.h>
+
#include <cppunit/ui/text/TestRunner.h>
#include <cppunit/TextOutputter.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
@@ -175,7 +177,7 @@
bool subscribeInterface(const SDOPackage::NVList& properties)
{
- return true;;
+ return true;
}
/*!
@@ -212,7 +214,7 @@
{
m_logger = NULL;
}
- ~PublisherFlushMock()
+ virtual ~PublisherFlushMock()
{
}
/*!
@@ -386,7 +388,7 @@
{
m_logger = NULL;
}
- ~PublisherNewMock()
+ virtual ~PublisherNewMock()
{
}
/*!
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/RTObjectTests.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/RTObjectTests.cpp 2011-08-22 08:05:53 UTC (rev 2218)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/RTObject/RTObjectTests.cpp 2011-08-23 22:31:13 UTC (rev 2219)
@@ -208,6 +208,7 @@
{
return;
}
+ virtual ~OutPortMock() {}
bool write() {
++m_cnt;
openrtm-commit メーリングリストの案内