incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1418883 - in /incubator/easyant/plugins/trunk: test-testng/ test-testng/src/main/resources/ test-testng/src/test/antunit/ test-testng/src/test/antunit/src/integration-test/java/org/apache/easyant/ test-testng/src/test/antunit/src/test/java...
Date Sun, 09 Dec 2012 10:22:02 GMT
Author: jlboudart
Date: Sun Dec  9 10:22:00 2012
New Revision: 1418883

URL: http://svn.apache.org/viewvc?rev=1418883&view=rev
Log:
Rename test-testng in testng

Added:
    incubator/easyant/plugins/trunk/testng/
    incubator/easyant/plugins/trunk/testng/module.ivy
      - copied, changed from r1418882, incubator/easyant/plugins/trunk/test-testng/module.ivy
    incubator/easyant/plugins/trunk/testng/src/
    incubator/easyant/plugins/trunk/testng/src/main/
    incubator/easyant/plugins/trunk/testng/src/main/resources/
    incubator/easyant/plugins/trunk/testng/src/main/resources/testng.ant
      - copied, changed from r1418882, incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant
    incubator/easyant/plugins/trunk/testng/src/test/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/sample-module.ivy
      - copied, changed from r1418882, incubator/easyant/plugins/trunk/test-testng/src/test/antunit/sample-module.ivy
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/integration-test/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/integration-test/java/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/integration-test/java/org/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/integration-test/java/org/apache/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/integration-test/java/org/apache/easyant/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java
      - copied, changed from r1418882, incubator/easyant/plugins/trunk/test-testng/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/test/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/test/java/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/test/java/org/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/test/java/org/apache/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/test/java/org/apache/easyant/
    incubator/easyant/plugins/trunk/testng/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java
      - copied, changed from r1418882, incubator/easyant/plugins/trunk/test-testng/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java
    incubator/easyant/plugins/trunk/testng/src/test/antunit/testng-test.xml
      - copied, changed from r1418882, incubator/easyant/plugins/trunk/test-testng/src/test/antunit/test-testng-test.xml
Removed:
    incubator/easyant/plugins/trunk/test-testng/module.ivy
    incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant
    incubator/easyant/plugins/trunk/test-testng/src/test/antunit/sample-module.ivy
    incubator/easyant/plugins/trunk/test-testng/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java
    incubator/easyant/plugins/trunk/test-testng/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java
    incubator/easyant/plugins/trunk/test-testng/src/test/antunit/test-testng-test.xml

Copied: incubator/easyant/plugins/trunk/testng/module.ivy (from r1418882, incubator/easyant/plugins/trunk/test-testng/module.ivy)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/testng/module.ivy?p2=incubator/easyant/plugins/trunk/testng/module.ivy&p1=incubator/easyant/plugins/trunk/test-testng/module.ivy&r1=1418882&r2=1418883&rev=1418883&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-testng/module.ivy (original)
+++ incubator/easyant/plugins/trunk/testng/module.ivy Sun Dec  9 10:22:00 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-testng" revision="0.9">
+    <info organisation="org.apache.easyant.plugins" module="testng" revision="0.9">
         <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1"
/>
         <description>
             This module provides testng tests compilation and execution feature.

Copied: incubator/easyant/plugins/trunk/testng/src/main/resources/testng.ant (from r1418882,
incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/testng/src/main/resources/testng.ant?p2=incubator/easyant/plugins/trunk/testng/src/main/resources/testng.ant&p1=incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant&r1=1418882&r2=1418883&rev=1418883&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-testng/src/main/resources/test-testng.ant (original)
+++ incubator/easyant/plugins/trunk/testng/src/main/resources/testng.ant Sun Dec  9 10:22:00
2012
@@ -14,12 +14,12 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.plugins#test-testng" xmlns:ea="antlib:org.apache.easyant">
+<project name="org.apache.easyant.plugins#testng" xmlns:ea="antlib:org.apache.easyant">
     <ea:core-version requiredrevision="[0.9,+]" />
 
     <ea:import mrid="org.apache.easyant.plugins#abstract-test;0.9" />
 
-    <target name="test-testng:init" depends="abstract-test:init">
+    <target name="testng:init" depends="abstract-test:init">
         <ea:parameter property="testng.filename" description="testng configuration filename"
default="testng.xml" />
         <available property="testng.available" classname="org.testng.TestNGAntTask">
             <classpath refid="run.test.classpath" />
@@ -45,29 +45,29 @@
         </sequential>
     </macrodef>
 
-    <target name="-test-testng:test" depends="test-testng:init,abstract-test:compute-test-sets"
unless="skip.test">
+    <target name="-testng:test" depends="testng:init,abstract-test:compute-test-sets"
unless="skip.test">
         <testng-test prefix="test" />
     </target>
 
-    <target name="-test-testng:integration-test" depends="test-testng:init,abstract-test:compute-test-sets"
+    <target name="-testng:integration-test" depends="testng:init,abstract-test:compute-test-sets"
         unless="skip.test.integration">
         <testng-test prefix="test.integration" />
     </target>
 
-    <target name="test-testng:run" if="test.mode.run" unless="skip.test" depends="-test-testng:test"
description="run testng tests"
+    <target name="testng:run" if="test.mode.run" unless="skip.test" depends="-testng:test"
description="run testng 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-testng:run-integration" if="test.mode.run" unless="skip.test.integration"
depends="-test-testng:integration-test"
+    <target name="testng:run-integration" if="test.mode.run" unless="skip.test.integration"
depends="-testng:integration-test"
         description="run testng 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-testng:report" if="test.mode.report" unless="skip.test"
-        depends="-test-testng:test,-test-testng:integration-test" description="generate testng
reports">
+    <target name="testng:report" if="test.mode.report" unless="skip.test"
+        depends="-testng:test,-testng:integration-test" description="generate testng reports">
         <junitreport todir="${target.test.xml}">
             <fileset dir="${target.test.xml}">
                 <include name="TEST-*.xml" />

Copied: incubator/easyant/plugins/trunk/testng/src/test/antunit/sample-module.ivy (from r1418882,
incubator/easyant/plugins/trunk/test-testng/src/test/antunit/sample-module.ivy)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/testng/src/test/antunit/sample-module.ivy?p2=incubator/easyant/plugins/trunk/testng/src/test/antunit/sample-module.ivy&p1=incubator/easyant/plugins/trunk/test-testng/src/test/antunit/sample-module.ivy&r1=1418882&r2=1418883&rev=1418883&view=diff
==============================================================================
    (empty)

Copied: incubator/easyant/plugins/trunk/testng/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java
(from r1418882, incubator/easyant/plugins/trunk/test-testng/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/testng/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java?p2=incubator/easyant/plugins/trunk/testng/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java&p1=incubator/easyant/plugins/trunk/test-testng/src/test/antunit/src/integration-test/java/org/apache/easyant/SampleITTest.java&r1=1418882&r2=1418883&rev=1418883&view=diff
==============================================================================
    (empty)

Copied: incubator/easyant/plugins/trunk/testng/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java
(from r1418882, incubator/easyant/plugins/trunk/test-testng/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/testng/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java?p2=incubator/easyant/plugins/trunk/testng/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java&p1=incubator/easyant/plugins/trunk/test-testng/src/test/antunit/src/test/java/org/apache/easyant/SampleTest.java&r1=1418882&r2=1418883&rev=1418883&view=diff
==============================================================================
    (empty)

Copied: incubator/easyant/plugins/trunk/testng/src/test/antunit/testng-test.xml (from r1418882,
incubator/easyant/plugins/trunk/test-testng/src/test/antunit/test-testng-test.xml)
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/testng/src/test/antunit/testng-test.xml?p2=incubator/easyant/plugins/trunk/testng/src/test/antunit/testng-test.xml&p1=incubator/easyant/plugins/trunk/test-testng/src/test/antunit/test-testng-test.xml&r1=1418882&r2=1418883&rev=1418883&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/test-testng/src/test/antunit/test-testng-test.xml (original)
+++ incubator/easyant/plugins/trunk/testng/src/test/antunit/testng-test.xml Sun Dec  9 10:22:00
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-testng-test" xmlns:au="antlib:org.apache.ant.antunit"
xmlns:ivy="antlib:org.apache.ivy.ant"
+<project name="org.apache.easyant.plugins;testng-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-testng targets get executed as they are prefixed by "test" -->
+    <!--FIXME: testng 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,15 +43,15 @@
     </target>
     <target name="tearDown" depends="clean" />
 
-    <target name="test-test-testng:init" depends="test-testng:init">
+    <target name="test-testng:init" depends="testng:init">
         <au:assertPropertyEquals name="testng.filename" value="testng.xml" />
     </target>
 
-    <target name="test-test-testng:test" depends="-test-testng:test">
+    <target name="test-testng:test" depends="-testng:test">
         <au:assertFileExists file="${target.test.xml}" />
     </target>
 
-    <target name="test-test-testng:integration-test" depends="-test-testng:integration-test">
+    <target name="test-testng:integration-test" depends="-testng:integration-test">
         <au:assertFileExists file="${target.test.xml}" />
     </target>
 
@@ -61,19 +61,19 @@
     </target>
 
 
-    <target name="test-test-testng:run" depends="configure-plugin,test-testng:run">
+    <target name="test-testng:run" depends="configure-plugin,testng: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-testng:run-integration" depends="configure-plugin,test-testng:run-integration">
+    <target name="test-testng:run-integration" depends="configure-plugin,testng: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-testng:report" depends="test-testng:report">
+    <target name="test-testng:report" depends="testng:report">
         <!--TODO: add this missing test case -->
     </target>
 </project>
\ No newline at end of file



Mime
View raw message