Rename test-junit in junit and test-testng in testng

git-svn-id: https://svn.apache.org/repos/asf/incubator/easyant/buildtypes/trunk@1418890 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build-std-groovy/src/main/resources/build-std-groovy.ant b/build-std-groovy/src/main/resources/build-std-groovy.ant
index 3f9e799..f783f59 100644
--- a/build-std-groovy/src/main/resources/build-std-groovy.ant
+++ b/build-std-groovy/src/main/resources/build-std-groovy.ant
@@ -27,7 +27,7 @@
     <ea:import mrid="org.apache.easyant.plugins#resources-std;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#compile-groovy;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#compile-test-groovy;0.9" />
-    <ea:import mrid="org.apache.easyant.plugins#test-junit;0.9" />
+    <ea:import mrid="org.apache.easyant.plugins#junit;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#manifest;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#package-jar;0.9" />
 
diff --git a/build-std-groovy/src/test/antunit/build-std-groovy-test.xml b/build-std-groovy/src/test/antunit/build-std-groovy-test.xml
index 06a4910..42e49e2 100644
--- a/build-std-groovy/src/test/antunit/build-std-groovy-test.xml
+++ b/build-std-groovy/src/test/antunit/build-std-groovy-test.xml
@@ -51,7 +51,7 @@
         <au:assertLogContains text="Running org.apache.easyant.example.ExampleTest" />
         <au:assertLogContains text="Tests run: 2, Failures: 0, Errors: 0" />
         <au:assertLogContains
-            text="Build sequence for target(s) `setUp', `test-build-std-groovy:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-groovy:init, -compile-groovy:configure, compile-groovy:compile, compile-test-groovy:configure, compile-test-groovy:compile, compile-test-groovy:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-std-groovy:test]"
+            text="Build sequence for target(s) `setUp', `test-build-std-groovy:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-groovy:init, -compile-groovy:configure, compile-groovy:compile, compile-test-groovy:configure, compile-test-groovy:compile, compile-test-groovy:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, junit:init, abstract-test:compute-test-sets, -junit:test, junit:run, abstract-test:test-run, test, test-build-std-groovy:test]"
             level="debug" />
     </target>
     <target name="test-build-std-groovy:package" depends="package">
diff --git a/build-std-java/src/main/resources/build-std-java.ant b/build-std-java/src/main/resources/build-std-java.ant
index 20c8bfe..25e4e16 100644
--- a/build-std-java/src/main/resources/build-std-java.ant
+++ b/build-std-java/src/main/resources/build-std-java.ant
@@ -26,7 +26,7 @@
     <ea:import mrid="org.apache.easyant.plugins#compile-java;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#compile-test-java;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#ivy-publication;0.9" />
-    <ea:import mrid="org.apache.easyant.plugins#test-junit;0.9" />
+    <ea:import mrid="org.apache.easyant.plugins#junit;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#manifest;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#package-jar;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#ivy-utils;0.9" />
diff --git a/build-std-java/src/test/antunit/build-std-java-test.xml b/build-std-java/src/test/antunit/build-std-java-test.xml
index 6a844d2..6c95455 100644
--- a/build-std-java/src/test/antunit/build-std-java-test.xml
+++ b/build-std-java/src/test/antunit/build-std-java-test.xml
@@ -51,7 +51,7 @@
         <au:assertLogContains text="Running org.apache.easyant.example.ExampleTest" />
         <au:assertLogContains text="Tests run: 2, Failures: 0, Errors: 0" />
         <au:assertLogContains
-            text="Build sequence for target(s) `setUp', `test-build-std-java:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-std-java:test]"
+            text="Build sequence for target(s) `setUp', `test-build-std-java:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, junit:init, abstract-test:compute-test-sets, -junit:test, junit:run, abstract-test:test-run, test, test-build-std-java:test]"
             level="debug" />
     </target>
     <target name="test-build-std-java:package" depends="package">
diff --git a/build-std-scala/src/main/resources/build-std-scala.ant b/build-std-scala/src/main/resources/build-std-scala.ant
index 47ced1c..9d1a36e 100644
--- a/build-std-scala/src/main/resources/build-std-scala.ant
+++ b/build-std-scala/src/main/resources/build-std-scala.ant
@@ -27,7 +27,7 @@
     <ea:import mrid="org.apache.easyant.plugins#resources-std;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#compile-scala;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#compile-test-scala;0.9" />
-    <ea:import mrid="org.apache.easyant.plugins#test-junit;0.9" />
+    <ea:import mrid="org.apache.easyant.plugins#junit;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#manifest;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#package-jar;0.9" />
 
diff --git a/build-std-scala/src/test/antunit/build-std-scala-test.xml b/build-std-scala/src/test/antunit/build-std-scala-test.xml
index 31b7516..38bc978 100644
--- a/build-std-scala/src/test/antunit/build-std-scala-test.xml
+++ b/build-std-scala/src/test/antunit/build-std-scala-test.xml
@@ -51,7 +51,7 @@
         <au:assertLogContains text="Running org.apache.easyant.example.ExampleTest" />
         <au:assertLogContains text="Tests run: 2, Failures: 0, Errors: 0" />
         <au:assertLogContains
-            text="Build sequence for target(s) `setUp', `test-build-std-scala:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-scala:init, compile-scala:configure, compile-scala:compile, compile-test-scala:configure, compile-test-scala:compile, compile-test-scala:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-std-scala:test]"
+            text="Build sequence for target(s) `setUp', `test-build-std-scala:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-scala:init, compile-scala:configure, compile-scala:compile, compile-test-scala:configure, compile-test-scala:compile, compile-test-scala:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, junit:init, abstract-test:compute-test-sets, -junit:test, junit:run, abstract-test:test-run, test, test-build-std-scala:test]"
             level="debug" />
     </target>
     <target name="test-build-std-scala:package" depends="package">
diff --git a/build-webapp-java/src/main/resources/build-webapp-java.ant b/build-webapp-java/src/main/resources/build-webapp-java.ant
index 95feba1..6dc1a9b 100644
--- a/build-webapp-java/src/main/resources/build-webapp-java.ant
+++ b/build-webapp-java/src/main/resources/build-webapp-java.ant
@@ -27,7 +27,7 @@
     <ea:import mrid="org.apache.easyant.plugins#resources-std;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#compile-java;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#compile-test-java;0.9" />
-    <ea:import mrid="org.apache.easyant.plugins#test-junit;0.9" />
+    <ea:import mrid="org.apache.easyant.plugins#junit;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#manifest;0.9" />
     <ea:import mrid="org.apache.easyant.plugins#package-war;0.9" />
 
diff --git a/build-webapp-java/src/test/antunit/build-webapp-java-test.xml b/build-webapp-java/src/test/antunit/build-webapp-java-test.xml
index c349f6e..3dd77fb 100644
--- a/build-webapp-java/src/test/antunit/build-webapp-java-test.xml
+++ b/build-webapp-java/src/test/antunit/build-webapp-java-test.xml
@@ -51,7 +51,7 @@
         <au:assertLogContains text="Running org.apache.easyant.example.ExampleTest" />
         <au:assertLogContains text="Tests run: 2, Failures: 0, Errors: 0" />
         <au:assertLogContains
-            text="Build sequence for target(s) `setUp', `test-build-webapp-java:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, test-junit:init, abstract-test:compute-test-sets, -test-junit:test, test-junit:run, abstract-test:test-run, test, test-build-webapp-java:test]"
+            text="Build sequence for target(s) `setUp', `test-build-webapp-java:test' is [clean-test, setUp, -ivy-provisioning:init, abstract-provisioning:provisioning-ready, -ivy-provisioning:resolve, -ivy-provisioning:resolve-main-confs, -ivy-provisioning:resolve-test-confs, -ivy-provisioning:resolve-provided-confs, ivy-provisioning:resolve, abstract-provisioning:provisioning, abstract-compile:compile-ready, compile-java:init, compile-java:compile, compile-test-java:compile, compile-test-java:compile-integration, abstract-compile:compile, compile, resources-std:init, -resources-std:check-resources, resources-std:copy-resources, resources-std:copy-test-resources, abstract-test:test-ready, abstract-test:init, junit:init, abstract-test:compute-test-sets, -junit:test, junit:run, abstract-test:test-run, test, test-build-webapp-java:test]"
             level="debug" />
     </target>
     <target name="test-build-webapp-java:package" depends="package">