[Junit-devel] CVS: junit/org/junit/tests InitializationErrorForwardCompatibilityTest.java, 1.3.2.1, 1.3.2.2 UserStopTest.java, 1.2.2.1, 1.2.2.2

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

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

Modified Files:
      Tag: saff_r41_runner_refactoring
	InitializationErrorForwardCompatibilityTest.java 
	UserStopTest.java 
Log Message:
BeforeAndAfterRunner is no more

Index: InitializationErrorForwardCompatibilityTest.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/tests/InitializationErrorForwardCompatibilityTest.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- InitializationErrorForwardCompatibilityTest.java	17 Oct 2006 19:10:20 -0000	1.3.2.1
+++ InitializationErrorForwardCompatibilityTest.java	18 Oct 2006 17:07:05 -0000	1.3.2.2
@@ -1,8 +1,6 @@
 package org.junit.tests;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import junit.framework.AssertionFailedError;
 import junit.framework.JUnit4TestAdapter;
 import junit.framework.TestListener;
@@ -10,7 +8,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.internal.runners.EmptyDescription;
-import org.junit.internal.runners.JavaTestInterpreter;
 import org.junit.internal.runners.TestClassRunner;
 import org.junit.runner.Description;
 import org.junit.runner.RunWith;
@@ -95,7 +92,7 @@
 	
 	public static class InitializesWithError extends TestClassRunner {
 		public InitializesWithError(Class<?> klass) throws Exception {
-			super(klass, new JavaTestInterpreter());
+			super(klass);
 			throw new Exception();
 		}
 	}

Index: UserStopTest.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/tests/UserStopTest.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- UserStopTest.java	17 Oct 2006 19:10:20 -0000	1.2.2.1
+++ UserStopTest.java	18 Oct 2006 17:07:05 -0000	1.2.2.2
@@ -2,10 +2,6 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.internal.runners.JavaMethod;
-import org.junit.internal.runners.JavaTestInterpreter;
-import org.junit.internal.runners.TestMethodRunner;
-import org.junit.runner.Description;
 import org.junit.runner.Request;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runner.notification.StoppedByUserException;
@@ -13,26 +9,25 @@
 public class UserStopTest {
 	private RunNotifier fNotifier;
 
-	@Before public void createNotifier() {
+	@Before
+	public void createNotifier() {
 		fNotifier= new RunNotifier();
-		fNotifier.pleaseStop();		
-	}
-	
-	@Test(expected=StoppedByUserException.class) public void userStop() {
-		fNotifier.fireTestStarted(null);
+		fNotifier.pleaseStop();
 	}
 
-	@Test(expected=StoppedByUserException.class) public void stopMethodRunner() throws Exception {
-		// TODO: is this a good test?
-		new TestMethodRunner(this, new JavaMethod(OneTest.class.getMethod("foo")), fNotifier,
-				Description.createTestDescription(OneTest.class, "foo"), new JavaTestInterpreter()).run();
+	@Test(expected= StoppedByUserException.class)
+	public void userStop() {
+		fNotifier.fireTestStarted(null);
 	}
 	
 	public static class OneTest {
-		@Test public void foo() {}
+		@Test
+		public void foo() {
+		}
 	}
-	
-	@Test(expected=StoppedByUserException.class) public void stopClassRunner() throws Exception {
+
+	@Test(expected= StoppedByUserException.class)
+	public void stopClassRunner() throws Exception {
 		Request.aClass(OneTest.class).getRunner().run(fNotifier);
 	}
 }