From 8be0b6387f06b837015270282f2e5e842e759e7d Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 22 Aug 2008 13:49:57 +0000
Subject: [PATCH] Make sure JunitTestRunners return code is correct when
 running under JUnit4.  PR 43892.  Submitted by Brian Curnow.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@688083 13f79535-47bb-0310-9956-ffa450edef68
---
 CONTRIBUTORS                                                 | 1 +
 WHATSNEW                                                     | 3 +++
 contributors.xml                                             | 4 ++++
 .../tools/ant/taskdefs/optional/junit/JUnitTestRunner.java   | 5 +++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9a0c7aec8..b6ade3e2e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -30,6 +30,7 @@ Benoit Moussaud
 Bernd Dutkowski
 Brad Clark
 Brant Langer Gurganus
+Brian Curnow
 Brian Deitte
 Brian Felder
 Bruce Atherton
diff --git a/WHATSNEW b/WHATSNEW
index f61bd14d8..f6b3d8b7a 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -158,6 +158,9 @@ Fixed bugs:
    filter tokens
    Bugzilla Report 44226.
    
+ * failures were treated as errors in forked JUnit tests when JUnit 4
+   was used.
+   Bugzilla Report 43892.
 
 Other changes:
 --------------
diff --git a/contributors.xml b/contributors.xml
index 33d7dd385..03e1bda0a 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -145,6 +145,10 @@
     <middle>Langer</middle>
     <last>Gurganus</last>
   </name>
+  <name>
+    <first>Brian</first>
+    <last>Curnow</last>
+  </name>
   <name>
     <first>Brian</first>
     <last>Deitte</last>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
index d59bb5292..fa145b8e3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
@@ -451,9 +451,10 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
         }
         fireEndTestSuite();
 
-        if (retCode != SUCCESS || res.errorCount() != 0) {
+        // junitTest has the correct counts for JUnit4, while res doesn't
+        if (retCode != SUCCESS || junitTest.errorCount() != 0) {
             retCode = ERRORS;
-        } else if (res.failureCount() != 0) {
+        } else if (junitTest.failureCount() != 0) {
             retCode = FAILURES;
         }
     }