From d121ce11a14e51da92d7d5b17161c29abfbfe37c Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sat, 6 Aug 2011 17:11:53 +0000 Subject: [PATCH] never filter out the first line of the exception stack trace in junit so the failure message is preserved git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1154551 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/junit/JUnitTestRunner.java | 4 +++- .../antunit/taskdefs/optional/junit/xmlformatter-test.xml | 2 +- 2 files changed, 4 insertions(+), 2 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 86f80dc4e..ce48fa432 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 @@ -1018,11 +1018,13 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR String line; try { + boolean firstLine = true; while ((line = br.readLine()) != null) { - if (!filterLine(line)) { + if (firstLine || !filterLine(line)) { pw.write(line); pw.newLine(); } + firstLine = false; } } catch (Exception e) { return stack; // return the stack unfiltered diff --git a/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml b/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml index bc9e4df1d..4aa6e4dad 100644 --- a/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml +++ b/src/tests/antunit/taskdefs/optional/junit/xmlformatter-test.xml @@ -87,7 +87,7 @@ public class A extends TestCase { value="AssertionFailedError: &&"/> - +