[Junit-devel] CVS: junit/junit/runner BaseTestRunner.java,1.18,1.19 Version.java,1.12,1.13 FailureDetailView.java,1.2,NONE ReloadingTestSuiteLoader.java,1.3,NONE TestSuiteLoader.java,1.1.1.1,NONE LoadingTestCollector.java,1.4,NONE ClassPathTestCollector.java,1.4,NONE SimpleTestCollector.java,1.1,NONE StandardTestSuiteLoader.java,1.1.1.1,NONE TestCaseClassLoader.java,1.6,NONE TestCollector.java,1.4,NONE Sorter.java,1.4,NONE

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

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

Modified Files:
	BaseTestRunner.java Version.java 
Removed Files:
	FailureDetailView.java ReloadingTestSuiteLoader.java 
	TestSuiteLoader.java LoadingTestCollector.java 
	ClassPathTestCollector.java SimpleTestCollector.java 
	StandardTestSuiteLoader.java TestCaseClassLoader.java 
	TestCollector.java Sorter.java 
Log Message:
Merged with branch, Kent will make final changes and launch.

Index: BaseTestRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/runner/BaseTestRunner.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- BaseTestRunner.java	24 Oct 2004 07:37:06 -0000	1.18
+++ BaseTestRunner.java	15 Feb 2006 22:55:29 -0000	1.19
@@ -17,6 +17,7 @@
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
+import junit.framework.TestCase;
 import junit.framework.TestListener;
 import junit.framework.TestSuite;
 
@@ -56,8 +57,7 @@
 	public static void savePreferences() throws IOException {
 		FileOutputStream fos= new FileOutputStream(getPreferencesFile());
 		try {
-			// calling of the deprecated save method to enable compiling under 1.1.7
-			getPreferences().save(fos, "");
+			getPreferences().store(fos, "");
 		} finally {
 			fos.close();
 		}
@@ -96,7 +96,7 @@
 			clearStatus();
 			return null;
 		}
-		Class testClass= null;
+		Class<? extends TestCase> testClass= null;
 		try {
 			testClass= loadSuiteClass(suiteClassName);
 		} catch (ClassNotFoundException e) {
@@ -204,8 +204,10 @@
 	/**
 	 * Returns the loaded Class for a suite name.
 	 */
-	protected Class loadSuiteClass(String suiteClassName) throws ClassNotFoundException {
-		return getLoader().load(suiteClassName);
+	protected Class<? extends TestCase> loadSuiteClass(String suiteClassName) throws ClassNotFoundException {
+		@SuppressWarnings("unchecked") 
+		Class<? extends TestCase> testClass = (Class<? extends TestCase>) Class.forName(suiteClassName);
+		return testClass;
 	}
 
 	/**
@@ -214,17 +216,8 @@
 	protected void clearStatus() { // Belongs in the GUI TestRunner class
 	}
 
-	/**
-	 * Returns the loader to be used.
-	 */
-	public TestSuiteLoader getLoader() {
-		if (useReloadingTestSuiteLoader())
-			return new ReloadingTestSuiteLoader();
-		return new StandardTestSuiteLoader();
-	}
-
 	protected boolean useReloadingTestSuiteLoader() {
-		return getPreference("loading").equals("true") && !inVAJava() && fLoading;
+		return getPreference("loading").equals("true") && fLoading;
 	}
 
 	private static File getPreferencesFile() {
@@ -263,21 +256,6 @@
  		return intValue;
  	}
 
- 	public static boolean inVAJava() {
-		try {
-			Class.forName("com.ibm.uvm.tools.DebugSupport");
-		}
-		catch (Exception e) {
-			return false;
-		}
-		return true;
-	}
-
-	public static boolean inMac() {
-		return System.getProperty("mrj.version") != null;
-	}
-
-
 	/**
 	 * Returns a filtered stack trace
 	 */

Index: Version.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/runner/Version.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Version.java	24 Oct 2004 07:45:54 -0000	1.12
+++ Version.java	15 Feb 2006 22:55:29 -0000	1.13
@@ -9,7 +9,8 @@
 	}
 
 	public static String id() {
-		return "@version@";
+		// TODO: auto-replace this
+		return "4.0";
 	}
 	
 	public static void main(String[] args) {

--- FailureDetailView.java DELETED ---

--- ReloadingTestSuiteLoader.java DELETED ---

--- TestSuiteLoader.java DELETED ---

--- LoadingTestCollector.java DELETED ---

--- ClassPathTestCollector.java DELETED ---

--- SimpleTestCollector.java DELETED ---

--- StandardTestSuiteLoader.java DELETED ---

--- TestCaseClassLoader.java DELETED ---

--- TestCollector.java DELETED ---

--- Sorter.java DELETED ---