From 5ad76f71663b369b563ee41714012270bebcbea4 Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Tue, 4 Jan 2011 16:49:45 +0000
Subject: [PATCH] testFailNone (now renamed testTestMethods) was passing
 without actually doing anything.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1055099 13f79535-47bb-0310-9956-ffa450edef68
---
 .../taskdefs/optional/junit/junit-test.xml    | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
index 6d256a3ee..3fa272072 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
@@ -300,19 +300,7 @@ public class BTest extends TestCase {
     </au:expectfailure>
   </target>
 
-	<target name="-setUp.methods" depends="setUp">
-	  <property name="junit-3.8.2.location" location="../../../../lib/optional/junit-3.8.2.jar"/>
-	  <property name="junit-4.8.1.location" location="../../../../lib/optional/junit-4.8.1.jar"/>
-	  <condition property="test.can.run">
-	     <and>
-	     	<available file="${junit-3.8.2.location}"/>
-	     	<available file="${junit-4.8.1.location}"/>
-	     	<isset property="jdk1.5+"/>
-	     </and>
-	  </condition>
-	</target>
-
-	<target name="testFailNone" depends="-setUp.methods" if="test.can.run">
+	<target name="testTestMethods" if="jdk1.5+">
 		<echo file="${input}/T1.java">public class T1 extends
 			junit.framework.TestCase {
 			public void testOK() {}
@@ -330,23 +318,16 @@ public class BTest extends TestCase {
 		<javac srcdir="${input}" destdir="${output}" includes="T1.java,T2.java" source="5"
 			 includeantruntime="false" >
 			 <classpath>
-			   <pathelement path="${java.class.path}"/>
+			   <path refid="junit"/>
 			 </classpath>
 		</javac>
-		<junit fork="true" printsummary="true" failureproperty="test.failed" errorproperty="test.haseerror">
+		<junit fork="true" printsummary="true" haltonerror="true">
 			<classpath>
 			  <pathelement location="${output}"/>
-			  <pathelement location="${junit-3.8.2.location}"/>
-			  <pathelement location="${junit-4.8.1.location}"/>
+		          <path refid="junit"/>
 			</classpath>
 			<test name="T1" methods="testOK" />
 			<test name="T2" methods="ok" />
 		</junit>
-		<au:assertFalse>
-		<or>
-		   <isset property="test.failed"/>
-		   <isset property="test.haserror"/>
-		</or>
-		</au:assertFalse>
 	</target>
 </project>