[Junit-devel] CVS: junit/junit/tests/runner StackFilterTest.java,1.4,1.5 BaseTestRunnerTest.java,1.5

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/junit/junit/junit/tests/runner
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13390/junit/tests/runner

Modified Files:
	StackFilterTest.java BaseTestRunnerTest.java 
	TextRunnerTest.java AllTests.java 
	TextRunnerSingleMethodTest.java TextFeedbackTest.java 
Removed Files:
	ClassLoaderTest.java SorterTest.java 
	SimpleTestCollectorTest.java TestCaseClassLoaderTest.java 
	LoadedFromJar.java 
Log Message:
Merged with branch, Kent will make final changes and launch.

Index: StackFilterTest.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/tests/runner/StackFilterTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5

--- StackFilterTest.java	9 Sep 2004 21:53:55 -0000	1.4
+++ StackFilterTest.java	15 Feb 2006 22:55:28 -0000	1.5
@@ -10,6 +10,7 @@
 	String fFiltered;
 	String fUnfiltered;
 	
+	@Override
 	protected void setUp() {
 		StringWriter swin= new StringWriter();
 		PrintWriter pwin= new PrintWriter(swin);

Index: BaseTestRunnerTest.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/tests/runner/BaseTestRunnerTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- BaseTestRunnerTest.java	3 Sep 2004 16:27:28 -0000	1.5
+++ BaseTestRunnerTest.java	15 Feb 2006 22:55:28 -0000	1.6
@@ -8,15 +8,19 @@
 public class BaseTestRunnerTest extends TestCase {
 	
 	public static class MockRunner extends BaseTestRunner {
+		@Override
 		protected void runFailed(String message) {
 		}
 
+		@Override
 		public void testEnded(String testName) {
 		}
 
+		@Override
 		public void testFailed(int status, Test test, Throwable t) {
 		}
 
+		@Override
 		public void testStarted(String testName) {
 		}
 	}

Index: TextRunnerTest.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/tests/runner/TextRunnerTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- TextRunnerTest.java	23 Oct 2004 06:47:22 -0000	1.6
+++ TextRunnerTest.java	15 Feb 2006 22:55:28 -0000	1.7
@@ -44,6 +44,7 @@
 		PrintStream oldOut= System.out;
 		System.setOut(new PrintStream (
 			new OutputStream() {
+				@Override
 				public void write(int arg0) throws IOException {
 				}
 			}

Index: AllTests.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/tests/runner/AllTests.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- AllTests.java	17 Nov 2004 22:46:47 -0000	1.6
+++ AllTests.java	15 Feb 2006 22:55:28 -0000	1.7
@@ -2,7 +2,6 @@
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import junit.runner.BaseTestRunner;
 
 /**
  * TestSuite that runs all the sample tests
@@ -17,16 +16,10 @@
 	public static Test suite() { // Collect tests manually because we have to test class collection code
 		TestSuite suite= new TestSuite("Framework Tests");
 		suite.addTestSuite(StackFilterTest.class);
-		suite.addTestSuite(SorterTest.class);
-		suite.addTestSuite(SimpleTestCollectorTest.class);
 		suite.addTestSuite(BaseTestRunnerTest.class);
 		suite.addTestSuite(TextFeedbackTest.class);
-		//suite.addTestSuite(TextRunnerSingleMethodTest.class);
-		if (!BaseTestRunner.inVAJava()) {
-			suite.addTestSuite(TextRunnerTest.class);
-			if (!isJDK11())
-				suite.addTest(new TestSuite(TestCaseClassLoaderTest.class));
-		}
+		suite.addTestSuite(TextRunnerSingleMethodTest.class);
+		suite.addTestSuite(TextRunnerTest.class);
 		return suite;
 	}
 	

Index: TextRunnerSingleMethodTest.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/tests/runner/TextRunnerSingleMethodTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TextRunnerSingleMethodTest.java	17 Nov 2004 22:46:22 -0000	1.3
+++ TextRunnerSingleMethodTest.java	15 Feb 2006 22:55:28 -0000	1.4
@@ -1,54 +1,19 @@
 package junit.tests.runner;
 
+import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
-import java.util.Enumeration;
-import junit.framework.*;
-import junit.textui.*;
+
+import junit.framework.TestCase;
+import junit.textui.ResultPrinter;
+import junit.textui.TestRunner;
 
 /**
  *  Test invoking a single test method of a TestCase.
  */
 public class TextRunnerSingleMethodTest extends TestCase {
-	private final class NullResultPrinter extends ResultPrinter {
-		private NullResultPrinter(PrintStream writer) {
-			super(writer);
-		}
-		public void addError(Test test, Throwable t) {
-		}
-		public void addFailure(Test test, AssertionFailedError t) {
-		}
-		protected String elapsedTimeAsString(long runTime) {
-			return null;
-		}
-		public void endTest(Test test) {
-		}
-		public PrintStream getWriter() {
-			return null;
-		}
-		synchronized void print(TestResult result, long runTime) {
-		}
-		public void printDefect(TestFailure failure, int count) {
-		}
-		protected void printDefectHeader(TestFailure failure, int count) {
-		}
-		protected void printDefects(Enumeration failure, int count, String type) {
-		}
-		protected void printDefectTrace(TestFailure failure) {
-		}
-		protected void printErrors(TestResult result) {
-		}
-		protected void printFailures(TestResult result) {
-		}
-		protected void printFooter(TestResult result) {
-		}
-		protected void printHeader(long runTime) {
-		}
-		void printWaitPrompt() {
-		}
-		public void startTest(Test test) {
-		}
-	}
-
+	
+	static boolean fgWasInvoked;
+	
 	public static class InvocationTest extends TestCase {
 
 		public void testWasInvoked() {
@@ -59,14 +24,14 @@
 			fail("Shouldn't get here.");
 		}
 	}
-	static boolean fgWasInvoked= false;
-
+	
 	public void testSingle() throws Exception {
-		TestRunner t= new TestRunner(new NullResultPrinter(null));
+		TestRunner t= new TestRunner();
+		t.setPrinter(new ResultPrinter(new PrintStream(new ByteArrayOutputStream())));
 		String[] args= {
 				"-m", "junit.tests.runner.TextRunnerSingleMethodTest$InvocationTest.testWasInvoked"
 		};
-		assertFalse(fgWasInvoked);
+		fgWasInvoked= false;
 		t.start(args);
 		assertTrue(fgWasInvoked);
 	}

Index: TextFeedbackTest.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/tests/runner/TextFeedbackTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- TextFeedbackTest.java	23 Oct 2004 05:28:40 -0000	1.10
+++ TextFeedbackTest.java	15 Feb 2006 22:55:28 -0000	1.11
@@ -23,6 +23,7 @@
 		
 		/* Spoof printing time so the tests are deterministic
 		 */
+		@Override
 		protected String elapsedTimeAsString(long runTime) {
 			return "0";
 		}
@@ -32,6 +33,7 @@
 		TestRunner.run(TextFeedbackTest.class);
 	}
 	
+	@Override
 	public void setUp() {
 		output= new ByteArrayOutputStream();
 		runner= new TestRunner(new TestResultPrinter(new PrintStream(output)));
@@ -47,7 +49,8 @@
 	public void testOneTest() {
 		String expected= expected(new String[]{".", "Time: 0", "", "OK (1 test)", ""});
 		TestSuite suite = new TestSuite();
-		suite.addTest(new TestCase() { public void runTest() {}});
+		suite.addTest(new TestCase() { @Override
+		public void runTest() {}});
 		runner.doRun(suite);
 		assertEquals(expected, output.toString());
 	}
@@ -55,8 +58,10 @@
 	public void testTwoTests() {
 		String expected= expected(new String[]{"..", "Time: 0", "", "OK (2 tests)", ""});
 		TestSuite suite = new TestSuite();
-		suite.addTest(new TestCase() { public void runTest() {}});
-		suite.addTest(new TestCase() { public void runTest() {}});
+		suite.addTest(new TestCase() { @Override
+		public void runTest() {}});
+		suite.addTest(new TestCase() { @Override
+		public void runTest() {}});
 		runner.doRun(suite);
 		assertEquals(expected, output.toString());
 	}
@@ -64,13 +69,15 @@
 	public void testFailure() {
 		String expected= expected(new String[]{".F", "Time: 0", "Failures here", "", "FAILURES!!!", "Tests run: 1,  Failures: 1,  Errors: 0", ""});
 		ResultPrinter printer= new TestResultPrinter(new PrintStream(output)) {
+			@Override
 			public void printFailures(TestResult result) {
 				getWriter().println("Failures here");
 			}
 		};
 		runner.setPrinter(printer);
 		TestSuite suite = new TestSuite();
-		suite.addTest(new TestCase() { public void runTest() {throw new AssertionFailedError();}});
+		suite.addTest(new TestCase() { @Override
+		public void runTest() {throw new AssertionFailedError();}});
 		runner.doRun(suite);
 		assertEquals(expected, output.toString());
 	}
@@ -78,13 +85,15 @@
 	public void testError() {
 		String expected= expected(new String[]{".E", "Time: 0", "Errors here", "", "FAILURES!!!", "Tests run: 1,  Failures: 0,  Errors: 1", ""});
 		ResultPrinter printer= new TestResultPrinter(new PrintStream(output)) {
+			@Override
 			public void printErrors(TestResult result) {
 				getWriter().println("Errors here");
 			}
 		};
 		runner.setPrinter(printer);
 		TestSuite suite = new TestSuite();
-		suite.addTest(new TestCase() { public void runTest() throws Exception {throw new Exception();}});
+		suite.addTest(new TestCase() { @Override
+		public void runTest() throws Exception {throw new Exception();}});
 		runner.doRun(suite);
 		assertEquals(expected, output.toString());
 	}

--- ClassLoaderTest.java DELETED ---

--- SorterTest.java DELETED ---

--- SimpleTestCollectorTest.java DELETED ---

--- TestCaseClassLoaderTest.java DELETED ---

--- LoadedFromJar.java DELETED ---



