From: David S. <ds...@us...> - 2006-11-16 17:52:17
|
Update of /cvsroot/junit/junit/org/junit/runners In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24081/org/junit/runners Modified Files: Tag: saff_r41_runner_refactoring ParameterizedInterpreter.java Log Message: About to work on trunk with Kent Index: ParameterizedInterpreter.java =================================================================== RCS file: /cvsroot/junit/junit/org/junit/runners/Attic/ParameterizedInterpreter.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 --- ParameterizedInterpreter.java 18 Oct 2006 20:36:08 -0000 1.1.2.4 +++ ParameterizedInterpreter.java 16 Nov 2006 17:52:10 -0000 1.1.2.5 @@ -29,8 +29,8 @@ private final int fNumber; private ParameterizedJavaClass(Class<?> type, Object[] parameters, - int number) { - super(type); + int number, JavaTestInterpreter interpreter) { + super(type, interpreter); fParameters= parameters; fNumber= number; } @@ -56,8 +56,7 @@ } @Override - public JavaMethod interpretJavaMethod(final JavaClass klass, - Method method) { + public JavaMethod interpretJavaMethod(final JavaClass klass, Method method) { return new JavaMethod(klass, method) { @Override public String getName() { @@ -73,18 +72,19 @@ @Override public Runner buildRunner(Class klass) throws InitializationError { CompositeRunner runner= new CompositeRunner(klass.getName()); + JavaClass simpleClass= buildClass(klass); int i= 0; - for (final Object each : getParametersList(new JavaClass(klass))) { + for (final Object each : getParametersList(simpleClass)) { if (each instanceof Object[]) { runner .add(new TestClassMethodsRunner( new ParameterizedJavaClass(klass, - (Object[]) each, i++), this)); + (Object[]) each, i++, this), this)); } else throw new InitializationError(String.format( "%s.%s() must return a Collection of arrays.", klass - .getName(), getParametersMethod( - new JavaClass(klass)).getName())); + .getName(), getParametersMethod(simpleClass) + .getName())); } return runner; } |