[openrtm-commit:02510] r699 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python: src/jp/go/aist/rtm/rtcbuilder/python/manager src/jp/go/aist/rtm/rtcbuilder/python/template/cmake test/jp/go/aist/rtm/rtcbuilder/python/_test test/jp/go/aist/rtm/rtcbuilder/python/_test/_100
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 11日 (土) 13:31:07 JST
Author: ga
Date: 2017-03-11 13:31:07 +0900 (Sat, 11 Mar 2017)
New Revision: 699
Removed:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix.xsl.in.vsl
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java
trunk/rtmtools/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/BaseTest.java
trunk/rtmtools/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/ConfigSetTest.java
trunk/rtmtools/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/PyIDLInheritTest.java
trunk/rtmtools/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/PyImplTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java
Log:
Modified generated CMakeFile #3980
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/manager/PythonCMakeGenerateManager.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -70,14 +70,6 @@
}
// 1.0系 (CMake/cpack_resources)
-
- @Override
- public GeneratedResult generateResourceWixXSL(Map<String, Object> contextMap) {
- String outfile = "cpack_resources/wix.xsl.in";
- String infile = "cmake/wix.xsl.in.vsl";
- return generatePython(infile, outfile, contextMap);
- }
-
public GeneratedResult generateResourceDescriptionTXT(Map<String, Object> contextMap) {
String outfile = "cpack_resources/Description.txt";
String infile = "cmake/Description.txt.vsl";
Deleted: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix.xsl.in.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix.xsl.in.vsl 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/src/jp/go/aist/rtm/rtcbuilder/python/template/cmake/wix.xsl.in.vsl 2017-03-11 04:31:07 UTC (rev 699)
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
- <xsl:output indent="yes" method="xml"/>
-
- <xsl:template match="/wix:Wix">
- <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product xmlns="http://schemas.microsoft.com/wix/2006/wi" Id="${WIX_PRODUCT_ID}" Name="@RTC_NAME@ @PACKAGE_VERSION@" Language="1041" Codepage="932" Version="@PACKAGE_VERSION@" Manufacturer="@RTC_VENDOR@" UpgradeCode="${WIX_UPGRADECODE}">
- <Package InstallerVersion="300" Compressed="yes" Languages='1041' SummaryCodepage='932' />
- <Media Id="1" Cabinet="@RTC_NAME at .cab" EmbedCab="yes" />
- <Directory Id="TARGETDIR" Name="SourceDir" >
- <Directory Id="ProgramFilesFolder" Name="PFILE" >
- <Directory Id="OPENRTM_DIR" Name="OpenRTM-aist" >
- <Directory Id="INSTALLLOCATION" Name="@OPENRTM_VERSION_MAJOR at .@OPENRTM_VERSION_MINOR@" />
- </Directory>
- </Directory>
- </Directory>
-
- <Feature Id="APPLICATIONS" Title="@CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME@" Level="1" Description="@CPACK_COMPONENT_APPLICATIONS_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\RTC.xml')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\@RTC_NAME at .py')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@') and contains(wix:File/@Source, '_idl_example.py')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@') and contains(wix:File/@Source, '_idl.py')]" />
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@') and contains(wix:File/@Source, '__init__.py')]" />
- </Feature>
-
- <Feature Id="DOCUMENTS" Title="@CPACK_COMPONENT_DOCUMENTS_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_DOCUMENTS_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\doc')]" />
- </Feature>
-
- <Feature Id="SOURCES" Title="@CPACK_COMPONENT_SOURCES_DISPLAY_NAME@" Level="1" Absent="allow" Description="@CPACK_COMPONENT_SOURCES_DESCRIPTION@" >
- <!-- Start Ripping through the xml -->
- <xsl:apply-templates select="wix:Fragment/wix:DirectoryRef/wix:Component[contains(wix:File/@Source, '@PACKAGE_NAME@@PACKAGE_VERSION@\src')]" />
- </Feature>
-
- <!--Tack on your specific wix options-->
- <UIRef Id="WixUI_FeatureTree" />
- <UIRef Id="WixUI_ErrorProgressText" />
- <WixVariable Id="WixUILicenseRtf" Value="@CPACK_RESOURCE_FILE_LICENSE@"/>
- <!-- TODO: Add Wix Specific Dialogs and features. -->
- <!-- TODO: Add artwork -->
- <!-- TODO: Add ... -->
-
- </Product>
-
- <!--Output the fragment info which heat generates-->
- <xsl:copy-of select="wix:Fragment[wix:DirectoryRef/wix:Component]" />
- <xsl:apply-templates select="wix:Fragment[wix:DirectoryRef/@Id!='TARGETDIR' and wix:DirectoryRef/wix:Directory]" />
-
- </Wix>
- </xsl:template>
-
- <xsl:template match="wix:Fragment[wix:DirectoryRef/wix:Directory]" >
- <xsl:copy>
- <xsl:apply-templates select="wix:DirectoryRef" />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:DirectoryRef" >
- <xsl:copy>
- <xsl:choose>
- <xsl:when test="wix:Directory[@Name='components']" >
- <xsl:attribute name="Id">INSTALLLOCATION</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:apply-templates />
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Directory" >
- <xsl:copy>
- <xsl:attribute name="Id"><xsl:value-of select="@Id" /></xsl:attribute>
- <xsl:attribute name="Name"><xsl:value-of select="@Name" /></xsl:attribute>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="wix:Component">
- <xsl:element name="ComponentRef" xmlns="http://schemas.microsoft.com/wix/2006/wi" >
- <xsl:attribute name="Id">
- <xsl:value-of select="@Id" />
- </xsl:attribute>
- </xsl:element>
- </xsl:template>
-
-</xsl:stylesheet>
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/TestBase.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -16,6 +16,7 @@
protected String expContent;
protected int index;
protected String[] ignore_row_phrases = {"--service-idl=", "--consumer-idl"};
+ protected final int default_file_num = 26;
public TestBase () {
File fileCurrent = new File(".");
Modified: trunk/rtmtools/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 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/AISTTest.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -105,7 +105,7 @@
String resourceDir = rootPath + "/resource/100/aist/AIST6/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "test.py");
}
@@ -146,7 +146,7 @@
String resourceDir = rootPath + "/resource/100/aist/AIST4/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -198,7 +198,7 @@
String resourceDir = rootPath + "/resource/100/aist/AIST3/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -240,7 +240,7 @@
String resourceDir = rootPath + "/resource/100/aist/AIST2/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "idlcompile.bat");
checkCode(result, resourceDir, "idlcompile.sh");
@@ -273,7 +273,7 @@
String resourceDir = rootPath + "/resource/100/aist/AIST1/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
Modified: trunk/rtmtools/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 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BaseTest.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -83,7 +83,7 @@
String resourceDir = rootPath + "/resource/100/base/service2/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -125,7 +125,7 @@
String resourceDir = rootPath + "/resource/100/base/service1/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -156,7 +156,7 @@
String resourceDir = rootPath + "/resource/100/base/outport2/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -183,7 +183,7 @@
String resourceDir = rootPath + "/resource/100/base/outport1/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -207,7 +207,7 @@
String resourceDir = rootPath + "/resource/100/base/inport2/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -230,7 +230,7 @@
String resourceDir = rootPath + "/resource/100/base/inport1/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -249,7 +249,7 @@
String resourceDir = rootPath + "/resource/100/base/name2/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "Foo.py");
}
Modified: trunk/rtmtools/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 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/BuildTest.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -89,21 +89,11 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, 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 {
@@ -157,22 +147,10 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(31, result.size());
+ assertEquals(default_file_num+4, 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");
}
}
Modified: trunk/rtmtools/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 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/ConfigSetTest.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -54,7 +54,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset1/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -78,7 +78,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset2/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -106,7 +106,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset3/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -136,7 +136,7 @@
String resourceDir = rootPath + "/resource/100/ConfigSet/configset4/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -165,7 +165,7 @@
String resourceDir = rootPath
+ "/resource/100/ConfigSet/ConfigSetType/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
}
Modified: trunk/rtmtools/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 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyDocTest.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -262,7 +262,7 @@
String resourceDir = rootPath + "/resource/100/Doc/full/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -321,7 +321,7 @@
String resourceDir = rootPath + "/resource/100/Doc/refer/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -376,7 +376,7 @@
String resourceDir = rootPath + "/resource/100/Doc/authorLong/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -430,7 +430,7 @@
String resourceDir = rootPath + "/resource/100/Doc/author/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
Modified: trunk/rtmtools/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 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLInheritTest.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -81,7 +81,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
// checkCode(result, resourceDir, "idlcompile.bat");
@@ -129,7 +129,7 @@
String resourceDir = fixturePath(name) + "/";
- assertEquals(31, result.size());
+ assertEquals(default_file_num+4, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyServiceChildMulti_idl_example.py");
checkCode(result, resourceDir, "MyServiceChildWithType_idl_example.py");
Modified: trunk/rtmtools/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 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyIDLType.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -96,7 +96,7 @@
String resourceDir = rootPath + "/resource/100/idltype/type2/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -130,7 +130,7 @@
String resourceDir = rootPath + "/resource/100/idltype/type3/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "test.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
Modified: trunk/rtmtools/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 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyImplTest.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -61,7 +61,7 @@
String resourceDir = rootPath + "/resource/100/impl/all/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -86,7 +86,7 @@
String resourceDir = rootPath + "/resource/100/impl/execute/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -108,7 +108,7 @@
String resourceDir = rootPath + "/resource/100/impl/finalize/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -129,7 +129,7 @@
String resourceDir = rootPath + "/resource/100/impl/initialize/";
- assertEquals(27, result.size());
+ assertEquals(default_file_num, result.size());
checkCode(result, resourceDir, "foo.py");
}
Modified: trunk/rtmtools/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 2017-03-11 03:14:48 UTC (rev 698)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.python/test/jp/go/aist/rtm/rtcbuilder/python/_test/_100/PyModuleTest.java 2017-03-11 04:31:07 UTC (rev 699)
@@ -64,7 +64,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceM/";
- assertEquals(30, result.size());
+ assertEquals(default_file_num+3, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "idlcompile.bat");
@@ -104,7 +104,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceM2/";
- assertEquals(31, result.size());
+ assertEquals(default_file_num+4, result.size());
checkCode(result, resourceDir, "foo.py");
checkCode(result, resourceDir, "MyService_idl_example.py");
checkCode(result, resourceDir, "DAQService_idl_example.py");
@@ -140,7 +140,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceMC/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "foo.py");
}
@@ -177,7 +177,7 @@
String resourceDir = rootPath + "/resource/100/module/serviceMC2/";
- assertEquals(29, result.size());
+ assertEquals(default_file_num+2, result.size());
checkCode(result, resourceDir, "foo.py");
}
openrtm-commit メーリングリストの案内