--- jsr166/src/test/tck/CompletableFutureTest.java	2014/06/16 21:23:03	1.88
+++ jsr166/src/test/tck/CompletableFutureTest.java	2014/06/17 20:34:18	1.91
@@ -1264,21 +1264,31 @@ public class CompletableFutureTest exten
      */
     public void testThenRun_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final Noop r = new Noop(m);
-        if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Void> g = m.thenRun(f, r);
-        if (createIncomplete) {
-            checkIncomplete(g);
-            assertTrue(f.complete(v1));
-        }
+        final Noop[] rs = new Noop[6];
+        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
 
-        checkCompletedNormally(g, null);
+        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
+        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
+        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
+        checkIncomplete(h0);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        assertTrue(f.complete(v1));
+        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
+        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
+        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
+
+        checkCompletedNormally(h0, null);
+        checkCompletedNormally(h1, null);
+        checkCompletedNormally(h2, null);
+        checkCompletedNormally(h3, null);
+        checkCompletedNormally(h4, null);
+        checkCompletedNormally(h5, null);
         checkCompletedNormally(f, v1);
-        r.assertInvoked();
+        for (Noop r : rs) r.assertInvoked();
     }}
 
     /**
@@ -1287,21 +1297,31 @@ public class CompletableFutureTest exten
      */
     public void testThenRun_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
     {
         final CFException ex = new CFException();
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final Noop r = new Noop(m);
-        if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletableFuture<Void> g = m.thenRun(f, r);
-        if (createIncomplete) {
-            checkIncomplete(g);
-            f.completeExceptionally(ex);
-        }
+        final Noop[] rs = new Noop[6];
+        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
 
-        checkCompletedWithWrappedException(g, ex);
+        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
+        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
+        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
+        checkIncomplete(h0);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        assertTrue(f.completeExceptionally(ex));
+        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
+        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
+        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
+
+        checkCompletedWithWrappedException(h0, ex);
+        checkCompletedWithWrappedException(h1, ex);
+        checkCompletedWithWrappedException(h2, ex);
+        checkCompletedWithWrappedException(h3, ex);
+        checkCompletedWithWrappedException(h4, ex);
+        checkCompletedWithWrappedException(h5, ex);
         checkCompletedExceptionally(f, ex);
-        r.assertNotInvoked();
+        for (Noop r : rs) r.assertNotInvoked();
     }}
 
     /**
@@ -1309,21 +1329,31 @@ public class CompletableFutureTest exten
      */
     public void testThenRun_sourceCancelled() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final Noop r = new Noop(m);
-        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
-        final CompletableFuture<Void> g = m.thenRun(f, r);
-        if (createIncomplete) {
-            checkIncomplete(g);
-            assertTrue(f.cancel(mayInterruptIfRunning));
-        }
+        final Noop[] rs = new Noop[6];
+        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
 
-        checkCompletedWithWrappedCancellationException(g);
+        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
+        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
+        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
+        checkIncomplete(h0);
+        checkIncomplete(h1);
+        checkIncomplete(h2);
+        assertTrue(f.cancel(mayInterruptIfRunning));
+        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
+        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
+        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
+
+        checkCompletedWithWrappedCancellationException(h0);
+        checkCompletedWithWrappedCancellationException(h1);
+        checkCompletedWithWrappedCancellationException(h2);
+        checkCompletedWithWrappedCancellationException(h3);
+        checkCompletedWithWrappedCancellationException(h4);
+        checkCompletedWithWrappedCancellationException(h5);
         checkCancelled(f);
-        r.assertNotInvoked();
+        for (Noop r : rs) r.assertNotInvoked();
     }}
 
     /**
@@ -1331,19 +1361,26 @@ public class CompletableFutureTest exten
      */
     public void testThenRun_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final FailingRunnable r = new FailingRunnable(m);
-        if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Void> g = m.thenRun(f, r);
-        if (createIncomplete) {
-            checkIncomplete(g);
-            assertTrue(f.complete(v1));
-        }
+        final FailingRunnable[] rs = new FailingRunnable[6];
+        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
 
-        checkCompletedWithWrappedCFException(g);
+        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
+        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
+        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
+        assertTrue(f.complete(v1));
+        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
+        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
+        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
+
+        checkCompletedWithWrappedCFException(h0);
+        checkCompletedWithWrappedCFException(h1);
+        checkCompletedWithWrappedCFException(h2);
+        checkCompletedWithWrappedCFException(h3);
+        checkCompletedWithWrappedCFException(h4);
+        checkCompletedWithWrappedCFException(h5);
         checkCompletedNormally(f, v1);
     }}
 
@@ -1352,21 +1389,26 @@ public class CompletableFutureTest exten
      */
     public void testThenApply_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final IncFunction r = new IncFunction(m);
-        if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> g = m.thenApply(f, r);
-        if (createIncomplete) {
-            checkIncomplete(g);
-            assertTrue(f.complete(v1));
-        }
+        final IncFunction[] rs = new IncFunction[4];
+        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        checkCompletedNormally(g, inc(v1));
+        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
+        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
+        checkIncomplete(h0);
+        checkIncomplete(h1);
+        assertTrue(f.complete(v1));
+        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
+        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
+
+        checkCompletedNormally(h0, inc(v1));
+        checkCompletedNormally(h1, inc(v1));
+        checkCompletedNormally(h2, inc(v1));
+        checkCompletedNormally(h3, inc(v1));
         checkCompletedNormally(f, v1);
-        r.assertValue(inc(v1));
+        for (IncFunction r : rs) r.assertValue(inc(v1));
     }}
 
     /**
@@ -1375,21 +1417,24 @@ public class CompletableFutureTest exten
      */
     public void testThenApply_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
     {
         final CFException ex = new CFException();
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final IncFunction r = new IncFunction(m);
-        if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletableFuture<Integer> g = m.thenApply(f, r);
-        if (createIncomplete) {
-            checkIncomplete(g);
-            f.completeExceptionally(ex);
-        }
+        final IncFunction[] rs = new IncFunction[4];
+        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        checkCompletedWithWrappedException(g, ex);
+        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
+        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
+        assertTrue(f.completeExceptionally(ex));
+        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
+        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
+
+        checkCompletedWithWrappedException(h0, ex);
+        checkCompletedWithWrappedException(h1, ex);
+        checkCompletedWithWrappedException(h2, ex);
+        checkCompletedWithWrappedException(h3, ex);
         checkCompletedExceptionally(f, ex);
-        r.assertNotInvoked();
+        for (IncFunction r : rs) r.assertNotInvoked();
     }}
 
     /**
@@ -1397,21 +1442,24 @@ public class CompletableFutureTest exten
      */
     public void testThenApply_sourceCancelled() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final IncFunction r = new IncFunction(m);
-        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
-        final CompletableFuture<Integer> g = m.thenApply(f, r);
-        if (createIncomplete) {
-            checkIncomplete(g);
-            assertTrue(f.cancel(mayInterruptIfRunning));
-        }
+        final IncFunction[] rs = new IncFunction[4];
+        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        checkCompletedWithWrappedCancellationException(g);
+        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
+        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
+        assertTrue(f.cancel(mayInterruptIfRunning));
+        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
+        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
+
+        checkCompletedWithWrappedCancellationException(h0);
+        checkCompletedWithWrappedCancellationException(h1);
+        checkCompletedWithWrappedCancellationException(h2);
+        checkCompletedWithWrappedCancellationException(h3);
         checkCancelled(f);
-        r.assertNotInvoked();
+        for (IncFunction r : rs) r.assertNotInvoked();
     }}
 
     /**
@@ -1419,19 +1467,22 @@ public class CompletableFutureTest exten
      */
     public void testThenApply_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (boolean createIncomplete : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final FailingFunction r = new FailingFunction(m);
-        if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> g = m.thenApply(f, r);
-        if (createIncomplete) {
-            checkIncomplete(g);
-            assertTrue(f.complete(v1));
-        }
+        final FailingFunction[] rs = new FailingFunction[4];
+        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
 
-        checkCompletedWithWrappedCFException(g);
+        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
+        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
+        assertTrue(f.complete(v1));
+        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
+        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
+
+        checkCompletedWithWrappedCFException(h0);
+        checkCompletedWithWrappedCFException(h1);
+        checkCompletedWithWrappedCFException(h2);
+        checkCompletedWithWrappedCFException(h3);
         checkCompletedNormally(f, v1);
     }}
 
@@ -3203,44 +3254,44 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
         final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
 
-        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> dependentFactories
+        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
             = new ArrayList<>();
 
-        dependentFactories.add((y) -> m.thenRun(y, new Noop(m)));
-        dependentFactories.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
-        dependentFactories.add((y) -> m.thenApply(y, new IncFunction(m)));
+        funs.add((y) -> m.thenRun(y, new Noop(m)));
+        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
+        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
 
-        dependentFactories.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
-        dependentFactories.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
-        dependentFactories.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
+        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
+        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
+        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
 
-        dependentFactories.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
-        dependentFactories.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
-        dependentFactories.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
+        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
+        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
+        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
 
-        dependentFactories.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
+        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
 
-        dependentFactories.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
+        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
 
-        dependentFactories.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
-        dependentFactories.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
+        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
+        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
 
         for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
-                 dependentFactory : dependentFactories) {
+                 fun : funs) {
             CompletableFuture<Integer> f = new CompletableFuture<>();
             f.completeExceptionally(ex);
             CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
             checkCompletedWithWrappedException(src, ex);
-            CompletableFuture<?> dep = dependentFactory.apply(src);
+            CompletableFuture<?> dep = fun.apply(src);
             checkCompletedWithWrappedException(dep, ex);
             assertSame(resultOf(src), resultOf(dep));
         }
 
         for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
-                 dependentFactory : dependentFactories) {
+                 fun : funs) {
             CompletableFuture<Integer> f = new CompletableFuture<>();
             CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
-            CompletableFuture<?> dep = dependentFactory.apply(src);
+            CompletableFuture<?> dep = fun.apply(src);
             f.completeExceptionally(ex);
             checkCompletedWithWrappedException(src, ex);
             checkCompletedWithWrappedException(dep, ex);
@@ -3249,23 +3300,23 @@ public class CompletableFutureTest exten
 
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
         for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
-                 dependentFactory : dependentFactories) {
+                 fun : funs) {
             CompletableFuture<Integer> f = new CompletableFuture<>();
             f.cancel(mayInterruptIfRunning);
             checkCancelled(f);
             CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
             checkCompletedWithWrappedCancellationException(src);
-            CompletableFuture<?> dep = dependentFactory.apply(src);
+            CompletableFuture<?> dep = fun.apply(src);
             checkCompletedWithWrappedCancellationException(dep);
             assertSame(resultOf(src), resultOf(dep));
         }
 
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
         for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
-                 dependentFactory : dependentFactories) {
+                 fun : funs) {
             CompletableFuture<Integer> f = new CompletableFuture<>();
             CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
-            CompletableFuture<?> dep = dependentFactory.apply(src);
+            CompletableFuture<?> dep = fun.apply(src);
             f.cancel(mayInterruptIfRunning);
             checkCancelled(f);
             checkCompletedWithWrappedCancellationException(src);