ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CopyOnWriteArrayListTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CopyOnWriteArrayListTest.java (file contents):
Revision 1.25 by jsr166, Sat Nov 26 07:39:02 2011 UTC vs.
Revision 1.26 by jsr166, Tue Nov 29 05:23:56 2011 UTC

# Line 8 | Line 8
8  
9   import junit.framework.*;
10   import java.util.Arrays;
11 + import java.util.Collection;
12 + import java.util.Collections;
13   import java.util.Iterator;
14   import java.util.LinkedList;
15   import java.util.List;
# Line 26 | Line 28 | public class CopyOnWriteArrayListTest ex
28      }
29  
30      static CopyOnWriteArrayList<Integer> populatedArray(int n) {
31 <        CopyOnWriteArrayList<Integer> a
30 <            = new CopyOnWriteArrayList<Integer>();
31 >        CopyOnWriteArrayList<Integer> a = new CopyOnWriteArrayList<Integer>();
32          assertTrue(a.isEmpty());
33 <        for (int i = 0; i < n; ++i)
33 >        for (int i = 0; i < n; i++)
34              a.add(i);
35          assertFalse(a.isEmpty());
36          assertEquals(n, a.size());
37          return a;
38      }
39  
40 +    static CopyOnWriteArrayList<Integer> populatedArray(Integer[] elements) {
41 +        CopyOnWriteArrayList<Integer> a = new CopyOnWriteArrayList<Integer>();
42 +        assertTrue(a.isEmpty());
43 +        for (int i = 0; i < elements.length; i++)
44 +            a.add(elements[i]);
45 +        assertFalse(a.isEmpty());
46 +        assertEquals(elements.length, a.size());
47 +        return a;
48 +    }
49 +
50      /**
51       * a new list is empty
52       */
# Line 349 | Line 360 | public class CopyOnWriteArrayListTest ex
360      }
361  
362      /**
363 <     * toArray returns an Object array containing all elements from the list
363 >     * toArray() returns an Object array containing all elements from
364 >     * the list in insertion order
365       */
366      public void testToArray() {
367 <        CopyOnWriteArrayList full = populatedArray(3);
368 <        Object[] o = full.toArray();
369 <        assertEquals(3, o.length);
370 <        assertEquals(0, o[0]);
371 <        assertEquals(1, o[1]);
372 <        assertEquals(2, o[2]);
367 >        Object[] a = new CopyOnWriteArrayList().toArray();
368 >        assertTrue(Arrays.equals(new Object[0], a));
369 >        assertSame(Object[].class, a.getClass());
370 >
371 >        Integer[] elements = new Integer[SIZE];
372 >        for (int i = 0; i < SIZE; i++)
373 >            elements[i] = i;
374 >        Collections.shuffle(Arrays.asList(elements));
375 >        Collection<Integer> full = populatedArray(elements);
376 >
377 >        assertTrue(Arrays.equals(elements, full.toArray()));
378 >        assertSame(Object[].class, full.toArray().getClass());
379      }
380  
381      /**
382 <     * toArray returns an Integer array containing all elements from
383 <     * the list
382 >     * toArray(Integer array) returns an Integer array containing all
383 >     * elements from the list in insertion order
384       */
385      public void testToArray2() {
386 <        final int size = 3;
387 <        CopyOnWriteArrayList<Integer> full = populatedArray(size);
388 <        Integer[] ints = new Integer[size];
389 <        assertSame(ints, full.toArray(ints));
390 <        Iterator<Integer> it = full.iterator();
391 <        for (int i = 0; i < size; i++)
392 <            assertSame(ints[i], it.next());
393 <        assertFalse(it.hasNext());
386 >        Collection empty = new CopyOnWriteArrayList();
387 >        Integer[] a;
388 >
389 >        a = new Integer[0];
390 >        assertSame(a, empty.toArray(a));
391 >
392 >        a = new Integer[SIZE/2];
393 >        Arrays.fill(a, 42);
394 >        assertSame(a, empty.toArray(a));
395 >        assertNull(a[0]);
396 >        for (int i = 1; i < a.length; i++)
397 >            assertEquals(42, (int) a[i]);
398 >
399 >        Integer[] elements = new Integer[SIZE];
400 >        for (int i = 0; i < SIZE; i++)
401 >            elements[i] = i;
402 >        Collections.shuffle(Arrays.asList(elements));
403 >        Collection<Integer> full = populatedArray(elements);
404 >
405 >        Arrays.fill(a, 42);
406 >        assertTrue(Arrays.equals(elements, full.toArray(a)));
407 >        for (int i = 0; i < a.length; i++)
408 >            assertEquals(42, (int) a[i]);
409 >        assertSame(Integer[].class, full.toArray(a).getClass());
410 >
411 >        a = new Integer[SIZE];
412 >        Arrays.fill(a, 42);
413 >        assertSame(a, full.toArray(a));
414 >        assertTrue(Arrays.equals(elements, a));
415 >
416 >        a = new Integer[2*SIZE];
417 >        Arrays.fill(a, 42);
418 >        assertSame(a, full.toArray(a));
419 >        assertTrue(Arrays.equals(elements, Arrays.copyOf(a, SIZE)));
420 >        assertNull(a[SIZE]);
421 >        for (int i = SIZE + 1; i < a.length; i++)
422 >            assertEquals(42, (int) a[i]);
423      }
424  
425      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines