[openrtm-commit:03209] r802 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test: . _100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 3月 3日 (土) 21:42:14 JST
Author: ga
Date: 2018-03-03 21:42:14 +0900 (Sat, 03 Mar 2018)
New Revision: 802
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/TestBase.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java
Log:
Modified rtc.cpnf. #4469
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/TestBase.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/TestBase.java 2018-03-03 12:41:50 UTC (rev 801)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/TestBase.java 2018-03-03 12:42:14 UTC (rev 802)
@@ -16,6 +16,7 @@
protected String expContent;
protected int index;
protected String[] ignore_row_phrases = {"--service-idl=", "--consumer-idl"};
+ protected final int default_file_num = 35;
public TestBase () {
File fileCurrent = new File(".");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2018-03-03 12:41:50 UTC (rev 801)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2018-03-03 12:42:14 UTC (rev 802)
@@ -83,7 +83,7 @@
String resourceDir = rootPath + "/resource/100/base/service2/";
- assertEquals(33, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -127,7 +127,7 @@
String resourceDir = rootPath + "/resource/100/base/service1/";
- assertEquals(33, result.size());
+ assertEquals(default_file_num+1, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -160,7 +160,7 @@
String resourceDir = rootPath + "/resource/100/base/outport2/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -191,7 +191,7 @@
String resourceDir = rootPath + "/resource/100/base/outport1/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -219,7 +219,7 @@
String resourceDir = rootPath + "/resource/100/base/inport2/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -246,7 +246,7 @@
String resourceDir = rootPath + "/resource/100/base/inport1/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -269,7 +269,7 @@
String resourceDir = rootPath + "/resource/100/base/name/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java 2018-03-03 12:41:50 UTC (rev 801)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java 2018-03-03 12:42:14 UTC (rev 802)
@@ -89,7 +89,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(33, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -151,7 +151,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(37, result.size());
+ assertEquals(default_file_num+5, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java 2018-03-03 12:41:50 UTC (rev 801)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java 2018-03-03 12:42:14 UTC (rev 802)
@@ -58,7 +58,7 @@
String targetDir = rootPath + "/resource/100/ConfigSet/AIST7/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, targetDir, "src/ModuleNameComp.java");
checkCode(result, targetDir, "src/ModuleName.java");
checkCode(result, targetDir, "src/ModuleNameImpl.java");
@@ -87,7 +87,7 @@
String targetDir = rootPath + "/resource/100/ConfigSet/AIST6/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, targetDir, "src/ModuleNameComp.java");
checkCode(result, targetDir, "src/ModuleName.java");
checkCode(result, targetDir, "src/ModuleNameImpl.java");
@@ -114,7 +114,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset1/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -143,7 +143,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset2/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -175,7 +175,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset3/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -209,7 +209,7 @@
String resourceDir = rootPath
+ "/resource/100/ConfigSet/ConfigSetType/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java 2018-03-03 12:41:50 UTC (rev 801)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java 2018-03-03 12:42:14 UTC (rev 802)
@@ -81,7 +81,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(35, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -133,7 +133,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(37, result.size());
+ assertEquals(default_file_num+5, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java 2018-03-03 12:41:50 UTC (rev 801)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java 2018-03-03 12:42:14 UTC (rev 802)
@@ -63,7 +63,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceM/";
- assertEquals(33, result.size());
+ assertEquals(default_file_num+1, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -99,7 +99,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceCon/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num+1, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -146,7 +146,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceMC/";
- assertEquals(33, result.size());
+ assertEquals(default_file_num+1, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java 2018-03-03 12:41:50 UTC (rev 801)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java 2018-03-03 12:42:14 UTC (rev 802)
@@ -102,7 +102,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ProConMulti/";
- assertEquals(34, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -157,7 +157,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ConMulti/";
- assertEquals(32, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -210,7 +210,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ProMulti/";
- assertEquals(34, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
More information about the openrtm-commit
mailing list