[Junit-devel] CVS: junit/org/junit/tests TimeoutTest.java, 1.2, 1.3 AssertionTest.java, 1.9, 1.10

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

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

Modified Files:
	TimeoutTest.java AssertionTest.java 
Log Message:
- Fixed raw types because Eclipse 3.3 told us to.
- No longer dynamically check arrays that are statically typed as objects.
- Update documentation to 4.2

Index: TimeoutTest.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/tests/TimeoutTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TimeoutTest.java	15 Feb 2006 22:55:29 -0000	1.2
+++ TimeoutTest.java	16 Nov 2006 19:17:42 -0000	1.3
@@ -59,7 +59,7 @@
 
 	static public class TimeoutFailureTest {
 		@Test(timeout= 100) public void success() throws InterruptedException {			
-			Thread.sleep(200);
+			Thread.sleep(40000);
 		}
 	}
 	

Index: AssertionTest.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/tests/AssertionTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- AssertionTest.java	4 Oct 2006 23:27:13 -0000	1.9
+++ AssertionTest.java	16 Nov 2006 19:17:42 -0000	1.10
@@ -102,6 +102,10 @@
 		assertEquals(new Object[][]{{true, true}, {false, false}}, new Object[][]{{true, true}, {false, false}});
 	}
 	
+	@Test public void multiDimensionalArraysDeclaredAsOneDimensionalAreEqual() {
+		assertEquals(new Object[]{new Object[] {true, true}, new Object[] {false, false}}, new Object[]{new Object[] {true, true}, new Object[] {false, false}});
+	}
+	
 	@Test public void multiDimensionalArraysAreNotEqual() {
 		try {
 			assertEquals("message", new Object[][]{{true, true}, {false, false}}, new Object[][]{{true, true}, {true, false}});
@@ -286,7 +290,8 @@
 		}
 	}
 	
-	@Test public void arraysDeclaredAsObjectAreComparedAsArrays() {
+	@Test(expected=AssertionError.class) 
+	public void arraysDeclaredAsObjectAreComparedAsObjects() {
 		Object a1= new Object[] {"abc"};
 		Object a2= new Object[] {"abc"};
 		assertEquals(a1, a2);