You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2012/12/09 10:20:20 UTC
svn commit: r1418882 - in /incubator/easyant/plugins/trunk: junit/
junit/src/ junit/src/main/ junit/src/main/resources/ junit/src/test/
junit/src/test/antunit/ junit/src/test/antunit/src/
junit/src/test/antunit/src/integration-test/ junit/src/test/antu...
Author: jlboudart
Date: Sun Dec 9 10:20:19 2012
New Revision: 1418882
URL: http://svn.apache.org/viewvc?rev=1418882&view=rev
Log:
Rename test-junit in junit
Added:
incubator/easyant/plugins/trunk/junit/
incubator/easyant/plugins/trunk/junit/module.ivy
- copied, changed from r1418868, incubator/easyant/plugins/trunk/test-junit/module.ivy
incubator/easyant/plugins/trunk/junit/src/
incubator/easyant/plugins/trunk/junit/src/main/
incubator/easyant/plugins/trunk/junit/src/main/resources/
incubator/easyant/plugins/trunk/junit/src/main/resources/junit.ant
- copied, changed from r1418868, incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant
incubator/easyant/plugins/trunk/junit/src/test/
incubator/easyant/plugins/trunk/junit/src/test/antunit/
incubator/easyant/plugins/trunk/junit/src/test/antunit/junit-test.xml
- copied, changed from r1418868, incubator/easyant/plugins/trunk/test-junit/src/test/antunit/test-junit-test.xml
incubator/easyant/plugins/trunk/junit/src/test/antunit/sample-module.ivy
- copied, changed from r1418868, incubator/easyant/plugins/trunk/test-junit/src/test/antunit/sample-module.ivy
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/integration-test/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/integration-test/java/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/integration-test/java/org/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/integration-test/java/org/apache/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/integration-test/java/org/apache/easyant/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java
- copied, changed from r1418868, incubator/easyant/plugins/trunk/test-junit/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/test/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/test/java/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/test/java/org/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/test/java/org/apache/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/test/java/org/apache/easyant/
incubator/easyant/plugins/trunk/junit/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java
- copied, changed from r1418868, incubator/easyant/plugins/trunk/test-junit/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java
Removed:
incubator/easyant/plugins/trunk/test-junit/module.ivy
incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant
incubator/easyant/plugins/trunk/test-junit/src/test/antunit/sample-module.ivy
incubator/easyant/plugins/trunk/test-junit/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java
incubator/easyant/plugins/trunk/test-junit/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java
incubator/easyant/plugins/trunk/test-junit/src/test/antunit/test-junit-test.xml
Copied: incubator/easyant/plugins/trunk/junit/module.ivy (from r1418868, incubator/easyant/plugins/trunk/test-junit/module.ivy)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/junit/module.ivy?p2=incubator/easyant/plugins/trunk/junit/module.ivy&p1=incubator/easyant/plugins/trunk/test-junit/module.ivy&r1=1418868&r2=1418882&rev=1418882&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-junit/module.ivy (original)
+++ incubator/easyant/plugins/trunk/junit/module.ivy Sun Dec 9 10:20:19 2012
@@ -15,7 +15,7 @@
limitations under the License.
-->
<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
- <info organisation="org.apache.easyant.plugins" module="test-junit" revision="0.9">
+ <info organisation="org.apache.easyant.plugins" module="junit" revision="0.9">
<extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1" />
<description>
This module provides junit tests compilation and execution feature.
Copied: incubator/easyant/plugins/trunk/junit/src/main/resources/junit.ant (from r1418868, incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/junit/src/main/resources/junit.ant?p2=incubator/easyant/plugins/trunk/junit/src/main/resources/junit.ant&p1=incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant&r1=1418868&r2=1418882&rev=1418882&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-junit/src/main/resources/test-junit.ant (original)
+++ incubator/easyant/plugins/trunk/junit/src/main/resources/junit.ant Sun Dec 9 10:20:19 2012
@@ -14,13 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins#test-junit" xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins#junit" xmlns:ea="antlib:org.apache.easyant">
<ea:core-version requiredrevision="[0.9,+]" />
<ea:import mrid="org.apache.easyant.plugins#abstract-test;0.9" />
<ea:import mrid="org.apache.easyant.plugins#antcontrib-activator;0.9" />
- <target name="test-junit:init" depends="abstract-test:init">
+ <target name="junit:init" depends="abstract-test:init">
<ea:parameter property="test.run.forkmode" default="perTest"
description="The forkmode for junit tests; 'perTest' or 'once'" />
<ea:parameter property="test.run.fork" default="true" description="Run the tests in a separate VM. (true/false)" />
@@ -59,27 +59,27 @@
</sequential>
</macrodef>
- <target name="-test-junit:test" depends="test-junit:init,abstract-test:compute-test-sets" unless="skip.test">
+ <target name="-junit:test" depends="junit:init,abstract-test:compute-test-sets" unless="skip.test">
<junit-test prefix="test" />
</target>
- <target name="-test-junit:integration-test" depends="test-junit:init,abstract-test:compute-test-sets" unless="skip.test.integration">
+ <target name="-junit:integration-test" depends="junit:init,abstract-test:compute-test-sets" unless="skip.test.integration">
<junit-test prefix="test.integration" />
</target>
- <target name="test-junit:run" if="test.mode.run" unless="skip.test" depends="-test-junit:test" description="run junit tests"
+ <target name="junit:run" if="test.mode.run" unless="skip.test" depends="-junit:test" description="run junit tests"
extensionOf="abstract-test:test-run">
<check-test-result propertytocheck="test.failed"
message="At least one test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report" />
</target>
- <target name="test-junit:run-integration" if="test.mode.run" unless="skip.test.integration" depends="-test-junit:integration-test"
+ <target name="junit:run-integration" if="test.mode.run" unless="skip.test.integration" depends="-junit:integration-test"
description="run junit integration tests" extensionOf="abstract-test:integration-test-run">
<check-test-result propertytocheck="test.integration.failed"
message="At least one integration test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report" />
</target>
- <target name="test-junit:report" if="test.mode.report" unless="skip.test" depends="-test-junit:test,-test-junit:integration-test"
+ <target name="junit:report" if="test.mode.report" unless="skip.test" depends="-junit:test,-junit:integration-test"
description="generate junit report">
<junitreport todir="${target.test.xml}">
<fileset dir="${target.test.xml}">
Copied: incubator/easyant/plugins/trunk/junit/src/test/antunit/junit-test.xml (from r1418868, incubator/easyant/plugins/trunk/test-junit/src/test/antunit/test-junit-test.xml)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/junit/src/test/antunit/junit-test.xml?p2=incubator/easyant/plugins/trunk/junit/src/test/antunit/junit-test.xml&p1=incubator/easyant/plugins/trunk/test-junit/src/test/antunit/test-junit-test.xml&r1=1418868&r2=1418882&rev=1418882&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-junit/src/test/antunit/test-junit-test.xml (original)
+++ incubator/easyant/plugins/trunk/junit/src/test/antunit/junit-test.xml Sun Dec 9 10:20:19 2012
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="org.apache.easyant.plugins;test-junit-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;junit-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:ea="antlib:org.apache.easyant">
<!-- Import your plugin -->
@@ -32,7 +32,7 @@
</delete>
</target>
- <!--FIXME: test-junit targets get executed as they are prefixed by "test" -->
+ <!--FIXME: junit targets get executed as they are prefixed by "test" -->
<target name="setUp" depends="clean">
<ivy:settings id="project.ivy.instance" />
<ivy:cachepath pathid="compile.test.classpath" file="sample-module.ivy" settingsRef="project.ivy.instance" />
@@ -43,7 +43,7 @@
</target>
<target name="tearDown" depends="clean" />
- <target name="test-test-junit:init" depends="test-junit:init">
+ <target name="test-junit:init" depends="junit:init">
<au:assertPropertyEquals name="test.run.forkmode" value="perTest" />
<au:assertPropertyEquals name="test.run.fork" value="true" />
<au:assertPropertyEquals name="test.run.jvmargs" value="" />
@@ -52,12 +52,12 @@
<au:assertPropertyEquals name="test.integration.run.jvmargs" value="" />
</target>
- <target name="test-test-junit:test" depends="-test-junit:test">
+ <target name="test-junit:test" depends="-junit:test">
<au:assertFileExists file="${target.test.xml}" />
<au:assertFileExists file="${test.run.dir}" />
</target>
- <target name="test-test-junit:integration-test" depends="-test-junit:integration-test">
+ <target name="test-junit:integration-test" depends="-junit:integration-test">
<au:assertFileExists file="${target.test.xml}" />
<au:assertFileExists file="${test.integration.run.dir}" />
</target>
@@ -67,20 +67,20 @@
<property name="test.run.failonerror" value="false" />
</target>
- <target name="test-test-junit:run" depends="configure-plugin,test-junit:run">
+ <target name="test-junit:run" depends="configure-plugin,junit:run">
<au:assertLogContains
text="At least one test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report"
level="error" />
</target>
- <target name="test-test-junit:run-integration" depends="configure-plugin,test-junit:run-integration">
+ <target name="test-junit:run-integration" depends="configure-plugin,junit:run-integration">
<au:assertLogContains
text="At least one integration test has failed. See logs in ${target.test.xml} for details or use the report target to run the test with a report"
level="error" />
</target>
- <target name="test-test-junit:report" depends="test-junit:report">
+ <target name="test-junit:report" depends="junit:report">
<!--TODO: add this missing test case -->
</target>
</project>
\ No newline at end of file
Copied: incubator/easyant/plugins/trunk/junit/src/test/antunit/sample-module.ivy (from r1418868, incubator/easyant/plugins/trunk/test-junit/src/test/antunit/sample-module.ivy)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/junit/src/test/antunit/sample-module.ivy?p2=incubator/easyant/plugins/trunk/junit/src/test/antunit/sample-module.ivy&p1=incubator/easyant/plugins/trunk/test-junit/src/test/antunit/sample-module.ivy&r1=1418868&r2=1418882&rev=1418882&view=diff
==============================================================================
(empty)
Copied: incubator/easyant/plugins/trunk/junit/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java (from r1418868, incubator/easyant/plugins/trunk/test-junit/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/junit/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java?p2=incubator/easyant/plugins/trunk/junit/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java&p1=incubator/easyant/plugins/trunk/test-junit/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java&r1=1418868&r2=1418882&rev=1418882&view=diff
==============================================================================
(empty)
Copied: incubator/easyant/plugins/trunk/junit/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java (from r1418868, incubator/easyant/plugins/trunk/test-junit/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/junit/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java?p2=incubator/easyant/plugins/trunk/junit/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java&p1=incubator/easyant/plugins/trunk/test-junit/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java&r1=1418868&r2=1418882&rev=1418882&view=diff
==============================================================================
(empty)