sbailliez 01/12/09 05:38:19
Modified: src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTestRunner.java BatchTest.java JUnitTask.java
XMLJUnitResultFormatter.java
PlainJUnitResultFormatter.java JUnitTest.java
BaseTest.java
Log:
Patch from Scott Stirling <[EMAIL PROTECTED]> that allows
stack trace filtering for formatters. It will filter out
those unneeded frame from Ant and JUnit so the stack will
be much more readable.
nb: Looks like the JUnit task need serious refactoring since we have
been adding feature incrementally. It starts to be a real mess,
I can barely read my own code :-(
Revision Changes Path
1.14 +80 -5
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
Index: JUnitTestRunner.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JUnitTestRunner.java 2001/10/28 21:30:22 1.13
+++ JUnitTestRunner.java 2001/12/09 13:38:18 1.14
@@ -64,7 +64,11 @@
import junit.framework.TestSuite;
import junit.framework.AssertionFailedError;
import java.lang.reflect.Method;
+import java.io.BufferedReader;
import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.FileInputStream;
@@ -122,6 +126,24 @@
private TestResult res;
/**
+ * Do we filter junit.*.* stack frames out of failure and error
exceptions.
+ */
+ private static boolean filtertrace = true;
+
+ private final static String[] DEFAULT_TRACE_FILTERS = new String[] {
+ "junit.framework.TestCase",
+ "junit.framework.TestResult",
+ "junit.framework.TestSuite",
+ "junit.framework.Assert.", // don't filter AssertionFailure
+ "junit.swingui.TestRunner",
+ "junit.awtui.TestRunner",
+ "junit.textui.TestRunner",
+ "java.lang.reflect.Method.invoke(",
+ "org.apache.tools.ant."
+ };
+
+
+ /**
* Do we stop on errors.
*/
private boolean haltOnError = false;
@@ -161,16 +183,18 @@
* Constructor for fork=true or when the user hasn't specified a
* classpath.
*/
- public JUnitTestRunner(JUnitTest test, boolean haltOnError,
+ public JUnitTestRunner(JUnitTest test, boolean haltOnError, boolean
filtertrace,
boolean haltOnFailure) {
- this(test, haltOnError, haltOnFailure, null);
+ this(test, haltOnError, filtertrace, haltOnFailure, null);
}
/**
* Constructor to use when the user has specified a classpath.
*/
- public JUnitTestRunner(JUnitTest test, boolean haltOnError,
+ public JUnitTestRunner(JUnitTest test, boolean haltOnError, boolean
filtertrace,
boolean haltOnFailure, ClassLoader loader) {
+ //JUnitTestRunner.filtertrace = filtertrace;
+ this.filtertrace = filtertrace;
this.junitTest = test;
this.haltOnError = haltOnError;
this.haltOnFailure = haltOnFailure;
@@ -378,6 +402,7 @@
boolean exitAtEnd = true;
boolean haltError = false;
boolean haltFail = false;
+ boolean stackfilter = true;
Properties props = new Properties();
if (args.length == 0) {
@@ -390,6 +415,8 @@
haltError = Project.toBoolean(args[i].substring(12));
} else if (args[i].startsWith("haltOnFailure=")) {
haltFail = Project.toBoolean(args[i].substring(14));
+ } else if (args[i].startsWith("filtertrace=")) {
+ stackfilter = Project.toBoolean(args[i].substring(12));
} else if (args[i].startsWith("formatter=")) {
try {
createAndStoreFormatter(args[i].substring(10));
@@ -405,7 +432,7 @@
}
JUnitTest t = new JUnitTest(args[0]);
-
+
// Add/overlay system properties on the properties from the Ant
project
Hashtable p = System.getProperties();
for (Enumeration enum = p.keys(); enum.hasMoreElements(); ) {
@@ -414,7 +441,7 @@
}
t.setProperties(props);
- JUnitTestRunner runner = new JUnitTestRunner(t, haltError, haltFail);
+ JUnitTestRunner runner = new JUnitTestRunner(t, haltError,
stackfilter, haltFail);
transferFormatters(runner);
runner.run();
System.exit(runner.getRetCode());
@@ -443,5 +470,53 @@
}
fromCmdLine.addElement(fe.createFormatter());
}
+
+ /**
+ * Returns a filtered stack trace.
+ * This is ripped out of junit.runner.BaseTestRunner.
+ * Scott M. Stirling.
+ */
+ public static String getFilteredTrace(Throwable t) {
+ StringWriter stringWriter = new StringWriter();
+ PrintWriter writer = new PrintWriter(stringWriter);
+ t.printStackTrace(writer);
+ StringBuffer buffer = stringWriter.getBuffer();
+ String trace = buffer.toString();
+ return JUnitTestRunner.filterStack(trace);
+ }
+ /**
+ * Filters stack frames from internal JUnit and Ant classes
+ */
+ public static String filterStack(String stack) {
+ if (!filtertrace) {
+ return stack;
+ }
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ StringReader sr = new StringReader(stack);
+ BufferedReader br = new BufferedReader(sr);
+
+ String line;
+ try {
+ while ((line = br.readLine()) != null) {
+ if (!filterLine(line)) {
+ pw.println(line);
+ }
+ }
+ } catch (Exception IOException) {
+ return stack; // return the stack unfiltered
+ }
+ return sw.toString();
+ }
+
+ private static boolean filterLine(String line) {
+ for (int i = 0; i < DEFAULT_TRACE_FILTERS.length; i++) {
+ if (line.indexOf(DEFAULT_TRACE_FILTERS[i]) > 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
} // JUnitTestRunner
1.9 +1 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java
Index: BatchTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BatchTest.java 2001/10/28 21:30:22 1.8
+++ BatchTest.java 2001/12/09 13:38:18 1.9
@@ -199,6 +199,7 @@
test.setName(classname);
test.setHaltonerror(this.haltOnError);
test.setHaltonfailure(this.haltOnFail);
+ test.setFiltertrace(this.filtertrace);
test.setFork(this.fork);
test.setIf(this.ifProperty);
test.setUnless(this.unlessProperty);
1.26 +19 -3
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JUnitTask.java 2001/08/02 16:15:24 1.25
+++ JUnitTask.java 2001/12/09 13:38:18 1.26
@@ -155,7 +155,23 @@
private Integer timeout = null;
private boolean summary = false;
private String summaryValue = "";
+ private boolean filtertrace = true;
private JUnitTestRunner runner = null;
+
+ /**
+ * Tells this task whether to smartly filter the stack frames of JUnit
testcase
+ * errors and failures before reporting them. This property is applied
on all
+ * BatchTest (batchtest) and JUnitTest (test) however it can possibly be
+ * overridden by their own properties.
+ * @param value <tt>false</tt> if it should not filter, otherwise
<tt>true<tt>
+ */
+ public void setFiltertrace(boolean value) {
+ Enumeration enum = allTests();
+ while (enum.hasMoreElements()) {
+ BaseTest test = (BaseTest) enum.nextElement();
+ test.setFiltertrace(value);
+ }
+ }
/**
* Tells this task to halt when there is an error in a test.
@@ -361,7 +377,7 @@
/**
* Adds the jars or directories containing Ant, this task and
* JUnit to the classpath - this should make the forked JVM work
- * without having to specify the directly.
+ * without having to specify them directly.
*/
public void init() {
addClasspathEntry("/junit/framework/TestCase.class");
@@ -447,6 +463,7 @@
cmd.setClassname("org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner");
cmd.createArgument().setValue(test.getName());
+ cmd.createArgument().setValue("filtertrace=" +
test.getFiltertrace());
cmd.createArgument().setValue("haltOnError=" +
test.getHaltonerror());
cmd.createArgument().setValue("haltOnFailure=" +
test.getHaltonfailure());
if (summary) {
@@ -555,8 +572,7 @@
// will cause trouble in JDK 1.1 if omitted
cl.addSystemPackageRoot("org.apache.tools.ant");
}
- runner = new JUnitTestRunner(test, test.getHaltonerror(),
test.getHaltonfailure(), cl);
-
+ runner = new JUnitTestRunner(test, test.getHaltonerror(),
test.getFiltertrace(), test.getHaltonfailure(), cl);
if (summary) {
log("Running " + test.getName(), Project.MSG_INFO);
1.16 +2 -3
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
Index: XMLJUnitResultFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XMLJUnitResultFormatter.java 2001/11/15 08:47:49 1.15
+++ XMLJUnitResultFormatter.java 2001/12/09 13:38:18 1.16
@@ -261,9 +261,8 @@
}
nested.setAttribute(ATTR_TYPE, t.getClass().getName());
- StringWriter swr = new StringWriter();
- t.printStackTrace(new PrintWriter(swr, true));
- Text trace = doc.createTextNode(swr.toString());
+ String strace = JUnitTestRunner.getFilteredTrace(t);
+ Text trace = doc.createTextNode(strace);
nested.appendChild(trace);
}
1.11 +2 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
Index: PlainJUnitResultFormatter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PlainJUnitResultFormatter.java 2001/11/15 08:47:49 1.10
+++ PlainJUnitResultFormatter.java 2001/12/09 13:38:18 1.11
@@ -248,7 +248,8 @@
wri.println(type);
wri.println(t.getMessage());
- t.printStackTrace(wri);
+ String strace = JUnitTestRunner.getFilteredTrace(t);
+ wri.print(strace);
wri.println("");
}
}
1.9 +3 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
Index: JUnitTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JUnitTest.java 2001/10/28 21:30:22 1.8
+++ JUnitTest.java 2001/12/09 13:38:18 1.9
@@ -100,10 +100,11 @@
this.name = name;
}
- public JUnitTest(String name, boolean haltOnError, boolean
haltOnFailure) {
+ public JUnitTest(String name, boolean haltOnError, boolean
haltOnFailure, boolean filtertrace) {
this.name = name;
this.haltOnError = haltOnError;
- this.haltOnFail = haltOnFail;
+ this.haltOnFail = haltOnFailure;
+ this.filtertrace = filtertrace;
}
/**
1.5 +15 -6
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java
Index: BaseTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseTest.java 2001/11/27 18:04:53 1.4
+++ BaseTest.java 2001/12/09 13:38:18 1.5
@@ -60,12 +60,13 @@
/**
* Baseclass for BatchTest and JUnitTest.
*
- * @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stephane Bailliez</a>
*/
public abstract class BaseTest {
protected boolean haltOnError = false;
protected boolean haltOnFail = false;
+ protected boolean filtertrace = true;
protected boolean fork = false;
protected String ifProperty = null;
protected String unlessProperty = null;
@@ -76,6 +77,14 @@
protected String failureProperty;
protected String errorProperty;
+ public void setFiltertrace(boolean value) {
+ filtertrace = value;
+ }
+
+ public boolean getFiltertrace() {
+ return filtertrace;
+ }
+
public void setFork(boolean value) {
fork = value;
}
@@ -116,12 +125,12 @@
* Sets the destination directory.
*/
public void setTodir(File destDir) {
- this.destDir = destDir;
+ this.destDir = destDir;
}
/**
* @return the destination directory as an absolute path if it exists
- * otherwise return <tt>null</tt>
+ * otherwise return <tt>null</tt>
*/
public String getTodir(){
if (destDir != null){
@@ -133,15 +142,15 @@
public java.lang.String getFailureProperty() {
return failureProperty;
}
-
+
public void setFailureProperty(String failureProperty) {
this.failureProperty = failureProperty;
}
-
+
public java.lang.String getErrorProperty() {
return errorProperty;
}
-
+
public void setErrorProperty(String errorProperty) {
this.errorProperty = errorProperty;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
