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.50 by jsr166, Mon Jun 2 19:32:57 2014 UTC vs.
Revision 1.66 by jsr166, Fri Jun 6 19:19:04 2014 UTC

# Line 284 | 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 320 | Line 320 | public class CompletableFutureTest exten
320          checkCompletedNormally(f, "test");
321      }
322  
323 <    // Choose non-commutative actions for better coverage
323 >    abstract class CheckedAction {
324 >        int invocationCount = 0;
325 >        final ExecutionMode m;
326 >        CheckedAction(ExecutionMode m) { this.m = m; }
327 >        void invoked() {
328 >            m.checkExecutionMode();
329 >            assertEquals(0, invocationCount++);
330 >        }
331 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
332 >        void assertInvoked() { assertEquals(1, invocationCount); }
333 >    }
334  
335 <    // A non-commutative function that handles and produces null values as well.
336 <    static Integer subtract(Integer x, Integer y) {
337 <        return (x == null && y == null) ? null :
338 <            ((x == null) ? 42 : x.intValue())
339 <            - ((y == null) ? 99 : y.intValue());
335 >    abstract class CheckedIntegerAction extends CheckedAction {
336 >        Integer value;
337 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
338 >        void assertValue(Integer expected) {
339 >            assertInvoked();
340 >            assertEquals(expected, value);
341 >        }
342 >    }
343 >
344 >    class IntegerSupplier extends CheckedAction
345 >        implements Supplier<Integer>
346 >    {
347 >        final Integer value;
348 >        IntegerSupplier(ExecutionMode m, Integer value) {
349 >            super(m);
350 >            this.value = value;
351 >        }
352 >        public Integer get() {
353 >            invoked();
354 >            return value;
355 >        }
356      }
357  
358      // A function that handles and produces null values as well.
# Line 334 | Line 360 | public class CompletableFutureTest exten
360          return (x == null) ? null : x + 1;
361      }
362  
363 <    static final Supplier<Integer> supplyOne =
364 <        () -> Integer.valueOf(1);
365 <    static final Function<Integer, Integer> inc =
366 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
341 <    static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> subtract(x, y);
343 <    static final class IncAction implements Consumer<Integer> {
344 <        int invocationCount = 0;
345 <        Integer value;
363 >    class NoopConsumer extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        NoopConsumer(ExecutionMode m) { super(m); }
367          public void accept(Integer x) {
368 <            invocationCount++;
369 <            value = inc(x);
368 >            invoked();
369 >            value = x;
370          }
371      }
372 <    static final class IncFunction implements Function<Integer,Integer> {
373 <        int invocationCount = 0;
374 <        Integer value;
372 >
373 >    class IncFunction extends CheckedIntegerAction
374 >        implements Function<Integer,Integer>
375 >    {
376 >        IncFunction(ExecutionMode m) { super(m); }
377          public Integer apply(Integer x) {
378 <            invocationCount++;
378 >            invoked();
379              return value = inc(x);
380          }
381      }
382 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
383 <        int invocationCount = 0;
384 <        Integer value;
385 <        // Check this action was invoked exactly once when result is computed.
382 >
383 >    // Choose non-commutative actions for better coverage
384 >    // A non-commutative function that handles and produces null values as well.
385 >    static Integer subtract(Integer x, Integer y) {
386 >        return (x == null && y == null) ? null :
387 >            ((x == null) ? 42 : x.intValue())
388 >            - ((y == null) ? 99 : y.intValue());
389 >    }
390 >
391 >    class SubtractAction extends CheckedIntegerAction
392 >        implements BiConsumer<Integer, Integer>
393 >    {
394 >        SubtractAction(ExecutionMode m) { super(m); }
395          public void accept(Integer x, Integer y) {
396 <            invocationCount++;
396 >            invoked();
397              value = subtract(x, y);
398          }
399      }
400 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
401 <        int invocationCount = 0;
402 <        Integer value;
403 <        // Check this action was invoked exactly once when result is computed.
400 >
401 >    class SubtractFunction extends CheckedIntegerAction
402 >        implements BiFunction<Integer, Integer, Integer>
403 >    {
404 >        SubtractFunction(ExecutionMode m) { super(m); }
405          public Integer apply(Integer x, Integer y) {
406 <            invocationCount++;
406 >            invoked();
407              return value = subtract(x, y);
408          }
409      }
410 <    static final class Noop implements Runnable {
411 <        int invocationCount = 0;
410 >
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413          public void run() {
414 <            invocationCount++;
414 >            invoked();
415          }
416      }
417  
418 <    static final class FailingSupplier implements Supplier<Integer> {
419 <        int invocationCount = 0;
418 >    class FailingSupplier extends CheckedAction
419 >        implements Supplier<Integer>
420 >    {
421 >        FailingSupplier(ExecutionMode m) { super(m); }
422          public Integer get() {
423 <            invocationCount++;
423 >            invoked();
424              throw new CFException();
425          }
426      }
427 <    static final class FailingConsumer implements Consumer<Integer> {
428 <        int invocationCount = 0;
427 >
428 >    class FailingConsumer extends CheckedIntegerAction
429 >        implements Consumer<Integer>
430 >    {
431 >        FailingConsumer(ExecutionMode m) { super(m); }
432          public void accept(Integer x) {
433 <            invocationCount++;
433 >            invoked();
434 >            value = x;
435              throw new CFException();
436          }
437      }
438 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
439 <        int invocationCount = 0;
438 >
439 >    class FailingBiConsumer extends CheckedIntegerAction
440 >        implements BiConsumer<Integer, Integer>
441 >    {
442 >        FailingBiConsumer(ExecutionMode m) { super(m); }
443          public void accept(Integer x, Integer y) {
444 <            invocationCount++;
444 >            invoked();
445 >            value = subtract(x, y);
446              throw new CFException();
447          }
448      }
449 <    static final class FailingFunction implements Function<Integer, Integer> {
450 <        int invocationCount = 0;
449 >
450 >    class FailingFunction extends CheckedIntegerAction
451 >        implements Function<Integer, Integer>
452 >    {
453 >        FailingFunction(ExecutionMode m) { super(m); }
454          public Integer apply(Integer x) {
455 <            invocationCount++;
455 >            invoked();
456 >            value = x;
457              throw new CFException();
458          }
459      }
460 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
461 <        int invocationCount = 0;
460 >
461 >    class FailingBiFunction extends CheckedIntegerAction
462 >        implements BiFunction<Integer, Integer, Integer>
463 >    {
464 >        FailingBiFunction(ExecutionMode m) { super(m); }
465          public Integer apply(Integer x, Integer y) {
466 <            invocationCount++;
466 >            invoked();
467 >            value = subtract(x, y);
468              throw new CFException();
469          }
470      }
471 <    static final class FailingRunnable implements Runnable {
472 <        int invocationCount = 0;
471 >
472 >    class FailingRunnable extends CheckedAction implements Runnable {
473 >        FailingRunnable(ExecutionMode m) { super(m); }
474          public void run() {
475 <            invocationCount++;
475 >            invoked();
476              throw new CFException();
477          }
478      }
479  
480 <    static final class CompletableFutureInc
481 <        implements Function<Integer, CompletableFuture<Integer>> {
482 <        int invocationCount = 0;
480 >
481 >    class CompletableFutureInc extends CheckedIntegerAction
482 >        implements Function<Integer, CompletableFuture<Integer>>
483 >    {
484 >        CompletableFutureInc(ExecutionMode m) { super(m); }
485          public CompletableFuture<Integer> apply(Integer x) {
486 <            invocationCount++;
486 >            invoked();
487 >            value = x;
488              CompletableFuture<Integer> f = new CompletableFuture<>();
489              f.complete(inc(x));
490              return f;
491          }
492      }
493  
494 <    static final class FailingCompletableFutureFunction
495 <        implements Function<Integer, CompletableFuture<Integer>> {
496 <        int invocationCount = 0;
494 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
495 >        implements Function<Integer, CompletableFuture<Integer>>
496 >    {
497 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
498          public CompletableFuture<Integer> apply(Integer x) {
499 <            invocationCount++;
499 >            invoked();
500 >            value = x;
501              throw new CFException();
502          }
503      }
504  
505      // Used for explicit executor tests
506      static final class ThreadExecutor implements Executor {
507 <        AtomicInteger count = new AtomicInteger(0);
507 >        final AtomicInteger count = new AtomicInteger(0);
508 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
509 >        static boolean startedCurrentThread() {
510 >            return Thread.currentThread().getThreadGroup() == tg;
511 >        }
512  
513          public void execute(Runnable r) {
514              count.getAndIncrement();
515 <            new Thread(r).start();
515 >            new Thread(tg, r).start();
516          }
517      }
518  
519      /**
520       * Permits the testing of parallel code for the 3 different
521 <     * execution modes without repeating all the testing code.
521 >     * execution modes without copy/pasting all the test methods.
522       */
523      enum ExecutionMode {
524          DEFAULT {
525              public void checkExecutionMode() {
526 +                assertFalse(ThreadExecutor.startedCurrentThread());
527                  assertNull(ForkJoinTask.getPool());
528              }
529 +            public CompletableFuture<Void> runAsync(Runnable a) {
530 +                throw new UnsupportedOperationException();
531 +            }
532 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
533 +                throw new UnsupportedOperationException();
534 +            }
535              public <T> CompletableFuture<Void> thenRun
536                  (CompletableFuture<T> f, Runnable a) {
537                  return f.thenRun(a);
# Line 531 | Line 600 | public class CompletableFutureTest exten
600                  assertSame(ForkJoinPool.commonPool(),
601                             ForkJoinTask.getPool());
602              }
603 +            public CompletableFuture<Void> runAsync(Runnable a) {
604 +                return CompletableFuture.runAsync(a);
605 +            }
606 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
607 +                return CompletableFuture.supplyAsync(a);
608 +            }
609              public <T> CompletableFuture<Void> thenRun
610                  (CompletableFuture<T> f, Runnable a) {
611                  return f.thenRunAsync(a);
# Line 596 | Line 671 | public class CompletableFutureTest exten
671  
672          EXECUTOR {
673              public void checkExecutionMode() {
674 <                //TODO
674 >                assertTrue(ThreadExecutor.startedCurrentThread());
675 >            }
676 >            public CompletableFuture<Void> runAsync(Runnable a) {
677 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
678 >            }
679 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
680 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
681              }
682              public <T> CompletableFuture<Void> thenRun
683                  (CompletableFuture<T> f, Runnable a) {
# Line 662 | Line 743 | public class CompletableFutureTest exten
743          };
744  
745          public abstract void checkExecutionMode();
746 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
747 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
748          public abstract <T> CompletableFuture<Void> thenRun
749              (CompletableFuture<T> f, Runnable a);
750          public abstract <T> CompletableFuture<Void> thenAccept
# Line 740 | Line 823 | public class CompletableFutureTest exten
823          if (!createIncomplete) f.completeExceptionally(ex);
824          final CompletableFuture<Integer> g = f.exceptionally
825              ((Throwable t) -> {
826 +                ExecutionMode.DEFAULT.checkExecutionMode();
827                  threadAssertSame(t, ex);
828                  a.getAndIncrement();
829                  return v1;
# Line 761 | Line 845 | public class CompletableFutureTest exten
845          if (!createIncomplete) f.completeExceptionally(ex1);
846          final CompletableFuture<Integer> g = f.exceptionally
847              ((Throwable t) -> {
848 +                ExecutionMode.DEFAULT.checkExecutionMode();
849                  threadAssertSame(t, ex1);
850                  a.getAndIncrement();
851                  throw ex2;
# Line 786 | Line 871 | public class CompletableFutureTest exten
871          final CompletableFuture<Integer> g = m.handle
872              (f,
873               (Integer x, Throwable t) -> {
874 +                m.checkExecutionMode();
875                  threadAssertSame(x, v1);
876                  threadAssertNull(t);
877                  a.getAndIncrement();
# Line 814 | Line 900 | public class CompletableFutureTest exten
900          final CompletableFuture<Integer> g = m.handle
901              (f,
902               (Integer x, Throwable t) -> {
903 +                m.checkExecutionMode();
904                  threadAssertNull(x);
905                  threadAssertSame(t, ex);
906                  a.getAndIncrement();
# Line 842 | Line 929 | public class CompletableFutureTest exten
929          final CompletableFuture<Integer> g = m.handle
930              (f,
931               (Integer x, Throwable t) -> {
932 +                m.checkExecutionMode();
933                  threadAssertNull(x);
934                  threadAssertTrue(t instanceof CancellationException);
935                  a.getAndIncrement();
# Line 869 | Line 957 | public class CompletableFutureTest exten
957          final CompletableFuture<Integer> g = m.handle
958              (f,
959               (Integer x, Throwable t) -> {
960 +                m.checkExecutionMode();
961                  threadAssertNull(x);
962                  threadAssertSame(ex1, t);
963                  a.getAndIncrement();
# Line 893 | Line 982 | public class CompletableFutureTest exten
982          final CompletableFuture<Integer> g = m.handle
983              (f,
984               (Integer x, Throwable t) -> {
985 +                m.checkExecutionMode();
986                  threadAssertSame(x, v1);
987                  threadAssertNull(t);
988                  a.getAndIncrement();
# Line 908 | Line 998 | public class CompletableFutureTest exten
998      /**
999       * runAsync completes after running Runnable
1000       */
1001 <    public void testRunAsync() {
1002 <        Noop r = new Noop();
1003 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1004 <        assertNull(f.join());
1005 <        assertEquals(1, r.invocationCount);
1006 <        checkCompletedNormally(f, null);
1007 <    }
1008 <
1009 <    /**
920 <     * runAsync with executor completes after running Runnable
921 <     */
922 <    public void testRunAsync2() {
923 <        Noop r = new Noop();
924 <        ThreadExecutor exec = new ThreadExecutor();
925 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1001 >    public void testRunAsync_normalCompletion() {
1002 >        ExecutionMode[] executionModes = {
1003 >            ExecutionMode.ASYNC,
1004 >            ExecutionMode.EXECUTOR,
1005 >        };
1006 >        for (ExecutionMode m : executionModes)
1007 >    {
1008 >        final Noop r = new Noop(m);
1009 >        final CompletableFuture<Void> f = m.runAsync(r);
1010          assertNull(f.join());
927        assertEquals(1, r.invocationCount);
1011          checkCompletedNormally(f, null);
1012 <        assertEquals(1, exec.count.get());
1013 <    }
1012 >        r.assertInvoked();
1013 >    }}
1014  
1015      /**
1016       * failing runAsync completes exceptionally after running Runnable
1017       */
1018 <    public void testRunAsync3() {
1019 <        FailingRunnable r = new FailingRunnable();
1020 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1018 >    public void testRunAsync_exceptionalCompletion() {
1019 >        ExecutionMode[] executionModes = {
1020 >            ExecutionMode.ASYNC,
1021 >            ExecutionMode.EXECUTOR,
1022 >        };
1023 >        for (ExecutionMode m : executionModes)
1024 >    {
1025 >        final FailingRunnable r = new FailingRunnable(m);
1026 >        final CompletableFuture<Void> f = m.runAsync(r);
1027          checkCompletedWithWrappedCFException(f);
1028 <        assertEquals(1, r.invocationCount);
1029 <    }
1028 >        r.assertInvoked();
1029 >    }}
1030  
1031      /**
1032       * supplyAsync completes with result of supplier
1033       */
1034 <    public void testSupplyAsync() {
1035 <        CompletableFuture<Integer> f;
1036 <        f = CompletableFuture.supplyAsync(supplyOne);
1037 <        assertEquals(f.join(), one);
1038 <        checkCompletedNormally(f, one);
1039 <    }
1040 <
1041 <    /**
1042 <     * supplyAsync with executor completes with result of supplier
1043 <     */
1044 <    public void testSupplyAsync2() {
1045 <        CompletableFuture<Integer> f;
1046 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1047 <        assertEquals(f.join(), one);
959 <        checkCompletedNormally(f, one);
960 <    }
1034 >    public void testSupplyAsync_normalCompletion() {
1035 >        ExecutionMode[] executionModes = {
1036 >            ExecutionMode.ASYNC,
1037 >            ExecutionMode.EXECUTOR,
1038 >        };
1039 >        for (ExecutionMode m : executionModes)
1040 >        for (Integer v1 : new Integer[] { 1, null })
1041 >    {
1042 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1043 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1044 >        assertSame(v1, f.join());
1045 >        checkCompletedNormally(f, v1);
1046 >        r.assertInvoked();
1047 >    }}
1048  
1049      /**
1050       * Failing supplyAsync completes exceptionally
1051       */
1052 <    public void testSupplyAsync3() {
1053 <        FailingSupplier r = new FailingSupplier();
1054 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1052 >    public void testSupplyAsync_exceptionalCompletion() {
1053 >        ExecutionMode[] executionModes = {
1054 >            ExecutionMode.ASYNC,
1055 >            ExecutionMode.EXECUTOR,
1056 >        };
1057 >        for (ExecutionMode m : executionModes)
1058 >    {
1059 >        FailingSupplier r = new FailingSupplier(m);
1060 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1061          checkCompletedWithWrappedCFException(f);
1062 <        assertEquals(1, r.invocationCount);
1063 <    }
1062 >        r.assertInvoked();
1063 >    }}
1064  
1065      // seq completion methods
1066  
# Line 980 | Line 1073 | public class CompletableFutureTest exten
1073          for (Integer v1 : new Integer[] { 1, null })
1074      {
1075          final CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        final Noop r = new Noop();
1076 >        final Noop r = new Noop(m);
1077          if (!createIncomplete) f.complete(v1);
1078          final CompletableFuture<Void> g = m.thenRun(f, r);
1079 <        if (createIncomplete) f.complete(v1);
1079 >        if (createIncomplete) {
1080 >            checkIncomplete(g);
1081 >            f.complete(v1);
1082 >        }
1083  
1084          checkCompletedNormally(g, null);
1085          checkCompletedNormally(f, v1);
1086 <        assertEquals(1, r.invocationCount);
1086 >        r.assertInvoked();
1087      }}
1088  
1089      /**
# Line 1000 | Line 1096 | public class CompletableFutureTest exten
1096      {
1097          final CFException ex = new CFException();
1098          final CompletableFuture<Integer> f = new CompletableFuture<>();
1099 <        final Noop r = new Noop();
1099 >        final Noop r = new Noop(m);
1100          if (!createIncomplete) f.completeExceptionally(ex);
1101          final CompletableFuture<Void> g = m.thenRun(f, r);
1102 <        if (createIncomplete) f.completeExceptionally(ex);
1102 >        if (createIncomplete) {
1103 >            checkIncomplete(g);
1104 >            f.completeExceptionally(ex);
1105 >        }
1106  
1107          checkCompletedWithWrappedCFException(g, ex);
1108          checkCompletedWithWrappedCFException(f, ex);
1109 <        assertEquals(0, r.invocationCount);
1109 >        r.assertNotInvoked();
1110      }}
1111  
1112      /**
# Line 1019 | Line 1118 | public class CompletableFutureTest exten
1118          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1119      {
1120          final CompletableFuture<Integer> f = new CompletableFuture<>();
1121 <        final Noop r = new Noop();
1121 >        final Noop r = new Noop(m);
1122          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 <        final CompletableFuture<Void> g = f.thenRun(r);
1124 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1124 >        if (createIncomplete) {
1125 >            checkIncomplete(g);
1126 >            assertTrue(f.cancel(mayInterruptIfRunning));
1127 >        }
1128  
1129          checkCompletedWithWrappedCancellationException(g);
1130          checkCancelled(f);
1131 <        assertEquals(0, r.invocationCount);
1131 >        r.assertNotInvoked();
1132      }}
1133  
1134      /**
# Line 1038 | Line 1140 | public class CompletableFutureTest exten
1140          for (Integer v1 : new Integer[] { 1, null })
1141      {
1142          final CompletableFuture<Integer> f = new CompletableFuture<>();
1143 <        final FailingRunnable r = new FailingRunnable();
1143 >        final FailingRunnable r = new FailingRunnable(m);
1144          if (!createIncomplete) f.complete(v1);
1145 <        final CompletableFuture<Void> g = f.thenRun(r);
1146 <        if (createIncomplete) f.complete(v1);
1145 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1146 >        if (createIncomplete) {
1147 >            checkIncomplete(g);
1148 >            f.complete(v1);
1149 >        }
1150  
1151          checkCompletedWithWrappedCFException(g);
1152          checkCompletedNormally(f, v1);
# Line 1056 | Line 1161 | public class CompletableFutureTest exten
1161          for (Integer v1 : new Integer[] { 1, null })
1162      {
1163          final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 <        final IncFunction r = new IncFunction();
1164 >        final IncFunction r = new IncFunction(m);
1165          if (!createIncomplete) f.complete(v1);
1166          final CompletableFuture<Integer> g = m.thenApply(f, r);
1167          if (createIncomplete) {
# Line 1066 | Line 1171 | public class CompletableFutureTest exten
1171  
1172          checkCompletedNormally(g, inc(v1));
1173          checkCompletedNormally(f, v1);
1174 <        assertEquals(1, r.invocationCount);
1174 >        r.assertInvoked();
1175      }}
1176  
1177      /**
# Line 1079 | Line 1184 | public class CompletableFutureTest exten
1184      {
1185          final CFException ex = new CFException();
1186          final CompletableFuture<Integer> f = new CompletableFuture<>();
1187 <        final IncFunction r = new IncFunction();
1187 >        final IncFunction r = new IncFunction(m);
1188          if (!createIncomplete) f.completeExceptionally(ex);
1189          final CompletableFuture<Integer> g = m.thenApply(f, r);
1190 <        if (createIncomplete) f.completeExceptionally(ex);
1190 >        if (createIncomplete) {
1191 >            checkIncomplete(g);
1192 >            f.completeExceptionally(ex);
1193 >        }
1194  
1195          checkCompletedWithWrappedCFException(g, ex);
1196          checkCompletedWithWrappedCFException(f, ex);
1197 <        assertEquals(0, r.invocationCount);
1197 >        r.assertNotInvoked();
1198      }}
1199  
1200      /**
# Line 1098 | Line 1206 | public class CompletableFutureTest exten
1206          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1207      {
1208          final CompletableFuture<Integer> f = new CompletableFuture<>();
1209 <        final IncFunction r = new IncFunction();
1209 >        final IncFunction r = new IncFunction(m);
1210          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 <        final CompletableFuture<Integer> g = f.thenApply(r);
1212 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212 >        if (createIncomplete) {
1213 >            checkIncomplete(g);
1214 >            assertTrue(f.cancel(mayInterruptIfRunning));
1215 >        }
1216  
1217          checkCompletedWithWrappedCancellationException(g);
1218          checkCancelled(f);
1219 <        assertEquals(0, r.invocationCount);
1219 >        r.assertNotInvoked();
1220      }}
1221  
1222      /**
# Line 1117 | Line 1228 | public class CompletableFutureTest exten
1228          for (Integer v1 : new Integer[] { 1, null })
1229      {
1230          final CompletableFuture<Integer> f = new CompletableFuture<>();
1231 <        final FailingFunction r = new FailingFunction();
1231 >        final FailingFunction r = new FailingFunction(m);
1232          if (!createIncomplete) f.complete(v1);
1233 <        final CompletableFuture<Integer> g = f.thenApply(r);
1234 <        if (createIncomplete) f.complete(v1);
1233 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234 >        if (createIncomplete) {
1235 >            checkIncomplete(g);
1236 >            f.complete(v1);
1237 >        }
1238  
1239          checkCompletedWithWrappedCFException(g);
1240          checkCompletedNormally(f, v1);
# Line 1135 | Line 1249 | public class CompletableFutureTest exten
1249          for (Integer v1 : new Integer[] { 1, null })
1250      {
1251          final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 <        final IncAction r = new IncAction();
1252 >        final NoopConsumer r = new NoopConsumer(m);
1253          if (!createIncomplete) f.complete(v1);
1254          final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 <        if (createIncomplete) f.complete(v1);
1255 >        if (createIncomplete) {
1256 >            checkIncomplete(g);
1257 >            f.complete(v1);
1258 >        }
1259  
1260          checkCompletedNormally(g, null);
1261 +        r.assertValue(v1);
1262          checkCompletedNormally(f, v1);
1145        assertEquals(1, r.invocationCount);
1146        assertEquals(inc(v1), r.value);
1263      }}
1264  
1265      /**
# Line 1156 | Line 1272 | public class CompletableFutureTest exten
1272      {
1273          final CFException ex = new CFException();
1274          final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 <        final IncAction r = new IncAction();
1275 >        final NoopConsumer r = new NoopConsumer(m);
1276          if (!createIncomplete) f.completeExceptionally(ex);
1277          final CompletableFuture<Void> g = m.thenAccept(f, r);
1278 <        if (createIncomplete) f.completeExceptionally(ex);
1278 >        if (createIncomplete) {
1279 >            checkIncomplete(g);
1280 >            f.completeExceptionally(ex);
1281 >        }
1282  
1283          checkCompletedWithWrappedCFException(g, ex);
1284          checkCompletedWithWrappedCFException(f, ex);
1285 <        assertEquals(0, r.invocationCount);
1167 <    }}
1168 <
1169 <    /**
1170 <     * thenAccept result completes exceptionally if action does
1171 <     */
1172 <    public void testThenAccept_actionFailed() {
1173 <        for (ExecutionMode m : ExecutionMode.values())
1174 <        for (boolean createIncomplete : new boolean[] { true, false })
1175 <        for (Integer v1 : new Integer[] { 1, null })
1176 <    {
1177 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 <        final FailingConsumer r = new FailingConsumer();
1179 <        if (!createIncomplete) f.complete(v1);
1180 <        final CompletableFuture<Void> g = f.thenAccept(r);
1181 <        if (createIncomplete) f.complete(v1);
1182 <
1183 <        checkCompletedWithWrappedCFException(g);
1184 <        checkCompletedNormally(f, v1);
1285 >        r.assertNotInvoked();
1286      }}
1287  
1288      /**
# Line 1193 | Line 1294 | public class CompletableFutureTest exten
1294          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1295      {
1296          final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 <        final IncAction r = new IncAction();
1297 >        final NoopConsumer r = new NoopConsumer(m);
1298          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299 <        final CompletableFuture<Void> g = f.thenAccept(r);
1299 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1300          if (createIncomplete) {
1301              checkIncomplete(g);
1302              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1203 | Line 1304 | public class CompletableFutureTest exten
1304  
1305          checkCompletedWithWrappedCancellationException(g);
1306          checkCancelled(f);
1307 <        assertEquals(0, r.invocationCount);
1307 >        r.assertNotInvoked();
1308      }}
1309  
1310      /**
1311 <     * thenCombine result completes normally after normal completion
1211 <     * of sources
1311 >     * thenAccept result completes exceptionally if action does
1312       */
1313 <    public void testThenCombine_normalCompletion1() {
1214 <        for (boolean createIncomplete : new boolean[] { true, false })
1215 <        for (boolean fFirst : new boolean[] { true, false })
1313 >    public void testThenAccept_actionFailed() {
1314          for (ExecutionMode m : ExecutionMode.values())
1315 +        for (boolean createIncomplete : new boolean[] { true, false })
1316          for (Integer v1 : new Integer[] { 1, null })
1218        for (Integer v2 : new Integer[] { 2, null })
1317      {
1318          final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1320 <        final SubtractFunction r = new SubtractFunction();
1321 <        CompletableFuture<Integer> h = null;
1322 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1323 <
1226 <        if (fFirst)
1227 <            f.complete(v1);
1228 <        else
1229 <            g.complete(v2);
1230 <        if (createIncomplete) checkIncomplete(h);
1231 <        assertEquals(0, r.invocationCount);
1232 <        if (!fFirst)
1319 >        final FailingConsumer r = new FailingConsumer(m);
1320 >        if (!createIncomplete) f.complete(v1);
1321 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1322 >        if (createIncomplete) {
1323 >            checkIncomplete(g);
1324              f.complete(v1);
1325 <        else
1235 <            g.complete(v2);
1236 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1325 >        }
1326  
1327 <        checkCompletedNormally(h, subtract(v1, v2));
1327 >        checkCompletedWithWrappedCFException(g);
1328          checkCompletedNormally(f, v1);
1240        checkCompletedNormally(g, v2);
1241        assertEquals(1, r.invocationCount);
1329      }}
1330  
1331      /**
1332 <     * thenCombine result completes exceptionally after exceptional
1333 <     * completion of either source
1332 >     * thenCombine result completes normally after normal completion
1333 >     * of sources
1334       */
1335 <    public void testThenCombine_exceptionalCompletion1() {
1335 >    public void testThenCombine_normalCompletion() {
1336          for (ExecutionMode m : ExecutionMode.values())
1337 +        for (boolean createIncomplete : new boolean[] { true, false })
1338 +        for (boolean fFirst : new boolean[] { true, false })
1339          for (Integer v1 : new Integer[] { 1, null })
1340 +        for (Integer v2 : new Integer[] { 2, null })
1341      {
1342          final CompletableFuture<Integer> f = new CompletableFuture<>();
1343          final CompletableFuture<Integer> g = new CompletableFuture<>();
1344 <        final SubtractFunction r = new SubtractFunction();
1255 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1256 <        final CFException ex = new CFException();
1344 >        final SubtractFunction r = new SubtractFunction(m);
1345  
1346 <        f.completeExceptionally(ex);
1347 <        checkIncomplete(h);
1348 <        g.complete(v1);
1261 <
1262 <        checkCompletedWithWrappedCFException(h, ex);
1263 <        checkCompletedWithWrappedCFException(f, ex);
1264 <        assertEquals(0, r.invocationCount);
1265 <        checkCompletedNormally(g, v1);
1266 <    }}
1267 <
1268 <    public void testThenCombine_exceptionalCompletion2() {
1269 <        for (ExecutionMode m : ExecutionMode.values())
1270 <        for (Integer v1 : new Integer[] { 1, null })
1271 <    {
1272 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1273 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1274 <        final SubtractFunction r = new SubtractFunction();
1346 >        if (fFirst) f.complete(v1); else g.complete(v2);
1347 >        if (!createIncomplete)
1348 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1349          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1350 <        final CFException ex = new CFException();
1351 <
1352 <        g.completeExceptionally(ex);
1353 <        checkIncomplete(h);
1354 <        f.complete(v1);
1350 >        if (createIncomplete) {
1351 >            checkIncomplete(h);
1352 >            r.assertNotInvoked();
1353 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1354 >        }
1355  
1356 <        checkCompletedWithWrappedCFException(h, ex);
1283 <        checkCompletedWithWrappedCFException(g, ex);
1284 <        assertEquals(0, r.invocationCount);
1356 >        checkCompletedNormally(h, subtract(v1, v2));
1357          checkCompletedNormally(f, v1);
1358 +        checkCompletedNormally(g, v2);
1359 +        r.assertInvoked();
1360      }}
1361  
1362 <    public void testThenCombine_exceptionalCompletion3() {
1362 >    /**
1363 >     * thenCombine result completes exceptionally after exceptional
1364 >     * completion of either source
1365 >     */
1366 >    public void testThenCombine_exceptionalCompletion() {
1367          for (ExecutionMode m : ExecutionMode.values())
1368 +        for (boolean createIncomplete : new boolean[] { true, false })
1369 +        for (boolean fFirst : new boolean[] { true, false })
1370          for (Integer v1 : new Integer[] { 1, null })
1371      {
1372          final CompletableFuture<Integer> f = new CompletableFuture<>();
1373          final CompletableFuture<Integer> g = new CompletableFuture<>();
1294        final SubtractFunction r = new SubtractFunction();
1374          final CFException ex = new CFException();
1375 +        final SubtractFunction r = new SubtractFunction(m);
1376  
1377 <        g.completeExceptionally(ex);
1378 <        f.complete(v1);
1377 >        (fFirst ? f : g).complete(v1);
1378 >        if (!createIncomplete)
1379 >            (!fFirst ? f : g).completeExceptionally(ex);
1380          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1381 +        if (createIncomplete) {
1382 +            checkIncomplete(h);
1383 +            (!fFirst ? f : g).completeExceptionally(ex);
1384 +        }
1385  
1386          checkCompletedWithWrappedCFException(h, ex);
1387 <        checkCompletedWithWrappedCFException(g, ex);
1388 <        assertEquals(0, r.invocationCount);
1389 <        checkCompletedNormally(f, v1);
1387 >        r.assertNotInvoked();
1388 >        checkCompletedNormally(fFirst ? f : g, v1);
1389 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1390      }}
1391  
1392 <    public void testThenCombine_exceptionalCompletion4() {
1392 >    /**
1393 >     * thenCombine result completes exceptionally if either source cancelled
1394 >     */
1395 >    public void testThenCombine_sourceCancelled() {
1396          for (ExecutionMode m : ExecutionMode.values())
1397 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398 +        for (boolean createIncomplete : new boolean[] { true, false })
1399 +        for (boolean fFirst : new boolean[] { true, false })
1400          for (Integer v1 : new Integer[] { 1, null })
1401      {
1402          final CompletableFuture<Integer> f = new CompletableFuture<>();
1403          final CompletableFuture<Integer> g = new CompletableFuture<>();
1404 <        final SubtractFunction r = new SubtractFunction();
1314 <        final CFException ex = new CFException();
1404 >        final SubtractFunction r = new SubtractFunction(m);
1405  
1406 <        f.completeExceptionally(ex);
1407 <        g.complete(v1);
1406 >        (fFirst ? f : g).complete(v1);
1407 >        if (!createIncomplete)
1408 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1409          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1410 +        if (createIncomplete) {
1411 +            checkIncomplete(h);
1412 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1413 +        }
1414  
1415 <        checkCompletedWithWrappedCFException(h, ex);
1416 <        checkCompletedWithWrappedCFException(f, ex);
1417 <        assertEquals(0, r.invocationCount);
1418 <        checkCompletedNormally(g, v1);
1415 >        checkCompletedWithWrappedCancellationException(h);
1416 >        checkCancelled(!fFirst ? f : g);
1417 >        r.assertNotInvoked();
1418 >        checkCompletedNormally(fFirst ? f : g, v1);
1419      }}
1420  
1421      /**
1422       * thenCombine result completes exceptionally if action does
1423       */
1424 <    public void testThenCombine_actionFailed1() {
1330 <        for (ExecutionMode m : ExecutionMode.values())
1331 <        for (Integer v1 : new Integer[] { 1, null })
1332 <        for (Integer v2 : new Integer[] { 2, null })
1333 <    {
1334 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1336 <        final FailingBiFunction r = new FailingBiFunction();
1337 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1338 <
1339 <        f.complete(v1);
1340 <        checkIncomplete(h);
1341 <        g.complete(v2);
1342 <
1343 <        checkCompletedWithWrappedCFException(h);
1344 <        checkCompletedNormally(f, v1);
1345 <        checkCompletedNormally(g, v2);
1346 <    }}
1347 <
1348 <    public void testThenCombine_actionFailed2() {
1424 >    public void testThenCombine_actionFailed() {
1425          for (ExecutionMode m : ExecutionMode.values())
1426 +        for (boolean fFirst : new boolean[] { true, false })
1427          for (Integer v1 : new Integer[] { 1, null })
1428          for (Integer v2 : new Integer[] { 2, null })
1429      {
1430          final CompletableFuture<Integer> f = new CompletableFuture<>();
1431          final CompletableFuture<Integer> g = new CompletableFuture<>();
1432 <        final FailingBiFunction r = new FailingBiFunction();
1432 >        final FailingBiFunction r = new FailingBiFunction(m);
1433          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1434  
1435 <        g.complete(v2);
1436 <        checkIncomplete(h);
1437 <        f.complete(v1);
1435 >        if (fFirst) {
1436 >            f.complete(v1);
1437 >            g.complete(v2);
1438 >        } else {
1439 >            g.complete(v2);
1440 >            f.complete(v1);
1441 >        }
1442  
1443          checkCompletedWithWrappedCFException(h);
1444          checkCompletedNormally(f, v1);
# Line 1365 | Line 1446 | public class CompletableFutureTest exten
1446      }}
1447  
1448      /**
1368     * thenCombine result completes exceptionally if either source cancelled
1369     */
1370    public void testThenCombine_sourceCancelled1() {
1371        for (ExecutionMode m : ExecutionMode.values())
1372        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1373        for (Integer v1 : new Integer[] { 1, null })
1374    {
1375        final CompletableFuture<Integer> f = new CompletableFuture<>();
1376        final CompletableFuture<Integer> g = new CompletableFuture<>();
1377        final SubtractFunction r = new SubtractFunction();
1378        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1379
1380        assertTrue(f.cancel(mayInterruptIfRunning));
1381        checkIncomplete(h);
1382        g.complete(v1);
1383
1384        checkCompletedWithWrappedCancellationException(h);
1385        checkCancelled(f);
1386        assertEquals(0, r.invocationCount);
1387        checkCompletedNormally(g, v1);
1388    }}
1389
1390    public void testThenCombine_sourceCancelled2() {
1391        for (ExecutionMode m : ExecutionMode.values())
1392        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1393        for (Integer v1 : new Integer[] { 1, null })
1394    {
1395        final CompletableFuture<Integer> f = new CompletableFuture<>();
1396        final CompletableFuture<Integer> g = new CompletableFuture<>();
1397        final SubtractFunction r = new SubtractFunction();
1398        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1399
1400        assertTrue(g.cancel(mayInterruptIfRunning));
1401        checkIncomplete(h);
1402        f.complete(v1);
1403
1404        checkCompletedWithWrappedCancellationException(h);
1405        checkCancelled(g);
1406        assertEquals(0, r.invocationCount);
1407        checkCompletedNormally(f, v1);
1408    }}
1409
1410    public void testThenCombine_sourceCancelled3() {
1411        for (ExecutionMode m : ExecutionMode.values())
1412        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1413        for (Integer v1 : new Integer[] { 1, null })
1414    {
1415        final CompletableFuture<Integer> f = new CompletableFuture<>();
1416        final CompletableFuture<Integer> g = new CompletableFuture<>();
1417        final SubtractFunction r = new SubtractFunction();
1418
1419        assertTrue(g.cancel(mayInterruptIfRunning));
1420        f.complete(v1);
1421        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1422
1423        checkCompletedWithWrappedCancellationException(h);
1424        checkCancelled(g);
1425        assertEquals(0, r.invocationCount);
1426        checkCompletedNormally(f, v1);
1427    }}
1428
1429    public void testThenCombine_sourceCancelled4() {
1430        for (ExecutionMode m : ExecutionMode.values())
1431        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1432        for (Integer v1 : new Integer[] { 1, null })
1433    {
1434        final CompletableFuture<Integer> f = new CompletableFuture<>();
1435        final CompletableFuture<Integer> g = new CompletableFuture<>();
1436        final SubtractFunction r = new SubtractFunction();
1437
1438        assertTrue(f.cancel(mayInterruptIfRunning));
1439        g.complete(v1);
1440        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1441
1442        checkCompletedWithWrappedCancellationException(h);
1443        checkCancelled(f);
1444        assertEquals(0, r.invocationCount);
1445        checkCompletedNormally(g, v1);
1446    }}
1447
1448    /**
1449       * thenAcceptBoth result completes normally after normal
1450       * completion of sources
1451       */
1452 <    public void testThenAcceptBoth_normalCompletion1() {
1453 <        for (ExecutionMode m : ExecutionMode.values())
1454 <        for (Integer v1 : new Integer[] { 1, null })
1455 <        for (Integer v2 : new Integer[] { 2, null })
1456 <    {
1457 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1458 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1459 <        final SubtractAction r = new SubtractAction();
1460 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1461 <
1462 <        f.complete(v1);
1463 <        checkIncomplete(h);
1464 <        assertEquals(0, r.invocationCount);
1465 <        g.complete(v2);
1466 <
1467 <        checkCompletedNormally(h, null);
1468 <        assertEquals(subtract(v1, v2), r.value);
1469 <        checkCompletedNormally(f, v1);
1470 <        checkCompletedNormally(g, v2);
1471 <    }}
1472 <
1473 <    public void testThenAcceptBoth_normalCompletion2() {
1474 <        for (ExecutionMode m : ExecutionMode.values())
1475 <        for (Integer v1 : new Integer[] { 1, null })
1476 <        for (Integer v2 : new Integer[] { 2, null })
1477 <    {
1478 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1479 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1480 <        final SubtractAction r = new SubtractAction();
1481 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1482 <
1483 <        g.complete(v2);
1484 <        checkIncomplete(h);
1485 <        assertEquals(0, r.invocationCount);
1486 <        f.complete(v1);
1487 <
1488 <        checkCompletedNormally(h, null);
1489 <        assertEquals(subtract(v1, v2), r.value);
1490 <        checkCompletedNormally(f, v1);
1491 <        checkCompletedNormally(g, v2);
1492 <    }}
1493 <
1494 <    public void testThenAcceptBoth_normalCompletion3() {
1495 <        for (ExecutionMode m : ExecutionMode.values())
1496 <        for (Integer v1 : new Integer[] { 1, null })
1497 <        for (Integer v2 : new Integer[] { 2, null })
1498 <    {
1499 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1500 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1501 <        final SubtractAction r = new SubtractAction();
1502 <
1503 <        g.complete(v2);
1504 <        f.complete(v1);
1505 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1506 <
1507 <        checkCompletedNormally(h, null);
1508 <        assertEquals(subtract(v1, v2), r.value);
1509 <        checkCompletedNormally(f, v1);
1510 <        checkCompletedNormally(g, v2);
1511 <    }}
1512 <
1513 <    public void testThenAcceptBoth_normalCompletion4() {
1452 >    public void testThenAcceptBoth_normalCompletion() {
1453          for (ExecutionMode m : ExecutionMode.values())
1454 +        for (boolean createIncomplete : new boolean[] { true, false })
1455 +        for (boolean fFirst : new boolean[] { true, false })
1456          for (Integer v1 : new Integer[] { 1, null })
1457          for (Integer v2 : new Integer[] { 2, null })
1458      {
1459          final CompletableFuture<Integer> f = new CompletableFuture<>();
1460          final CompletableFuture<Integer> g = new CompletableFuture<>();
1461 <        final SubtractAction r = new SubtractAction();
1461 >        final SubtractAction r = new SubtractAction(m);
1462  
1463 <        f.complete(v1);
1464 <        g.complete(v2);
1463 >        if (fFirst) f.complete(v1); else g.complete(v2);
1464 >        if (!createIncomplete)
1465 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1466          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1467 +        if (createIncomplete) {
1468 +            checkIncomplete(h);
1469 +            r.assertNotInvoked();
1470 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1471 +        }
1472  
1473          checkCompletedNormally(h, null);
1474 <        assertEquals(subtract(v1, v2), r.value);
1474 >        r.assertValue(subtract(v1, v2));
1475          checkCompletedNormally(f, v1);
1476          checkCompletedNormally(g, v2);
1477      }}
# Line 1533 | Line 1480 | public class CompletableFutureTest exten
1480       * thenAcceptBoth result completes exceptionally after exceptional
1481       * completion of either source
1482       */
1483 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1537 <        for (ExecutionMode m : ExecutionMode.values())
1538 <        for (Integer v1 : new Integer[] { 1, null })
1539 <    {
1540 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1541 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1542 <        final SubtractAction r = new SubtractAction();
1543 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1544 <        final CFException ex = new CFException();
1545 <
1546 <        f.completeExceptionally(ex);
1547 <        checkIncomplete(h);
1548 <        g.complete(v1);
1549 <
1550 <        checkCompletedWithWrappedCFException(h, ex);
1551 <        checkCompletedWithWrappedCFException(f, ex);
1552 <        assertEquals(0, r.invocationCount);
1553 <        checkCompletedNormally(g, v1);
1554 <    }}
1555 <
1556 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1557 <        for (ExecutionMode m : ExecutionMode.values())
1558 <        for (Integer v1 : new Integer[] { 1, null })
1559 <    {
1560 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1561 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1562 <        final SubtractAction r = new SubtractAction();
1563 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1564 <        final CFException ex = new CFException();
1565 <
1566 <        g.completeExceptionally(ex);
1567 <        checkIncomplete(h);
1568 <        f.complete(v1);
1569 <
1570 <        checkCompletedWithWrappedCFException(h, ex);
1571 <        checkCompletedWithWrappedCFException(g, ex);
1572 <        assertEquals(0, r.invocationCount);
1573 <        checkCompletedNormally(f, v1);
1574 <    }}
1575 <
1576 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1483 >    public void testThenAcceptBoth_exceptionalCompletion() {
1484          for (ExecutionMode m : ExecutionMode.values())
1485 +        for (boolean createIncomplete : new boolean[] { true, false })
1486 +        for (boolean fFirst : new boolean[] { true, false })
1487          for (Integer v1 : new Integer[] { 1, null })
1488      {
1489          final CompletableFuture<Integer> f = new CompletableFuture<>();
1490          final CompletableFuture<Integer> g = new CompletableFuture<>();
1582        final SubtractAction r = new SubtractAction();
1491          final CFException ex = new CFException();
1492 +        final SubtractAction r = new SubtractAction(m);
1493  
1494 <        g.completeExceptionally(ex);
1495 <        f.complete(v1);
1494 >        (fFirst ? f : g).complete(v1);
1495 >        if (!createIncomplete)
1496 >            (!fFirst ? f : g).completeExceptionally(ex);
1497          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1498 +        if (createIncomplete) {
1499 +            checkIncomplete(h);
1500 +            (!fFirst ? f : g).completeExceptionally(ex);
1501 +        }
1502  
1503          checkCompletedWithWrappedCFException(h, ex);
1504 <        checkCompletedWithWrappedCFException(g, ex);
1505 <        assertEquals(0, r.invocationCount);
1506 <        checkCompletedNormally(f, v1);
1504 >        r.assertNotInvoked();
1505 >        checkCompletedNormally(fFirst ? f : g, v1);
1506 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1507      }}
1508  
1509 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1509 >    /**
1510 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1511 >     */
1512 >    public void testThenAcceptBoth_sourceCancelled() {
1513          for (ExecutionMode m : ExecutionMode.values())
1514 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515 +        for (boolean createIncomplete : new boolean[] { true, false })
1516 +        for (boolean fFirst : new boolean[] { true, false })
1517          for (Integer v1 : new Integer[] { 1, null })
1518      {
1519          final CompletableFuture<Integer> f = new CompletableFuture<>();
1520          final CompletableFuture<Integer> g = new CompletableFuture<>();
1521 <        final SubtractAction r = new SubtractAction();
1602 <        final CFException ex = new CFException();
1521 >        final SubtractAction r = new SubtractAction(m);
1522  
1523 <        f.completeExceptionally(ex);
1524 <        g.complete(v1);
1523 >        (fFirst ? f : g).complete(v1);
1524 >        if (!createIncomplete)
1525 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1526          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1527 +        if (createIncomplete) {
1528 +            checkIncomplete(h);
1529 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1530 +        }
1531  
1532 <        checkCompletedWithWrappedCFException(h, ex);
1533 <        checkCompletedWithWrappedCFException(f, ex);
1534 <        assertEquals(0, r.invocationCount);
1535 <        checkCompletedNormally(g, v1);
1532 >        checkCompletedWithWrappedCancellationException(h);
1533 >        checkCancelled(!fFirst ? f : g);
1534 >        r.assertNotInvoked();
1535 >        checkCompletedNormally(fFirst ? f : g, v1);
1536      }}
1537  
1538      /**
1539       * thenAcceptBoth result completes exceptionally if action does
1540       */
1541 <    public void testThenAcceptBoth_actionFailed1() {
1618 <        for (ExecutionMode m : ExecutionMode.values())
1619 <        for (Integer v1 : new Integer[] { 1, null })
1620 <        for (Integer v2 : new Integer[] { 2, null })
1621 <    {
1622 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1623 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1624 <        final FailingBiConsumer r = new FailingBiConsumer();
1625 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1626 <
1627 <        f.complete(v1);
1628 <        checkIncomplete(h);
1629 <        g.complete(v2);
1630 <
1631 <        checkCompletedWithWrappedCFException(h);
1632 <        checkCompletedNormally(f, v1);
1633 <        checkCompletedNormally(g, v2);
1634 <    }}
1635 <
1636 <    public void testThenAcceptBoth_actionFailed2() {
1541 >    public void testThenAcceptBoth_actionFailed() {
1542          for (ExecutionMode m : ExecutionMode.values())
1543 +        for (boolean fFirst : new boolean[] { true, false })
1544          for (Integer v1 : new Integer[] { 1, null })
1545          for (Integer v2 : new Integer[] { 2, null })
1546      {
1547          final CompletableFuture<Integer> f = new CompletableFuture<>();
1548          final CompletableFuture<Integer> g = new CompletableFuture<>();
1549 <        final FailingBiConsumer r = new FailingBiConsumer();
1549 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1550          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551  
1552 <        g.complete(v2);
1553 <        checkIncomplete(h);
1554 <        f.complete(v1);
1552 >        if (fFirst) {
1553 >            f.complete(v1);
1554 >            g.complete(v2);
1555 >        } else {
1556 >            g.complete(v2);
1557 >            f.complete(v1);
1558 >        }
1559  
1560          checkCompletedWithWrappedCFException(h);
1561          checkCompletedNormally(f, v1);
# Line 1653 | Line 1563 | public class CompletableFutureTest exten
1563      }}
1564  
1565      /**
1656     * thenAcceptBoth result completes exceptionally if either source cancelled
1657     */
1658    public void testThenAcceptBoth_sourceCancelled1() {
1659        for (ExecutionMode m : ExecutionMode.values())
1660        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1661        for (Integer v1 : new Integer[] { 1, null })
1662    {
1663        final CompletableFuture<Integer> f = new CompletableFuture<>();
1664        final CompletableFuture<Integer> g = new CompletableFuture<>();
1665        final SubtractAction r = new SubtractAction();
1666        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1667
1668        assertTrue(f.cancel(mayInterruptIfRunning));
1669        checkIncomplete(h);
1670        g.complete(v1);
1671
1672        checkCompletedWithWrappedCancellationException(h);
1673        checkCancelled(f);
1674        assertEquals(0, r.invocationCount);
1675        checkCompletedNormally(g, v1);
1676    }}
1677
1678    public void testThenAcceptBoth_sourceCancelled2() {
1679        for (ExecutionMode m : ExecutionMode.values())
1680        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1681        for (Integer v1 : new Integer[] { 1, null })
1682    {
1683        final CompletableFuture<Integer> f = new CompletableFuture<>();
1684        final CompletableFuture<Integer> g = new CompletableFuture<>();
1685        final SubtractAction r = new SubtractAction();
1686        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1687
1688        assertTrue(g.cancel(mayInterruptIfRunning));
1689        checkIncomplete(h);
1690        f.complete(v1);
1691
1692        checkCompletedWithWrappedCancellationException(h);
1693        checkCancelled(g);
1694        assertEquals(0, r.invocationCount);
1695        checkCompletedNormally(f, v1);
1696    }}
1697
1698    public void testThenAcceptBoth_sourceCancelled3() {
1699        for (ExecutionMode m : ExecutionMode.values())
1700        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1701        for (Integer v1 : new Integer[] { 1, null })
1702    {
1703        final CompletableFuture<Integer> f = new CompletableFuture<>();
1704        final CompletableFuture<Integer> g = new CompletableFuture<>();
1705        final SubtractAction r = new SubtractAction();
1706
1707        assertTrue(g.cancel(mayInterruptIfRunning));
1708        f.complete(v1);
1709        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1710
1711        checkCompletedWithWrappedCancellationException(h);
1712        checkCancelled(g);
1713        assertEquals(0, r.invocationCount);
1714        checkCompletedNormally(f, v1);
1715    }}
1716
1717    public void testThenAcceptBoth_sourceCancelled4() {
1718        for (ExecutionMode m : ExecutionMode.values())
1719        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1720        for (Integer v1 : new Integer[] { 1, null })
1721    {
1722        final CompletableFuture<Integer> f = new CompletableFuture<>();
1723        final CompletableFuture<Integer> g = new CompletableFuture<>();
1724        final SubtractAction r = new SubtractAction();
1725
1726        assertTrue(f.cancel(mayInterruptIfRunning));
1727        g.complete(v1);
1728        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1729
1730        checkCompletedWithWrappedCancellationException(h);
1731        checkCancelled(f);
1732        assertEquals(0, r.invocationCount);
1733        checkCompletedNormally(g, v1);
1734    }}
1735
1736    /**
1566       * runAfterBoth result completes normally after normal
1567       * completion of sources
1568       */
1569 <    public void testRunAfterBoth_normalCompletion1() {
1741 <        for (ExecutionMode m : ExecutionMode.values())
1742 <        for (Integer v1 : new Integer[] { 1, null })
1743 <        for (Integer v2 : new Integer[] { 2, null })
1744 <    {
1745 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1746 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1747 <        final Noop r = new Noop();
1748 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1749 <
1750 <        f.complete(v1);
1751 <        checkIncomplete(h);
1752 <        assertEquals(0, r.invocationCount);
1753 <        g.complete(v2);
1754 <
1755 <        checkCompletedNormally(h, null);
1756 <        assertEquals(1, r.invocationCount);
1757 <        checkCompletedNormally(f, v1);
1758 <        checkCompletedNormally(g, v2);
1759 <    }}
1760 <
1761 <    public void testRunAfterBoth_normalCompletion2() {
1762 <        for (ExecutionMode m : ExecutionMode.values())
1763 <        for (Integer v1 : new Integer[] { 1, null })
1764 <        for (Integer v2 : new Integer[] { 2, null })
1765 <    {
1766 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1767 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1768 <        final Noop r = new Noop();
1769 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1770 <
1771 <        g.complete(v2);
1772 <        checkIncomplete(h);
1773 <        assertEquals(0, r.invocationCount);
1774 <        f.complete(v1);
1775 <
1776 <        checkCompletedNormally(h, null);
1777 <        assertEquals(1, r.invocationCount);
1778 <        checkCompletedNormally(f, v1);
1779 <        checkCompletedNormally(g, v2);
1780 <    }}
1781 <
1782 <    public void testRunAfterBoth_normalCompletion3() {
1783 <        for (ExecutionMode m : ExecutionMode.values())
1784 <        for (Integer v1 : new Integer[] { 1, null })
1785 <        for (Integer v2 : new Integer[] { 2, null })
1786 <    {
1787 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1788 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1789 <        final Noop r = new Noop();
1790 <
1791 <        g.complete(v2);
1792 <        f.complete(v1);
1793 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1794 <
1795 <        checkCompletedNormally(h, null);
1796 <        assertEquals(1, r.invocationCount);
1797 <        checkCompletedNormally(f, v1);
1798 <        checkCompletedNormally(g, v2);
1799 <    }}
1800 <
1801 <    public void testRunAfterBoth_normalCompletion4() {
1569 >    public void testRunAfterBoth_normalCompletion() {
1570          for (ExecutionMode m : ExecutionMode.values())
1571 +        for (boolean createIncomplete : new boolean[] { true, false })
1572 +        for (boolean fFirst : new boolean[] { true, false })
1573          for (Integer v1 : new Integer[] { 1, null })
1574          for (Integer v2 : new Integer[] { 2, null })
1575      {
1576          final CompletableFuture<Integer> f = new CompletableFuture<>();
1577          final CompletableFuture<Integer> g = new CompletableFuture<>();
1578 <        final Noop r = new Noop();
1578 >        final Noop r = new Noop(m);
1579  
1580 <        f.complete(v1);
1581 <        g.complete(v2);
1580 >        if (fFirst) f.complete(v1); else g.complete(v2);
1581 >        if (!createIncomplete)
1582 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1583          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 +        if (createIncomplete) {
1585 +            checkIncomplete(h);
1586 +            r.assertNotInvoked();
1587 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1588 +        }
1589  
1590          checkCompletedNormally(h, null);
1591 <        assertEquals(1, r.invocationCount);
1591 >        r.assertInvoked();
1592          checkCompletedNormally(f, v1);
1593          checkCompletedNormally(g, v2);
1594      }}
# Line 1821 | Line 1597 | public class CompletableFutureTest exten
1597       * runAfterBoth result completes exceptionally after exceptional
1598       * completion of either source
1599       */
1600 <    public void testRunAfterBoth_exceptionalCompletion1() {
1825 <        for (ExecutionMode m : ExecutionMode.values())
1826 <        for (Integer v1 : new Integer[] { 1, null })
1827 <    {
1828 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1829 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1830 <        final Noop r = new Noop();
1831 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1832 <        final CFException ex = new CFException();
1833 <
1834 <        f.completeExceptionally(ex);
1835 <        checkIncomplete(h);
1836 <        g.complete(v1);
1837 <
1838 <        checkCompletedWithWrappedCFException(h, ex);
1839 <        checkCompletedWithWrappedCFException(f, ex);
1840 <        assertEquals(0, r.invocationCount);
1841 <        checkCompletedNormally(g, v1);
1842 <    }}
1843 <
1844 <    public void testRunAfterBoth_exceptionalCompletion2() {
1845 <        for (ExecutionMode m : ExecutionMode.values())
1846 <        for (Integer v1 : new Integer[] { 1, null })
1847 <    {
1848 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1849 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1850 <        final Noop r = new Noop();
1851 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1852 <        final CFException ex = new CFException();
1853 <
1854 <        g.completeExceptionally(ex);
1855 <        checkIncomplete(h);
1856 <        f.complete(v1);
1857 <
1858 <        checkCompletedWithWrappedCFException(h, ex);
1859 <        checkCompletedWithWrappedCFException(g, ex);
1860 <        assertEquals(0, r.invocationCount);
1861 <        checkCompletedNormally(f, v1);
1862 <    }}
1863 <
1864 <    public void testRunAfterBoth_exceptionalCompletion3() {
1865 <        for (ExecutionMode m : ExecutionMode.values())
1866 <        for (Integer v1 : new Integer[] { 1, null })
1867 <    {
1868 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1869 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1870 <        final Noop r = new Noop();
1871 <        final CFException ex = new CFException();
1872 <
1873 <        g.completeExceptionally(ex);
1874 <        f.complete(v1);
1875 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1876 <
1877 <        checkCompletedWithWrappedCFException(h, ex);
1878 <        checkCompletedWithWrappedCFException(g, ex);
1879 <        assertEquals(0, r.invocationCount);
1880 <        checkCompletedNormally(f, v1);
1881 <    }}
1882 <
1883 <    public void testRunAfterBoth_exceptionalCompletion4() {
1600 >    public void testRunAfterBoth_exceptionalCompletion() {
1601          for (ExecutionMode m : ExecutionMode.values())
1602 +        for (boolean createIncomplete : new boolean[] { true, false })
1603 +        for (boolean fFirst : new boolean[] { true, false })
1604          for (Integer v1 : new Integer[] { 1, null })
1605      {
1606          final CompletableFuture<Integer> f = new CompletableFuture<>();
1607          final CompletableFuture<Integer> g = new CompletableFuture<>();
1889        final Noop r = new Noop();
1608          final CFException ex = new CFException();
1609 +        final Noop r = new Noop(m);
1610  
1611 <        f.completeExceptionally(ex);
1612 <        g.complete(v1);
1611 >        (fFirst ? f : g).complete(v1);
1612 >        if (!createIncomplete)
1613 >            (!fFirst ? f : g).completeExceptionally(ex);
1614          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1615 +        if (createIncomplete) {
1616 +            checkIncomplete(h);
1617 +            (!fFirst ? f : g).completeExceptionally(ex);
1618 +        }
1619  
1620          checkCompletedWithWrappedCFException(h, ex);
1621 <        checkCompletedWithWrappedCFException(f, ex);
1622 <        assertEquals(0, r.invocationCount);
1623 <        checkCompletedNormally(g, v1);
1900 <    }}
1901 <
1902 <    /**
1903 <     * runAfterBoth result completes exceptionally if action does
1904 <     */
1905 <    public void testRunAfterBoth_actionFailed1() {
1906 <        for (ExecutionMode m : ExecutionMode.values())
1907 <        for (Integer v1 : new Integer[] { 1, null })
1908 <        for (Integer v2 : new Integer[] { 2, null })
1909 <    {
1910 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1911 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1912 <        final FailingRunnable r = new FailingRunnable();
1913 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1914 <
1915 <        f.complete(v1);
1916 <        checkIncomplete(h);
1917 <        g.complete(v2);
1918 <
1919 <        checkCompletedWithWrappedCFException(h);
1920 <        checkCompletedNormally(f, v1);
1921 <        checkCompletedNormally(g, v2);
1922 <    }}
1923 <
1924 <    public void testRunAfterBoth_actionFailed2() {
1925 <        for (ExecutionMode m : ExecutionMode.values())
1926 <        for (Integer v1 : new Integer[] { 1, null })
1927 <        for (Integer v2 : new Integer[] { 2, null })
1928 <    {
1929 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1930 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 <        final FailingRunnable r = new FailingRunnable();
1932 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1933 <
1934 <        g.complete(v2);
1935 <        checkIncomplete(h);
1936 <        f.complete(v1);
1937 <
1938 <        checkCompletedWithWrappedCFException(h);
1939 <        checkCompletedNormally(f, v1);
1940 <        checkCompletedNormally(g, v2);
1621 >        r.assertNotInvoked();
1622 >        checkCompletedNormally(fFirst ? f : g, v1);
1623 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1624      }}
1625  
1626      /**
1627       * runAfterBoth result completes exceptionally if either source cancelled
1628       */
1629 <    public void testRunAfterBoth_sourceCancelled1() {
1629 >    public void testRunAfterBoth_sourceCancelled() {
1630          for (ExecutionMode m : ExecutionMode.values())
1631          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632 +        for (boolean createIncomplete : new boolean[] { true, false })
1633 +        for (boolean fFirst : new boolean[] { true, false })
1634          for (Integer v1 : new Integer[] { 1, null })
1635      {
1636          final CompletableFuture<Integer> f = new CompletableFuture<>();
1637          final CompletableFuture<Integer> g = new CompletableFuture<>();
1638 <        final Noop r = new Noop();
1954 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1955 <
1956 <        assertTrue(f.cancel(mayInterruptIfRunning));
1957 <        checkIncomplete(h);
1958 <        g.complete(v1);
1638 >        final Noop r = new Noop(m);
1639  
1960        checkCompletedWithWrappedCancellationException(h);
1961        checkCancelled(f);
1962        assertEquals(0, r.invocationCount);
1963        checkCompletedNormally(g, v1);
1964    }}
1640  
1641 <    public void testRunAfterBoth_sourceCancelled2() {
1642 <        for (ExecutionMode m : ExecutionMode.values())
1643 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1969 <        for (Integer v1 : new Integer[] { 1, null })
1970 <    {
1971 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1972 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1973 <        final Noop r = new Noop();
1641 >        (fFirst ? f : g).complete(v1);
1642 >        if (!createIncomplete)
1643 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1644          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1645 <
1646 <        assertTrue(g.cancel(mayInterruptIfRunning));
1647 <        checkIncomplete(h);
1648 <        f.complete(v1);
1645 >        if (createIncomplete) {
1646 >            checkIncomplete(h);
1647 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1648 >        }
1649  
1650          checkCompletedWithWrappedCancellationException(h);
1651 <        checkCancelled(g);
1652 <        assertEquals(0, r.invocationCount);
1653 <        checkCompletedNormally(f, v1);
1651 >        checkCancelled(!fFirst ? f : g);
1652 >        r.assertNotInvoked();
1653 >        checkCompletedNormally(fFirst ? f : g, v1);
1654      }}
1655  
1656 <    public void testRunAfterBoth_sourceCancelled3() {
1656 >    /**
1657 >     * runAfterBoth result completes exceptionally if action does
1658 >     */
1659 >    public void testRunAfterBoth_actionFailed() {
1660          for (ExecutionMode m : ExecutionMode.values())
1661 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1661 >        for (boolean fFirst : new boolean[] { true, false })
1662          for (Integer v1 : new Integer[] { 1, null })
1663 +        for (Integer v2 : new Integer[] { 2, null })
1664      {
1665          final CompletableFuture<Integer> f = new CompletableFuture<>();
1666          final CompletableFuture<Integer> g = new CompletableFuture<>();
1667 <        final Noop r = new Noop();
1667 >        final FailingRunnable r1 = new FailingRunnable(m);
1668 >        final FailingRunnable r2 = new FailingRunnable(m);
1669  
1670 <        assertTrue(g.cancel(mayInterruptIfRunning));
1671 <        f.complete(v1);
1672 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1671 >        if (fFirst) {
1672 >            f.complete(v1);
1673 >            g.complete(v2);
1674 >        } else {
1675 >            g.complete(v2);
1676 >            f.complete(v1);
1677 >        }
1678 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1679  
1680 <        checkCompletedWithWrappedCancellationException(h);
1681 <        checkCancelled(g);
2001 <        assertEquals(0, r.invocationCount);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682          checkCompletedNormally(f, v1);
1683 <    }}
2004 <
2005 <    public void testRunAfterBoth_sourceCancelled4() {
2006 <        for (ExecutionMode m : ExecutionMode.values())
2007 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2008 <        for (Integer v1 : new Integer[] { 1, null })
2009 <    {
2010 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2011 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2012 <        final Noop r = new Noop();
2013 <
2014 <        assertTrue(f.cancel(mayInterruptIfRunning));
2015 <        g.complete(v1);
2016 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2017 <
2018 <        checkCompletedWithWrappedCancellationException(h);
2019 <        checkCancelled(f);
2020 <        assertEquals(0, r.invocationCount);
2021 <        checkCompletedNormally(g, v1);
1683 >        checkCompletedNormally(g, v2);
1684      }}
1685  
1686      /**
1687       * applyToEither result completes normally after normal completion
1688       * of either source
1689       */
1690 <    public void testApplyToEither_normalCompletion1() {
1690 >    public void testApplyToEither_normalCompletion() {
1691          for (ExecutionMode m : ExecutionMode.values())
1692          for (Integer v1 : new Integer[] { 1, null })
1693          for (Integer v2 : new Integer[] { 2, null })
1694      {
1695          final CompletableFuture<Integer> f = new CompletableFuture<>();
1696          final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final IncFunction r = new IncFunction();
1698 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1697 >        final IncFunction[] rs = new IncFunction[6];
1698 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1699  
1700 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1701 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1702 +        checkIncomplete(h0);
1703 +        checkIncomplete(h1);
1704 +        rs[0].assertNotInvoked();
1705 +        rs[1].assertNotInvoked();
1706          f.complete(v1);
1707 <        checkCompletedNormally(h, inc(v1));
1707 >        checkCompletedNormally(h0, inc(v1));
1708 >        checkCompletedNormally(h1, inc(v1));
1709 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1710 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1711 >        checkCompletedNormally(h2, inc(v1));
1712 >        checkCompletedNormally(h3, inc(v1));
1713          g.complete(v2);
1714  
1715 <        checkCompletedNormally(f, v1);
1716 <        checkCompletedNormally(g, v2);
1717 <        checkCompletedNormally(h, inc(v1));
1718 <    }}
1719 <
1720 <    public void testApplyToEither_normalCompletion2() {
1721 <        for (ExecutionMode m : ExecutionMode.values())
1722 <        for (Integer v1 : new Integer[] { 1, null })
1723 <        for (Integer v2 : new Integer[] { 2, null })
2051 <    {
2052 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2053 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2054 <        final IncFunction r = new IncFunction();
2055 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2056 <
2057 <        g.complete(v2);
2058 <        checkCompletedNormally(h, inc(v2));
2059 <        f.complete(v1);
2060 <
2061 <        checkCompletedNormally(f, v1);
2062 <        checkCompletedNormally(g, v2);
2063 <        checkCompletedNormally(h, inc(v2));
2064 <        }}
2065 <
2066 <    public void testApplyToEither_normalCompletion3() {
2067 <        for (ExecutionMode m : ExecutionMode.values())
2068 <        for (Integer v1 : new Integer[] { 1, null })
2069 <        for (Integer v2 : new Integer[] { 2, null })
2070 <    {
2071 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2072 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2073 <        final IncFunction r = new IncFunction();
2074 <
2075 <        f.complete(v1);
2076 <        g.complete(v2);
2077 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1715 >        // unspecified behavior - both source completions available
1716 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1717 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1718 >        rs[4].assertValue(h4.join());
1719 >        rs[5].assertValue(h5.join());
1720 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1721 >                   Objects.equals(inc(v2), h4.join()));
1722 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1723 >                   Objects.equals(inc(v2), h5.join()));
1724  
1725          checkCompletedNormally(f, v1);
1726          checkCompletedNormally(g, v2);
1727 <
1728 <        // unspecified behavior
1729 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1730 <                   Objects.equals(h.join(), inc(v2)));
1731 <        assertEquals(1, r.invocationCount);
1727 >        checkCompletedNormally(h0, inc(v1));
1728 >        checkCompletedNormally(h1, inc(v1));
1729 >        checkCompletedNormally(h2, inc(v1));
1730 >        checkCompletedNormally(h3, inc(v1));
1731 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1732      }}
1733  
1734      /**
1735       * applyToEither result completes exceptionally after exceptional
1736       * completion of either source
1737       */
1738 <    public void testApplyToEither_exceptionalCompletion1() {
1738 >    public void testApplyToEither_exceptionalCompletion() {
1739          for (ExecutionMode m : ExecutionMode.values())
1740          for (Integer v1 : new Integer[] { 1, null })
1741      {
1742          final CompletableFuture<Integer> f = new CompletableFuture<>();
1743          final CompletableFuture<Integer> g = new CompletableFuture<>();
2098        final IncFunction r = new IncFunction();
2099        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1744          final CFException ex = new CFException();
1745 +        final IncFunction[] rs = new IncFunction[6];
1746 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1747  
1748 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1749 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1750 +        checkIncomplete(h0);
1751 +        checkIncomplete(h1);
1752 +        rs[0].assertNotInvoked();
1753 +        rs[1].assertNotInvoked();
1754          f.completeExceptionally(ex);
1755 <        checkCompletedWithWrappedCFException(h, ex);
1755 >        checkCompletedWithWrappedCFException(h0, ex);
1756 >        checkCompletedWithWrappedCFException(h1, ex);
1757 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1758 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1759 >        checkCompletedWithWrappedCFException(h2, ex);
1760 >        checkCompletedWithWrappedCFException(h3, ex);
1761          g.complete(v1);
1762  
1763 <        assertEquals(0, r.invocationCount);
1764 <        checkCompletedNormally(g, v1);
1765 <        checkCompletedWithWrappedCFException(f, ex);
2109 <        checkCompletedWithWrappedCFException(h, ex);
2110 <    }}
2111 <
2112 <    public void testApplyToEither_exceptionalCompletion2() {
2113 <        for (ExecutionMode m : ExecutionMode.values())
2114 <        for (Integer v1 : new Integer[] { 1, null })
2115 <    {
2116 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2117 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2118 <        final IncFunction r = new IncFunction();
2119 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2120 <        final CFException ex = new CFException();
2121 <
2122 <        g.completeExceptionally(ex);
2123 <        checkCompletedWithWrappedCFException(h, ex);
2124 <        f.complete(v1);
2125 <
2126 <        assertEquals(0, r.invocationCount);
2127 <        checkCompletedNormally(f, v1);
2128 <        checkCompletedWithWrappedCFException(g, ex);
2129 <        checkCompletedWithWrappedCFException(h, ex);
2130 <    }}
2131 <
2132 <    public void testApplyToEither_exceptionalCompletion3() {
2133 <        for (ExecutionMode m : ExecutionMode.values())
2134 <        for (Integer v1 : new Integer[] { 1, null })
2135 <    {
2136 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2137 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2138 <        final IncFunction r = new IncFunction();
2139 <        final CFException ex = new CFException();
2140 <
2141 <        g.completeExceptionally(ex);
2142 <        f.complete(v1);
2143 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2144 <
2145 <        // unspecified behavior
2146 <        Integer v;
1763 >        // unspecified behavior - both source completions available
1764 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1765 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1766          try {
1767 <            assertEquals(inc(v1), h.join());
1768 <            assertEquals(1, r.invocationCount);
1767 >            assertEquals(inc(v1), h4.join());
1768 >            rs[4].assertValue(inc(v1));
1769          } catch (CompletionException ok) {
1770 <            checkCompletedWithWrappedCFException(h, ex);
1771 <            assertEquals(0, r.invocationCount);
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772          }
2154
2155        checkCompletedWithWrappedCFException(g, ex);
2156        checkCompletedNormally(f, v1);
2157    }}
2158
2159    public void testApplyToEither_exceptionalCompletion4() {
2160        for (ExecutionMode m : ExecutionMode.values())
2161        for (Integer v1 : new Integer[] { 1, null })
2162    {
2163        final CompletableFuture<Integer> f = new CompletableFuture<>();
2164        final CompletableFuture<Integer> g = new CompletableFuture<>();
2165        final IncFunction r = new IncFunction();
2166        final CFException ex = new CFException();
2167
2168        f.completeExceptionally(ex);
2169        g.complete(v1);
2170        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2171
2172        // unspecified behavior
2173        Integer v;
1773          try {
1774 <            assertEquals(inc(v1), h.join());
1775 <            assertEquals(1, r.invocationCount);
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertValue(inc(v1));
1776          } catch (CompletionException ok) {
1777 <            checkCompletedWithWrappedCFException(h, ex);
1778 <            assertEquals(0, r.invocationCount);
1777 >            checkCompletedWithWrappedCFException(h5, ex);
1778 >            rs[5].assertNotInvoked();
1779          }
1780  
1781          checkCompletedWithWrappedCFException(f, ex);
1782          checkCompletedNormally(g, v1);
1783 +        checkCompletedWithWrappedCFException(h0, ex);
1784 +        checkCompletedWithWrappedCFException(h1, ex);
1785 +        checkCompletedWithWrappedCFException(h2, ex);
1786 +        checkCompletedWithWrappedCFException(h3, ex);
1787 +        checkCompletedWithWrappedCFException(h4, ex);
1788 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1789      }}
1790  
1791 <    /**
2187 <     * applyToEither result completes exceptionally if action does
2188 <     */
2189 <    public void testApplyToEither_actionFailed1() {
1791 >    public void testApplyToEither_exceptionalCompletion2() {
1792          for (ExecutionMode m : ExecutionMode.values())
1793 +        for (boolean fFirst : new boolean[] { true, false })
1794          for (Integer v1 : new Integer[] { 1, null })
2192        for (Integer v2 : new Integer[] { 2, null })
1795      {
1796          final CompletableFuture<Integer> f = new CompletableFuture<>();
1797          final CompletableFuture<Integer> g = new CompletableFuture<>();
1798 <        final FailingFunction r = new FailingFunction();
1799 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1798 >        final CFException ex = new CFException();
1799 >        final IncFunction[] rs = new IncFunction[6];
1800 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1801  
1802 <        f.complete(v1);
1803 <        checkCompletedWithWrappedCFException(h);
1804 <        g.complete(v2);
1805 <        checkCompletedNormally(f, v1);
1806 <        checkCompletedNormally(g, v2);
1807 <    }}
1802 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1803 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1804 >        if (fFirst) {
1805 >            f.complete(v1);
1806 >            g.completeExceptionally(ex);
1807 >        } else {
1808 >            g.completeExceptionally(ex);
1809 >            f.complete(v1);
1810 >        }
1811 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1812 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1813  
1814 <    public void testApplyToEither_actionFailed2() {
1815 <        for (ExecutionMode m : ExecutionMode.values())
1816 <        for (Integer v1 : new Integer[] { 1, null })
1817 <        for (Integer v2 : new Integer[] { 2, null })
1818 <    {
1819 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1820 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1821 <        final FailingFunction r = new FailingFunction();
1822 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1814 >        // unspecified behavior - both source completions available
1815 >        try {
1816 >            assertEquals(inc(v1), h0.join());
1817 >            rs[0].assertValue(inc(v1));
1818 >        } catch (CompletionException ok) {
1819 >            checkCompletedWithWrappedCFException(h0, ex);
1820 >            rs[0].assertNotInvoked();
1821 >        }
1822 >        try {
1823 >            assertEquals(inc(v1), h1.join());
1824 >            rs[1].assertValue(inc(v1));
1825 >        } catch (CompletionException ok) {
1826 >            checkCompletedWithWrappedCFException(h1, ex);
1827 >            rs[1].assertNotInvoked();
1828 >        }
1829 >        try {
1830 >            assertEquals(inc(v1), h2.join());
1831 >            rs[2].assertValue(inc(v1));
1832 >        } catch (CompletionException ok) {
1833 >            checkCompletedWithWrappedCFException(h2, ex);
1834 >            rs[2].assertNotInvoked();
1835 >        }
1836 >        try {
1837 >            assertEquals(inc(v1), h3.join());
1838 >            rs[3].assertValue(inc(v1));
1839 >        } catch (CompletionException ok) {
1840 >            checkCompletedWithWrappedCFException(h3, ex);
1841 >            rs[3].assertNotInvoked();
1842 >        }
1843  
2216        g.complete(v2);
2217        checkCompletedWithWrappedCFException(h);
2218        f.complete(v1);
1844          checkCompletedNormally(f, v1);
1845 <        checkCompletedNormally(g, v2);
1845 >        checkCompletedWithWrappedCFException(g, ex);
1846      }}
1847  
1848      /**
1849       * applyToEither result completes exceptionally if either source cancelled
1850       */
1851 <    public void testApplyToEither_sourceCancelled1() {
1851 >    public void testApplyToEither_sourceCancelled() {
1852          for (ExecutionMode m : ExecutionMode.values())
1853          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1854          for (Integer v1 : new Integer[] { 1, null })
1855      {
1856          final CompletableFuture<Integer> f = new CompletableFuture<>();
1857          final CompletableFuture<Integer> g = new CompletableFuture<>();
1858 <        final IncFunction r = new IncFunction();
1859 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1858 >        final IncFunction[] rs = new IncFunction[6];
1859 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1860  
1861 <        assertTrue(f.cancel(mayInterruptIfRunning));
1862 <        checkCompletedWithWrappedCancellationException(h);
1861 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1862 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1863 >        checkIncomplete(h0);
1864 >        checkIncomplete(h1);
1865 >        rs[0].assertNotInvoked();
1866 >        rs[1].assertNotInvoked();
1867 >        f.cancel(mayInterruptIfRunning);
1868 >        checkCompletedWithWrappedCancellationException(h0);
1869 >        checkCompletedWithWrappedCancellationException(h1);
1870 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1871 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1872 >        checkCompletedWithWrappedCancellationException(h2);
1873 >        checkCompletedWithWrappedCancellationException(h3);
1874          g.complete(v1);
1875  
1876 <        checkCancelled(f);
1877 <        assertEquals(0, r.invocationCount);
1878 <        checkCompletedNormally(g, v1);
2243 <        checkCompletedWithWrappedCancellationException(h);
2244 <    }}
2245 <
2246 <    public void testApplyToEither_sourceCancelled2() {
2247 <        for (ExecutionMode m : ExecutionMode.values())
2248 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2249 <        for (Integer v1 : new Integer[] { 1, null })
2250 <    {
2251 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2252 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2253 <        final IncFunction r = new IncFunction();
2254 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2255 <
2256 <        assertTrue(g.cancel(mayInterruptIfRunning));
2257 <        checkCompletedWithWrappedCancellationException(h);
2258 <        f.complete(v1);
2259 <
2260 <        checkCancelled(g);
2261 <        assertEquals(0, r.invocationCount);
2262 <        checkCompletedNormally(f, v1);
2263 <        checkCompletedWithWrappedCancellationException(h);
2264 <    }}
2265 <
2266 <    public void testApplyToEither_sourceCancelled3() {
2267 <        for (ExecutionMode m : ExecutionMode.values())
2268 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2269 <        for (Integer v1 : new Integer[] { 1, null })
2270 <    {
2271 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2272 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2273 <        final IncFunction r = new IncFunction();
2274 <
2275 <        assertTrue(g.cancel(mayInterruptIfRunning));
2276 <        f.complete(v1);
2277 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2278 <
2279 <        // unspecified behavior
2280 <        Integer v;
1876 >        // unspecified behavior - both source completions available
1877 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1878 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1879          try {
1880 <            assertEquals(inc(v1), h.join());
1881 <            assertEquals(1, r.invocationCount);
1880 >            assertEquals(inc(v1), h4.join());
1881 >            rs[4].assertValue(inc(v1));
1882          } catch (CompletionException ok) {
1883 <            checkCompletedWithWrappedCancellationException(h);
1884 <            assertEquals(0, r.invocationCount);
1883 >            checkCompletedWithWrappedCancellationException(h4);
1884 >            rs[4].assertNotInvoked();
1885          }
2288
2289        checkCancelled(g);
2290        checkCompletedNormally(f, v1);
2291    }}
2292
2293    public void testApplyToEither_sourceCancelled4() {
2294        for (ExecutionMode m : ExecutionMode.values())
2295        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2296        for (Integer v1 : new Integer[] { 1, null })
2297    {
2298        final CompletableFuture<Integer> f = new CompletableFuture<>();
2299        final CompletableFuture<Integer> g = new CompletableFuture<>();
2300        final IncFunction r = new IncFunction();
2301
2302        assertTrue(f.cancel(mayInterruptIfRunning));
2303        g.complete(v1);
2304        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2305
2306        // unspecified behavior
2307        Integer v;
1886          try {
1887 <            assertEquals(inc(v1), h.join());
1888 <            assertEquals(1, r.invocationCount);
1887 >            assertEquals(inc(v1), h5.join());
1888 >            rs[5].assertValue(inc(v1));
1889          } catch (CompletionException ok) {
1890 <            checkCompletedWithWrappedCancellationException(h);
1891 <            assertEquals(0, r.invocationCount);
1890 >            checkCompletedWithWrappedCancellationException(h5);
1891 >            rs[5].assertNotInvoked();
1892          }
1893  
1894          checkCancelled(f);
1895          checkCompletedNormally(g, v1);
1896 +        checkCompletedWithWrappedCancellationException(h0);
1897 +        checkCompletedWithWrappedCancellationException(h1);
1898 +        checkCompletedWithWrappedCancellationException(h2);
1899 +        checkCompletedWithWrappedCancellationException(h3);
1900 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1901      }}
1902  
1903      /**
1904 <     * acceptEither result completes normally after normal completion
2322 <     * of either source
1904 >     * applyToEither result completes exceptionally if action does
1905       */
1906 <    public void testAcceptEither_normalCompletion1() {
1906 >    public void testApplyToEither_actionFailed() {
1907          for (ExecutionMode m : ExecutionMode.values())
1908          for (Integer v1 : new Integer[] { 1, null })
1909          for (Integer v2 : new Integer[] { 2, null })
1910      {
1911          final CompletableFuture<Integer> f = new CompletableFuture<>();
1912          final CompletableFuture<Integer> g = new CompletableFuture<>();
1913 <        final IncAction r = new IncAction();
1914 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1913 >        final FailingFunction[] rs = new FailingFunction[6];
1914 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1915  
1916 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1917 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1918          f.complete(v1);
1919 <        checkCompletedNormally(h, null);
1920 <        assertEquals(inc(v1), r.value);
1921 <        g.complete(v2);
1919 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1920 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1921 >        checkCompletedWithWrappedCFException(h0);
1922 >        checkCompletedWithWrappedCFException(h1);
1923 >        checkCompletedWithWrappedCFException(h2);
1924 >        checkCompletedWithWrappedCFException(h3);
1925 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1926  
1927 <        checkCompletedNormally(f, v1);
2340 <        checkCompletedNormally(g, v2);
2341 <        checkCompletedNormally(h, null);
2342 <    }}
1927 >        g.complete(v2);
1928  
1929 <    public void testAcceptEither_normalCompletion2() {
1930 <        for (ExecutionMode m : ExecutionMode.values())
1931 <        for (Integer v1 : new Integer[] { 1, null })
2347 <        for (Integer v2 : new Integer[] { 2, null })
2348 <    {
2349 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2350 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2351 <        final IncAction r = new IncAction();
2352 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1929 >        // unspecified behavior - both source completions available
1930 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1931 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1932  
1933 <        g.complete(v2);
1934 <        checkCompletedNormally(h, null);
1935 <        assertEquals(inc(v2), r.value);
1936 <        f.complete(v1);
1933 >        checkCompletedWithWrappedCFException(h4);
1934 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1935 >                   Objects.equals(v2, rs[4].value));
1936 >        checkCompletedWithWrappedCFException(h5);
1937 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1938 >                   Objects.equals(v2, rs[5].value));
1939  
1940          checkCompletedNormally(f, v1);
1941          checkCompletedNormally(g, v2);
2361        checkCompletedNormally(h, null);
1942      }}
1943  
1944 <    public void testAcceptEither_normalCompletion3() {
1944 >    /**
1945 >     * acceptEither result completes normally after normal completion
1946 >     * of either source
1947 >     */
1948 >    public void testAcceptEither_normalCompletion() {
1949          for (ExecutionMode m : ExecutionMode.values())
1950          for (Integer v1 : new Integer[] { 1, null })
1951          for (Integer v2 : new Integer[] { 2, null })
1952      {
1953          final CompletableFuture<Integer> f = new CompletableFuture<>();
1954          final CompletableFuture<Integer> g = new CompletableFuture<>();
1955 <        final IncAction r = new IncAction();
1955 >        final NoopConsumer[] rs = new NoopConsumer[6];
1956 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1957  
1958 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1959 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1960 +        checkIncomplete(h0);
1961 +        checkIncomplete(h1);
1962 +        rs[0].assertNotInvoked();
1963 +        rs[1].assertNotInvoked();
1964          f.complete(v1);
1965 +        checkCompletedNormally(h0, null);
1966 +        checkCompletedNormally(h1, null);
1967 +        rs[0].assertValue(v1);
1968 +        rs[1].assertValue(v1);
1969 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1970 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1971 +        checkCompletedNormally(h2, null);
1972 +        checkCompletedNormally(h3, null);
1973 +        rs[2].assertValue(v1);
1974 +        rs[3].assertValue(v1);
1975          g.complete(v2);
2375        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1976  
1977 <        checkCompletedNormally(h, null);
1977 >        // unspecified behavior - both source completions available
1978 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1979 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1980 >        checkCompletedNormally(h4, null);
1981 >        checkCompletedNormally(h5, null);
1982 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1983 >                   Objects.equals(v2, rs[4].value));
1984 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1985 >                   Objects.equals(v2, rs[5].value));
1986 >
1987          checkCompletedNormally(f, v1);
1988          checkCompletedNormally(g, v2);
1989 <
1990 <        // unspecified behavior
1991 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
1992 <                   Objects.equals(r.value, inc(v2)));
1989 >        checkCompletedNormally(h0, null);
1990 >        checkCompletedNormally(h1, null);
1991 >        checkCompletedNormally(h2, null);
1992 >        checkCompletedNormally(h3, null);
1993 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1994      }}
1995  
1996      /**
1997       * acceptEither result completes exceptionally after exceptional
1998       * completion of either source
1999       */
2000 <    public void testAcceptEither_exceptionalCompletion1() {
2000 >    public void testAcceptEither_exceptionalCompletion() {
2001          for (ExecutionMode m : ExecutionMode.values())
2002          for (Integer v1 : new Integer[] { 1, null })
2003      {
2004          final CompletableFuture<Integer> f = new CompletableFuture<>();
2005          final CompletableFuture<Integer> g = new CompletableFuture<>();
2396        final IncAction r = new IncAction();
2397        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2006          final CFException ex = new CFException();
2007 +        final NoopConsumer[] rs = new NoopConsumer[6];
2008 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2009  
2010 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2011 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2012 +        checkIncomplete(h0);
2013 +        checkIncomplete(h1);
2014 +        rs[0].assertNotInvoked();
2015 +        rs[1].assertNotInvoked();
2016          f.completeExceptionally(ex);
2017 <        checkCompletedWithWrappedCFException(h, ex);
2018 <        g.complete(v1);
2019 <
2020 <        assertEquals(0, r.invocationCount);
2021 <        checkCompletedNormally(g, v1);
2022 <        checkCompletedWithWrappedCFException(f, ex);
2407 <        checkCompletedWithWrappedCFException(h, ex);
2408 <    }}
2409 <
2410 <    public void testAcceptEither_exceptionalCompletion2() {
2411 <        for (ExecutionMode m : ExecutionMode.values())
2412 <        for (Integer v1 : new Integer[] { 1, null })
2413 <    {
2414 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2415 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2416 <        final IncAction r = new IncAction();
2417 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2418 <        final CFException ex = new CFException();
2017 >        checkCompletedWithWrappedCFException(h0, ex);
2018 >        checkCompletedWithWrappedCFException(h1, ex);
2019 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2020 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2021 >        checkCompletedWithWrappedCFException(h2, ex);
2022 >        checkCompletedWithWrappedCFException(h3, ex);
2023  
2024 <        g.completeExceptionally(ex);
2421 <        checkCompletedWithWrappedCFException(h, ex);
2422 <        f.complete(v1);
2423 <
2424 <        assertEquals(0, r.invocationCount);
2425 <        checkCompletedNormally(f, v1);
2426 <        checkCompletedWithWrappedCFException(g, ex);
2427 <        checkCompletedWithWrappedCFException(h, ex);
2428 <    }}
2429 <
2430 <    public void testAcceptEither_exceptionalCompletion3() {
2431 <        for (ExecutionMode m : ExecutionMode.values())
2432 <        for (Integer v1 : new Integer[] { 1, null })
2433 <    {
2434 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2435 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2436 <        final IncAction r = new IncAction();
2437 <        final CFException ex = new CFException();
2438 <
2439 <        g.completeExceptionally(ex);
2440 <        f.complete(v1);
2441 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2024 >        g.complete(v1);
2025  
2026 <        // unspecified behavior
2027 <        Integer v;
2026 >        // unspecified behavior - both source completions available
2027 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2028 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2029          try {
2030 <            assertNull(h.join());
2031 <            assertEquals(1, r.invocationCount);
2448 <            assertEquals(inc(v1), r.value);
2030 >            assertNull(h4.join());
2031 >            rs[4].assertValue(v1);
2032          } catch (CompletionException ok) {
2033 <            checkCompletedWithWrappedCFException(h, ex);
2034 <            assertEquals(0, r.invocationCount);
2033 >            checkCompletedWithWrappedCFException(h4, ex);
2034 >            rs[4].assertNotInvoked();
2035          }
2453
2454        checkCompletedWithWrappedCFException(g, ex);
2455        checkCompletedNormally(f, v1);
2456    }}
2457
2458    public void testAcceptEither_exceptionalCompletion4() {
2459        for (ExecutionMode m : ExecutionMode.values())
2460        for (Integer v1 : new Integer[] { 1, null })
2461    {
2462        final CompletableFuture<Integer> f = new CompletableFuture<>();
2463        final CompletableFuture<Integer> g = new CompletableFuture<>();
2464        final IncAction r = new IncAction();
2465        final CFException ex = new CFException();
2466
2467        f.completeExceptionally(ex);
2468        g.complete(v1);
2469        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2470
2471        // unspecified behavior
2472        Integer v;
2036          try {
2037 <            assertNull(h.join());
2038 <            assertEquals(1, r.invocationCount);
2476 <            assertEquals(inc(v1), r.value);
2037 >            assertNull(h5.join());
2038 >            rs[5].assertValue(v1);
2039          } catch (CompletionException ok) {
2040 <            checkCompletedWithWrappedCFException(h, ex);
2041 <            assertEquals(0, r.invocationCount);
2040 >            checkCompletedWithWrappedCFException(h5, ex);
2041 >            rs[5].assertNotInvoked();
2042          }
2043  
2044          checkCompletedWithWrappedCFException(f, ex);
2045          checkCompletedNormally(g, v1);
2046 <    }}
2047 <
2048 <    /**
2049 <     * acceptEither result completes exceptionally if action does
2050 <     */
2051 <    public void testAcceptEither_actionFailed1() {
2490 <        for (ExecutionMode m : ExecutionMode.values())
2491 <        for (Integer v1 : new Integer[] { 1, null })
2492 <        for (Integer v2 : new Integer[] { 2, null })
2493 <    {
2494 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2495 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2496 <        final FailingConsumer r = new FailingConsumer();
2497 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2498 <
2499 <        f.complete(v1);
2500 <        checkCompletedWithWrappedCFException(h);
2501 <        g.complete(v2);
2502 <        checkCompletedNormally(f, v1);
2503 <        checkCompletedNormally(g, v2);
2504 <    }}
2505 <
2506 <    public void testAcceptEither_actionFailed2() {
2507 <        for (ExecutionMode m : ExecutionMode.values())
2508 <        for (Integer v1 : new Integer[] { 1, null })
2509 <        for (Integer v2 : new Integer[] { 2, null })
2510 <    {
2511 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2512 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2513 <        final FailingConsumer r = new FailingConsumer();
2514 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2515 <
2516 <        g.complete(v2);
2517 <        checkCompletedWithWrappedCFException(h);
2518 <        f.complete(v1);
2519 <        checkCompletedNormally(f, v1);
2520 <        checkCompletedNormally(g, v2);
2046 >        checkCompletedWithWrappedCFException(h0, ex);
2047 >        checkCompletedWithWrappedCFException(h1, ex);
2048 >        checkCompletedWithWrappedCFException(h2, ex);
2049 >        checkCompletedWithWrappedCFException(h3, ex);
2050 >        checkCompletedWithWrappedCFException(h4, ex);
2051 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2052      }}
2053  
2054      /**
2055       * acceptEither result completes exceptionally if either source cancelled
2056       */
2057 <    public void testAcceptEither_sourceCancelled1() {
2057 >    public void testAcceptEither_sourceCancelled() {
2058          for (ExecutionMode m : ExecutionMode.values())
2059          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2060          for (Integer v1 : new Integer[] { 1, null })
2061      {
2062          final CompletableFuture<Integer> f = new CompletableFuture<>();
2063          final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 <        final IncAction r = new IncAction();
2065 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2064 >        final NoopConsumer[] rs = new NoopConsumer[6];
2065 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2066  
2067 <        assertTrue(f.cancel(mayInterruptIfRunning));
2068 <        checkCompletedWithWrappedCancellationException(h);
2069 <        g.complete(v1);
2067 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2068 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2069 >        checkIncomplete(h0);
2070 >        checkIncomplete(h1);
2071 >        rs[0].assertNotInvoked();
2072 >        rs[1].assertNotInvoked();
2073 >        f.cancel(mayInterruptIfRunning);
2074 >        checkCompletedWithWrappedCancellationException(h0);
2075 >        checkCompletedWithWrappedCancellationException(h1);
2076 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2077 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2078 >        checkCompletedWithWrappedCancellationException(h2);
2079 >        checkCompletedWithWrappedCancellationException(h3);
2080  
2081 <        checkCancelled(f);
2541 <        assertEquals(0, r.invocationCount);
2542 <        checkCompletedNormally(g, v1);
2543 <        checkCompletedWithWrappedCancellationException(h);
2544 <    }}
2545 <
2546 <    public void testAcceptEither_sourceCancelled2() {
2547 <        for (ExecutionMode m : ExecutionMode.values())
2548 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2549 <        for (Integer v1 : new Integer[] { 1, null })
2550 <    {
2551 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2552 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2553 <        final IncAction r = new IncAction();
2554 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2555 <
2556 <        assertTrue(g.cancel(mayInterruptIfRunning));
2557 <        checkCompletedWithWrappedCancellationException(h);
2558 <        f.complete(v1);
2559 <
2560 <        checkCancelled(g);
2561 <        assertEquals(0, r.invocationCount);
2562 <        checkCompletedNormally(f, v1);
2563 <        checkCompletedWithWrappedCancellationException(h);
2564 <    }}
2565 <
2566 <    public void testAcceptEither_sourceCancelled3() {
2567 <        for (ExecutionMode m : ExecutionMode.values())
2568 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2569 <        for (Integer v1 : new Integer[] { 1, null })
2570 <    {
2571 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2572 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2573 <        final IncAction r = new IncAction();
2574 <
2575 <        assertTrue(g.cancel(mayInterruptIfRunning));
2576 <        f.complete(v1);
2577 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2081 >        g.complete(v1);
2082  
2083 <        // unspecified behavior
2084 <        Integer v;
2083 >        // unspecified behavior - both source completions available
2084 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2085 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2086          try {
2087 <            assertNull(h.join());
2088 <            assertEquals(1, r.invocationCount);
2584 <            assertEquals(inc(v1), r.value);
2087 >            assertNull(h4.join());
2088 >            rs[4].assertValue(v1);
2089          } catch (CompletionException ok) {
2090 <            checkCompletedWithWrappedCancellationException(h);
2091 <            assertEquals(0, r.invocationCount);
2090 >            checkCompletedWithWrappedCancellationException(h4);
2091 >            rs[4].assertNotInvoked();
2092          }
2589
2590        checkCancelled(g);
2591        checkCompletedNormally(f, v1);
2592    }}
2593
2594    public void testAcceptEither_sourceCancelled4() {
2595        for (ExecutionMode m : ExecutionMode.values())
2596        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2597        for (Integer v1 : new Integer[] { 1, null })
2598    {
2599        final CompletableFuture<Integer> f = new CompletableFuture<>();
2600        final CompletableFuture<Integer> g = new CompletableFuture<>();
2601        final IncAction r = new IncAction();
2602
2603        assertTrue(f.cancel(mayInterruptIfRunning));
2604        g.complete(v1);
2605        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2606
2607        // unspecified behavior
2608        Integer v;
2093          try {
2094 <            assertNull(h.join());
2095 <            assertEquals(1, r.invocationCount);
2612 <            assertEquals(inc(v1), r.value);
2094 >            assertNull(h5.join());
2095 >            rs[5].assertValue(v1);
2096          } catch (CompletionException ok) {
2097 <            checkCompletedWithWrappedCancellationException(h);
2098 <            assertEquals(0, r.invocationCount);
2097 >            checkCompletedWithWrappedCancellationException(h5);
2098 >            rs[5].assertNotInvoked();
2099          }
2100  
2101          checkCancelled(f);
2102          checkCompletedNormally(g, v1);
2103 +        checkCompletedWithWrappedCancellationException(h0);
2104 +        checkCompletedWithWrappedCancellationException(h1);
2105 +        checkCompletedWithWrappedCancellationException(h2);
2106 +        checkCompletedWithWrappedCancellationException(h3);
2107 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2108      }}
2109  
2110      /**
2111 <     * runAfterEither result completes normally after normal completion
2624 <     * of either source
2111 >     * acceptEither result completes exceptionally if action does
2112       */
2113 <    public void testRunAfterEither_normalCompletion1() {
2113 >    public void testAcceptEither_actionFailed() {
2114          for (ExecutionMode m : ExecutionMode.values())
2115          for (Integer v1 : new Integer[] { 1, null })
2116          for (Integer v2 : new Integer[] { 2, null })
2117      {
2118          final CompletableFuture<Integer> f = new CompletableFuture<>();
2119          final CompletableFuture<Integer> g = new CompletableFuture<>();
2120 <        final Noop r = new Noop();
2121 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2120 >        final FailingConsumer[] rs = new FailingConsumer[6];
2121 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2122  
2123 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2124 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2125          f.complete(v1);
2126 <        checkCompletedNormally(h, null);
2127 <        assertEquals(1, r.invocationCount);
2128 <        g.complete(v2);
2126 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2127 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2128 >        checkCompletedWithWrappedCFException(h0);
2129 >        checkCompletedWithWrappedCFException(h1);
2130 >        checkCompletedWithWrappedCFException(h2);
2131 >        checkCompletedWithWrappedCFException(h3);
2132 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2133  
2134 <        checkCompletedNormally(f, v1);
2642 <        checkCompletedNormally(g, v2);
2643 <        checkCompletedNormally(h, null);
2644 <        assertEquals(1, r.invocationCount);
2645 <    }}
2134 >        g.complete(v2);
2135  
2136 <    public void testRunAfterEither_normalCompletion2() {
2137 <        for (ExecutionMode m : ExecutionMode.values())
2138 <        for (Integer v1 : new Integer[] { 1, null })
2650 <        for (Integer v2 : new Integer[] { 2, null })
2651 <    {
2652 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2653 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2654 <        final Noop r = new Noop();
2655 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2136 >        // unspecified behavior - both source completions available
2137 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2138 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2139  
2140 <        g.complete(v2);
2141 <        checkCompletedNormally(h, null);
2142 <        assertEquals(1, r.invocationCount);
2143 <        f.complete(v1);
2140 >        checkCompletedWithWrappedCFException(h4);
2141 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2142 >                   Objects.equals(v2, rs[4].value));
2143 >        checkCompletedWithWrappedCFException(h5);
2144 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2145 >                   Objects.equals(v2, rs[5].value));
2146  
2147          checkCompletedNormally(f, v1);
2148          checkCompletedNormally(g, v2);
2149 <        checkCompletedNormally(h, null);
2665 <        assertEquals(1, r.invocationCount);
2666 <        }}
2149 >    }}
2150  
2151 <    public void testRunAfterEither_normalCompletion3() {
2151 >    /**
2152 >     * runAfterEither result completes normally after normal completion
2153 >     * of either source
2154 >     */
2155 >    public void testRunAfterEither_normalCompletion() {
2156          for (ExecutionMode m : ExecutionMode.values())
2157          for (Integer v1 : new Integer[] { 1, null })
2158          for (Integer v2 : new Integer[] { 2, null })
2159      {
2160          final CompletableFuture<Integer> f = new CompletableFuture<>();
2161          final CompletableFuture<Integer> g = new CompletableFuture<>();
2162 <        final Noop r = new Noop();
2162 >        final Noop[] rs = new Noop[6];
2163 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2164  
2165 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2166 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2167 +        checkIncomplete(h0);
2168 +        checkIncomplete(h1);
2169 +        rs[0].assertNotInvoked();
2170 +        rs[1].assertNotInvoked();
2171          f.complete(v1);
2172 +        checkCompletedNormally(h0, null);
2173 +        checkCompletedNormally(h1, null);
2174 +        rs[0].assertInvoked();
2175 +        rs[1].assertInvoked();
2176 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2177 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2178 +        checkCompletedNormally(h2, null);
2179 +        checkCompletedNormally(h3, null);
2180 +        rs[2].assertInvoked();
2181 +        rs[3].assertInvoked();
2182 +
2183          g.complete(v2);
2679        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2184  
2185 <        checkCompletedNormally(h, null);
2185 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2186 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2187 >
2188          checkCompletedNormally(f, v1);
2189          checkCompletedNormally(g, v2);
2190 <        assertEquals(1, r.invocationCount);
2190 >        checkCompletedNormally(h0, null);
2191 >        checkCompletedNormally(h1, null);
2192 >        checkCompletedNormally(h2, null);
2193 >        checkCompletedNormally(h3, null);
2194 >        checkCompletedNormally(h4, null);
2195 >        checkCompletedNormally(h5, null);
2196 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2197      }}
2198  
2199      /**
2200       * runAfterEither result completes exceptionally after exceptional
2201       * completion of either source
2202       */
2203 <    public void testRunAfterEither_exceptionalCompletion1() {
2203 >    public void testRunAfterEither_exceptionalCompletion() {
2204          for (ExecutionMode m : ExecutionMode.values())
2205          for (Integer v1 : new Integer[] { 1, null })
2206      {
2207          final CompletableFuture<Integer> f = new CompletableFuture<>();
2208          final CompletableFuture<Integer> g = new CompletableFuture<>();
2697        final Noop r = new Noop();
2698        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2209          final CFException ex = new CFException();
2210 +        final Noop[] rs = new Noop[6];
2211 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2212  
2213 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2214 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2215 +        checkIncomplete(h0);
2216 +        checkIncomplete(h1);
2217 +        rs[0].assertNotInvoked();
2218 +        rs[1].assertNotInvoked();
2219          f.completeExceptionally(ex);
2220 <        checkCompletedWithWrappedCFException(h, ex);
2221 <        g.complete(v1);
2222 <
2223 <        assertEquals(0, r.invocationCount);
2224 <        checkCompletedNormally(g, v1);
2225 <        checkCompletedWithWrappedCFException(f, ex);
2708 <        checkCompletedWithWrappedCFException(h, ex);
2709 <    }}
2710 <
2711 <    public void testRunAfterEither_exceptionalCompletion2() {
2712 <        for (ExecutionMode m : ExecutionMode.values())
2713 <        for (Integer v1 : new Integer[] { 1, null })
2714 <    {
2715 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2716 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2717 <        final Noop r = new Noop();
2718 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2719 <        final CFException ex = new CFException();
2220 >        checkCompletedWithWrappedCFException(h0, ex);
2221 >        checkCompletedWithWrappedCFException(h1, ex);
2222 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2223 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2224 >        checkCompletedWithWrappedCFException(h2, ex);
2225 >        checkCompletedWithWrappedCFException(h3, ex);
2226  
2227 <        g.completeExceptionally(ex);
2722 <        checkCompletedWithWrappedCFException(h, ex);
2723 <        f.complete(v1);
2724 <
2725 <        assertEquals(0, r.invocationCount);
2726 <        checkCompletedNormally(f, v1);
2727 <        checkCompletedWithWrappedCFException(g, ex);
2728 <        checkCompletedWithWrappedCFException(h, ex);
2729 <    }}
2730 <
2731 <    public void testRunAfterEither_exceptionalCompletion3() {
2732 <        for (ExecutionMode m : ExecutionMode.values())
2733 <        for (Integer v1 : new Integer[] { 1, null })
2734 <    {
2735 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2736 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2737 <        final Noop r = new Noop();
2738 <        final CFException ex = new CFException();
2739 <
2740 <        g.completeExceptionally(ex);
2741 <        f.complete(v1);
2742 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2227 >        g.complete(v1);
2228  
2229 <        // unspecified behavior
2230 <        Integer v;
2229 >        // unspecified behavior - both source completions available
2230 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2231 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2232          try {
2233 <            assertNull(h.join());
2234 <            assertEquals(1, r.invocationCount);
2233 >            assertNull(h4.join());
2234 >            rs[4].assertInvoked();
2235          } catch (CompletionException ok) {
2236 <            checkCompletedWithWrappedCFException(h, ex);
2237 <            assertEquals(0, r.invocationCount);
2236 >            checkCompletedWithWrappedCFException(h4, ex);
2237 >            rs[4].assertNotInvoked();
2238          }
2753
2754        checkCompletedWithWrappedCFException(g, ex);
2755        checkCompletedNormally(f, v1);
2756    }}
2757
2758    public void testRunAfterEither_exceptionalCompletion4() {
2759        for (ExecutionMode m : ExecutionMode.values())
2760        for (Integer v1 : new Integer[] { 1, null })
2761    {
2762        final CompletableFuture<Integer> f = new CompletableFuture<>();
2763        final CompletableFuture<Integer> g = new CompletableFuture<>();
2764        final Noop r = new Noop();
2765        final CFException ex = new CFException();
2766
2767        f.completeExceptionally(ex);
2768        g.complete(v1);
2769        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2770
2771        // unspecified behavior
2772        Integer v;
2239          try {
2240 <            assertNull(h.join());
2241 <            assertEquals(1, r.invocationCount);
2240 >            assertNull(h5.join());
2241 >            rs[5].assertInvoked();
2242          } catch (CompletionException ok) {
2243 <            checkCompletedWithWrappedCFException(h, ex);
2244 <            assertEquals(0, r.invocationCount);
2243 >            checkCompletedWithWrappedCFException(h5, ex);
2244 >            rs[5].assertNotInvoked();
2245          }
2246  
2247          checkCompletedWithWrappedCFException(f, ex);
2248          checkCompletedNormally(g, v1);
2249 <    }}
2250 <
2251 <    /**
2252 <     * runAfterEither result completes exceptionally if action does
2253 <     */
2254 <    public void testRunAfterEither_actionFailed1() {
2789 <        for (ExecutionMode m : ExecutionMode.values())
2790 <        for (Integer v1 : new Integer[] { 1, null })
2791 <        for (Integer v2 : new Integer[] { 2, null })
2792 <    {
2793 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2794 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2795 <        final FailingRunnable r = new FailingRunnable();
2796 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2797 <
2798 <        f.complete(v1);
2799 <        checkCompletedWithWrappedCFException(h);
2800 <        g.complete(v2);
2801 <        checkCompletedNormally(f, v1);
2802 <        checkCompletedNormally(g, v2);
2803 <    }}
2804 <
2805 <    public void testRunAfterEither_actionFailed2() {
2806 <        for (ExecutionMode m : ExecutionMode.values())
2807 <        for (Integer v1 : new Integer[] { 1, null })
2808 <        for (Integer v2 : new Integer[] { 2, null })
2809 <    {
2810 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2811 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2812 <        final FailingRunnable r = new FailingRunnable();
2813 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2814 <
2815 <        g.complete(v2);
2816 <        checkCompletedWithWrappedCFException(h);
2817 <        f.complete(v1);
2818 <        checkCompletedNormally(f, v1);
2819 <        checkCompletedNormally(g, v2);
2249 >        checkCompletedWithWrappedCFException(h0, ex);
2250 >        checkCompletedWithWrappedCFException(h1, ex);
2251 >        checkCompletedWithWrappedCFException(h2, ex);
2252 >        checkCompletedWithWrappedCFException(h3, ex);
2253 >        checkCompletedWithWrappedCFException(h4, ex);
2254 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2255      }}
2256  
2257      /**
2258       * runAfterEither result completes exceptionally if either source cancelled
2259       */
2260 <    public void testRunAfterEither_sourceCancelled1() {
2260 >    public void testRunAfterEither_sourceCancelled() {
2261          for (ExecutionMode m : ExecutionMode.values())
2262          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2263          for (Integer v1 : new Integer[] { 1, null })
2264      {
2265          final CompletableFuture<Integer> f = new CompletableFuture<>();
2266          final CompletableFuture<Integer> g = new CompletableFuture<>();
2267 <        final Noop r = new Noop();
2268 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2267 >        final Noop[] rs = new Noop[6];
2268 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2269  
2270 <        assertTrue(f.cancel(mayInterruptIfRunning));
2271 <        checkCompletedWithWrappedCancellationException(h);
2272 <        g.complete(v1);
2270 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2271 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2272 >        checkIncomplete(h0);
2273 >        checkIncomplete(h1);
2274 >        rs[0].assertNotInvoked();
2275 >        rs[1].assertNotInvoked();
2276 >        f.cancel(mayInterruptIfRunning);
2277 >        checkCompletedWithWrappedCancellationException(h0);
2278 >        checkCompletedWithWrappedCancellationException(h1);
2279 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2280 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2281 >        checkCompletedWithWrappedCancellationException(h2);
2282 >        checkCompletedWithWrappedCancellationException(h3);
2283  
2284 <        checkCancelled(f);
2840 <        assertEquals(0, r.invocationCount);
2841 <        checkCompletedNormally(g, v1);
2842 <        checkCompletedWithWrappedCancellationException(h);
2843 <    }}
2844 <
2845 <    public void testRunAfterEither_sourceCancelled2() {
2846 <        for (ExecutionMode m : ExecutionMode.values())
2847 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2848 <        for (Integer v1 : new Integer[] { 1, null })
2849 <    {
2850 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2851 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2852 <        final Noop r = new Noop();
2853 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2854 <
2855 <        assertTrue(g.cancel(mayInterruptIfRunning));
2856 <        checkCompletedWithWrappedCancellationException(h);
2857 <        f.complete(v1);
2858 <
2859 <        checkCancelled(g);
2860 <        assertEquals(0, r.invocationCount);
2861 <        checkCompletedNormally(f, v1);
2862 <        checkCompletedWithWrappedCancellationException(h);
2863 <    }}
2864 <
2865 <    public void testRunAfterEither_sourceCancelled3() {
2866 <        for (ExecutionMode m : ExecutionMode.values())
2867 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2868 <        for (Integer v1 : new Integer[] { 1, null })
2869 <    {
2870 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2871 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2872 <        final Noop r = new Noop();
2873 <
2874 <        assertTrue(g.cancel(mayInterruptIfRunning));
2875 <        f.complete(v1);
2876 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2284 >        g.complete(v1);
2285  
2286 <        // unspecified behavior
2287 <        Integer v;
2286 >        // unspecified behavior - both source completions available
2287 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2288 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2289          try {
2290 <            assertNull(h.join());
2291 <            assertEquals(1, r.invocationCount);
2290 >            assertNull(h4.join());
2291 >            rs[4].assertInvoked();
2292          } catch (CompletionException ok) {
2293 <            checkCompletedWithWrappedCancellationException(h);
2294 <            assertEquals(0, r.invocationCount);
2293 >            checkCompletedWithWrappedCancellationException(h4);
2294 >            rs[4].assertNotInvoked();
2295 >        }
2296 >        try {
2297 >            assertNull(h5.join());
2298 >            rs[5].assertInvoked();
2299 >        } catch (CompletionException ok) {
2300 >            checkCompletedWithWrappedCancellationException(h5);
2301 >            rs[5].assertNotInvoked();
2302          }
2303  
2304 <        checkCancelled(g);
2305 <        checkCompletedNormally(f, v1);
2304 >        checkCancelled(f);
2305 >        checkCompletedNormally(g, v1);
2306 >        checkCompletedWithWrappedCancellationException(h0);
2307 >        checkCompletedWithWrappedCancellationException(h1);
2308 >        checkCompletedWithWrappedCancellationException(h2);
2309 >        checkCompletedWithWrappedCancellationException(h3);
2310 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2311      }}
2312  
2313 <    public void testRunAfterEither_sourceCancelled4() {
2313 >    /**
2314 >     * runAfterEither result completes exceptionally if action does
2315 >     */
2316 >    public void testRunAfterEither_actionFailed() {
2317          for (ExecutionMode m : ExecutionMode.values())
2894        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2318          for (Integer v1 : new Integer[] { 1, null })
2319 +        for (Integer v2 : new Integer[] { 2, null })
2320      {
2321          final CompletableFuture<Integer> f = new CompletableFuture<>();
2322          final CompletableFuture<Integer> g = new CompletableFuture<>();
2323 <        final Noop r = new Noop();
2324 <
2901 <        assertTrue(f.cancel(mayInterruptIfRunning));
2902 <        g.complete(v1);
2903 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2323 >        final FailingRunnable[] rs = new FailingRunnable[6];
2324 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2325  
2326 <        // unspecified behavior
2327 <        Integer v;
2328 <        try {
2329 <            assertNull(h.join());
2330 <            assertEquals(1, r.invocationCount);
2331 <        } catch (CompletionException ok) {
2332 <            checkCompletedWithWrappedCancellationException(h);
2333 <            assertEquals(0, r.invocationCount);
2334 <        }
2326 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2327 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2328 >        f.complete(v1);
2329 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2330 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2331 >        checkCompletedWithWrappedCFException(h0);
2332 >        checkCompletedWithWrappedCFException(h1);
2333 >        checkCompletedWithWrappedCFException(h2);
2334 >        checkCompletedWithWrappedCFException(h3);
2335 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2336 >        g.complete(v2);
2337 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2338 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2339 >        checkCompletedWithWrappedCFException(h4);
2340 >        checkCompletedWithWrappedCFException(h5);
2341  
2342 <        checkCancelled(f);
2343 <        checkCompletedNormally(g, v1);
2342 >        checkCompletedNormally(f, v1);
2343 >        checkCompletedNormally(g, v2);
2344 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2345      }}
2346  
2347      /**
# Line 2925 | Line 2353 | public class CompletableFutureTest exten
2353          for (Integer v1 : new Integer[] { 1, null })
2354      {
2355          final CompletableFuture<Integer> f = new CompletableFuture<>();
2356 <        final CompletableFutureInc r = new CompletableFutureInc();
2356 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2357          if (!createIncomplete) f.complete(v1);
2358 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2358 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2359          if (createIncomplete) f.complete(v1);
2360  
2361          checkCompletedNormally(g, inc(v1));
2362          checkCompletedNormally(f, v1);
2363 <        assertEquals(1, r.invocationCount);
2363 >        r.assertInvoked();
2364      }}
2365  
2366      /**
# Line 2944 | Line 2372 | public class CompletableFutureTest exten
2372          for (boolean createIncomplete : new boolean[] { true, false })
2373      {
2374          final CFException ex = new CFException();
2375 <        final CompletableFutureInc r = new CompletableFutureInc();
2375 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2376          final CompletableFuture<Integer> f = new CompletableFuture<>();
2377          if (!createIncomplete) f.completeExceptionally(ex);
2378 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2378 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2379          if (createIncomplete) f.completeExceptionally(ex);
2380  
2381          checkCompletedWithWrappedCFException(g, ex);
2382          checkCompletedWithWrappedCFException(f, ex);
2383 <        assertEquals(0, r.invocationCount);
2383 >        r.assertNotInvoked();
2384      }}
2385  
2386      /**
# Line 2965 | Line 2393 | public class CompletableFutureTest exten
2393      {
2394          final CompletableFuture<Integer> f = new CompletableFuture<>();
2395          final FailingCompletableFutureFunction r
2396 <            = new FailingCompletableFutureFunction();
2396 >            = new FailingCompletableFutureFunction(m);
2397          if (!createIncomplete) f.complete(v1);
2398 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2398 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2399          if (createIncomplete) f.complete(v1);
2400  
2401          checkCompletedWithWrappedCFException(g);
# Line 2983 | Line 2411 | public class CompletableFutureTest exten
2411          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2412      {
2413          final CompletableFuture<Integer> f = new CompletableFuture<>();
2414 <        final CompletableFutureInc r = new CompletableFutureInc();
2414 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2415          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2416 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2416 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2417          if (createIncomplete) {
2418              checkIncomplete(g);
2419              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 3012 | Line 2440 | public class CompletableFutureTest exten
2440       */
2441      public void testAllOf_normal() throws Exception {
2442          for (int k = 1; k < 20; ++k) {
2443 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2443 >            CompletableFuture<Integer>[] fs
2444 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2445              for (int i = 0; i < k; ++i)
2446                  fs[i] = new CompletableFuture<>();
2447              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3026 | Line 2455 | public class CompletableFutureTest exten
2455          }
2456      }
2457  
2458 +    public void testAllOf_backwards() throws Exception {
2459 +        for (int k = 1; k < 20; ++k) {
2460 +            CompletableFuture<Integer>[] fs
2461 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2462 +            for (int i = 0; i < k; ++i)
2463 +                fs[i] = new CompletableFuture<>();
2464 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2465 +            for (int i = k - 1; i >= 0; i--) {
2466 +                checkIncomplete(f);
2467 +                checkIncomplete(CompletableFuture.allOf(fs));
2468 +                fs[i].complete(one);
2469 +            }
2470 +            checkCompletedNormally(f, null);
2471 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2472 +        }
2473 +    }
2474 +
2475      /**
2476       * anyOf(no component futures) returns an incomplete future
2477       */
# Line 3084 | Line 2530 | public class CompletableFutureTest exten
2530          Runnable[] throwingActions = {
2531              () -> CompletableFuture.supplyAsync(null),
2532              () -> CompletableFuture.supplyAsync(null, exec),
2533 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2533 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2534  
2535              () -> CompletableFuture.runAsync(null),
2536              () -> CompletableFuture.runAsync(null, exec),
# Line 3157 | Line 2603 | public class CompletableFutureTest exten
2603  
2604              () -> f.thenCompose(null),
2605              () -> f.thenComposeAsync(null),
2606 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2606 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2607              () -> f.thenComposeAsync(null, exec),
2608  
2609              () -> f.exceptionally(null),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines