[openrtm-commit:02569] r728 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test: . _100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 4月 12日 (水) 12:45:05 JST
Author: ga
Date: 2017-04-12 12:45:05 +0900 (Wed, 12 Apr 2017)
New Revision: 728
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.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/CXXContentTest.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/CXXIDLStructTest.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/CXXManipTest.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:
Modified TestCase
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -15,6 +15,7 @@
protected String expPath;
protected String expContent;
protected int index;
+ protected final int default_file_num = 27;
public TestBase () {
File fileCurrent = new File(".");
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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -64,7 +64,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(26, result.size());
+ assertEquals(default_file_num, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -62,7 +62,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/operation/";
- assertEquals(26, result.size());
+ assertEquals(default_file_num, 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(26, result.size());
+ assertEquals(default_file_num, 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(28, result.size());
+ assertEquals(default_file_num+2, 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(28, result.size());
+ assertEquals(default_file_num+2, 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(26, result.size());
+ assertEquals(default_file_num, 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(26, result.size());
+ assertEquals(default_file_num, 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(26, result.size());
+ assertEquals(default_file_num, 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(26, result.size());
+ assertEquals(default_file_num, 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(26, result.size());
+ assertEquals(default_file_num, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -88,7 +88,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "src/fooComp.cpp");
checkCode(result, resourceDir, "include/foo/foo.h");
checkCode(result, resourceDir, "src/foo.cpp");
@@ -157,7 +157,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+4, result.size());
checkCode(result, resourceDir, "src/fooComp.cpp");
checkCode(result, resourceDir, "include/foo/foo.h");
checkCode(result, resourceDir, "src/foo.cpp");
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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -111,7 +111,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(26, result.size());
+ assertEquals(default_file_num, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -76,7 +76,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(26, result.size());
+ assertEquals(default_file_num, 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/CXXContentTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -54,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Content/";
- assertEquals(26, result.size());
+ assertEquals(default_file_num, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -60,7 +60,7 @@
String resourceDir = rootPath + "/resource/100/CXX/DataPortIDL/";
- assertEquals(26, result.size());
+ assertEquals(default_file_num, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -228,7 +228,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Doc/fullLong/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -52,7 +52,7 @@
String resourceDir = rootPath + "/resource/100/CXX/ExecutionCxt/";
- assertEquals(26, result.size());
+ assertEquals(default_file_num, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -78,7 +78,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, 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(30, result.size());
+ assertEquals(default_file_num+4, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -54,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceM/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, 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(26, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -124,7 +124,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArg/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -158,7 +158,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, 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/CXXIDLPathTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -76,7 +76,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath3/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, 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(28, result.size());
+ assertEquals(default_file_num+2, 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(28, result.size());
+ assertEquals(default_file_num+2, 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/CXXIDLStructTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -56,7 +56,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlstruct/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "TestModuleComp.cpp");
checkCode(result, resourceDir, "TestModule.h");
checkCode(result, resourceDir, "TestModule.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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -56,7 +56,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, 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(28, result.size());
+ assertEquals(default_file_num+2, 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(28, result.size());
+ assertEquals(default_file_num+2, 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(28, result.size());
+ assertEquals(default_file_num+2, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -53,7 +53,7 @@
String resourceDir = rootPath + "/resource/100/CXX/impl/all/";
- assertEquals(26, result.size());
+ assertEquals(default_file_num, 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(26, result.size());
+ assertEquals(default_file_num, 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(26, result.size());
+ assertEquals(default_file_num, 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(26, result.size());
+ assertEquals(default_file_num, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -47,7 +47,7 @@
String resourceDir = rootPath + "/resource/100/CXX/library/library2/";
- assertEquals(26, result.size());
+ assertEquals(default_file_num, 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(26, result.size());
+ assertEquals(default_file_num, 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/CXXManipTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -54,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlmodule/serviceArgStruct/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
@@ -90,7 +90,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/IDLType1/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "ModuleNameComp.cpp");
checkCode(result, resourceDir, "ModuleName.h");
checkCode(result, resourceDir, "ModuleName.cpp");
@@ -126,7 +126,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Manip/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, 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/CXXMultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -87,7 +87,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProConMulti/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+4, 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(26, result.size());
+ assertEquals(default_file_num, 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(30, result.size());
+ assertEquals(default_file_num+4, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -219,7 +219,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -58,7 +58,7 @@
String resourceDir = rootPath + "/resource/100/CXX/SystemConfig/";
- assertEquals(26, result.size());
+ assertEquals(default_file_num, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -53,7 +53,7 @@
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
String targetDir = rootPath + "/resource/100/CXX/AIST2/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, 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 2017-04-10 08:10:18 UTC (rev 727)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2017-04-12 03:45:05 UTC (rev 728)
@@ -76,7 +76,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort2/";
- assertEquals(28, result.size());
+ assertEquals(default_file_num+2, 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(28, result.size());
+ assertEquals(default_file_num+2, 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(26, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
openrtm-commit メーリングリストの案内