From 75ed66a66d4ea436b01dbadf62c03cd08361654f Mon Sep 17 00:00:00 2001
From: Oliver Burn <oliver@puppycrawl.com>
Date: Thu, 20 Dec 2001 01:40:55 +0000
Subject: [PATCH] patch to clean up running unit tests

---
 .cvsignore |  2 +-
 ChangeLog  |  6 ++++++
 build.xml  | 37 +++++++++++++++++++++++++++++++------
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8541d7ab7..fe6a5b634 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-TEST-com.puppycrawl.tools.checkstyle.*.txt
+testreports
 classes
 dist
diff --git a/ChangeLog b/ChangeLog
index ae6e89581..36e185d0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-20  Oliver Burn  <oliver@cortexebusiness.com.au>
+
+	* build.xml:
+	Included patch to fail build if unit tests fail, and also format the
+	unit test results. From Lars kuehne.
+
 2001-12-11  Oliver Burn  <oliver@cortexebusiness.com.au>
 
 	* src/checkstyle/com/puppycrawl/tools/checkstyle/java.tree.g:
diff --git a/build.xml b/build.xml
index dbe24cf09..a515ba8c5 100644
--- a/build.xml
+++ b/build.xml
@@ -14,7 +14,9 @@
   <property name="regexp.jar" value="c:/apps/jakarta-regexp-1.2/jakarta-regexp-1.2.jar" />
   <property name="junit.jar" value="c:/apps/junit3.7/junit.jar" />
   <property name="checkstyle.dir" value="src/checkstyle/com/puppycrawl/tools/checkstyle" />
-  <property name="version" value="1.3" />
+  <property name="testreport.dir" value="testreports"/>
+
+  <property name="version" value="1.4" />
 
   <path id="build.classpath">
     <pathelement location="${antlr.home}" />
@@ -48,10 +50,10 @@
     <delete dir="classes" />
     <delete dir="dist" />
     <delete dir="javadoc" />
+    <delete dir="${testreport.dir}" />
     <delete>
       <fileset dir="src/checkstyle" includes="**/Generated*.java" />
       <fileset dir="src/checkstyle" includes="**/Generated*.txt" />
-      <fileset dir="." includes="**/TEST-*" />
     </delete>
   </target>
 
@@ -149,18 +151,41 @@
   </target>
 
   <target name="run.tests" depends="compile.tests">
+
+    <mkdir dir="${testreport.dir}"/>
+
     <property name="tests.dir"
-	      location="src/tests/com/puppycrawl/tools/checkstyle"/>
-    <junit printsummary="yes" fork="yes">
+              location="src/tests/com/puppycrawl/tools/checkstyle"/>
+
+    <junit printsummary="yes" 
+           fork="yes" 
+           haltonfailure="no" 
+           failureProperty="tests.have.failed">
       <jvmarg value="-Dtests.dir=${tests.dir}"/>
-      <formatter type="plain" />
+      <formatter type="xml" />
       <classpath refid="tests.runpath"/>
-      <batchtest>
+      <batchtest todir="${testreport.dir}">
         <fileset dir="src/tests">
           <include name="**/*Test.java" />
         </fileset>
       </batchtest>
     </junit>
+
+    <junitreport todir="${testreport.dir}">
+      <fileset dir="${testreport.dir}">
+        <include name="TEST-*.xml"/>
+      </fileset>
+      <report todir="${testreport.dir}"/>
+    </junitreport>
+
+    <!-- if only fail had an if attribute ... ugly workaround follows -->
+    <antcall target="tests.failed"/> 
+
+  </target>
+
+  <target name="tests.failed" if="tests.have.failed">
+    <property name="report" value="${basedir}/${testreport.dir}/index.html"/>
+    <fail message="Unit tests failed - Report is available in ${report}"/>
   </target>
 
   <!-- -->