[openrtm-commit:02302] r651 - in branches/FSM4RTC: . jp.go.aist.rtm.rtcbuilder.python/META-INF jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1 jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2 jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3 jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4 jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1 jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2 jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1 jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2 jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3 jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2 jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 1月 22日 (日) 15:08:45 JST
Author: ga
Date: 2017-01-22 15:08:45 +0900 (Sun, 22 Jan 2017)
New Revision: 651
Added:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java
Removed:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python_04/
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java
Modified:
branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF
Log:
Modified: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/META-INF/MANIFEST.MF 2017-01-22 06:08:45 UTC (rev 651)
@@ -14,8 +14,7 @@
Bundle-Vendor: %providerName
Export-Package: jp.go.aist.rtm.rtcbuilder.python,jp.go.aist.rtm.rtcbui
lder.python.manager,jp.go.aist.rtm.rtcbuilder.python.template.cmake,j
- p.go.aist.rtm.rtcbuilder.python.template.python,jp.go.aist.rtm.rtcbui
- lder.python.template.python_04
+ p.go.aist.rtm.rtcbuilder.python.template.python
Eclipse-BuddyPolicy: registered
Built-By: ngd
Built-Date: 2015/06/18 19:57:37
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/author/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/authorLong/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/full/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/Doc/refer/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST1/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST2/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST3/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/aist/AIST4/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service1/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/base/service2/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/build/cmake1/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type2/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/idltype/type3/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,10 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/resource/100/module/serviceM2/idlcompile.bat 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,10 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" idl/MyService.idl idl/DAQService.idl
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,11 +0,0 @@
-echo off
-setlocal
-for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
-if exist %f% do (
- %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" #foreach($IdlPath in ${idlPathes})-I"${IdlPath}" #end#foreach($IdlFile in ${allIdlFileParam})idl/${IdlFile.IdlFile} #end
-
-) else do (
- echo "python.exe" can not be found.
- echo Please modify PATH environmental variable for python command.
-)
-endlocal
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/python/idlcompile.bat.vsl 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,11 @@
+echo off
+setlocal
+for %%I in (python.exe) do if exist %%~$path:I set f=%%~$path:I
+if exist %f% do (
+ %f:python.exe=%omniidl.exe -bpython -I"%RTM_ROOT%rtm\idl" #foreach($IdlPath in ${idlPathes})-I"${IdlPath}" #end#foreach($IdlFile in ${allIdlFileParam})idl/${IdlFile.IdlFile} #end
+
+) else (
+ echo "python.exe" can not be found.
+ echo Please modify PATH environmental variable for python command.
+)
+endlocal
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,283 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test._100;
-
-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.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class AISTTest extends TestBase {
-
- Generator generator;
- GeneratorParam genParam;
- RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "/resource/work");
- rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
- rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
- rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
- rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
-
- generator = new Generator();
- generator.addGenerateManager(new PythonGenerateManager());
- generator.addGenerateManager(new PythonCMakeGenerateManager());
- }
-
- public void testAIST7() 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);
- rtcParam.setComponentKind("DataFlowComponent");
-
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- ConfigSetParam param01 = new ConfigSetParam("test", "double", "", "0");
- param01.setWidget("slider");
- param01.setStep("0.2");
- param01.setConstraint("-1.0<x<1.0");
- configset.add(param01);
- rtcParam.getConfigParams().addAll(configset);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/aist/AIST7/";
-
- checkCode(result, resourceDir, "ModuleName.py");
- }
-
- public void testAIST6() 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);
- rtcParam.setComponentKind("DataFlowComponent");
-
- ServicePortParam service1 = new ServicePortParam("MySVPro0", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "myservice0", "", "", rootPath
- + "resource/Python/AIST6/work/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/Python/AIST6/work/MyServiceAIST.idl",
- "MyService2", "", 0);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
- //
- rtcParam.setOutputProject(rootPath + "/resource/work");
- rtcParam.getServicePorts().clear();
- result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/aist/AIST6/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "test.py");
- }
-
- 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);
- rtcParam.setComponentKind("DataFlowComponent");
-
- ServicePortParam service1 = new ServicePortParam("MySVPro0", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "myservice0", "", "", rootPath
- + "resource/Python/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/Python/AIST4/MyService.idl", "MyService",
- "", 0);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/aist/AIST4/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "test.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- 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);
- rtcParam.setComponentKind("DataFlowComponent");
-
- 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/Python/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/Python/AIST3/MyService.idl", "MyService",
- "", 1);
- srvinterts2.add(int2);
- service2.getServicePortInterfaces().addAll(srvinterts2);
- srvports.add(service2);
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/aist/AIST3/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "test.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- 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);
- rtcParam.setComponentKind("DataFlowComponent");
-
- 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/Python/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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/aist/AIST2/";
-
- assertEquals(30, result.size());
- checkCode(result, resourceDir, "test.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- public void testAIST1() 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);
- rtcParam.setComponentKind("DataFlowComponent");
-
- ServicePortParam service1 = new ServicePortParam("MySVPro", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "myservice", "", "", rootPath
- + "resource/Python/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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/aist/AIST1/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "test.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
-}
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,283 @@
+package jp.go.aist.rtm.rtcbuilder.python._test._100;
+
+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.python.IRtcBuilderConstantsPython;
+import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
+
+public class AISTTest extends TestBase {
+
+ Generator generator;
+ GeneratorParam genParam;
+ RtcParam rtcParam;
+
+ protected void setUp() throws Exception {
+ genParam = new GeneratorParam();
+ rtcParam = new RtcParam(genParam, true);
+ rtcParam.setOutputProject(rootPath + "/resource/work");
+ rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
+ rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
+ rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
+ rtcParam.setIsTest(true);
+ genParam.getRtcParams().add(rtcParam);
+
+ generator = new Generator();
+ generator.addGenerateManager(new PythonGenerateManager());
+ generator.addGenerateManager(new PythonCMakeGenerateManager());
+ }
+
+ public void testAIST7() 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);
+ rtcParam.setComponentKind("DataFlowComponent");
+
+ List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
+ ConfigSetParam param01 = new ConfigSetParam("test", "double", "", "0");
+ param01.setWidget("slider");
+ param01.setStep("0.2");
+ param01.setConstraint("-1.0<x<1.0");
+ configset.add(param01);
+ rtcParam.getConfigParams().addAll(configset);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/aist/AIST7/";
+
+ checkCode(result, resourceDir, "ModuleName.py");
+ }
+
+ public void testAIST6() 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);
+ rtcParam.setComponentKind("DataFlowComponent");
+
+ ServicePortParam service1 = new ServicePortParam("MySVPro0", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+ service1, "myservice0", "", "", rootPath
+ + "resource/Python/AIST6/work/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/Python/AIST6/work/MyServiceAIST.idl",
+ "MyService2", "", 0);
+ srvinterts2.add(int2);
+ service2.getServicePortInterfaces().addAll(srvinterts2);
+ srvports.add(service2);
+ rtcParam.getServicePorts().addAll(srvports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+ //
+ rtcParam.setOutputProject(rootPath + "/resource/work");
+ rtcParam.getServicePorts().clear();
+ result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/aist/AIST6/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "test.py");
+ }
+
+ 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);
+ rtcParam.setComponentKind("DataFlowComponent");
+
+ ServicePortParam service1 = new ServicePortParam("MySVPro0", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+ service1, "myservice0", "", "", rootPath
+ + "resource/Python/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/Python/AIST4/MyService.idl", "MyService",
+ "", 0);
+ srvinterts2.add(int2);
+ service2.getServicePortInterfaces().addAll(srvinterts2);
+ srvports.add(service2);
+ rtcParam.getServicePorts().addAll(srvports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/aist/AIST4/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "test.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ 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);
+ rtcParam.setComponentKind("DataFlowComponent");
+
+ 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/Python/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/Python/AIST3/MyService.idl", "MyService",
+ "", 1);
+ srvinterts2.add(int2);
+ service2.getServicePortInterfaces().addAll(srvinterts2);
+ srvports.add(service2);
+ rtcParam.getServicePorts().addAll(srvports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/aist/AIST3/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "test.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ 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);
+ rtcParam.setComponentKind("DataFlowComponent");
+
+ 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/Python/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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/aist/AIST2/";
+
+ assertEquals(29, result.size());
+ checkCode(result, resourceDir, "test.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ public void testAIST1() 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);
+ rtcParam.setComponentKind("DataFlowComponent");
+
+ ServicePortParam service1 = new ServicePortParam("MySVPro", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+ service1, "myservice", "", "", rootPath
+ + "resource/Python/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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/aist/AIST1/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "test.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+}
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,278 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test._100;
-
-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.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.manager.GenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class BaseTest extends TestBase {
-
- Generator generator;
- GeneratorParam genParam;
- RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "/resource/work");
- rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
- rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
- rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
- rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
-
- generator = new Generator();
- generator.addGenerateManager(new PythonGenerateManager());
- generator.addGenerateManager(new PythonCMakeGenerateManager());
- }
-
- public void testServicePort2() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setMaxInstance(5);
-
- 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/base/service2/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- public void testServicePort1() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(5);
-
- 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/base/service1/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- public void testOutPort2() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(5);
-
- 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/base/outport2/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testOutPort1() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(5);
-
- 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/base/outport1/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testInPort2() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(5);
-
- 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<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/base/inport2/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testInPort() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(5);
-
- List<DataPortParam> dataport = new ArrayList<DataPortParam>();
- dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
- rtcParam.getInports().addAll(dataport);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/base/inport1/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testName2() throws Exception {
- rtcParam.setName("Foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(5);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/base/name2/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "Foo.py");
- }
-
- public void testBasic() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("MDesc");
- rtcParam.setVersion("1.0.1");
- rtcParam.setVender("TA");
- rtcParam.setCategory("Manip");
- rtcParam.setComponentType("STATIC2");
- rtcParam.setActivityType("PERIODIC2");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setMaxInstance(5);
-
- Generator generator = new Generator();
- GenerateManager manager = new PythonGenerateManager();
- generator.addGenerateManager(manager);
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/base/name/";
-
- assertEquals(4, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
-}
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,278 @@
+package jp.go.aist.rtm.rtcbuilder.python._test._100;
+
+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.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.manager.GenerateManager;
+import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
+import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
+
+public class BaseTest extends TestBase {
+
+ Generator generator;
+ GeneratorParam genParam;
+ RtcParam rtcParam;
+
+ protected void setUp() throws Exception {
+ genParam = new GeneratorParam();
+ rtcParam = new RtcParam(genParam, true);
+ rtcParam.setOutputProject(rootPath + "/resource/work");
+ rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
+ rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
+ rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
+ rtcParam.setIsTest(true);
+ genParam.getRtcParams().add(rtcParam);
+
+ generator = new Generator();
+ generator.addGenerateManager(new PythonGenerateManager());
+ generator.addGenerateManager(new PythonCMakeGenerateManager());
+ }
+
+ public void testServicePort2() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("MDesc");
+ rtcParam.setVersion("1.0.1");
+ rtcParam.setVender("TA");
+ rtcParam.setCategory("Manip");
+ rtcParam.setComponentType("STATIC2");
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setActivityType("PERIODIC2");
+ rtcParam.setMaxInstance(5);
+
+ 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/base/service2/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ public void testServicePort1() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("MDesc");
+ rtcParam.setVersion("1.0.1");
+ rtcParam.setVender("TA");
+ rtcParam.setCategory("Manip");
+ rtcParam.setComponentType("STATIC2");
+ rtcParam.setActivityType("PERIODIC2");
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setMaxInstance(5);
+
+ 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/base/service1/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ public void testOutPort2() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("MDesc");
+ rtcParam.setVersion("1.0.1");
+ rtcParam.setVender("TA");
+ rtcParam.setCategory("Manip");
+ rtcParam.setComponentType("STATIC2");
+ rtcParam.setActivityType("PERIODIC2");
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setMaxInstance(5);
+
+ 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/base/outport2/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testOutPort1() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("MDesc");
+ rtcParam.setVersion("1.0.1");
+ rtcParam.setVender("TA");
+ rtcParam.setCategory("Manip");
+ rtcParam.setComponentType("STATIC2");
+ rtcParam.setActivityType("PERIODIC2");
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setMaxInstance(5);
+
+ 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/base/outport1/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testInPort2() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("MDesc");
+ rtcParam.setVersion("1.0.1");
+ rtcParam.setVender("TA");
+ rtcParam.setCategory("Manip");
+ rtcParam.setComponentType("STATIC2");
+ rtcParam.setActivityType("PERIODIC2");
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setMaxInstance(5);
+
+ 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<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/base/inport2/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testInPort() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("MDesc");
+ rtcParam.setVersion("1.0.1");
+ rtcParam.setVender("TA");
+ rtcParam.setCategory("Manip");
+ rtcParam.setComponentType("STATIC2");
+ rtcParam.setActivityType("PERIODIC2");
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setMaxInstance(5);
+
+ List<DataPortParam> dataport = new ArrayList<DataPortParam>();
+ dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
+ rtcParam.getInports().addAll(dataport);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/base/inport1/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testName2() throws Exception {
+ rtcParam.setName("Foo");
+ rtcParam.setDescription("MDesc");
+ rtcParam.setVersion("1.0.1");
+ rtcParam.setVender("TA");
+ rtcParam.setCategory("Manip");
+ rtcParam.setComponentType("STATIC2");
+ rtcParam.setActivityType("PERIODIC2");
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setMaxInstance(5);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/base/name2/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "Foo.py");
+ }
+
+ public void testBasic() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("MDesc");
+ rtcParam.setVersion("1.0.1");
+ rtcParam.setVender("TA");
+ rtcParam.setCategory("Manip");
+ rtcParam.setComponentType("STATIC2");
+ rtcParam.setActivityType("PERIODIC2");
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setMaxInstance(5);
+
+ Generator generator = new Generator();
+ GenerateManager manager = new PythonGenerateManager();
+ generator.addGenerateManager(manager);
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/base/name/";
+
+ assertEquals(4, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+}
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,178 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test._100;
-
-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.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.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class BuildTest extends TestBase {
-
- Generator generator;
- GeneratorParam genParam;
- RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "/resource/work");
- rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
- rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
- rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
- rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
-
- generator = new Generator();
- generator.addGenerateManager(new PythonGenerateManager());
- generator.addGenerateManager(new PythonCMakeGenerateManager());
- }
-
- String fixturePath(String name) {
- return rootPath + "resource/100/" + name;
- }
-
- public void testCMake1() throws Exception {
- String name = "build/cmake1";
-
- 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.setComponentKind("DataFlowComponent");
-
- 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::TimedInt", "", 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = fixturePath(name) + "/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- //
-// checkCode(result, resourceDir, "CMakeLists.txt");
-// checkCode(result, resourceDir, "Doxyfile.in");
-// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-// checkCode(result, resourceDir, "cmake_modules/FindOpenRTMPython.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");
- }
-
- public void testCMake2() throws Exception {
- String name = "build/cmake2";
-
- 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.setComponentKind("DataFlowComponent");
-
- List<ServicePortParam> svports = new ArrayList<ServicePortParam>();
-
- ServicePortParam sv1 = new ServicePortParam("MyServiceProvider", 0);
- List<ServicePortInterfaceParam> iflist = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam sif1 = new ServicePortInterfaceParam(sv1,
- "MyServiceProvider", "", "", fixturePath(name)
- + "/MyServiceChildMulti.idl", "MyServiceChild",
- fixturePath(name), 0);
- iflist.add(sif1);
- ServicePortInterfaceParam sif2 = new ServicePortInterfaceParam(sv1,
- "MyServiceProvider2", "", "", fixturePath(name)
- + "/MyServiceChildWithType.idl",
- "MyServiceWithTypeChild", fixturePath(name), 0);
- iflist.add(sif2);
- sv1.getServicePortInterfaces().addAll(iflist);
- svports.add(sv1);
-
- ServicePortParam sv2 = new ServicePortParam("MyServiceRequire", 0);
- iflist = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam sif3 = new ServicePortInterfaceParam(sv2,
- "MyServiceRequire", "", "", fixturePath(name)
- + "/MyServiceChildMulti.idl", "MyServiceChild",
- fixturePath(name), 1);
- iflist.add(sif3);
- ServicePortInterfaceParam sif4 = new ServicePortInterfaceParam(sv2,
- "MyServiceRequire2", "", "", fixturePath(name)
- + "/MyServiceChildWithType.idl",
- "MyServiceWithTypeChild", fixturePath(name), 1);
- iflist.add(sif4);
- sv2.getServicePortInterfaces().addAll(iflist);
- svports.add(sv2);
-
- rtcParam.getServicePorts().addAll(svports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = fixturePath(name) + "/";
-
- assertEquals(32, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
- checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");
-// checkCode(result, resourceDir, "idlcompile.bat");
-// checkCode(result, resourceDir, "idlcompile.sh");
- //
-// checkCode(result, resourceDir, "CMakeLists.txt");
-// checkCode(result, resourceDir, "Doxyfile.in");
-// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
-// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
-// checkCode(result, resourceDir, "cmake_modules/FindOpenRTMPython.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");
- }
-
-}
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,178 @@
+package jp.go.aist.rtm.rtcbuilder.python._test._100;
+
+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.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.python.IRtcBuilderConstantsPython;
+import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
+
+public class BuildTest extends TestBase {
+
+ Generator generator;
+ GeneratorParam genParam;
+ RtcParam rtcParam;
+
+ protected void setUp() throws Exception {
+ genParam = new GeneratorParam();
+ rtcParam = new RtcParam(genParam, true);
+ rtcParam.setOutputProject(rootPath + "/resource/work");
+ rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
+ rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
+ rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
+ rtcParam.setIsTest(true);
+ genParam.getRtcParams().add(rtcParam);
+
+ generator = new Generator();
+ generator.addGenerateManager(new PythonGenerateManager());
+ generator.addGenerateManager(new PythonCMakeGenerateManager());
+ }
+
+ String fixturePath(String name) {
+ return rootPath + "resource/100/" + name;
+ }
+
+ public void testCMake1() throws Exception {
+ String name = "build/cmake1";
+
+ 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.setComponentKind("DataFlowComponent");
+
+ 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::TimedInt", "", 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = fixturePath(name) + "/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ //
+// checkCode(result, resourceDir, "CMakeLists.txt");
+// checkCode(result, resourceDir, "Doxyfile.in");
+// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+// checkCode(result, resourceDir, "cmake_modules/FindOpenRTMPython.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");
+ }
+
+ public void testCMake2() throws Exception {
+ String name = "build/cmake2";
+
+ 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.setComponentKind("DataFlowComponent");
+
+ List<ServicePortParam> svports = new ArrayList<ServicePortParam>();
+
+ ServicePortParam sv1 = new ServicePortParam("MyServiceProvider", 0);
+ List<ServicePortInterfaceParam> iflist = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam sif1 = new ServicePortInterfaceParam(sv1,
+ "MyServiceProvider", "", "", fixturePath(name)
+ + "/MyServiceChildMulti.idl", "MyServiceChild",
+ fixturePath(name), 0);
+ iflist.add(sif1);
+ ServicePortInterfaceParam sif2 = new ServicePortInterfaceParam(sv1,
+ "MyServiceProvider2", "", "", fixturePath(name)
+ + "/MyServiceChildWithType.idl",
+ "MyServiceWithTypeChild", fixturePath(name), 0);
+ iflist.add(sif2);
+ sv1.getServicePortInterfaces().addAll(iflist);
+ svports.add(sv1);
+
+ ServicePortParam sv2 = new ServicePortParam("MyServiceRequire", 0);
+ iflist = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam sif3 = new ServicePortInterfaceParam(sv2,
+ "MyServiceRequire", "", "", fixturePath(name)
+ + "/MyServiceChildMulti.idl", "MyServiceChild",
+ fixturePath(name), 1);
+ iflist.add(sif3);
+ ServicePortInterfaceParam sif4 = new ServicePortInterfaceParam(sv2,
+ "MyServiceRequire2", "", "", fixturePath(name)
+ + "/MyServiceChildWithType.idl",
+ "MyServiceWithTypeChild", fixturePath(name), 1);
+ iflist.add(sif4);
+ sv2.getServicePortInterfaces().addAll(iflist);
+ svports.add(sv2);
+
+ rtcParam.getServicePorts().addAll(svports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = fixturePath(name) + "/";
+
+ assertEquals(31, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
+ checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
+ //
+// checkCode(result, resourceDir, "CMakeLists.txt");
+// checkCode(result, resourceDir, "Doxyfile.in");
+// checkCode(result, resourceDir, "cmake_modules/cmake_uninstall.cmake.in");
+// checkCode(result, resourceDir, "cmake_modules/CPackWIX.cmake");
+// checkCode(result, resourceDir, "cmake_modules/FindOpenRTMPython.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");
+ }
+
+}
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,171 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test._100;
-
-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.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class ConfigSetTest extends TestBase {
-
- Generator generator;
- GeneratorParam genParam;
- RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "/resource/work");
- rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
- rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
- rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
- rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
-
- generator = new Generator();
- generator.addGenerateManager(new PythonGenerateManager());
- generator.addGenerateManager(new PythonCMakeGenerateManager());
- }
-
- public void testConfigSet() throws Exception {
- 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.setComponentKind("DataFlowComponent");
-
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- configset.add(new ConfigSetParam("int_param0", "int", "", "0"));
- rtcParam.getConfigParams().addAll(configset);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/ConfigSet/configset1/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testConfigSet2() throws Exception {
- 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.setComponentKind("DataFlowComponent");
-
- 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/ConfigSet/configset2/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testConfigSet3() throws Exception {
- 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.setComponentKind("DataFlowComponent");
-
- 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<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/ConfigSet/configset3/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testConfigSet4() throws Exception {
- 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.setComponentKind("DataFlowComponent");
-
- 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"));
- configset.add(new ConfigSetParam("vector_param0", "double", "",
- "0.0,1.0,2.0,3.0"));
- rtcParam.getConfigParams().addAll(configset);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/ConfigSet/configset4/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testConfigSetType() throws Exception {
- 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);
-
- List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
- configset.add(new ConfigSetParam("short_param", "short", "", "0"));
- configset.add(new ConfigSetParam("int_param", "int", "", "1"));
- configset.add(new ConfigSetParam("long_param", "long", "", "14"));
- configset.add(new ConfigSetParam("float_param", "float", "", "0.11"));
- configset.add(new ConfigSetParam("double_param", "double", "", "4.11"));
- configset.add(new ConfigSetParam("str_param0", "string", "", "hoge"));
- configset.add(new ConfigSetParam("str_param1", "string", "", "dara"));
- rtcParam.getConfigParams().addAll(configset);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath
- + "/resource/100/ConfigSet/ConfigSetType/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-}
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,171 @@
+package jp.go.aist.rtm.rtcbuilder.python._test._100;
+
+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.GeneratorParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
+import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
+import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
+
+public class ConfigSetTest extends TestBase {
+
+ Generator generator;
+ GeneratorParam genParam;
+ RtcParam rtcParam;
+
+ protected void setUp() throws Exception {
+ genParam = new GeneratorParam();
+ rtcParam = new RtcParam(genParam, true);
+ rtcParam.setOutputProject(rootPath + "/resource/work");
+ rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
+ rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
+ rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
+ rtcParam.setIsTest(true);
+ genParam.getRtcParams().add(rtcParam);
+
+ generator = new Generator();
+ generator.addGenerateManager(new PythonGenerateManager());
+ generator.addGenerateManager(new PythonCMakeGenerateManager());
+ }
+
+ public void testConfigSet() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+
+ List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
+ configset.add(new ConfigSetParam("int_param0", "int", "", "0"));
+ rtcParam.getConfigParams().addAll(configset);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/ConfigSet/configset1/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testConfigSet2() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+
+ 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/ConfigSet/configset2/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testConfigSet3() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+
+ 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<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/ConfigSet/configset3/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testConfigSet4() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+
+ 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"));
+ configset.add(new ConfigSetParam("vector_param0", "double", "",
+ "0.0,1.0,2.0,3.0"));
+ rtcParam.getConfigParams().addAll(configset);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/ConfigSet/configset4/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testConfigSetType() throws Exception {
+ 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);
+
+ List<ConfigSetParam> configset = new ArrayList<ConfigSetParam>();
+ configset.add(new ConfigSetParam("short_param", "short", "", "0"));
+ configset.add(new ConfigSetParam("int_param", "int", "", "1"));
+ configset.add(new ConfigSetParam("long_param", "long", "", "14"));
+ configset.add(new ConfigSetParam("float_param", "float", "", "0.11"));
+ configset.add(new ConfigSetParam("double_param", "double", "", "4.11"));
+ configset.add(new ConfigSetParam("str_param0", "string", "", "hoge"));
+ configset.add(new ConfigSetParam("str_param1", "string", "", "dara"));
+ rtcParam.getConfigParams().addAll(configset);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath
+ + "/resource/100/ConfigSet/ConfigSetType/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+}
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,440 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test._100;
-
-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.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
-
-public class PyDocTest extends TestBase {
-
- Generator generator;
- GeneratorParam genParam;
- RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "/resource/work");
- rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
- rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
- rtcParam.setRtmVersion(RTM_VERSION_100);
- rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
-
- generator = new Generator();
- generator.addGenerateManager(new PythonGenerateManager());
- generator.addGenerateManager(new PythonCMakeGenerateManager());
- }
-
- public void testDocAll() throws Exception {
- 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.setComponentKind("DataFlowComponent");
- //
- 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(ACTIVITY_INITIALIZE, "on_initialize概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_INITIALIZE,
- "on_initialize事前条件");
- rtcParam.setDocActionPostCondition(ACTIVITY_INITIALIZE,
- "on_initialize事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_FINALIZE, "on_finalize概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_FINALIZE, "on_finalize事前条件");
- rtcParam
- .setDocActionPostCondition(ACTIVITY_FINALIZE, "on_finalize事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_STARTUP, "on_startup概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_STARTUP, "on_startup事前条件");
- rtcParam.setDocActionPostCondition(ACTIVITY_STARTUP, "on_startup事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_SHUTDOWN, "on_shutdown概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_SHUTDOWN, "on_shutdown事前条件");
- rtcParam
- .setDocActionPostCondition(ACTIVITY_SHUTDOWN, "on_shutdown事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_ACTIVATED, "on_activated概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_ACTIVATED,
- "on_activated事前条件");
- rtcParam.setDocActionPostCondition(ACTIVITY_ACTIVATED,
- "on_activated事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_DEACTIVATED,
- "on_deactivated概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_DEACTIVATED,
- "on_deactivated事前条件");
- rtcParam.setDocActionPostCondition(ACTIVITY_DEACTIVATED,
- "on_deactivated事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_EXECUTE, "on_execute概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_EXECUTE, "on_execute事前条件");
- rtcParam.setDocActionPostCondition(ACTIVITY_EXECUTE, "on_execute事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_ABORTING, "on_aborting概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_ABORTING, "on_aborting事前条件");
- rtcParam
- .setDocActionPostCondition(ACTIVITY_ABORTING, "on_aborting事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_ERROR, "on_error概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_ERROR, "on_error事前条件");
- rtcParam.setDocActionPostCondition(ACTIVITY_ERROR, "on_error事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_RESET, "on_reset概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_RESET, "on_reset事前条件");
- rtcParam.setDocActionPostCondition(ACTIVITY_RESET, "on_reset事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_STATE_UPDATE,
- "on_state_update概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_STATE_UPDATE,
- "on_state_update事前条件");
- rtcParam.setDocActionPostCondition(ACTIVITY_STATE_UPDATE,
- "on_state_update事後条件");
- //
- rtcParam.setDocActionOverView(ACTIVITY_RATE_CHANGED,
- "on_rate_changed概要説明");
- rtcParam.setDocActionPreCondition(ACTIVITY_RATE_CHANGED,
- "on_rate_changed事前条件");
- rtcParam.setDocActionPostCondition(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", "",
- "hoge");
- 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/Doc/full/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- public void testDocRefer() throws Exception {
- 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.setComponentKind("DataFlowComponent");
- //
- 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/Doc/refer/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- public void testDocAuthorLong() throws Exception {
- 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.setComponentKind("DataFlowComponent");
- //
- 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/Doc/authorLong/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- public void testDocAuthor() throws Exception {
- 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.setComponentKind("DataFlowComponent");
- //
- 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/Doc/author/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
-}
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,440 @@
+package jp.go.aist.rtm.rtcbuilder.python._test._100;
+
+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.python.IRtcBuilderConstantsPython;
+import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
+
+import static jp.go.aist.rtm.rtcbuilder.IRtcBuilderConstants.*;
+
+public class PyDocTest extends TestBase {
+
+ Generator generator;
+ GeneratorParam genParam;
+ RtcParam rtcParam;
+
+ protected void setUp() throws Exception {
+ genParam = new GeneratorParam();
+ rtcParam = new RtcParam(genParam, true);
+ rtcParam.setOutputProject(rootPath + "/resource/work");
+ rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
+ rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
+ rtcParam.setRtmVersion(RTM_VERSION_100);
+ rtcParam.setIsTest(true);
+ genParam.getRtcParams().add(rtcParam);
+
+ generator = new Generator();
+ generator.addGenerateManager(new PythonGenerateManager());
+ generator.addGenerateManager(new PythonCMakeGenerateManager());
+ }
+
+ public void testDocAll() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+ //
+ 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(ACTIVITY_INITIALIZE, "on_initialize概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_INITIALIZE,
+ "on_initialize事前条件");
+ rtcParam.setDocActionPostCondition(ACTIVITY_INITIALIZE,
+ "on_initialize事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_FINALIZE, "on_finalize概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_FINALIZE, "on_finalize事前条件");
+ rtcParam
+ .setDocActionPostCondition(ACTIVITY_FINALIZE, "on_finalize事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_STARTUP, "on_startup概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_STARTUP, "on_startup事前条件");
+ rtcParam.setDocActionPostCondition(ACTIVITY_STARTUP, "on_startup事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_SHUTDOWN, "on_shutdown概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_SHUTDOWN, "on_shutdown事前条件");
+ rtcParam
+ .setDocActionPostCondition(ACTIVITY_SHUTDOWN, "on_shutdown事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_ACTIVATED, "on_activated概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_ACTIVATED,
+ "on_activated事前条件");
+ rtcParam.setDocActionPostCondition(ACTIVITY_ACTIVATED,
+ "on_activated事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_DEACTIVATED,
+ "on_deactivated概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_DEACTIVATED,
+ "on_deactivated事前条件");
+ rtcParam.setDocActionPostCondition(ACTIVITY_DEACTIVATED,
+ "on_deactivated事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_EXECUTE, "on_execute概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_EXECUTE, "on_execute事前条件");
+ rtcParam.setDocActionPostCondition(ACTIVITY_EXECUTE, "on_execute事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_ABORTING, "on_aborting概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_ABORTING, "on_aborting事前条件");
+ rtcParam
+ .setDocActionPostCondition(ACTIVITY_ABORTING, "on_aborting事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_ERROR, "on_error概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_ERROR, "on_error事前条件");
+ rtcParam.setDocActionPostCondition(ACTIVITY_ERROR, "on_error事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_RESET, "on_reset概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_RESET, "on_reset事前条件");
+ rtcParam.setDocActionPostCondition(ACTIVITY_RESET, "on_reset事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_STATE_UPDATE,
+ "on_state_update概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_STATE_UPDATE,
+ "on_state_update事前条件");
+ rtcParam.setDocActionPostCondition(ACTIVITY_STATE_UPDATE,
+ "on_state_update事後条件");
+ //
+ rtcParam.setDocActionOverView(ACTIVITY_RATE_CHANGED,
+ "on_rate_changed概要説明");
+ rtcParam.setDocActionPreCondition(ACTIVITY_RATE_CHANGED,
+ "on_rate_changed事前条件");
+ rtcParam.setDocActionPostCondition(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", "",
+ "hoge");
+ 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/Doc/full/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ public void testDocRefer() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+ //
+ 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/Doc/refer/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ public void testDocAuthorLong() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+ //
+ 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/Doc/authorLong/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ public void testDocAuthor() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+ //
+ 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/Doc/author/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+}
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,140 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test._100;
-
-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.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.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class PyIDLInheritTest extends TestBase {
-
- Generator generator;
- GeneratorParam genParam;
- RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
-
- rtcParam.setOutputProject(rootPath + "/resource/work");
- rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
- rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_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.setComponentKind("DataFlowComponent");
- rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
- rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
-
- generator = new Generator();
- generator.addGenerateManager(new PythonGenerateManager());
- generator.addGenerateManager(new PythonCMakeGenerateManager());
- }
-
- String fixturePath(String name) {
- return rootPath + "resource/100/" + name;
- }
-
- public void testInherit1() throws Exception {
- String name = "idlinherit/inherit1";
-
- List<ServicePortParam> svports = new ArrayList<ServicePortParam>();
-
- ServicePortParam sv1 = new ServicePortParam("MyServiceProvider", 0);
- List<ServicePortInterfaceParam> iflist = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam sif1 = new ServicePortInterfaceParam(sv1,
- "MyServiceProvider", "", "", fixturePath(name)
- + "/MyServiceChildMulti.idl", "MyServiceChild",
- fixturePath(name), 0);
- iflist.add(sif1);
- sv1.getServicePortInterfaces().addAll(iflist);
- svports.add(sv1);
-
- ServicePortParam sv2 = new ServicePortParam("MyServiceRequire", 0);
- iflist = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam sif2 = new ServicePortInterfaceParam(sv2,
- "MyServiceRequire", "", "", fixturePath(name)
- + "/MyServiceChildMulti.idl", "MyServiceChild",
- fixturePath(name), 1);
- iflist.add(sif2);
- sv2.getServicePortInterfaces().addAll(iflist);
- svports.add(sv2);
-
- rtcParam.getServicePorts().addAll(svports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = fixturePath(name) + "/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
-// checkCode(result, resourceDir, "idlcompile.bat");
-// checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- public void testInherit2() throws Exception {
- String name = "idlinherit/inherit2";
-
- List<ServicePortParam> svports = new ArrayList<ServicePortParam>();
-
- ServicePortParam sv1 = new ServicePortParam("MyServiceProvider", 0);
- List<ServicePortInterfaceParam> iflist = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam sif1 = new ServicePortInterfaceParam(sv1,
- "MyServiceProvider", "", "", fixturePath(name)
- + "/MyServiceChildMulti.idl", "MyServiceChild",
- fixturePath(name), 0);
- iflist.add(sif1);
- ServicePortInterfaceParam sif2 = new ServicePortInterfaceParam(sv1,
- "MyServiceProvider2", "", "", fixturePath(name)
- + "/MyServiceChildWithType.idl",
- "MyServiceWithTypeChild", fixturePath(name), 0);
- iflist.add(sif2);
- sv1.getServicePortInterfaces().addAll(iflist);
- svports.add(sv1);
-
- ServicePortParam sv2 = new ServicePortParam("MyServiceRequire", 0);
- iflist = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam sif3 = new ServicePortInterfaceParam(sv2,
- "MyServiceRequire", "", "", fixturePath(name)
- + "/MyServiceChildMulti.idl", "MyServiceChild",
- fixturePath(name), 1);
- iflist.add(sif3);
- ServicePortInterfaceParam sif4 = new ServicePortInterfaceParam(sv2,
- "MyServiceRequire2", "", "", fixturePath(name)
- + "/MyServiceChildWithType.idl",
- "MyServiceWithTypeChild", fixturePath(name), 1);
- iflist.add(sif4);
- sv2.getServicePortInterfaces().addAll(iflist);
- svports.add(sv2);
-
- rtcParam.getServicePorts().addAll(svports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = fixturePath(name) + "/";
-
- assertEquals(32, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
- checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");
-// checkCode(result, resourceDir, "idlcompile.bat");
-// checkCode(result, resourceDir, "idlcompile.sh");
- }
-
-}
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,140 @@
+package jp.go.aist.rtm.rtcbuilder.python._test._100;
+
+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.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.python.IRtcBuilderConstantsPython;
+import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
+
+public class PyIDLInheritTest extends TestBase {
+
+ Generator generator;
+ GeneratorParam genParam;
+ RtcParam rtcParam;
+
+ protected void setUp() throws Exception {
+ genParam = new GeneratorParam();
+ rtcParam = new RtcParam(genParam, true);
+
+ rtcParam.setOutputProject(rootPath + "/resource/work");
+ rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
+ rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_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.setComponentKind("DataFlowComponent");
+ rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
+ rtcParam.setIsTest(true);
+ genParam.getRtcParams().add(rtcParam);
+
+ generator = new Generator();
+ generator.addGenerateManager(new PythonGenerateManager());
+ generator.addGenerateManager(new PythonCMakeGenerateManager());
+ }
+
+ String fixturePath(String name) {
+ return rootPath + "resource/100/" + name;
+ }
+
+ public void testInherit1() throws Exception {
+ String name = "idlinherit/inherit1";
+
+ List<ServicePortParam> svports = new ArrayList<ServicePortParam>();
+
+ ServicePortParam sv1 = new ServicePortParam("MyServiceProvider", 0);
+ List<ServicePortInterfaceParam> iflist = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam sif1 = new ServicePortInterfaceParam(sv1,
+ "MyServiceProvider", "", "", fixturePath(name)
+ + "/MyServiceChildMulti.idl", "MyServiceChild",
+ fixturePath(name), 0);
+ iflist.add(sif1);
+ sv1.getServicePortInterfaces().addAll(iflist);
+ svports.add(sv1);
+
+ ServicePortParam sv2 = new ServicePortParam("MyServiceRequire", 0);
+ iflist = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam sif2 = new ServicePortInterfaceParam(sv2,
+ "MyServiceRequire", "", "", fixturePath(name)
+ + "/MyServiceChildMulti.idl", "MyServiceChild",
+ fixturePath(name), 1);
+ iflist.add(sif2);
+ sv2.getServicePortInterfaces().addAll(iflist);
+ svports.add(sv2);
+
+ rtcParam.getServicePorts().addAll(svports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = fixturePath(name) + "/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ public void testInherit2() throws Exception {
+ String name = "idlinherit/inherit2";
+
+ List<ServicePortParam> svports = new ArrayList<ServicePortParam>();
+
+ ServicePortParam sv1 = new ServicePortParam("MyServiceProvider", 0);
+ List<ServicePortInterfaceParam> iflist = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam sif1 = new ServicePortInterfaceParam(sv1,
+ "MyServiceProvider", "", "", fixturePath(name)
+ + "/MyServiceChildMulti.idl", "MyServiceChild",
+ fixturePath(name), 0);
+ iflist.add(sif1);
+ ServicePortInterfaceParam sif2 = new ServicePortInterfaceParam(sv1,
+ "MyServiceProvider2", "", "", fixturePath(name)
+ + "/MyServiceChildWithType.idl",
+ "MyServiceWithTypeChild", fixturePath(name), 0);
+ iflist.add(sif2);
+ sv1.getServicePortInterfaces().addAll(iflist);
+ svports.add(sv1);
+
+ ServicePortParam sv2 = new ServicePortParam("MyServiceRequire", 0);
+ iflist = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam sif3 = new ServicePortInterfaceParam(sv2,
+ "MyServiceRequire", "", "", fixturePath(name)
+ + "/MyServiceChildMulti.idl", "MyServiceChild",
+ fixturePath(name), 1);
+ iflist.add(sif3);
+ ServicePortInterfaceParam sif4 = new ServicePortInterfaceParam(sv2,
+ "MyServiceRequire2", "", "", fixturePath(name)
+ + "/MyServiceChildWithType.idl",
+ "MyServiceWithTypeChild", fixturePath(name), 1);
+ iflist.add(sif4);
+ sv2.getServicePortInterfaces().addAll(iflist);
+ svports.add(sv2);
+
+ rtcParam.getServicePorts().addAll(svports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = fixturePath(name) + "/";
+
+ assertEquals(31, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
+ checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");
+// checkCode(result, resourceDir, "idlcompile.bat");
+// checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+}
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,140 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test._100;
-
-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.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.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class PyIDLType extends TestBase {
-
- Generator generator;
- GeneratorParam genParam;
- RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "/resource/work");
- rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
- rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
- rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
- rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
-
- generator = new Generator();
- generator.addGenerateManager(new PythonGenerateManager());
- generator.addGenerateManager(new PythonCMakeGenerateManager());
- }
-
- public void testType() throws Exception {
- rtcParam.setName("ModuleName");
- rtcParam.setDescription("ModuleDescription");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("VenderName");
- rtcParam.setCategory("Category");
- rtcParam.setComponentType("STATIC");
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setActivityType("PERIODIC");
- rtcParam.setExecutionRate(1.0);
- rtcParam.setMaxInstance(1);
-
- ServicePortParam service1 = new ServicePortParam("sV1", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "sIF1", "", "sIFv", rootPath
- + "resource/100/idltype/type1/TestIDL.idl", "ComFk",
- "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
-
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/idltype/type1/";
-
- checkCode(result, resourceDir, "ModuleName.py");
- checkCode(result, resourceDir, "TestIDL_idl_example.py");
- }
-
- public void testBaseType2() 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);
- rtcParam.setComponentKind("DataFlowComponent");
-
- ServicePortParam service1 = new ServicePortParam("MySVPro", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "myservice", "", "", rootPath
- + "resource/Python/type2/MyService.idl", "MyService",
- "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/idltype/type2/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "test.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- public void testBaseType() 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);
- rtcParam.setComponentKind("DataFlowComponent");
-
- ServicePortParam service1 = new ServicePortParam("MySVPro", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "myservice", "", "", rootPath
- + "resource/Python/type/MyService.idl", "MyService",
- "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/idltype/type3/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "test.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
-}
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,140 @@
+package jp.go.aist.rtm.rtcbuilder.python._test._100;
+
+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.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.python.IRtcBuilderConstantsPython;
+import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
+
+public class PyIDLType extends TestBase {
+
+ Generator generator;
+ GeneratorParam genParam;
+ RtcParam rtcParam;
+
+ protected void setUp() throws Exception {
+ genParam = new GeneratorParam();
+ rtcParam = new RtcParam(genParam, true);
+ rtcParam.setOutputProject(rootPath + "/resource/work");
+ rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
+ rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
+ rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
+ rtcParam.setIsTest(true);
+ genParam.getRtcParams().add(rtcParam);
+
+ generator = new Generator();
+ generator.addGenerateManager(new PythonGenerateManager());
+ generator.addGenerateManager(new PythonCMakeGenerateManager());
+ }
+
+ public void testType() throws Exception {
+ rtcParam.setName("ModuleName");
+ rtcParam.setDescription("ModuleDescription");
+ rtcParam.setVersion("1.0.0");
+ rtcParam.setVender("VenderName");
+ rtcParam.setCategory("Category");
+ rtcParam.setComponentType("STATIC");
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setActivityType("PERIODIC");
+ rtcParam.setExecutionRate(1.0);
+ rtcParam.setMaxInstance(1);
+
+ ServicePortParam service1 = new ServicePortParam("sV1", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+ service1, "sIF1", "", "sIFv", rootPath
+ + "resource/100/idltype/type1/TestIDL.idl", "ComFk",
+ "", 0);
+ srvinterts.add(int1);
+ service1.getServicePortInterfaces().addAll(srvinterts);
+ List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+ srvports.add(service1);
+
+ rtcParam.getServicePorts().addAll(srvports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/idltype/type1/";
+
+ checkCode(result, resourceDir, "ModuleName.py");
+ checkCode(result, resourceDir, "TestIDL_idl_example.py");
+ }
+
+ public void testBaseType2() 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);
+ rtcParam.setComponentKind("DataFlowComponent");
+
+ ServicePortParam service1 = new ServicePortParam("MySVPro", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+ service1, "myservice", "", "", rootPath
+ + "resource/Python/type2/MyService.idl", "MyService",
+ "", 0);
+ srvinterts.add(int1);
+ service1.getServicePortInterfaces().addAll(srvinterts);
+ List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+ srvports.add(service1);
+ rtcParam.getServicePorts().addAll(srvports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/idltype/type2/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "test.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ public void testBaseType() 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);
+ rtcParam.setComponentKind("DataFlowComponent");
+
+ ServicePortParam service1 = new ServicePortParam("MySVPro", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+ service1, "myservice", "", "", rootPath
+ + "resource/Python/type/MyService.idl", "MyService",
+ "", 0);
+ srvinterts.add(int1);
+ service1.getServicePortInterfaces().addAll(srvinterts);
+ List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+ srvports.add(service1);
+ rtcParam.getServicePorts().addAll(srvports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/idltype/type3/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "test.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+}
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,136 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test._100;
-
-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.GeneratorParam;
-import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
-import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class PyImplTest extends TestBase {
-
- Generator generator;
- GeneratorParam genParam;
- RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "/resource/work");
- rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
- rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
- rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
- rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
-
- generator = new Generator();
- generator.addGenerateManager(new PythonGenerateManager());
- generator.addGenerateManager(new PythonCMakeGenerateManager());
- }
-
- public void testAll() throws Exception {
- 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.setComponentKind("DataFlowComponent");
-
- 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);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/impl/all/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testExecute() throws Exception {
- 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.setComponentKind("DataFlowComponent");
-
- rtcParam.setActionImplemented(0, true);
- rtcParam.setActionImplemented(1, true);
- rtcParam.setActionImplemented(3, true);
- rtcParam.setActionImplemented(5, true);
- rtcParam.setActionImplemented(9, true);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/impl/execute/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testFinalize() throws Exception {
- 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.setComponentKind("DataFlowComponent");
-
- rtcParam.setActionImplemented(0, true);
- rtcParam.setActionImplemented(1, true);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/impl/finalize/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testInitialize() throws Exception {
- 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.setComponentKind("DataFlowComponent");
-
- rtcParam.setActionImplemented(0, true);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/impl/initialize/";
-
- assertEquals(28, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
-}
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,136 @@
+package jp.go.aist.rtm.rtcbuilder.python._test._100;
+
+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.GeneratorParam;
+import jp.go.aist.rtm.rtcbuilder.generator.param.RtcParam;
+import jp.go.aist.rtm.rtcbuilder.python.IRtcBuilderConstantsPython;
+import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
+
+public class PyImplTest extends TestBase {
+
+ Generator generator;
+ GeneratorParam genParam;
+ RtcParam rtcParam;
+
+ protected void setUp() throws Exception {
+ genParam = new GeneratorParam();
+ rtcParam = new RtcParam(genParam, true);
+ rtcParam.setOutputProject(rootPath + "/resource/work");
+ rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
+ rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
+ rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
+ rtcParam.setIsTest(true);
+ genParam.getRtcParams().add(rtcParam);
+
+ generator = new Generator();
+ generator.addGenerateManager(new PythonGenerateManager());
+ generator.addGenerateManager(new PythonCMakeGenerateManager());
+ }
+
+ public void testAll() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+
+ 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);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/impl/all/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testExecute() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+
+ rtcParam.setActionImplemented(0, true);
+ rtcParam.setActionImplemented(1, true);
+ rtcParam.setActionImplemented(3, true);
+ rtcParam.setActionImplemented(5, true);
+ rtcParam.setActionImplemented(9, true);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/impl/execute/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testFinalize() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+
+ rtcParam.setActionImplemented(0, true);
+ rtcParam.setActionImplemented(1, true);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/impl/finalize/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testInitialize() throws Exception {
+ 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.setComponentKind("DataFlowComponent");
+
+ rtcParam.setActionImplemented(0, true);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/impl/initialize/";
+
+ assertEquals(27, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+}
Deleted: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java 2016-12-14 08:37:12 UTC (rev 638)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -1,184 +0,0 @@
-package jp.go.aist.rtm.rtcbuilder.python._test._100;
-
-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.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.python.IRtcBuilderConstantsPython;
-import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
-import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
-
-public class PyModuleTest extends TestBase {
-
- Generator generator;
- GeneratorParam genParam;
- RtcParam rtcParam;
-
- protected void setUp() throws Exception {
- genParam = new GeneratorParam();
- rtcParam = new RtcParam(genParam, true);
- rtcParam.setOutputProject(rootPath + "/resource/work");
- rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
- rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
- rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
- rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
-
- generator = new Generator();
- generator.addGenerateManager(new PythonGenerateManager());
- generator.addGenerateManager(new PythonCMakeGenerateManager());
- }
-
- public void testServicePortProv() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("ModuleDescription");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("VenderName");
- rtcParam.setCategory("Category");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("EVENTDRIVEN");
- rtcParam.setMaxInstance(1);
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setRtmVersion("1.0.0");
-
- ServicePortParam service1 = new ServicePortParam("sv_name", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "if_name", "", "", rootPath
- + "/resource/100/module/serviceM/MyService.idl",
- "SimpleService::MyService", "", 0);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/module/serviceM/";
-
- assertEquals(31, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- public void testServicePortProv2() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("ModuleDescription");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("VenderName");
- rtcParam.setCategory("Category");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("EVENTDRIVEN");
- rtcParam.setMaxInstance(1);
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setRtmVersion("1.0.0");
-
- ServicePortParam service1 = new ServicePortParam("sv_name", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "if_name1", "", "", rootPath
- + "/resource/100/module/serviceM2/MyService.idl",
- "SimpleService::MyService", "", 0);
- srvinterts.add(int1);
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(
- service1, "if_name2", "", "", rootPath
- + "/resource/100/module/serviceM2/DAQService.idl",
- "DAQService", "", 0);
- srvinterts.add(int2);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/module/serviceM2/";
-
- assertEquals(32, result.size());
- checkCode(result, resourceDir, "foo.py");
- checkCode(result, resourceDir, "MyService_idl_example.py");
- checkCode(result, resourceDir, "DAQService_idl_example.py");
- checkCode(result, resourceDir, "idlcompile.bat");
- checkCode(result, resourceDir, "idlcompile.sh");
- }
-
- public void testServicePortCon() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("ModuleDescription");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("VenderName");
- rtcParam.setCategory("Category");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("EVENTDRIVEN");
- rtcParam.setMaxInstance(1);
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setRtmVersion("1.0.0");
-
- ServicePortParam service1 = new ServicePortParam("sv_name", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "if_name", "", "", rootPath
- + "/resource/100/module/serviceMC/MyService.idl",
- "SimpleService::MyService", "", 1);
- srvinterts.add(int1);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/module/serviceMC/";
-
- assertEquals(30, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
- public void testServicePortCon2() throws Exception {
- rtcParam.setName("foo");
- rtcParam.setDescription("ModuleDescription");
- rtcParam.setVersion("1.0.0");
- rtcParam.setVender("VenderName");
- rtcParam.setCategory("Category");
- rtcParam.setComponentType("STATIC");
- rtcParam.setActivityType("EVENTDRIVEN");
- rtcParam.setMaxInstance(1);
- rtcParam.setComponentKind("DataFlowComponent");
- rtcParam.setRtmVersion("1.0.0");
-
- ServicePortParam service1 = new ServicePortParam("sv_name", 0);
- List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
- ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
- service1, "if_name1", "", "", rootPath
- + "/resource/100/module/serviceMC2/MyService.idl",
- "SimpleService::MyService", "", 1);
- srvinterts.add(int1);
- ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(
- service1, "if_name2", "", "", rootPath
- + "/resource/100/module/serviceMC2/DAQService.idl",
- "DAQService", "", 1);
- srvinterts.add(int2);
- service1.getServicePortInterfaces().addAll(srvinterts);
- List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
- srvports.add(service1);
- rtcParam.getServicePorts().addAll(srvports);
-
- List<GeneratedResult> result = generator.generateTemplateCode(genParam);
-
- String resourceDir = rootPath + "/resource/100/module/serviceMC2/";
-
- assertEquals(30, result.size());
- checkCode(result, resourceDir, "foo.py");
- }
-
-}
Copied: branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java (from rev 639, trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java)
===================================================================
--- branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java (rev 0)
+++ branches/FSM4RTC/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java 2017-01-22 06:08:45 UTC (rev 651)
@@ -0,0 +1,184 @@
+package jp.go.aist.rtm.rtcbuilder.python._test._100;
+
+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.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.python.IRtcBuilderConstantsPython;
+import jp.go.aist.rtm.rtcbuilder.python._test.TestBase;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonCMakeGenerateManager;
+import jp.go.aist.rtm.rtcbuilder.python.manager.PythonGenerateManager;
+
+public class PyModuleTest extends TestBase {
+
+ Generator generator;
+ GeneratorParam genParam;
+ RtcParam rtcParam;
+
+ protected void setUp() throws Exception {
+ genParam = new GeneratorParam();
+ rtcParam = new RtcParam(genParam, true);
+ rtcParam.setOutputProject(rootPath + "/resource/work");
+ rtcParam.setLanguage(IRtcBuilderConstantsPython.LANG_PYTHON);
+ rtcParam.setLanguageArg(IRtcBuilderConstantsPython.LANG_PYTHON_ARG);
+ rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
+ rtcParam.setIsTest(true);
+ genParam.getRtcParams().add(rtcParam);
+
+ generator = new Generator();
+ generator.addGenerateManager(new PythonGenerateManager());
+ generator.addGenerateManager(new PythonCMakeGenerateManager());
+ }
+
+ public void testServicePortProv() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("ModuleDescription");
+ rtcParam.setVersion("1.0.0");
+ rtcParam.setVender("VenderName");
+ rtcParam.setCategory("Category");
+ rtcParam.setComponentType("STATIC");
+ rtcParam.setActivityType("EVENTDRIVEN");
+ rtcParam.setMaxInstance(1);
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setRtmVersion("1.0.0");
+
+ ServicePortParam service1 = new ServicePortParam("sv_name", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+ service1, "if_name", "", "", rootPath
+ + "/resource/100/module/serviceM/MyService.idl",
+ "SimpleService::MyService", "", 0);
+ srvinterts.add(int1);
+ service1.getServicePortInterfaces().addAll(srvinterts);
+ List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+ srvports.add(service1);
+ rtcParam.getServicePorts().addAll(srvports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/module/serviceM/";
+
+ assertEquals(30, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ public void testServicePortProv2() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("ModuleDescription");
+ rtcParam.setVersion("1.0.0");
+ rtcParam.setVender("VenderName");
+ rtcParam.setCategory("Category");
+ rtcParam.setComponentType("STATIC");
+ rtcParam.setActivityType("EVENTDRIVEN");
+ rtcParam.setMaxInstance(1);
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setRtmVersion("1.0.0");
+
+ ServicePortParam service1 = new ServicePortParam("sv_name", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+ service1, "if_name1", "", "", rootPath
+ + "/resource/100/module/serviceM2/MyService.idl",
+ "SimpleService::MyService", "", 0);
+ srvinterts.add(int1);
+ ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(
+ service1, "if_name2", "", "", rootPath
+ + "/resource/100/module/serviceM2/DAQService.idl",
+ "DAQService", "", 0);
+ srvinterts.add(int2);
+ service1.getServicePortInterfaces().addAll(srvinterts);
+ List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+ srvports.add(service1);
+ rtcParam.getServicePorts().addAll(srvports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/module/serviceM2/";
+
+ assertEquals(31, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ checkCode(result, resourceDir, "MyService_idl_example.py");
+ checkCode(result, resourceDir, "DAQService_idl_example.py");
+ checkCode(result, resourceDir, "idlcompile.bat");
+ checkCode(result, resourceDir, "idlcompile.sh");
+ }
+
+ public void testServicePortCon() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("ModuleDescription");
+ rtcParam.setVersion("1.0.0");
+ rtcParam.setVender("VenderName");
+ rtcParam.setCategory("Category");
+ rtcParam.setComponentType("STATIC");
+ rtcParam.setActivityType("EVENTDRIVEN");
+ rtcParam.setMaxInstance(1);
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setRtmVersion("1.0.0");
+
+ ServicePortParam service1 = new ServicePortParam("sv_name", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+ service1, "if_name", "", "", rootPath
+ + "/resource/100/module/serviceMC/MyService.idl",
+ "SimpleService::MyService", "", 1);
+ srvinterts.add(int1);
+ service1.getServicePortInterfaces().addAll(srvinterts);
+ List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+ srvports.add(service1);
+ rtcParam.getServicePorts().addAll(srvports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/module/serviceMC/";
+
+ assertEquals(29, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+ public void testServicePortCon2() throws Exception {
+ rtcParam.setName("foo");
+ rtcParam.setDescription("ModuleDescription");
+ rtcParam.setVersion("1.0.0");
+ rtcParam.setVender("VenderName");
+ rtcParam.setCategory("Category");
+ rtcParam.setComponentType("STATIC");
+ rtcParam.setActivityType("EVENTDRIVEN");
+ rtcParam.setMaxInstance(1);
+ rtcParam.setComponentKind("DataFlowComponent");
+ rtcParam.setRtmVersion("1.0.0");
+
+ ServicePortParam service1 = new ServicePortParam("sv_name", 0);
+ List<ServicePortInterfaceParam> srvinterts = new ArrayList<ServicePortInterfaceParam>();
+ ServicePortInterfaceParam int1 = new ServicePortInterfaceParam(
+ service1, "if_name1", "", "", rootPath
+ + "/resource/100/module/serviceMC2/MyService.idl",
+ "SimpleService::MyService", "", 1);
+ srvinterts.add(int1);
+ ServicePortInterfaceParam int2 = new ServicePortInterfaceParam(
+ service1, "if_name2", "", "", rootPath
+ + "/resource/100/module/serviceMC2/DAQService.idl",
+ "DAQService", "", 1);
+ srvinterts.add(int2);
+ service1.getServicePortInterfaces().addAll(srvinterts);
+ List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
+ srvports.add(service1);
+ rtcParam.getServicePorts().addAll(srvports);
+
+ List<GeneratedResult> result = generator.generateTemplateCode(genParam);
+
+ String resourceDir = rootPath + "/resource/100/module/serviceMC2/";
+
+ assertEquals(29, result.size());
+ checkCode(result, resourceDir, "foo.py");
+ }
+
+}
More information about the openrtm-commit
mailing list