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.30 by jsr166, Fri Jan 31 17:58:35 2014 UTC vs.
Revision 1.35 by jsr166, Sat May 23 00:53:08 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 – import junit.framework.*;
9   import java.util.ArrayList;
10   import java.util.Arrays;
11   import java.util.Collection;
# Line 16 | Line 15 | import java.util.LinkedList;
15   import java.util.List;
16   import java.util.ListIterator;
17   import java.util.NoSuchElementException;
19 – import java.util.Vector;
18   import java.util.concurrent.CopyOnWriteArrayList;
19  
20 + import junit.framework.Test;
21 + import junit.framework.TestSuite;
22 +
23   public class CopyOnWriteArrayListTest extends JSR166TestCase {
24  
25      public static void main(String[] args) {
26 <        junit.textui.TestRunner.run(suite());
26 >        main(suite(), args);
27      }
28  
29      public static Test suite() {
# Line 62 | Line 63 | public class CopyOnWriteArrayListTest ex
63       */
64      public void testConstructor2() {
65          Integer[] ints = new Integer[SIZE];
66 <        for (int i = 0; i < SIZE-1; ++i)
66 >        for (int i = 0; i < SIZE - 1; ++i)
67              ints[i] = new Integer(i);
68          CopyOnWriteArrayList a = new CopyOnWriteArrayList(ints);
69          for (int i = 0; i < SIZE; ++i)
# Line 74 | Line 75 | public class CopyOnWriteArrayListTest ex
75       */
76      public void testConstructor3() {
77          Integer[] ints = new Integer[SIZE];
78 <        for (int i = 0; i < SIZE-1; ++i)
78 >        for (int i = 0; i < SIZE - 1; ++i)
79              ints[i] = new Integer(i);
80          CopyOnWriteArrayList a = new CopyOnWriteArrayList(Arrays.asList(ints));
81          for (int i = 0; i < SIZE; ++i)
# Line 82 | Line 83 | public class CopyOnWriteArrayListTest ex
83      }
84  
85      /**
86 <     * addAll adds each element from the given collection
86 >     * addAll adds each element from the given collection, including duplicates
87       */
88      public void testAddAll() {
89          CopyOnWriteArrayList full = populatedArray(3);
90 <        Vector v = new Vector();
90 <        v.add(three);
91 <        v.add(four);
92 <        v.add(five);
93 <        full.addAll(v);
90 >        assertTrue(full.addAll(Arrays.asList(three, four, five)));
91          assertEquals(6, full.size());
92 +        assertTrue(full.addAll(Arrays.asList(three, four, five)));
93 +        assertEquals(9, full.size());
94      }
95  
96      /**
# Line 100 | Line 99 | public class CopyOnWriteArrayListTest ex
99       */
100      public void testAddAllAbsent() {
101          CopyOnWriteArrayList full = populatedArray(3);
102 <        Vector v = new Vector();
103 <        v.add(three);
104 <        v.add(four);
105 <        v.add(one); // will not add this element
107 <        full.addAllAbsent(v);
102 >        // "one" is duplicate and will not be added
103 >        assertEquals(2, full.addAllAbsent(Arrays.asList(three, four, one)));
104 >        assertEquals(5, full.size());
105 >        assertEquals(0, full.addAllAbsent(Arrays.asList(three, four, one)));
106          assertEquals(5, full.size());
107      }
108  
# Line 194 | Line 192 | public class CopyOnWriteArrayListTest ex
192       */
193      public void testContainsAll() {
194          CopyOnWriteArrayList full = populatedArray(3);
195 <        Vector v = new Vector();
196 <        v.add(one);
197 <        v.add(two);
198 <        assertTrue(full.containsAll(v));
199 <        v.add(six);
202 <        assertFalse(full.containsAll(v));
195 >        assertTrue(full.containsAll(Arrays.asList()));
196 >        assertTrue(full.containsAll(Arrays.asList(one)));
197 >        assertTrue(full.containsAll(Arrays.asList(one, two)));
198 >        assertFalse(full.containsAll(Arrays.asList(one, two, six)));
199 >        assertFalse(full.containsAll(Arrays.asList(six)));
200      }
201  
202      /**
# Line 262 | Line 259 | public class CopyOnWriteArrayListTest ex
259              assertTrue(it.hasNext());
260              assertEquals(elements[j], it.next());
261          }
262 <        assertFalse(it.hasNext());
263 <        try {
264 <            it.next();
265 <            shouldThrow();
266 <        } catch (NoSuchElementException success) {}
262 >        assertIteratorExhausted(it);
263 >    }
264 >
265 >    /**
266 >     * iterator of empty collection has no elements
267 >     */
268 >    public void testEmptyIterator() {
269 >        Collection c = new CopyOnWriteArrayList();
270 >        assertIteratorExhausted(c.iterator());
271      }
272  
273      /**
# Line 381 | Line 382 | public class CopyOnWriteArrayListTest ex
382       */
383      public void testRemoveAll() {
384          CopyOnWriteArrayList full = populatedArray(3);
385 <        Vector v = new Vector();
386 <        v.add(one);
387 <        v.add(two);
387 <        full.removeAll(v);
385 >        assertTrue(full.removeAll(Arrays.asList(one, two)));
386 >        assertEquals(1, full.size());
387 >        assertFalse(full.removeAll(Arrays.asList(one, two)));
388          assertEquals(1, full.size());
389      }
390  
# Line 437 | Line 437 | public class CopyOnWriteArrayListTest ex
437          a = new Integer[0];
438          assertSame(a, empty.toArray(a));
439  
440 <        a = new Integer[SIZE/2];
440 >        a = new Integer[SIZE / 2];
441          Arrays.fill(a, 42);
442          assertSame(a, empty.toArray(a));
443          assertNull(a[0]);
# Line 461 | Line 461 | public class CopyOnWriteArrayListTest ex
461          assertSame(a, full.toArray(a));
462          assertTrue(Arrays.equals(elements, a));
463  
464 <        a = new Integer[2*SIZE];
464 >        a = new Integer[2 * SIZE];
465          Arrays.fill(a, 42);
466          assertSame(a, full.toArray(a));
467          assertTrue(Arrays.equals(elements, Arrays.copyOf(a, SIZE)));

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines