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.35 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.39 by jsr166, Wed Aug 24 22:22:39 2016 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;
# Line 177 | Line 176 | public class CopyOnWriteArrayListTest ex
176          CopyOnWriteArrayList b = populatedArray(3);
177          assertTrue(a.equals(b));
178          assertTrue(b.equals(a));
179 +        assertTrue(a.containsAll(b));
180 +        assertTrue(b.containsAll(a));
181          assertEquals(a.hashCode(), b.hashCode());
182          a.add(m1);
183          assertFalse(a.equals(b));
184          assertFalse(b.equals(a));
185 +        assertTrue(a.containsAll(b));
186 +        assertFalse(b.containsAll(a));
187          b.add(m1);
188          assertTrue(a.equals(b));
189          assertTrue(b.equals(a));
190 +        assertTrue(a.containsAll(b));
191 +        assertTrue(b.containsAll(a));
192          assertEquals(a.hashCode(), b.hashCode());
193 +
194 +        assertFalse(a.equals(null));
195      }
196  
197      /**
198 <     * containsAll returns true for collection with subset of elements
198 >     * containsAll returns true for collections with subset of elements
199       */
200      public void testContainsAll() {
201          CopyOnWriteArrayList full = populatedArray(3);
# Line 197 | Line 204 | public class CopyOnWriteArrayListTest ex
204          assertTrue(full.containsAll(Arrays.asList(one, two)));
205          assertFalse(full.containsAll(Arrays.asList(one, two, six)));
206          assertFalse(full.containsAll(Arrays.asList(six)));
207 +
208 +        try {
209 +            full.containsAll(null);
210 +            shouldThrow();
211 +        } catch (NullPointerException success) {}
212      }
213  
214      /**
# Line 251 | Line 263 | public class CopyOnWriteArrayListTest ex
263          Integer[] elements = new Integer[SIZE];
264          for (int i = 0; i < SIZE; i++)
265              elements[i] = i;
266 <        Collections.shuffle(Arrays.asList(elements));
266 >        shuffle(elements);
267          Collection<Integer> full = populatedArray(elements);
268  
269          Iterator it = full.iterator();
# Line 338 | Line 350 | public class CopyOnWriteArrayListTest ex
350          ListIterator i = full.listIterator(1);
351          int j;
352          for (j = 0; i.hasNext(); j++)
353 <            assertEquals(j+1, i.next());
353 >            assertEquals(j + 1, i.next());
354          assertEquals(2, j);
355      }
356  
# Line 419 | Line 431 | public class CopyOnWriteArrayListTest ex
431          Integer[] elements = new Integer[SIZE];
432          for (int i = 0; i < SIZE; i++)
433              elements[i] = i;
434 <        Collections.shuffle(Arrays.asList(elements));
434 >        shuffle(elements);
435          Collection<Integer> full = populatedArray(elements);
436  
437          assertTrue(Arrays.equals(elements, full.toArray()));
# Line 447 | Line 459 | public class CopyOnWriteArrayListTest ex
459          Integer[] elements = new Integer[SIZE];
460          for (int i = 0; i < SIZE; i++)
461              elements[i] = i;
462 <        Collections.shuffle(Arrays.asList(elements));
462 >        shuffle(elements);
463          Collection<Integer> full = populatedArray(elements);
464  
465          Arrays.fill(a, 42);

Diff Legend

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