1 files changed, 17 insertions, 21 deletions

diff --git a/src/junit/textui/TestRunner.java b/src/junit/textui/TestRunner.java
index 01b9d6d..046448e 100644
--- a/src/junit/textui/TestRunner.java
+++ b/src/junit/textui/TestRunner.java
@@ -4,11 +4,10 @@ package junit.textui;
 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;
 
 /**
@@ -16,16 +15,17 @@ import junit.runner.Version;
  * <pre>
  * java junit.textui.TestRunner [-wait] TestCaseClass
  * </pre>
- * TestRunner expects the name of a TestCase class as argument.
+ * 
+ * <p>TestRunner expects the name of a TestCase class as argument.
  * If this class defines a static <code>suite</code> method it 
  * will be invoked and the returned test is run. Otherwise all 
- * the methods starting with "test" having no arguments are run.
- * <p>
- * When the wait command line argument is given TestRunner
- * waits until the users types RETURN.
- * <p>
- * TestRunner prints a trace as the tests are executed followed by a
- * summary at the end. 
+ * the methods starting with "test" having no arguments are run.</p>
+ * 
+ * <p> When the wait command line argument is given TestRunner
+ * waits until the users types RETURN.</p>
+ * 
+ * <p>TestRunner prints a trace as the tests are executed followed by a
+ * summary at the end.</p>
  */
 public class TestRunner extends BaseTestRunner {
 	private ResultPrinter fPrinter;
@@ -58,7 +58,7 @@ public class TestRunner extends BaseTestRunner {
 	/**
 	 * 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));
 	}
 
@@ -68,7 +68,7 @@ public class TestRunner extends BaseTestRunner {
 	 * from your program.
 	 * <pre>
 	 * public static void main (String[] args) {
-	 *     test.textui.TestRunner.run(suite());
+	 *    test.textui.TestRunner.run(suite());
 	 * }
 	 * </pre>
 	 */
@@ -86,20 +86,15 @@ public class TestRunner extends BaseTestRunner {
 		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 +184,12 @@ public class TestRunner extends BaseTestRunner {
 	}
 
 	protected TestResult runSingleMethod(String testCase, String method, boolean wait) throws Exception {
-		Class testClass= loadSuiteClass(testCase);
+		Class<? extends TestCase> testClass= loadSuiteClass(testCase).asSubclass(TestCase.class);
 		Test test= TestSuite.createTest(testClass, method);
 		return doRun(test, wait);
 	}
 
+	@Override
 	protected void runFailed(String message) {
 		System.err.println(message);
 		System.exit(FAILURE_EXIT);