--- jsr166/src/test/tck/Collection8Test.java	2016/10/29 22:47:55	1.6
+++ jsr166/src/test/tck/Collection8Test.java	2016/11/05 19:56:46	1.13
@@ -49,9 +49,27 @@ public class Collection8Test extends JSR
                                       impl);
     }
 
+    Object bomb() {
+        return new Object() {
+                public boolean equals(Object x) { throw new AssertionError(); }
+                public int hashCode() { throw new AssertionError(); }
+            };
+    }
+
     /** Checks properties of empty collections. */
     public void testEmptyMeansEmpty() {
         Collection c = impl.emptyCollection();
+        emptyMeansEmpty(c);
+
+        if (c instanceof java.io.Serializable)
+            emptyMeansEmpty(serialClone(c));
+
+        Collection clone = cloneableClone(c);
+        if (clone != null)
+            emptyMeansEmpty(clone);
+    }
+
+    void emptyMeansEmpty(Collection c) {
         assertTrue(c.isEmpty());
         assertEquals(0, c.size());
         assertEquals("[]", c.toString());
@@ -81,18 +99,25 @@ public class Collection8Test extends JSR
         c.iterator().forEachRemaining(alwaysThrows);
         c.spliterator().forEachRemaining(alwaysThrows);
         assertFalse(c.spliterator().tryAdvance(alwaysThrows));
-        if (Queue.class.isAssignableFrom(impl.klazz())) {
+        if (c.spliterator().hasCharacteristics(Spliterator.SIZED))
+            assertEquals(0, c.spliterator().estimateSize());
+        assertFalse(c.contains(bomb()));
+        assertFalse(c.remove(bomb()));
+        if (c instanceof Queue) {
             Queue q = (Queue) c;
             assertNull(q.peek());
             assertNull(q.poll());
         }
-        if (Deque.class.isAssignableFrom(impl.klazz())) {
+        if (c instanceof Deque) {
             Deque d = (Deque) c;
             assertNull(d.peekFirst());
             assertNull(d.peekLast());
             assertNull(d.pollFirst());
             assertNull(d.pollLast());
             assertIteratorExhausted(d.descendingIterator());
+            d.descendingIterator().forEachRemaining(alwaysThrows);
+            assertFalse(d.removeFirstOccurrence(bomb()));
+            assertFalse(d.removeLastOccurrence(bomb()));
         }
     }
 
@@ -182,28 +207,32 @@ public class Collection8Test extends JSR
             }
         };
         try {
-            boolean modified = c.removeIf(randomPredicate);
-            if (!modified) {
-                assertNull(threwAt.get());
-                assertEquals(n, rejects.size());
-                assertEquals(0, accepts.size());
-            }
-        } catch (ArithmeticException ok) {}
-        survivors.removeAll(accepts);
-        if (n - accepts.size() != c.size()) {
+            assertFalse(survivors.contains(null));
+            try {
+                boolean modified = c.removeIf(randomPredicate);
+                if (!modified) {
+                    assertNull(threwAt.get());
+                    assertEquals(n, rejects.size());
+                    assertEquals(0, accepts.size());
+                }
+            } catch (ArithmeticException ok) {}
+            survivors.removeAll(accepts);
+            assertEquals(n - accepts.size(), c.size());
+            assertTrue(c.containsAll(survivors));
+            assertTrue(survivors.containsAll(rejects));
+            for (Object x : accepts) assertFalse(c.contains(x));
+            if (threwAt.get() == null)
+                assertEquals(accepts.size() + rejects.size(), n);
+        } catch (Throwable ex) {
             System.err.println(impl.klazz());
-            System.err.println(c);
-            System.err.println(accepts);
-            System.err.println(rejects);
-            System.err.println(survivors);
-            System.err.println(threwAt.get());
-        }
-        assertEquals(n - accepts.size(), c.size());
-        assertTrue(c.containsAll(survivors));
-        assertTrue(survivors.containsAll(rejects));
-        for (Object x : accepts) assertFalse(c.contains(x));
-        if (threwAt.get() == null)
-            assertEquals(accepts.size() + rejects.size(), n);
+            System.err.printf("c=%s%n", c);
+            System.err.printf("n=%d%n", n);
+            System.err.printf("accepts=%s%n", accepts);
+            System.err.printf("rejects=%s%n", rejects);
+            System.err.printf("survivors=%s%n", survivors);
+            System.err.printf("threw=%s%n", threwAt.get());
+            throw ex;
+        }
     }
 
     /**
@@ -216,26 +245,35 @@ public class Collection8Test extends JSR
         for (int i = 0; i < n; i++) c.add(impl.makeElement(i));
         ArrayList iterated = new ArrayList();
         ArrayList iteratedForEachRemaining = new ArrayList();
+        ArrayList tryAdvanced = new ArrayList();
         ArrayList spliterated = new ArrayList();
-        ArrayList foreached = new ArrayList();
+        ArrayList forEached = new ArrayList();
+        ArrayList removeIfed = new ArrayList();
         for (Object x : c) iterated.add(x);
         c.iterator().forEachRemaining(e -> iteratedForEachRemaining.add(e));
+        for (Spliterator s = c.spliterator();
+             s.tryAdvance(e -> tryAdvanced.add(e)); ) {}
         c.spliterator().forEachRemaining(e -> spliterated.add(e));
-        c.forEach(e -> foreached.add(e));
+        c.forEach(e -> forEached.add(e));
+        c.removeIf(e -> { removeIfed.add(e); return false; });
         boolean ordered =
             c.spliterator().hasCharacteristics(Spliterator.ORDERED);
         if (c instanceof List || c instanceof Deque)
             assertTrue(ordered);
         if (ordered) {
             assertEquals(iterated, iteratedForEachRemaining);
+            assertEquals(iterated, tryAdvanced);
             assertEquals(iterated, spliterated);
-            assertEquals(iterated, foreached);
+            assertEquals(iterated, forEached);
+            assertEquals(iterated, removeIfed);
         } else {
             HashSet cset = new HashSet(c);
             assertEquals(cset, new HashSet(iterated));
             assertEquals(cset, new HashSet(iteratedForEachRemaining));
+            assertEquals(cset, new HashSet(tryAdvanced));
             assertEquals(cset, new HashSet(spliterated));
-            assertEquals(cset, new HashSet(foreached));
+            assertEquals(cset, new HashSet(forEached));
+            assertEquals(cset, new HashSet(removeIfed));
         }
         if (c instanceof Deque) {
             Deque d = (Deque) c;