Switch stable branch back to HEAD

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113855 13f79535-47bb-0310-9956-ffa450edef68

test/plugin.jelly

@@ -1,77 +1,88 @@
 <?xml version="1.0"?>
 
-<project 
-  xmlns:ant="jelly:ant"
-  xmlns:define="jelly:define"
-  xmlns:j="jelly:core"
-  xmlns:maven="jelly:maven"
-  xmlns:u="jelly:util">
-
-
-  <goal name="test"
+<project xmlns:j="jelly:core"
+         xmlns:maven="jelly:maven"
+         xmlns:u="jelly:util" 
+         xmlns:resources="resources"
+         xmlns:define="jelly:define">
+  
+  <goal name="test" 
         description="Test the application"
         prereqs="test:test"/>
 
   <goal name="test:prepare-filesystem"
         description="Create the needed directory structure">
-    <mkdir dir="${plugins.test.testDest}"/>
-    <mkdir dir="${plugins.test.reportsDirectory}"/>
+    <mkdir dir="${maven.test.dest}"/>
+    <mkdir dir="${maven.test.reportsDirectory}"/>
   </goal>
-
+ 
   <goal name="test:compile"
         description="Compile the TestCases and TestSuites"
         prereqs="java:compile,java:jar-resources,test:prepare-filesystem,test:test-resources">
 
-    <j:choose>
-      <j:when test="${unitTestSourcesPresent}">
+    <j:if test="${unitTestSourcesPresent == 'true'}">
       
-         <echo>Compiling test sources ...</echo>
-          
-         <ant:javac
-          destdir="${plugins.test.testDest}"
-          excludes="**/package.html"
-          debug="${plugins.test.compileDebug}"
-          deprecation="${plugins.test.compileDeprecation}"
-          optimize="${plugins.test.compileOptimize}">
+      <javac 
+        destdir="${maven.test.dest}"
+        excludes="**/package.html"
+        debug="${maven.compile.debug}"
+        deprecation="${maven.compile.deprecation}"
+        optimize="${maven.compile.optimize}">
+        <j:if test="${context.getVariable('maven.test.source') != null}">
+          <setProperty name="source" value="${maven.test.source}" />
+        </j:if>
+        <classpath>
+          <pathelement path="${maven.build.dest}"/>
+          <path refid="maven.dependency.classpath"/>
+          <pathelement path="${plugin.getDependencyPath('junit')}"/>
+        </classpath>
+        <src>
+          <path refid="maven.test.compile.src.set"/>
+        </src>
+        <j:if test="${context.getVariable('maven.compile.compilerargs') != null}">
+          <compilerarg line="${maven.compile.compilerargs}" />
+        </j:if>
+           
+        <j:if test="${context.getVariable('maven.compile.encoding') != null}">
+          <setProperty name="encoding" value="${maven.compile.encoding}" />
+        </j:if>
+             
+        <j:if test="${context.getVariable('maven.compile.executable') != null}">
+          <setProperty name="executable" value="${maven.compile.executable}" />
+        </j:if>
+            
+        <j:if test="${context.getVariable('maven.compile.fork') != null}">
+          <setProperty name="fork" value="${maven.compile.fork}" />
+        </j:if>
 
-          <j:forEach var="path" items="${pom.testCompileSourceRootsList}">
-            <src path="${path}"/>
-          </j:forEach>
+        <j:if test="${context.getVariable('maven.compile.source') != null}">
+          <setProperty name="source" value="${maven.compile.source}" />
+        </j:if>
+            
+        <j:if test="${context.getVariable('maven.compile.verbose') != null}">
+          <setProperty name="verbose" value="${maven.compile.verbose}" />
+        </j:if>
+      </javac>
+    </j:if>
 
-          <j:if test="${context.getVariable('maven.test.source') != null}">
-            <setProperty name="source" value="${maven.test.source}" />
-          </j:if>
-
-          <classpath>
-            <pathelement path="${maven.build.dest}"/>
-            <path refid="maven.dependency.classpath"/>
-            <pathelement path="${plugin.getDependencyPath('junit')}"/>
-          </classpath>
-        </ant:javac>
-      </j:when>
-      <j:otherwise>
-        <echo>No test sources to compile.</echo>
-      </j:otherwise>
-    </j:choose>
+    <j:if test="${!unitTestSourcesPresent}">
+      <echo>No test source files to compile.</echo>
+    </j:if>
+      
   </goal>
 
   <goal name="test:test"
         description="Test the application"
         prereqs="test:compile">
-        
-        <!--
-        
-    <j:choose>
-    
-    <j:when test="${unitTestSourcesPresent}">
-
-      <j:if test="${!plugins.test.skipTests}">
-
+      
+    <j:if test="${unitTestSourcesPresent == 'true' and context.getVariable('maven.test.skip') != 'true'}">
+      
       <taskdef
         name="junit"
-        classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
-
-      <junit printSummary="yes"
+        classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"
+      />
+      
+      <junit printSummary="yes" 
              failureProperty="maven.test.failure"
              fork="${maven.junit.fork}"
              dir="${maven.junit.dir}">
@@ -100,6 +111,7 @@
             <j:forEach var="pat" items="${pom.build.unitTest.excludes}">
               <exclude name="${pat}"/>
             </j:forEach>
+              <!-- KEEP ALL ABSTRACT TESTS FROM BEING RUN! -->
               <exclude name="**/*AbstractTestCase.java"/>
           </fileset>
         </batchtest>
@@ -111,17 +123,12 @@
           <fail message="There were test failures."/>
         </j:if>
       </j:if>
-      
-      </j:if>
-      
-    </j:when>
 
-    <j:otherwise>
-      <echo>No tests to run.</echo>
-    </j:otherwise>
-    </j:choose>
+    </j:if>
     
-    -->
+    <j:if test="${!unitTestSourcesPresent}">
+      <echo>No tests to run.</echo>
+    </j:if>
 
   </goal>
 
@@ -155,13 +162,13 @@
         description="Execute a single test defined using the 'testcase' variable"
         prereqs="test:compile">
 
-    <j:if test="${unitTestSourcesPresent}">
-
+    <j:if test="${unitTestSourcesPresent == 'true'}">
+    
       <j:choose>
         <j:when test="${empty(testcase)}">
         <echo>
           You must define the test case to run via -Dtestcase=classname
-          Example: maven -Dtestcase=MyTest test:single-test
+          Example: maven -Dtestcase=MyTest test:single
         </echo>
         </j:when>
 
@@ -217,13 +224,13 @@
         description="Execute all the tests matching the given 'testmatch' variable"
         prereqs="test:compile">
 
-    <j:if test="${unitTestSourcesPresent}">
-
+    <j:if test="${unitTestSourcesPresent == 'true'}">
+    
       <j:choose>
         <j:when test="${empty(testmatch)}">
         <echo>
           You must define the test case to run via -Dtestmatch=pattern
-          Example: maven -Dtestmatch=*Foo* test:match-test
+          Example: maven -Dtestmatch=*Foo* test:match
         </echo>
         </j:when>
 

test/plugin.properties

@@ -10,13 +10,4 @@ maven.junit.usefile = true
 maven.test.dest = ${maven.build.dir}/test-classes
 maven.test.reportsDirectory = ${maven.build.dir}/test-reports
 maven.test.skip = false
-maven.junit.jvmargs=
-
-skipTests = false
-
-compileDebug = on
-compileDeprecation = on
-compileOptimize = off
-
-testDest = ${basedir}/target/test-classes
-reportsDirectory = ${basedir}/target/test-reports
+maven.junit.jvmargs=

test/project.xml

@@ -19,16 +19,25 @@
     <dependency>
       <id>junit</id>
       <version>3.8.1</version>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
     </dependency>
     <dependency>
       <id>xml-apis</id>
       <version>1.0.b2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
     </dependency>
     <dependency>
       <id>xerces</id>
-      <version>2.0.2</version>
+      <version>2.4.0</version>
       <url>http://xml.apache.org/xerces2-j/</url>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
     </dependency>
   </dependencies>
 </project>