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

Comparing jsr166/src/test/tck/CopyOnWriteArraySetTest.java (file contents):
Revision 1.29 by jsr166, Sat Jan 17 22:55:06 2015 UTC vs.
Revision 1.30 by jsr166, Fri Feb 27 19:28:23 2015 UTC

# Line 13 | Line 13 | import java.util.Collections;
13   import java.util.Iterator;
14   import java.util.NoSuchElementException;
15   import java.util.Set;
16 – import java.util.Vector;
16   import java.util.concurrent.CopyOnWriteArraySet;
17  
18   import junit.framework.Test;
# Line 72 | Line 71 | public class CopyOnWriteArraySetTest ext
71       */
72      public void testAddAll() {
73          CopyOnWriteArraySet full = populatedSet(3);
74 <        Vector v = new Vector();
75 <        v.add(three);
76 <        v.add(four);
78 <        v.add(five);
79 <        full.addAll(v);
74 >        assertTrue(full.addAll(Arrays.asList(three, four, five)));
75 >        assertEquals(6, full.size());
76 >        assertFalse(full.addAll(Arrays.asList(three, four, five)));
77          assertEquals(6, full.size());
78      }
79  
# Line 86 | Line 83 | public class CopyOnWriteArraySetTest ext
83       */
84      public void testAddAll2() {
85          CopyOnWriteArraySet full = populatedSet(3);
86 <        Vector v = new Vector();
87 <        v.add(three);
88 <        v.add(four);
89 <        v.add(one); // will not add this element
93 <        full.addAll(v);
86 >        // "one" is duplicate and will not be added
87 >        assertTrue(full.addAll(Arrays.asList(three, four, one)));
88 >        assertEquals(5, full.size());
89 >        assertFalse(full.addAll(Arrays.asList(three, four, one)));
90          assertEquals(5, full.size());
91      }
92  
# Line 153 | Line 149 | public class CopyOnWriteArraySetTest ext
149       */
150      public void testContainsAll() {
151          CopyOnWriteArraySet full = populatedSet(3);
152 <        Vector v = new Vector();
153 <        v.add(one);
154 <        v.add(two);
155 <        assertTrue(full.containsAll(v));
156 <        v.add(six);
161 <        assertFalse(full.containsAll(v));
152 >        assertTrue(full.containsAll(Arrays.asList()));
153 >        assertTrue(full.containsAll(Arrays.asList(one)));
154 >        assertTrue(full.containsAll(Arrays.asList(one, two)));
155 >        assertFalse(full.containsAll(Arrays.asList(one, two, six)));
156 >        assertFalse(full.containsAll(Arrays.asList(six)));
157      }
158  
159      /**
# Line 235 | Line 230 | public class CopyOnWriteArraySetTest ext
230       */
231      public void testRemoveAll() {
232          CopyOnWriteArraySet full = populatedSet(3);
233 <        Vector v = new Vector();
234 <        v.add(one);
235 <        v.add(two);
241 <        full.removeAll(v);
233 >        assertTrue(full.removeAll(Arrays.asList(one, two)));
234 >        assertEquals(1, full.size());
235 >        assertFalse(full.removeAll(Arrays.asList(one, two)));
236          assertEquals(1, full.size());
237      }
238  

Diff Legend

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