[Junit-devel] CVS: junit/junit/tests/extensions ExtensionTest.java,1.3,1.4 RepeatedTestTest.java,1.4,1.5 AllTests.java,1.2,1.3 ActiveTestTest.java,1.3,1.4 ExceptionTestCaseTest.java,1.3,NONE

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

Update of /cvsroot/junit/junit/junit/tests/extensions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13390/junit/tests/extensions

Modified Files:
	ExtensionTest.java RepeatedTestTest.java AllTests.java 
	ActiveTestTest.java 
Removed Files:
	ExceptionTestCaseTest.java 
Log Message:
Merged with branch, Kent will make final changes and launch.

Index: ExtensionTest.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/tests/extensions/ExtensionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ExtensionTest.java	9 Sep 2004 21:53:57 -0000	1.3
+++ ExtensionTest.java	15 Feb 2006 22:55:37 -0000	1.4
@@ -18,12 +18,14 @@
 		TornDown(Test test) {
 			super(test);
 		}
+		@Override
 		protected void tearDown() {
 			fTornDown= true;
 		}
 	}
 	public void testRunningErrorInTestSetup() {
 		TestCase test= new TestCase("failure") {
+			@Override
 			public void runTest() {
 				fail();
 			}
@@ -37,12 +39,14 @@
 	}
 	public void testRunningErrorsInTestSetup() {
 		TestCase failure= new TestCase("failure") {
+			@Override
 			public void runTest() {
 				fail();
 			}
 		};
 
 		TestCase error= new TestCase("error") {
+			@Override
 			public void runTest() {
 				throw new Error();
 			}
@@ -64,6 +68,7 @@
 		WasRun test= new WasRun();
 
 		TornDown wrapper= new TornDown(test) {
+			@Override
 			public void setUp() {
 				fail();
 			}
@@ -78,6 +83,7 @@
 		WasRun test= new WasRun();
 
 		TestSetup wrapper= new TestSetup(test) {
+			@Override
 			public void setUp() {
 				fail();
 			}

Index: RepeatedTestTest.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/tests/extensions/RepeatedTestTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- RepeatedTestTest.java	9 Sep 2004 21:53:57 -0000	1.4
+++ RepeatedTestTest.java	15 Feb 2006 22:55:37 -0000	1.5
@@ -15,6 +15,7 @@
 
 	public static class SuccessTest extends TestCase {
 
+		@Override
 		public void runTest() {
 		}
 	}

Index: AllTests.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/tests/extensions/AllTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AllTests.java	9 Sep 2004 21:53:57 -0000	1.2
+++ AllTests.java	15 Feb 2006 22:55:37 -0000	1.3
@@ -16,7 +16,6 @@
 	public static Test suite() { // Collect tests manually because we have to test class collection code
 		TestSuite suite= new TestSuite("Framework Tests");
 		suite.addTestSuite(ExtensionTest.class);
-		suite.addTestSuite(ExceptionTestCaseTest.class);
 		suite.addTestSuite(ActiveTestTest.class);
 		suite.addTestSuite(RepeatedTestTest.class);
 		return suite;

Index: ActiveTestTest.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/tests/extensions/ActiveTestTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ActiveTestTest.java	9 Sep 2004 21:53:56 -0000	1.3
+++ ActiveTestTest.java	15 Feb 2006 22:55:37 -0000	1.4
@@ -13,6 +13,7 @@
 public class ActiveTestTest extends TestCase {
 
 	public static class SuccessTest extends TestCase {		
+		@Override
 		public void runTest() {
 		}
 	}

--- ExceptionTestCaseTest.java DELETED ---