diff options
| author | Henrik Rentz-Reichert | 2013-03-27 18:15:13 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2013-03-27 18:15:13 +0000 |
| commit | 7b007a79ef94c3a103bd191d310b128a6b30b809 (patch) | |
| tree | 8d30ae93a7f4de3165a39dddfe0bfed98f2ae474 | |
| parent | c18c838cde0581d8ec3c4a69b2e8af9ee99a735c (diff) | |
| download | org.eclipse.etrice-7b007a79ef94c3a103bd191d310b128a6b30b809.tar.gz org.eclipse.etrice-7b007a79ef94c3a103bd191d310b128a6b30b809.tar.xz org.eclipse.etrice-7b007a79ef94c3a103bd191d310b128a6b30b809.zip | |
[generator.java.tests] added new data driven test
| -rw-r--r-- | tests/org.eclipse.etrice.generator.java.tests/make.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/org.eclipse.etrice.generator.java.tests/make.xml b/tests/org.eclipse.etrice.generator.java.tests/make.xml index a15da201c..934e6678b 100644 --- a/tests/org.eclipse.etrice.generator.java.tests/make.xml +++ b/tests/org.eclipse.etrice.generator.java.tests/make.xml @@ -117,6 +117,7 @@ <arg value="${java.tests.model.path}/StaticConfigTest.config"/>
<arg value="${java.tests.model.path}/DynamicConfigTest_Java.room"/>
<arg value="${java.tests.model.path}/DynamicConfigTest_Java.config"/>
+ <arg value="${java.tests.model.path}/DataDrivenTest.room"/>
<classpath refid="clspath"/>
</java>
</target>
@@ -194,6 +195,12 @@ <classpath path="${bin.path};${runtime.path}/bin;${modellib.path}/bin"/>
</java>
<echo>end DynamicConfigTest</echo>
+ <echo>start DataDrivenTest</echo>
+ <java output="${output}/runDataDrivenTest.txt" classname="DataDrivenTest.SubSystemRunner" fork="true" failonerror="true">
+ <arg value="-run_as_test"/>
+ <classpath path="${bin.path};${runtime.path}/bin;${modellib.path}/bin"/>
+ </java>
+ <echo>end DataDrivenTest</echo>
</target>
<!--
@@ -265,6 +272,13 @@ <arg value="./tmp/DynamicConfigTest.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.DataDrivenTest"/>
+ <arg value="./tmp/DataDrivenTest.etu"/>
+ <classpath refid="clspath"/>
+ </java>
</target>
<!--
@@ -275,6 +289,7 @@ <move file="./tmp/ChoicePointTest.xml" tofile="./tmp/JavaChoicePointTest.xml"/>
<move file="./tmp/StaticConfigTest.xml" tofile="./tmp/JavaStaticConfigTest.xml"/>
<move file="./tmp/DynamicConfigTest.xml" tofile="./tmp/JavaDynamicConfigTest.xml"/>
+ <move file="./tmp/DataDrivenTest.xml" tofile="./tmp/JavaDataDrivenTest.xml"/>
<copy todir="${test.results}" >
<fileset dir="./tmp">
<include name="*.xml"/>
|