[Junit-devel] CVS: junit/junit/textui TestRunner.java,1.22,1.23 ResultPrinter.java,1.6,1.7

[David S. <ds...@us...>]

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

Modified Files:
	TestRunner.java ResultPrinter.java 
Log Message:
Merged with branch, Kent will make final changes and launch.

Index: TestRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/textui/TestRunner.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- TestRunner.java	13 Nov 2004 00:33:19 -0000	1.22
+++ TestRunner.java	15 Feb 2006 22:55:37 -0000	1.23
@@ -4,11 +4,10 @@
 import java.io.PrintStream;
 
 import junit.framework.Test;
+import junit.framework.TestCase;
 import junit.framework.TestResult;
 import junit.framework.TestSuite;
 import junit.runner.BaseTestRunner;
-import junit.runner.StandardTestSuiteLoader;
-import junit.runner.TestSuiteLoader;
 import junit.runner.Version;
 
 /**
@@ -58,7 +57,7 @@
 	/**
 	 * Runs a suite extracted from a TestCase subclass.
 	 */
-	static public void run(Class testClass) {
+	static public void run(Class<? extends TestCase> testClass) {
 		run(new TestSuite(testClass));
 	}
 
@@ -86,20 +85,15 @@
 		aTestRunner.doRun(suite, true);
 	}
 
-	/**
-	 * Always use the StandardTestSuiteLoader. Overridden from
-	 * BaseTestRunner.
-	 */
-	public TestSuiteLoader getLoader() {
-		return new StandardTestSuiteLoader();
-	}
-
+	@Override
 	public void testFailed(int status, Test test, Throwable t) {
 	}
 	
+	@Override
 	public void testStarted(String testName) {
 	}
 	
+	@Override
 	public void testEnded(String testName) {
 	}
 
@@ -189,11 +183,12 @@
 	}
 
 	protected TestResult runSingleMethod(String testCase, String method, boolean wait) throws Exception {
-		Class testClass= loadSuiteClass(testCase);
+		Class<? extends TestCase> testClass= loadSuiteClass(testCase);
 		Test test= TestSuite.createTest(testClass, method);
 		return doRun(test, wait);
 	}
 
+	@Override
 	protected void runFailed(String message) {
 		System.err.println(message);
 		System.exit(FAILURE_EXIT);

Index: ResultPrinter.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/textui/ResultPrinter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ResultPrinter.java	23 Aug 2002 05:05:56 -0000	1.6
+++ ResultPrinter.java	15 Feb 2006 22:55:37 -0000	1.7
@@ -4,7 +4,6 @@
 import java.io.PrintStream;
 import java.text.NumberFormat;
 import java.util.Enumeration;
-
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestFailure;
@@ -51,14 +50,14 @@
 		printDefects(result.failures(), result.failureCount(), "failure");
 	}
 	
-	protected void printDefects(Enumeration booBoos, int count, String type) {
+	protected void printDefects(Enumeration<TestFailure> booBoos, int count, String type) {
 		if (count == 0) return;
 		if (count == 1)
 			getWriter().println("There was " + count + " " + type + ":");
 		else
 			getWriter().println("There were " + count + " " + type + "s:");
 		for (int i= 1; booBoos.hasMoreElements(); i++) {
-			printDefect((TestFailure) booBoos.nextElement(), i);
+			printDefect(booBoos.nextElement(), i);
 		}
 	}