diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterStackFormatterTest.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterStackFormatterTest.java
index bdd39c357..686b6f86a 100644
--- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterStackFormatterTest.java
+++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterStackFormatterTest.java
@@ -65,15 +65,15 @@ import junit.framework.TestCase;
*
* @author Stephane Bailliez
*/
-public class FilterStackFormatterTest extends TestCase {
+public class FilterStackFormatterTest extends TestCase
+ implements Formatter {
public FilterStackFormatterTest(String s) {
super(s);
}
- protected String trace = "";
- protected String expected = "";
- protected NullFormatter wrapped;
+ protected String trace;
+ protected String expected;
protected void setUp() {
StringWriter sw = new StringWriter();
@@ -105,54 +105,52 @@ public class FilterStackFormatterTest extends TestCase {
pw.println("\tat org.apache.test.C5.m1(C5.java:125)");
pw.println("\tat org.apache.test.C6.m1(C6.java:125)");
expected = sw.toString();
-
- wrapped = new NullFormatter();
}
public void testFiltering() {
- FilterStackFormatter wrapper = new FilterStackFormatter(wrapped);
+ FilterStackFormatter wrapper = new FilterStackFormatter(this);
wrapper.onTestFailed(0, "", trace);
- assertEquals(expected, wrapped.trace);
+ assertEquals(expected, filteredTrace);
}
- public class NullFormatter implements Formatter {
- protected String trace;
- public void setOutput(OutputStream out) {
- }
+// --- formatter implementation
+ protected String filteredTrace;
- public void onTestStarted(String testname) {
- }
+ public void setOutput(OutputStream out) {
+ }
- public void setSystemOutput(String out) {
- }
+ public void onTestStarted(String testname) {
+ }
- public void onTestEnded(String testname) {
- }
+ public void setSystemOutput(String out) {
+ }
- public void setSystemError(String err) {
- }
+ public void onTestEnded(String testname) {
+ }
- public void onTestFailed(int status, String testname, String trace) {
- this.trace = trace;
- }
+ public void setSystemError(String err) {
+ }
- public void onTestStdOutLine(String testname, String line) {
- }
+ public void onTestFailed(int status, String testname, String trace) {
+ filteredTrace = trace;
+ }
- public void onTestStdErrLine(String testname, String line) {
- }
+ public void onTestStdOutLine(String testname, String line) {
+ }
+
+ public void onTestStdErrLine(String testname, String line) {
+ }
- public void onTestRunSystemProperties(Properties props) {
- }
+ public void onTestRunSystemProperties(Properties props) {
+ }
- public void onTestRunStarted(int testcount) {
- }
+ public void onTestRunStarted(int testcount) {
+ }
- public void onTestRunEnded(long elapsedtime) {
- }
+ public void onTestRunEnded(long elapsedtime) {
+ }
- public void onTestRunStopped(long elapsedtime) {
- }
+ public void onTestRunStopped(long elapsedtime) {
}
}
diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FormatterRecorder.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FormatterRecorder.java
new file mode 100644
index 000000000..85533d2bb
--- /dev/null
+++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FormatterRecorder.java
@@ -0,0 +1,79 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ */
+package org.apache.tools.ant.taskdefs.optional.junit.formatter;
+
+import java.io.OutputStream;
+
+import org.apache.tools.ant.taskdefs.optional.junit.TestRunRecorder;
+
+/**
+ * A formatter recorder that serves the same purpose as
+ * a TestRunRecorder
+ *
+ *
+ * @see TestRunRecorder
+ * @author Stephane Bailliez
+ */
+public class FormatterRecorder extends TestRunRecorder
+ implements Formatter {
+
+ public void setOutput(OutputStream out) {
+ }
+
+ public void setSystemOutput(String out) {
+ }
+
+ public void setSystemError(String err) {
+ }
+}