[Junit-devel] CVS: junit/org/junit/internal/runners TestClassMethodsRunner.java, 1.3.2.5, 1.3.2.6 TestEnvironment.java, 1.1.2.2, 1.1.2.3 JavaTestInterpreter.java, 1.1.2.4, 1.1.2.5 MethodValidator.java, 1.3.2.3, 1.3.2.4 TestClassRunner.java, 1.2.2.4, 1.2.2.5 JavaMethod.java, 1.1.2.5, NONE JavaMethodList.java, 1.1.2.2, NONE JavaModelElement.java, 1.1.2.3, NONE JavaClass.java, 1.1.2.5, NONE

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

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

Modified Files:
      Tag: saff_r41_runner_refactoring
	TestClassMethodsRunner.java TestEnvironment.java 
	JavaTestInterpreter.java MethodValidator.java 
	TestClassRunner.java 
Removed Files:
      Tag: saff_r41_runner_refactoring
	JavaMethod.java JavaMethodList.java JavaModelElement.java 
	JavaClass.java 
Log Message:
Moved model elements into their own package (although this leads to circularities), for easier review.  Also introduced WrappedJavaModelElement

Index: TestClassMethodsRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/TestClassMethodsRunner.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -d -r1.3.2.5 -r1.3.2.6
--- TestClassMethodsRunner.java	18 Oct 2006 19:36:35 -0000	1.3.2.5
+++ TestClassMethodsRunner.java	18 Oct 2006 20:36:08 -0000	1.3.2.6
@@ -1,5 +1,7 @@
 package org.junit.internal.runners;
 
+import org.junit.internal.javamodel.JavaClass;
+import org.junit.internal.javamodel.JavaMethodList;
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;

Index: TestEnvironment.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/Attic/TestEnvironment.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- TestEnvironment.java	18 Oct 2006 19:36:35 -0000	1.1.2.2
+++ TestEnvironment.java	18 Oct 2006 20:36:08 -0000	1.1.2.3
@@ -17,7 +17,7 @@
 		fNotifier= notifier;
 	}
 
-	JavaTestInterpreter getInterpreter() {
+	public JavaTestInterpreter getInterpreter() {
 		return fInterpreter;
 	}
 

Index: JavaTestInterpreter.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/Attic/JavaTestInterpreter.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- JavaTestInterpreter.java	18 Oct 2006 19:36:35 -0000	1.1.2.4
+++ JavaTestInterpreter.java	18 Oct 2006 20:36:08 -0000	1.1.2.5
@@ -3,6 +3,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.junit.internal.javamodel.JavaClass;
+import org.junit.internal.javamodel.JavaMethod;
 import org.junit.runner.Runner;
 
 public class JavaTestInterpreter {
@@ -25,7 +27,7 @@
 		javaMethod.invoke(test);
 	}
 
-	public Runner runnerFor(Class<?> klass) throws InitializationError {
+	public Runner buildRunner(Class<?> klass) throws InitializationError {
 		MethodValidator methodValidator= new MethodValidator(klass);
 		validate(methodValidator);
 		methodValidator.assertValid();
@@ -36,7 +38,7 @@
 		methodValidator.validateAllMethods();
 	}
 	
-	protected JavaMethod interpretJavaMethod(final JavaClass klass, Method method) {
+	public JavaMethod interpretJavaMethod(final JavaClass klass, Method method) {
 		return new JavaMethod(klass, method);
 	}
 }

Index: MethodValidator.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/MethodValidator.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -d -r1.3.2.3 -r1.3.2.4
--- MethodValidator.java	18 Oct 2006 19:36:35 -0000	1.3.2.3
+++ MethodValidator.java	18 Oct 2006 20:36:08 -0000	1.3.2.4
@@ -11,6 +11,7 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.internal.javamodel.JavaClass;
 
 public class MethodValidator {
 	private final List<Throwable> fErrors= new ArrayList<Throwable>();

Index: TestClassRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/TestClassRunner.java,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -d -r1.2.2.4 -r1.2.2.5
--- TestClassRunner.java	18 Oct 2006 19:36:35 -0000	1.2.2.4
+++ TestClassRunner.java	18 Oct 2006 20:36:08 -0000	1.2.2.5
@@ -1,5 +1,6 @@
 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;
@@ -21,12 +22,7 @@
 	public TestClassRunner(Class<?> klass, JavaTestInterpreter interpreter)
 			throws InitializationError {
 		fTestClass= klass;
-		fEnclosedRunner= interpreter.runnerFor(klass);
-	}
-
-	// TODO: this is parallel to passed-in runner
-	protected void validate(MethodValidator methodValidator) {
-		methodValidator.validateAllMethods();
+		fEnclosedRunner= interpreter.buildRunner(klass);
 	}
 
 	@Override

--- JavaMethod.java DELETED ---

--- JavaMethodList.java DELETED ---

--- JavaModelElement.java DELETED ---

--- JavaClass.java DELETED ---