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.38 by jsr166, Wed Aug 10 01:28:14 2016 UTC

# Line 177 | Line 177 | public class CopyOnWriteArrayListTest ex
177          CopyOnWriteArrayList b = populatedArray(3);
178          assertTrue(a.equals(b));
179          assertTrue(b.equals(a));
180 +        assertTrue(a.containsAll(b));
181 +        assertTrue(b.containsAll(a));
182          assertEquals(a.hashCode(), b.hashCode());
183          a.add(m1);
184          assertFalse(a.equals(b));
185          assertFalse(b.equals(a));
186 +        assertTrue(a.containsAll(b));
187 +        assertFalse(b.containsAll(a));
188          b.add(m1);
189          assertTrue(a.equals(b));
190          assertTrue(b.equals(a));
191 +        assertTrue(a.containsAll(b));
192 +        assertTrue(b.containsAll(a));
193          assertEquals(a.hashCode(), b.hashCode());
194 +
195 +        assertFalse(a.equals(null));
196      }
197  
198      /**
199 <     * containsAll returns true for collection with subset of elements
199 >     * containsAll returns true for collections with subset of elements
200       */
201      public void testContainsAll() {
202          CopyOnWriteArrayList full = populatedArray(3);
# Line 197 | Line 205 | public class CopyOnWriteArrayListTest ex
205          assertTrue(full.containsAll(Arrays.asList(one, two)));
206          assertFalse(full.containsAll(Arrays.asList(one, two, six)));
207          assertFalse(full.containsAll(Arrays.asList(six)));
208 +
209 +        try {
210 +            full.containsAll(null);
211 +            shouldThrow();
212 +        } catch (NullPointerException success) {}
213      }
214  
215      /**
# Line 251 | Line 264 | public class CopyOnWriteArrayListTest ex
264          Integer[] elements = new Integer[SIZE];
265          for (int i = 0; i < SIZE; i++)
266              elements[i] = i;
267 <        Collections.shuffle(Arrays.asList(elements));
267 >        shuffle(elements);
268          Collection<Integer> full = populatedArray(elements);
269  
270          Iterator it = full.iterator();
# Line 338 | Line 351 | public class CopyOnWriteArrayListTest ex
351          ListIterator i = full.listIterator(1);
352          int j;
353          for (j = 0; i.hasNext(); j++)
354 <            assertEquals(j+1, i.next());
354 >            assertEquals(j + 1, i.next());
355          assertEquals(2, j);
356      }
357  
# Line 419 | Line 432 | public class CopyOnWriteArrayListTest ex
432          Integer[] elements = new Integer[SIZE];
433          for (int i = 0; i < SIZE; i++)
434              elements[i] = i;
435 <        Collections.shuffle(Arrays.asList(elements));
435 >        shuffle(elements);
436          Collection<Integer> full = populatedArray(elements);
437  
438          assertTrue(Arrays.equals(elements, full.toArray()));
# Line 447 | Line 460 | public class CopyOnWriteArrayListTest ex
460          Integer[] elements = new Integer[SIZE];
461          for (int i = 0; i < SIZE; i++)
462              elements[i] = i;
463 <        Collections.shuffle(Arrays.asList(elements));
463 >        shuffle(elements);
464          Collection<Integer> full = populatedArray(elements);
465  
466          Arrays.fill(a, 42);

Diff Legend

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