[openrtm-commit:01301] r2496 - in branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest: ExecutionContextServiceServant OrganizationServant PortServiceServant RTObjectServant SDOServant stubs
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 2月 15日 (土) 15:10:01 JST
Author: win-ei
Date: 2014-02-15 15:10:01 +0900 (Sat, 15 Feb 2014)
New Revision: 2496
Modified:
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ExecutionContextServiceServant/Makefile.am
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/OrganizationServant/Makefile.am
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/PortServiceServant/Makefile.am
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/PortServiceServant/PortServiceServantTests.cpp
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/Makefile.am
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/RTObjectServantTests.cpp
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/Makefile.am
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/SDOServantTests.cpp
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ExecutionContextServiceImpl.cpp
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/LightweightRTObjectImpl.cpp
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/LightweightRTObjectImpl.h
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ModeCapableImpl.cpp
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/OrganizationImpl.cpp
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/PortServiceImpl.cpp
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/RTObjectImpl.cpp
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOImpl.cpp
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOImpl.h
branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOServiceImpl.h
Log:
Daily work.
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ExecutionContextServiceServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ExecutionContextServiceServant/Makefile.am 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/ExecutionContextServiceServant/Makefile.am 2014-02-15 06:10:01 UTC (rev 2496)
@@ -46,6 +46,9 @@
ExecutionContextServiceServantTests_SOURCES += $(IDL_SOURCES:.idl=Stub.cpp)
ExecutionContextServiceServantTests_SOURCES += $(open_rtm_dir)/doil/ORBManager.cpp
ExecutionContextServiceServantTests_SOURCES += $(open_rtm_dir)/doil/corba/CORBAManager.cpp
+ExecutionContextServiceServantTests_SOURCES += ../stubs/RTObjectImpl.cpp
+ExecutionContextServiceServantTests_SOURCES += ../stubs/PortServiceImpl.cpp
+ExecutionContextServiceServantTests_SOURCES += ../stubs/ExecutionContextImpl.cpp
ExecutionContextServiceServantTests_SOURCES += ../stubs/ExecutionContextServiceImpl.cpp
ExecutionContextServiceServantTests_SOURCES += ../stubs/Logger.cpp
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/OrganizationServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/OrganizationServant/Makefile.am 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/OrganizationServant/Makefile.am 2014-02-15 06:10:01 UTC (rev 2496)
@@ -46,6 +46,7 @@
OrganizationServantTests_SOURCES += $(IDL_SOURCES:.idl=Stub.cpp)
OrganizationServantTests_SOURCES += $(open_rtm_dir)/doil/ORBManager.cpp
OrganizationServantTests_SOURCES += $(open_rtm_dir)/doil/corba/CORBAManager.cpp
+OrganizationServantTests_SOURCES += ../stubs/SDOSystemElementImpl.cpp
OrganizationServantTests_SOURCES += ../stubs/OrganizationImpl.cpp
OrganizationServantTests_SOURCES += ../stubs/Logger.cpp
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/PortServiceServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/PortServiceServant/Makefile.am 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/PortServiceServant/Makefile.am 2014-02-15 06:10:01 UTC (rev 2496)
@@ -53,6 +53,7 @@
PortServiceServantTests_SOURCES += $(open_rtm_dir)/doil/corba/CORBAManager.cpp
PortServiceServantTests_SOURCES += ../stubs/PortServiceImpl.cpp
PortServiceServantTests_SOURCES += ../stubs/ExecutionContextImpl.cpp
+PortServiceServantTests_SOURCES += ../stubs/RTObjectImpl.cpp
PortServiceServantTests_SOURCES += ../stubs/Logger.cpp
PortServiceServantTests_LDFLAGS = -L$(libdir)
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/PortServiceServant/PortServiceServantTests.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/PortServiceServant/PortServiceServantTests.cpp 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/PortServiceServant/PortServiceServantTests.cpp 2014-02-15 06:10:01 UTC (rev 2496)
@@ -36,6 +36,7 @@
: public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(PortServiceServantTests);
+/*
CPPUNIT_TEST(test_call_get_port_profile);
CPPUNIT_TEST(test_call_get_connector_profiles);
CPPUNIT_TEST(test_call_get_connector_profile);
@@ -43,7 +44,10 @@
CPPUNIT_TEST(test_call_disconnect);
CPPUNIT_TEST(test_call_disconnect_all);
CPPUNIT_TEST(test_call_notify_connect);
+*/
CPPUNIT_TEST(test_call_notify_disconnect);
+/*
+*/
//CPPUNIT_TEST(test_case0);
CPPUNIT_TEST_SUITE_END();
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/Makefile.am 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/Makefile.am 2014-02-15 06:10:01 UTC (rev 2496)
@@ -46,6 +46,10 @@
RTObjectServantTests_SOURCES += $(IDL_SOURCES:.idl=Stub.cpp)
RTObjectServantTests_SOURCES += $(open_rtm_dir)/doil/ORBManager.cpp
RTObjectServantTests_SOURCES += $(open_rtm_dir)/doil/corba/CORBAManager.cpp
+RTObjectServantTests_SOURCES += ../stubs/RTObjectImpl.cpp
+RTObjectServantTests_SOURCES += ../stubs/ExecutionContextImpl.cpp
+RTObjectServantTests_SOURCES += ../stubs/Logger.cpp
+RTObjectServantTests_SOURCES += ../stubs/PortServiceImpl.cpp
RTObjectServantTests_LDFLAGS = -L$(libdir)
@@ -57,9 +61,6 @@
RTObjectServantTests_LDADD += $(target_srcdir)/RTObjectServant.o
RTObjectServantTests_LDADD += $(target_srcdir)/RTCTypeConversion.o
RTObjectServantTests_LDADD += $(target_srcdir)/SDOPackageTypeConversion.o
-RTObjectServantTests_SOURCES += ../stubs/RTObjectImpl.cpp
-RTObjectServantTests_SOURCES += ../stubs/ExecutionContextImpl.cpp
-RTObjectServantTests_SOURCES += ../stubs/Logger.cpp
RTObjectServantTests_LDADD += $(target_srcdir)/ComponentActionServant.o
RTObjectServantTests_LDADD += $(target_srcdir)/LightweightRTObjectServant.o
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/RTObjectServantTests.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/RTObjectServantTests.cpp 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/RTObjectServant/RTObjectServantTests.cpp 2014-02-15 06:10:01 UTC (rev 2496)
@@ -36,7 +36,7 @@
: public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(RTObjectServantTests);
- CPPUNIT_TEST(test_call_get_component_profile);
+ //CPPUNIT_TEST(test_call_get_component_profile);
CPPUNIT_TEST(test_call_get_ports);
//CPPUNIT_TEST(test_case0);
CPPUNIT_TEST_SUITE_END();
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/Makefile.am
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/Makefile.am 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/Makefile.am 2014-02-15 06:10:01 UTC (rev 2496)
@@ -47,6 +47,8 @@
SDOServantTests_SOURCES += $(open_rtm_dir)/doil/ORBManager.cpp
SDOServantTests_SOURCES += $(open_rtm_dir)/doil/corba/CORBAManager.cpp
SDOServantTests_SOURCES += ../stubs/SDOImpl.cpp
+SDOServantTests_SOURCES += ../stubs/ConfigurationImpl.cpp
+SDOServantTests_SOURCES += ../stubs/SDOServiceImpl.cpp
SDOServantTests_SOURCES += ../stubs/Logger.cpp
SDOServantTests_LDFLAGS = -L$(libdir)
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/SDOServantTests.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/SDOServantTests.cpp 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/SDOServant/SDOServantTests.cpp 2014-02-15 06:10:01 UTC (rev 2496)
@@ -40,10 +40,12 @@
CPPUNIT_TEST(test_call_get_sdo_type);
CPPUNIT_TEST(test_call_get_device_profile);
CPPUNIT_TEST(test_call_get_service_profiles);
+
CPPUNIT_TEST(test_call_get_service_profile);
CPPUNIT_TEST(test_call_get_sdo_service);
CPPUNIT_TEST(test_call_get_configuration);
CPPUNIT_TEST(test_call_get_monitoring);
+
CPPUNIT_TEST(test_call_get_organizations);
CPPUNIT_TEST(test_call_get_status_list);
CPPUNIT_TEST(test_call_get_status);
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ExecutionContextServiceImpl.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ExecutionContextServiceImpl.cpp 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ExecutionContextServiceImpl.cpp 2014-02-15 06:10:01 UTC (rev 2496)
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <ExecutionContextServiceImpl.h>
+#include <RTObjectImpl.h>
#include <iostream>
#include <sstream>
#include <string>
@@ -57,7 +58,7 @@
::RTC::Local::ExecutionContextProfile ret;
m_ret.kind = ::RTC::Local::PERIODIC;
m_ret.rate = 100.0;
- m_ret.owner = NULL;
+ m_ret.owner = new UnitTest::Servant::RTObjectImpl();
return m_ret;
}
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/LightweightRTObjectImpl.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/LightweightRTObjectImpl.cpp 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/LightweightRTObjectImpl.cpp 2014-02-15 06:10:01 UTC (rev 2496)
@@ -35,13 +35,13 @@
{
++count;
m_logger = new Logger();
- //m_pec = new ::UnitTest::Servant::ExecutionContextImpl();
+ m_pec = new ::UnitTest::Servant::ExecutionContextImpl();
}
LightweightRTObjectImpl::LightweightRTObjectImpl(Logger& aLogger)
{
++count;
m_logger = &aLogger;
- //m_pec = new ::UnitTest::Servant::ExecutionContextImpl();
+ m_pec = new ::UnitTest::Servant::ExecutionContextImpl();
}
LightweightRTObjectImpl::~LightweightRTObjectImpl()
@@ -116,11 +116,10 @@
{
m_logger->push("get_context");
}
- std::cout<<"010"<<std::endl;
::RTC::Local::IExecutionContext *ret = new ::UnitTest::Servant::ExecutionContextImpl();
- std::cout<<"020"<<std::endl;
+ std::cout<<"020:"<< m_pec <<std::endl;
//return ret;
- return (::RTC::Local::IExecutionContext *)&m_pec;
+ return m_pec;
}
::RTC::Local::ExecutionContextList LightweightRTObjectImpl::get_owned_contexts()
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/LightweightRTObjectImpl.h
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/LightweightRTObjectImpl.h 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/LightweightRTObjectImpl.h 2014-02-15 06:10:01 UTC (rev 2496)
@@ -113,8 +113,8 @@
char m_name[32];
int refcount;
Logger *m_logger;
- //::RTC::Local::IExecutionContext m_pec;
- ::UnitTest::Servant::ExecutionContextImpl m_pec;
+ ::RTC::Local::IExecutionContext * m_pec;
+ //::UnitTest::Servant::ExecutionContextImpl m_pec;
};
}; // namespace Servant
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ModeCapableImpl.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ModeCapableImpl.cpp 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/ModeCapableImpl.cpp 2014-02-15 06:10:01 UTC (rev 2496)
@@ -55,8 +55,10 @@
m_logger->push("get_fsm_profile");
}
//ModeImpl* lo_ret = new ModeImpl();
- ::RTC::Local::IMode* ret;
- return ret;
+ //::RTC::Local::IMode * ret = new UnitTest::Servant::ModeImpl();
+ //::UnitTest::Servant::ModeImpl * ret = new ::UnitTest::Servant::ModeImpl();
+ //::UnitTest::Servant::ModeImpl ret;
+ return NULL;
}
::RTC::Local::IMode* ModeCapableImpl::get_current_mode()
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/OrganizationImpl.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/OrganizationImpl.cpp 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/OrganizationImpl.cpp 2014-02-15 06:10:01 UTC (rev 2496)
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <OrganizationImpl.h>
+#include <SDOSystemElementImpl.h>
#include <iostream>
#include <sstream>
#include <string>
@@ -55,7 +56,7 @@
{
m_logger->push("get_organization_id");
}
- return "_id";
+ return "foo";
}
::SDOPackage::Local::OrganizationProperty OrganizationImpl::get_organization_property()
@@ -126,7 +127,9 @@
{
m_logger->push("get_owner");
}
- return NULL;
+ ::SDOPackage::Local::ISDOSystemElement * ret = new UnitTest::Servant::SDOSystemElementImpl();
+std::cout<<ret<<std::endl;
+ return ret;
}
bool OrganizationImpl::set_owner(const ::SDOPackage::Local::ISDOSystemElement* sdo)
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/PortServiceImpl.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/PortServiceImpl.cpp 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/PortServiceImpl.cpp 2014-02-15 06:10:01 UTC (rev 2496)
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <PortServiceImpl.h>
+#include <RTObjectImpl.h>
#include <ExecutionContextImpl.h>
#include <iostream>
#include <string>
@@ -54,6 +55,8 @@
m_logger->push("get_port_profile");
}
::RTC::Local::PortProfile ret;
+ ret.port_ref = this;
+ ret.owner = new UnitTest::Servant::RTObjectImpl();
return ret;
}
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/RTObjectImpl.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/RTObjectImpl.cpp 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/RTObjectImpl.cpp 2014-02-15 06:10:01 UTC (rev 2496)
@@ -10,7 +10,9 @@
#include <stdio.h>
+#include <IRTObject.h>
#include <RTObjectImpl.h>
+#include <PortServiceImpl.h>
#include <ExecutionContextImpl.h>
#include <iostream>
#include <string>
@@ -53,7 +55,12 @@
{
m_logger->push("get_component_profile");
}
+ //::RTC::Local::PortProfileList port_profiles;
+ //::RTC::Local::IRTObject* parent;
+ //:::RTC::Local::NVList properties;
::RTC::Local::ComponentProfile ret;
+ //ret.parent = dynamic_cast<::RTC::Local::IRTObject*>(this);
+ ret.parent = this;
return ret;
}
@@ -65,6 +72,8 @@
m_logger->push("get_ports");
}
::RTC::Local::PortServiceList ret;
+ //new UnitTest::Servant::PortServiceImpl();
+ ret.push_back(new UnitTest::Servant::PortServiceImpl());
return ret;
}
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOImpl.cpp
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOImpl.cpp 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOImpl.cpp 2014-02-15 06:10:01 UTC (rev 2496)
@@ -11,6 +11,8 @@
#include <stdio.h>
#include <SDOImpl.h>
+#include <SDOServiceImpl.h>
+#include <ConfigurationImpl.h>
#include <iostream>
#include <sstream>
#include <string>
@@ -35,6 +37,7 @@
{
++count;
m_logger = new Logger();
+ m_sdos = new UnitTest::Servant::SDOServiceImpl();
}
SDOImpl::SDOImpl(Logger& aLogger)
{
@@ -101,7 +104,18 @@
{
m_logger->push("get_service_profile");
}
+
+ ::SDOPackage::Local::NameValue nv;
+ nv.name="foo";
+ nv.value="bar";
+std::cout<<"1"<<std::endl;
::SDOPackage::Local::ServiceProfile prof;
+std::cout<<"2"<<std::endl;
+ prof.id = "foo";
+ prof.interface_type = "bar";
+ prof.properties.push_back(nv);
+ prof.service = m_sdos;
+std::cout<<"3:"<<prof.service<<std::endl;
return prof;
}
@@ -114,7 +128,8 @@
{
m_logger->push("get_sdo_service");
}
- ::SDOPackage::Local::ISDOService* ret;
+ ::SDOPackage::Local::ISDOService* ret = m_sdos;
+ return m_sdos;
return ret;
}
@@ -127,7 +142,7 @@
{
m_logger->push("get_configuration");
}
- ::SDOPackage::Local::IConfiguration* ret;
+ ::SDOPackage::Local::IConfiguration * ret = new UnitTest::Servant::ConfigurationImpl() ;
return ret;
}
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOImpl.h
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOImpl.h 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOImpl.h 2014-02-15 06:10:01 UTC (rev 2496)
@@ -102,6 +102,7 @@
const char* name() { return m_name; }
void incRef() { refcount++; }
void decRef() { refcount--; }
+ ::SDOPackage::Local::ISDOService * m_sdos;
private:
static int count;
char m_name[32];
Modified: branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOServiceImpl.h
===================================================================
--- branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOServiceImpl.h 2014-02-15 02:24:20 UTC (rev 2495)
+++ branches/work_ForDoil/OpenRTM-aist/src/lib/doil/utils/omniidl_be/tests/unitTest/stubs/SDOServiceImpl.h 2014-02-15 06:10:01 UTC (rev 2496)
@@ -34,7 +34,7 @@
class SDOServiceImpl
: public virtual doil::ImplBase,
- public virtual RTC::Local::ISDOService
+ public virtual SDOPackage::Local::ISDOService
{
public:
More information about the openrtm-commit
mailing list