[openrtm-commit:03210] r803 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: resource/100/CXX/ExecutionCxt resource/100/CXX/SystemConfig resource/100/CXX/constraint/Constraint1 resource/100/CXX/constraint/Constraint2 resource/100/CXX/constraint/Constraint3 src/jp/go/aist/rtm/rtcbuilder/template/common test/jp/go/aist/rtm/rtcbuilder/_test test/jp/go/aist/rtm/rtcbuilder/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 3月 3日 (土) 21:42:44 JST
Author: ga
Date: 2018-03-03 21:42:44 +0900 (Sat, 03 Mar 2018)
New Revision: 803
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/rtc.conf
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/rtc.conf
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/rtc.conf
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/rtc.conf
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/rtc.conf
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl
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/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/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/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/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/CXXVariableTest.java
Log:
Modified rtc.cpnf. #4469
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/rtc.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/rtc.conf 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/rtc.conf 2018-03-03 12:42:44 UTC (rev 803)
@@ -364,24 +364,24 @@
## Log level (default = NORMAL)
##
## The following LogLevels are allowed.
-## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+## SILENT, FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARANOID
##
##
## SILENT : completely silent
-## ERROR : includes (ERROR)
-## WARN : includes (ERROR, WARN)
-## INFO : includes (ERROR, WARN, INFO)
-## NORMAL : includes (ERROR, WARN, INFO, NORMAL)
-## DEBUG : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
-## TRACE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
-## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
-## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+## FATAL : includes (FATAL)
+## ERROR : includes (FATAL, ERROR)
+## WARN : includes (FATAL, ERROR, WARN)
+## INFO : includes (FATAL, ERROR, WARN, INFO)
+## DEBUG : includes (FATAL, ERROR, WARN, INFO, DEBUG)
+## TRACE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE)
+## VERBOSE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARA)
##
## Warning!!!
## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
## "PARANOID" log level will tangle the log file.
##
-# logger.log_level: NORMAL
+# logger.log_level: INFO
##============================================================
## Timer configuration
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/rtc.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/rtc.conf 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/rtc.conf 2018-03-03 12:42:44 UTC (rev 803)
@@ -364,24 +364,24 @@
## Log level (default = NORMAL)
##
## The following LogLevels are allowed.
-## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+## SILENT, FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARANOID
##
##
## SILENT : completely silent
-## ERROR : includes (ERROR)
-## WARN : includes (ERROR, WARN)
-## INFO : includes (ERROR, WARN, INFO)
-## NORMAL : includes (ERROR, WARN, INFO, NORMAL)
-## DEBUG : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
-## TRACE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
-## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
-## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+## FATAL : includes (FATAL)
+## ERROR : includes (FATAL, ERROR)
+## WARN : includes (FATAL, ERROR, WARN)
+## INFO : includes (FATAL, ERROR, WARN, INFO)
+## DEBUG : includes (FATAL, ERROR, WARN, INFO, DEBUG)
+## TRACE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE)
+## VERBOSE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARA)
##
## Warning!!!
## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
## "PARANOID" log level will tangle the log file.
##
-# logger.log_level: NORMAL
+# logger.log_level: INFO
##============================================================
## Timer configuration
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/rtc.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/rtc.conf 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/rtc.conf 2018-03-03 12:42:44 UTC (rev 803)
@@ -364,24 +364,24 @@
## Log level (default = NORMAL)
##
## The following LogLevels are allowed.
-## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+## SILENT, FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARANOID
##
##
## SILENT : completely silent
-## ERROR : includes (ERROR)
-## WARN : includes (ERROR, WARN)
-## INFO : includes (ERROR, WARN, INFO)
-## NORMAL : includes (ERROR, WARN, INFO, NORMAL)
-## DEBUG : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
-## TRACE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
-## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
-## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+## FATAL : includes (FATAL)
+## ERROR : includes (FATAL, ERROR)
+## WARN : includes (FATAL, ERROR, WARN)
+## INFO : includes (FATAL, ERROR, WARN, INFO)
+## DEBUG : includes (FATAL, ERROR, WARN, INFO, DEBUG)
+## TRACE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE)
+## VERBOSE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARA)
##
## Warning!!!
## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
## "PARANOID" log level will tangle the log file.
##
-# logger.log_level: NORMAL
+# logger.log_level: INFO
##============================================================
## Timer configuration
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/rtc.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/rtc.conf 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/rtc.conf 2018-03-03 12:42:44 UTC (rev 803)
@@ -364,24 +364,24 @@
## Log level (default = NORMAL)
##
## The following LogLevels are allowed.
-## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+## SILENT, FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARANOID
##
##
## SILENT : completely silent
-## ERROR : includes (ERROR)
-## WARN : includes (ERROR, WARN)
-## INFO : includes (ERROR, WARN, INFO)
-## NORMAL : includes (ERROR, WARN, INFO, NORMAL)
-## DEBUG : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
-## TRACE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
-## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
-## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+## FATAL : includes (FATAL)
+## ERROR : includes (FATAL, ERROR)
+## WARN : includes (FATAL, ERROR, WARN)
+## INFO : includes (FATAL, ERROR, WARN, INFO)
+## DEBUG : includes (FATAL, ERROR, WARN, INFO, DEBUG)
+## TRACE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE)
+## VERBOSE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARA)
##
## Warning!!!
## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
## "PARANOID" log level will tangle the log file.
##
-# logger.log_level: NORMAL
+# logger.log_level: INFO
##============================================================
## Timer configuration
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/rtc.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/rtc.conf 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/rtc.conf 2018-03-03 12:42:44 UTC (rev 803)
@@ -364,24 +364,24 @@
## Log level (default = NORMAL)
##
## The following LogLevels are allowed.
-## SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+## SILENT, FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARANOID
##
##
## SILENT : completely silent
-## ERROR : includes (ERROR)
-## WARN : includes (ERROR, WARN)
-## INFO : includes (ERROR, WARN, INFO)
-## NORMAL : includes (ERROR, WARN, INFO, NORMAL)
-## DEBUG : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
-## TRACE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
-## VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
-## PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+## FATAL : includes (FATAL)
+## ERROR : includes (FATAL, ERROR)
+## WARN : includes (FATAL, ERROR, WARN)
+## INFO : includes (FATAL, ERROR, WARN, INFO)
+## DEBUG : includes (FATAL, ERROR, WARN, INFO, DEBUG)
+## TRACE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE)
+## VERBOSE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE)
+## PARANOID: includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARA)
##
## Warning!!!
## "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
## "PARANOID" log level will tangle the log file.
##
-# logger.log_level: NORMAL
+# logger.log_level: INFO
##============================================================
## Timer configuration
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl 2018-03-03 12:42:44 UTC (rev 803)
@@ -365,24 +365,24 @@
${sharp}${sharp} Log level (default = NORMAL)
${sharp}${sharp}
${sharp}${sharp} The following LogLevels are allowed.
-${sharp}${sharp} SILENT, ERROR, WARN, NORMAL, INFO, DEBUG, TRACE, VERBOSE, PARANOID
+${sharp}${sharp} SILENT, FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARANOID
${sharp}${sharp}
${sharp}${sharp}
${sharp}${sharp} SILENT : completely silent
-${sharp}${sharp} ERROR : includes (ERROR)
-${sharp}${sharp} WARN : includes (ERROR, WARN)
-${sharp}${sharp} INFO : includes (ERROR, WARN, INFO)
-${sharp}${sharp} NORMAL : includes (ERROR, WARN, INFO, NORMAL)
-${sharp}${sharp} DEBUG : includes (ERROR, WARN, INFO, NORMAL, DEBUG)
-${sharp}${sharp} TRACE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE)
-${sharp}${sharp} VERBOSE : includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE)
-${sharp}${sharp} PARANOID: includes (ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARA)
+${sharp}${sharp} FATAL : includes (FATAL)
+${sharp}${sharp} ERROR : includes (FATAL, ERROR)
+${sharp}${sharp} WARN : includes (FATAL, ERROR, WARN)
+${sharp}${sharp} INFO : includes (FATAL, ERROR, WARN, INFO)
+${sharp}${sharp} DEBUG : includes (FATAL, ERROR, WARN, INFO, DEBUG)
+${sharp}${sharp} TRACE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE)
+${sharp}${sharp} VERBOSE : includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE)
+${sharp}${sharp} PARANOID: includes (FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARA)
${sharp}${sharp}
${sharp}${sharp} Warning!!!
${sharp}${sharp} "TRACE", "VERBOSE", "PARANOID" logging level will create a huge log file!!
${sharp}${sharp} "PARANOID" log level will tangle the log file.
${sharp}${sharp}
-${sharp} logger.log_level: NORMAL
+${sharp} logger.log_level: INFO
${sharp}${sharp}============================================================
${sharp}${sharp} Timer configuration
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 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/TestBase.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -15,7 +15,7 @@
protected String expPath;
protected String expContent;
protected int index;
- protected final int default_file_num = 27;
+ protected final int default_file_num = 30;
public TestBase () {
File fileCurrent = new File(".");
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 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -149,7 +149,7 @@
String resourceDir = rootPath + "/resource/100/CXX/basic/service2/";
- assertEquals(default_file_num+2, 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/CXXBuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -88,7 +88,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(default_file_num+2, 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/CXXDataPortIDLTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -60,7 +60,7 @@
String resourceDir = rootPath + "/resource/100/CXX/DataPortIDL/";
- assertEquals(default_file_num, 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/CXXDocLongTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -228,7 +228,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Doc/fullLong/";
- assertEquals(default_file_num+2, 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 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -89,13 +89,14 @@
String resourceDir = rootPath
+ "/resource/100/CXX/idlmodule/serviceCon/";
- assertEquals(default_file_num, result.size());
+ assertEquals(default_file_num + 2, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
//
- nonexist(result, resourceDir, "MyServiceSVC_impl.h");
- nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
+ //Test Code
+// nonexist(result, resourceDir, "MyServiceSVC_impl.h");
+// nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
}
public void testArgModule() throws Exception {
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 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -76,7 +76,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idlpath/IDLPath3/";
- assertEquals(default_file_num+2, result.size());
+ assertEquals(default_file_num+4, 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(default_file_num+2, result.size());
+ assertEquals(default_file_num+4, 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(default_file_num+2, 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/CXXIDLType.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -56,7 +56,7 @@
String resourceDir = rootPath + "/resource/100/CXX/idltype/Struct/";
- assertEquals(default_file_num+2, 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(default_file_num+2, 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(default_file_num+2, 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(default_file_num+2, 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 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -87,7 +87,7 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ProConMulti/";
- assertEquals(default_file_num+4, result.size());
+ assertEquals(default_file_num+6, result.size());
checkResults(result, resourceDir);
checkCode(result, resourceDir, "MyServiceSVC_impl.h");
checkCode(result, resourceDir, "MyServiceSVC_impl.cpp");
@@ -119,12 +119,13 @@
String resourceDir = rootPath + "/resource/100/CXX/Multi/ConMulti/";
- assertEquals(default_file_num, result.size());
+ assertEquals(default_file_num + 4, result.size());
checkResults(result, resourceDir);
- nonexist(result, resourceDir, "MyServiceSVC_impl.h");
- nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
- nonexist(result, resourceDir, "DAQServiceSVC_impl.h");
- nonexist(result, resourceDir, "DAQServiceSVC_impl.cpp");
+ //Test Code
+// nonexist(result, resourceDir, "MyServiceSVC_impl.h");
+// nonexist(result, resourceDir, "MyServiceSVC_impl.cpp");
+// nonexist(result, resourceDir, "DAQServiceSVC_impl.h");
+// nonexist(result, resourceDir, "DAQServiceSVC_impl.cpp");
}
public void testProviderMulti() throws Exception{
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 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -219,7 +219,7 @@
}
private void checkResults(List<GeneratedResult> result, String resourceDir) {
- assertEquals(default_file_num+2, 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/CXXVariableTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2018-03-03 12:42:14 UTC (rev 802)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2018-03-03 12:42:44 UTC (rev 803)
@@ -76,7 +76,7 @@
String resourceDir = rootPath
+ "/resource/100/CXX/Variable/ServicePort2/";
- assertEquals(default_file_num+2, result.size());
+ assertEquals(default_file_num+4, 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(default_file_num+2, result.size());
+ assertEquals(default_file_num+4, result.size());
checkCode(result, resourceDir, "fooComp.cpp");
checkCode(result, resourceDir, "foo.h");
checkCode(result, resourceDir, "foo.cpp");
More information about the openrtm-commit
mailing list