[ViewVC] Diff of: jsr166/jsr166/src/test/tck/Collection8Test.java

Comparing jsr166/src/test/tck/Collection8Test.java (file contents):
Revision 1.38 by jsr166, Wed Dec 7 22:03:41 2016 UTC vs.
Revision 1.44 by jsr166, Sun Dec 18 20:47:28 2016 UTC

+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
-+
+import java.util.ConcurrentModificationException;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.Iterator;
+    /**
-+
+     * All elements removed in the middle of CONCURRENT traversal.
-+
+     */
-+
+    public void testElementRemovalDuringTraversal() {
-+
+        Collection c = impl.emptyCollection();
-+
+        ThreadLocalRandom rnd = ThreadLocalRandom.current();
-+
+        int n = rnd.nextInt(6);
-+
+        ArrayList copy = new ArrayList();
-+
+        for (int i = 0; i < n; i++) {
-+
+            Object x = impl.makeElement(i);
-+
+            copy.add(x);
-+
+            c.add(x);
-+
+        }
-+
+        ArrayList iterated = new ArrayList();
-+
+        ArrayList spliterated = new ArrayList();
-+
+        Spliterator s = c.spliterator();
-+
+        Iterator it = c.iterator();
-+
+        for (int i = rnd.nextInt(n + 1); --i >= 0; ) {
-+
+            assertTrue(s.tryAdvance(spliterated::add));
-+
+            if (rnd.nextBoolean()) assertTrue(it.hasNext());
-+
+            iterated.add(it.next());
-+
+        }
-+
+        Consumer alwaysThrows = e -> { throw new AssertionError(); };
-+
+        if (s.hasCharacteristics(Spliterator.CONCURRENT)) {
-+
+            c.clear();          // TODO: many more removal methods
-+
+            if (testImplementationDetails
-+
+                && !(c instanceof java.util.concurrent.ArrayBlockingQueue)) {
-+
+                if (rnd.nextBoolean())
-+
+                    assertFalse(s.tryAdvance(alwaysThrows));
-+
+                else
-+
+                    s.forEachRemaining(alwaysThrows);
-+
+            }
-+
+            if (it.hasNext()) iterated.add(it.next());
-+
+            if (rnd.nextBoolean()) assertIteratorExhausted(it);
-+
+        }
-+
+        assertTrue(copy.containsAll(iterated));
-+
+        assertTrue(copy.containsAll(spliterated));
-+
+    }
-+
-+
+    /**
-+
+     * Some elements randomly disappear in the middle of traversal.
-+
+     */
-+
+    public void testRandomElementRemovalDuringTraversal() {
-+
+        Collection c = impl.emptyCollection();
-+
+        ThreadLocalRandom rnd = ThreadLocalRandom.current();
-+
+        int n = rnd.nextInt(6);
-+
+        ArrayList copy = new ArrayList();
-+
+        for (int i = 0; i < n; i++) {
-+
+            Object x = impl.makeElement(i);
-+
+            copy.add(x);
-+
+            c.add(x);
-+
+        }
-+
+        ArrayList iterated = new ArrayList();
-+
+        ArrayList spliterated = new ArrayList();
-+
+        ArrayList removed = new ArrayList();
-+
+        Spliterator s = c.spliterator();
-+
+        Iterator it = c.iterator();
-+
+        if (! (s.hasCharacteristics(Spliterator.CONCURRENT) ||
-+
+               s.hasCharacteristics(Spliterator.IMMUTABLE)))
-+
+            return;
-+
+        for (int i = rnd.nextInt(n + 1); --i >= 0; ) {
-+
+            assertTrue(s.tryAdvance(e -> {}));
-+
+            if (rnd.nextBoolean()) assertTrue(it.hasNext());
-+
+            it.next();
-+
+        }
-+
+        Consumer alwaysThrows = e -> { throw new AssertionError(); };
-+
+        // TODO: many more removal methods
-+
+        if (rnd.nextBoolean()) {
-+
+            for (Iterator z = c.iterator(); z.hasNext(); ) {
-+
+                Object e = z.next();
-+
+                if (rnd.nextBoolean()) {
-+
+                    try {
-+
+                        z.remove();
-+
+                    } catch (UnsupportedOperationException ok) { return; }
-+
+                    removed.add(e);
-+
+                }
-+
+            }
-+
+        } else {
-+
+            Predicate randomlyRemove = e -> {
-+
+                if (rnd.nextBoolean()) { removed.add(e); return true; }
-+
+                else return false;
-+
+            };
-+
+            c.removeIf(randomlyRemove);
-+
+        }
-+
+        s.forEachRemaining(spliterated::add);
-+
+        while (it.hasNext())
-+
+            iterated.add(it.next());
-+
+        assertTrue(copy.containsAll(iterated));
-+
+        assertTrue(copy.containsAll(spliterated));
-+
+        assertTrue(copy.containsAll(removed));
-+
+        if (s.hasCharacteristics(Spliterator.CONCURRENT)) {
-+
+            ArrayList iteratedAndRemoved = new ArrayList(iterated);
-+
+            ArrayList spliteratedAndRemoved = new ArrayList(spliterated);
-+
+            iteratedAndRemoved.retainAll(removed);
-+
+            spliteratedAndRemoved.retainAll(removed);
-+
+            assertTrue(iteratedAndRemoved.size() <= 1);
-+
+            assertTrue(spliteratedAndRemoved.size() <= 1);
-+
+            if (testImplementationDetails
-+
+                && !(c instanceof java.util.concurrent.ArrayBlockingQueue))
-+
+                assertTrue(spliteratedAndRemoved.isEmpty());
-+
+        }
-+
+    }
-+
-+
+    /**
+     * Various ways of traversing a collection yield same elements
+     */
-<
+    public void testIteratorEquivalence() {
->
+    public void testTraversalEquivalence() {
+        Collection c = impl.emptyCollection();
+        ThreadLocalRandom rnd = ThreadLocalRandom.current();
+        int n = rnd.nextInt(6);
+    /**
-+
+     * Iterator.forEachRemaining has same behavior as Iterator's
-+
+     * default implementation.
-+
+     */
-+
+    public void testForEachRemainingConsistentWithDefaultImplementation() {
-+
+        Collection c = impl.emptyCollection();
-+
+        if (!testImplementationDetails
-+
+            || c.getClass() == java.util.LinkedList.class)
-+
+            return;
-+
+        ThreadLocalRandom rnd = ThreadLocalRandom.current();
-+
+        int n = 1 + rnd.nextInt(3);
-+
+        for (int i = 0; i < n; i++) c.add(impl.makeElement(i));
-+
+        ArrayList iterated = new ArrayList();
-+
+        ArrayList iteratedForEachRemaining = new ArrayList();
-+
+        Iterator it1 = c.iterator();
-+
+        Iterator it2 = c.iterator();
-+
+        assertTrue(it1.hasNext());
-+
+        assertTrue(it2.hasNext());
-+
+        c.clear();
-+
+        Object r1, r2;
-+
+        try {
-+
+            while (it1.hasNext()) iterated.add(it1.next());
-+
+            r1 = iterated;
-+
+        } catch (ConcurrentModificationException ex) {
-+
+            r1 = ConcurrentModificationException.class;
-+
+            assertFalse(impl.isConcurrent());
-+
+        }
-+
+        try {
-+
+            it2.forEachRemaining(iteratedForEachRemaining::add);
-+
+            r2 = iteratedForEachRemaining;
-+
+        } catch (ConcurrentModificationException ex) {
-+
+            r2 = ConcurrentModificationException.class;
-+
+            assertFalse(impl.isConcurrent());
-+
+        }
-+
+        assertEquals(r1, r2);
-+
+    }
-+
-+
+    /**
+     * Calling Iterator#remove() after Iterator#forEachRemaining
+     * should (maybe) remove last element
+     */
-+
+    /**
-+
+     * Spliterator.getComparator throws IllegalStateException iff the
-+
+     * spliterator does not report SORTED.
-+
+     */
-+
+    public void testGetComparator_IllegalStateException() {
-+
+        Collection c = impl.emptyCollection();
-+
+        Spliterator s = c.spliterator();
-+
+        boolean reportsSorted = s.hasCharacteristics(Spliterator.SORTED);
-+
+        try {
-+
+            s.getComparator();
-+
+            assertTrue(reportsSorted);
-+
+        } catch (IllegalStateException ex) {
-+
+            assertFalse(reportsSorted);
-+
+        }
-+
+    }
-+
+//     public void testCollection8DebugFail() {
+//         fail(impl.klazz().getSimpleName());
+//     }

Diff Legend

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

Comparing jsr166/src/test/tck/Collection8Test.java (file contents): Revision 1.38 by jsr166, Wed Dec 7 22:03:41 2016 UTC vs. Revision 1.44 by jsr166, Sun Dec 18 20:47:28 2016 UTC

Diff Legend

Comparing jsr166/src/test/tck/Collection8Test.java (file contents):
Revision 1.38 by jsr166, Wed Dec 7 22:03:41 2016 UTC vs.
Revision 1.44 by jsr166, Sun Dec 18 20:47:28 2016 UTC