[Junit-devel] CVS: junit/org/junit/runners ParameterizedInterpreter.java, 1.1.2.3, 1.1.2.4 Suite.java, 1.4.2.1, 1.4.2.2

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

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

Modified Files:
      Tag: saff_r41_runner_refactoring
	ParameterizedInterpreter.java Suite.java 
Log Message:
Moved model elements into their own package (although this leads to circularities), for easier review.  Also introduced WrappedJavaModelElement

Index: ParameterizedInterpreter.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/runners/Attic/ParameterizedInterpreter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- ParameterizedInterpreter.java	18 Oct 2006 19:36:35 -0000	1.1.2.3
+++ ParameterizedInterpreter.java	18 Oct 2006 20:36:08 -0000	1.1.2.4
@@ -12,10 +12,10 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.junit.internal.javamodel.JavaClass;
+import org.junit.internal.javamodel.JavaMethod;
 import org.junit.internal.runners.CompositeRunner;
 import org.junit.internal.runners.InitializationError;
-import org.junit.internal.runners.JavaClass;
-import org.junit.internal.runners.JavaMethod;
 import org.junit.internal.runners.JavaTestInterpreter;
 import org.junit.internal.runners.MethodValidator;
 import org.junit.internal.runners.TestClassMethodsRunner;
@@ -56,7 +56,7 @@
 	}
 
 	@Override
-	protected JavaMethod interpretJavaMethod(final JavaClass klass,
+	public JavaMethod interpretJavaMethod(final JavaClass klass,
 			Method method) {
 		return new JavaMethod(klass, method) {
 			@Override
@@ -71,7 +71,7 @@
 
 	// TODO: pull interpreter back in?
 	@Override
-	public Runner runnerFor(Class klass) throws InitializationError {
+	public Runner buildRunner(Class klass) throws InitializationError {
 		CompositeRunner runner= new CompositeRunner(klass.getName());
 		int i= 0;
 		for (final Object each : getParametersList(new JavaClass(klass))) {

Index: Suite.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/runners/Suite.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- Suite.java	18 Oct 2006 18:22:14 -0000	1.4.2.1
+++ Suite.java	18 Oct 2006 20:36:08 -0000	1.4.2.2
@@ -45,7 +45,7 @@
 	public Suite(Class<?> klass, final Class[] annotatedClasses) throws InitializationError {
 		super(klass, new JavaTestInterpreter() {
 			@Override
-			public Runner runnerFor(Class<?> klass) throws InitializationError {
+			public Runner buildRunner(Class<?> klass) throws InitializationError {
 				return Request.classes(klass.getName(), annotatedClasses)
 						.getRunner();
 			}