From 940895930e4b7aa5ee2618e984cfa9b1a2e3117f Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 25 Sep 2008 14:15:48 +0000
Subject: [PATCH] Passing tests for PR 40457

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

diff --git a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
index a48c88950..945d660f2 100644
--- a/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
+++ b/src/tests/antunit/taskdefs/optional/junit/junit-test.xml
@@ -69,4 +69,64 @@ public class BTest extends TestCase {
     <au:assertLogDoesntContain text="CTest"/>
     <au:assertLogDoesntContain text="DTest"/>
   </target>
+
+  <target name="testFailurePropertyOnTestCase">
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
+    <echo file="${input}/ATest.java"><![CDATA[
+package test;
+import junit.framework.TestCase;
+
+public class ATest extends TestCase {
+    public void testFail() {
+        assertTrue(false);
+    }
+}
+]]>  </echo>
+    <javac srcdir="${input}" destdir="${output}">
+      <classpath refid="junit"/>
+    </javac>
+    <junit failureProperty="testcase.failed" haltonfailure="false">
+      <classpath refid="junit"/>
+      <classpath location="${output}"/>
+      <batchtest>
+        <fileset dir="${output}">
+          <include name="**/*Test.class" />
+        </fileset>
+      </batchtest>
+    </junit>
+    <au:assertPropertySet name="testcase.failed"/>
+  </target>
+
+  <target name="testFailurePropertyOnTestSuite">
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
+    <echo file="${input}/ATest.java"><![CDATA[
+package test;
+import junit.framework.Assert;
+import junit.framework.TestSuite;
+
+public class ATest extends TestSuite {
+    public ATest() {
+        super(test.ATest.class);
+    }
+    public void testFail() {
+        Assert.assertTrue(false);
+    }
+}
+]]>  </echo>
+    <javac srcdir="${input}" destdir="${output}">
+      <classpath refid="junit"/>
+    </javac>
+    <junit failureProperty="testsuite.failed" haltonfailure="false">
+      <classpath refid="junit"/>
+      <classpath location="${output}"/>
+      <batchtest>
+        <fileset dir="${output}">
+          <include name="**/*Test.class" />
+        </fileset>
+      </batchtest>
+    </junit>
+    <au:assertPropertySet name="testsuite.failed"/>
+  </target>
 </project>