[Junit-devel] CVS: junit/org/junit/internal/runners TestClassMethodsRunner.java, 1.3.2.6, 1.3.2.7 JavaTestInterpreter.java, 1.1.2.5, 1.1.2.6 MethodValidator.java, 1.3.2.4, 1.3.2.5 TestClassRunner.java, 1.2.2.5, 1.2.2.6 TestEnvironment.java, 1.1.2.3, NONE

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

Update of /cvsroot/junit/junit/org/junit/internal/runners
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24081/org/junit/internal/runners

Modified Files:
      Tag: saff_r41_runner_refactoring
	TestClassMethodsRunner.java JavaTestInterpreter.java 
	MethodValidator.java TestClassRunner.java 
Removed Files:
      Tag: saff_r41_runner_refactoring
	TestEnvironment.java 
Log Message:
About to work on trunk with Kent

Index: TestClassMethodsRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/TestClassMethodsRunner.java,v
retrieving revision 1.3.2.6
retrieving revision 1.3.2.7
diff -u -d -r1.3.2.6 -r1.3.2.7
--- TestClassMethodsRunner.java	18 Oct 2006 20:36:08 -0000	1.3.2.6
+++ TestClassMethodsRunner.java	16 Nov 2006 17:52:10 -0000	1.3.2.7
@@ -15,26 +15,23 @@
 		Sortable {
 	private final JavaMethodList fTestMethods;
 
-	private final JavaTestInterpreter fInterpreter;
-
 	// This assumes that some containing runner will perform validation of the
 	// test methods
 	public TestClassMethodsRunner(JavaClass klass,
 			JavaTestInterpreter javaTestInterpreter) {
 		fTestMethods= klass.getTestMethods(javaTestInterpreter);
-		fInterpreter= javaTestInterpreter;
 	}
 
 	// TODO: rename method to element?
 
 	@Override
 	public void run(RunNotifier notifier) {
-		fTestMethods.run(new TestEnvironment(fInterpreter, notifier));
+		fTestMethods.run(notifier);
 	}
 
 	@Override
 	public Description getDescription() {
-		return fTestMethods.description();
+		return fTestMethods.getDescription();
 	}
 
 	public void filter(Filter filter) throws NoTestsRemainException {
@@ -42,6 +39,6 @@
 	}
 
 	public void sort(final Sorter sorter) {
-		fTestMethods.filter(sorter);
+		fTestMethods.sort(sorter);
 	}
 }
\ No newline at end of file

Index: JavaTestInterpreter.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/Attic/JavaTestInterpreter.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- JavaTestInterpreter.java	18 Oct 2006 20:36:08 -0000	1.1.2.5
+++ JavaTestInterpreter.java	16 Nov 2006 17:52:10 -0000	1.1.2.6
@@ -28,10 +28,11 @@
 	}
 
 	public Runner buildRunner(Class<?> klass) throws InitializationError {
-		MethodValidator methodValidator= new MethodValidator(klass);
+		JavaClass built= buildClass(klass);
+		MethodValidator methodValidator= new MethodValidator(built);
 		validate(methodValidator);
 		methodValidator.assertValid();
-		return new TestClassMethodsRunner(new JavaClass(klass), this);
+		return new TestClassMethodsRunner(built, this);
 	}
 
 	protected void validate(MethodValidator methodValidator) {
@@ -41,4 +42,8 @@
 	public JavaMethod interpretJavaMethod(final JavaClass klass, Method method) {
 		return new JavaMethod(klass, method);
 	}
+
+	public JavaClass buildClass(Class<?> superclass) {
+		return new JavaClass(superclass, this);
+	}
 }

Index: MethodValidator.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/MethodValidator.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -d -r1.3.2.4 -r1.3.2.5
--- MethodValidator.java	18 Oct 2006 20:36:08 -0000	1.3.2.4
+++ MethodValidator.java	16 Nov 2006 17:52:10 -0000	1.3.2.5
@@ -18,8 +18,8 @@
 
 	private final JavaClass fJavaClass;
 
-	public MethodValidator(Class<?> testClass) {
-		fJavaClass= new JavaClass(testClass);
+	public MethodValidator(JavaClass testClass) {
+		fJavaClass= testClass;
 	}
 
 	public void validateInstanceMethods() {

Index: TestClassRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/TestClassRunner.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -d -r1.2.2.5 -r1.2.2.6
--- TestClassRunner.java	18 Oct 2006 20:36:08 -0000	1.2.2.5
+++ TestClassRunner.java	16 Nov 2006 17:52:10 -0000	1.2.2.6
@@ -1,6 +1,5 @@
 package org.junit.internal.runners;
 
-import org.junit.internal.javamodel.JavaClass;
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
@@ -15,6 +14,8 @@
 
 	private final Class<?> fTestClass;
 
+	private final JavaTestInterpreter fInterpreter;
+
 	public TestClassRunner(Class<?> klass) throws InitializationError {
 		this(klass, new JavaTestInterpreter());
 	}
@@ -22,6 +23,7 @@
 	public TestClassRunner(Class<?> klass, JavaTestInterpreter interpreter)
 			throws InitializationError {
 		fTestClass= klass;
+		fInterpreter= interpreter;
 		fEnclosedRunner= interpreter.buildRunner(klass);
 	}
 
@@ -33,7 +35,7 @@
 			}
 		};
 
-		new JavaClass(getTestClass()).runWithBeforeAndAfter(protectThis, null,
+		fInterpreter.buildClass(getTestClass()).runWithBeforeAndAfter(protectThis, null,
 				notifier);
 	}
 

--- TestEnvironment.java DELETED ---