--- jsr166/src/test/tck/ExecutorCompletionService9Test.java	2016/05/22 15:29:32	1.2
+++ jsr166/src/test/tck/ExecutorCompletionService9Test.java	2016/08/24 22:22:39	1.5
@@ -13,10 +13,8 @@ import java.util.HashSet;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletionService;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.Future;
 
 import junit.framework.Test;
@@ -35,7 +33,7 @@ public class ExecutorCompletionService9T
         throws InterruptedException, ExecutionException {
         CompletionService<Integer> cs
             = new ExecutorCompletionService<>(e);
-        solvers.forEach((solver) -> cs.submit(solver));
+        solvers.forEach(cs::submit);
         for (int i = solvers.size(); i > 0; i--) {
             Integer r = cs.take().get();
             if (r != null)
@@ -88,7 +86,7 @@ public class ExecutorCompletionService9T
             () -> 2,
             () -> 3,
             () -> null);
-        solveAll(ForkJoinPool.commonPool(), solvers);
+        solveAll(cachedThreadPool, solvers);
         assertEquals(Set.of(1, 2, 3), results);
     }
 
@@ -102,7 +100,7 @@ public class ExecutorCompletionService9T
             () -> null,
             () -> 1,
             () -> 2);
-        solveAny(ForkJoinPool.commonPool(), solvers);
+        solveAny(cachedThreadPool, solvers);
         assertEquals(1, results.size());
         Integer elt = results.iterator().next();
         assertTrue(elt.equals(1) || elt.equals(2));