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.35 by jsr166, Tue May 26 19:22:09 2015 UTC vs.
Revision 1.40 by jsr166, Thu Apr 5 02:20:21 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.NoSuchElementException;
14   import java.util.Set;
# Line 23 | Line 22 | public class CopyOnWriteArraySetTest ext
22          main(suite(), args);
23      }
24      public static Test suite() {
25 <        return new TestSuite(CopyOnWriteArraySetTest.class);
25 >        class Implementation implements CollectionImplementation {
26 >            public Class<?> klazz() { return CopyOnWriteArraySet.class; }
27 >            public Set emptyCollection() { return new CopyOnWriteArraySet(); }
28 >            public Object makeElement(int i) { return i; }
29 >            public boolean isConcurrent() { return true; }
30 >            public boolean permitsNulls() { return true; }
31 >        }
32 >        return newTestSuite(
33 >                CopyOnWriteArraySetTest.class,
34 >                CollectionTest.testSuite(new Implementation()));
35      }
36  
37      static CopyOnWriteArraySet<Integer> populatedSet(int n) {
38 <        CopyOnWriteArraySet<Integer> a = new CopyOnWriteArraySet<Integer>();
38 >        CopyOnWriteArraySet<Integer> a = new CopyOnWriteArraySet<>();
39          assertTrue(a.isEmpty());
40          for (int i = 0; i < n; i++)
41              a.add(i);
# Line 37 | Line 45 | public class CopyOnWriteArraySetTest ext
45      }
46  
47      static CopyOnWriteArraySet populatedSet(Integer[] elements) {
48 <        CopyOnWriteArraySet<Integer> a = new CopyOnWriteArraySet<Integer>();
48 >        CopyOnWriteArraySet<Integer> a = new CopyOnWriteArraySet<>();
49          assertTrue(a.isEmpty());
50          for (int i = 0; i < elements.length; i++)
51              a.add(elements[i]);
# Line 224 | Line 232 | public class CopyOnWriteArraySetTest ext
232          Integer[] elements = new Integer[SIZE];
233          for (int i = 0; i < SIZE; i++)
234              elements[i] = i;
235 <        Collections.shuffle(Arrays.asList(elements));
235 >        shuffle(elements);
236          Collection<Integer> full = populatedSet(elements);
237  
238          Iterator it = full.iterator();
# Line 311 | Line 319 | public class CopyOnWriteArraySetTest ext
319          Integer[] elements = new Integer[SIZE];
320          for (int i = 0; i < SIZE; i++)
321              elements[i] = i;
322 <        Collections.shuffle(Arrays.asList(elements));
322 >        shuffle(elements);
323          Collection<Integer> full = populatedSet(elements);
324  
325          assertTrue(Arrays.equals(elements, full.toArray()));
# Line 339 | Line 347 | public class CopyOnWriteArraySetTest ext
347          Integer[] elements = new Integer[SIZE];
348          for (int i = 0; i < SIZE; i++)
349              elements[i] = i;
350 <        Collections.shuffle(Arrays.asList(elements));
350 >        shuffle(elements);
351          Collection<Integer> full = populatedSet(elements);
352  
353          Arrays.fill(a, 42);
# Line 377 | Line 385 | public class CopyOnWriteArraySetTest ext
385      }
386  
387      /**
388 <     * A deserialized serialized set is equal
388 >     * A deserialized/reserialized set equals original
389       */
390      public void testSerialization() throws Exception {
391          Set x = populatedSet(SIZE);

Diff Legend

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