ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgl...@apache.org
Subject svn commit: r1055099 - /ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
Date Tue, 04 Jan 2011 16:49:45 GMT
Author: jglick
Date: Tue Jan  4 16:49:45 2011
New Revision: 1055099

URL: http://svn.apache.org/viewvc?rev=1055099&view=rev
Log:
testFailNone (now renamed testTestMethods) was passing without actually doing anything.

Modified:
    ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/junit-test.xml

Modified: ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/junit-test.xml?rev=1055099&r1=1055098&r2=1055099&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/junit-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/optional/junit/junit-test.xml Tue Jan  4 16:49:45
2011
@@ -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>



Mime
View raw message