[Junit-devel] CVS: junit/junit/samples ListTest.java,1.1,1.2 AllTests.java,1.2,1.3 SimpleTest.java,1.5,1.6 VectorTest.java,1.5,NONE

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

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

Modified Files:
	AllTests.java SimpleTest.java 
Added Files:
	ListTest.java 
Removed Files:
	VectorTest.java 
Log Message:
Merged with branch, Kent will make final changes and launch.


Index: AllTests.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/samples/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:54 -0000	1.2
+++ AllTests.java	15 Feb 2006 22:55:32 -0000	1.3
@@ -14,7 +14,7 @@
 	}
 	public static Test suite ( ) {
 		TestSuite suite= new TestSuite("All JUnit Tests");
-		suite.addTest(VectorTest.suite());
+		suite.addTest(ListTest.suite());
 		suite.addTest(new TestSuite(junit.samples.money.MoneyTest.class));
 		suite.addTest(junit.tests.AllTests.suite());
 	    return suite;

Index: SimpleTest.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/samples/SimpleTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SimpleTest.java	9 Sep 2004 21:53:54 -0000	1.5
+++ SimpleTest.java	15 Feb 2006 22:55:32 -0000	1.6
@@ -12,6 +12,7 @@
 	protected int fValue1;
 	protected int fValue2;
 
+	@Override
 	protected void setUp() {
 		fValue1= 2;
 		fValue2= 3;

--- VectorTest.java DELETED ---