--- jsr166/src/test/tck/CopyOnWriteArrayListTest.java	2011/11/26 05:19:17	1.24
+++ jsr166/src/test/tck/CopyOnWriteArrayListTest.java	2011/11/26 07:39:02	1.25
@@ -25,11 +25,12 @@ public class CopyOnWriteArrayListTest ex
         return new TestSuite(CopyOnWriteArrayListTest.class);
     }
 
-    static CopyOnWriteArrayList populatedArray(int n) {
-        CopyOnWriteArrayList a = new CopyOnWriteArrayList();
+    static CopyOnWriteArrayList<Integer> populatedArray(int n) {
+        CopyOnWriteArrayList<Integer> a
+            = new CopyOnWriteArrayList<Integer>();
         assertTrue(a.isEmpty());
         for (int i = 0; i < n; ++i)
-            a.add(new Integer(i));
+            a.add(i);
         assertFalse(a.isEmpty());
         assertEquals(n, a.size());
         return a;
@@ -364,13 +365,14 @@ public class CopyOnWriteArrayListTest ex
      * the list
      */
     public void testToArray2() {
-        CopyOnWriteArrayList full = populatedArray(3);
-        Integer[] i = new Integer[3];
-        i = (Integer[])full.toArray(i);
-        assertEquals(3, i.length);
-        assertEquals(0, i[0].intValue());
-        assertEquals(1, i[1].intValue());
-        assertEquals(2, i[2].intValue());
+        final int size = 3;
+        CopyOnWriteArrayList<Integer> full = populatedArray(size);
+        Integer[] ints = new Integer[size];
+        assertSame(ints, full.toArray(ints));
+        Iterator<Integer> it = full.iterator();
+        for (int i = 0; i < size; i++)
+            assertSame(ints[i], it.next());
+        assertFalse(it.hasNext());
     }
 
     /**