[Junit-devel] CVS: junit/org/junit/internal/runners TestClassRunner.java, 1.2, 1.2.2.1

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

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

Modified Files:
      Tag: saff_r41_runner_refactoring
	TestClassRunner.java 
Log Message:
Remove TestIntrospector

Index: TestClassRunner.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/runners/TestClassRunner.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- TestClassRunner.java	15 Feb 2006 22:55:28 -0000	1.2
+++ TestClassRunner.java	17 Oct 2006 19:07:40 -0000	1.2.2.1
@@ -10,17 +10,22 @@
 import org.junit.runner.manipulation.Sortable;
 import org.junit.runner.manipulation.Sorter;
 import org.junit.runner.notification.RunNotifier;
-import org.junit.runner.notification.Failure;
 
 public class TestClassRunner extends Runner implements Filterable, Sortable {
 	protected final Runner fEnclosedRunner;
-	private final Class<?> fTestClass;
 
+	private final Class<?> fTestClass;
+	
 	public TestClassRunner(Class<?> klass) throws InitializationError {
-		this(klass, new TestClassMethodsRunner(klass));
+		this(klass, new JavaTestInterpreter());
 	}
 	
-	public TestClassRunner(Class<?> klass, Runner runner) throws InitializationError {
+	public TestClassRunner(Class<?> klass, JavaTestInterpreter interpreter) throws InitializationError {
+		this(klass, new TestClassMethodsRunner(new JavaClass(klass), interpreter));
+	}
+
+	public TestClassRunner(Class<?> klass, Runner runner)
+			throws InitializationError {
 		fTestClass= klass;
 		fEnclosedRunner= runner;
 		MethodValidator methodValidator= new MethodValidator(klass);
@@ -35,18 +40,13 @@
 
 	@Override
 	public void run(final RunNotifier notifier) {
-		BeforeAndAfterRunner runner = new BeforeAndAfterRunner(getTestClass(),
-				BeforeClass.class, AfterClass.class, null) {		
+		BeforeAndAfterRunner runner= new BeforeAndAfterRunner(getTestClass(),
+				BeforeClass.class, AfterClass.class, null, new PerTestNotifier(notifier,
+						getDescription())) {
 			@Override
 			protected void runUnprotected() {
 				fEnclosedRunner.run(notifier);
 			}
-		
-			// TODO: looks very similar to other method of BeforeAfter, now
-			@Override
-			protected void addFailure(Throwable targetException) {
-				notifier.fireTestFailure(new Failure(getDescription(), targetException));
-			}
 		};
 
 		runner.runProtected();
@@ -56,9 +56,9 @@
 	public Description getDescription() {
 		return fEnclosedRunner.getDescription();
 	}
-	
+
 	// TODO: good behavior when createTest fails
-	
+
 	// TODO: dup?
 	public void filter(Filter filter) throws NoTestsRemainException {
 		filter.apply(fEnclosedRunner);