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.31 by jsr166, Wed Dec 31 19:05:42 2014 UTC vs.
Revision 1.46 by jsr166, Sun Jan 7 07:07:20 2018 UTC

# Line 9 | Line 9
9   import java.util.ArrayList;
10   import java.util.Arrays;
11   import java.util.Collection;
12 import java.util.Collections;
12   import java.util.Iterator;
13   import java.util.LinkedList;
14   import java.util.List;
15   import java.util.ListIterator;
16   import java.util.NoSuchElementException;
18 import java.util.Vector;
17   import java.util.concurrent.CopyOnWriteArrayList;
18  
19   import junit.framework.Test;
22 import junit.framework.TestSuite;
20  
21   public class CopyOnWriteArrayListTest extends JSR166TestCase {
22  
23      public static void main(String[] args) {
24 <        junit.textui.TestRunner.run(suite());
24 >        main(suite(), args);
25      }
26  
27      public static Test suite() {
28 <        return new TestSuite(CopyOnWriteArrayListTest.class);
28 >        class Implementation implements CollectionImplementation {
29 >            public Class<?> klazz() { return CopyOnWriteArrayList.class; }
30 >            public List emptyCollection() { return new CopyOnWriteArrayList(); }
31 >            public Object makeElement(int i) { return i; }
32 >            public boolean isConcurrent() { return true; }
33 >            public boolean permitsNulls() { return true; }
34 >        }
35 >        class SubListImplementation extends Implementation {
36 >            public List emptyCollection() {
37 >                return super.emptyCollection().subList(0, 0);
38 >            }
39 >        }
40 >        return newTestSuite(
41 >                CopyOnWriteArrayListTest.class,
42 >                CollectionTest.testSuite(new Implementation()),
43 >                CollectionTest.testSuite(new SubListImplementation()));
44      }
45  
46      static CopyOnWriteArrayList<Integer> populatedArray(int n) {
47 <        CopyOnWriteArrayList<Integer> a = new CopyOnWriteArrayList<Integer>();
47 >        CopyOnWriteArrayList<Integer> a = new CopyOnWriteArrayList<>();
48          assertTrue(a.isEmpty());
49          for (int i = 0; i < n; i++)
50              a.add(i);
# Line 42 | Line 54 | public class CopyOnWriteArrayListTest ex
54      }
55  
56      static CopyOnWriteArrayList<Integer> populatedArray(Integer[] elements) {
57 <        CopyOnWriteArrayList<Integer> a = new CopyOnWriteArrayList<Integer>();
57 >        CopyOnWriteArrayList<Integer> a = new CopyOnWriteArrayList<>();
58          assertTrue(a.isEmpty());
59 <        for (int i = 0; i < elements.length; i++)
60 <            a.add(elements[i]);
59 >        for (Integer element : elements)
60 >            a.add(element);
61          assertFalse(a.isEmpty());
62          assertEquals(elements.length, a.size());
63          return a;
# Line 64 | Line 76 | public class CopyOnWriteArrayListTest ex
76       */
77      public void testConstructor2() {
78          Integer[] ints = new Integer[SIZE];
79 <        for (int i = 0; i < SIZE-1; ++i)
79 >        for (int i = 0; i < SIZE - 1; ++i)
80              ints[i] = new Integer(i);
81          CopyOnWriteArrayList a = new CopyOnWriteArrayList(ints);
82          for (int i = 0; i < SIZE; ++i)
# Line 76 | Line 88 | public class CopyOnWriteArrayListTest ex
88       */
89      public void testConstructor3() {
90          Integer[] ints = new Integer[SIZE];
91 <        for (int i = 0; i < SIZE-1; ++i)
91 >        for (int i = 0; i < SIZE - 1; ++i)
92              ints[i] = new Integer(i);
93          CopyOnWriteArrayList a = new CopyOnWriteArrayList(Arrays.asList(ints));
94          for (int i = 0; i < SIZE; ++i)
# Line 84 | Line 96 | public class CopyOnWriteArrayListTest ex
96      }
97  
98      /**
99 <     * addAll adds each element from the given collection
99 >     * addAll adds each element from the given collection, including duplicates
100       */
101      public void testAddAll() {
102          CopyOnWriteArrayList full = populatedArray(3);
103 <        Vector v = new Vector();
92 <        v.add(three);
93 <        v.add(four);
94 <        v.add(five);
95 <        full.addAll(v);
103 >        assertTrue(full.addAll(Arrays.asList(three, four, five)));
104          assertEquals(6, full.size());
105 +        assertTrue(full.addAll(Arrays.asList(three, four, five)));
106 +        assertEquals(9, full.size());
107      }
108  
109      /**
# Line 102 | Line 112 | public class CopyOnWriteArrayListTest ex
112       */
113      public void testAddAllAbsent() {
114          CopyOnWriteArrayList full = populatedArray(3);
115 <        Vector v = new Vector();
116 <        v.add(three);
117 <        v.add(four);
118 <        v.add(one); // will not add this element
109 <        full.addAllAbsent(v);
115 >        // "one" is duplicate and will not be added
116 >        assertEquals(2, full.addAllAbsent(Arrays.asList(three, four, one)));
117 >        assertEquals(5, full.size());
118 >        assertEquals(0, full.addAllAbsent(Arrays.asList(three, four, one)));
119          assertEquals(5, full.size());
120      }
121  
# Line 181 | Line 190 | public class CopyOnWriteArrayListTest ex
190          CopyOnWriteArrayList b = populatedArray(3);
191          assertTrue(a.equals(b));
192          assertTrue(b.equals(a));
193 +        assertTrue(a.containsAll(b));
194 +        assertTrue(b.containsAll(a));
195          assertEquals(a.hashCode(), b.hashCode());
196          a.add(m1);
197          assertFalse(a.equals(b));
198          assertFalse(b.equals(a));
199 +        assertTrue(a.containsAll(b));
200 +        assertFalse(b.containsAll(a));
201          b.add(m1);
202          assertTrue(a.equals(b));
203          assertTrue(b.equals(a));
204 +        assertTrue(a.containsAll(b));
205 +        assertTrue(b.containsAll(a));
206          assertEquals(a.hashCode(), b.hashCode());
207 +
208 +        assertFalse(a.equals(null));
209      }
210  
211      /**
212 <     * containsAll returns true for collection with subset of elements
212 >     * containsAll returns true for collections with subset of elements
213       */
214      public void testContainsAll() {
215          CopyOnWriteArrayList full = populatedArray(3);
216 <        Vector v = new Vector();
217 <        v.add(one);
218 <        v.add(two);
219 <        assertTrue(full.containsAll(v));
220 <        v.add(six);
221 <        assertFalse(full.containsAll(v));
216 >        assertTrue(full.containsAll(Arrays.asList()));
217 >        assertTrue(full.containsAll(Arrays.asList(one)));
218 >        assertTrue(full.containsAll(Arrays.asList(one, two)));
219 >        assertFalse(full.containsAll(Arrays.asList(one, two, six)));
220 >        assertFalse(full.containsAll(Arrays.asList(six)));
221 >
222 >        try {
223 >            full.containsAll(null);
224 >            shouldThrow();
225 >        } catch (NullPointerException success) {}
226      }
227  
228      /**
# Line 256 | Line 277 | public class CopyOnWriteArrayListTest ex
277          Integer[] elements = new Integer[SIZE];
278          for (int i = 0; i < SIZE; i++)
279              elements[i] = i;
280 <        Collections.shuffle(Arrays.asList(elements));
280 >        shuffle(elements);
281          Collection<Integer> full = populatedArray(elements);
282  
283          Iterator it = full.iterator();
# Line 264 | Line 285 | public class CopyOnWriteArrayListTest ex
285              assertTrue(it.hasNext());
286              assertEquals(elements[j], it.next());
287          }
288 <        assertFalse(it.hasNext());
289 <        try {
290 <            it.next();
291 <            shouldThrow();
292 <        } catch (NoSuchElementException success) {}
288 >        assertIteratorExhausted(it);
289 >    }
290 >
291 >    /**
292 >     * iterator of empty collection has no elements
293 >     */
294 >    public void testEmptyIterator() {
295 >        Collection c = new CopyOnWriteArrayList();
296 >        assertIteratorExhausted(c.iterator());
297      }
298  
299      /**
# Line 339 | Line 364 | public class CopyOnWriteArrayListTest ex
364          ListIterator i = full.listIterator(1);
365          int j;
366          for (j = 0; i.hasNext(); j++)
367 <            assertEquals(j+1, i.next());
367 >            assertEquals(j + 1, i.next());
368          assertEquals(2, j);
369      }
370  
# Line 383 | Line 408 | public class CopyOnWriteArrayListTest ex
408       */
409      public void testRemoveAll() {
410          CopyOnWriteArrayList full = populatedArray(3);
411 <        Vector v = new Vector();
412 <        v.add(one);
413 <        v.add(two);
389 <        full.removeAll(v);
411 >        assertTrue(full.removeAll(Arrays.asList(one, two)));
412 >        assertEquals(1, full.size());
413 >        assertFalse(full.removeAll(Arrays.asList(one, two)));
414          assertEquals(1, full.size());
415      }
416  
# Line 421 | Line 445 | public class CopyOnWriteArrayListTest ex
445          Integer[] elements = new Integer[SIZE];
446          for (int i = 0; i < SIZE; i++)
447              elements[i] = i;
448 <        Collections.shuffle(Arrays.asList(elements));
448 >        shuffle(elements);
449          Collection<Integer> full = populatedArray(elements);
450  
451          assertTrue(Arrays.equals(elements, full.toArray()));
# Line 439 | Line 463 | public class CopyOnWriteArrayListTest ex
463          a = new Integer[0];
464          assertSame(a, empty.toArray(a));
465  
466 <        a = new Integer[SIZE/2];
466 >        a = new Integer[SIZE / 2];
467          Arrays.fill(a, 42);
468          assertSame(a, empty.toArray(a));
469          assertNull(a[0]);
# Line 449 | Line 473 | public class CopyOnWriteArrayListTest ex
473          Integer[] elements = new Integer[SIZE];
474          for (int i = 0; i < SIZE; i++)
475              elements[i] = i;
476 <        Collections.shuffle(Arrays.asList(elements));
476 >        shuffle(elements);
477          Collection<Integer> full = populatedArray(elements);
478  
479          Arrays.fill(a, 42);
# Line 463 | Line 487 | public class CopyOnWriteArrayListTest ex
487          assertSame(a, full.toArray(a));
488          assertTrue(Arrays.equals(elements, a));
489  
490 <        a = new Integer[2*SIZE];
490 >        a = new Integer[2 * SIZE];
491          Arrays.fill(a, 42);
492          assertSame(a, full.toArray(a));
493          assertTrue(Arrays.equals(elements, Arrays.copyOf(a, SIZE)));
# Line 723 | Line 747 | public class CopyOnWriteArrayListTest ex
747      }
748  
749      /**
750 <     * a deserialized serialized list is equal
750 >     * a deserialized/reserialized list equals original
751       */
752      public void testSerialization() throws Exception {
753          List x = populatedArray(SIZE);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines