--- jsr166/src/test/tck/ConcurrentLinkedDequeTest.java 2010/11/03 07:54:52 1.2 +++ jsr166/src/test/tck/ConcurrentLinkedDequeTest.java 2010/11/04 01:04:54 1.4 @@ -635,35 +635,33 @@ public class ConcurrentLinkedDequeTest e } /** - * toArray() contains all elements + * toArray() contains all elements in FIFO order */ public void testToArray() { ConcurrentLinkedDeque q = populatedDeque(SIZE); Object[] o = q.toArray(); - Arrays.sort(o); for (int i = 0; i < o.length; i++) - assertEquals(o[i], q.poll()); + assertSame(o[i], q.poll()); } /** - * toArray(a) contains all elements + * toArray(a) contains all elements in FIFO order */ public void testToArray2() { ConcurrentLinkedDeque q = populatedDeque(SIZE); Integer[] ints = new Integer[SIZE]; - ints = (Integer[])q.toArray(ints); - Arrays.sort(ints); + assertSame(ints, q.toArray(ints)); for (int i = 0; i < ints.length; i++) - assertEquals(ints[i], q.poll()); + assertSame(ints[i], q.poll()); } /** - * toArray(null) throws NPE + * toArray(null) throws NullPointerException */ - public void testToArray_BadArg() { + public void testToArray_NullArg() { ConcurrentLinkedDeque q = populatedDeque(SIZE); try { - Object o[] = q.toArray(null); + q.toArray(null); shouldThrow(); } catch (NullPointerException success) {} }