From 1fa88fd389ad20b5d615d3709463a4575a9dfc05 Mon Sep 17 00:00:00 2001
From: David Roazen <droazen@broadinstitute.org>
Date: Tue, 29 May 2012 16:11:17 -0400
Subject: [PATCH] Fixing some problems with the binary release tests

-Classpaths to test the release jars were being constructed prematurely,
 before all needed properties had been defined
-Added reportng as a TestNG dependency for testing purposes
---
 build.xml | 71 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/build.xml b/build.xml
index cfaa9114e..6bfa206ec 100644
--- a/build.xml
+++ b/build.xml
@@ -1051,6 +1051,7 @@
             <include name="junit*.jar"/>
             <include name="bsh*.jar"/>
             <include name="snakeyaml*.jar"/>
+            <include name="reportng*.jar"/>
         </fileset>
     </path>
 
@@ -1066,38 +1067,6 @@
         <path refid="external.dependencies" />
     </path>
 
-    <path id="gatk.binary.release.tests.classpath">
-        <path refid="testng.dependencies" />
-        <path>
-            <fileset dir="${package.output.dir}">
-                <include name="**/${executable}.jar" />
-            </fileset>
-        </path>
-        <pathelement location="${java.contracts.dir}" />
-        <pathelement location="${java.test.classes}" />
-        <pathelement location="${scala.test.classes}" />
-        <pathelement location="${scala.classes}" />
-        <path>
-            <fileset dir="${lib.dir}">
-                <include name="scala*.jar"/>
-                <include name="jna*.jar"/>
-            </fileset>
-        </path>
-    </path>
-
-    <path id="queue.binary.release.tests.classpath">
-        <path refid="testng.dependencies" />
-        <path>
-            <fileset dir="${package.output.dir}">
-                <include name="**/${executable}.jar" />
-            </fileset>
-        </path>
-        <pathelement location="${java.contracts.dir}" />
-        <pathelement location="${java.test.classes}" />
-        <pathelement location="${scala.test.classes}" />
-    </path>
-
-
     <!-- Test targets -->
 
     <target name="test.init.compile">
@@ -1180,8 +1149,14 @@
             </condition>
 
             <mkdir dir="@{outputdir}"/>
+
+            <echo message="" />
+            <echo message="Test Classpath ID: ${testng.classpath}" />
+            <property name="test.classpath.display.string" refid="${testng.classpath}" />
+            <echo message="Test Classpath: ${test.classpath.display.string}" />
+            <echo message="" />
             <echo message="Sting: Running @{testtype} test cases!"/>
-            <echo message="Test classpath: ${testng.classpath}"/>
+
             <taskdef resource="testngtasks" classpath="${testng.jar}"/>
             <testng outputDir="@{outputdir}"
                     classpathref="${testng.classpath}"
@@ -1237,13 +1212,43 @@
     </target>
 
     <target name="init.testgatkjar">
+        <path id="gatk.binary.release.tests.classpath">
+            <path refid="testng.dependencies" />
+            <path>
+                <fileset dir="${package.output.dir}">
+                    <include name="**/${executable}.jar" />
+                </fileset>
+            </path>
+            <pathelement location="${java.contracts.dir}" />
+            <pathelement location="${java.test.classes}" />
+            <pathelement location="${scala.test.classes}" />
+            <pathelement location="${scala.classes}" />
+            <path>
+                <fileset dir="${lib.dir}">
+                    <include name="scala*.jar"/>
+                    <include name="jna*.jar"/>
+                </fileset>
+            </path>
+        </path>
         <property name="testng.classpath" value="gatk.binary.release.tests.classpath" />
     </target>
 
     <target name="init.testqueuejar">
+        <path id="queue.binary.release.tests.classpath">
+            <path refid="testng.dependencies" />
+            <path>
+                <fileset dir="${package.output.dir}">
+                    <include name="**/${executable}.jar" />
+                </fileset>
+            </path>
+            <pathelement location="${java.contracts.dir}" />
+            <pathelement location="${java.test.classes}" />
+            <pathelement location="${scala.test.classes}" />
+        </path>
         <property name="testng.classpath" value="queue.binary.release.tests.classpath" />
     </target>
 
+
     <target name="committests">
         <antcall target="unittest" inheritAll="false"/>
         <antcall target="integrationtest" inheritAll="false"/>