[openrtm-commit:00550] r235 - 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/generator/param src/jp/go/aist/rtm/rtcbuilder/manager src/jp/go/aist/rtm/rtcbuilder/template src/jp/go/aist/rtm/rtcbuilder/template/common test/jp/go/aist/rtm/rtcbuilder/_test/_100

openrtm @ openrtm.org openrtm @ openrtm.org
2012年 1月 6日 (金) 01:43:26 JST


Author: sakamoto
Date: 2012-01-06 01:43:25 +0900 (Fri, 06 Jan 2012)
New Revision: 235

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf
   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/foo.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/foo.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/foo.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/generator/param/RtcParam.java
   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/template/TemplateHelper.java
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl
   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/_100/CXXConfigSetTest.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/CXXPrefixSuffixTest.java
Log:
modify XXX.conf #2299

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/foo.conf	2012-01-05 16:43:25 UTC (rev 235)
@@ -101,7 +101,9 @@
 # conf.__widget__.str_param0: radio
 # conf.__widget__.vector_param0: checkbox
 # conf.__widget__.vector_param1: orderd_list
-#
+
+
+
 # conf.__constraints__.int_param0: 0<=x<=150
 # conf.__constraints__.int_param1: 0<=x<=1000
 # conf.__constraints__.double_param0: 0<=x<=100
@@ -111,6 +113,7 @@
 # conf.__constraints__.vector_param1: (pita,gora,switch)
 
 
+
 ##============================================================
 ## Execution context settings
 ##============================================================
@@ -135,4 +138,5 @@
 ##
 ## The execution cycle of ExecutionContext
 ##
-# exec_cxt.periodic.rate: 1000
+exec_cxt.periodic.rate:5.0
+

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	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/ExecutionCxt/rtc.conf	2012-01-05 16:43:25 UTC (rev 235)
@@ -33,6 +33,7 @@
 #
 #------------------------------------------------------------
 
+manip2.foo.config_file: foo.conf
 
 #
 # Please delete the following part if you are familiar with OpenRTM's
@@ -419,7 +420,6 @@
 ## The execution cycle of ExecutionContext
 ##
 # exec_cxt.periodic.rate: 1000
-exec_cxt.periodic.rate:5.0
 
 ##============================================================
 ## SDO service settings
@@ -435,4 +435,3 @@
 ##
 # sdo.service.consumer.available_services: [read only]
 # sdo.service.consumer.enabled_services: ALL
-

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	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/SystemConfig/rtc.conf	2012-01-05 16:43:25 UTC (rev 235)
@@ -33,6 +33,7 @@
 #
 #------------------------------------------------------------
 
+manip2.foo.config_file: foo.conf
 
 #
 # Please delete the following part if you are familiar with OpenRTM's
@@ -419,7 +420,6 @@
 ## The execution cycle of ExecutionContext
 ##
 # exec_cxt.periodic.rate: 1000
-exec_cxt.periodic.rate:5.0
 
 ##============================================================
 ## SDO service settings
@@ -435,6 +435,3 @@
 ##
 # sdo.service.consumer.available_services: [read only]
 # sdo.service.consumer.enabled_services: ALL
-
-timer.tick:0.1
-naming.update.interval:10.0

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/foo.conf	2012-01-05 16:43:25 UTC (rev 235)
@@ -101,7 +101,9 @@
 # conf.__widget__.str_param0: radio
 # conf.__widget__.vector_param0: checkbox
 # conf.__widget__.vector_param1: orderd_list
-#
+
+
+
 # conf.__constraints__.int_param0: 0<=x<=150
 # conf.__constraints__.int_param1: 0<=x<=1000
 # conf.__constraints__.double_param0: 0<=x<=100
@@ -110,7 +112,9 @@
 # conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
 # conf.__constraints__.vector_param1: (pita,gora,switch)
 
+conf.__constraints__.int_param0, 0<x<1
 
+
 ##============================================================
 ## Execution context settings
 ##============================================================
@@ -136,3 +140,4 @@
 ## The execution cycle of ExecutionContext
 ##
 # exec_cxt.periodic.rate: 1000
+

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	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint1/rtc.conf	2012-01-05 16:43:25 UTC (rev 235)
@@ -435,4 +435,3 @@
 ##
 # sdo.service.consumer.available_services: [read only]
 # sdo.service.consumer.enabled_services: ALL
-

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/foo.conf	2012-01-05 16:43:25 UTC (rev 235)
@@ -101,7 +101,9 @@
 # conf.__widget__.str_param0: radio
 # conf.__widget__.vector_param0: checkbox
 # conf.__widget__.vector_param1: orderd_list
-#
+
+
+
 # conf.__constraints__.int_param0: 0<=x<=150
 # conf.__constraints__.int_param1: 0<=x<=1000
 # conf.__constraints__.double_param0: 0<=x<=100
@@ -110,7 +112,10 @@
 # conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
 # conf.__constraints__.vector_param1: (pita,gora,switch)
 
+conf.__constraints__.int_param0, 0<x<1
+conf.__constraints__.str_param0, (up, down, right, left)
 
+
 ##============================================================
 ## Execution context settings
 ##============================================================
@@ -136,3 +141,4 @@
 ## The execution cycle of ExecutionContext
 ##
 # exec_cxt.periodic.rate: 1000
+

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	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint2/rtc.conf	2012-01-05 16:43:25 UTC (rev 235)
@@ -435,4 +435,3 @@
 ##
 # sdo.service.consumer.available_services: [read only]
 # sdo.service.consumer.enabled_services: ALL
-

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/foo.conf	2012-01-05 16:43:25 UTC (rev 235)
@@ -101,7 +101,9 @@
 # conf.__widget__.str_param0: radio
 # conf.__widget__.vector_param0: checkbox
 # conf.__widget__.vector_param1: orderd_list
-#
+
+
+
 # conf.__constraints__.int_param0: 0<=x<=150
 # conf.__constraints__.int_param1: 0<=x<=1000
 # conf.__constraints__.double_param0: 0<=x<=100
@@ -110,7 +112,11 @@
 # conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
 # conf.__constraints__.vector_param1: (pita,gora,switch)
 
+conf.__constraints__.int_param0, 0<x<1
+conf.__constraints__.str_param0, (up, down, right, left)
+conf.__constraints__.double_param0, 1.5<=x<=3.2
 
+
 ##============================================================
 ## Execution context settings
 ##============================================================
@@ -136,3 +142,4 @@
 ## The execution cycle of ExecutionContext
 ##
 # exec_cxt.periodic.rate: 1000
+

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	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/resource/100/CXX/constraint/Constraint3/rtc.conf	2012-01-05 16:43:25 UTC (rev 235)
@@ -435,4 +435,3 @@
 ##
 # sdo.service.consumer.available_services: [read only]
 # sdo.service.consumer.enabled_services: ALL
-

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/RtcParam.java	2012-01-05 16:43:25 UTC (rev 235)
@@ -774,10 +774,8 @@
 		this.test_version = isTest;
 	}
 	public boolean checkConstraint() {
-		for( ConfigSetParam config : configParams ) {
-			if( config.getConstraint()!=null && config.getConstraint().length()>0) {
-				return true;
-			}
+		if( 0<configParams.size() ) {
+			return true;
 		}
 		return false;
 	}

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	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/manager/CXXConverter.java	2012-01-05 16:43:25 UTC (rev 235)
@@ -6,6 +6,7 @@
 import java.util.Map;
 
 import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
+import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
 import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
 import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
 import jp.go.aist.rtm.rtcbuilder.generator.param.idl.ServiceArgumentParam;
@@ -333,5 +334,4 @@
 		String dataTypeNames[] = rtcType.split("::", 0);
 		return dataTypeNames[1];
 	}
-
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/TemplateHelper.java	2012-01-05 16:43:25 UTC (rev 235)
@@ -2,6 +2,9 @@
 
 import java.io.File;
 
+import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
+
 import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
 import static jp.go.aist.rtm.rtcbuilder.util.StringUtil.*;
 
@@ -237,5 +240,29 @@
 		String[] vers = ver.split("\\.");
 		return (vers.length > 2) ? vers[2] : "0";
 	}
-
+	//ConfigParameterのチェック
+	public boolean checkPeriodicType(RtcParam param) {
+		for( ConfigParameterParam target : param.getConfigParameterParams() ) {
+			if( target.getConfigName().trim().equals("exec_cxt.periodic.type") ) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean checkNotPeriodicTypeParam(ConfigParameterParam param) {
+		if( param.getConfigName().trim().equals("exec_cxt.periodic.type") ) {
+			return false;
+		}
+		return true;
+	}
+	
+	public String getPeriodicTypeValue(RtcParam param) {
+		for( ConfigParameterParam target : param.getConfigParameterParams() ) {
+			if( target.getConfigName().trim().equals("exec_cxt.periodic.type") ) {
+				return target.getDefaultVal();
+			}
+		}
+		return "";
+	}
 }

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/Component.conf.vsl	2012-01-05 16:43:25 UTC (rev 235)
@@ -101,7 +101,14 @@
 ${sharp} conf.__widget__.str_param0: radio
 ${sharp} conf.__widget__.vector_param0: checkbox
 ${sharp} conf.__widget__.vector_param1: orderd_list
-${sharp}
+
+#foreach($configParam in ${rtcParam.configParams})
+#if( ${configParam.widget.length()} > 0 )
+conf.__widget__.${configParam.name}, ${configParam.widget}#if( ${configParam.step.length()} > 0 ).${configParam.step}#end
+#end
+#end
+
+
 ${sharp} conf.__constraints__.int_param0: 0<=x<=150
 ${sharp} conf.__constraints__.int_param1: 0<=x<=1000
 ${sharp} conf.__constraints__.double_param0: 0<=x<=100
@@ -110,7 +117,13 @@
 ${sharp} conf.__constraints__.vector_param0: (dog,monky,pheasant,cat)
 ${sharp} conf.__constraints__.vector_param1: (pita,gora,switch)
 
+#foreach($configParam in ${rtcParam.configParams})
+#if( ${configParam.constraint.length()} > 0 )
+conf.__constraints__.${configParam.name}, ${configParam.constraint}
+#end
+#end
 
+
 ${sharp}${sharp}============================================================
 ${sharp}${sharp} Execution context settings
 ${sharp}${sharp}============================================================
@@ -130,9 +143,24 @@
 ${sharp}${sharp} - ArtExecutionContext:     Real-time execution context for ARTLinux
 ${sharp}${sharp}                            (http://sourceforge.net/projects/art-linux/)
 ${sharp}${sharp}
+#if(${tmpltHelper.checkPeriodicType(${rtcParam})})
+exec_cxt.periodic.type:${tmpltHelper.getPeriodicTypeValue(${rtcParam})}
+#else
 ${sharp} exec_cxt.periodic.type: PeriodicExecutionContext
+#end
 
 ${sharp}${sharp}
 ${sharp}${sharp} The execution cycle of ExecutionContext
 ${sharp}${sharp}
+#if(${rtcParam.executionRate}>0)exec_cxt.periodic.rate:${rtcParam.executionRate}
+#else
 ${sharp} exec_cxt.periodic.rate: 1000
+#end
+
+#if( ${rtcParam.configParameterParams.size()} > 0 )
+#foreach($parameterParam in ${rtcParam.configParameterParams})  
+#if(${tmpltHelper.checkNotPeriodicTypeParam(${parameterParam})})
+${parameterParam.configName}:${parameterParam.defaultVal}
+#end
+#end
+#end
\ No newline at end of file

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	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/common/rtc.conf.vsl	2012-01-05 16:43:25 UTC (rev 235)
@@ -421,8 +421,6 @@
 ${sharp}${sharp} The execution cycle of ExecutionContext
 ${sharp}${sharp}
 ${sharp} exec_cxt.periodic.rate: 1000
-#if(${rtcParam.executionRate}>0)exec_cxt.periodic.rate:${rtcParam.executionRate}
-#end
 
 ${sharp}${sharp}============================================================
 ${sharp}${sharp} SDO service settings
@@ -438,9 +436,3 @@
 ${sharp}${sharp}
 ${sharp} sdo.service.consumer.available_services: [read only]
 ${sharp} sdo.service.consumer.enabled_services: ALL
-
-#if( ${rtcParam.configParameterParams.size()} > 0 )
-#foreach($parameterParam in ${rtcParam.configParameterParams})  
-${parameterParam.configName}:${parameterParam.defaultVal}
-#end
-#end

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	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java	2012-01-05 16:43:25 UTC (rev 235)
@@ -95,7 +95,7 @@
 	}
 
 	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		assertEquals(12, 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/CXXDocLongTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java	2012-01-05 16:43:25 UTC (rev 235)
@@ -228,7 +228,7 @@
 
 		String resourceDir = rootPath + "/resource/100/CXX/Doc/fullLong/";
 
-		assertEquals(14, result.size());
+		assertEquals(15, 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/CXXPrefixSuffixTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java	2012-01-04 14:54:30 UTC (rev 234)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java	2012-01-05 16:43:25 UTC (rev 235)
@@ -219,7 +219,7 @@
 	}
 
 	private void checkResults(List<GeneratedResult> result, String resourceDir) {
-		assertEquals(14, result.size());
+		assertEquals(15, result.size());
 		checkCode(result, resourceDir, "fooComp.cpp");
 		checkCode(result, resourceDir, "foo.h");
 		checkCode(result, resourceDir, "foo.cpp");



openrtm-commit メーリングリストの案内