--- jsr166/src/test/tck/CompletableFutureTest.java	2018/09/24 00:20:46	1.210
+++ jsr166/src/test/tck/CompletableFutureTest.java	2018/11/21 23:25:17	1.216
@@ -3116,30 +3116,30 @@ public class CompletableFutureTest exten
         case 0:
             assertTrue(f.complete(v1));
             assertTrue(g.completeExceptionally(ex));
-            h = m.thenCompose(f, (x -> g));
+            h = m.thenCompose(f, x -> g);
             break;
         case 1:
             assertTrue(f.complete(v1));
-            h = m.thenCompose(f, (x -> g));
+            h = m.thenCompose(f, x -> g);
             assertTrue(g.completeExceptionally(ex));
             break;
         case 2:
             assertTrue(g.completeExceptionally(ex));
             assertTrue(f.complete(v1));
-            h = m.thenCompose(f, (x -> g));
+            h = m.thenCompose(f, x -> g);
             break;
         case 3:
             assertTrue(g.completeExceptionally(ex));
-            h = m.thenCompose(f, (x -> g));
+            h = m.thenCompose(f, x -> g);
             assertTrue(f.complete(v1));
             break;
         case 4:
-            h = m.thenCompose(f, (x -> g));
+            h = m.thenCompose(f, x -> g);
             assertTrue(f.complete(v1));
             assertTrue(g.completeExceptionally(ex));
             break;
         case 5:
-            h = m.thenCompose(f, (x -> g));
+            h = m.thenCompose(f, x -> g);
             assertTrue(f.complete(v1));
             assertTrue(g.completeExceptionally(ex));
             break;
@@ -3199,7 +3199,6 @@ public class CompletableFutureTest exten
     public void testExceptionallyCompose_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
     {
         final CFException ex = new CFException();
         final CompletableFuture<Integer> f = new CompletableFuture<>();
@@ -3215,13 +3214,12 @@ public class CompletableFutureTest exten
     }}
 
     /**
-     * thenComposeExceptionally result completes exceptionally if the
+     * exceptionallyCompose result completes exceptionally if the
      * result of the action does
      */
     public void testExceptionallyCompose_actionReturnsFailingFuture() {
         for (ExecutionMode m : ExecutionMode.values())
         for (int order = 0; order < 6; order++)
-        for (Integer v1 : new Integer[] { 1, null })
     {
         final CFException ex0 = new CFException();
         final CFException ex = new CFException();
@@ -3233,30 +3231,30 @@ public class CompletableFutureTest exten
         case 0:
             assertTrue(f.completeExceptionally(ex0));
             assertTrue(g.completeExceptionally(ex));
-            h = m.exceptionallyCompose(f, (x -> g));
+            h = m.exceptionallyCompose(f, x -> g);
             break;
         case 1:
             assertTrue(f.completeExceptionally(ex0));
-            h = m.exceptionallyCompose(f, (x -> g));
+            h = m.exceptionallyCompose(f, x -> g);
             assertTrue(g.completeExceptionally(ex));
             break;
         case 2:
             assertTrue(g.completeExceptionally(ex));
             assertTrue(f.completeExceptionally(ex0));
-            h = m.exceptionallyCompose(f, (x -> g));
+            h = m.exceptionallyCompose(f, x -> g);
             break;
         case 3:
             assertTrue(g.completeExceptionally(ex));
-            h = m.exceptionallyCompose(f, (x -> g));
+            h = m.exceptionallyCompose(f, x -> g);
             assertTrue(f.completeExceptionally(ex0));
             break;
         case 4:
-            h = m.exceptionallyCompose(f, (x -> g));
+            h = m.exceptionallyCompose(f, x -> g);
             assertTrue(f.completeExceptionally(ex0));
             assertTrue(g.completeExceptionally(ex));
             break;
         case 5:
-            h = m.exceptionallyCompose(f, (x -> g));
+            h = m.exceptionallyCompose(f, x -> g);
             assertTrue(f.completeExceptionally(ex0));
             assertTrue(g.completeExceptionally(ex));
             break;
@@ -3647,12 +3645,6 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
         final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
 
-        List<CompletableFuture<?>> futures = new ArrayList<>();
-
-        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
-        srcs.add(complete);
-        srcs.add(incomplete);
-
         List<CompletableFuture<?>> fs = new ArrayList<>();
         fs.add(incomplete.thenRunAsync(() -> {}, e));
         fs.add(incomplete.thenAcceptAsync(z -> {}, e));
@@ -4907,8 +4899,8 @@ public class CompletableFutureTest exten
     }}
 
     /**
-     * default exceptionallyCompose result completes normally after normal
-     * completion of source
+     * default-implemented exceptionallyCompose result completes
+     * normally after normal completion of source
      */
     public void testDefaultExceptionallyCompose_normalCompletion() {
         for (boolean createIncomplete : new boolean[] { true, false })
@@ -4956,7 +4948,6 @@ public class CompletableFutureTest exten
      */
     public void testDefaultExceptionallyCompose_actionFailed() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
     {
         final CFException ex = new CFException();
         final CompletableFuture<Integer> f = new CompletableFuture<>();
@@ -4974,8 +4965,8 @@ public class CompletableFutureTest exten
     }}
 
     /**
-     * default exceptionallyComposeAsync result completes normally after normal
-     * completion of source
+     * default-implemented exceptionallyComposeAsync result completes
+     * normally after normal completion of source
      */
     public void testDefaultExceptionallyComposeAsync_normalCompletion() {
         for (boolean createIncomplete : new boolean[] { true, false })
@@ -5023,7 +5014,6 @@ public class CompletableFutureTest exten
      */
     public void testDefaultExceptionallyComposeAsync_actionFailed() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
     {
         final CFException ex = new CFException();
         final CompletableFuture<Integer> f = new CompletableFuture<>();
@@ -5040,10 +5030,9 @@ public class CompletableFutureTest exten
         r.assertInvoked();
     }}
 
-
     /**
-     * default exceptionallyComposeAsync result completes normally after normal
-     * completion of source
+     * default-implemented exceptionallyComposeAsync result completes
+     * normally after normal completion of source
      */
     public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
         for (boolean createIncomplete : new boolean[] { true, false })
@@ -5091,7 +5080,6 @@ public class CompletableFutureTest exten
      */
     public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
     {
         final CFException ex = new CFException();
         final CompletableFuture<Integer> f = new CompletableFuture<>();