[Yanel-commits] rev 54144 - public/yanel/trunk/src/build/resource-types

[michi at wyona.com]

Author: michi
Date: 2010-10-27 08:27:12 +0200 (Wed, 27 Oct 2010)
New Revision: 54144

Modified:
   public/yanel/trunk/src/build/resource-types/resource-type.build.xml
Log:
thanks to Paul Bakker one can run all junit tests of a resource at the same time

Modified: public/yanel/trunk/src/build/resource-types/resource-type.build.xml
===================================================================
--- public/yanel/trunk/src/build/resource-types/resource-type.build.xml	2010-10-26 15:23:39 UTC (rev 54143)
+++ public/yanel/trunk/src/build/resource-types/resource-type.build.xml	2010-10-27 06:27:12 UTC (rev 54144)
@@ -17,6 +17,7 @@
 
   <!-- For example set within build.sh ... -->
   <property name="yanel.home" value="${yanel.source.home}"/>
+  <property name="yanel.build.dir" value="${yanel.home}/build"/>
   <property file="${yanel.home}/src/build/local.build.properties"/>
   <property file="${yanel.home}/src/build/build.properties"/>
 
@@ -33,10 +34,21 @@
       <pathelement path="${maven2.cp}"/>
       <pathelement path="${maven2.resource.cp}"/>
     </path>
+
     <property name="resource.build.dir" value="${resource.home.dir}/build"/>
     <property name="resource.classes.dir" value="${resource.build.dir}/classes"/>
     <property name="resource.lib.dir" value="${resource.build.dir}/lib"/>
     <property name="resource.java.dir" value="${resource.home.dir}/src/java"/>
+    <property name="resource.junit.src.dir" value="${resource.home.dir}/src/test/junit"/>
+    <property name="resource.junit.build.dir" value="${resource.build.dir}/test/junit"/>
+
+    <path id="classpath-of-tests">
+      <pathelement path="${maven2.cp}"/>
+      <pathelement path="${maven2.resource.cp}"/>
+      <pathelement location="${resource.classes.dir}"/>
+      <pathelement location="${resource.junit.build.dir}"/>
+    </path>
+
     <!--NOTE for "multi-resource-types" properties will be picked from the 1st "resource-*.xml" file found, so please make sure they all use the same values! -->
     <xmlproperty prefix="resource.resource.xml">
       <first>
@@ -145,8 +157,8 @@
     <delete dir="${resource.build.dir}"/>
   </target>
 
-  <target name="copy-dependencies" depends="init">
-    <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
+  <target name="copy-dependencies" depends="init" description="Copy resource depenedencies to Yanel webapp lib directory">
+    <copy todir="${yanel.build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
       <fileset refid="maven2.resource.fileset"/>
       <mapper type="flatten"/>
     </copy>
@@ -207,9 +219,9 @@
   <target name="compile-junit-tests" depends="init" description="Compile junit tests">
     <echo>Compiling the junit tests of resource-type with root directory set to ${resource.home.dir}</echo>
 
-    <mkdir dir="${resource.classes.dir}"/>
-    <javac srcdir="${resource.home.dir}/src/test/junit" destdir="${resource.classes.dir}"
-      classpathref="classpath"
+    <mkdir dir="${resource.junit.build.dir}"/>
+    <javac srcdir="${resource.junit.src.dir}" destdir="${resource.junit.build.dir}"
+      classpathref="classpath-of-tests"
       source="${source.java.version}"
       target="${target.java.version}"
       encoding="${javac.encoding}"
@@ -217,7 +229,7 @@
     />
 
 <!--
-    <mkdir dir="${build.dir}"/>
+    <mkdir dir="${yanel.build.dir}"/>
     <mkdir dir="${junit.build.dir}"/>
     <mkdir dir="${htmlunit.build.dir}"/>
     <copy todir="${test.data.dir}">
@@ -242,14 +254,14 @@
       <pathelement path="${maven2.cp}"/>
       <pathelement path="${maven2.resource.cp}"/>
       <pathelement location="${resource.classes.dir}"/>
+      <pathelement location="${resource.junit.build.dir}"/>
+      <pathelement location="${resource.java.dir}"/>
     </path>
 
     <junit fork="yes" printsummary="yes" haltonfailure="no" failureproperty="junit.tests.failed">
-<!--
       <batchtest todir="${test.results.dir}" unless="test.class.name">
-        <fileset dir="${junit.build.dir}" includes="**/*Test.class" excludes="**/Abstract*.class"/>
+        <fileset dir="${resource.junit.build.dir}" includes="**/*Test.class" excludes="**/Abstract*.class"/>
       </batchtest>
--->
       <test todir="${test.results.dir}" name="${test.class.name}" if="test.class.name"/>
       <formatter type="plain" usefile="false"/>
       <formatter type="xml"/>