diff -ru /tmp/apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java --- /tmp/apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java 2005-06-02 14:20:04.000000000 +0100 +++ ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java 2005-07-26 12:36:55.409695112 +0100 @@ -19,9 +19,12 @@ import java.io.IOException; import java.io.OutputStream; +import java.io.PrintWriter; import java.text.NumberFormat; + import junit.framework.AssertionFailedError; import junit.framework.Test; + import org.apache.tools.ant.BuildException; /** @@ -64,10 +67,29 @@ */ public void endTest(Test test) { } + + /** + * Formats the test failure for logging. Used by addFailure and addError + */ + private void formatError(String type, Test test, Throwable throwable) + { + PrintWriter pw = new PrintWriter(out); + pw.print(type); + pw.print(": "); + pw.print(test.getClass().getName()); + pw.print(" "); + pw.print(JUnitVersionHelper.getTestCaseName(test)); + pw.print(": "); + pw.print(throwable.toString()); + pw.println(); + pw.close(); + } + /** * Empty */ public void addFailure(Test test, Throwable t) { + formatError("FAILED", test, t); } /** * Interface TestListener for JUnit > 3.4. @@ -81,6 +103,7 @@ * Empty */ public void addError(Test test, Throwable t) { + formatError("ERROR", test, t); } public void setOutput(OutputStream out) {