[openrtm-commit:00698] r261 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java: META-INF resource resource/100/base/inport1 resource/100/base/inport2 resource/100/base/name resource/100/base/outport1 resource/100/base/outport2 src/jp/go/aist/rtm/rtcbuilder/java/manager test/jp/go/aist/rtm/rtcbuilder/java/_test test/jp/go/aist/rtm/rtcbuilder/java/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 2月 11日 (土) 02:03:18 JST
Author: sakamoto
Date: 2012-02-11 02:03:17 +0900 (Sat, 11 Feb 2012)
New Revision: 261
Removed:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/Java/
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AISTTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AllTestsJava.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BaseTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BuildPathTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/ConfigSetTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/DiffTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocLongTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaExCxtTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaIDLPathTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaImplTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaSystemConfigTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaVariableTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/LuckTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MLTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MultiTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/VarTest.java
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.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:
Update CMakeList.txt #2300
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/META-INF/MANIFEST.MF 2012-02-10 17:03:17 UTC (rev 261)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: jp.go.aist.rtm.rtcbuilder.java;singleton:=true
-Bundle-Version: 1.1.0.rc2v20110725
+Bundle-Version: 1.1.0.rc3v20120211
Bundle-Activator: jp.go.aist.rtm.rtcbuilder.java.RtcBuilderJavaPlugin
Bundle-Localization: plugin
Require-Bundle: jp.go.aist.rtm.rtcbuilder,
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport1/.classpath 2012-02-10 17:03:17 UTC (rev 261)
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.0/jar/OpenRTM-aist-1.0.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.0.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
\ No newline at end of file
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/inport2/.classpath 2012-02-10 17:03:17 UTC (rev 261)
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.0/jar/OpenRTM-aist-1.0.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.0.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
\ No newline at end of file
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/name/.classpath 2012-02-10 17:03:17 UTC (rev 261)
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.0/jar/OpenRTM-aist-1.0.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.0.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
\ No newline at end of file
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport1/.classpath 2012-02-10 17:03:17 UTC (rev 261)
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.0/jar/OpenRTM-aist-1.0.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.0.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
\ No newline at end of file
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/base/outport2/.classpath 2012-02-10 17:03:17 UTC (rev 261)
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.0/jar/OpenRTM-aist-1.0.0.jar"/>
+ <classpathentry kind="lib" path="C:/Program Files/OpenRTM-aist/1.1/jar/OpenRTM-aist-1.0.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
\ No newline at end of file
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/manager/JavaGenerateManager.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -84,9 +84,6 @@
resetIDLServiceClass(rtcParam);
- if (rtcParam.getRtmVersion().equals(RTM_VERSION_042)) {
- return generateTemplateCode04(contextMap);
- }
return generateTemplateCode10(contextMap);
}
@@ -126,38 +123,6 @@
return result;
}
- // RTM 0.4系
- public List<GeneratedResult> generateTemplateCode04(
- Map<String, Object> contextMap) {
- List<GeneratedResult> result = new ArrayList<GeneratedResult>();
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
-
- GeneratedResult gr;
- gr = generateCompSource_04(contextMap);
- result.add(gr);
- gr = generateRTCSource_04(contextMap);
- result.add(gr);
- gr = generateRTCImplSource_04(contextMap);
- result.add(gr);
-
- gr = generateClassPath(contextMap);
- result.add(gr);
-
- gr = generateBuildXML_04(contextMap);
- result.add(gr);
-
- for (IdlFileParam idl : rtcParam.getProviderIdlPathes()) {
- contextMap.put("idlFileParam", idl);
- for (ServiceClassParam svc : idl.getServiceClassParams()) {
- contextMap.put("serviceClassParam", svc);
- gr = generateSVCSource_04(contextMap);
- result.add(gr);
- }
- }
-
- return result;
- }
-
// 1.0系 (Java)
public GeneratedResult generateCompSource(Map<String, Object> contextMap) {
@@ -210,39 +175,6 @@
return generate(infile, outfile, contextMap);
}
- // 0.4系 (Java)
-
- public GeneratedResult generateCompSource_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "Comp.java";
- String infile = "java/Java_Comp.java.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateRTCSource_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + ".java";
- String infile = "java_04/Java_RTC.java.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateRTCImplSource_04(
- Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = rtcParam.getName() + "Impl.java";
- String infile = "java_04/Java_RTC_Impl.java.vsl";
- return generate(infile, outfile, contextMap);
- }
-
- public GeneratedResult generateSVCSource_04(Map<String, Object> contextMap) {
- ServiceClassParam svc = (ServiceClassParam) contextMap
- .get("serviceClassParam");
- String outfile = TemplateHelper.getBasename(svc.getName())
- + TemplateHelper.getServiceImplSuffix() + ".java";
- String infile = "java/Java_SVC.java.vsl";
- return generate(infile, outfile, contextMap);
- }
-
// 1.0系 (ビルド環境)
public GeneratedResult generateBuildXML(Map<String, Object> contextMap) {
@@ -252,15 +184,6 @@
return generate(infile, outfile, contextMap);
}
- // 0.4系 (ビルド環境)
-
- public GeneratedResult generateBuildXML_04(Map<String, Object> contextMap) {
- RtcParam rtcParam = (RtcParam) contextMap.get("rtcParam");
- String outfile = "build_" + rtcParam.getName() + ".xml";
- String infile = "java_04/build.xml.vsl";
- return generate(infile, outfile, contextMap);
- }
-
public GeneratedResult generate(String infile, String outfile,
Map<String, Object> contextMap) {
try {
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AISTTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AISTTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AISTTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,279 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class AISTTest extends TestBase {
- private GeneratorParam genParam;
- private RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setRtmVersion("0.4.2");
- }
-
- public void testAIST6() throws Exception{
- rtcParam.setName("ModuleName");
- rtcParam.setDescription("ModuleDescription");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("VenderName");
- rtcParam.setCategory("Category");
- rtcParam.setComponentType("DataFlowComponent");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setMaxInstance(1);
-
- genParam.getRtcParams().add(rtcParam);
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- configset.add(new ConfigSetParam("int_param0","int","","0"));
- configset.add(new ConfigSetParam("vector_param","Vector","", "1.0,2.0,3.0"));
- rtcParam.getConfigParams().addAll(configset);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String targetDir = rootPath + "\\resource\\Java\\ConfigSet\\AIST6\\";
- checkCode(result, targetDir, "ModuleNameComp.java");
- checkCode(result, targetDir, "build_ModuleName.xml");
- checkCode(result, targetDir, "ModuleName.java");
- checkCode(result, targetDir, "ModuleNameImpl.java");
- checkCode(result, targetDir, "README.ModuleName");
- }
-
- public void testAIST5() throws Exception{
- rtcParam.setName("test");
- rtcParam.setDescription("test component");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("S.Kurihara");
- rtcParam.setCategory("sample");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setMaxInstance(1);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "resource\\Java\\AIST5\\MyService.idl", "MyServiceT", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("MySVPro1",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice", "", "",
- rootPath + "resource\\Java\\AIST5\\MyService.idl", "MyServiceOpen", "", 0);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\AIST5\\";
-
- checkCode(result, resourceDir, "testComp.java");
- checkCode(result, resourceDir, "build_test.xml");
- checkCode(result, resourceDir, "test.java");
- checkCode(result, resourceDir, "testImpl.java");
- checkCode(result, resourceDir, "MyServiceTSVC_impl.java");
- checkCode(result, resourceDir, "MyServiceOpenSVC_impl.java");
- checkCode(result, resourceDir, "README.test");
- }
-
- public void testAIST4() throws Exception{
- rtcParam.setName("test");
- rtcParam.setDescription("test component");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("S.Kurihara");
- rtcParam.setCategory("sample");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setMaxInstance(1);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "resource\\Java\\AIST4\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("MySVPro1",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice", "", "",
- rootPath + "resource\\Java\\AIST4\\MyService.idl", "MyService", "", 0);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\AIST4\\";
-
- checkCode(result, resourceDir, "testComp.java");
- checkCode(result, resourceDir, "build_test.xml");
- checkCode(result, resourceDir, "test.java");
- checkCode(result, resourceDir, "testImpl.java");
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- checkCode(result, resourceDir, "README.test");
- }
-
- public void testAIST3() throws Exception{
- rtcParam.setName("test");
- rtcParam.setDescription("test component");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("S.Kurihara");
- rtcParam.setCategory("example");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setMaxInstance(1);
-
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("in", "RTC::TimedFloatSeq", "", 0));
- rtcParam.getInports().addAll(dataport);
-
- List<DataPortParam> dataoutport = new ArrayList<DataPortParam>();
- dataoutport.add(new DataPortParam("out", "RTC::TimedFloatSeq", "", 0));
- rtcParam.getOutports().addAll(dataoutport);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "resource\\Java\\AIST3\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("MySVCon",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice1", "", "",
- rootPath + "resource\\Java\\AIST3\\MyService.idl", "MyService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\AIST3\\";
-
- checkCode(result, resourceDir, "testComp.java");
- checkCode(result, resourceDir, "build_test.xml");
- checkCode(result, resourceDir, "test.java");
- checkCode(result, resourceDir, "testImpl.java");
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- checkCode(result, resourceDir, "README.test");
- }
-
- public void testAIST2() throws Exception{
- rtcParam.setName("test");
- rtcParam.setDescription("test component");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("S.Kurihara");
- rtcParam.setCategory("example");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setMaxInstance(1);
-
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("in", "RTC::TimedFloatSeq", "", 0));
- rtcParam.getInports().addAll(dataport);
-
- List<DataPortParam> dataoutport = new ArrayList<DataPortParam>();
- dataoutport.add(new DataPortParam("out", "RTC::TimedFloatSeq", "", 0));
- rtcParam.getOutports().addAll(dataoutport);
-
- ServicePortParam service1 = new ServicePortParam("MySVCon",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice", "", "",
- rootPath + "resource\\Java\\AIST2\\MyService.idl", "MyService", "", 1);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\AIST2\\";
-
- checkCode(result, resourceDir, "testComp.java");
- checkCode(result, resourceDir, "build_test.xml");
- checkCode(result, resourceDir, "test.java");
- checkCode(result, resourceDir, "testImpl.java");
- checkCode(result, resourceDir, "README.test");
- }
-
- public void testServicePort() throws Exception{
- rtcParam.setName("test");
- rtcParam.setDescription("test component");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("S.Kurihara");
- rtcParam.setCategory("exmple");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setMaxInstance(1);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice", "", "",
- rootPath + "resource\\Java\\AIST1\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\AIST1\\";
-
- checkCode(result, resourceDir, "testComp.java");
- checkCode(result, resourceDir, "build_test.xml");
- checkCode(result, resourceDir, "test.java");
- checkCode(result, resourceDir, "testImpl.java");
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- checkCode(result, resourceDir, "README.test");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AllTestsJava.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AllTestsJava.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/AllTestsJava.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,32 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTestsJava {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for jp.go.aist.rtm.rtcbuilder._test");
- //$JUnit-BEGIN$
- suite.addTestSuite(ConfigSetTest.class);
- suite.addTestSuite(DiffTest.class);
- suite.addTestSuite(LuckTest.class);
- suite.addTestSuite(MultiTest.class);
- suite.addTestSuite(AISTTest.class);
- suite.addTestSuite(BaseTest.class);
- suite.addTestSuite(BuildPathTest.class);
- suite.addTestSuite(VarTest.class);
-// suite.addTestSuite(JavaIDLPathTest.class);
- suite.addTestSuite(JavaDocTest.class);
- suite.addTestSuite(JavaDocLongTest.class);
- suite.addTestSuite(MLTest.class);
- suite.addTestSuite(JavaExCxtTest.class);
- suite.addTestSuite(JavaSystemConfigTest.class);
- suite.addTestSuite(JavaImplTest.class);
- suite.addTestSuite(JavaVariableTest.class);
- //$JUnit-END$
- return suite;
- }
-
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BaseTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BaseTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BaseTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,191 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class BaseTest extends TestBase {
- private GeneratorParam genParam;
- private RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(5);
- rtcParam.setRtmVersion("0.4.2");
- genParam.getRtcParams().add(rtcParam);
- }
-
- public void testServicePort2() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\service2\\";
- checkResults(result, resourceDir);
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- }
-
- public void testServicePort1() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "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();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\service1\\";
- checkResults(result, resourceDir);
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- }
-
- public void testOutPort2() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\outport2\\";
- checkResults(result, resourceDir);
- }
-
- public void testOutPort1() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\outport1\\";
- checkResults(result, resourceDir);
- }
-
- public void testInPort2() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\inport2\\";
- checkResults(result, resourceDir);
- }
-
- public void testInPort() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataport);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\inport1\\";
- checkResults(result, resourceDir);
- }
-
- public void testBasic() throws Exception{
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\name\\";
- checkResults(result, resourceDir);
- }
-
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "README.foo");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BuildPathTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BuildPathTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/BuildPathTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,126 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class BuildPathTest extends TestBase {
- private GeneratorParam genParam;
- private RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(5);
- rtcParam.setRtmVersion("0.4.2");
- genParam.getRtcParams().add(rtcParam);
- }
-
- public void testPath4() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- ArrayList<String> pathList = new ArrayList<String>();
- pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
- pathList.add(new String("C:\\aaa\\bbb\\ccc.jar"));
- pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
- rtcParam.getLibraryPathes().addAll(pathList);
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "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();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\buildpath\\path4\\";
- checkResults(result, resourceDir);
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- }
-
- public void testPath3() throws Exception{
- ArrayList<String> pathList = new ArrayList<String>();
- pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
- pathList.add(new String("C:\\aaa\\bbb\\ccc.jar"));
- pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
- rtcParam.getLibraryPathes().addAll(pathList);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\buildpath\\path2\\";
- checkResults(result, resourceDir);
- }
-
- public void testPath2() throws Exception{
- ArrayList<String> pathList = new ArrayList<String>();
- pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
- pathList.add(new String("C:\\aaa\\bbb\\ccc.jar"));
- rtcParam.getLibraryPathes().addAll(pathList);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\buildpath\\path2\\";
- checkResults(result, resourceDir);
- }
-
- public void testPath1() throws Exception{
- ArrayList<String> pathList = new ArrayList<String>();
- pathList.add(new String("C:\\xxx\\yyy\\zzz.jar"));
- rtcParam.getLibraryPathes().addAll(pathList);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\buildpath\\path1\\";
- checkResults(result, resourceDir);
- }
-
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "README.foo");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/ConfigSetTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/ConfigSetTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/ConfigSetTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,92 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class ConfigSetTest extends TestBase {
- private GeneratorParam genParam;
- private RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.3");
- rtcParam.setVender("TA2");
- rtcParam.setCategory("manip2");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(3);
- rtcParam.setRtmVersion("0.4.2");
-
- genParam.getRtcParams().add(rtcParam);
- }
-
- public void testConfigSet() throws Exception{
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- configset.add(new ConfigSetParam("int_param0","int","","0"));
- rtcParam.getConfigParams().addAll(configset);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\ConfigSet\\configset1\\";
- checkResults(result, resourceDir);
- }
-
- public void testConfigSet2() throws Exception{
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- configset.add(new ConfigSetParam("int_param0","int","","0"));
- configset.add(new ConfigSetParam("int_param1","int","","1"));
- rtcParam.getConfigParams().addAll(configset);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\ConfigSet\\configset2\\";
- checkResults(result, resourceDir);
- }
-
- public void testConfigSet3() throws Exception{
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- configset.add(new ConfigSetParam("int_param0","int","","0"));
- configset.add(new ConfigSetParam("int_param1","int","","1"));
- configset.add(new ConfigSetParam("double_param0","double","","0.11"));
- configset.add(new ConfigSetParam("str_param0","String","","hoge"));
- configset.add(new ConfigSetParam("str_param1","String","","dara"));
- rtcParam.getConfigParams().addAll(configset);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\ConfigSet\\configset3\\";
- checkResults(result, resourceDir);
- }
-
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "README.foo");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/DiffTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/DiffTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/DiffTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,86 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class DiffTest extends TestBase {
- private GeneratorParam genParam;
- private RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("test");
- rtcParam.setDescription("test component");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("S.Kurihara");
- rtcParam.setCategory("sample");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setMaxInstance(1);
- genParam.getRtcParams().add(rtcParam);
- rtcParam.setRtmVersion("0.4.2");
- }
-
- public void testDiffName2() throws Exception{
- ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "\\resource\\MyService3.idl", "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();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\diffname2\\";
- checkResults(result, resourceDir);
- }
-
- public void testDiffName() throws Exception{
- ServicePortParam service1 = new ServicePortParam("MySVPro0",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "\\resource\\MyService3.idl", "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();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\diffname\\";
- checkResults(result, resourceDir);
- }
-
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "testComp.java");
- checkCode(result, resourceDir, "build_test.xml");
- checkCode(result, resourceDir, "test.java");
- checkCode(result, resourceDir, "testImpl.java");
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- checkCode(result, resourceDir, "README.test");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocLongTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocLongTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocLongTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,237 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaDocLongTest extends TestBase {
-
- protected void setUp() throws Exception {
- }
-
- public void testDocAllLong() throws Exception{
- GeneratorParam genParam = new GeneratorParam();
- RtcParam rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setRtmVersion("0.4.2");
- rtcParam.setMaxInstance(5);
- //
- rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>34567894123456789512345678961234567897123456789812345");
- rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス12345678901234567890123456789012345678901234567890");
- rtcParam.setDocDescription("本コンポーネントの概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocInOut("本コンポーネントの入出力1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocAlgorithm("本コンポーネントのアルゴリズムなど1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocReference("参考文献の情報1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- //
- genParam.getRtcParams().add(rtcParam);
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
-
- DataPortParam datap1 = new DataPortParam("InP1", "RTC::TimedShort", "", 0);
- datap1.setDocDescription("InPort1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- datap1.setDocType("InPort1のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
- datap1.setDocNum("InPort1のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
- datap1.setDocSemantics("InPort1のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
- datap1.setDocUnit("InPort1のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
- datap1.setDocOccurrence("InPort1のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
- datap1.setDocOperation("InPort1のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
- dataport.add(datap1);
-
- DataPortParam datap2 = new DataPortParam("InP2", "RTC::TimedLong", "", 0);
- datap2.setDocDescription("InPort2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- datap2.setDocType("InPort2のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
- datap2.setDocNum("InPort2のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
- datap2.setDocSemantics("InPort2のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
- datap2.setDocUnit("InPort2のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
- datap2.setDocOccurrence("InPort2のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
- datap2.setDocOperation("InPort2のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
- dataport.add(datap2);
-
- rtcParam.getInports().addAll(dataport);
- //
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
-
- DataPortParam datap3 = new DataPortParam("OutP1", "RTC::TimedLong", "", 0);
- datap3.setDocDescription("OutPort1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- datap3.setDocType("OutPort1のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
- datap3.setDocNum("OutPort1のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
- datap3.setDocSemantics("OutPort1のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
- datap3.setDocUnit("OutPort1のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
- datap3.setDocOccurrence("OutPort1のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
- datap3.setDocOperation("OutPort1のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
- outport.add(datap3);
-
- DataPortParam datap4 = new DataPortParam("OutP2", "RTC::TimedFloat", "", 0);
- datap4.setDocDescription("OutPort2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- datap4.setDocType("OutPort2のデータの型1234567890123456789012345678901234567890123456789012345678901234567890");
- datap4.setDocNum("OutPort2のデータの数1234567890123456789012345678901234567890123456789012345678901234567890");
- datap4.setDocSemantics("OutPort2のデータの意味1234567890123456789012345678901234567890123456789012345678901234567890");
- datap4.setDocUnit("OutPort2のデータの単位1234567890123456789012345678901234567890123456789012345678901234567890");
- datap4.setDocOccurrence("OutPort2のデータの発生頻度1234567890123456789012345678901234567890123456789012345678901234567890");
- datap4.setDocOperation("OutPort2のデータの処理周期1234567890123456789012345678901234567890123456789012345678901234567890");
- outport.add(datap4);
-
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- service1.setDocDescription("ServicePort1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- service1.setDocIfDescription("ServicePort1のインターフェースの概要1234567890123456789012345678901234567890123456789012345678901234567890");
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- int1.setDocDescription("ServiceIF1の概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- int1.setDocArgument("ServiceIF1の引数1234567890123456789012345678901234567890123456789012345678901234567890");
- int1.setDocReturn("ServiceIF1の返値1234567890123456789012345678901234567890123456789012345678901234567890");
- int1.setDocException("ServiceIF1の例外1234567890123456789012345678901234567890123456789012345678901234567890");
- int1.setDocPreCondition("ServiceIF1の事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- int1.setDocPostCondition("ServiceIF1の事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- service2.setDocDescription("ServicePort2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- service2.setDocIfDescription("ServicePort2のインターフェースの概要1234567890123456789012345678901234567890123456789012345678901234567890");
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- int2.setDocDescription("ServiceIF2の概要説明1234567890123456789012345678901234567890123456789012345678901234567890");
- int2.setDocArgument("ServiceIF2の引数1234567890123456789012345678901234567890123456789012345678901234567890");
- int2.setDocReturn("ServiceIF2の返値1234567890123456789012345678901234567890123456789012345678901234567890");
- int2.setDocException("ServiceIF2の例外1234567890123456789012345678901234567890123456789012345678901234567890");
- int2.setDocPreCondition("ServiceIF2の事前条件1234567890123456789012345678901234567890123456789012345678901234567890");
- int2.setDocPostCondition("ServiceIF2の事後条件1234567890123456789012345678901234567890123456789012345678901234567890");
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- ConfigSetParam config1 = new ConfigSetParam("int_param0","int","", "0");
- config1.setDocDataName("Config1の名前");
- config1.setDocDescription("Config1の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- config1.setDocDefaultVal("Config1のデフォルト値");
- config1.setDocUnit("Config1の単位1234567890123456789012345678901234567890123456789012345678901234567890");
- config1.setDocRange("Config1の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
- config1.setDocConstraint("Config1の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
- configset.add(config1);
- ConfigSetParam config2 = new ConfigSetParam("int_param1","int","", "1");
- config2.setDocDataName("Config2の名前");
- config2.setDocDescription("Config2の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- config2.setDocDefaultVal("Config2のデフォルト値");
- config2.setDocUnit("Config2の単位1234567890123456789012345678901234567890123456789012345678901234567890");
- config2.setDocRange("Config2の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
- config2.setDocConstraint("Config2の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
- configset.add(config2);
- ConfigSetParam config3 = new ConfigSetParam("double_param0","double","", "0.11");
- config3.setDocDataName("Config3の名前");
- config3.setDocDescription("Config3の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- config3.setDocDefaultVal("Config3のデフォルト値");
- config3.setDocUnit("Config3の単位1234567890123456789012345678901234567890123456789012345678901234567890");
- config3.setDocRange("Config3の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
- config3.setDocConstraint("Config3の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
- configset.add(config3);
- ConfigSetParam config4 = new ConfigSetParam("str_param0","String","", "日本語");
- config4.setDocDataName("Config4の名前");
- config4.setDocDescription("Config4の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- config4.setDocDefaultVal("Config4のデフォルト値");
- config4.setDocUnit("Config4の単位1234567890123456789012345678901234567890123456789012345678901234567890");
- config4.setDocRange("Config4の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
- config4.setDocConstraint("Config4の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
- configset.add(config4);
- ConfigSetParam config5 = new ConfigSetParam("str_param1","String","", "dara");
- config5.setDocDataName("Config5の名前");
- config5.setDocDescription("Config5の概要1234567890123456789012345678901234567890123456789012345678901234567890");
- config5.setDocDefaultVal("Config5のデフォルト値");
- config5.setDocUnit("Config5の単位1234567890123456789012345678901234567890123456789012345678901234567890");
- config5.setDocRange("Config5の範囲1234567890123456789012345678901234567890123456789012345678901234567890");
- config5.setDocConstraint("Config5の制約条件1234567890123456789012345678901234567890123456789012345678901234567890");
- configset.add(config5);
- rtcParam.getConfigParams().addAll(configset);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Doc\\fullLong\\";
-
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- checkCode(result, resourceDir, "README.foo");
- }
-
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaDocTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,403 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaDocTest extends TestBase {
- private GeneratorParam genParam;
- private RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(5);
- rtcParam.setRtmVersion("0.4.2");
- genParam.getRtcParams().add(rtcParam);
- }
-
- public void testDocAll() throws Exception{
- rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>");
- rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス");
- rtcParam.setDocDescription("本コンポーネントの概要説明");
- rtcParam.setDocInOut("本コンポーネントの入出力");
- rtcParam.setDocAlgorithm("本コンポーネントのアルゴリズムなど");
- rtcParam.setDocReference("参考文献の情報");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_INITIALIZE, "on_initialize事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_FINALIZE, "on_finalize事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STARTUP, "on_startup事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_SHUTDOWN, "on_shutdown事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ACTIVATED, "on_activated事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_DEACTIVATED, "on_deactivated事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_EXECUTE, "on_execute事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ABORTING, "on_aborting事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_ERROR, "on_error事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RESET, "on_reset事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_STATE_UPDATE, "on_state_update事後条件");
- //
- rtcParam.setDocActionOverView(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed概要説明");
- rtcParam.setDocActionPreCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事前条件");
- rtcParam.setDocActionPostCondition(IRtcBuilderConstants.ACTIVITY_RATE_CHANGED, "on_rate_changed事後条件");
- //
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
-
- DataPortParam datap1 = new DataPortParam("InP1", "RTC::TimedShort", "", 0);
- datap1.setDocDescription("InPort1の概要");
- datap1.setDocType("InPort1のデータの型");
- datap1.setDocNum("InPort1のデータの数");
- datap1.setDocSemantics("InPort1のデータの意味");
- datap1.setDocUnit("InPort1のデータの単位");
- datap1.setDocOccurrence("InPort1のデータの発生頻度");
- datap1.setDocOperation("InPort1のデータの処理周期");
- dataport.add(datap1);
-
- DataPortParam datap2 = new DataPortParam("InP2", "RTC::TimedLong", "", 0);
- datap2.setDocDescription("InPort2の概要");
- datap2.setDocType("InPort2のデータの型");
- datap2.setDocNum("InPort2のデータの数");
- datap2.setDocSemantics("InPort2のデータの意味");
- datap2.setDocUnit("InPort2のデータの単位");
- datap2.setDocOccurrence("InPort2のデータの発生頻度");
- datap2.setDocOperation("InPort2のデータの処理周期");
- dataport.add(datap2);
-
- rtcParam.getInports().addAll(dataport);
- //
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
-
- DataPortParam datap3 = new DataPortParam("OutP1", "RTC::TimedLong", "", 0);
- datap3.setDocDescription("OutPort1の概要");
- datap3.setDocType("OutPort1のデータの型");
- datap3.setDocNum("OutPort1のデータの数");
- datap3.setDocSemantics("OutPort1のデータの意味");
- datap3.setDocUnit("OutPort1のデータの単位");
- datap3.setDocOccurrence("OutPort1のデータの発生頻度");
- datap3.setDocOperation("OutPort1のデータの処理周期");
- outport.add(datap3);
-
- DataPortParam datap4 = new DataPortParam("OutP2", "RTC::TimedFloat", "", 0);
- datap4.setDocDescription("OutPort2の概要");
- datap4.setDocType("OutPort2のデータの型");
- datap4.setDocNum("OutPort2のデータの数");
- datap4.setDocSemantics("OutPort2のデータの意味");
- datap4.setDocUnit("OutPort2のデータの単位");
- datap4.setDocOccurrence("OutPort2のデータの発生頻度");
- datap4.setDocOperation("OutPort2のデータの処理周期");
- outport.add(datap4);
-
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- service1.setDocDescription("ServicePort1の概要");
- service1.setDocIfDescription("ServicePort1のインターフェースの概要");
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- int1.setDocDescription("ServiceIF1の概要説明");
- int1.setDocArgument("ServiceIF1の引数");
- int1.setDocReturn("ServiceIF1の返値");
- int1.setDocException("ServiceIF1の例外");
- int1.setDocPreCondition("ServiceIF1の事前条件");
- int1.setDocPostCondition("ServiceIF1の事後条件");
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- service2.setDocDescription("ServicePort2の概要");
- service2.setDocIfDescription("ServicePort2のインターフェースの概要");
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- int2.setDocDescription("ServiceIF2の概要説明");
- int2.setDocArgument("ServiceIF2の引数");
- int2.setDocReturn("ServiceIF2の返値");
- int2.setDocException("ServiceIF2の例外");
- int2.setDocPreCondition("ServiceIF2の事前条件");
- int2.setDocPostCondition("ServiceIF2の事後条件");
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- ConfigSetParam config1 = new ConfigSetParam("int_param0","int","", "0");
- config1.setDocDataName("Config1の名前");
- config1.setDocDescription("Config1の概要");
- config1.setDocDefaultVal("Config1のデフォルト値");
- config1.setDocUnit("Config1の単位");
- config1.setDocRange("Config1の範囲");
- config1.setDocConstraint("Config1の制約条件");
- configset.add(config1);
- ConfigSetParam config2 = new ConfigSetParam("int_param1","int","", "1");
- config2.setDocDataName("Config2の名前");
- config2.setDocDescription("Config2の概要");
- config2.setDocDefaultVal("Config2のデフォルト値");
- config2.setDocUnit("Config2の単位");
- config2.setDocRange("Config2の範囲");
- config2.setDocConstraint("Config2の制約条件");
- configset.add(config2);
- ConfigSetParam config3 = new ConfigSetParam("double_param0","double","", "0.11");
- config3.setDocDataName("Config3の名前");
- config3.setDocDescription("Config3の概要");
- config3.setDocDefaultVal("Config3のデフォルト値");
- config3.setDocUnit("Config3の単位");
- config3.setDocRange("Config3の範囲");
- config3.setDocConstraint("Config3の制約条件");
- configset.add(config3);
- ConfigSetParam config4 = new ConfigSetParam("str_param0","String","", "日本語");
- config4.setDocDataName("Config4の名前");
- config4.setDocDescription("Config4の概要");
- config4.setDocDefaultVal("Config4のデフォルト値");
- config4.setDocUnit("Config4の単位");
- config4.setDocRange("Config4の範囲");
- config4.setDocConstraint("Config4の制約条件");
- configset.add(config4);
- ConfigSetParam config5 = new ConfigSetParam("str_param1","String","", "dara");
- config5.setDocDataName("Config5の名前");
- config5.setDocDescription("Config5の概要");
- config5.setDocDefaultVal("Config5のデフォルト値");
- config5.setDocUnit("Config5の単位");
- config5.setDocRange("Config5の範囲");
- config5.setDocConstraint("Config5の制約条件");
- configset.add(config5);
- rtcParam.getConfigParams().addAll(configset);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Doc\\full\\";
- checkResults(result, resourceDir);
- }
-
- public void testDocRefer() throws Exception{
- rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>");
- rtcParam.setDocLicense("Copyright (C) 2006-2008 ライセンス");
- rtcParam.setDocDescription("本コンポーネントの概要説明");
- rtcParam.setDocInOut("本コンポーネントの入出力");
- rtcParam.setDocAlgorithm("本コンポーネントのアルゴリズムなど");
- rtcParam.setDocReference("参考文献の情報");
- //
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Doc\\refer\\";
- checkResults(result, resourceDir);
- }
-
- public void testDocAuthorLong() throws Exception{
- rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>34567894123456789512345678961234567897123456789812345");
- //
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Doc\\authorLong\\";
- checkResults(result, resourceDir);
- }
-
- public void testDocAuthor() throws Exception{
- rtcParam.setDocCreator("Noriaki Ando <n-ando at aist.go.jp>");
- //
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Doc\\author\\";
- checkResults(result, resourceDir);
- }
-
- public void testOriginal() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\service2\\";
- checkResults(result, resourceDir);
- }
-
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- checkCode(result, resourceDir, "README.foo");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaExCxtTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaExCxtTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaExCxtTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,60 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaExCxtTest extends TestBase {
-
- protected void setUp() throws Exception {
- }
-
- public void testExecutionContext() throws Exception{
- GeneratorParam genParam = new GeneratorParam();
- RtcParam rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.3");
- rtcParam.setVender("TA2");
- rtcParam.setCategory("manip2");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(3);
- rtcParam.setExecutionRate(5.0);
- rtcParam.setRtmVersion("0.4.2");
-
- genParam.getRtcParams().add(rtcParam);
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- configset.add(new ConfigSetParam("int_param0","int","","0"));
- configset.add(new ConfigSetParam("int_param1","int","","1"));
- configset.add(new ConfigSetParam("double_param0","double","","0.11"));
- configset.add(new ConfigSetParam("str_param0","String","","hoge"));
- configset.add(new ConfigSetParam("str_param1","String","","dara"));
- rtcParam.getConfigParams().addAll(configset);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\ExecutionCxt\\";
-
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "README.foo");
- checkCode(result, resourceDir, "rtc.conf");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaIDLPathTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaIDLPathTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaIDLPathTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,171 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaIDLPathTest extends TestBase {
- private GeneratorParam genParam;
- private RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(5);
- genParam.getRtcParams().add(rtcParam);
- //
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
- }
-
- public void testIDLSearchPath3() throws Exception{
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "MyService.idl", "MyService", rootPath + "\\resource", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- "resource\\DAQService.idl", "DAQService", rootPath, 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\IDLPath3\\";
- checkResults(result, resourceDir);
- }
-
- public void testIDLSearchPath2() throws Exception{
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- "MyService.idl", "MyService", rootPath + "\\resource", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- "DAQService.idl", "DAQService", rootPath + "\\resource", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\IDLPath2\\";
- checkResults(result, resourceDir);
- }
-
- public void testIDLSearchPath1() throws Exception{
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- "MyService.idl", "MyService", rootPath + "\\resource", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\IDLPath1\\";
- checkResults(result, resourceDir);
- }
-
- public void testOriginalPort() throws Exception{
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\service2\\";
- checkResults(result, resourceDir);
- }
-
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- checkCode(result, resourceDir, "README.foo");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaImplTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaImplTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaImplTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,106 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaImplTest extends TestBase {
- private RtcParam rtcParam;
- private GeneratorParam genParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(5);
- rtcParam.setRtmVersion("0.4.2");
- genParam.getRtcParams().add(rtcParam);
- }
-
- public void testAll() throws Exception{
- rtcParam.setActionImplemented(0, true);
- rtcParam.setActionImplemented(1, true);
- rtcParam.setActionImplemented(2, true);
- rtcParam.setActionImplemented(3, true);
- rtcParam.setActionImplemented(4, true);
- rtcParam.setActionImplemented(5, true);
- rtcParam.setActionImplemented(6, true);
- rtcParam.setActionImplemented(7, true);
- rtcParam.setActionImplemented(8, true);
- rtcParam.setActionImplemented(9, true);
- rtcParam.setActionImplemented(10, true);
- rtcParam.setActionImplemented(11, true);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
- String resourceDir = rootPath + "\\resource\\Java\\impl\\all\\";
-
- checkResults(result, resourceDir);
- }
-
- public void testExecute() throws Exception{
- rtcParam.setActionImplemented(0, true);
- rtcParam.setActionImplemented(1, true);
- rtcParam.setActionImplemented(3, true);
- rtcParam.setActionImplemented(5, true);
- rtcParam.setActionImplemented(9, true);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\impl\\execute\\";
- checkResults(result, resourceDir);
- }
-
- public void testFinalize() throws Exception{
- rtcParam.setActionImplemented(0, true);
- rtcParam.setActionImplemented(1, true);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\impl\\finalize\\";
- checkResults(result, resourceDir);
- }
-
- public void testInitialize() throws Exception{
- rtcParam.setActionImplemented(0, true);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\impl\\initialize\\";
- checkResults(result, resourceDir);
- }
-
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "README.foo");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaSystemConfigTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaSystemConfigTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaSystemConfigTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,66 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigParameterParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaSystemConfigTest extends TestBase {
-
- protected void setUp() throws Exception {
- }
-
- public void testExecutionContext() throws Exception{
- GeneratorParam genParam = new GeneratorParam();
- RtcParam rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.3");
- rtcParam.setVender("TA2");
- rtcParam.setCategory("manip2");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(3);
- rtcParam.setExecutionRate(5.0);
- rtcParam.setRtmVersion("0.4.2");
-
- genParam.getRtcParams().add(rtcParam);
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- configset.add(new ConfigSetParam("int_param0","int","","0"));
- configset.add(new ConfigSetParam("int_param1","int","","1"));
- configset.add(new ConfigSetParam("double_param0","double","","0.11"));
- configset.add(new ConfigSetParam("str_param0","String","","hoge"));
- configset.add(new ConfigSetParam("str_param1","String","","dara"));
- rtcParam.getConfigParams().addAll(configset);
-
- List<ConfigParameterParam> configparam = new ArrayList<ConfigParameterParam>();
- configparam.add(new ConfigParameterParam("timer.tick","0.1"));
- configparam.add(new ConfigParameterParam("naming.update.interval","10.0"));
- rtcParam.getConfigParameterParams().addAll(configparam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\SystemConfig\\";
-
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "README.foo");
- checkCode(result, resourceDir, "rtc.conf");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaVariableTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaVariableTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/JavaVariableTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,143 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class JavaVariableTest extends TestBase {
- private RtcParam rtcParam;
- private GeneratorParam genParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(5);
- rtcParam.setRtmVersion("0.4.2");
- genParam.getRtcParams().add(rtcParam);
- }
-
- public void testServicePort2() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "acinst", "acvaria",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "rinst", "rvaria",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Variable\\ServicePort2\\";
- checkResults(result, resourceDir);
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- }
-
- public void testServicePort1() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "acinst", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "rinst", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Variable\\ServicePort1\\";
- checkResults(result, resourceDir);
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- }
-
- public void testDataPort() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "VarInP1", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "VarOutP2", 0));
- rtcParam.getOutports().addAll(outport);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Variable\\DataPort\\";
- checkResults(result, resourceDir);
- }
-
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "README.foo");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/LuckTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/LuckTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/LuckTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,315 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class LuckTest extends TestBase {
- private RtcParam rtcParam;
- private GeneratorParam genParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("test module");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("sample");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setMaxInstance(2);
- genParam.getRtcParams().add(rtcParam);
-
- }
-
- public void testConsumerNoType() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("MyConPro",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice1", "", "",
- rootPath + "\\resource\\Java\\Exception\\MyService.idl", "", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- try {
- generator.generateTemplateCode(genParam);
- fail();
- } catch ( Exception ex ) {
- assertEquals("Please enter Service Interface type. : foo", ex.getMessage());
- }
- }
-
- public void testConsumerNoName() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("MyConPro",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "", "", "",
- rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- try {
- generator.generateTemplateCode(genParam);
- fail();
- } catch(Exception e) {
- }
- }
-
- public void testConsumerNoPortName() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice1", "", "",
- rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- try {
- generator.generateTemplateCode(genParam);
- fail();
- } catch(Exception e) {
- }
- }
-
- public void testProviderNoType() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "\\resource\\Java\\Exception\\MyService.idl", "", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- try {
- generator.generateTemplateCode(genParam);
- fail();
- } catch ( Exception ex ) {
- assertEquals("Please enter Service Interface type. : foo", ex.getMessage());
- }
-
- }
-
- public void testProviderNoName() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "", "", "",
- rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- try {
- generator.generateTemplateCode(genParam);
- fail();
- } catch(Exception e) {
- }
- }
-
- public void testProviderNoPortName() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- ServicePortParam service1 = new ServicePortParam("",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "\\resource\\Java\\Exception\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- try {
- generator.generateTemplateCode(genParam);
- fail();
- } catch(Exception e) {
- }
- }
-
- public void testOutPortNoType() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("out1", "", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- try {
- generator.generateTemplateCode(genParam);
- fail();
- } catch(Exception e) {
- }
- }
-
- public void testOutPortNoName() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- try {
- generator.generateTemplateCode(genParam);
- fail();
- } catch(Exception e) {
- }
- }
-
- public void testInPortNoType() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("in1", "", "", 0));
- rtcParam.getInports().addAll(dataport);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- try {
- generator.generateTemplateCode(genParam);
- fail();
- } catch(Exception e) {
- }
- }
-
- public void testInPortNoName() throws Exception{
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataport);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- try {
- generator.generateTemplateCode(genParam);
- fail();
- } catch(Exception e) {
- }
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MLTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MLTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MLTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,109 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class MLTest extends TestBase {
- private RtcParam rtcParam;
- private GeneratorParam genParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("ModuleName");
- rtcParam.setDescription("ModuleDescription");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("VenderName");
- rtcParam.setCategory("Category");
- rtcParam.setComponentType("DataFlowComponent");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setMaxInstance(1);
- rtcParam.setRtmVersion("0.4.2");
- genParam.getRtcParams().add(rtcParam);
- }
-
- public void testML3() throws Exception{
- ServicePortParam service1 = new ServicePortParam("portName",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "name", "", "",
- rootPath + "\\resource\\Java\\ML\\ML3\\MyServiceType1.idl", "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();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\ML\\ML3\\";
- checkResults(result, resourceDir);
- }
-
- public void testML2() throws Exception{
- ServicePortParam service1 = new ServicePortParam("portName",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "name", "", "",
- rootPath + "\\resource\\Java\\ML\\ML2\\MyServiceType1.idl", "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();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\ML\\ML2\\";
- checkResults(result, resourceDir);
- }
-
- public void testML1() throws Exception{
- ServicePortParam service1 = new ServicePortParam("portName",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "name", "", "",
- rootPath + "\\resource\\Java\\ML\\ML1\\MyServiceAIST2.idl", "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();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\ML\\ML1\\";
- checkResults(result, resourceDir);
- }
-
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "ModuleNameComp.java");
- checkCode(result, resourceDir, "build_ModuleName.xml");
- checkCode(result, resourceDir, "ModuleName.java");
- checkCode(result, resourceDir, "ModuleNameImpl.java");
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- checkCode(result, resourceDir, "README.ModuleName");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MultiTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/MultiTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,173 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class MultiTest extends TestBase {
- private RtcParam rtcParam;
- private GeneratorParam genParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("test module");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("sample");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setMaxInstance(2);
- rtcParam.setRtmVersion("0.4.2");
- genParam.getRtcParams().add(rtcParam);
- }
-
- public void testProConMulti() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myserviceP1", "", "",
- rootPath + "resource\\Java\\Multi\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("MySVPro2",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myserviceP2", "", "",
- rootPath + "resource\\Java\\Multi\\MyService2.idl", "MyService2", "", 0);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- ServicePortParam service3 = new ServicePortParam("MyConPro",0);
- List<ServicePortInterfaceParam> srvintert3 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int3 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "resource\\Java\\Multi\\MyService.idl", "MyService", "", 1);
- srvintert3.add(int3);
- service3.getServicePortInterfaces().addAll(srvintert3);
- srvports.add(service3);
-
- ServicePortParam service4 = new ServicePortParam("MyConPro2",0);
- List<ServicePortInterfaceParam> srvinterts4 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int4 = new ServicePortInterfaceParam(service1, "myservice2", "", "",
- rootPath + "resource\\Java\\Multi\\DAQService.idl", "DAQService", "", 1);
- srvinterts4.add(int4);
- service4.getServicePortInterfaces().addAll(srvinterts4);
- srvports.add(service4);
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Multi\\ProConMulti\\";
- checkResults(result, resourceDir);
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- checkCode(result, resourceDir, "MyService2SVC_impl.java");
- }
-
- public void testConsumerMulti() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- ServicePortParam service1 = new ServicePortParam("MyConPro",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "resource\\Java\\Multi\\MyService.idl", "MyService", "", 1);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("MyConPro2",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice2", "", "",
- rootPath + "resource\\Java\\Multi\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Multi\\ConMulti\\";
- checkResults(result, resourceDir);
- }
-
- public void testProviderMulti() throws Exception{
- List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
- dataInport.add(new DataPortParam("in1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataInport);
-
- List<DataPortParam> dataOutport = new ArrayList<DataPortParam>();
- dataOutport.add(new DataPortParam("out1", "RTC::TimedLong", "", 0));
- rtcParam.getOutports().addAll(dataOutport);
-
- ServicePortParam service1 = new ServicePortParam("MySVPro",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "myservice0", "", "",
- rootPath + "resource\\Java\\Multi\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("MySVPro2",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service1, "myservice2", "", "",
- rootPath + "resource\\Java\\Multi\\DAQService.idl", "DAQService", "", 0);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\Multi\\ProMulti\\";
- checkResults(result, resourceDir);
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- checkCode(result, resourceDir, "DAQServiceSVC_impl.java");
- }
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "README.foo");
- }
-}
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/VarTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/VarTest.java 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/VarTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -1,183 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.java._test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import jp.go.aist.rtm.rtcbuilder.Generator;
-import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.DataPortParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortInterfaceParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.ServicePortParam;
-import jp.go.aist.rtm.rtcbuilder.java.IRtcBuilderConstantsJava;
-import jp.go.aist.rtm.rtcbuilder.java.manager.JavaGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
-
-public class VarTest extends TestBase {
- private RtcParam rtcParam;
- private GeneratorParam genParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "\\resource\\work");
- rtcParam.setLanguage(IRtcBuilderConstantsJava.LANG_JAVA);
- rtcParam.setLanguageArg(IRtcBuilderConstantsJava.LANG_JAVA_ARG);
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setRtmVersion("0.4.2");
- }
-
- public void testConfigSetVar() throws Exception{
- rtcParam.setVersion("1.0.3");
- rtcParam.setVender("TA2");
- rtcParam.setCategory("manip2");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(3);
-
- genParam.getRtcParams().add(rtcParam);
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- configset.add(new ConfigSetParam("int_param0","int","varname1","0"));
- configset.add(new ConfigSetParam("int_param1","int","","1"));
- configset.add(new ConfigSetParam("double_param0","double","varname2","0.11"));
- configset.add(new ConfigSetParam("str_param0","String","","hoge"));
- configset.add(new ConfigSetParam("str_param1","String","varname3","dara"));
- rtcParam.getConfigParams().addAll(configset);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\ConfigSet\\ConfigVar\\";
- checkResults(result, resourceDir);
- }
- public void testConfigSetOriginal() throws Exception{
- rtcParam.setVersion("1.0.3");
- rtcParam.setVender("TA2");
- rtcParam.setCategory("manip2");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(3);
-
- genParam.getRtcParams().add(rtcParam);
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- configset.add(new ConfigSetParam("int_param0","int","","0"));
- configset.add(new ConfigSetParam("int_param1","int","","1"));
- configset.add(new ConfigSetParam("double_param0","double","","0.11"));
- configset.add(new ConfigSetParam("str_param0","String","","hoge"));
- configset.add(new ConfigSetParam("str_param1","String","","dara"));
- rtcParam.getConfigParams().addAll(configset);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\ConfigSet\\configset3\\";
- checkResults(result, resourceDir);
- }
-
- public void testDataPortVar() throws Exception{
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(5);
- genParam.getRtcParams().add(rtcParam);
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "InName1", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "InNm2", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "OutName1", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "OutNme2", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\PortVar\\";
- checkResults(result, resourceDir);
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- }
-
- public void testOriginalPort() throws Exception{
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(5);
- genParam.getRtcParams().add(rtcParam);
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- dataport.add(new DataPortParam("InP2", "RTC::TimedLong", "", 0));
- rtcParam.getInports().addAll(dataport);
- List<DataPortParam> outport = new ArrayList<DataPortParam>();
- outport.add(new DataPortParam("OutP1", "RTC::TimedLong", "", 0));
- outport.add(new DataPortParam("OutP2", "RTC::TimedFloat", "", 0));
- rtcParam.getOutports().addAll(outport);
-
- ServicePortParam service1 = new ServicePortParam("svPort",0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(service1, "acc", "", "",
- rootPath + "\\resource\\MyService.idl", "MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- ServicePortParam service2 = new ServicePortParam("cmPort",0);
- List<ServicePortInterfaceParam> srvinterts2 = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(service2, "rate", "", "",
- rootPath + "\\resource\\DAQService.idl", "DAQService", "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- Generator generator = new Generator();
- GenerateManager manager = new JavaGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "\\resource\\Java\\service2\\";
- checkResults(result, resourceDir);
- checkCode(result, resourceDir, "MyServiceSVC_impl.java");
- }
-
- private void checkResults(List<GeneratedResult> result, String resourceDir) {
- checkCode(result, resourceDir, "fooComp.java");
- checkCode(result, resourceDir, "build_foo.xml");
- checkCode(result, resourceDir, "foo.java");
- checkCode(result, resourceDir, "fooImpl.java");
- checkCode(result, resourceDir, "README.foo");
- }
-}
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 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BaseTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -83,7 +83,7 @@
String resourceDir = rootPath + "/resource/100/base/service2/";
- assertEquals(19, result.size());
+ assertEquals(34, 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(19, result.size());
+ assertEquals(34, 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(18, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -192,7 +192,7 @@
String resourceDir = rootPath + "/resource/100/base/outport1/";
- assertEquals(18, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -221,7 +221,7 @@
String resourceDir = rootPath + "/resource/100/base/inport2/";
- assertEquals(18, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -249,7 +249,7 @@
String resourceDir = rootPath + "/resource/100/base/inport1/";
- assertEquals(18, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -273,7 +273,7 @@
String resourceDir = rootPath + "/resource/100/base/name/";
- assertEquals(18, result.size());
+ assertEquals(33, 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 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/BuildTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -89,7 +89,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(19, result.size());
+ assertEquals(34, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -97,17 +97,17 @@
checkCode(result, resourceDir, "foo.sh");
checkCode(result, resourceDir, "foo.bat");
//
- checkCode(result, resourceDir, "CMakeLists.txt");
- checkCode(result, resourceDir, "Doxyfile.in");
- checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
- checkCode(result, resourceDir,
- "cmake_modules/cmake_javacompile.cmake.in");
- checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
- checkCode(result, resourceDir, "cmake_modules/FindOpenRTMJava.cmake");
- checkCode(result, resourceDir, "cpack_resources/Description.txt");
- checkCode(result, resourceDir, "cpack_resources/License.txt");
- checkCode(result, resourceDir, "cpack_resources/License.rtf");
- checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+// checkCode(result, resourceDir, "CMakeLists.txt");
+// checkCode(result, resourceDir, "Doxyfile.in");
+// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+// checkCode(result, resourceDir,
+// "cmake_modules/cmake_javacompile.cmake.in");
+// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+// checkCode(result, resourceDir, "cmake_modules/FindOpenRTMJava.cmake");
+// checkCode(result, resourceDir, "cpack_resources/Description.txt");
+// checkCode(result, resourceDir, "cpack_resources/License.txt");
+// checkCode(result, resourceDir, "cpack_resources/License.rtf");
+// checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
//
checkCode(result, resourceDir, "build_foo.xml");
}
@@ -163,7 +163,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(23, result.size());
+ assertEquals(38, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -171,17 +171,17 @@
checkCode(result, resourceDir, "foo.sh");
checkCode(result, resourceDir, "foo.bat");
//
- checkCode(result, resourceDir, "CMakeLists.txt");
- checkCode(result, resourceDir, "Doxyfile.in");
- checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
- checkCode(result, resourceDir,
- "cmake_modules/cmake_javacompile.cmake.in");
- checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
- checkCode(result, resourceDir, "cmake_modules/FindOpenRTMJava.cmake");
- checkCode(result, resourceDir, "cpack_resources/Description.txt");
- checkCode(result, resourceDir, "cpack_resources/License.txt");
- checkCode(result, resourceDir, "cpack_resources/License.rtf");
- checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
+// checkCode(result, resourceDir, "CMakeLists.txt");
+// checkCode(result, resourceDir, "Doxyfile.in");
+// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+// checkCode(result, resourceDir,
+// "cmake_modules/cmake_javacompile.cmake.in");
+// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+// checkCode(result, resourceDir, "cmake_modules/FindOpenRTMJava.cmake");
+// checkCode(result, resourceDir, "cpack_resources/Description.txt");
+// checkCode(result, resourceDir, "cpack_resources/License.txt");
+// checkCode(result, resourceDir, "cpack_resources/License.rtf");
+// checkCode(result, resourceDir, "cpack_resources/wix.xsl.in");
//
checkCode(result, resourceDir, "build_foo.xml");
}
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 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ConfigSetTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -56,7 +56,7 @@
String targetDir = rootPath + "/resource/100/ConfigSet/AIST6/";
- assertEquals(18, result.size());
+ assertEquals(33, result.size());
checkCode(result, targetDir, "src/ModuleNameComp.java");
checkCode(result, targetDir, "src/ModuleName.java");
checkCode(result, targetDir, "src/ModuleNameImpl.java");
@@ -83,7 +83,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset1/";
- assertEquals(18, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -112,7 +112,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset2/";
- assertEquals(18, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -144,7 +144,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset3/";
- assertEquals(18, result.size());
+ assertEquals(33, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
@@ -178,7 +178,7 @@
String resourceDir = rootPath
+ "/resource/100/ConfigSet/ConfigSetType/";
- assertEquals(18, result.size());
+ assertEquals(33, 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 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/JavaIDLInheritTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -81,7 +81,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(21, result.size());
+ assertEquals(36, 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(23, result.size());
+ assertEquals(38, 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 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/ModuleTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -63,7 +63,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceM/";
- assertEquals(19, result.size());
+ assertEquals(34, 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(18, result.size());
+ assertEquals(33, 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(19, result.size());
+ assertEquals(34, 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 2012-02-10 17:02:45 UTC (rev 260)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/test/jp/go/aist/rtm/rtcbuilder/java/_test/_100/MultiTest.java 2012-02-10 17:03:17 UTC (rev 261)
@@ -102,7 +102,7 @@
String resourceDir = rootPath + "/resource/100/Multi/ProConMulti/";
- assertEquals(20, result.size());
+ assertEquals(35, 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(18, result.size());
+ assertEquals(33, 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(20, result.size());
+ assertEquals(35, result.size());
checkCode(result, resourceDir, "src/fooComp.java");
checkCode(result, resourceDir, "src/foo.java");
checkCode(result, resourceDir, "src/fooImpl.java");
openrtm-commit メーリングリストの案内