Author: jlboudart
Date: Tue Oct 1 21:25:52 2013
New Revision: 1528220
URL: http://svn.apache.org/r1528220
Log:
Introduce syspropertyset in junit / testng plugins
Modified:
ant/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
ant/easyant/plugins/trunk/abstract-test/src/test/antunit/abstract-test-test.xml
ant/easyant/plugins/trunk/junit/src/main/resources/junit.ant
ant/easyant/plugins/trunk/testng/src/main/resources/testng.ant
Modified:
ant/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
URL:
http://svn.apache.org/viewvc/ant/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant?rev=1528220&r1=1528219&r2=1528220&view=diff
==============================================================================
---
ant/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
(original)
+++
ant/easyant/plugins/trunk/abstract-test/src/main/resources/abstract-test.ant
Tue Oct 1 21:25:52 2013
@@ -31,6 +31,8 @@
<property name="skip.test" value="true" />
<property name="skip.test.integration" value="true" />
</target>
+
+ <propertyset id="test.propertyset.ref" description="a set of properties
/ system properties used by tests"/>
<target name="abstract-test:init"
depends="abstract-provisioning:provisioning">
<ea:parameter property="target.test.xml" default="${target}/test/xml"
description="destination directory for xml test report" />
Modified:
ant/easyant/plugins/trunk/abstract-test/src/test/antunit/abstract-test-test.xml
URL:
http://svn.apache.org/viewvc/ant/easyant/plugins/trunk/abstract-test/src/test/antunit/abstract-test-test.xml?rev=1528220&r1=1528219&r2=1528220&view=diff
==============================================================================
---
ant/easyant/plugins/trunk/abstract-test/src/test/antunit/abstract-test-test.xml
(original)
+++
ant/easyant/plugins/trunk/abstract-test/src/test/antunit/abstract-test-test.xml
Tue Oct 1 21:25:52 2013
@@ -34,6 +34,10 @@
<target name="setUp" depends="clean" />
<target name="tearDown" depends="clean" />
+
+ <target name="test-abstract-test-global">
+ <au:assertReferenceSet refid="test.propertyset.ref"/>
+ </target>
<target name="test-abstract-test:init" depends="abstract-test:init">
<au:assertPropertyEquals name="target.test.xml"
value="${target}/test/xml" />
Modified: ant/easyant/plugins/trunk/junit/src/main/resources/junit.ant
URL:
http://svn.apache.org/viewvc/ant/easyant/plugins/trunk/junit/src/main/resources/junit.ant?rev=1528220&r1=1528219&r2=1528220&view=diff
==============================================================================
--- ant/easyant/plugins/trunk/junit/src/main/resources/junit.ant (original)
+++ ant/easyant/plugins/trunk/junit/src/main/resources/junit.ant Tue Oct 1
21:25:52 2013
@@ -17,7 +17,7 @@
<project name="org.apache.easyant.plugins#junit"
xmlns:ea="antlib:org.apache.easyant" xmlns:ac="antlib:net.sf.antcontrib">
<ea:core-version requiredrevision="[0.9,+]" />
- <ea:plugin module="abstract-test" revision="0.9" />
+ <ea:plugin module="abstract-test" revision="0.10" />
<target name="junit:init" depends="abstract-test:init">
<ea:parameter property="test.run.forkmode" default="perTest"
@@ -72,6 +72,9 @@
<batchtest todir="${target.test.xml}">
<resources refid="target.@{prefix}.set" />
</batchtest>
+
+ <syspropertyset refid="test.propertyset.ref"/>
+
</junit>
</sequential>
</macrodef>
Modified: ant/easyant/plugins/trunk/testng/src/main/resources/testng.ant
URL:
http://svn.apache.org/viewvc/ant/easyant/plugins/trunk/testng/src/main/resources/testng.ant?rev=1528220&r1=1528219&r2=1528220&view=diff
==============================================================================
--- ant/easyant/plugins/trunk/testng/src/main/resources/testng.ant (original)
+++ ant/easyant/plugins/trunk/testng/src/main/resources/testng.ant Tue Oct 1
21:25:52 2013
@@ -17,7 +17,7 @@
<project name="org.apache.easyant.plugins#testng"
xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
- <ea:plugin module="abstract-test" revision="0.9" />
+ <ea:plugin module="abstract-test" revision="0.10" />
<target name="testng:init" depends="abstract-test:init">
<ea:parameter property="testng.filename" description="testng
configuration filename" default="testng.xml" />
@@ -41,6 +41,7 @@
<xmlfileset dir="${target.@{prefix}.classes}"
includes="${testng.filename}" />
<!-- Alternative way to launch testng, maybe this could be an
alternative target? -->
<classfileset dir="${target.@{prefix}.classes}"
includes="**/*.class" />
+ <propertyset refid="test.propertyset.ref"/>
</testng>
</sequential>
</macrodef>
