[Junit-devel] CVS: junit/org/junit/tests SortableTest.java, 1.5, 1.5.2.1 ValidationTest.java, 1.3, 1.3.2.1

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

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

Modified Files:
      Tag: saff_r41_runner_refactoring
	SortableTest.java ValidationTest.java 
Log Message:
Parameterized works entirely with JavaTestInterpreter now

Index: SortableTest.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/tests/SortableTest.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- SortableTest.java	29 Jun 2006 23:06:45 -0000	1.5
+++ SortableTest.java	18 Oct 2006 18:22:14 -0000	1.5.2.1
@@ -1,6 +1,6 @@
 package org.junit.tests;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.util.Comparator;
 
@@ -8,6 +8,7 @@
 import org.junit.Test;
 import org.junit.internal.runners.EmptyDescription;
 import org.junit.internal.runners.InitializationError;
+import org.junit.internal.runners.JavaTestInterpreter;
 import org.junit.internal.runners.TestClassRunner;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
@@ -27,7 +28,7 @@
 			}
 		};
 	}
-	
+
 	private static Comparator<Description> backward() {
 		return new Comparator<Description>() {
 			public int compare(Description o1, Description o2) {
@@ -38,88 +39,142 @@
 
 	public static class TestClassRunnerIsSortable {
 		private static String log= "";
-		
+
 		public static class SortMe {
-			@Test public void a() { log+= "a"; }
-			@Test public void b() { log+= "b"; }
-			@Test public void c() { log+= "c"; }
+			@Test
+			public void a() {
+				log+= "a";
+			}
+
+			@Test
+			public void b() {
+				log+= "b";
+			}
+
+			@Test
+			public void c() {
+				log+= "c";
+			}
 		}
-		
-		@Before public void resetLog() {
+
+		@Before
+		public void resetLog() {
 			log= "";
 		}
-		
-		@Test public void sortingForwardWorksOnTestClassRunner() {
+
+		@Test
+		public void sortingForwardWorksOnTestClassRunner() {
 			Request forward= Request.aClass(SortMe.class).sortWith(forward());
-			
+
 			new JUnitCore().run(forward);
 			assertEquals("abc", log);
 		}
 
-		@Test public void sortingBackwardWorksOnTestClassRunner() {
+		@Test
+		public void sortingBackwardWorksOnTestClassRunner() {
 			Request backward= Request.aClass(SortMe.class).sortWith(backward());
-			
+
 			new JUnitCore().run(backward);
 			assertEquals("cba", log);
 		}
-		
-		@RunWith(Enclosed.class) 
+
+		@RunWith(Enclosed.class)
 		public static class Enclosing {
 			public static class A {
-				@Test public void a() { log+= "Aa"; }
-				@Test public void b() { log+= "Ab"; }
-				@Test public void c() { log+= "Ac"; }				
+				@Test
+				public void a() {
+					log+= "Aa";
+				}
+
+				@Test
+				public void b() {
+					log+= "Ab";
+				}
+
+				@Test
+				public void c() {
+					log+= "Ac";
+				}
 			}
+
 			public static class B {
-				@Test public void a() { log+= "Ba"; }
-				@Test public void b() { log+= "Bb"; }
-				@Test public void c() { log+= "Bc"; }								
+				@Test
+				public void a() {
+					log+= "Ba";
+				}
+
+				@Test
+				public void b() {
+					log+= "Bb";
+				}
+
+				@Test
+				public void c() {
+					log+= "Bc";
+				}
 			}
 		}
 
-		@Test public void sortingForwardWorksOnSuite() {
-			Request forward= Request.aClass(Enclosing.class).sortWith(forward());
-			
+		@Test
+		public void sortingForwardWorksOnSuite() {
+			Request forward= Request.aClass(Enclosing.class)
+					.sortWith(forward());
+
 			new JUnitCore().run(forward);
 			assertEquals("AaAbAcBaBbBc", log);
 		}
 
-		@Test public void sortingBackwardWorksOnSuite() {
-			Request backward= Request.aClass(Enclosing.class).sortWith(backward());
-			
+		@Test
+		public void sortingBackwardWorksOnSuite() {
+			Request backward= Request.aClass(Enclosing.class).sortWith(
+					backward());
+
 			new JUnitCore().run(backward);
 			assertEquals("BcBbBaAcAbAa", log);
 		}
 
 	}
-	
+
 	public static class UnsortableRunnersAreHandledWithoutCrashing {
 		public static class UnsortableRunner extends Runner {
 			public UnsortableRunner(Class<?> klass) {
 			}
-			
+
 			@Override
 			public Description getDescription() {
 				return new EmptyDescription();
 			}
-			
+
 			@Override
 			public void run(RunNotifier notifier) {
 			}
 		}
-		
+
 		@RunWith(UnsortableRunner.class)
 		public static class Unsortable {
-			@Test public void a() {}		
+			@Test
+			public void a() {
+			}
 		}
-		
-		@Test public void unsortablesAreHandledWithoutCrashing() {
-			Request unsorted= Request.aClass(Unsortable.class).sortWith(forward());
+
+		@Test
+		public void unsortablesAreHandledWithoutCrashing() {
+			Request unsorted= Request.aClass(Unsortable.class).sortWith(
+					forward());
 			new JUnitCore().run(unsorted);
 		}
-		
-		@Test public void testClassRunnerCanBeWrappedAroundUnsortable() throws InitializationError {
-			TestClassRunner runner= new TestClassRunner(Unsortable.class, new UnsortableRunner(Unsortable.class));
+
+		@Test
+		public void testClassRunnerCanBeWrappedAroundUnsortable()
+				throws InitializationError {
+			TestClassRunner runner= new TestClassRunner(Unsortable.class,
+					new JavaTestInterpreter() {
+						@Override
+						public Runner runnerFor(Class<?> klass)
+								throws InitializationError {
+							return new UnsortableRunner(klass);
+						}
+					});
 			runner.sort(new Sorter(forward()));
 		}
 	}

Index: ValidationTest.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/tests/ValidationTest.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- ValidationTest.java	29 Jun 2006 23:06:45 -0000	1.3
+++ ValidationTest.java	18 Oct 2006 18:22:14 -0000	1.3.2.1
@@ -1,15 +1,12 @@
 package org.junit.tests;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.internal.runners.EmptyDescription;
 import org.junit.internal.runners.InitializationError;
+import org.junit.internal.runners.JavaTestInterpreter;
 import org.junit.internal.runners.TestClassRunner;
-import org.junit.runner.Description;
 import org.junit.runner.Request;
-import org.junit.runner.Runner;
-import org.junit.runner.notification.RunNotifier;
 
 public class ValidationTest {
 	public static class WrongBeforeClass {
@@ -21,17 +18,7 @@
 
 	@Test(expected=InitializationError.class)
 	public void testClassRunnerHandlesBeforeClassAndAfterClassValidation() throws InitializationError {
-		new TestClassRunner(WrongBeforeClass.class, new Runner() {
-			@Override
-			public Description getDescription() {
-				return new EmptyDescription();
-			}
-
-			@Override
-			public void run(RunNotifier notifier) {
-				// do nothing
-			}
-		});
+		new TestClassRunner(WrongBeforeClass.class, new JavaTestInterpreter());
 	}
 	
 	@Test