1 files changed, 123 insertions, 0 deletions
diff --git a/junit4/src/test/java/org/junit/tests/junit3compatibility/SuiteMethodTest.java b/junit4/src/test/java/org/junit/tests/junit3compatibility/SuiteMethodTest.java
new file mode 100644
index 0000000..c4890d0
--- /dev/null
+++ b/junit4/src/test/java/org/junit/tests/junit3compatibility/SuiteMethodTest.java
@@ -0,0 +1,123 @@
+package org.junit.tests.junit3compatibility;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Request;
+import org.junit.runner.Result;
+
+public class SuiteMethodTest {
+	public static boolean wasRun;
+
+	static public class OldTest extends TestCase {
+		public OldTest(String name) {
+			super(name);
+		}
+		
+		public static junit.framework.Test suite() {
+			TestSuite result= new TestSuite();
+			result.addTest(new OldTest("notObviouslyATest"));
+			return result;
+		}
+		
+		public void notObviouslyATest() {
+			wasRun= true;
+		}
+	}
+	
+	@Test public void makeSureSuiteIsCalled() {
+		wasRun= false;
+		JUnitCore.runClasses(OldTest.class);
+		assertTrue(wasRun);
+	}
+	
+	static public class NewTest {
+		@Test public void sample() {
+			wasRun= true;
+		}
+
+		public static junit.framework.Test suite() {
+			return new JUnit4TestAdapter(NewTest.class);
+		}
+	}
+	
+	@Test public void makeSureSuiteWorksWithJUnit4Classes() {
+		wasRun= false;
+		JUnitCore.runClasses(NewTest.class);
+		assertTrue(wasRun);
+	}
+	
+
+	public static class CompatibilityTest {
+		@Ignore	@Test
+		public void ignored() {
+		}
+		
+		public static junit.framework.Test suite() {
+			return new JUnit4TestAdapter(CompatibilityTest.class);
+		}
+	}
+
+	// when executing as JUnit 3, ignored tests are stripped out before execution
+	@Test
+	public void descriptionAndRunNotificationsAreConsistent() {
+		Result result= JUnitCore.runClasses(CompatibilityTest.class);
+		assertEquals(0, result.getIgnoreCount());
+		
+		Description description= Request.aClass(CompatibilityTest.class).getRunner().getDescription();
+		assertEquals(0, description.getChildren().size());
+	}
+	
+	static public class NewTestSuiteFails {
+		@Test public void sample() {
+			wasRun= true;
+		}
+		
+		public static junit.framework.Test suite() {
+			fail("called with JUnit 4 runner");
+			return null;
+		}
+	}
+	
+	@Test public void suiteIsUsedWithJUnit4Classes() {
+		wasRun= false;
+		Result result= JUnitCore.runClasses(NewTestSuiteFails.class);
+		assertEquals(1, result.getFailureCount());
+		assertFalse(wasRun);
+	}
+	
+	static public class NewTestSuiteNotUsed {
+		private static boolean wasIgnoredRun;
+		
+		@Test public void sample() {
+			wasRun= true;
+		}
+		
+		@Ignore @Test public void ignore() {
+			wasIgnoredRun= true;
+		}
+		
+		public static junit.framework.Test suite() {
+			return new JUnit4TestAdapter(NewTestSuiteNotUsed.class);
+		}
+	}
+	
+	@Test public void makeSureSuiteNotUsedWithJUnit4Classes2() {
+		wasRun= false;
+		NewTestSuiteNotUsed.wasIgnoredRun= false;
+		Result res= JUnitCore.runClasses(NewTestSuiteNotUsed.class);
+		assertTrue(wasRun);
+		assertFalse(NewTestSuiteNotUsed.wasIgnoredRun);
+		assertEquals(0, res.getFailureCount());
+		assertEquals(1, res.getRunCount());
+		assertEquals(0, res.getIgnoreCount());
+	}
+}