[openrtm-commit:00424] r217 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: resource/100/CXX/build/vc1 src/jp/go/aist/rtm/rtcbuilder/generator src/jp/go/aist/rtm/rtcbuilder/generator/param/idl src/jp/go/aist/rtm/rtcbuilder/manager test/jp/go/aist/rtm/rtcbuilder/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 9月 25日 (日) 14:59:19 JST
Author: sakamoto
Date: 2011-09-25 14:59:19 +0900 (Sun, 25 Sep 2011)
New Revision: 217
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/Makefile.foo
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceArgumentParam.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
Log:
Modify Module Arg #2258
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/Makefile.foo
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/Makefile.foo 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/build/vc1/Makefile.foo 2011-09-25 05:59:19 UTC (rev 217)
@@ -11,8 +11,8 @@
# --module-category=sample --module-comp-type=STATIC
# --module-act-type=PERIODIC --module-max-inst=2
# --inport=InP1:RTC::TimedShort --inport=InP2:RTC::TimedLong --outport=OutP1:RTC::TimedInt --outport=OutP2:RTC::TimedFloat
-# --service-idl=C:\Project\RTM\git34\jp.go.aist.rtm.rtcbuilder\/resource/MyService.idl
-# --consumer-idl=C:\Project\RTM\git34\jp.go.aist.rtm.rtcbuilder\/resource/DAQService.idl
+# --service-idl=__ROOT_PATH__resource/MyService.idl
+# --consumer-idl=__ROOT_PATH__resource/DAQService.idl
# --service=svPort:acc:MyService
# --consumer=cmPort:rate:DAQService
#
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -92,6 +92,7 @@
serviceArgumentParam
.setType(node2String(n.param_type_spec));
serviceArgumentParam.setDirection(node2String(n.param_attribute));
+ serviceArgumentParam.setModule(service.getModule());
serviceMethodParam.getArguments().add(
serviceArgumentParam);
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceArgumentParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceArgumentParam.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/ServiceArgumentParam.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -11,6 +11,7 @@
private String type;
private String originalType;
private String name;
+ private String module;
private String direction;
private boolean isUnbounded;
private boolean isArray;
@@ -30,6 +31,13 @@
public void setType(String argType) {
this.type = argType;
}
+
+ public String getModule() {
+ return module;
+ }
+ public void setModule(String module) {
+ this.module = module;
+ }
public String getOriginalType() {
return originalType;
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -234,6 +234,9 @@
} else {
if(typeDef.isStruct()) {
+ if(typeDef.getModule()!=null && typeDef.getModule().length()>0) {
+ result = typeDef.getModule() + result;
+ }
if(typeDef.getDirection().equals("in"))
result = "const " + result + "&";
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -65,7 +65,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(22, result.size());
+ assertEquals(13, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -62,7 +62,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/operation/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -96,7 +96,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/attribute/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -149,7 +149,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service2/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -193,7 +193,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service1/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -226,7 +226,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/outport2/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -256,7 +256,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/outport1/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -283,7 +283,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/inport2/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -309,7 +309,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/inport1/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "testComp.cpp");
checkCode(result, resourceDir, "test.h");
checkCode(result, resourceDir, "test.cpp");
@@ -331,7 +331,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/name/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -69,7 +69,7 @@
ServicePortParam service1 = new ServicePortParam("svPort", 0);
List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "acc", "", "", rootPath + "/resource/MyService.idl",
+ service1, "acc", "", "", rootPath + "resource/MyService.idl",
"MyService", "", 0);
srvinterts.add(int1);
service1.getServicePortInterfaces().addAll(srvinterts);
@@ -80,7 +80,7 @@
List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(
service2, "rate", "", "",
- rootPath + "/resource/DAQService.idl", "DAQService", "", 1);
+ rootPath + "resource/DAQService.idl", "DAQService", "", 1);
srvinterts2.add(int2);
service2.getServicePortInterfaces().addAll(srvinterts2);
srvports.add(service2);
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -95,7 +95,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -76,7 +76,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(14, result.size());
+ assertEquals(13, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -60,7 +60,7 @@
String resourceDir = rootPath + "/resource/100/CXX/DataPortIDL/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -228,7 +228,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Doc/fullLong/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -52,7 +52,7 @@
String resourceDir = rootPath + "/resource/100/CXX/ExecutionCxt/";
- assertEquals(14, result.size());
+ assertEquals(13, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -78,7 +78,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -127,7 +127,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(17, result.size());
+ assertEquals(16, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -54,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceM/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -89,7 +89,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/idlmodule/serviceCon/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -98,4 +98,37 @@
nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
}
+ public void testArgModule() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("ModuleDescription");
+ rtcParam.setVersion("1.0.0");
+ rtcParam.setVender("VenderName");
+ rtcParam.setCategory("Category");
+ rtcParam.setComponentType("UNIQUE");
+ rtcParam.setActivityType("EVENTDRIVEN");
+ rtcParam.setMaxInstance(0);
+ rtcParam.setComponentKind("DataFlowComponent");
+
+ ServicePortParam service1 = new ServicePortParam("sv_name", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "if_name", "", "",
+ rootPath + "/resource/100/CXX/idlmodule/serviceArg/MyServiceModuleTypeDef.idl", "RTC::RTM::MyService", "", 0);
+ srvinterts.add(int1);
+ service1.getServicePortInterfaces().addAll(srvinterts);
+ List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+ srvports.add(service1);
+ rtcParam.getServicePorts().addAll(srvports);
+
+ Generator generator = new Generator();
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArg/";
+
+ assertEquals(14, result.size());
+ checkCode(result, resourceDir, "fooComp.cpp");
+ checkCode(result, resourceDir, "foo.h");
+ checkCode(result, resourceDir, "foo.cpp");
+ checkCode(result, resourceDir, "MyServiceModuleTypeDefSVC_impl.h");
+ checkCode(result, resourceDir, "MyServiceModuleTypeDefSVC_impl.cpp");
+ }
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -76,7 +76,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath3/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -131,7 +131,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath2/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -185,7 +185,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath1/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -56,7 +56,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct/";
- assertEquals(16, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -92,7 +92,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/SeqString/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -163,7 +163,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct2/";
- assertEquals(16, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -200,7 +200,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
- assertEquals(16, result.size());
+ assertEquals(15, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -53,7 +53,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/all/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -80,7 +80,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/execute/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -106,7 +106,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/finalize/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -129,7 +129,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/initialize/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -47,7 +47,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library2/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -73,7 +73,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library1/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -87,7 +87,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProConMulti/";
- assertEquals(17, result.size());
+ assertEquals(16, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -119,7 +119,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ConMulti/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkResults(result, resourceDir);
nonexist(result, resourceDir, "MyServiceSVC_impl.h");
nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -151,7 +151,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProMulti/";
- assertEquals(17, result.size());
+ assertEquals(16, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -219,7 +219,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -58,7 +58,7 @@
String resourceDir = rootPath + "/resource/100/CXX/SystemConfig/";
- assertEquals(14, result.size());
+ assertEquals(13, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -53,7 +53,7 @@
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String targetDir = rootPath + "/resource/100/CXX/AIST2/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, targetDir, "ModuleNameComp.cpp");
checkCode(result, targetDir, "ModuleName.h");
checkCode(result, targetDir, "ModuleName.cpp");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2011-09-25 04:42:52 UTC (rev 216)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2011-09-25 05:59:19 UTC (rev 217)
@@ -76,7 +76,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort2/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -131,7 +131,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort1/";
- assertEquals(15, result.size());
+ assertEquals(14, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -167,7 +167,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Variable/DataPort/";
- assertEquals(13, result.size());
+ assertEquals(12, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
openrtm-commit メーリングリストの案内