--- jsr166/src/test/tck/Collection8Test.java	2016/11/06 20:53:53	1.18
+++ jsr166/src/test/tck/Collection8Test.java	2016/11/14 21:33:58	1.23
@@ -98,7 +98,7 @@ public class Collection8Test extends JSR
             assertSame(3, a[2]);
         }
         assertIteratorExhausted(c.iterator());
-        Consumer alwaysThrows = (e) -> { throw new AssertionError(); };
+        Consumer alwaysThrows = e -> { throw new AssertionError(); };
         c.forEach(alwaysThrows);
         c.iterator().forEachRemaining(alwaysThrows);
         c.spliterator().forEachRemaining(alwaysThrows);
@@ -241,6 +241,8 @@ public class Collection8Test extends JSR
 
     public void testRemoveIf() {
         Collection c = impl.emptyCollection();
+        boolean ordered =
+            c.spliterator().hasCharacteristics(Spliterator.ORDERED);
         ThreadLocalRandom rnd = ThreadLocalRandom.current();
         int n = rnd.nextInt(6);
         for (int i = 0; i < n; i++) c.add(impl.makeElement(i));
@@ -256,7 +258,7 @@ public class Collection8Test extends JSR
         ArrayList accepts = new ArrayList();
         ArrayList rejects = new ArrayList();
 
-        Predicate randomPredicate = (e) -> {
+        Predicate randomPredicate = e -> {
             assertNull(threwAt.get());
             switch (rnd.nextInt(3)) {
             case 0: accepts.add(e); return true;
@@ -272,7 +274,13 @@ public class Collection8Test extends JSR
                 assertEquals(modified, accepts.size() > 0);
                 assertEquals(modified, rejects.size() != n);
                 assertEquals(accepts.size() + rejects.size(), n);
-                assertEquals(rejects, Arrays.asList(c.toArray()));
+                if (ordered) {
+                    assertEquals(rejects,
+                                 Arrays.asList(c.toArray()));
+                } else {
+                    assertEquals(new HashSet(rejects),
+                                 new HashSet(Arrays.asList(c.toArray())));
+                }
             } catch (ArithmeticException ok) {
                 assertNotNull(threwAt.get());
                 assertTrue(c.contains(threwAt.get()));
@@ -293,11 +301,22 @@ public class Collection8Test extends JSR
             assertTrue(c.containsAll(rejects));
             assertTrue(c.containsAll(survivors));
             assertTrue(survivors.containsAll(rejects));
-            assertEquals(n - accepts.size(), c.size());
-            for (Object x : accepts) assertFalse(c.contains(x));
+            if (threwAt.get() == null) {
+                assertEquals(n - accepts.size(), c.size());
+                for (Object x : accepts) assertFalse(c.contains(x));
+            } else {
+                // Two acceptable behaviors: entire removeIf call is one
+                // transaction, or each element processed is one transaction.
+                assertTrue(n == c.size() || n == c.size() + accepts.size());
+                int k = 0;
+                for (Object x : accepts) if (c.contains(x)) k++;
+                assertTrue(k == accepts.size() || k == 0);
+            }
         } catch (Throwable ex) {
             System.err.println(impl.klazz());
-            System.err.printf("c=%s%n", c);
+            // c is at risk of corruption if we got here, so be lenient
+            try { System.err.printf("c=%s%n", c); }
+            catch (Throwable t) { t.printStackTrace(); }
             System.err.printf("n=%d%n", n);
             System.err.printf("orig=%s%n", orig);
             System.err.printf("accepts=%s%n", accepts);
@@ -365,7 +384,7 @@ public class Collection8Test extends JSR
 
     /**
      * Calling Iterator#remove() after Iterator#forEachRemaining
-     * should remove last element
+     * should (maybe) remove last element
      */
     public void testRemoveAfterForEachRemaining() {
         Collection c = impl.emptyCollection();
@@ -378,12 +397,18 @@ public class Collection8Test extends JSR
             assertEquals(impl.makeElement(0), it.next());
             assertTrue(it.hasNext());
             assertEquals(impl.makeElement(1), it.next());
-            it.forEachRemaining((e) -> {});
-            it.remove();
-            assertEquals(n - 1, c.size());
-            for (int i = 0; i < n - 1; i++)
-                assertTrue(c.contains(impl.makeElement(i)));
-            assertFalse(c.contains(impl.makeElement(n - 1)));
+            it.forEachRemaining(e -> assertTrue(c.contains(e)));
+            if (testImplementationDetails) {
+                if (c instanceof java.util.concurrent.ArrayBlockingQueue) {
+                    assertIteratorExhausted(it);
+                } else {
+                    it.remove();
+                    assertEquals(n - 1, c.size());
+                    for (int i = 0; i < n - 1; i++)
+                        assertTrue(c.contains(impl.makeElement(i)));
+                    assertFalse(c.contains(impl.makeElement(n - 1)));
+                }
+            }
         }
         if (c instanceof Deque) {
             Deque d = (Deque) impl.emptyCollection();
@@ -394,12 +419,14 @@ public class Collection8Test extends JSR
             assertEquals(impl.makeElement(n - 1), it.next());
             assertTrue(it.hasNext());
             assertEquals(impl.makeElement(n - 2), it.next());
-            it.forEachRemaining((e) -> {});
-            it.remove();
-            assertEquals(n - 1, d.size());
-            for (int i = 1; i < n; i++)
-                assertTrue(d.contains(impl.makeElement(i)));
-            assertFalse(d.contains(impl.makeElement(0)));
+            it.forEachRemaining(e -> assertTrue(c.contains(e)));
+            if (testImplementationDetails) {
+                it.remove();
+                assertEquals(n - 1, d.size());
+                for (int i = 1; i < n; i++)
+                    assertTrue(d.contains(impl.makeElement(i)));
+                assertFalse(d.contains(impl.makeElement(0)));
+            }
         }
     }
 
@@ -412,7 +439,7 @@ public class Collection8Test extends JSR
         final Object x = impl.makeElement(1);
         final Object y = impl.makeElement(2);
         final ArrayList found = new ArrayList();
-        Consumer<Object> spy = (o) -> { found.add(o); };
+        Consumer<Object> spy = o -> found.add(o);
         c.stream().forEach(spy);
         assertTrue(found.isEmpty());
 
@@ -446,7 +473,7 @@ public class Collection8Test extends JSR
             Runnable checkElt = () -> {
                 threadsStarted.countDown();
                 while (!done.get())
-                    c.stream().forEach((x) -> { assertSame(x, elt); }); };
+                    c.stream().forEach(x -> assertSame(x, elt)); };
             Runnable addRemove = () -> {
                 threadsStarted.countDown();
                 while (!done.get()) {
@@ -470,7 +497,7 @@ public class Collection8Test extends JSR
         final Object x = impl.makeElement(1);
         final Object y = impl.makeElement(2);
         final ArrayList found = new ArrayList();
-        Consumer<Object> spy = (o) -> { found.add(o); };
+        Consumer<Object> spy = o -> found.add(o);
         c.forEach(spy);
         assertTrue(found.isEmpty());
 
@@ -504,7 +531,7 @@ public class Collection8Test extends JSR
             Runnable checkElt = () -> {
                 threadsStarted.countDown();
                 while (!done.get())
-                    c.forEach((x) -> { assertSame(x, elt); }); };
+                    c.forEach(x -> assertSame(x, elt)); };
             Runnable addRemove = () -> {
                 threadsStarted.countDown();
                 while (!done.get()) {