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.32 by jsr166, Sat Jan 17 22:55:06 2015 UTC vs.
Revision 1.33 by jsr166, Fri Feb 27 19:28:23 2015 UTC

# Line 15 | Line 15 | import java.util.LinkedList;
15   import java.util.List;
16   import java.util.ListIterator;
17   import java.util.NoSuchElementException;
18 – import java.util.Vector;
18   import java.util.concurrent.CopyOnWriteArrayList;
19  
20   import junit.framework.Test;
# Line 84 | 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();
92 <        v.add(three);
93 <        v.add(four);
94 <        v.add(five);
95 <        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 102 | 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
109 <        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 196 | 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);
204 <        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 387 | 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);
393 <        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  

Diff Legend

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