From ce5785476b6fab84040bccba241275d92231210e Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 29 Jan 2001 16:04:37 +0000
Subject: [PATCH] Make <junit> work with JUnit 3.5 as well.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268534 13f79535-47bb-0310-9956-ffa450edef68
---
 .../taskdefs/optional/junit/JUnitTestRunner.java   | 11 ++++++++++-
 .../optional/junit/PlainJUnitResultFormatter.java  | 14 ++++++++++++--
 .../junit/SummaryJUnitResultFormatter.java         | 11 ++++++++++-
 .../optional/junit/XMLJUnitResultFormatter.java    | 12 +++++++++++-
 4 files changed, 43 insertions(+), 5 deletions(-)

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 b70cbef29..603afc5ba 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
@@ -237,7 +237,7 @@ public class JUnitTestRunner implements TestListener {
     public void endTest(Test test) {}
 
     /**
-     * Interface TestListener.
+     * Interface TestListener for JUnit &lt;= 3.4.
      *
      * <p>A Test failed.
      */
@@ -247,6 +247,15 @@ public class JUnitTestRunner implements TestListener {
         }
     }
 
+    /**
+     * Interface TestListener for JUnit &gt; 3.4.
+     *
+     * <p>A Test failed.
+     */
+    public void addFailure(Test test, AssertionFailedError t) {
+        addFailure(test, (Throwable) t);
+    }
+
     /**
      * Interface TestListener.
      *
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
index 4bb2db1d5..722369c08 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
@@ -59,13 +59,14 @@ import org.apache.tools.ant.BuildException;
 import java.io.*;
 import java.text.NumberFormat;
 
+import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestCase;
 
 /**
  * Prints plain text output of the test to a specified Writer.
  *
- * @author <a href="mailto:stefan.bodewig@megabit.net">Stefan Bodewig</a>
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
 
 public class PlainJUnitResultFormatter implements JUnitResultFormatter {
@@ -172,7 +173,7 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter {
     }
 
     /**
-     * Interface TestListener.
+     * Interface TestListener for JUnit &lt;= 3.4.
      *
      * <p>A Test failed.
      */
@@ -180,6 +181,15 @@ public class PlainJUnitResultFormatter implements JUnitResultFormatter {
         formatError("\tFAILED", test, t);
     }
 
+    /**
+     * Interface TestListener for JUnit &gt; 3.4.
+     *
+     * <p>A Test failed.
+     */
+    public void addFailure(Test test, AssertionFailedError t) {
+        addFailure(test, (Throwable) t);
+    }
+
     /**
      * Interface TestListener.
      *
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java
index 684428c7d..e01f28100 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java
@@ -57,6 +57,7 @@ package org.apache.tools.ant.taskdefs.optional.junit;
 import java.text.NumberFormat;
 import java.io.IOException;
 import java.io.OutputStream;
+import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 
 import org.apache.tools.ant.BuildException;
@@ -64,7 +65,7 @@ import org.apache.tools.ant.BuildException;
 /**
  * Prints short summary output of the test to Ant's logging system.
  *
- * @author <a href="mailto:stefan.bodewig@megabit.net">Stefan Bodewig</a>
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
  
 public class SummaryJUnitResultFormatter implements JUnitResultFormatter {
@@ -98,6 +99,14 @@ public class SummaryJUnitResultFormatter implements JUnitResultFormatter {
      * Empty
      */
     public void addFailure(Test test, Throwable t) {}
+    /**
+     * Interface TestListener for JUnit &gt; 3.4.
+     *
+     * <p>A Test failed.
+     */
+    public void addFailure(Test test, AssertionFailedError t) {
+        addFailure(test, (Throwable) t);
+    }
     /**
      * Empty
      */
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
index 0ddad9a18..8e5978ef6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
@@ -64,6 +64,7 @@ import org.w3c.dom.*;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.DOMElementWriter;
 
+import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestCase;
 
@@ -178,7 +179,7 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter {
     }
 
     /**
-     * Interface TestListener.
+     * Interface TestListener for JUnit &lt;= 3.4.
      *
      * <p>A Test failed.
      */
@@ -186,6 +187,15 @@ public class XMLJUnitResultFormatter implements JUnitResultFormatter {
         formatError("failure", test, t);
     }
 
+    /**
+     * Interface TestListener for JUnit &gt; 3.4.
+     *
+     * <p>A Test failed.
+     */
+    public void addFailure(Test test, AssertionFailedError t) {
+        addFailure(test, (Throwable) t);
+    }
+
     /**
      * Interface TestListener.
      *