--- jsr166/src/test/tck/Collection8Test.java 2016/11/15 22:59:09 1.26 +++ jsr166/src/test/tck/Collection8Test.java 2016/11/18 17:23:29 1.28 @@ -304,7 +304,7 @@ public class Collection8Test extends JSR switch (rnd.nextInt(4)) { case 0: survivors.addAll(c); break; case 1: survivors.addAll(Arrays.asList(c.toArray())); break; - case 2: c.forEach(e -> survivors.add(e)); break; + case 2: c.forEach(survivors::add); break; case 3: for (Object e : c) survivors.add(e); break; } assertTrue(orig.containsAll(accepts)); @@ -355,11 +355,11 @@ public class Collection8Test extends JSR ArrayList forEached = new ArrayList(); ArrayList removeIfed = new ArrayList(); for (Object x : c) iterated.add(x); - c.iterator().forEachRemaining(e -> iteratedForEachRemaining.add(e)); + c.iterator().forEachRemaining(iteratedForEachRemaining::add); for (Spliterator s = c.spliterator(); - s.tryAdvance(e -> tryAdvanced.add(e)); ) {} - c.spliterator().forEachRemaining(e -> spliterated.add(e)); - c.forEach(e -> forEached.add(e)); + s.tryAdvance(tryAdvanced::add); ) {} + c.spliterator().forEachRemaining(spliterated::add); + c.forEach(forEached::add); c.removeIf(e -> { removeIfed.add(e); return false; }); boolean ordered = c.spliterator().hasCharacteristics(Spliterator.ORDERED); @@ -547,7 +547,7 @@ public class Collection8Test extends JSR final Object two = impl.makeElement(2); final List> futures; final Phaser threadsStarted = new Phaser(1); // register this thread - final List tasks = List.of( + final Runnable[] frobbers = { () -> c.forEach(x -> assertTrue(x == one || x == two)), () -> c.stream().forEach(x -> assertTrue(x == one || x == two)), () -> c.spliterator().trySplit(), @@ -574,8 +574,10 @@ public class Collection8Test extends JSR assertTrue(c.contains(two)); assertTrue(c.remove(two)); assertFalse(c.contains(two)); - }) - .stream() + }, + }; + final List tasks = + Arrays.stream(frobbers) .filter(task -> rnd.nextBoolean()) // random subset .map(task -> (Runnable) () -> { threadsStarted.arriveAndAwaitAdvance(); @@ -587,7 +589,7 @@ public class Collection8Test extends JSR try (PoolCleaner cleaner = cleaner(pool, done)) { threadsStarted.bulkRegister(tasks.size()); futures = tasks.stream() - .map(task -> pool.submit(task)) + .map(pool::submit) .collect(Collectors.toList()); threadsStarted.arriveAndDeregister(); Thread.sleep(testDurationMillis);