ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.47 by jsr166, Mon Jun 2 18:21:34 2014 UTC vs.
Revision 1.57 by jsr166, Mon Jun 2 22:48:50 2014 UTC

# Line 17 | Line 17 | import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19   import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 282 | Line 284 | public class CompletableFutureTest exten
284      public void testGetNumberOfDependents() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286          assertEquals(0, f.getNumberOfDependents());
287 <        CompletableFuture g = f.thenRun(new Noop());
287 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
288          assertEquals(1, f.getNumberOfDependents());
289          assertEquals(0, g.getNumberOfDependents());
290 <        CompletableFuture h = f.thenRun(new Noop());
290 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
291          assertEquals(2, f.getNumberOfDependents());
292          f.complete(1);
293          checkCompletedNormally(g, null);
# Line 347 | Line 349 | public class CompletableFutureTest exten
349          }
350      }
351      static final class IncFunction implements Function<Integer,Integer> {
352 +        final ExecutionMode m;
353          int invocationCount = 0;
354          Integer value;
355 +        IncFunction(ExecutionMode m) { this.m = m; }
356          public Integer apply(Integer x) {
357 +            m.checkExecutionMode();
358              invocationCount++;
359              return value = inc(x);
360          }
361      }
362      static final class SubtractAction implements BiConsumer<Integer, Integer> {
363 +        final ExecutionMode m;
364          int invocationCount = 0;
365          Integer value;
366          // Check this action was invoked exactly once when result is computed.
367 +        SubtractAction(ExecutionMode m) { this.m = m; }
368          public void accept(Integer x, Integer y) {
369 +            m.checkExecutionMode();
370              invocationCount++;
371              value = subtract(x, y);
372          }
373      }
374      static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
375 +        final ExecutionMode m;
376          int invocationCount = 0;
377          Integer value;
378          // Check this action was invoked exactly once when result is computed.
379 +        SubtractFunction(ExecutionMode m) { this.m = m; }
380          public Integer apply(Integer x, Integer y) {
381 +            m.checkExecutionMode();
382              invocationCount++;
383              return value = subtract(x, y);
384          }
385      }
386      static final class Noop implements Runnable {
387 +        final ExecutionMode m;
388          int invocationCount = 0;
389 +        Noop(ExecutionMode m) { this.m = m; }
390          public void run() {
391 +            m.checkExecutionMode();
392              invocationCount++;
393          }
394      }
395  
396      static final class FailingSupplier implements Supplier<Integer> {
397 +        final ExecutionMode m;
398          int invocationCount = 0;
399 +        FailingSupplier(ExecutionMode m) { this.m = m; }
400          public Integer get() {
401 +            m.checkExecutionMode();
402              invocationCount++;
403              throw new CFException();
404          }
405      }
406      static final class FailingConsumer implements Consumer<Integer> {
407 +        final ExecutionMode m;
408          int invocationCount = 0;
409 +        FailingConsumer(ExecutionMode m) { this.m = m; }
410          public void accept(Integer x) {
411 +            m.checkExecutionMode();
412              invocationCount++;
413              throw new CFException();
414          }
415      }
416      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
417 +        final ExecutionMode m;
418          int invocationCount = 0;
419 +        FailingBiConsumer(ExecutionMode m) { this.m = m; }
420          public void accept(Integer x, Integer y) {
421 +            m.checkExecutionMode();
422              invocationCount++;
423              throw new CFException();
424          }
425      }
426      static final class FailingFunction implements Function<Integer, Integer> {
427 +        final ExecutionMode m;
428          int invocationCount = 0;
429 +        FailingFunction(ExecutionMode m) { this.m = m; }
430          public Integer apply(Integer x) {
431 +            m.checkExecutionMode();
432              invocationCount++;
433              throw new CFException();
434          }
435      }
436      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
437 +        final ExecutionMode m;
438          int invocationCount = 0;
439 +        FailingBiFunction(ExecutionMode m) { this.m = m; }
440          public Integer apply(Integer x, Integer y) {
441 +            m.checkExecutionMode();
442              invocationCount++;
443              throw new CFException();
444          }
445      }
446 <    static final class FailingNoop implements Runnable {
446 >    static final class FailingRunnable implements Runnable {
447 >        final ExecutionMode m;
448          int invocationCount = 0;
449 +        FailingRunnable(ExecutionMode m) { this.m = m; }
450          public void run() {
451 +            m.checkExecutionMode();
452              invocationCount++;
453              throw new CFException();
454          }
# Line 424 | Line 456 | public class CompletableFutureTest exten
456  
457      static final class CompletableFutureInc
458          implements Function<Integer, CompletableFuture<Integer>> {
459 +        final ExecutionMode m;
460          int invocationCount = 0;
461 +        CompletableFutureInc(ExecutionMode m) { this.m = m; }
462          public CompletableFuture<Integer> apply(Integer x) {
463 +            m.checkExecutionMode();
464              invocationCount++;
465              CompletableFuture<Integer> f = new CompletableFuture<>();
466              f.complete(inc(x));
# Line 435 | Line 470 | public class CompletableFutureTest exten
470  
471      static final class FailingCompletableFutureFunction
472          implements Function<Integer, CompletableFuture<Integer>> {
473 +        final ExecutionMode m;
474          int invocationCount = 0;
475 +        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
476          public CompletableFuture<Integer> apply(Integer x) {
477 +            m.checkExecutionMode();
478              invocationCount++;
479              throw new CFException();
480          }
# Line 444 | Line 482 | public class CompletableFutureTest exten
482  
483      // Used for explicit executor tests
484      static final class ThreadExecutor implements Executor {
485 <        AtomicInteger count = new AtomicInteger(0);
485 >        final AtomicInteger count = new AtomicInteger(0);
486 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
487 >        static boolean startedCurrentThread() {
488 >            return Thread.currentThread().getThreadGroup() == tg;
489 >        }
490  
491          public void execute(Runnable r) {
492              count.getAndIncrement();
493 <            new Thread(r).start();
493 >            new Thread(tg, r).start();
494          }
495      }
496  
# Line 458 | Line 500 | public class CompletableFutureTest exten
500       */
501      enum ExecutionMode {
502          DEFAULT {
503 +            public void checkExecutionMode() {
504 +                assertNull(ForkJoinTask.getPool());
505 +            }
506 +            public CompletableFuture<Void> runAsync(Runnable a) {
507 +                throw new UnsupportedOperationException();
508 +            }
509              public <T> CompletableFuture<Void> thenRun
510                  (CompletableFuture<T> f, Runnable a) {
511                  return f.thenRun(a);
# Line 521 | Line 569 | public class CompletableFutureTest exten
569              }
570          },
571  
572 <        DEFAULT_ASYNC {
572 >        ASYNC {
573 >            public void checkExecutionMode() {
574 >                assertSame(ForkJoinPool.commonPool(),
575 >                           ForkJoinTask.getPool());
576 >            }
577 >            public CompletableFuture<Void> runAsync(Runnable a) {
578 >                return CompletableFuture.runAsync(a);
579 >            }
580              public <T> CompletableFuture<Void> thenRun
581                  (CompletableFuture<T> f, Runnable a) {
582                  return f.thenRunAsync(a);
# Line 586 | Line 641 | public class CompletableFutureTest exten
641          },
642  
643          EXECUTOR {
644 +            public void checkExecutionMode() {
645 +                assertTrue(ThreadExecutor.startedCurrentThread());
646 +            }
647 +            public CompletableFuture<Void> runAsync(Runnable a) {
648 +                return CompletableFuture.runAsync(a, new ThreadExecutor());
649 +            }
650              public <T> CompletableFuture<Void> thenRun
651                  (CompletableFuture<T> f, Runnable a) {
652                  return f.thenRunAsync(a, new ThreadExecutor());
# Line 649 | Line 710 | public class CompletableFutureTest exten
710              }
711          };
712  
713 +        public abstract void checkExecutionMode();
714 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
715          public abstract <T> CompletableFuture<Void> thenRun
716              (CompletableFuture<T> f, Runnable a);
717          public abstract <T> CompletableFuture<Void> thenAccept
# Line 727 | Line 790 | public class CompletableFutureTest exten
790          if (!createIncomplete) f.completeExceptionally(ex);
791          final CompletableFuture<Integer> g = f.exceptionally
792              ((Throwable t) -> {
793 +                ExecutionMode.DEFAULT.checkExecutionMode();
794                  threadAssertSame(t, ex);
795                  a.getAndIncrement();
796                  return v1;
# Line 748 | Line 812 | public class CompletableFutureTest exten
812          if (!createIncomplete) f.completeExceptionally(ex1);
813          final CompletableFuture<Integer> g = f.exceptionally
814              ((Throwable t) -> {
815 +                ExecutionMode.DEFAULT.checkExecutionMode();
816                  threadAssertSame(t, ex1);
817                  a.getAndIncrement();
818                  throw ex2;
# Line 773 | Line 838 | public class CompletableFutureTest exten
838          final CompletableFuture<Integer> g = m.handle
839              (f,
840               (Integer x, Throwable t) -> {
841 +                m.checkExecutionMode();
842                  threadAssertSame(x, v1);
843                  threadAssertNull(t);
844                  a.getAndIncrement();
# Line 801 | Line 867 | public class CompletableFutureTest exten
867          final CompletableFuture<Integer> g = m.handle
868              (f,
869               (Integer x, Throwable t) -> {
870 +                m.checkExecutionMode();
871                  threadAssertNull(x);
872                  threadAssertSame(t, ex);
873                  a.getAndIncrement();
# Line 829 | Line 896 | public class CompletableFutureTest exten
896          final CompletableFuture<Integer> g = m.handle
897              (f,
898               (Integer x, Throwable t) -> {
899 +                m.checkExecutionMode();
900                  threadAssertNull(x);
901                  threadAssertTrue(t instanceof CancellationException);
902                  a.getAndIncrement();
# Line 856 | Line 924 | public class CompletableFutureTest exten
924          final CompletableFuture<Integer> g = m.handle
925              (f,
926               (Integer x, Throwable t) -> {
927 +                m.checkExecutionMode();
928                  threadAssertNull(x);
929                  threadAssertSame(ex1, t);
930                  a.getAndIncrement();
# Line 880 | Line 949 | public class CompletableFutureTest exten
949          final CompletableFuture<Integer> g = m.handle
950              (f,
951               (Integer x, Throwable t) -> {
952 +                m.checkExecutionMode();
953                  threadAssertSame(x, v1);
954                  threadAssertNull(t);
955                  a.getAndIncrement();
# Line 895 | Line 965 | public class CompletableFutureTest exten
965      /**
966       * runAsync completes after running Runnable
967       */
968 <    public void testRunAsync() {
969 <        Noop r = new Noop();
970 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
968 >    public void testRunAsync_normalCompletion() {
969 >        ExecutionMode[] executionModes = {
970 >            ExecutionMode.ASYNC,
971 >            ExecutionMode.EXECUTOR,
972 >        };
973 >        for (ExecutionMode m : executionModes)
974 >    {
975 >        final Noop r = new Noop(m);
976 >        final CompletableFuture<Void> f = m.runAsync(r);
977          assertNull(f.join());
902        assertEquals(1, r.invocationCount);
978          checkCompletedNormally(f, null);
904    }
905
906    /**
907     * runAsync with executor completes after running Runnable
908     */
909    public void testRunAsync2() {
910        Noop r = new Noop();
911        ThreadExecutor exec = new ThreadExecutor();
912        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
913        assertNull(f.join());
979          assertEquals(1, r.invocationCount);
980 <        checkCompletedNormally(f, null);
916 <        assertEquals(1, exec.count.get());
917 <    }
980 >    }}
981  
982      /**
983       * failing runAsync completes exceptionally after running Runnable
984       */
985 <    public void testRunAsync3() {
986 <        FailingNoop r = new FailingNoop();
987 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
985 >    public void testRunAsync_exceptionalCompletion() {
986 >        ExecutionMode[] executionModes = {
987 >            ExecutionMode.ASYNC,
988 >            ExecutionMode.EXECUTOR,
989 >        };
990 >        for (ExecutionMode m : executionModes)
991 >    {
992 >        final FailingRunnable r = new FailingRunnable(m);
993 >        final CompletableFuture<Void> f = m.runAsync(r);
994          checkCompletedWithWrappedCFException(f);
995          assertEquals(1, r.invocationCount);
996 <    }
996 >    }}
997  
998      /**
999       * supplyAsync completes with result of supplier
# Line 950 | Line 1019 | public class CompletableFutureTest exten
1019       * Failing supplyAsync completes exceptionally
1020       */
1021      public void testSupplyAsync3() {
1022 <        FailingSupplier r = new FailingSupplier();
1022 >        FailingSupplier r = new FailingSupplier(ExecutionMode.ASYNC);
1023          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1024          checkCompletedWithWrappedCFException(f);
1025          assertEquals(1, r.invocationCount);
# Line 961 | Line 1030 | public class CompletableFutureTest exten
1030      /**
1031       * thenRun result completes normally after normal completion of source
1032       */
1033 <    public void testThenRun() {
1034 <        CompletableFuture<Integer> f;
1035 <        CompletableFuture<Void> g;
1036 <        Noop r;
1037 <
1038 <        f = new CompletableFuture<>();
1039 <        g = f.thenRun(r = new Noop());
1040 <        f.complete(null);
1041 <        checkCompletedNormally(g, null);
1042 <        assertEquals(1, r.invocationCount);
1033 >    public void testThenRun_normalCompletion() {
1034 >        for (ExecutionMode m : ExecutionMode.values())
1035 >        for (boolean createIncomplete : new boolean[] { true, false })
1036 >        for (Integer v1 : new Integer[] { 1, null })
1037 >    {
1038 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1039 >        final Noop r = new Noop(m);
1040 >        if (!createIncomplete) f.complete(v1);
1041 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1042 >        if (createIncomplete) {
1043 >            checkIncomplete(g);
1044 >            f.complete(v1);
1045 >        }
1046  
975        f = new CompletableFuture<>();
976        f.complete(null);
977        g = f.thenRun(r = new Noop());
1047          checkCompletedNormally(g, null);
1048 +        checkCompletedNormally(f, v1);
1049          assertEquals(1, r.invocationCount);
1050 <    }
1050 >    }}
1051  
1052      /**
1053       * thenRun result completes exceptionally after exceptional
1054       * completion of source
1055       */
1056 <    public void testThenRun2() {
1057 <        CompletableFuture<Integer> f;
1058 <        CompletableFuture<Void> g;
1059 <        Noop r;
1060 <
1061 <        f = new CompletableFuture<>();
1062 <        g = f.thenRun(r = new Noop());
1063 <        f.completeExceptionally(new CFException());
1064 <        checkCompletedWithWrappedCFException(g);
1065 <        assertEquals(0, r.invocationCount);
1056 >    public void testThenRun_exceptionalCompletion() {
1057 >        for (ExecutionMode m : ExecutionMode.values())
1058 >        for (boolean createIncomplete : new boolean[] { true, false })
1059 >    {
1060 >        final CFException ex = new CFException();
1061 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1062 >        final Noop r = new Noop(m);
1063 >        if (!createIncomplete) f.completeExceptionally(ex);
1064 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1065 >        if (createIncomplete) {
1066 >            checkIncomplete(g);
1067 >            f.completeExceptionally(ex);
1068 >        }
1069  
1070 <        f = new CompletableFuture<>();
1071 <        f.completeExceptionally(new CFException());
999 <        g = f.thenRun(r = new Noop());
1000 <        checkCompletedWithWrappedCFException(g);
1070 >        checkCompletedWithWrappedCFException(g, ex);
1071 >        checkCompletedWithWrappedCFException(f, ex);
1072          assertEquals(0, r.invocationCount);
1073 <    }
1003 <
1004 <    /**
1005 <     * thenRun result completes exceptionally if action does
1006 <     */
1007 <    public void testThenRun3() {
1008 <        CompletableFuture<Integer> f;
1009 <        CompletableFuture<Void> g;
1010 <        FailingNoop r;
1011 <
1012 <        f = new CompletableFuture<>();
1013 <        g = f.thenRun(r = new FailingNoop());
1014 <        f.complete(null);
1015 <        checkCompletedWithWrappedCFException(g);
1016 <
1017 <        f = new CompletableFuture<>();
1018 <        f.complete(null);
1019 <        g = f.thenRun(r = new FailingNoop());
1020 <        checkCompletedWithWrappedCFException(g);
1021 <    }
1073 >    }}
1074  
1075      /**
1076       * thenRun result completes exceptionally if source cancelled
1077       */
1078 <    public void testThenRun4() {
1027 <        CompletableFuture<Integer> f;
1028 <        CompletableFuture<Void> g;
1029 <        Noop r;
1030 <
1031 <        f = new CompletableFuture<>();
1032 <        g = f.thenRun(r = new Noop());
1033 <        assertTrue(f.cancel(true));
1034 <        checkCompletedWithWrappedCancellationException(g);
1035 <
1036 <        f = new CompletableFuture<>();
1037 <        assertTrue(f.cancel(true));
1038 <        g = f.thenRun(r = new Noop());
1039 <        checkCompletedWithWrappedCancellationException(g);
1040 <    }
1041 <
1042 <    /**
1043 <     * thenApply result completes normally after normal completion of source
1044 <     */
1045 <    public void testThenApply() {
1046 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1047 <        CompletableFuture<Integer> g = f.thenApply(inc);
1048 <        f.complete(one);
1049 <        checkCompletedNormally(g, two);
1050 <    }
1051 <
1052 <    /**
1053 <     * thenApply result completes exceptionally after exceptional
1054 <     * completion of source
1055 <     */
1056 <    public void testThenApply2() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        CompletableFuture<Integer> g = f.thenApply(inc);
1059 <        f.completeExceptionally(new CFException());
1060 <        checkCompletedWithWrappedCFException(g);
1061 <    }
1062 <
1063 <    /**
1064 <     * thenApply result completes exceptionally if action does
1065 <     */
1066 <    public void testThenApply3() {
1067 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1068 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1069 <        f.complete(one);
1070 <        checkCompletedWithWrappedCFException(g);
1071 <    }
1072 <
1073 <    /**
1074 <     * thenApply result completes exceptionally if source cancelled
1075 <     */
1076 <    public void testThenApply4() {
1077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1078 <        CompletableFuture<Integer> g = f.thenApply(inc);
1079 <        assertTrue(f.cancel(true));
1080 <        checkCompletedWithWrappedCancellationException(g);
1081 <    }
1082 <
1083 <    /**
1084 <     * thenAccept result completes normally after normal completion of source
1085 <     */
1086 <    public void testThenAccept() {
1087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1088 <        IncAction r = new IncAction();
1089 <        CompletableFuture<Void> g = f.thenAccept(r);
1090 <        f.complete(one);
1091 <        checkCompletedNormally(g, null);
1092 <        assertEquals(r.value, (Integer) 2);
1093 <    }
1094 <
1095 <    /**
1096 <     * thenAccept result completes exceptionally after exceptional
1097 <     * completion of source
1098 <     */
1099 <    public void testThenAccept2() {
1100 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1101 <        IncAction r = new IncAction();
1102 <        CompletableFuture<Void> g = f.thenAccept(r);
1103 <        f.completeExceptionally(new CFException());
1104 <        checkCompletedWithWrappedCFException(g);
1105 <    }
1106 <
1107 <    /**
1108 <     * thenAccept result completes exceptionally if action does
1109 <     */
1110 <    public void testThenAccept3() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1112 <        FailingConsumer r = new FailingConsumer();
1113 <        CompletableFuture<Void> g = f.thenAccept(r);
1114 <        f.complete(one);
1115 <        checkCompletedWithWrappedCFException(g);
1116 <        assertEquals(1, r.invocationCount);
1117 <    }
1118 <
1119 <    /**
1120 <     * thenAccept result completes exceptionally if source cancelled
1121 <     */
1122 <    public void testThenAccept4() {
1123 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1124 <        IncAction r = new IncAction();
1125 <        CompletableFuture<Void> g = f.thenAccept(r);
1126 <        assertTrue(f.cancel(true));
1127 <        checkCompletedWithWrappedCancellationException(g);
1128 <    }
1129 <
1130 <    /**
1131 <     * thenCombine result completes normally after normal completion
1132 <     * of sources
1133 <     */
1134 <    public void testThenCombine_normalCompletion1() {
1135 <        for (boolean createIncomplete : new boolean[] { true, false })
1136 <        for (boolean fFirst : new boolean[] { true, false })
1078 >    public void testThenRun_sourceCancelled() {
1079          for (ExecutionMode m : ExecutionMode.values())
1080 <        for (Integer v1 : new Integer[] { 1, null })
1081 <        for (Integer v2 : new Integer[] { 2, null })
1080 >        for (boolean createIncomplete : new boolean[] { true, false })
1081 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1082      {
1083          final CompletableFuture<Integer> f = new CompletableFuture<>();
1084 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1085 <        final SubtractFunction r = new SubtractFunction();
1086 <        CompletableFuture<Integer> h = null;
1087 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1084 >        final Noop r = new Noop(m);
1085 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1086 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1087 >        if (createIncomplete) {
1088 >            checkIncomplete(g);
1089 >            assertTrue(f.cancel(mayInterruptIfRunning));
1090 >        }
1091  
1092 <        if (fFirst)
1093 <            f.complete(v1);
1149 <        else
1150 <            g.complete(v2);
1151 <        if (createIncomplete) checkIncomplete(h);
1092 >        checkCompletedWithWrappedCancellationException(g);
1093 >        checkCancelled(f);
1094          assertEquals(0, r.invocationCount);
1153        if (!fFirst)
1154            f.complete(v1);
1155        else
1156            g.complete(v2);
1157        if (!createIncomplete) h = m.thenCombine(f, g, r);
1158
1159        checkCompletedNormally(h, subtract(v1, v2));
1160        checkCompletedNormally(f, v1);
1161        checkCompletedNormally(g, v2);
1162        assertEquals(1, r.invocationCount);
1095      }}
1096  
1097      /**
1098 <     * thenCombine result completes exceptionally after exceptional
1167 <     * completion of either source
1098 >     * thenRun result completes exceptionally if action does
1099       */
1100 <    public void testThenCombine_exceptionalCompletion1() {
1100 >    public void testThenRun_actionFailed() {
1101          for (ExecutionMode m : ExecutionMode.values())
1102 +        for (boolean createIncomplete : new boolean[] { true, false })
1103          for (Integer v1 : new Integer[] { 1, null })
1104      {
1105          final CompletableFuture<Integer> f = new CompletableFuture<>();
1106 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1107 <        final SubtractFunction r = new SubtractFunction();
1108 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1109 <        final CFException ex = new CFException();
1110 <
1111 <        f.completeExceptionally(ex);
1112 <        checkIncomplete(h);
1181 <        g.complete(v1);
1106 >        final FailingRunnable r = new FailingRunnable(m);
1107 >        if (!createIncomplete) f.complete(v1);
1108 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1109 >        if (createIncomplete) {
1110 >            checkIncomplete(g);
1111 >            f.complete(v1);
1112 >        }
1113  
1114 <        checkCompletedWithWrappedCFException(h, ex);
1115 <        checkCompletedWithWrappedCFException(f, ex);
1185 <        assertEquals(0, r.invocationCount);
1186 <        checkCompletedNormally(g, v1);
1114 >        checkCompletedWithWrappedCFException(g);
1115 >        checkCompletedNormally(f, v1);
1116      }}
1117  
1118 <    public void testThenCombine_exceptionalCompletion2() {
1118 >    /**
1119 >     * thenApply result completes normally after normal completion of source
1120 >     */
1121 >    public void testThenApply_normalCompletion() {
1122          for (ExecutionMode m : ExecutionMode.values())
1123 +        for (boolean createIncomplete : new boolean[] { true, false })
1124          for (Integer v1 : new Integer[] { 1, null })
1125      {
1126          final CompletableFuture<Integer> f = new CompletableFuture<>();
1127 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1128 <        final SubtractFunction r = new SubtractFunction();
1129 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1130 <        final CFException ex = new CFException();
1131 <
1132 <        g.completeExceptionally(ex);
1133 <        checkIncomplete(h);
1201 <        f.complete(v1);
1127 >        final IncFunction r = new IncFunction(m);
1128 >        if (!createIncomplete) f.complete(v1);
1129 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1130 >        if (createIncomplete) {
1131 >            checkIncomplete(g);
1132 >            f.complete(v1);
1133 >        }
1134  
1135 <        checkCompletedWithWrappedCFException(h, ex);
1204 <        checkCompletedWithWrappedCFException(g, ex);
1205 <        assertEquals(0, r.invocationCount);
1135 >        checkCompletedNormally(g, inc(v1));
1136          checkCompletedNormally(f, v1);
1137 +        assertEquals(1, r.invocationCount);
1138      }}
1139  
1140 <    public void testThenCombine_exceptionalCompletion3() {
1140 >    /**
1141 >     * thenApply result completes exceptionally after exceptional
1142 >     * completion of source
1143 >     */
1144 >    public void testThenApply_exceptionalCompletion() {
1145          for (ExecutionMode m : ExecutionMode.values())
1146 <        for (Integer v1 : new Integer[] { 1, null })
1146 >        for (boolean createIncomplete : new boolean[] { true, false })
1147      {
1213        final CompletableFuture<Integer> f = new CompletableFuture<>();
1214        final CompletableFuture<Integer> g = new CompletableFuture<>();
1215        final SubtractFunction r = new SubtractFunction();
1148          final CFException ex = new CFException();
1149 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1150 +        final IncFunction r = new IncFunction(m);
1151 +        if (!createIncomplete) f.completeExceptionally(ex);
1152 +        final CompletableFuture<Integer> g = m.thenApply(f, r);
1153 +        if (createIncomplete) {
1154 +            checkIncomplete(g);
1155 +            f.completeExceptionally(ex);
1156 +        }
1157  
1218        g.completeExceptionally(ex);
1219        f.complete(v1);
1220        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1221
1222        checkCompletedWithWrappedCFException(h, ex);
1158          checkCompletedWithWrappedCFException(g, ex);
1159 +        checkCompletedWithWrappedCFException(f, ex);
1160          assertEquals(0, r.invocationCount);
1225        checkCompletedNormally(f, v1);
1161      }}
1162  
1163 <    public void testThenCombine_exceptionalCompletion4() {
1163 >    /**
1164 >     * thenApply result completes exceptionally if source cancelled
1165 >     */
1166 >    public void testThenApply_sourceCancelled() {
1167          for (ExecutionMode m : ExecutionMode.values())
1168 <        for (Integer v1 : new Integer[] { 1, null })
1168 >        for (boolean createIncomplete : new boolean[] { true, false })
1169 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1170      {
1171          final CompletableFuture<Integer> f = new CompletableFuture<>();
1172 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1173 <        final SubtractFunction r = new SubtractFunction();
1174 <        final CFException ex = new CFException();
1175 <
1176 <        f.completeExceptionally(ex);
1177 <        g.complete(v1);
1178 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1172 >        final IncFunction r = new IncFunction(m);
1173 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1174 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1175 >        if (createIncomplete) {
1176 >            checkIncomplete(g);
1177 >            assertTrue(f.cancel(mayInterruptIfRunning));
1178 >        }
1179  
1180 <        checkCompletedWithWrappedCFException(h, ex);
1181 <        checkCompletedWithWrappedCFException(f, ex);
1180 >        checkCompletedWithWrappedCancellationException(g);
1181 >        checkCancelled(f);
1182          assertEquals(0, r.invocationCount);
1244        checkCompletedNormally(g, v1);
1183      }}
1184  
1185      /**
1186 <     * thenCombine result completes exceptionally if action does
1186 >     * thenApply result completes exceptionally if action does
1187       */
1188 <    public void testThenCombine_actionFailed1() {
1188 >    public void testThenApply_actionFailed() {
1189          for (ExecutionMode m : ExecutionMode.values())
1190 +        for (boolean createIncomplete : new boolean[] { true, false })
1191          for (Integer v1 : new Integer[] { 1, null })
1253        for (Integer v2 : new Integer[] { 2, null })
1192      {
1193          final CompletableFuture<Integer> f = new CompletableFuture<>();
1194 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1195 <        final FailingBiFunction r = new FailingBiFunction();
1196 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1197 <
1198 <        f.complete(v1);
1199 <        checkIncomplete(h);
1200 <        g.complete(v2);
1194 >        final FailingFunction r = new FailingFunction(m);
1195 >        if (!createIncomplete) f.complete(v1);
1196 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1197 >        if (createIncomplete) {
1198 >            checkIncomplete(g);
1199 >            f.complete(v1);
1200 >        }
1201  
1202 <        checkCompletedWithWrappedCFException(h);
1202 >        checkCompletedWithWrappedCFException(g);
1203          checkCompletedNormally(f, v1);
1266        checkCompletedNormally(g, v2);
1204      }}
1205  
1206 <    public void testThenCombine_actionFailed2() {
1206 >    /**
1207 >     * thenAccept result completes normally after normal completion of source
1208 >     */
1209 >    public void testThenAccept_normalCompletion() {
1210          for (ExecutionMode m : ExecutionMode.values())
1211 +        for (boolean createIncomplete : new boolean[] { true, false })
1212          for (Integer v1 : new Integer[] { 1, null })
1272        for (Integer v2 : new Integer[] { 2, null })
1213      {
1214          final CompletableFuture<Integer> f = new CompletableFuture<>();
1215 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1216 <        final FailingBiFunction r = new FailingBiFunction();
1217 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1218 <
1219 <        g.complete(v2);
1220 <        checkIncomplete(h);
1221 <        f.complete(v1);
1215 >        final IncAction r = new IncAction();
1216 >        if (!createIncomplete) f.complete(v1);
1217 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1218 >        if (createIncomplete) {
1219 >            checkIncomplete(g);
1220 >            f.complete(v1);
1221 >        }
1222  
1223 <        checkCompletedWithWrappedCFException(h);
1223 >        checkCompletedNormally(g, null);
1224          checkCompletedNormally(f, v1);
1225 <        checkCompletedNormally(g, v2);
1225 >        assertEquals(1, r.invocationCount);
1226 >        assertEquals(inc(v1), r.value);
1227      }}
1228  
1229      /**
1230 <     * thenCombine result completes exceptionally if either source cancelled
1230 >     * thenAccept result completes exceptionally after exceptional
1231 >     * completion of source
1232       */
1233 <    public void testThenCombine_sourceCancelled1() {
1233 >    public void testThenAccept_exceptionalCompletion() {
1234          for (ExecutionMode m : ExecutionMode.values())
1235 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1294 <        for (Integer v1 : new Integer[] { 1, null })
1235 >        for (boolean createIncomplete : new boolean[] { true, false })
1236      {
1237 +        final CFException ex = new CFException();
1238          final CompletableFuture<Integer> f = new CompletableFuture<>();
1239 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1240 <        final SubtractFunction r = new SubtractFunction();
1241 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1242 <
1243 <        assertTrue(f.cancel(mayInterruptIfRunning));
1244 <        checkIncomplete(h);
1245 <        g.complete(v1);
1239 >        final IncAction r = new IncAction();
1240 >        if (!createIncomplete) f.completeExceptionally(ex);
1241 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1242 >        if (createIncomplete) {
1243 >            checkIncomplete(g);
1244 >            f.completeExceptionally(ex);
1245 >        }
1246  
1247 <        checkCompletedWithWrappedCancellationException(h);
1248 <        checkCancelled(f);
1247 >        checkCompletedWithWrappedCFException(g, ex);
1248 >        checkCompletedWithWrappedCFException(f, ex);
1249          assertEquals(0, r.invocationCount);
1308        checkCompletedNormally(g, v1);
1250      }}
1251  
1252 <    public void testThenCombine_sourceCancelled2() {
1252 >    /**
1253 >     * thenAccept result completes exceptionally if action does
1254 >     */
1255 >    public void testThenAccept_actionFailed() {
1256          for (ExecutionMode m : ExecutionMode.values())
1257 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1257 >        for (boolean createIncomplete : new boolean[] { true, false })
1258          for (Integer v1 : new Integer[] { 1, null })
1259      {
1260          final CompletableFuture<Integer> f = new CompletableFuture<>();
1261 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1262 <        final SubtractFunction r = new SubtractFunction();
1263 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1264 <
1265 <        assertTrue(g.cancel(mayInterruptIfRunning));
1266 <        checkIncomplete(h);
1267 <        f.complete(v1);
1261 >        final FailingConsumer r = new FailingConsumer(m);
1262 >        if (!createIncomplete) f.complete(v1);
1263 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1264 >        if (createIncomplete) {
1265 >            checkIncomplete(g);
1266 >            f.complete(v1);
1267 >        }
1268  
1269 <        checkCompletedWithWrappedCancellationException(h);
1326 <        checkCancelled(g);
1327 <        assertEquals(0, r.invocationCount);
1269 >        checkCompletedWithWrappedCFException(g);
1270          checkCompletedNormally(f, v1);
1271      }}
1272  
1273 <    public void testThenCombine_sourceCancelled3() {
1273 >    /**
1274 >     * thenAccept result completes exceptionally if source cancelled
1275 >     */
1276 >    public void testThenAccept_sourceCancelled() {
1277          for (ExecutionMode m : ExecutionMode.values())
1278 +        for (boolean createIncomplete : new boolean[] { true, false })
1279          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1334        for (Integer v1 : new Integer[] { 1, null })
1280      {
1281          final CompletableFuture<Integer> f = new CompletableFuture<>();
1282 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1283 <        final SubtractFunction r = new SubtractFunction();
1284 <
1285 <        assertTrue(g.cancel(mayInterruptIfRunning));
1286 <        f.complete(v1);
1287 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1282 >        final IncAction r = new IncAction();
1283 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1284 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1285 >        if (createIncomplete) {
1286 >            checkIncomplete(g);
1287 >            assertTrue(f.cancel(mayInterruptIfRunning));
1288 >        }
1289  
1290 <        checkCompletedWithWrappedCancellationException(h);
1291 <        checkCancelled(g);
1290 >        checkCompletedWithWrappedCancellationException(g);
1291 >        checkCancelled(f);
1292          assertEquals(0, r.invocationCount);
1347        checkCompletedNormally(f, v1);
1293      }}
1294  
1295 <    public void testThenCombine_sourceCancelled4() {
1295 >    /**
1296 >     * thenCombine result completes normally after normal completion
1297 >     * of sources
1298 >     */
1299 >    public void testThenCombine_normalCompletion() {
1300          for (ExecutionMode m : ExecutionMode.values())
1301 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1301 >        for (boolean createIncomplete : new boolean[] { true, false })
1302 >        for (boolean fFirst : new boolean[] { true, false })
1303          for (Integer v1 : new Integer[] { 1, null })
1304 +        for (Integer v2 : new Integer[] { 2, null })
1305      {
1306          final CompletableFuture<Integer> f = new CompletableFuture<>();
1307          final CompletableFuture<Integer> g = new CompletableFuture<>();
1308 <        final SubtractFunction r = new SubtractFunction();
1308 >        final SubtractFunction r = new SubtractFunction(m);
1309  
1310 <        assertTrue(f.cancel(mayInterruptIfRunning));
1311 <        g.complete(v1);
1310 >        if (fFirst) f.complete(v1); else g.complete(v2);
1311 >        if (!createIncomplete)
1312 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1313          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1314 +        if (createIncomplete) {
1315 +            checkIncomplete(h);
1316 +            assertEquals(0, r.invocationCount);
1317 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1318 +        }
1319  
1320 <        checkCompletedWithWrappedCancellationException(h);
1321 <        checkCancelled(f);
1322 <        assertEquals(0, r.invocationCount);
1323 <        checkCompletedNormally(g, v1);
1320 >        checkCompletedNormally(h, subtract(v1, v2));
1321 >        checkCompletedNormally(f, v1);
1322 >        checkCompletedNormally(g, v2);
1323 >        assertEquals(1, r.invocationCount);
1324      }}
1325  
1326      /**
1327 <     * thenAcceptBoth result completes normally after normal
1328 <     * completion of sources
1327 >     * thenCombine result completes exceptionally after exceptional
1328 >     * completion of either source
1329       */
1330 <    public void testThenAcceptBoth_normalCompletion1() {
1330 >    public void testThenCombine_exceptionalCompletion() {
1331          for (ExecutionMode m : ExecutionMode.values())
1332 +        for (boolean createIncomplete : new boolean[] { true, false })
1333 +        for (boolean fFirst : new boolean[] { true, false })
1334          for (Integer v1 : new Integer[] { 1, null })
1376        for (Integer v2 : new Integer[] { 2, null })
1335      {
1336          final CompletableFuture<Integer> f = new CompletableFuture<>();
1337          final CompletableFuture<Integer> g = new CompletableFuture<>();
1338 <        final SubtractAction r = new SubtractAction();
1339 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1338 >        final CFException ex = new CFException();
1339 >        final SubtractFunction r = new SubtractFunction(m);
1340  
1341 <        f.complete(v1);
1342 <        checkIncomplete(h);
1343 <        assertEquals(0, r.invocationCount);
1344 <        g.complete(v2);
1341 >        (fFirst ? f : g).complete(v1);
1342 >        if (!createIncomplete)
1343 >            (!fFirst ? f : g).completeExceptionally(ex);
1344 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1345 >        if (createIncomplete) {
1346 >            checkIncomplete(h);
1347 >            (!fFirst ? f : g).completeExceptionally(ex);
1348 >        }
1349  
1350 <        checkCompletedNormally(h, null);
1351 <        assertEquals(subtract(v1, v2), r.value);
1352 <        checkCompletedNormally(f, v1);
1353 <        checkCompletedNormally(g, v2);
1350 >        checkCompletedWithWrappedCFException(h, ex);
1351 >        assertEquals(0, r.invocationCount);
1352 >        checkCompletedNormally(fFirst ? f : g, v1);
1353 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1354      }}
1355  
1356 <    public void testThenAcceptBoth_normalCompletion2() {
1356 >    /**
1357 >     * thenCombine result completes exceptionally if action does
1358 >     */
1359 >    public void testThenCombine_actionFailed() {
1360          for (ExecutionMode m : ExecutionMode.values())
1361 +        for (boolean fFirst : new boolean[] { true, false })
1362          for (Integer v1 : new Integer[] { 1, null })
1363          for (Integer v2 : new Integer[] { 2, null })
1364      {
1365          final CompletableFuture<Integer> f = new CompletableFuture<>();
1366          final CompletableFuture<Integer> g = new CompletableFuture<>();
1367 <        final SubtractAction r = new SubtractAction();
1368 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1367 >        final FailingBiFunction r = new FailingBiFunction(m);
1368 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1369  
1370 <        g.complete(v2);
1371 <        checkIncomplete(h);
1372 <        assertEquals(0, r.invocationCount);
1373 <        f.complete(v1);
1370 >        if (fFirst) {
1371 >            f.complete(v1);
1372 >            g.complete(v2);
1373 >        } else {
1374 >            g.complete(v2);
1375 >            f.complete(v1);
1376 >        }
1377  
1378 <        checkCompletedNormally(h, null);
1410 <        assertEquals(subtract(v1, v2), r.value);
1378 >        checkCompletedWithWrappedCFException(h);
1379          checkCompletedNormally(f, v1);
1380          checkCompletedNormally(g, v2);
1381      }}
1382  
1383 <    public void testThenAcceptBoth_normalCompletion3() {
1383 >    /**
1384 >     * thenCombine result completes exceptionally if either source cancelled
1385 >     */
1386 >    public void testThenCombine_sourceCancelled() {
1387          for (ExecutionMode m : ExecutionMode.values())
1388 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1389 +        for (boolean createIncomplete : new boolean[] { true, false })
1390 +        for (boolean fFirst : new boolean[] { true, false })
1391          for (Integer v1 : new Integer[] { 1, null })
1418        for (Integer v2 : new Integer[] { 2, null })
1392      {
1393          final CompletableFuture<Integer> f = new CompletableFuture<>();
1394          final CompletableFuture<Integer> g = new CompletableFuture<>();
1395 <        final SubtractAction r = new SubtractAction();
1395 >        final SubtractFunction r = new SubtractFunction(m);
1396  
1397 <        g.complete(v2);
1398 <        f.complete(v1);
1399 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1397 >        (fFirst ? f : g).complete(v1);
1398 >        if (!createIncomplete)
1399 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1400 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1401 >        if (createIncomplete) {
1402 >            checkIncomplete(h);
1403 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1404 >        }
1405  
1406 <        checkCompletedNormally(h, null);
1407 <        assertEquals(subtract(v1, v2), r.value);
1408 <        checkCompletedNormally(f, v1);
1409 <        checkCompletedNormally(g, v2);
1406 >        checkCompletedWithWrappedCancellationException(h);
1407 >        checkCancelled(!fFirst ? f : g);
1408 >        assertEquals(0, r.invocationCount);
1409 >        checkCompletedNormally(fFirst ? f : g, v1);
1410      }}
1411  
1412 <    public void testThenAcceptBoth_normalCompletion4() {
1412 >    /**
1413 >     * thenAcceptBoth result completes normally after normal
1414 >     * completion of sources
1415 >     */
1416 >    public void testThenAcceptBoth_normalCompletion() {
1417          for (ExecutionMode m : ExecutionMode.values())
1418 +        for (boolean createIncomplete : new boolean[] { true, false })
1419 +        for (boolean fFirst : new boolean[] { true, false })
1420          for (Integer v1 : new Integer[] { 1, null })
1421          for (Integer v2 : new Integer[] { 2, null })
1422      {
1423          final CompletableFuture<Integer> f = new CompletableFuture<>();
1424          final CompletableFuture<Integer> g = new CompletableFuture<>();
1425 <        final SubtractAction r = new SubtractAction();
1425 >        final SubtractAction r = new SubtractAction(m);
1426  
1427 <        f.complete(v1);
1428 <        g.complete(v2);
1427 >        if (fFirst) f.complete(v1); else g.complete(v2);
1428 >        if (!createIncomplete)
1429 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1430          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1431 +        if (createIncomplete) {
1432 +            checkIncomplete(h);
1433 +            assertEquals(0, r.invocationCount);
1434 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1435 +        }
1436  
1437          checkCompletedNormally(h, null);
1438          assertEquals(subtract(v1, v2), r.value);
# Line 1454 | Line 1444 | public class CompletableFutureTest exten
1444       * thenAcceptBoth result completes exceptionally after exceptional
1445       * completion of either source
1446       */
1447 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1458 <        for (ExecutionMode m : ExecutionMode.values())
1459 <        for (Integer v1 : new Integer[] { 1, null })
1460 <    {
1461 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1462 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1463 <        final SubtractAction r = new SubtractAction();
1464 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1465 <        final CFException ex = new CFException();
1466 <
1467 <        f.completeExceptionally(ex);
1468 <        checkIncomplete(h);
1469 <        g.complete(v1);
1470 <
1471 <        checkCompletedWithWrappedCFException(h, ex);
1472 <        checkCompletedWithWrappedCFException(f, ex);
1473 <        assertEquals(0, r.invocationCount);
1474 <        checkCompletedNormally(g, v1);
1475 <    }}
1476 <
1477 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1478 <        for (ExecutionMode m : ExecutionMode.values())
1479 <        for (Integer v1 : new Integer[] { 1, null })
1480 <    {
1481 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1483 <        final SubtractAction r = new SubtractAction();
1484 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1485 <        final CFException ex = new CFException();
1486 <
1487 <        g.completeExceptionally(ex);
1488 <        checkIncomplete(h);
1489 <        f.complete(v1);
1490 <
1491 <        checkCompletedWithWrappedCFException(h, ex);
1492 <        checkCompletedWithWrappedCFException(g, ex);
1493 <        assertEquals(0, r.invocationCount);
1494 <        checkCompletedNormally(f, v1);
1495 <    }}
1496 <
1497 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1498 <        for (ExecutionMode m : ExecutionMode.values())
1499 <        for (Integer v1 : new Integer[] { 1, null })
1500 <    {
1501 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1502 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1503 <        final SubtractAction r = new SubtractAction();
1504 <        final CFException ex = new CFException();
1505 <
1506 <        g.completeExceptionally(ex);
1507 <        f.complete(v1);
1508 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1509 <
1510 <        checkCompletedWithWrappedCFException(h, ex);
1511 <        checkCompletedWithWrappedCFException(g, ex);
1512 <        assertEquals(0, r.invocationCount);
1513 <        checkCompletedNormally(f, v1);
1514 <    }}
1515 <
1516 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1447 >    public void testThenAcceptBoth_exceptionalCompletion() {
1448          for (ExecutionMode m : ExecutionMode.values())
1449 +        for (boolean createIncomplete : new boolean[] { true, false })
1450 +        for (boolean fFirst : new boolean[] { true, false })
1451          for (Integer v1 : new Integer[] { 1, null })
1452      {
1453          final CompletableFuture<Integer> f = new CompletableFuture<>();
1454          final CompletableFuture<Integer> g = new CompletableFuture<>();
1522        final SubtractAction r = new SubtractAction();
1455          final CFException ex = new CFException();
1456 +        final SubtractAction r = new SubtractAction(m);
1457  
1458 <        f.completeExceptionally(ex);
1459 <        g.complete(v1);
1458 >        (fFirst ? f : g).complete(v1);
1459 >        if (!createIncomplete)
1460 >            (!fFirst ? f : g).completeExceptionally(ex);
1461          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1462 +        if (createIncomplete) {
1463 +            checkIncomplete(h);
1464 +            (!fFirst ? f : g).completeExceptionally(ex);
1465 +        }
1466  
1467          checkCompletedWithWrappedCFException(h, ex);
1530        checkCompletedWithWrappedCFException(f, ex);
1468          assertEquals(0, r.invocationCount);
1469 <        checkCompletedNormally(g, v1);
1469 >        checkCompletedNormally(fFirst ? f : g, v1);
1470 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1471      }}
1472  
1473      /**
1474       * thenAcceptBoth result completes exceptionally if action does
1475       */
1476 <    public void testThenAcceptBoth_actionFailed1() {
1539 <        for (ExecutionMode m : ExecutionMode.values())
1540 <        for (Integer v1 : new Integer[] { 1, null })
1541 <        for (Integer v2 : new Integer[] { 2, null })
1542 <    {
1543 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1544 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1545 <        final FailingBiConsumer r = new FailingBiConsumer();
1546 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1547 <
1548 <        f.complete(v1);
1549 <        checkIncomplete(h);
1550 <        g.complete(v2);
1551 <
1552 <        checkCompletedWithWrappedCFException(h);
1553 <        checkCompletedNormally(f, v1);
1554 <        checkCompletedNormally(g, v2);
1555 <    }}
1556 <
1557 <    public void testThenAcceptBoth_actionFailed2() {
1476 >    public void testThenAcceptBoth_actionFailed() {
1477          for (ExecutionMode m : ExecutionMode.values())
1478 +        for (boolean fFirst : new boolean[] { true, false })
1479          for (Integer v1 : new Integer[] { 1, null })
1480          for (Integer v2 : new Integer[] { 2, null })
1481      {
1482          final CompletableFuture<Integer> f = new CompletableFuture<>();
1483          final CompletableFuture<Integer> g = new CompletableFuture<>();
1484 <        final FailingBiConsumer r = new FailingBiConsumer();
1484 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1485          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1486  
1487 <        g.complete(v2);
1488 <        checkIncomplete(h);
1489 <        f.complete(v1);
1487 >        if (fFirst) {
1488 >            f.complete(v1);
1489 >            g.complete(v2);
1490 >        } else {
1491 >            g.complete(v2);
1492 >            f.complete(v1);
1493 >        }
1494  
1495          checkCompletedWithWrappedCFException(h);
1496          checkCompletedNormally(f, v1);
# Line 1576 | Line 1500 | public class CompletableFutureTest exten
1500      /**
1501       * thenAcceptBoth result completes exceptionally if either source cancelled
1502       */
1503 <    public void testThenAcceptBoth_sourceCancelled1() {
1580 <        for (ExecutionMode m : ExecutionMode.values())
1581 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1582 <        for (Integer v1 : new Integer[] { 1, null })
1583 <    {
1584 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1585 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1586 <        final SubtractAction r = new SubtractAction();
1587 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1588 <
1589 <        assertTrue(f.cancel(mayInterruptIfRunning));
1590 <        checkIncomplete(h);
1591 <        g.complete(v1);
1592 <
1593 <        checkCompletedWithWrappedCancellationException(h);
1594 <        checkCancelled(f);
1595 <        assertEquals(0, r.invocationCount);
1596 <        checkCompletedNormally(g, v1);
1597 <    }}
1598 <
1599 <    public void testThenAcceptBoth_sourceCancelled2() {
1600 <        for (ExecutionMode m : ExecutionMode.values())
1601 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1602 <        for (Integer v1 : new Integer[] { 1, null })
1603 <    {
1604 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1605 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1606 <        final SubtractAction r = new SubtractAction();
1607 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1608 <
1609 <        assertTrue(g.cancel(mayInterruptIfRunning));
1610 <        checkIncomplete(h);
1611 <        f.complete(v1);
1612 <
1613 <        checkCompletedWithWrappedCancellationException(h);
1614 <        checkCancelled(g);
1615 <        assertEquals(0, r.invocationCount);
1616 <        checkCompletedNormally(f, v1);
1617 <    }}
1618 <
1619 <    public void testThenAcceptBoth_sourceCancelled3() {
1620 <        for (ExecutionMode m : ExecutionMode.values())
1621 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1622 <        for (Integer v1 : new Integer[] { 1, null })
1623 <    {
1624 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1625 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1626 <        final SubtractAction r = new SubtractAction();
1627 <
1628 <        assertTrue(g.cancel(mayInterruptIfRunning));
1629 <        f.complete(v1);
1630 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1631 <
1632 <        checkCompletedWithWrappedCancellationException(h);
1633 <        checkCancelled(g);
1634 <        assertEquals(0, r.invocationCount);
1635 <        checkCompletedNormally(f, v1);
1636 <    }}
1637 <
1638 <    public void testThenAcceptBoth_sourceCancelled4() {
1503 >    public void testThenAcceptBoth_sourceCancelled() {
1504          for (ExecutionMode m : ExecutionMode.values())
1505          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1506 +        for (boolean createIncomplete : new boolean[] { true, false })
1507 +        for (boolean fFirst : new boolean[] { true, false })
1508          for (Integer v1 : new Integer[] { 1, null })
1509      {
1510          final CompletableFuture<Integer> f = new CompletableFuture<>();
1511          final CompletableFuture<Integer> g = new CompletableFuture<>();
1512 <        final SubtractAction r = new SubtractAction();
1512 >        final SubtractAction r = new SubtractAction(m);
1513  
1514 <        assertTrue(f.cancel(mayInterruptIfRunning));
1515 <        g.complete(v1);
1514 >        (fFirst ? f : g).complete(v1);
1515 >        if (!createIncomplete)
1516 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1517          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1518 +        if (createIncomplete) {
1519 +            checkIncomplete(h);
1520 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1521 +        }
1522  
1523          checkCompletedWithWrappedCancellationException(h);
1524 <        checkCancelled(f);
1524 >        checkCancelled(!fFirst ? f : g);
1525          assertEquals(0, r.invocationCount);
1526 <        checkCompletedNormally(g, v1);
1526 >        checkCompletedNormally(fFirst ? f : g, v1);
1527      }}
1528  
1529      /**
1530       * runAfterBoth result completes normally after normal
1531       * completion of sources
1532       */
1533 <    public void testRunAfterBoth_normalCompletion1() {
1662 <        for (ExecutionMode m : ExecutionMode.values())
1663 <        for (Integer v1 : new Integer[] { 1, null })
1664 <        for (Integer v2 : new Integer[] { 2, null })
1665 <    {
1666 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final Noop r = new Noop();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 <
1671 <        f.complete(v1);
1672 <        checkIncomplete(h);
1673 <        assertEquals(0, r.invocationCount);
1674 <        g.complete(v2);
1675 <
1676 <        checkCompletedNormally(h, null);
1677 <        assertEquals(1, r.invocationCount);
1678 <        checkCompletedNormally(f, v1);
1679 <        checkCompletedNormally(g, v2);
1680 <    }}
1681 <
1682 <    public void testRunAfterBoth_normalCompletion2() {
1683 <        for (ExecutionMode m : ExecutionMode.values())
1684 <        for (Integer v1 : new Integer[] { 1, null })
1685 <        for (Integer v2 : new Integer[] { 2, null })
1686 <    {
1687 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1688 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1689 <        final Noop r = new Noop();
1690 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1691 <
1692 <        g.complete(v2);
1693 <        checkIncomplete(h);
1694 <        assertEquals(0, r.invocationCount);
1695 <        f.complete(v1);
1696 <
1697 <        checkCompletedNormally(h, null);
1698 <        assertEquals(1, r.invocationCount);
1699 <        checkCompletedNormally(f, v1);
1700 <        checkCompletedNormally(g, v2);
1701 <    }}
1702 <
1703 <    public void testRunAfterBoth_normalCompletion3() {
1704 <        for (ExecutionMode m : ExecutionMode.values())
1705 <        for (Integer v1 : new Integer[] { 1, null })
1706 <        for (Integer v2 : new Integer[] { 2, null })
1707 <    {
1708 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1709 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 <        final Noop r = new Noop();
1711 <
1712 <        g.complete(v2);
1713 <        f.complete(v1);
1714 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1715 <
1716 <        checkCompletedNormally(h, null);
1717 <        assertEquals(1, r.invocationCount);
1718 <        checkCompletedNormally(f, v1);
1719 <        checkCompletedNormally(g, v2);
1720 <    }}
1721 <
1722 <    public void testRunAfterBoth_normalCompletion4() {
1533 >    public void testRunAfterBoth_normalCompletion() {
1534          for (ExecutionMode m : ExecutionMode.values())
1535 +        for (boolean createIncomplete : new boolean[] { true, false })
1536 +        for (boolean fFirst : new boolean[] { true, false })
1537          for (Integer v1 : new Integer[] { 1, null })
1538          for (Integer v2 : new Integer[] { 2, null })
1539      {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541          final CompletableFuture<Integer> g = new CompletableFuture<>();
1542 <        final Noop r = new Noop();
1542 >        final Noop r = new Noop(m);
1543  
1544 <        f.complete(v1);
1545 <        g.complete(v2);
1544 >        if (fFirst) f.complete(v1); else g.complete(v2);
1545 >        if (!createIncomplete)
1546 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1547          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1548 +        if (createIncomplete) {
1549 +            checkIncomplete(h);
1550 +            assertEquals(0, r.invocationCount);
1551 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1552 +        }
1553  
1554          checkCompletedNormally(h, null);
1555          assertEquals(1, r.invocationCount);
# Line 1742 | Line 1561 | public class CompletableFutureTest exten
1561       * runAfterBoth result completes exceptionally after exceptional
1562       * completion of either source
1563       */
1564 <    public void testRunAfterBoth_exceptionalCompletion1() {
1746 <        for (ExecutionMode m : ExecutionMode.values())
1747 <        for (Integer v1 : new Integer[] { 1, null })
1748 <    {
1749 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1750 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1751 <        final Noop r = new Noop();
1752 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1753 <        final CFException ex = new CFException();
1754 <
1755 <        f.completeExceptionally(ex);
1756 <        checkIncomplete(h);
1757 <        g.complete(v1);
1758 <
1759 <        checkCompletedWithWrappedCFException(h, ex);
1760 <        checkCompletedWithWrappedCFException(f, ex);
1761 <        assertEquals(0, r.invocationCount);
1762 <        checkCompletedNormally(g, v1);
1763 <    }}
1764 <
1765 <    public void testRunAfterBoth_exceptionalCompletion2() {
1766 <        for (ExecutionMode m : ExecutionMode.values())
1767 <        for (Integer v1 : new Integer[] { 1, null })
1768 <    {
1769 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1770 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1771 <        final Noop r = new Noop();
1772 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1773 <        final CFException ex = new CFException();
1774 <
1775 <        g.completeExceptionally(ex);
1776 <        checkIncomplete(h);
1777 <        f.complete(v1);
1778 <
1779 <        checkCompletedWithWrappedCFException(h, ex);
1780 <        checkCompletedWithWrappedCFException(g, ex);
1781 <        assertEquals(0, r.invocationCount);
1782 <        checkCompletedNormally(f, v1);
1783 <    }}
1784 <
1785 <    public void testRunAfterBoth_exceptionalCompletion3() {
1786 <        for (ExecutionMode m : ExecutionMode.values())
1787 <        for (Integer v1 : new Integer[] { 1, null })
1788 <    {
1789 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1790 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1791 <        final Noop r = new Noop();
1792 <        final CFException ex = new CFException();
1793 <
1794 <        g.completeExceptionally(ex);
1795 <        f.complete(v1);
1796 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1797 <
1798 <        checkCompletedWithWrappedCFException(h, ex);
1799 <        checkCompletedWithWrappedCFException(g, ex);
1800 <        assertEquals(0, r.invocationCount);
1801 <        checkCompletedNormally(f, v1);
1802 <    }}
1803 <
1804 <    public void testRunAfterBoth_exceptionalCompletion4() {
1564 >    public void testRunAfterBoth_exceptionalCompletion() {
1565          for (ExecutionMode m : ExecutionMode.values())
1566 +        for (boolean createIncomplete : new boolean[] { true, false })
1567 +        for (boolean fFirst : new boolean[] { true, false })
1568          for (Integer v1 : new Integer[] { 1, null })
1569      {
1570          final CompletableFuture<Integer> f = new CompletableFuture<>();
1571          final CompletableFuture<Integer> g = new CompletableFuture<>();
1810        final Noop r = new Noop();
1572          final CFException ex = new CFException();
1573 +        final Noop r = new Noop(m);
1574  
1575 <        f.completeExceptionally(ex);
1576 <        g.complete(v1);
1575 >        (fFirst ? f : g).complete(v1);
1576 >        if (!createIncomplete)
1577 >            (!fFirst ? f : g).completeExceptionally(ex);
1578          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1579 +        if (createIncomplete) {
1580 +            checkIncomplete(h);
1581 +            (!fFirst ? f : g).completeExceptionally(ex);
1582 +        }
1583  
1584          checkCompletedWithWrappedCFException(h, ex);
1818        checkCompletedWithWrappedCFException(f, ex);
1585          assertEquals(0, r.invocationCount);
1586 <        checkCompletedNormally(g, v1);
1586 >        checkCompletedNormally(fFirst ? f : g, v1);
1587 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1588      }}
1589  
1590      /**
1591       * runAfterBoth result completes exceptionally if action does
1592       */
1593 <    public void testRunAfterBoth_actionFailed1() {
1827 <        for (ExecutionMode m : ExecutionMode.values())
1828 <        for (Integer v1 : new Integer[] { 1, null })
1829 <        for (Integer v2 : new Integer[] { 2, null })
1830 <    {
1831 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1832 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1833 <        final FailingNoop r = new FailingNoop();
1834 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1835 <
1836 <        f.complete(v1);
1837 <        checkIncomplete(h);
1838 <        g.complete(v2);
1839 <
1840 <        checkCompletedWithWrappedCFException(h);
1841 <        checkCompletedNormally(f, v1);
1842 <        checkCompletedNormally(g, v2);
1843 <    }}
1844 <
1845 <    public void testRunAfterBoth_actionFailed2() {
1593 >    public void testRunAfterBoth_actionFailed() {
1594          for (ExecutionMode m : ExecutionMode.values())
1595 +        for (boolean fFirst : new boolean[] { true, false })
1596          for (Integer v1 : new Integer[] { 1, null })
1597          for (Integer v2 : new Integer[] { 2, null })
1598      {
1599          final CompletableFuture<Integer> f = new CompletableFuture<>();
1600          final CompletableFuture<Integer> g = new CompletableFuture<>();
1601 <        final FailingNoop r = new FailingNoop();
1853 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1601 >        final FailingRunnable r = new FailingRunnable(m);
1602  
1603 <        g.complete(v2);
1604 <        checkIncomplete(h);
1605 <        f.complete(v1);
1603 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1604 >        if (fFirst) {
1605 >            f.complete(v1);
1606 >            g.complete(v2);
1607 >        } else {
1608 >            g.complete(v2);
1609 >            f.complete(v1);
1610 >        }
1611 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1612  
1613 <        checkCompletedWithWrappedCFException(h);
1613 >        checkCompletedWithWrappedCFException(h1);
1614 >        checkCompletedWithWrappedCFException(h2);
1615          checkCompletedNormally(f, v1);
1616          checkCompletedNormally(g, v2);
1617      }}
# Line 1864 | Line 1619 | public class CompletableFutureTest exten
1619      /**
1620       * runAfterBoth result completes exceptionally if either source cancelled
1621       */
1622 <    public void testRunAfterBoth_sourceCancelled1() {
1868 <        for (ExecutionMode m : ExecutionMode.values())
1869 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1870 <        for (Integer v1 : new Integer[] { 1, null })
1871 <    {
1872 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1873 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1874 <        final Noop r = new Noop();
1875 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1876 <
1877 <        assertTrue(f.cancel(mayInterruptIfRunning));
1878 <        checkIncomplete(h);
1879 <        g.complete(v1);
1880 <
1881 <        checkCompletedWithWrappedCancellationException(h);
1882 <        checkCancelled(f);
1883 <        assertEquals(0, r.invocationCount);
1884 <        checkCompletedNormally(g, v1);
1885 <    }}
1886 <
1887 <    public void testRunAfterBoth_sourceCancelled2() {
1888 <        for (ExecutionMode m : ExecutionMode.values())
1889 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1890 <        for (Integer v1 : new Integer[] { 1, null })
1891 <    {
1892 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1893 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1894 <        final Noop r = new Noop();
1895 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1896 <
1897 <        assertTrue(g.cancel(mayInterruptIfRunning));
1898 <        checkIncomplete(h);
1899 <        f.complete(v1);
1900 <
1901 <        checkCompletedWithWrappedCancellationException(h);
1902 <        checkCancelled(g);
1903 <        assertEquals(0, r.invocationCount);
1904 <        checkCompletedNormally(f, v1);
1905 <    }}
1906 <
1907 <    public void testRunAfterBoth_sourceCancelled3() {
1622 >    public void testRunAfterBoth_sourceCancelled() {
1623          for (ExecutionMode m : ExecutionMode.values())
1624          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1625 +        for (boolean createIncomplete : new boolean[] { true, false })
1626 +        for (boolean fFirst : new boolean[] { true, false })
1627          for (Integer v1 : new Integer[] { 1, null })
1628      {
1629          final CompletableFuture<Integer> f = new CompletableFuture<>();
1630          final CompletableFuture<Integer> g = new CompletableFuture<>();
1631 <        final Noop r = new Noop();
1915 <
1916 <        assertTrue(g.cancel(mayInterruptIfRunning));
1917 <        f.complete(v1);
1918 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1631 >        final Noop r = new Noop(m);
1632  
1920        checkCompletedWithWrappedCancellationException(h);
1921        checkCancelled(g);
1922        assertEquals(0, r.invocationCount);
1923        checkCompletedNormally(f, v1);
1924    }}
1925
1926    public void testRunAfterBoth_sourceCancelled4() {
1927        for (ExecutionMode m : ExecutionMode.values())
1928        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1929        for (Integer v1 : new Integer[] { 1, null })
1930    {
1931        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932        final CompletableFuture<Integer> g = new CompletableFuture<>();
1933        final Noop r = new Noop();
1633  
1634 <        assertTrue(f.cancel(mayInterruptIfRunning));
1635 <        g.complete(v1);
1634 >        (fFirst ? f : g).complete(v1);
1635 >        if (!createIncomplete)
1636 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1637          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1638 +        if (createIncomplete) {
1639 +            checkIncomplete(h);
1640 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1641 +        }
1642  
1643          checkCompletedWithWrappedCancellationException(h);
1644 <        checkCancelled(f);
1644 >        checkCancelled(!fFirst ? f : g);
1645          assertEquals(0, r.invocationCount);
1646 <        checkCompletedNormally(g, v1);
1646 >        checkCompletedNormally(fFirst ? f : g, v1);
1647      }}
1648  
1649      /**
1650       * applyToEither result completes normally after normal completion
1651       * of either source
1652       */
1653 <    public void testApplyToEither_normalCompletion1() {
1653 >    public void testApplyToEither_normalCompletion() {
1654          for (ExecutionMode m : ExecutionMode.values())
1655 +        for (boolean createIncomplete : new boolean[] { true, false })
1656 +        for (boolean fFirst : new boolean[] { true, false })
1657          for (Integer v1 : new Integer[] { 1, null })
1658          for (Integer v2 : new Integer[] { 2, null })
1659      {
1660          final CompletableFuture<Integer> f = new CompletableFuture<>();
1661          final CompletableFuture<Integer> g = new CompletableFuture<>();
1662 <        final IncFunction r = new IncFunction();
1957 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1662 >        final IncFunction r = new IncFunction(m);
1663  
1664 <        f.complete(v1);
1665 <        checkCompletedNormally(h, inc(v1));
1666 <        g.complete(v2);
1664 >        if (!createIncomplete)
1665 >            if (fFirst) f.complete(v1); else g.complete(v2);
1666 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1667 >        if (createIncomplete) {
1668 >            checkIncomplete(h);
1669 >            assertEquals(0, r.invocationCount);
1670 >            if (fFirst) f.complete(v1); else g.complete(v2);
1671 >        }
1672 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1673 >        if (!fFirst) f.complete(v1); else g.complete(v2);
1674  
1675          checkCompletedNormally(f, v1);
1676          checkCompletedNormally(g, v2);
1677 <        checkCompletedNormally(h, inc(v1));
1677 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1678      }}
1679  
1680 <    public void testApplyToEither_normalCompletion2() {
1680 >    public void testApplyToEither_normalCompletionBothAvailable() {
1681          for (ExecutionMode m : ExecutionMode.values())
1682 +        for (boolean fFirst : new boolean[] { true, false })
1683          for (Integer v1 : new Integer[] { 1, null })
1684          for (Integer v2 : new Integer[] { 2, null })
1685      {
1686          final CompletableFuture<Integer> f = new CompletableFuture<>();
1687          final CompletableFuture<Integer> g = new CompletableFuture<>();
1688 <        final IncFunction r = new IncFunction();
1976 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1688 >        final IncFunction r = new IncFunction(m);
1689  
1690 <        g.complete(v2);
1691 <        checkCompletedNormally(h, inc(v2));
1692 <        f.complete(v1);
1693 <
1694 <        checkCompletedNormally(f, v1);
1695 <        checkCompletedNormally(g, v2);
1696 <        checkCompletedNormally(h, inc(v2));
1985 <        }}
1986 <
1987 <    public void testApplyToEither_normalCompletion3() {
1988 <        for (ExecutionMode m : ExecutionMode.values())
1989 <        for (Integer v1 : new Integer[] { 1, null })
1990 <        for (Integer v2 : new Integer[] { 2, null })
1991 <    {
1992 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1993 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1994 <        final IncFunction r = new IncFunction();
1690 >        if (fFirst) {
1691 >            f.complete(v1);
1692 >            g.complete(v2);
1693 >        } else {
1694 >            g.complete(v2);
1695 >            f.complete(v1);
1696 >        }
1697  
1996        f.complete(v1);
1997        g.complete(v2);
1698          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1699  
1700          checkCompletedNormally(f, v1);
# Line 2012 | Line 1712 | public class CompletableFutureTest exten
1712       */
1713      public void testApplyToEither_exceptionalCompletion1() {
1714          for (ExecutionMode m : ExecutionMode.values())
1715 +        for (boolean createIncomplete : new boolean[] { true, false })
1716 +        for (boolean fFirst : new boolean[] { true, false })
1717          for (Integer v1 : new Integer[] { 1, null })
1718      {
1719          final CompletableFuture<Integer> f = new CompletableFuture<>();
1720          final CompletableFuture<Integer> g = new CompletableFuture<>();
2019        final IncFunction r = new IncFunction();
2020        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1721          final CFException ex = new CFException();
1722 +        final IncFunction r = new IncFunction(m);
1723  
1724 <        f.completeExceptionally(ex);
2024 <        checkCompletedWithWrappedCFException(h, ex);
2025 <        g.complete(v1);
2026 <
2027 <        assertEquals(0, r.invocationCount);
2028 <        checkCompletedNormally(g, v1);
2029 <        checkCompletedWithWrappedCFException(f, ex);
2030 <        checkCompletedWithWrappedCFException(h, ex);
2031 <    }}
2032 <
2033 <    public void testApplyToEither_exceptionalCompletion2() {
2034 <        for (ExecutionMode m : ExecutionMode.values())
2035 <        for (Integer v1 : new Integer[] { 1, null })
2036 <    {
2037 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2038 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2039 <        final IncFunction r = new IncFunction();
1724 >        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1725          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1726 <        final CFException ex = new CFException();
1726 >        if (createIncomplete) {
1727 >            checkIncomplete(h);
1728 >            assertEquals(0, r.invocationCount);
1729 >            (fFirst ? f : g).completeExceptionally(ex);
1730 >        }
1731  
2043        g.completeExceptionally(ex);
1732          checkCompletedWithWrappedCFException(h, ex);
1733 <        f.complete(v1);
1733 >        (!fFirst ? f : g).complete(v1);
1734  
1735          assertEquals(0, r.invocationCount);
1736 <        checkCompletedNormally(f, v1);
1737 <        checkCompletedWithWrappedCFException(g, ex);
1736 >        checkCompletedNormally(!fFirst ? f : g, v1);
1737 >        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1738          checkCompletedWithWrappedCFException(h, ex);
1739      }}
1740  
1741 <    public void testApplyToEither_exceptionalCompletion3() {
1741 >    public void testApplyToEither_exceptionalCompletion2() {
1742          for (ExecutionMode m : ExecutionMode.values())
1743 +        for (boolean reverseArgs : new boolean[] { true, false })
1744 +        for (boolean fFirst : new boolean[] { true, false })
1745          for (Integer v1 : new Integer[] { 1, null })
1746      {
1747          final CompletableFuture<Integer> f = new CompletableFuture<>();
1748          final CompletableFuture<Integer> g = new CompletableFuture<>();
1749 <        final IncFunction r = new IncFunction();
1749 >        final IncFunction r1 = new IncFunction(m);
1750 >        final IncFunction r2 = new IncFunction(m);
1751          final CFException ex = new CFException();
1752 <
1753 <        g.completeExceptionally(ex);
1754 <        f.complete(v1);
1755 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1752 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1753 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1754 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1755 >        if (fFirst) {
1756 >            f.complete(v1);
1757 >            g.completeExceptionally(ex);
1758 >        } else {
1759 >            g.completeExceptionally(ex);
1760 >            f.complete(v1);
1761 >        }
1762 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1763  
1764          // unspecified behavior
2067        Integer v;
1765          try {
1766 <            assertEquals(inc(v1), h.join());
1767 <            assertEquals(1, r.invocationCount);
1766 >            assertEquals(inc(v1), h1.join());
1767 >            assertEquals(1, r1.invocationCount);
1768          } catch (CompletionException ok) {
1769 <            checkCompletedWithWrappedCFException(h, ex);
1770 <            assertEquals(0, r.invocationCount);
1769 >            checkCompletedWithWrappedCFException(h1, ex);
1770 >            assertEquals(0, r1.invocationCount);
1771          }
1772  
2076        checkCompletedWithWrappedCFException(g, ex);
2077        checkCompletedNormally(f, v1);
2078    }}
2079
2080    public void testApplyToEither_exceptionalCompletion4() {
2081        for (ExecutionMode m : ExecutionMode.values())
2082        for (Integer v1 : new Integer[] { 1, null })
2083    {
2084        final CompletableFuture<Integer> f = new CompletableFuture<>();
2085        final CompletableFuture<Integer> g = new CompletableFuture<>();
2086        final IncFunction r = new IncFunction();
2087        final CFException ex = new CFException();
2088
2089        f.completeExceptionally(ex);
2090        g.complete(v1);
2091        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2092
2093        // unspecified behavior
2094        Integer v;
1773          try {
1774 <            assertEquals(inc(v1), h.join());
1775 <            assertEquals(1, r.invocationCount);
1774 >            assertEquals(inc(v1), h2.join());
1775 >            assertEquals(1, r2.invocationCount);
1776          } catch (CompletionException ok) {
1777 <            checkCompletedWithWrappedCFException(h, ex);
1778 <            assertEquals(0, r.invocationCount);
1777 >            checkCompletedWithWrappedCFException(h2, ex);
1778 >            assertEquals(0, r2.invocationCount);
1779          }
1780  
1781 <        checkCompletedWithWrappedCFException(f, ex);
1782 <        checkCompletedNormally(g, v1);
1781 >        checkCompletedWithWrappedCFException(g, ex);
1782 >        checkCompletedNormally(f, v1);
1783      }}
1784  
1785      /**
# Line 2114 | Line 1792 | public class CompletableFutureTest exten
1792      {
1793          final CompletableFuture<Integer> f = new CompletableFuture<>();
1794          final CompletableFuture<Integer> g = new CompletableFuture<>();
1795 <        final FailingFunction r = new FailingFunction();
1795 >        final FailingFunction r = new FailingFunction(m);
1796          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1797  
1798          f.complete(v1);
# Line 2131 | Line 1809 | public class CompletableFutureTest exten
1809      {
1810          final CompletableFuture<Integer> f = new CompletableFuture<>();
1811          final CompletableFuture<Integer> g = new CompletableFuture<>();
1812 <        final FailingFunction r = new FailingFunction();
1812 >        final FailingFunction r = new FailingFunction(m);
1813          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1814  
1815          g.complete(v2);
# Line 2147 | Line 1825 | public class CompletableFutureTest exten
1825      public void testApplyToEither_sourceCancelled1() {
1826          for (ExecutionMode m : ExecutionMode.values())
1827          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1828 +        for (boolean createIncomplete : new boolean[] { true, false })
1829 +        for (boolean fFirst : new boolean[] { true, false })
1830          for (Integer v1 : new Integer[] { 1, null })
1831      {
1832          final CompletableFuture<Integer> f = new CompletableFuture<>();
1833          final CompletableFuture<Integer> g = new CompletableFuture<>();
1834 <        final IncFunction r = new IncFunction();
2155 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1834 >        final IncFunction r = new IncFunction(m);
1835  
1836 <        assertTrue(f.cancel(mayInterruptIfRunning));
2158 <        checkCompletedWithWrappedCancellationException(h);
2159 <        g.complete(v1);
2160 <
2161 <        checkCancelled(f);
2162 <        assertEquals(0, r.invocationCount);
2163 <        checkCompletedNormally(g, v1);
2164 <        checkCompletedWithWrappedCancellationException(h);
2165 <    }}
2166 <
2167 <    public void testApplyToEither_sourceCancelled2() {
2168 <        for (ExecutionMode m : ExecutionMode.values())
2169 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2170 <        for (Integer v1 : new Integer[] { 1, null })
2171 <    {
2172 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2173 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2174 <        final IncFunction r = new IncFunction();
1836 >        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1837          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1838 +        if (createIncomplete) {
1839 +            checkIncomplete(h);
1840 +            assertEquals(0, r.invocationCount);
1841 +            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1842 +        }
1843  
2177        assertTrue(g.cancel(mayInterruptIfRunning));
1844          checkCompletedWithWrappedCancellationException(h);
1845 <        f.complete(v1);
1845 >        (!fFirst ? f : g).complete(v1);
1846  
2181        checkCancelled(g);
1847          assertEquals(0, r.invocationCount);
1848 <        checkCompletedNormally(f, v1);
1848 >        checkCompletedNormally(!fFirst ? f : g, v1);
1849 >        checkCancelled(fFirst ? f : g);
1850          checkCompletedWithWrappedCancellationException(h);
1851      }}
1852  
1853 <    public void testApplyToEither_sourceCancelled3() {
1853 >    public void testApplyToEither_sourceCancelled2() {
1854          for (ExecutionMode m : ExecutionMode.values())
1855          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1856 +        for (boolean reverseArgs : new boolean[] { true, false })
1857 +        for (boolean fFirst : new boolean[] { true, false })
1858          for (Integer v1 : new Integer[] { 1, null })
1859      {
1860          final CompletableFuture<Integer> f = new CompletableFuture<>();
1861          final CompletableFuture<Integer> g = new CompletableFuture<>();
1862 <        final IncFunction r = new IncFunction();
1862 >        final IncFunction r1 = new IncFunction(m);
1863 >        final IncFunction r2 = new IncFunction(m);
1864 >        final CFException ex = new CFException();
1865 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1866 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1867  
1868 <        assertTrue(g.cancel(mayInterruptIfRunning));
1869 <        f.complete(v1);
1870 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1868 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1869 >        if (fFirst) {
1870 >            f.complete(v1);
1871 >            assertTrue(g.cancel(mayInterruptIfRunning));
1872 >        } else {
1873 >            assertTrue(g.cancel(mayInterruptIfRunning));
1874 >            f.complete(v1);
1875 >        }
1876 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1877  
1878          // unspecified behavior
2201        Integer v;
1879          try {
1880 <            assertEquals(inc(v1), h.join());
1881 <            assertEquals(1, r.invocationCount);
1880 >            assertEquals(inc(v1), h1.join());
1881 >            assertEquals(1, r1.invocationCount);
1882          } catch (CompletionException ok) {
1883 <            checkCompletedWithWrappedCancellationException(h);
1884 <            assertEquals(0, r.invocationCount);
1883 >            checkCompletedWithWrappedCancellationException(h1);
1884 >            assertEquals(0, r1.invocationCount);
1885          }
1886  
2210        checkCancelled(g);
2211        checkCompletedNormally(f, v1);
2212    }}
2213
2214    public void testApplyToEither_sourceCancelled4() {
2215        for (ExecutionMode m : ExecutionMode.values())
2216        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2217        for (Integer v1 : new Integer[] { 1, null })
2218    {
2219        final CompletableFuture<Integer> f = new CompletableFuture<>();
2220        final CompletableFuture<Integer> g = new CompletableFuture<>();
2221        final IncFunction r = new IncFunction();
2222
2223        assertTrue(f.cancel(mayInterruptIfRunning));
2224        g.complete(v1);
2225        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2226
2227        // unspecified behavior
2228        Integer v;
1887          try {
1888 <            assertEquals(inc(v1), h.join());
1889 <            assertEquals(1, r.invocationCount);
1888 >            assertEquals(inc(v1), h2.join());
1889 >            assertEquals(1, r2.invocationCount);
1890          } catch (CompletionException ok) {
1891 <            checkCompletedWithWrappedCancellationException(h);
1892 <            assertEquals(0, r.invocationCount);
1891 >            checkCompletedWithWrappedCancellationException(h2);
1892 >            assertEquals(0, r2.invocationCount);
1893          }
1894  
1895 <        checkCancelled(f);
1896 <        checkCompletedNormally(g, v1);
1895 >        checkCancelled(g);
1896 >        checkCompletedNormally(f, v1);
1897      }}
1898  
1899      /**
# Line 2414 | Line 2072 | public class CompletableFutureTest exten
2072      {
2073          final CompletableFuture<Integer> f = new CompletableFuture<>();
2074          final CompletableFuture<Integer> g = new CompletableFuture<>();
2075 <        final FailingConsumer r = new FailingConsumer();
2075 >        final FailingConsumer r = new FailingConsumer(m);
2076          final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2077  
2078          f.complete(v1);
# Line 2431 | Line 2089 | public class CompletableFutureTest exten
2089      {
2090          final CompletableFuture<Integer> f = new CompletableFuture<>();
2091          final CompletableFuture<Integer> g = new CompletableFuture<>();
2092 <        final FailingConsumer r = new FailingConsumer();
2092 >        final FailingConsumer r = new FailingConsumer(m);
2093          final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2094  
2095          g.complete(v2);
# Line 2551 | Line 2209 | public class CompletableFutureTest exten
2209      {
2210          final CompletableFuture<Integer> f = new CompletableFuture<>();
2211          final CompletableFuture<Integer> g = new CompletableFuture<>();
2212 <        final Noop r = new Noop();
2212 >        final Noop r = new Noop(m);
2213          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2214  
2215          f.complete(v1);
# Line 2572 | Line 2230 | public class CompletableFutureTest exten
2230      {
2231          final CompletableFuture<Integer> f = new CompletableFuture<>();
2232          final CompletableFuture<Integer> g = new CompletableFuture<>();
2233 <        final Noop r = new Noop();
2233 >        final Noop r = new Noop(m);
2234          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2235  
2236          g.complete(v2);
# Line 2593 | Line 2251 | public class CompletableFutureTest exten
2251      {
2252          final CompletableFuture<Integer> f = new CompletableFuture<>();
2253          final CompletableFuture<Integer> g = new CompletableFuture<>();
2254 <        final Noop r = new Noop();
2254 >        final Noop r = new Noop(m);
2255  
2256          f.complete(v1);
2257          g.complete(v2);
# Line 2615 | Line 2273 | public class CompletableFutureTest exten
2273      {
2274          final CompletableFuture<Integer> f = new CompletableFuture<>();
2275          final CompletableFuture<Integer> g = new CompletableFuture<>();
2276 <        final Noop r = new Noop();
2276 >        final Noop r = new Noop(m);
2277          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2278          final CFException ex = new CFException();
2279  
# Line 2635 | Line 2293 | public class CompletableFutureTest exten
2293      {
2294          final CompletableFuture<Integer> f = new CompletableFuture<>();
2295          final CompletableFuture<Integer> g = new CompletableFuture<>();
2296 <        final Noop r = new Noop();
2296 >        final Noop r = new Noop(m);
2297          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2298          final CFException ex = new CFException();
2299  
# Line 2655 | Line 2313 | public class CompletableFutureTest exten
2313      {
2314          final CompletableFuture<Integer> f = new CompletableFuture<>();
2315          final CompletableFuture<Integer> g = new CompletableFuture<>();
2316 <        final Noop r = new Noop();
2316 >        final Noop r = new Noop(m);
2317          final CFException ex = new CFException();
2318  
2319          g.completeExceptionally(ex);
# Line 2682 | Line 2340 | public class CompletableFutureTest exten
2340      {
2341          final CompletableFuture<Integer> f = new CompletableFuture<>();
2342          final CompletableFuture<Integer> g = new CompletableFuture<>();
2343 <        final Noop r = new Noop();
2343 >        final Noop r = new Noop(m);
2344          final CFException ex = new CFException();
2345  
2346          f.completeExceptionally(ex);
# Line 2713 | Line 2371 | public class CompletableFutureTest exten
2371      {
2372          final CompletableFuture<Integer> f = new CompletableFuture<>();
2373          final CompletableFuture<Integer> g = new CompletableFuture<>();
2374 <        final FailingNoop r = new FailingNoop();
2374 >        final FailingRunnable r = new FailingRunnable(m);
2375          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2376  
2377          f.complete(v1);
# Line 2730 | Line 2388 | public class CompletableFutureTest exten
2388      {
2389          final CompletableFuture<Integer> f = new CompletableFuture<>();
2390          final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final FailingNoop r = new FailingNoop();
2391 >        final FailingRunnable r = new FailingRunnable(m);
2392          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2393  
2394          g.complete(v2);
# Line 2750 | Line 2408 | public class CompletableFutureTest exten
2408      {
2409          final CompletableFuture<Integer> f = new CompletableFuture<>();
2410          final CompletableFuture<Integer> g = new CompletableFuture<>();
2411 <        final Noop r = new Noop();
2411 >        final Noop r = new Noop(m);
2412          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2413  
2414          assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2770 | Line 2428 | public class CompletableFutureTest exten
2428      {
2429          final CompletableFuture<Integer> f = new CompletableFuture<>();
2430          final CompletableFuture<Integer> g = new CompletableFuture<>();
2431 <        final Noop r = new Noop();
2431 >        final Noop r = new Noop(m);
2432          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2433  
2434          assertTrue(g.cancel(mayInterruptIfRunning));
# Line 2790 | Line 2448 | public class CompletableFutureTest exten
2448      {
2449          final CompletableFuture<Integer> f = new CompletableFuture<>();
2450          final CompletableFuture<Integer> g = new CompletableFuture<>();
2451 <        final Noop r = new Noop();
2451 >        final Noop r = new Noop(m);
2452  
2453          assertTrue(g.cancel(mayInterruptIfRunning));
2454          f.complete(v1);
# Line 2817 | Line 2475 | public class CompletableFutureTest exten
2475      {
2476          final CompletableFuture<Integer> f = new CompletableFuture<>();
2477          final CompletableFuture<Integer> g = new CompletableFuture<>();
2478 <        final Noop r = new Noop();
2478 >        final Noop r = new Noop(m);
2479  
2480          assertTrue(f.cancel(mayInterruptIfRunning));
2481          g.complete(v1);
# Line 2840 | Line 2498 | public class CompletableFutureTest exten
2498      /**
2499       * thenCompose result completes normally after normal completion of source
2500       */
2501 <    public void testThenCompose_normalCompletion1() {
2501 >    public void testThenCompose_normalCompletion() {
2502          for (ExecutionMode m : ExecutionMode.values())
2503 +        for (boolean createIncomplete : new boolean[] { true, false })
2504          for (Integer v1 : new Integer[] { 1, null })
2505      {
2506          final CompletableFuture<Integer> f = new CompletableFuture<>();
2507 <        final CompletableFutureInc r = new CompletableFutureInc();
2508 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2509 <        f.complete(v1);
2510 <        checkCompletedNormally(g, inc(v1));
2852 <        checkCompletedNormally(f, v1);
2853 <        assertEquals(1, r.invocationCount);
2854 <    }}
2507 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2508 >        if (!createIncomplete) f.complete(v1);
2509 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2510 >        if (createIncomplete) f.complete(v1);
2511  
2856    public void testThenCompose_normalCompletion2() {
2857        for (ExecutionMode m : ExecutionMode.values())
2858        for (Integer v1 : new Integer[] { 1, null })
2859    {
2860        final CompletableFuture<Integer> f = new CompletableFuture<>();
2861        final CompletableFutureInc r = new CompletableFutureInc();
2862        f.complete(v1);
2863        final CompletableFuture<Integer> g = f.thenCompose(r);
2512          checkCompletedNormally(g, inc(v1));
2513          checkCompletedNormally(f, v1);
2514          assertEquals(1, r.invocationCount);
# Line 2870 | Line 2518 | public class CompletableFutureTest exten
2518       * thenCompose result completes exceptionally after exceptional
2519       * completion of source
2520       */
2521 <    public void testThenCompose_exceptionalCompletion1() {
2521 >    public void testThenCompose_exceptionalCompletion() {
2522          for (ExecutionMode m : ExecutionMode.values())
2523 +        for (boolean createIncomplete : new boolean[] { true, false })
2524      {
2525          final CFException ex = new CFException();
2526 <        final CompletableFutureInc r = new CompletableFutureInc();
2526 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2527          final CompletableFuture<Integer> f = new CompletableFuture<>();
2528 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2529 <        f.completeExceptionally(ex);
2530 <        checkCompletedWithWrappedCFException(g, ex);
2882 <        checkCompletedWithWrappedCFException(f, ex);
2883 <    }}
2528 >        if (!createIncomplete) f.completeExceptionally(ex);
2529 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2530 >        if (createIncomplete) f.completeExceptionally(ex);
2531  
2885    public void testThenCompose_exceptionalCompletion2() {
2886        for (ExecutionMode m : ExecutionMode.values())
2887    {
2888        final CFException ex = new CFException();
2889        final CompletableFuture<Integer> f = new CompletableFuture<>();
2890        f.completeExceptionally(ex);
2891        final CompletableFutureInc r = new CompletableFutureInc();
2892        final CompletableFuture<Integer> g = f.thenCompose(r);
2532          checkCompletedWithWrappedCFException(g, ex);
2533          checkCompletedWithWrappedCFException(f, ex);
2534 +        assertEquals(0, r.invocationCount);
2535      }}
2536  
2537      /**
2538       * thenCompose result completes exceptionally if action does
2539       */
2540 <    public void testThenCompose_actionFailed1() {
2540 >    public void testThenCompose_actionFailed() {
2541          for (ExecutionMode m : ExecutionMode.values())
2542 +        for (boolean createIncomplete : new boolean[] { true, false })
2543          for (Integer v1 : new Integer[] { 1, null })
2544      {
2545          final CompletableFuture<Integer> f = new CompletableFuture<>();
2546          final FailingCompletableFutureFunction r
2547 <            = new FailingCompletableFutureFunction();
2548 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2549 <        f.complete(v1);
2550 <        checkCompletedWithWrappedCFException(g);
2910 <        checkCompletedNormally(f, v1);
2911 <    }}
2547 >            = new FailingCompletableFutureFunction(m);
2548 >        if (!createIncomplete) f.complete(v1);
2549 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2550 >        if (createIncomplete) f.complete(v1);
2551  
2913    public void testThenCompose_actionFailed2() {
2914        for (ExecutionMode m : ExecutionMode.values())
2915        for (Integer v1 : new Integer[] { 1, null })
2916    {
2917        final CompletableFuture<Integer> f = new CompletableFuture<>();
2918        f.complete(v1);
2919        final FailingCompletableFutureFunction r
2920            = new FailingCompletableFutureFunction();
2921        final CompletableFuture<Integer> g = f.thenCompose(r);
2552          checkCompletedWithWrappedCFException(g);
2553          checkCompletedNormally(f, v1);
2554      }}
# Line 2926 | Line 2556 | public class CompletableFutureTest exten
2556      /**
2557       * thenCompose result completes exceptionally if source cancelled
2558       */
2559 <    public void testThenCompose_sourceCancelled1() {
2559 >    public void testThenCompose_sourceCancelled() {
2560          for (ExecutionMode m : ExecutionMode.values())
2561 +        for (boolean createIncomplete : new boolean[] { true, false })
2562          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2563      {
2564          final CompletableFuture<Integer> f = new CompletableFuture<>();
2565 <        final CompletableFutureInc r = new CompletableFutureInc();
2566 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2567 <        assertTrue(f.cancel(mayInterruptIfRunning));
2568 <        checkCompletedWithWrappedCancellationException(g);
2569 <        checkCancelled(f);
2570 <    }}
2565 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2566 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2567 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2568 >        if (createIncomplete) {
2569 >            checkIncomplete(g);
2570 >            assertTrue(f.cancel(mayInterruptIfRunning));
2571 >        }
2572  
2941    public void testThenCompose_sourceCancelled2() {
2942        for (ExecutionMode m : ExecutionMode.values())
2943        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2944    {
2945        final CompletableFuture<Integer> f = new CompletableFuture<>();
2946        assertTrue(f.cancel(mayInterruptIfRunning));
2947        final CompletableFutureInc r = new CompletableFutureInc();
2948        final CompletableFuture<Integer> g = f.thenCompose(r);
2573          checkCompletedWithWrappedCancellationException(g);
2574          checkCancelled(f);
2575      }}
2576  
2953    // asyncs
2954
2955    /**
2956     * thenRunAsync result completes normally after normal completion of source
2957     */
2958    public void testThenRunAsync() {
2959        CompletableFuture<Integer> f = new CompletableFuture<>();
2960        Noop r = new Noop();
2961        CompletableFuture<Void> g = f.thenRunAsync(r);
2962        f.complete(null);
2963        checkCompletedNormally(g, null);
2964
2965        // reordered version
2966        f = new CompletableFuture<>();
2967        f.complete(null);
2968        r = new Noop();
2969        g = f.thenRunAsync(r);
2970        checkCompletedNormally(g, null);
2971    }
2972
2973    /**
2974     * thenRunAsync result completes exceptionally after exceptional
2975     * completion of source
2976     */
2977    public void testThenRunAsync2() {
2978        CompletableFuture<Integer> f = new CompletableFuture<>();
2979        Noop r = new Noop();
2980        CompletableFuture<Void> g = f.thenRunAsync(r);
2981        f.completeExceptionally(new CFException());
2982        try {
2983            g.join();
2984            shouldThrow();
2985        } catch (CompletionException success) {}
2986        checkCompletedWithWrappedCFException(g);
2987    }
2988
2989    /**
2990     * thenRunAsync result completes exceptionally if action does
2991     */
2992    public void testThenRunAsync3() {
2993        CompletableFuture<Integer> f = new CompletableFuture<>();
2994        FailingNoop r = new FailingNoop();
2995        CompletableFuture<Void> g = f.thenRunAsync(r);
2996        f.complete(null);
2997        checkCompletedWithWrappedCFException(g);
2998    }
2999
3000    /**
3001     * thenRunAsync result completes exceptionally if source cancelled
3002     */
3003    public void testThenRunAsync4() {
3004        CompletableFuture<Integer> f = new CompletableFuture<>();
3005        Noop r = new Noop();
3006        CompletableFuture<Void> g = f.thenRunAsync(r);
3007        assertTrue(f.cancel(true));
3008        checkCompletedWithWrappedCancellationException(g);
3009    }
3010
3011    /**
3012     * thenApplyAsync result completes normally after normal completion of source
3013     */
3014    public void testThenApplyAsync() {
3015        CompletableFuture<Integer> f = new CompletableFuture<>();
3016        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3017        f.complete(one);
3018        checkCompletedNormally(g, two);
3019    }
3020
3021    /**
3022     * thenApplyAsync result completes exceptionally after exceptional
3023     * completion of source
3024     */
3025    public void testThenApplyAsync2() {
3026        CompletableFuture<Integer> f = new CompletableFuture<>();
3027        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3028        f.completeExceptionally(new CFException());
3029        checkCompletedWithWrappedCFException(g);
3030    }
3031
3032    /**
3033     * thenApplyAsync result completes exceptionally if action does
3034     */
3035    public void testThenApplyAsync3() {
3036        CompletableFuture<Integer> f = new CompletableFuture<>();
3037        FailingFunction r = new FailingFunction();
3038        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3039        f.complete(null);
3040        checkCompletedWithWrappedCFException(g);
3041    }
3042
3043    /**
3044     * thenApplyAsync result completes exceptionally if source cancelled
3045     */
3046    public void testThenApplyAsync4() {
3047        CompletableFuture<Integer> f = new CompletableFuture<>();
3048        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3049        assertTrue(f.cancel(true));
3050        checkCompletedWithWrappedCancellationException(g);
3051    }
3052
3053    /**
3054     * thenAcceptAsync result completes normally after normal
3055     * completion of source
3056     */
3057    public void testThenAcceptAsync() {
3058        CompletableFuture<Integer> f = new CompletableFuture<>();
3059        IncAction r = new IncAction();
3060        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3061        f.complete(one);
3062        checkCompletedNormally(g, null);
3063        assertEquals(r.value, (Integer) 2);
3064    }
3065
3066    /**
3067     * thenAcceptAsync result completes exceptionally after exceptional
3068     * completion of source
3069     */
3070    public void testThenAcceptAsync2() {
3071        CompletableFuture<Integer> f = new CompletableFuture<>();
3072        IncAction r = new IncAction();
3073        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3074        f.completeExceptionally(new CFException());
3075        checkCompletedWithWrappedCFException(g);
3076    }
3077
3078    /**
3079     * thenAcceptAsync result completes exceptionally if action does
3080     */
3081    public void testThenAcceptAsync3() {
3082        CompletableFuture<Integer> f = new CompletableFuture<>();
3083        FailingConsumer r = new FailingConsumer();
3084        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3085        f.complete(null);
3086        checkCompletedWithWrappedCFException(g);
3087    }
3088
3089    /**
3090     * thenAcceptAsync result completes exceptionally if source cancelled
3091     */
3092    public void testThenAcceptAsync4() {
3093        CompletableFuture<Integer> f = new CompletableFuture<>();
3094        IncAction r = new IncAction();
3095        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3096        assertTrue(f.cancel(true));
3097        checkCompletedWithWrappedCancellationException(g);
3098    }
3099
3100    // async with explicit executors
3101
3102    /**
3103     * thenRunAsync result completes normally after normal completion of source
3104     */
3105    public void testThenRunAsyncE() {
3106        CompletableFuture<Integer> f = new CompletableFuture<>();
3107        Noop r = new Noop();
3108        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3109        f.complete(null);
3110        checkCompletedNormally(g, null);
3111
3112        // reordered version
3113        f = new CompletableFuture<>();
3114        f.complete(null);
3115        r = new Noop();
3116        g = f.thenRunAsync(r, new ThreadExecutor());
3117        checkCompletedNormally(g, null);
3118    }
3119
3120    /**
3121     * thenRunAsync result completes exceptionally after exceptional
3122     * completion of source
3123     */
3124    public void testThenRunAsync2E() {
3125        CompletableFuture<Integer> f = new CompletableFuture<>();
3126        Noop r = new Noop();
3127        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3128        f.completeExceptionally(new CFException());
3129        try {
3130            g.join();
3131            shouldThrow();
3132        } catch (CompletionException success) {}
3133        checkCompletedWithWrappedCFException(g);
3134    }
3135
3136    /**
3137     * thenRunAsync result completes exceptionally if action does
3138     */
3139    public void testThenRunAsync3E() {
3140        CompletableFuture<Integer> f = new CompletableFuture<>();
3141        FailingNoop r = new FailingNoop();
3142        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3143        f.complete(null);
3144        checkCompletedWithWrappedCFException(g);
3145    }
3146
3147    /**
3148     * thenRunAsync result completes exceptionally if source cancelled
3149     */
3150    public void testThenRunAsync4E() {
3151        CompletableFuture<Integer> f = new CompletableFuture<>();
3152        Noop r = new Noop();
3153        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3154        assertTrue(f.cancel(true));
3155        checkCompletedWithWrappedCancellationException(g);
3156    }
3157
3158    /**
3159     * thenApplyAsync result completes normally after normal completion of source
3160     */
3161    public void testThenApplyAsyncE() {
3162        CompletableFuture<Integer> f = new CompletableFuture<>();
3163        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3164        f.complete(one);
3165        checkCompletedNormally(g, two);
3166    }
3167
3168    /**
3169     * thenApplyAsync result completes exceptionally after exceptional
3170     * completion of source
3171     */
3172    public void testThenApplyAsync2E() {
3173        CompletableFuture<Integer> f = new CompletableFuture<>();
3174        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3175        f.completeExceptionally(new CFException());
3176        checkCompletedWithWrappedCFException(g);
3177    }
3178
3179    /**
3180     * thenApplyAsync result completes exceptionally if action does
3181     */
3182    public void testThenApplyAsync3E() {
3183        CompletableFuture<Integer> f = new CompletableFuture<>();
3184        FailingFunction r = new FailingFunction();
3185        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3186        f.complete(null);
3187        checkCompletedWithWrappedCFException(g);
3188    }
3189
3190    /**
3191     * thenApplyAsync result completes exceptionally if source cancelled
3192     */
3193    public void testThenApplyAsync4E() {
3194        CompletableFuture<Integer> f = new CompletableFuture<>();
3195        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3196        assertTrue(f.cancel(true));
3197        checkCompletedWithWrappedCancellationException(g);
3198    }
3199
3200    /**
3201     * thenAcceptAsync result completes normally after normal
3202     * completion of source
3203     */
3204    public void testThenAcceptAsyncE() {
3205        CompletableFuture<Integer> f = new CompletableFuture<>();
3206        IncAction r = new IncAction();
3207        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3208        f.complete(one);
3209        checkCompletedNormally(g, null);
3210        assertEquals(r.value, (Integer) 2);
3211    }
3212
3213    /**
3214     * thenAcceptAsync result completes exceptionally after exceptional
3215     * completion of source
3216     */
3217    public void testThenAcceptAsync2E() {
3218        CompletableFuture<Integer> f = new CompletableFuture<>();
3219        IncAction r = new IncAction();
3220        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3221        f.completeExceptionally(new CFException());
3222        checkCompletedWithWrappedCFException(g);
3223    }
3224
3225    /**
3226     * thenAcceptAsync result completes exceptionally if action does
3227     */
3228    public void testThenAcceptAsync3E() {
3229        CompletableFuture<Integer> f = new CompletableFuture<>();
3230        FailingConsumer r = new FailingConsumer();
3231        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3232        f.complete(null);
3233        checkCompletedWithWrappedCFException(g);
3234    }
3235
3236    /**
3237     * thenAcceptAsync result completes exceptionally if source cancelled
3238     */
3239    public void testThenAcceptAsync4E() {
3240        CompletableFuture<Integer> f = new CompletableFuture<>();
3241        IncAction r = new IncAction();
3242        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3243        assertTrue(f.cancel(true));
3244        checkCompletedWithWrappedCancellationException(g);
3245    }
3246
2577      // other static methods
2578  
2579      /**
# Line 3406 | Line 2736 | public class CompletableFutureTest exten
2736  
2737              () -> f.thenCompose(null),
2738              () -> f.thenComposeAsync(null),
2739 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2739 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2740              () -> f.thenComposeAsync(null, exec),
2741  
2742              () -> f.exceptionally(null),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines