From a9d78d80500338937a6c56ef2bce15e1fba2cc3c Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 18 Sep 2015 13:47:04 +0100
Subject: [PATCH] JAL-1888 compile tests to separate directory and pass
 directly as fileset to testNG task

---
 build.xml |   57 +++++++++++++++++++++++----------------------------------
 1 file changed, 23 insertions(+), 34 deletions(-)

diff --git a/build.xml b/build.xml
index 29e151b..a517ec2 100755
--- a/build.xml
+++ b/build.xml
@@ -157,7 +157,10 @@
         <include name="${jmolJar}" />
         <include name="${varnaJar}" />
       </fileset>
-
+    </path>
+    <path id="test.classpath">
+      <pathelement path="${outputDir}" />
+      <path refid="build.classpath" />
     </path>
     <property name="source.dist.name" value="${basedir}/jalview-src.tar.gz" />
     <!-- The Location of the java 1.1.8 jdk -->
@@ -264,42 +267,28 @@
   <target name="testclean" depends="init">
     <delete dir="${testOutputDir}" includes="*,**/*"/>
   </target>
-  
-  <target name="prepareTests" depends="init">
-	<mkdir dir="${testOutputDir}" />
-	<copy todir="${testOutputDir}">
-		<fileset dir=".">
-			<include name="${docDir}/**/*.*" />
-			<include name="${helpDir}/**/*.*" />
-			<include name="${libDir}/*.jar" />
-		</fileset>
-		<fileset dir="${resourceDir}">
-			<include name="**/*.*" />
-		</fileset>
-	</copy>
-  </target>  
-  
-  <target name="buildTests" depends="prepareTests">
-	<javac source="${javac.source}" target="${javac.target}" srcdir="${sourceDir}" destdir="${testOutputDir}"
-		debug="${javac.debug}" classpathref="build.classpath" includeantruntime="false" >		
-	</javac>
-	<javac source="${javac.source}" target="${javac.target}" srcdir="${testDir}" destdir="${testOutputDir}"
-		debug="${javac.debug}" classpathref="build.classpath" includeantruntime="false" >
-	</javac>
+
+  <target name="prepareTests" depends="init,clean">
+    <mkdir dir="${testOutputDir}" />
   </target>
-  
-  <taskdef name="testng" classname="org.testng.TestNGAntTask" >	    
-	<classpath location="utils/testnglibs/testng.jar" />
-  </taskdef>
-  
+
+  <target name="buildTests" depends="build,buildindices,prepareTests">
+    <javac source="${javac.source}" target="${javac.target}" srcdir="${testDir}" destdir="${testOutputDir}" debug="${javac.debug}" classpathref="test.classpath" includeantruntime="false">
+    </javac>
+  </target>
+
+  <taskdef resource="testngtasks" classpath="utils/testnglibs/testng.jar" />
+
   <target name="testng" depends="buildTests">
-	<testng classpathref="build.classpath" outputDir="${reportDir}"
-		haltOnFailure="false">
-		<classpath location="${testOutputDir}" />
-		<xmlfileset dir="utils" includes="jalview_testng.xml" />
-	</testng>
+    <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng">
+      <classpath>
+        <pathelement location="${testOutputDir}" />
+        <path refid="test.classpath" />
+      </classpath>
+      <classfileset dir="${testOutputDir}" includes="**/*.class" />
+    </testng>
   </target>
-  
+
   <target name="buildindices" depends="init, prepare" unless="help.uptodate">
     <java classname="com.sun.java.help.search.Indexer" classpathref="build.classpath" fork="true" dir="${outputDir}/${helpDir}">
       <arg line="html" />
-- 
1.7.10.2