Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-10-10 15:26:31 +0000
committerHenrik Rentz-Reichert2012-10-10 15:26:31 +0000
commit293c3c3793407ef37ffa0377382a75805f04bed4 (patch)
tree50c0b35aea438b0016a18ad5c934049c80f6ee10 /tests
parent242706ac48b2420008f47077c2c4c82f915196a8 (diff)
downloadorg.eclipse.etrice-293c3c3793407ef37ffa0377382a75805f04bed4.tar.gz
org.eclipse.etrice-293c3c3793407ef37ffa0377382a75805f04bed4.tar.xz
org.eclipse.etrice-293c3c3793407ef37ffa0377382a75805f04bed4.zip
[generator.java.tests] added new tests
(except the thread test with replicated ports)
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/make.xml64
1 files changed, 60 insertions, 4 deletions
diff --git a/tests/org.eclipse.etrice.generator.java.tests/make.xml b/tests/org.eclipse.etrice.generator.java.tests/make.xml
index 0dfad1242..4498f13e1 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/make.xml
+++ b/tests/org.eclipse.etrice.generator.java.tests/make.xml
@@ -65,6 +65,8 @@
<fileset dir="../../runtime/org.eclipse.etrice.modellib.java/models">
<include name="TimingService.room"/>
<include name="Types.room"/>
+ <include name="TcpService.room"/>
+ <include name="Language.room"/>
</fileset>
</copy>
</target>
@@ -101,8 +103,16 @@
<java output="${output}/generate.txt" error="${output}/generate_err.txt" classname="org.eclipse.etrice.generator.java.Main" fork="true" failonerror="true">
<arg value="${java.tests.model.path}/HandlerTest.room"/>
<arg value="${java.tests.model.path}/ChoicePointTest.room"/>
- <arg value="${modellib.path}/models/TimingService.room"/>
- <arg value="${modellib.path}/models/Types.room"/>
+ <arg value="${java.tests.model.path}/PingPongThreadTest.room"/>
+ <arg value="${java.tests.model.path}/PingPongThreadReplPortTest.room"/>
+ <arg value="${java.tests.model.path}/SendingDataTestJava.room"/>
+ <arg value="${java.tests.model.path}/TcpTest.room"/>
+
+ <!-- copied modellib.java models -->
+ <arg value="${java.tests.model.path}/TimingService.room"/>
+ <arg value="${java.tests.model.path}/TcpService.room"/>
+ <arg value="${java.tests.model.path}/Types.room"/>
+ <arg value="${java.tests.model.path}/Language.room"/>
<classpath refid="clspath"/>
</java>
</target>
@@ -114,7 +124,7 @@
<mkdir dir="${bin.path}"/>
<javac srcdir="src-gen"
destdir="${bin.path}"
- classpath="${runtime.path}/bin;${modellib.path}/bin"
+ classpath="${runtime.path}/bin"
debug="on"
/>
</target>
@@ -132,6 +142,24 @@
<arg value="-run_as_test"/>
<classpath path="${bin.path};${runtime.path}/bin;${modellib.path}/bin"/>
</java>
+ <java output="${output}/runPingPongThreadTest.txt" classname="PingPongThreadTest.SubSystem_PingPongRunner" fork="true" failonerror="true">
+ <arg value="-run_as_test"/>
+ <classpath path="${bin.path};${runtime.path}/bin;${modellib.path}/bin"/>
+ </java>
+ <!--
+ <java output="${output}/runPingPongThreadReplPortTest.txt" classname="PingPongThreadTestReplPort.SubSystem_PingPongRunner" fork="true" failonerror="true">
+ <arg value="-run_as_test"/>
+ <classpath path="${bin.path};${runtime.path}/bin;${modellib.path}/bin"/>
+ </java>
+ -->
+ <java output="${output}/runSendingDataTestJava.txt" classname="SendingDataTestJava.SubSys_SendingDataRunner" fork="true" failonerror="true">
+ <arg value="-run_as_test"/>
+ <classpath path="${bin.path};${runtime.path}/bin;${modellib.path}/bin"/>
+ </java>
+ <java output="${output}/runTCPTest.txt" classname="TCPTest.TCPTestSubSysRunner" fork="true" failonerror="true">
+ <arg value="-run_as_test"/>
+ <classpath path="${bin.path};${runtime.path}/bin;${modellib.path}/bin"/>
+ </java>
</target>
<!--
@@ -155,12 +183,40 @@
<classpath refid="clspath"/>
</java>
- <java output="${output}/convert.txt" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true">
+ <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true">
<arg value="-suite"/>
<arg value="org.eclipse.etrice.generator.java.tests.HandlerTest"/>
<arg value="./tmp/HandlerTest.etu"/>
<classpath refid="clspath"/>
</java>
+
+ <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true">
+ <arg value="-suite"/>
+ <arg value="org.eclipse.etrice.generator.java.tests.PingPongThreadTest"/>
+ <arg value="./tmp/PingPongThreadTest.etu"/>
+ <classpath refid="clspath"/>
+ </java>
+
+ <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true">
+ <arg value="-suite"/>
+ <arg value="org.eclipse.etrice.generator.java.tests.PingPongThreadTestReplPort"/>
+ <arg value="./tmp/PingPongThreadTestReplPort.etu"/>
+ <classpath refid="clspath"/>
+ </java>
+
+ <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true">
+ <arg value="-suite"/>
+ <arg value="org.eclipse.etrice.generator.java.tests.SendingDataTest"/>
+ <arg value="./tmp/SendingDataTestJava.etu"/>
+ <classpath refid="clspath"/>
+ </java>
+
+ <java output="${output}/convert.txt" append="true" classname="org.eclipse.etrice.etunit.converter.EtUnitReportConverter" fork="true" failonerror="true">
+ <arg value="-suite"/>
+ <arg value="org.eclipse.etrice.generator.java.tests.TCPTest"/>
+ <arg value="./tmp/TCPTest.etu"/>
+ <classpath refid="clspath"/>
+ </java>
</target>
<!--

Back to the top