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.51 by jsr166, Mon Jun 2 19:49:28 2014 UTC vs.
Revision 1.65 by jsr166, Fri Jun 6 17:41:02 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) {
# Line 990 | Line 1083 | public class CompletableFutureTest exten
1083  
1084          checkCompletedNormally(g, null);
1085          checkCompletedNormally(f, v1);
1086 <        assertEquals(1, r.invocationCount);
1086 >        r.assertInvoked();
1087      }}
1088  
1089      /**
# Line 1003 | 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) {
# Line 1013 | Line 1106 | public class CompletableFutureTest exten
1106  
1107          checkCompletedWithWrappedCFException(g, ex);
1108          checkCompletedWithWrappedCFException(f, ex);
1109 <        assertEquals(0, r.invocationCount);
1109 >        r.assertNotInvoked();
1110      }}
1111  
1112      /**
# Line 1025 | 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);
1123 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1124          if (createIncomplete) {
1125              checkIncomplete(g);
1126              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1035 | Line 1128 | public class CompletableFutureTest exten
1128  
1129          checkCompletedWithWrappedCancellationException(g);
1130          checkCancelled(f);
1131 <        assertEquals(0, r.invocationCount);
1131 >        r.assertNotInvoked();
1132      }}
1133  
1134      /**
# Line 1047 | 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);
1145 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1146          if (createIncomplete) {
1147              checkIncomplete(g);
1148              f.complete(v1);
# Line 1068 | 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 1078 | 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 1091 | 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) {
# Line 1101 | Line 1194 | public class CompletableFutureTest exten
1194  
1195          checkCompletedWithWrappedCFException(g, ex);
1196          checkCompletedWithWrappedCFException(f, ex);
1197 <        assertEquals(0, r.invocationCount);
1197 >        r.assertNotInvoked();
1198      }}
1199  
1200      /**
# Line 1113 | 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);
1211 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212          if (createIncomplete) {
1213              checkIncomplete(g);
1214              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1123 | Line 1216 | public class CompletableFutureTest exten
1216  
1217          checkCompletedWithWrappedCancellationException(g);
1218          checkCancelled(f);
1219 <        assertEquals(0, r.invocationCount);
1219 >        r.assertNotInvoked();
1220      }}
1221  
1222      /**
# Line 1135 | 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);
1233 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234          if (createIncomplete) {
1235              checkIncomplete(g);
1236              f.complete(v1);
# Line 1156 | 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) {
# Line 1165 | Line 1258 | public class CompletableFutureTest exten
1258          }
1259  
1260          checkCompletedNormally(g, null);
1261 +        r.assertValue(v1);
1262          checkCompletedNormally(f, v1);
1169        assertEquals(1, r.invocationCount);
1170        assertEquals(inc(v1), r.value);
1263      }}
1264  
1265      /**
# Line 1180 | 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) {
# Line 1190 | Line 1282 | public class CompletableFutureTest exten
1282  
1283          checkCompletedWithWrappedCFException(g, ex);
1284          checkCompletedWithWrappedCFException(f, ex);
1285 <        assertEquals(0, r.invocationCount);
1285 >        r.assertNotInvoked();
1286      }}
1287  
1288      /**
1289 <     * thenAccept result completes exceptionally if action does
1289 >     * thenAccept result completes exceptionally if source cancelled
1290       */
1291 <    public void testThenAccept_actionFailed() {
1291 >    public void testThenAccept_sourceCancelled() {
1292          for (ExecutionMode m : ExecutionMode.values())
1293          for (boolean createIncomplete : new boolean[] { true, false })
1294 <        for (Integer v1 : new Integer[] { 1, null })
1294 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1295      {
1296          final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 <        final FailingConsumer r = new FailingConsumer();
1298 <        if (!createIncomplete) f.complete(v1);
1299 <        final CompletableFuture<Void> g = f.thenAccept(r);
1297 >        final NoopConsumer r = new NoopConsumer(m);
1298 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1300          if (createIncomplete) {
1301              checkIncomplete(g);
1302 <            f.complete(v1);
1302 >            assertTrue(f.cancel(mayInterruptIfRunning));
1303          }
1304  
1305 <        checkCompletedWithWrappedCFException(g);
1306 <        checkCompletedNormally(f, v1);
1305 >        checkCompletedWithWrappedCancellationException(g);
1306 >        checkCancelled(f);
1307 >        r.assertNotInvoked();
1308      }}
1309  
1310      /**
1311 <     * thenAccept result completes exceptionally if source cancelled
1311 >     * thenAccept result completes exceptionally if action does
1312       */
1313 <    public void testThenAccept_sourceCancelled() {
1313 >    public void testThenAccept_actionFailed() {
1314          for (ExecutionMode m : ExecutionMode.values())
1315          for (boolean createIncomplete : new boolean[] { true, false })
1316 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1316 >        for (Integer v1 : new Integer[] { 1, null })
1317      {
1318          final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 <        final IncAction r = new IncAction();
1320 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1321 <        final CompletableFuture<Void> g = f.thenAccept(r);
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 <            assertTrue(f.cancel(mayInterruptIfRunning));
1324 >            f.complete(v1);
1325          }
1326  
1327 <        checkCompletedWithWrappedCancellationException(g);
1328 <        checkCancelled(f);
1236 <        assertEquals(0, r.invocationCount);
1327 >        checkCompletedWithWrappedCFException(g);
1328 >        checkCompletedNormally(f, v1);
1329      }}
1330  
1331      /**
# Line 1249 | Line 1341 | public class CompletableFutureTest exten
1341      {
1342          final CompletableFuture<Integer> f = new CompletableFuture<>();
1343          final CompletableFuture<Integer> g = new CompletableFuture<>();
1344 <        final SubtractFunction r = new SubtractFunction();
1344 >        final SubtractFunction r = new SubtractFunction(m);
1345  
1346          if (fFirst) f.complete(v1); else g.complete(v2);
1347          if (!createIncomplete)
# Line 1257 | Line 1349 | public class CompletableFutureTest exten
1349          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1350          if (createIncomplete) {
1351              checkIncomplete(h);
1352 <            assertEquals(0, r.invocationCount);
1352 >            r.assertNotInvoked();
1353              if (!fFirst) f.complete(v1); else g.complete(v2);
1354          }
1355  
1356          checkCompletedNormally(h, subtract(v1, v2));
1357          checkCompletedNormally(f, v1);
1358          checkCompletedNormally(g, v2);
1359 <        assertEquals(1, r.invocationCount);
1359 >        r.assertInvoked();
1360      }}
1361  
1362      /**
1363       * thenCombine result completes exceptionally after exceptional
1364       * completion of either source
1365       */
1366 <    public void testThenCombine_exceptionalCompletion1() {
1275 <        for (ExecutionMode m : ExecutionMode.values())
1276 <        for (Integer v1 : new Integer[] { 1, null })
1277 <    {
1278 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280 <        final SubtractFunction r = new SubtractFunction();
1281 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1282 <        final CFException ex = new CFException();
1283 <
1284 <        f.completeExceptionally(ex);
1285 <        checkIncomplete(h);
1286 <        g.complete(v1);
1287 <
1288 <        checkCompletedWithWrappedCFException(h, ex);
1289 <        checkCompletedWithWrappedCFException(f, ex);
1290 <        assertEquals(0, r.invocationCount);
1291 <        checkCompletedNormally(g, v1);
1292 <    }}
1293 <
1294 <    public void testThenCombine_exceptionalCompletion2() {
1295 <        for (ExecutionMode m : ExecutionMode.values())
1296 <        for (Integer v1 : new Integer[] { 1, null })
1297 <    {
1298 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1299 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1300 <        final SubtractFunction r = new SubtractFunction();
1301 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1302 <        final CFException ex = new CFException();
1303 <
1304 <        g.completeExceptionally(ex);
1305 <        checkIncomplete(h);
1306 <        f.complete(v1);
1307 <
1308 <        checkCompletedWithWrappedCFException(h, ex);
1309 <        checkCompletedWithWrappedCFException(g, ex);
1310 <        assertEquals(0, r.invocationCount);
1311 <        checkCompletedNormally(f, v1);
1312 <    }}
1313 <
1314 <    public void testThenCombine_exceptionalCompletion3() {
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<>();
1320        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();
1340 <        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() {
1356 <        for (ExecutionMode m : ExecutionMode.values())
1357 <        for (Integer v1 : new Integer[] { 1, null })
1358 <        for (Integer v2 : new Integer[] { 2, null })
1359 <    {
1360 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1361 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1362 <        final FailingBiFunction r = new FailingBiFunction();
1363 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1364 <
1365 <        f.complete(v1);
1366 <        checkIncomplete(h);
1367 <        g.complete(v2);
1368 <
1369 <        checkCompletedWithWrappedCFException(h);
1370 <        checkCompletedNormally(f, v1);
1371 <        checkCompletedNormally(g, v2);
1372 <    }}
1373 <
1374 <    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 1391 | Line 1446 | public class CompletableFutureTest exten
1446      }}
1447  
1448      /**
1394     * thenCombine result completes exceptionally if either source cancelled
1395     */
1396    public void testThenCombine_sourceCancelled1() {
1397        for (ExecutionMode m : ExecutionMode.values())
1398        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399        for (Integer v1 : new Integer[] { 1, null })
1400    {
1401        final CompletableFuture<Integer> f = new CompletableFuture<>();
1402        final CompletableFuture<Integer> g = new CompletableFuture<>();
1403        final SubtractFunction r = new SubtractFunction();
1404        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1405
1406        assertTrue(f.cancel(mayInterruptIfRunning));
1407        checkIncomplete(h);
1408        g.complete(v1);
1409
1410        checkCompletedWithWrappedCancellationException(h);
1411        checkCancelled(f);
1412        assertEquals(0, r.invocationCount);
1413        checkCompletedNormally(g, v1);
1414    }}
1415
1416    public void testThenCombine_sourceCancelled2() {
1417        for (ExecutionMode m : ExecutionMode.values())
1418        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1419        for (Integer v1 : new Integer[] { 1, null })
1420    {
1421        final CompletableFuture<Integer> f = new CompletableFuture<>();
1422        final CompletableFuture<Integer> g = new CompletableFuture<>();
1423        final SubtractFunction r = new SubtractFunction();
1424        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1425
1426        assertTrue(g.cancel(mayInterruptIfRunning));
1427        checkIncomplete(h);
1428        f.complete(v1);
1429
1430        checkCompletedWithWrappedCancellationException(h);
1431        checkCancelled(g);
1432        assertEquals(0, r.invocationCount);
1433        checkCompletedNormally(f, v1);
1434    }}
1435
1436    public void testThenCombine_sourceCancelled3() {
1437        for (ExecutionMode m : ExecutionMode.values())
1438        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1439        for (Integer v1 : new Integer[] { 1, null })
1440    {
1441        final CompletableFuture<Integer> f = new CompletableFuture<>();
1442        final CompletableFuture<Integer> g = new CompletableFuture<>();
1443        final SubtractFunction r = new SubtractFunction();
1444
1445        assertTrue(g.cancel(mayInterruptIfRunning));
1446        f.complete(v1);
1447        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1448
1449        checkCompletedWithWrappedCancellationException(h);
1450        checkCancelled(g);
1451        assertEquals(0, r.invocationCount);
1452        checkCompletedNormally(f, v1);
1453    }}
1454
1455    public void testThenCombine_sourceCancelled4() {
1456        for (ExecutionMode m : ExecutionMode.values())
1457        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1458        for (Integer v1 : new Integer[] { 1, null })
1459    {
1460        final CompletableFuture<Integer> f = new CompletableFuture<>();
1461        final CompletableFuture<Integer> g = new CompletableFuture<>();
1462        final SubtractFunction r = new SubtractFunction();
1463
1464        assertTrue(f.cancel(mayInterruptIfRunning));
1465        g.complete(v1);
1466        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1467
1468        checkCompletedWithWrappedCancellationException(h);
1469        checkCancelled(f);
1470        assertEquals(0, r.invocationCount);
1471        checkCompletedNormally(g, v1);
1472    }}
1473
1474    /**
1449       * thenAcceptBoth result completes normally after normal
1450       * completion of sources
1451       */
1452 <    public void testThenAcceptBoth_normalCompletion1() {
1479 <        for (ExecutionMode m : ExecutionMode.values())
1480 <        for (Integer v1 : new Integer[] { 1, null })
1481 <        for (Integer v2 : new Integer[] { 2, null })
1482 <    {
1483 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1484 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1485 <        final SubtractAction r = new SubtractAction();
1486 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1487 <
1488 <        f.complete(v1);
1489 <        checkIncomplete(h);
1490 <        assertEquals(0, r.invocationCount);
1491 <        g.complete(v2);
1492 <
1493 <        checkCompletedNormally(h, null);
1494 <        assertEquals(subtract(v1, v2), r.value);
1495 <        checkCompletedNormally(f, v1);
1496 <        checkCompletedNormally(g, v2);
1497 <    }}
1498 <
1499 <    public void testThenAcceptBoth_normalCompletion2() {
1500 <        for (ExecutionMode m : ExecutionMode.values())
1501 <        for (Integer v1 : new Integer[] { 1, null })
1502 <        for (Integer v2 : new Integer[] { 2, null })
1503 <    {
1504 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1505 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1506 <        final SubtractAction r = new SubtractAction();
1507 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1508 <
1509 <        g.complete(v2);
1510 <        checkIncomplete(h);
1511 <        assertEquals(0, r.invocationCount);
1512 <        f.complete(v1);
1513 <
1514 <        checkCompletedNormally(h, null);
1515 <        assertEquals(subtract(v1, v2), r.value);
1516 <        checkCompletedNormally(f, v1);
1517 <        checkCompletedNormally(g, v2);
1518 <    }}
1519 <
1520 <    public void testThenAcceptBoth_normalCompletion3() {
1521 <        for (ExecutionMode m : ExecutionMode.values())
1522 <        for (Integer v1 : new Integer[] { 1, null })
1523 <        for (Integer v2 : new Integer[] { 2, null })
1524 <    {
1525 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1526 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1527 <        final SubtractAction r = new SubtractAction();
1528 <
1529 <        g.complete(v2);
1530 <        f.complete(v1);
1531 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1532 <
1533 <        checkCompletedNormally(h, null);
1534 <        assertEquals(subtract(v1, v2), r.value);
1535 <        checkCompletedNormally(f, v1);
1536 <        checkCompletedNormally(g, v2);
1537 <    }}
1538 <
1539 <    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 1559 | Line 1480 | public class CompletableFutureTest exten
1480       * thenAcceptBoth result completes exceptionally after exceptional
1481       * completion of either source
1482       */
1483 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1563 <        for (ExecutionMode m : ExecutionMode.values())
1564 <        for (Integer v1 : new Integer[] { 1, null })
1565 <    {
1566 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1567 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1568 <        final SubtractAction r = new SubtractAction();
1569 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1570 <        final CFException ex = new CFException();
1571 <
1572 <        f.completeExceptionally(ex);
1573 <        checkIncomplete(h);
1574 <        g.complete(v1);
1575 <
1576 <        checkCompletedWithWrappedCFException(h, ex);
1577 <        checkCompletedWithWrappedCFException(f, ex);
1578 <        assertEquals(0, r.invocationCount);
1579 <        checkCompletedNormally(g, v1);
1580 <    }}
1581 <
1582 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1583 <        for (ExecutionMode m : ExecutionMode.values())
1584 <        for (Integer v1 : new Integer[] { 1, null })
1585 <    {
1586 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1587 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1588 <        final SubtractAction r = new SubtractAction();
1589 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1590 <        final CFException ex = new CFException();
1591 <
1592 <        g.completeExceptionally(ex);
1593 <        checkIncomplete(h);
1594 <        f.complete(v1);
1595 <
1596 <        checkCompletedWithWrappedCFException(h, ex);
1597 <        checkCompletedWithWrappedCFException(g, ex);
1598 <        assertEquals(0, r.invocationCount);
1599 <        checkCompletedNormally(f, v1);
1600 <    }}
1601 <
1602 <    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<>();
1608        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();
1628 <        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() {
1644 <        for (ExecutionMode m : ExecutionMode.values())
1645 <        for (Integer v1 : new Integer[] { 1, null })
1646 <        for (Integer v2 : new Integer[] { 2, null })
1647 <    {
1648 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1649 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1650 <        final FailingBiConsumer r = new FailingBiConsumer();
1651 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1652 <
1653 <        f.complete(v1);
1654 <        checkIncomplete(h);
1655 <        g.complete(v2);
1656 <
1657 <        checkCompletedWithWrappedCFException(h);
1658 <        checkCompletedNormally(f, v1);
1659 <        checkCompletedNormally(g, v2);
1660 <    }}
1661 <
1662 <    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 1679 | Line 1563 | public class CompletableFutureTest exten
1563      }}
1564  
1565      /**
1682     * thenAcceptBoth result completes exceptionally if either source cancelled
1683     */
1684    public void testThenAcceptBoth_sourceCancelled1() {
1685        for (ExecutionMode m : ExecutionMode.values())
1686        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1687        for (Integer v1 : new Integer[] { 1, null })
1688    {
1689        final CompletableFuture<Integer> f = new CompletableFuture<>();
1690        final CompletableFuture<Integer> g = new CompletableFuture<>();
1691        final SubtractAction r = new SubtractAction();
1692        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1693
1694        assertTrue(f.cancel(mayInterruptIfRunning));
1695        checkIncomplete(h);
1696        g.complete(v1);
1697
1698        checkCompletedWithWrappedCancellationException(h);
1699        checkCancelled(f);
1700        assertEquals(0, r.invocationCount);
1701        checkCompletedNormally(g, v1);
1702    }}
1703
1704    public void testThenAcceptBoth_sourceCancelled2() {
1705        for (ExecutionMode m : ExecutionMode.values())
1706        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1707        for (Integer v1 : new Integer[] { 1, null })
1708    {
1709        final CompletableFuture<Integer> f = new CompletableFuture<>();
1710        final CompletableFuture<Integer> g = new CompletableFuture<>();
1711        final SubtractAction r = new SubtractAction();
1712        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1713
1714        assertTrue(g.cancel(mayInterruptIfRunning));
1715        checkIncomplete(h);
1716        f.complete(v1);
1717
1718        checkCompletedWithWrappedCancellationException(h);
1719        checkCancelled(g);
1720        assertEquals(0, r.invocationCount);
1721        checkCompletedNormally(f, v1);
1722    }}
1723
1724    public void testThenAcceptBoth_sourceCancelled3() {
1725        for (ExecutionMode m : ExecutionMode.values())
1726        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1727        for (Integer v1 : new Integer[] { 1, null })
1728    {
1729        final CompletableFuture<Integer> f = new CompletableFuture<>();
1730        final CompletableFuture<Integer> g = new CompletableFuture<>();
1731        final SubtractAction r = new SubtractAction();
1732
1733        assertTrue(g.cancel(mayInterruptIfRunning));
1734        f.complete(v1);
1735        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1736
1737        checkCompletedWithWrappedCancellationException(h);
1738        checkCancelled(g);
1739        assertEquals(0, r.invocationCount);
1740        checkCompletedNormally(f, v1);
1741    }}
1742
1743    public void testThenAcceptBoth_sourceCancelled4() {
1744        for (ExecutionMode m : ExecutionMode.values())
1745        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1746        for (Integer v1 : new Integer[] { 1, null })
1747    {
1748        final CompletableFuture<Integer> f = new CompletableFuture<>();
1749        final CompletableFuture<Integer> g = new CompletableFuture<>();
1750        final SubtractAction r = new SubtractAction();
1751
1752        assertTrue(f.cancel(mayInterruptIfRunning));
1753        g.complete(v1);
1754        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1755
1756        checkCompletedWithWrappedCancellationException(h);
1757        checkCancelled(f);
1758        assertEquals(0, r.invocationCount);
1759        checkCompletedNormally(g, v1);
1760    }}
1761
1762    /**
1566       * runAfterBoth result completes normally after normal
1567       * completion of sources
1568       */
1569 <    public void testRunAfterBoth_normalCompletion1() {
1767 <        for (ExecutionMode m : ExecutionMode.values())
1768 <        for (Integer v1 : new Integer[] { 1, null })
1769 <        for (Integer v2 : new Integer[] { 2, null })
1770 <    {
1771 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1772 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1773 <        final Noop r = new Noop();
1774 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1775 <
1776 <        f.complete(v1);
1777 <        checkIncomplete(h);
1778 <        assertEquals(0, r.invocationCount);
1779 <        g.complete(v2);
1780 <
1781 <        checkCompletedNormally(h, null);
1782 <        assertEquals(1, r.invocationCount);
1783 <        checkCompletedNormally(f, v1);
1784 <        checkCompletedNormally(g, v2);
1785 <    }}
1786 <
1787 <    public void testRunAfterBoth_normalCompletion2() {
1788 <        for (ExecutionMode m : ExecutionMode.values())
1789 <        for (Integer v1 : new Integer[] { 1, null })
1790 <        for (Integer v2 : new Integer[] { 2, null })
1791 <    {
1792 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1793 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1794 <        final Noop r = new Noop();
1795 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1796 <
1797 <        g.complete(v2);
1798 <        checkIncomplete(h);
1799 <        assertEquals(0, r.invocationCount);
1800 <        f.complete(v1);
1801 <
1802 <        checkCompletedNormally(h, null);
1803 <        assertEquals(1, r.invocationCount);
1804 <        checkCompletedNormally(f, v1);
1805 <        checkCompletedNormally(g, v2);
1806 <    }}
1807 <
1808 <    public void testRunAfterBoth_normalCompletion3() {
1809 <        for (ExecutionMode m : ExecutionMode.values())
1810 <        for (Integer v1 : new Integer[] { 1, null })
1811 <        for (Integer v2 : new Integer[] { 2, null })
1812 <    {
1813 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1814 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1815 <        final Noop r = new Noop();
1816 <
1817 <        g.complete(v2);
1818 <        f.complete(v1);
1819 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1820 <
1821 <        checkCompletedNormally(h, null);
1822 <        assertEquals(1, r.invocationCount);
1823 <        checkCompletedNormally(f, v1);
1824 <        checkCompletedNormally(g, v2);
1825 <    }}
1826 <
1827 <    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 1847 | Line 1597 | public class CompletableFutureTest exten
1597       * runAfterBoth result completes exceptionally after exceptional
1598       * completion of either source
1599       */
1600 <    public void testRunAfterBoth_exceptionalCompletion1() {
1851 <        for (ExecutionMode m : ExecutionMode.values())
1852 <        for (Integer v1 : new Integer[] { 1, null })
1853 <    {
1854 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1855 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1856 <        final Noop r = new Noop();
1857 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1858 <        final CFException ex = new CFException();
1859 <
1860 <        f.completeExceptionally(ex);
1861 <        checkIncomplete(h);
1862 <        g.complete(v1);
1863 <
1864 <        checkCompletedWithWrappedCFException(h, ex);
1865 <        checkCompletedWithWrappedCFException(f, ex);
1866 <        assertEquals(0, r.invocationCount);
1867 <        checkCompletedNormally(g, v1);
1868 <    }}
1869 <
1870 <    public void testRunAfterBoth_exceptionalCompletion2() {
1871 <        for (ExecutionMode m : ExecutionMode.values())
1872 <        for (Integer v1 : new Integer[] { 1, null })
1873 <    {
1874 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1875 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1876 <        final Noop r = new Noop();
1877 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1878 <        final CFException ex = new CFException();
1879 <
1880 <        g.completeExceptionally(ex);
1881 <        checkIncomplete(h);
1882 <        f.complete(v1);
1883 <
1884 <        checkCompletedWithWrappedCFException(h, ex);
1885 <        checkCompletedWithWrappedCFException(g, ex);
1886 <        assertEquals(0, r.invocationCount);
1887 <        checkCompletedNormally(f, v1);
1888 <    }}
1889 <
1890 <    public void testRunAfterBoth_exceptionalCompletion3() {
1891 <        for (ExecutionMode m : ExecutionMode.values())
1892 <        for (Integer v1 : new Integer[] { 1, null })
1893 <    {
1894 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1895 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1896 <        final Noop r = new Noop();
1897 <        final CFException ex = new CFException();
1898 <
1899 <        g.completeExceptionally(ex);
1900 <        f.complete(v1);
1901 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1902 <
1903 <        checkCompletedWithWrappedCFException(h, ex);
1904 <        checkCompletedWithWrappedCFException(g, ex);
1905 <        assertEquals(0, r.invocationCount);
1906 <        checkCompletedNormally(f, v1);
1907 <    }}
1908 <
1909 <    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<>();
1915        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);
1926 <    }}
1927 <
1928 <    /**
1929 <     * runAfterBoth result completes exceptionally if action does
1930 <     */
1931 <    public void testRunAfterBoth_actionFailed1() {
1932 <        for (ExecutionMode m : ExecutionMode.values())
1933 <        for (Integer v1 : new Integer[] { 1, null })
1934 <        for (Integer v2 : new Integer[] { 2, null })
1935 <    {
1936 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1937 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1938 <        final FailingRunnable r = new FailingRunnable();
1939 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1940 <
1941 <        f.complete(v1);
1942 <        checkIncomplete(h);
1943 <        g.complete(v2);
1944 <
1945 <        checkCompletedWithWrappedCFException(h);
1946 <        checkCompletedNormally(f, v1);
1947 <        checkCompletedNormally(g, v2);
1948 <    }}
1949 <
1950 <    public void testRunAfterBoth_actionFailed2() {
1951 <        for (ExecutionMode m : ExecutionMode.values())
1952 <        for (Integer v1 : new Integer[] { 1, null })
1953 <        for (Integer v2 : new Integer[] { 2, null })
1954 <    {
1955 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1956 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1957 <        final FailingRunnable r = new FailingRunnable();
1958 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1959 <
1960 <        g.complete(v2);
1961 <        checkIncomplete(h);
1962 <        f.complete(v1);
1963 <
1964 <        checkCompletedWithWrappedCFException(h);
1965 <        checkCompletedNormally(f, v1);
1966 <        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();
1980 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1638 >        final Noop r = new Noop(m);
1639  
1982        assertTrue(f.cancel(mayInterruptIfRunning));
1983        checkIncomplete(h);
1984        g.complete(v1);
1640  
1641 <        checkCompletedWithWrappedCancellationException(h);
1642 <        checkCancelled(f);
1643 <        assertEquals(0, r.invocationCount);
1989 <        checkCompletedNormally(g, v1);
1990 <    }}
1991 <
1992 <    public void testRunAfterBoth_sourceCancelled2() {
1993 <        for (ExecutionMode m : ExecutionMode.values())
1994 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1995 <        for (Integer v1 : new Integer[] { 1, null })
1996 <    {
1997 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1998 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1999 <        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);
2027 <        assertEquals(0, r.invocationCount);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682          checkCompletedNormally(f, v1);
1683 <    }}
2030 <
2031 <    public void testRunAfterBoth_sourceCancelled4() {
2032 <        for (ExecutionMode m : ExecutionMode.values())
2033 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2034 <        for (Integer v1 : new Integer[] { 1, null })
2035 <    {
2036 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2037 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2038 <        final Noop r = new Noop();
2039 <
2040 <        assertTrue(f.cancel(mayInterruptIfRunning));
2041 <        g.complete(v1);
2042 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2043 <
2044 <        checkCompletedWithWrappedCancellationException(h);
2045 <        checkCancelled(f);
2046 <        assertEquals(0, r.invocationCount);
2047 <        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 })
2077 <    {
2078 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2079 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2080 <        final IncFunction r = new IncFunction();
2081 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2082 <
2083 <        g.complete(v2);
2084 <        checkCompletedNormally(h, inc(v2));
2085 <        f.complete(v1);
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 <        checkCompletedNormally(h, inc(v2));
1728 <        }}
1729 <
1730 <    public void testApplyToEither_normalCompletion3() {
1731 <        for (ExecutionMode m : ExecutionMode.values())
2094 <        for (Integer v1 : new Integer[] { 1, null })
2095 <        for (Integer v2 : new Integer[] { 2, null })
2096 <    {
2097 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2098 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2099 <        final IncFunction r = new IncFunction();
2100 <
2101 <        f.complete(v1);
2102 <        g.complete(v2);
2103 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2104 <
2105 <        checkCompletedNormally(f, v1);
2106 <        checkCompletedNormally(g, v2);
2107 <
2108 <        // unspecified behavior
2109 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2110 <                   Objects.equals(h.join(), inc(v2)));
2111 <        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<>();
2124        final IncFunction r = new IncFunction();
2125        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);
2135 <        checkCompletedWithWrappedCFException(h, ex);
2136 <    }}
2137 <
2138 <    public void testApplyToEither_exceptionalCompletion2() {
2139 <        for (ExecutionMode m : ExecutionMode.values())
2140 <        for (Integer v1 : new Integer[] { 1, null })
2141 <    {
2142 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2143 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2144 <        final IncFunction r = new IncFunction();
2145 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2146 <        final CFException ex = new CFException();
2147 <
2148 <        g.completeExceptionally(ex);
2149 <        checkCompletedWithWrappedCFException(h, ex);
2150 <        f.complete(v1);
2151 <
2152 <        assertEquals(0, r.invocationCount);
2153 <        checkCompletedNormally(f, v1);
2154 <        checkCompletedWithWrappedCFException(g, ex);
2155 <        checkCompletedWithWrappedCFException(h, ex);
2156 <    }}
2157 <
2158 <    public void testApplyToEither_exceptionalCompletion3() {
2159 <        for (ExecutionMode m : ExecutionMode.values())
2160 <        for (Integer v1 : new Integer[] { 1, null })
2161 <    {
2162 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2163 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2164 <        final IncFunction r = new IncFunction();
2165 <        final CFException ex = new CFException();
2166 <
2167 <        g.completeExceptionally(ex);
2168 <        f.complete(v1);
2169 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2170 <
2171 <        // unspecified behavior
2172 <        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].assertInvoked();
1769          } catch (CompletionException ok) {
1770 <            checkCompletedWithWrappedCFException(h, ex);
1771 <            assertEquals(0, r.invocationCount);
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772          }
2180
2181        checkCompletedWithWrappedCFException(g, ex);
2182        checkCompletedNormally(f, v1);
2183    }}
2184
2185    public void testApplyToEither_exceptionalCompletion4() {
2186        for (ExecutionMode m : ExecutionMode.values())
2187        for (Integer v1 : new Integer[] { 1, null })
2188    {
2189        final CompletableFuture<Integer> f = new CompletableFuture<>();
2190        final CompletableFuture<Integer> g = new CompletableFuture<>();
2191        final IncFunction r = new IncFunction();
2192        final CFException ex = new CFException();
2193
2194        f.completeExceptionally(ex);
2195        g.complete(v1);
2196        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2197
2198        // unspecified behavior
2199        Integer v;
1773          try {
1774 <            assertEquals(inc(v1), h.join());
1775 <            assertEquals(1, r.invocationCount);
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertInvoked();
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 <    }}
1784 <
1785 <    /**
1786 <     * applyToEither result completes exceptionally if action does
1787 <     */
1788 <    public void testApplyToEither_actionFailed1() {
2216 <        for (ExecutionMode m : ExecutionMode.values())
2217 <        for (Integer v1 : new Integer[] { 1, null })
2218 <        for (Integer v2 : new Integer[] { 2, null })
2219 <    {
2220 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2221 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2222 <        final FailingFunction r = new FailingFunction();
2223 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2224 <
2225 <        f.complete(v1);
2226 <        checkCompletedWithWrappedCFException(h);
2227 <        g.complete(v2);
2228 <        checkCompletedNormally(f, v1);
2229 <        checkCompletedNormally(g, v2);
2230 <    }}
2231 <
2232 <    public void testApplyToEither_actionFailed2() {
2233 <        for (ExecutionMode m : ExecutionMode.values())
2234 <        for (Integer v1 : new Integer[] { 1, null })
2235 <        for (Integer v2 : new Integer[] { 2, null })
2236 <    {
2237 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2238 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2239 <        final FailingFunction r = new FailingFunction();
2240 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2241 <
2242 <        g.complete(v2);
2243 <        checkCompletedWithWrappedCFException(h);
2244 <        f.complete(v1);
2245 <        checkCompletedNormally(f, v1);
2246 <        checkCompletedNormally(g, v2);
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      /**
1792       * applyToEither result completes exceptionally if either source cancelled
1793       */
1794 <    public void testApplyToEither_sourceCancelled1() {
1794 >    public void testApplyToEither_sourceCancelled() {
1795          for (ExecutionMode m : ExecutionMode.values())
1796          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1797          for (Integer v1 : new Integer[] { 1, null })
1798      {
1799          final CompletableFuture<Integer> f = new CompletableFuture<>();
1800          final CompletableFuture<Integer> g = new CompletableFuture<>();
1801 <        final IncFunction r = new IncFunction();
1802 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1801 >        final IncFunction[] rs = new IncFunction[6];
1802 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1803  
1804 <        assertTrue(f.cancel(mayInterruptIfRunning));
1805 <        checkCompletedWithWrappedCancellationException(h);
1804 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1805 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1806 >        checkIncomplete(h0);
1807 >        checkIncomplete(h1);
1808 >        rs[0].assertNotInvoked();
1809 >        rs[1].assertNotInvoked();
1810 >        f.cancel(mayInterruptIfRunning);
1811 >        checkCompletedWithWrappedCancellationException(h0);
1812 >        checkCompletedWithWrappedCancellationException(h1);
1813 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1814 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1815 >        checkCompletedWithWrappedCancellationException(h2);
1816 >        checkCompletedWithWrappedCancellationException(h3);
1817          g.complete(v1);
1818  
1819 <        checkCancelled(f);
1820 <        assertEquals(0, r.invocationCount);
1821 <        checkCompletedNormally(g, v1);
2269 <        checkCompletedWithWrappedCancellationException(h);
2270 <    }}
2271 <
2272 <    public void testApplyToEither_sourceCancelled2() {
2273 <        for (ExecutionMode m : ExecutionMode.values())
2274 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2275 <        for (Integer v1 : new Integer[] { 1, null })
2276 <    {
2277 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279 <        final IncFunction r = new IncFunction();
2280 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2281 <
2282 <        assertTrue(g.cancel(mayInterruptIfRunning));
2283 <        checkCompletedWithWrappedCancellationException(h);
2284 <        f.complete(v1);
2285 <
2286 <        checkCancelled(g);
2287 <        assertEquals(0, r.invocationCount);
2288 <        checkCompletedNormally(f, v1);
2289 <        checkCompletedWithWrappedCancellationException(h);
2290 <    }}
2291 <
2292 <    public void testApplyToEither_sourceCancelled3() {
2293 <        for (ExecutionMode m : ExecutionMode.values())
2294 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2295 <        for (Integer v1 : new Integer[] { 1, null })
2296 <    {
2297 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2298 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2299 <        final IncFunction r = new IncFunction();
2300 <
2301 <        assertTrue(g.cancel(mayInterruptIfRunning));
2302 <        f.complete(v1);
2303 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2304 <
2305 <        // unspecified behavior
2306 <        Integer v;
1819 >        // unspecified behavior - both source completions available
1820 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1821 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1822          try {
1823 <            assertEquals(inc(v1), h.join());
1824 <            assertEquals(1, r.invocationCount);
1823 >            assertEquals(inc(v1), h4.join());
1824 >            rs[4].assertInvoked();
1825          } catch (CompletionException ok) {
1826 <            checkCompletedWithWrappedCancellationException(h);
1827 <            assertEquals(0, r.invocationCount);
1826 >            checkCompletedWithWrappedCancellationException(h4);
1827 >            rs[4].assertNotInvoked();
1828          }
2314
2315        checkCancelled(g);
2316        checkCompletedNormally(f, v1);
2317    }}
2318
2319    public void testApplyToEither_sourceCancelled4() {
2320        for (ExecutionMode m : ExecutionMode.values())
2321        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2322        for (Integer v1 : new Integer[] { 1, null })
2323    {
2324        final CompletableFuture<Integer> f = new CompletableFuture<>();
2325        final CompletableFuture<Integer> g = new CompletableFuture<>();
2326        final IncFunction r = new IncFunction();
2327
2328        assertTrue(f.cancel(mayInterruptIfRunning));
2329        g.complete(v1);
2330        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2331
2332        // unspecified behavior
2333        Integer v;
1829          try {
1830 <            assertEquals(inc(v1), h.join());
1831 <            assertEquals(1, r.invocationCount);
1830 >            assertEquals(inc(v1), h5.join());
1831 >            rs[5].assertInvoked();
1832          } catch (CompletionException ok) {
1833 <            checkCompletedWithWrappedCancellationException(h);
1834 <            assertEquals(0, r.invocationCount);
1833 >            checkCompletedWithWrappedCancellationException(h5);
1834 >            rs[5].assertNotInvoked();
1835          }
1836  
1837          checkCancelled(f);
1838          checkCompletedNormally(g, v1);
1839 +        checkCompletedWithWrappedCancellationException(h0);
1840 +        checkCompletedWithWrappedCancellationException(h1);
1841 +        checkCompletedWithWrappedCancellationException(h2);
1842 +        checkCompletedWithWrappedCancellationException(h3);
1843 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1844      }}
1845  
1846      /**
1847 <     * acceptEither result completes normally after normal completion
2348 <     * of either source
1847 >     * applyToEither result completes exceptionally if action does
1848       */
1849 <    public void testAcceptEither_normalCompletion1() {
1849 >    public void testApplyToEither_actionFailed() {
1850          for (ExecutionMode m : ExecutionMode.values())
1851          for (Integer v1 : new Integer[] { 1, null })
1852          for (Integer v2 : new Integer[] { 2, null })
1853      {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856 <        final IncAction r = new IncAction();
1857 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1856 >        final FailingFunction[] rs = new FailingFunction[6];
1857 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1858  
1859 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1860 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1861          f.complete(v1);
1862 <        checkCompletedNormally(h, null);
1863 <        assertEquals(inc(v1), r.value);
1862 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1863 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1864 >        checkCompletedWithWrappedCFException(h0);
1865 >        checkCompletedWithWrappedCFException(h1);
1866 >        checkCompletedWithWrappedCFException(h2);
1867 >        checkCompletedWithWrappedCFException(h3);
1868 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1869 >
1870          g.complete(v2);
1871  
1872 <        checkCompletedNormally(f, v1);
1873 <        checkCompletedNormally(g, v2);
1874 <        checkCompletedNormally(h, null);
2368 <    }}
1872 >        // unspecified behavior - both source completions available
1873 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1874 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1875  
1876 <    public void testAcceptEither_normalCompletion2() {
1877 <        for (ExecutionMode m : ExecutionMode.values())
1878 <        for (Integer v1 : new Integer[] { 1, null })
1879 <        for (Integer v2 : new Integer[] { 2, null })
1880 <    {
1881 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2376 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2377 <        final IncAction r = new IncAction();
2378 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2379 <
2380 <        g.complete(v2);
2381 <        checkCompletedNormally(h, null);
2382 <        assertEquals(inc(v2), r.value);
2383 <        f.complete(v1);
1876 >        checkCompletedWithWrappedCFException(h4);
1877 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1878 >                   Objects.equals(v2, rs[4].value));
1879 >        checkCompletedWithWrappedCFException(h5);
1880 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1881 >                   Objects.equals(v2, rs[5].value));
1882  
1883          checkCompletedNormally(f, v1);
1884          checkCompletedNormally(g, v2);
2387        checkCompletedNormally(h, null);
1885      }}
1886  
1887 <    public void testAcceptEither_normalCompletion3() {
1887 >    /**
1888 >     * acceptEither result completes normally after normal completion
1889 >     * of either source
1890 >     */
1891 >    public void testAcceptEither_normalCompletion() {
1892          for (ExecutionMode m : ExecutionMode.values())
1893          for (Integer v1 : new Integer[] { 1, null })
1894          for (Integer v2 : new Integer[] { 2, null })
1895      {
1896          final CompletableFuture<Integer> f = new CompletableFuture<>();
1897          final CompletableFuture<Integer> g = new CompletableFuture<>();
1898 <        final IncAction r = new IncAction();
1898 >        final NoopConsumer[] rs = new NoopConsumer[6];
1899 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1900  
1901 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1902 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1903 +        checkIncomplete(h0);
1904 +        checkIncomplete(h1);
1905 +        rs[0].assertNotInvoked();
1906 +        rs[1].assertNotInvoked();
1907          f.complete(v1);
1908 +        checkCompletedNormally(h0, null);
1909 +        checkCompletedNormally(h1, null);
1910 +        rs[0].assertValue(v1);
1911 +        rs[1].assertValue(v1);
1912 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1913 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1914 +        checkCompletedNormally(h2, null);
1915 +        checkCompletedNormally(h3, null);
1916 +        rs[2].assertValue(v1);
1917 +        rs[3].assertValue(v1);
1918          g.complete(v2);
2401        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1919  
1920 <        checkCompletedNormally(h, null);
1920 >        // unspecified behavior - both source completions available
1921 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1922 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1923 >        checkCompletedNormally(h4, null);
1924 >        checkCompletedNormally(h5, null);
1925 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1926 >                   Objects.equals(v2, rs[4].value));
1927 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1928 >                   Objects.equals(v2, rs[5].value));
1929 >
1930          checkCompletedNormally(f, v1);
1931          checkCompletedNormally(g, v2);
1932 <
1933 <        // unspecified behavior
1934 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
1935 <                   Objects.equals(r.value, inc(v2)));
1932 >        checkCompletedNormally(h0, null);
1933 >        checkCompletedNormally(h1, null);
1934 >        checkCompletedNormally(h2, null);
1935 >        checkCompletedNormally(h3, null);
1936 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1937      }}
1938  
1939      /**
1940       * acceptEither result completes exceptionally after exceptional
1941       * completion of either source
1942       */
1943 <    public void testAcceptEither_exceptionalCompletion1() {
1943 >    public void testAcceptEither_exceptionalCompletion() {
1944          for (ExecutionMode m : ExecutionMode.values())
1945          for (Integer v1 : new Integer[] { 1, null })
1946      {
1947          final CompletableFuture<Integer> f = new CompletableFuture<>();
1948          final CompletableFuture<Integer> g = new CompletableFuture<>();
2422        final IncAction r = new IncAction();
2423        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1949          final CFException ex = new CFException();
1950 +        final NoopConsumer[] rs = new NoopConsumer[6];
1951 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1952  
1953 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1954 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1955 +        checkIncomplete(h0);
1956 +        checkIncomplete(h1);
1957 +        rs[0].assertNotInvoked();
1958 +        rs[1].assertNotInvoked();
1959          f.completeExceptionally(ex);
1960 <        checkCompletedWithWrappedCFException(h, ex);
1961 <        g.complete(v1);
1962 <
1963 <        assertEquals(0, r.invocationCount);
1964 <        checkCompletedNormally(g, v1);
1965 <        checkCompletedWithWrappedCFException(f, ex);
2433 <        checkCompletedWithWrappedCFException(h, ex);
2434 <    }}
2435 <
2436 <    public void testAcceptEither_exceptionalCompletion2() {
2437 <        for (ExecutionMode m : ExecutionMode.values())
2438 <        for (Integer v1 : new Integer[] { 1, null })
2439 <    {
2440 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442 <        final IncAction r = new IncAction();
2443 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444 <        final CFException ex = new CFException();
2445 <
2446 <        g.completeExceptionally(ex);
2447 <        checkCompletedWithWrappedCFException(h, ex);
2448 <        f.complete(v1);
2449 <
2450 <        assertEquals(0, r.invocationCount);
2451 <        checkCompletedNormally(f, v1);
2452 <        checkCompletedWithWrappedCFException(g, ex);
2453 <        checkCompletedWithWrappedCFException(h, ex);
2454 <    }}
2455 <
2456 <    public void testAcceptEither_exceptionalCompletion3() {
2457 <        for (ExecutionMode m : ExecutionMode.values())
2458 <        for (Integer v1 : new Integer[] { 1, null })
2459 <    {
2460 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2461 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2462 <        final IncAction r = new IncAction();
2463 <        final CFException ex = new CFException();
1960 >        checkCompletedWithWrappedCFException(h0, ex);
1961 >        checkCompletedWithWrappedCFException(h1, ex);
1962 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1963 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1964 >        checkCompletedWithWrappedCFException(h2, ex);
1965 >        checkCompletedWithWrappedCFException(h3, ex);
1966  
1967 <        g.completeExceptionally(ex);
2466 <        f.complete(v1);
2467 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1967 >        g.complete(v1);
1968  
1969 <        // unspecified behavior
1970 <        Integer v;
1969 >        // unspecified behavior - both source completions available
1970 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1971 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1972          try {
1973 <            assertNull(h.join());
1974 <            assertEquals(1, r.invocationCount);
2474 <            assertEquals(inc(v1), r.value);
1973 >            assertNull(h4.join());
1974 >            rs[4].assertValue(v1);
1975          } catch (CompletionException ok) {
1976 <            checkCompletedWithWrappedCFException(h, ex);
1977 <            assertEquals(0, r.invocationCount);
1976 >            checkCompletedWithWrappedCFException(h4, ex);
1977 >            rs[4].assertNotInvoked();
1978          }
2479
2480        checkCompletedWithWrappedCFException(g, ex);
2481        checkCompletedNormally(f, v1);
2482    }}
2483
2484    public void testAcceptEither_exceptionalCompletion4() {
2485        for (ExecutionMode m : ExecutionMode.values())
2486        for (Integer v1 : new Integer[] { 1, null })
2487    {
2488        final CompletableFuture<Integer> f = new CompletableFuture<>();
2489        final CompletableFuture<Integer> g = new CompletableFuture<>();
2490        final IncAction r = new IncAction();
2491        final CFException ex = new CFException();
2492
2493        f.completeExceptionally(ex);
2494        g.complete(v1);
2495        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2496
2497        // unspecified behavior
2498        Integer v;
1979          try {
1980 <            assertNull(h.join());
1981 <            assertEquals(1, r.invocationCount);
2502 <            assertEquals(inc(v1), r.value);
1980 >            assertNull(h5.join());
1981 >            rs[5].assertValue(v1);
1982          } catch (CompletionException ok) {
1983 <            checkCompletedWithWrappedCFException(h, ex);
1984 <            assertEquals(0, r.invocationCount);
1983 >            checkCompletedWithWrappedCFException(h5, ex);
1984 >            rs[5].assertNotInvoked();
1985          }
1986  
1987          checkCompletedWithWrappedCFException(f, ex);
1988          checkCompletedNormally(g, v1);
1989 <    }}
1990 <
1991 <    /**
1992 <     * acceptEither result completes exceptionally if action does
1993 <     */
1994 <    public void testAcceptEither_actionFailed1() {
2516 <        for (ExecutionMode m : ExecutionMode.values())
2517 <        for (Integer v1 : new Integer[] { 1, null })
2518 <        for (Integer v2 : new Integer[] { 2, null })
2519 <    {
2520 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2521 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2522 <        final FailingConsumer r = new FailingConsumer();
2523 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2524 <
2525 <        f.complete(v1);
2526 <        checkCompletedWithWrappedCFException(h);
2527 <        g.complete(v2);
2528 <        checkCompletedNormally(f, v1);
2529 <        checkCompletedNormally(g, v2);
2530 <    }}
2531 <
2532 <    public void testAcceptEither_actionFailed2() {
2533 <        for (ExecutionMode m : ExecutionMode.values())
2534 <        for (Integer v1 : new Integer[] { 1, null })
2535 <        for (Integer v2 : new Integer[] { 2, null })
2536 <    {
2537 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2538 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2539 <        final FailingConsumer r = new FailingConsumer();
2540 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2541 <
2542 <        g.complete(v2);
2543 <        checkCompletedWithWrappedCFException(h);
2544 <        f.complete(v1);
2545 <        checkCompletedNormally(f, v1);
2546 <        checkCompletedNormally(g, v2);
1989 >        checkCompletedWithWrappedCFException(h0, ex);
1990 >        checkCompletedWithWrappedCFException(h1, ex);
1991 >        checkCompletedWithWrappedCFException(h2, ex);
1992 >        checkCompletedWithWrappedCFException(h3, ex);
1993 >        checkCompletedWithWrappedCFException(h4, ex);
1994 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1995      }}
1996  
1997      /**
1998       * acceptEither result completes exceptionally if either source cancelled
1999       */
2000 <    public void testAcceptEither_sourceCancelled1() {
2000 >    public void testAcceptEither_sourceCancelled() {
2001          for (ExecutionMode m : ExecutionMode.values())
2002          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2003          for (Integer v1 : new Integer[] { 1, null })
2004      {
2005          final CompletableFuture<Integer> f = new CompletableFuture<>();
2006          final CompletableFuture<Integer> g = new CompletableFuture<>();
2007 <        final IncAction r = new IncAction();
2008 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2007 >        final NoopConsumer[] rs = new NoopConsumer[6];
2008 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2009  
2010 <        assertTrue(f.cancel(mayInterruptIfRunning));
2011 <        checkCompletedWithWrappedCancellationException(h);
2012 <        g.complete(v1);
2013 <
2014 <        checkCancelled(f);
2015 <        assertEquals(0, r.invocationCount);
2016 <        checkCompletedNormally(g, v1);
2017 <        checkCompletedWithWrappedCancellationException(h);
2018 <    }}
2019 <
2020 <    public void testAcceptEither_sourceCancelled2() {
2021 <        for (ExecutionMode m : ExecutionMode.values())
2022 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2575 <        for (Integer v1 : new Integer[] { 1, null })
2576 <    {
2577 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2578 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2579 <        final IncAction r = new IncAction();
2580 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2581 <
2582 <        assertTrue(g.cancel(mayInterruptIfRunning));
2583 <        checkCompletedWithWrappedCancellationException(h);
2584 <        f.complete(v1);
2585 <
2586 <        checkCancelled(g);
2587 <        assertEquals(0, r.invocationCount);
2588 <        checkCompletedNormally(f, v1);
2589 <        checkCompletedWithWrappedCancellationException(h);
2590 <    }}
2591 <
2592 <    public void testAcceptEither_sourceCancelled3() {
2593 <        for (ExecutionMode m : ExecutionMode.values())
2594 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2595 <        for (Integer v1 : new Integer[] { 1, null })
2596 <    {
2597 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2598 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2599 <        final IncAction r = new IncAction();
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.cancel(mayInterruptIfRunning);
2017 >        checkCompletedWithWrappedCancellationException(h0);
2018 >        checkCompletedWithWrappedCancellationException(h1);
2019 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2020 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2021 >        checkCompletedWithWrappedCancellationException(h2);
2022 >        checkCompletedWithWrappedCancellationException(h3);
2023  
2024 <        assertTrue(g.cancel(mayInterruptIfRunning));
2602 <        f.complete(v1);
2603 <        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);
2610 <            assertEquals(inc(v1), r.value);
2030 >            assertNull(h4.join());
2031 >            rs[4].assertValue(v1);
2032          } catch (CompletionException ok) {
2033 <            checkCompletedWithWrappedCancellationException(h);
2034 <            assertEquals(0, r.invocationCount);
2033 >            checkCompletedWithWrappedCancellationException(h4);
2034 >            rs[4].assertNotInvoked();
2035          }
2615
2616        checkCancelled(g);
2617        checkCompletedNormally(f, v1);
2618    }}
2619
2620    public void testAcceptEither_sourceCancelled4() {
2621        for (ExecutionMode m : ExecutionMode.values())
2622        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2623        for (Integer v1 : new Integer[] { 1, null })
2624    {
2625        final CompletableFuture<Integer> f = new CompletableFuture<>();
2626        final CompletableFuture<Integer> g = new CompletableFuture<>();
2627        final IncAction r = new IncAction();
2628
2629        assertTrue(f.cancel(mayInterruptIfRunning));
2630        g.complete(v1);
2631        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2632
2633        // unspecified behavior
2634        Integer v;
2036          try {
2037 <            assertNull(h.join());
2038 <            assertEquals(1, r.invocationCount);
2638 <            assertEquals(inc(v1), r.value);
2037 >            assertNull(h5.join());
2038 >            rs[5].assertValue(v1);
2039          } catch (CompletionException ok) {
2040 <            checkCompletedWithWrappedCancellationException(h);
2041 <            assertEquals(0, r.invocationCount);
2040 >            checkCompletedWithWrappedCancellationException(h5);
2041 >            rs[5].assertNotInvoked();
2042          }
2043  
2044          checkCancelled(f);
2045          checkCompletedNormally(g, v1);
2046 +        checkCompletedWithWrappedCancellationException(h0);
2047 +        checkCompletedWithWrappedCancellationException(h1);
2048 +        checkCompletedWithWrappedCancellationException(h2);
2049 +        checkCompletedWithWrappedCancellationException(h3);
2050 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2051      }}
2052  
2053      /**
2054 <     * runAfterEither result completes normally after normal completion
2650 <     * of either source
2054 >     * acceptEither result completes exceptionally if action does
2055       */
2056 <    public void testRunAfterEither_normalCompletion1() {
2056 >    public void testAcceptEither_actionFailed() {
2057          for (ExecutionMode m : ExecutionMode.values())
2058          for (Integer v1 : new Integer[] { 1, null })
2059          for (Integer v2 : new Integer[] { 2, null })
2060      {
2061          final CompletableFuture<Integer> f = new CompletableFuture<>();
2062          final CompletableFuture<Integer> g = new CompletableFuture<>();
2063 <        final Noop r = new Noop();
2064 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2063 >        final FailingConsumer[] rs = new FailingConsumer[6];
2064 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2065  
2066 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2067 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2068          f.complete(v1);
2069 <        checkCompletedNormally(h, null);
2070 <        assertEquals(1, r.invocationCount);
2069 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2070 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2071 >        checkCompletedWithWrappedCFException(h0);
2072 >        checkCompletedWithWrappedCFException(h1);
2073 >        checkCompletedWithWrappedCFException(h2);
2074 >        checkCompletedWithWrappedCFException(h3);
2075 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2076 >
2077          g.complete(v2);
2078  
2079 <        checkCompletedNormally(f, v1);
2080 <        checkCompletedNormally(g, v2);
2081 <        checkCompletedNormally(h, null);
2670 <        assertEquals(1, r.invocationCount);
2671 <    }}
2079 >        // unspecified behavior - both source completions available
2080 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2081 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2082  
2083 <    public void testRunAfterEither_normalCompletion2() {
2084 <        for (ExecutionMode m : ExecutionMode.values())
2085 <        for (Integer v1 : new Integer[] { 1, null })
2086 <        for (Integer v2 : new Integer[] { 2, null })
2087 <    {
2088 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2679 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2680 <        final Noop r = new Noop();
2681 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2682 <
2683 <        g.complete(v2);
2684 <        checkCompletedNormally(h, null);
2685 <        assertEquals(1, r.invocationCount);
2686 <        f.complete(v1);
2083 >        checkCompletedWithWrappedCFException(h4);
2084 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2085 >                   Objects.equals(v2, rs[4].value));
2086 >        checkCompletedWithWrappedCFException(h5);
2087 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2088 >                   Objects.equals(v2, rs[5].value));
2089  
2090          checkCompletedNormally(f, v1);
2091          checkCompletedNormally(g, v2);
2092 <        checkCompletedNormally(h, null);
2691 <        assertEquals(1, r.invocationCount);
2692 <        }}
2092 >    }}
2093  
2094 <    public void testRunAfterEither_normalCompletion3() {
2094 >    /**
2095 >     * runAfterEither result completes normally after normal completion
2096 >     * of either source
2097 >     */
2098 >    public void testRunAfterEither_normalCompletion() {
2099          for (ExecutionMode m : ExecutionMode.values())
2100          for (Integer v1 : new Integer[] { 1, null })
2101          for (Integer v2 : new Integer[] { 2, null })
2102      {
2103          final CompletableFuture<Integer> f = new CompletableFuture<>();
2104          final CompletableFuture<Integer> g = new CompletableFuture<>();
2105 <        final Noop r = new Noop();
2105 >        final Noop[] rs = new Noop[6];
2106 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2107  
2108 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2109 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2110 +        checkIncomplete(h0);
2111 +        checkIncomplete(h1);
2112 +        rs[0].assertNotInvoked();
2113 +        rs[1].assertNotInvoked();
2114          f.complete(v1);
2115 +        checkCompletedNormally(h0, null);
2116 +        checkCompletedNormally(h1, null);
2117 +        rs[0].assertInvoked();
2118 +        rs[1].assertInvoked();
2119 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2120 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2121 +        checkCompletedNormally(h2, null);
2122 +        checkCompletedNormally(h3, null);
2123 +        rs[2].assertInvoked();
2124 +        rs[3].assertInvoked();
2125 +
2126          g.complete(v2);
2705        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2127  
2128 <        checkCompletedNormally(h, null);
2128 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2129 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2130 >
2131          checkCompletedNormally(f, v1);
2132          checkCompletedNormally(g, v2);
2133 <        assertEquals(1, r.invocationCount);
2133 >        checkCompletedNormally(h0, null);
2134 >        checkCompletedNormally(h1, null);
2135 >        checkCompletedNormally(h2, null);
2136 >        checkCompletedNormally(h3, null);
2137 >        checkCompletedNormally(h4, null);
2138 >        checkCompletedNormally(h5, null);
2139 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2140      }}
2141  
2142      /**
2143       * runAfterEither result completes exceptionally after exceptional
2144       * completion of either source
2145       */
2146 <    public void testRunAfterEither_exceptionalCompletion1() {
2146 >    public void testRunAfterEither_exceptionalCompletion() {
2147          for (ExecutionMode m : ExecutionMode.values())
2148          for (Integer v1 : new Integer[] { 1, null })
2149      {
2150          final CompletableFuture<Integer> f = new CompletableFuture<>();
2151          final CompletableFuture<Integer> g = new CompletableFuture<>();
2723        final Noop r = new Noop();
2724        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2152          final CFException ex = new CFException();
2153 +        final Noop[] rs = new Noop[6];
2154 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2155  
2156 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2157 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2158 +        checkIncomplete(h0);
2159 +        checkIncomplete(h1);
2160 +        rs[0].assertNotInvoked();
2161 +        rs[1].assertNotInvoked();
2162          f.completeExceptionally(ex);
2163 <        checkCompletedWithWrappedCFException(h, ex);
2164 <        g.complete(v1);
2165 <
2166 <        assertEquals(0, r.invocationCount);
2167 <        checkCompletedNormally(g, v1);
2168 <        checkCompletedWithWrappedCFException(f, ex);
2734 <        checkCompletedWithWrappedCFException(h, ex);
2735 <    }}
2736 <
2737 <    public void testRunAfterEither_exceptionalCompletion2() {
2738 <        for (ExecutionMode m : ExecutionMode.values())
2739 <        for (Integer v1 : new Integer[] { 1, null })
2740 <    {
2741 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2742 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2743 <        final Noop r = new Noop();
2744 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2745 <        final CFException ex = new CFException();
2746 <
2747 <        g.completeExceptionally(ex);
2748 <        checkCompletedWithWrappedCFException(h, ex);
2749 <        f.complete(v1);
2750 <
2751 <        assertEquals(0, r.invocationCount);
2752 <        checkCompletedNormally(f, v1);
2753 <        checkCompletedWithWrappedCFException(g, ex);
2754 <        checkCompletedWithWrappedCFException(h, ex);
2755 <    }}
2756 <
2757 <    public void testRunAfterEither_exceptionalCompletion3() {
2758 <        for (ExecutionMode m : ExecutionMode.values())
2759 <        for (Integer v1 : new Integer[] { 1, null })
2760 <    {
2761 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2762 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2763 <        final Noop r = new Noop();
2764 <        final CFException ex = new CFException();
2163 >        checkCompletedWithWrappedCFException(h0, ex);
2164 >        checkCompletedWithWrappedCFException(h1, ex);
2165 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2166 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2167 >        checkCompletedWithWrappedCFException(h2, ex);
2168 >        checkCompletedWithWrappedCFException(h3, ex);
2169  
2170 <        g.completeExceptionally(ex);
2767 <        f.complete(v1);
2768 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2170 >        g.complete(v1);
2171  
2172 <        // unspecified behavior
2173 <        Integer v;
2172 >        // unspecified behavior - both source completions available
2173 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2174 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2175          try {
2176 <            assertNull(h.join());
2177 <            assertEquals(1, r.invocationCount);
2176 >            assertNull(h4.join());
2177 >            rs[4].assertInvoked();
2178          } catch (CompletionException ok) {
2179 <            checkCompletedWithWrappedCFException(h, ex);
2180 <            assertEquals(0, r.invocationCount);
2179 >            checkCompletedWithWrappedCFException(h4, ex);
2180 >            rs[4].assertNotInvoked();
2181          }
2779
2780        checkCompletedWithWrappedCFException(g, ex);
2781        checkCompletedNormally(f, v1);
2782    }}
2783
2784    public void testRunAfterEither_exceptionalCompletion4() {
2785        for (ExecutionMode m : ExecutionMode.values())
2786        for (Integer v1 : new Integer[] { 1, null })
2787    {
2788        final CompletableFuture<Integer> f = new CompletableFuture<>();
2789        final CompletableFuture<Integer> g = new CompletableFuture<>();
2790        final Noop r = new Noop();
2791        final CFException ex = new CFException();
2792
2793        f.completeExceptionally(ex);
2794        g.complete(v1);
2795        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2796
2797        // unspecified behavior
2798        Integer v;
2182          try {
2183 <            assertNull(h.join());
2184 <            assertEquals(1, r.invocationCount);
2183 >            assertNull(h5.join());
2184 >            rs[5].assertInvoked();
2185          } catch (CompletionException ok) {
2186 <            checkCompletedWithWrappedCFException(h, ex);
2187 <            assertEquals(0, r.invocationCount);
2186 >            checkCompletedWithWrappedCFException(h5, ex);
2187 >            rs[5].assertNotInvoked();
2188          }
2189  
2190          checkCompletedWithWrappedCFException(f, ex);
2191          checkCompletedNormally(g, v1);
2192 <    }}
2193 <
2194 <    /**
2195 <     * runAfterEither result completes exceptionally if action does
2196 <     */
2197 <    public void testRunAfterEither_actionFailed1() {
2815 <        for (ExecutionMode m : ExecutionMode.values())
2816 <        for (Integer v1 : new Integer[] { 1, null })
2817 <        for (Integer v2 : new Integer[] { 2, null })
2818 <    {
2819 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2820 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2821 <        final FailingRunnable r = new FailingRunnable();
2822 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2823 <
2824 <        f.complete(v1);
2825 <        checkCompletedWithWrappedCFException(h);
2826 <        g.complete(v2);
2827 <        checkCompletedNormally(f, v1);
2828 <        checkCompletedNormally(g, v2);
2829 <    }}
2830 <
2831 <    public void testRunAfterEither_actionFailed2() {
2832 <        for (ExecutionMode m : ExecutionMode.values())
2833 <        for (Integer v1 : new Integer[] { 1, null })
2834 <        for (Integer v2 : new Integer[] { 2, null })
2835 <    {
2836 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2837 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2838 <        final FailingRunnable r = new FailingRunnable();
2839 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2840 <
2841 <        g.complete(v2);
2842 <        checkCompletedWithWrappedCFException(h);
2843 <        f.complete(v1);
2844 <        checkCompletedNormally(f, v1);
2845 <        checkCompletedNormally(g, v2);
2192 >        checkCompletedWithWrappedCFException(h0, ex);
2193 >        checkCompletedWithWrappedCFException(h1, ex);
2194 >        checkCompletedWithWrappedCFException(h2, ex);
2195 >        checkCompletedWithWrappedCFException(h3, ex);
2196 >        checkCompletedWithWrappedCFException(h4, ex);
2197 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2198      }}
2199  
2200      /**
2201       * runAfterEither result completes exceptionally if either source cancelled
2202       */
2203 <    public void testRunAfterEither_sourceCancelled1() {
2852 <        for (ExecutionMode m : ExecutionMode.values())
2853 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2854 <        for (Integer v1 : new Integer[] { 1, null })
2855 <    {
2856 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2858 <        final Noop r = new Noop();
2859 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2860 <
2861 <        assertTrue(f.cancel(mayInterruptIfRunning));
2862 <        checkCompletedWithWrappedCancellationException(h);
2863 <        g.complete(v1);
2864 <
2865 <        checkCancelled(f);
2866 <        assertEquals(0, r.invocationCount);
2867 <        checkCompletedNormally(g, v1);
2868 <        checkCompletedWithWrappedCancellationException(h);
2869 <    }}
2870 <
2871 <    public void testRunAfterEither_sourceCancelled2() {
2203 >    public void testRunAfterEither_sourceCancelled() {
2204          for (ExecutionMode m : ExecutionMode.values())
2205          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2206          for (Integer v1 : new Integer[] { 1, null })
2207      {
2208          final CompletableFuture<Integer> f = new CompletableFuture<>();
2209          final CompletableFuture<Integer> g = new CompletableFuture<>();
2210 <        final Noop r = new Noop();
2211 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2880 <
2881 <        assertTrue(g.cancel(mayInterruptIfRunning));
2882 <        checkCompletedWithWrappedCancellationException(h);
2883 <        f.complete(v1);
2884 <
2885 <        checkCancelled(g);
2886 <        assertEquals(0, r.invocationCount);
2887 <        checkCompletedNormally(f, v1);
2888 <        checkCompletedWithWrappedCancellationException(h);
2889 <    }}
2210 >        final Noop[] rs = new Noop[6];
2211 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2212  
2213 <    public void testRunAfterEither_sourceCancelled3() {
2214 <        for (ExecutionMode m : ExecutionMode.values())
2215 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2216 <        for (Integer v1 : new Integer[] { 1, null })
2217 <    {
2218 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2219 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2220 <        final Noop r = new Noop();
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.cancel(mayInterruptIfRunning);
2220 >        checkCompletedWithWrappedCancellationException(h0);
2221 >        checkCompletedWithWrappedCancellationException(h1);
2222 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2223 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2224 >        checkCompletedWithWrappedCancellationException(h2);
2225 >        checkCompletedWithWrappedCancellationException(h3);
2226  
2227 <        assertTrue(g.cancel(mayInterruptIfRunning));
2901 <        f.complete(v1);
2902 <        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 <            checkCompletedWithWrappedCancellationException(h);
2237 <            assertEquals(0, r.invocationCount);
2236 >            checkCompletedWithWrappedCancellationException(h4);
2237 >            rs[4].assertNotInvoked();
2238 >        }
2239 >        try {
2240 >            assertNull(h5.join());
2241 >            rs[5].assertInvoked();
2242 >        } catch (CompletionException ok) {
2243 >            checkCompletedWithWrappedCancellationException(h5);
2244 >            rs[5].assertNotInvoked();
2245          }
2246  
2247 <        checkCancelled(g);
2248 <        checkCompletedNormally(f, v1);
2247 >        checkCancelled(f);
2248 >        checkCompletedNormally(g, v1);
2249 >        checkCompletedWithWrappedCancellationException(h0);
2250 >        checkCompletedWithWrappedCancellationException(h1);
2251 >        checkCompletedWithWrappedCancellationException(h2);
2252 >        checkCompletedWithWrappedCancellationException(h3);
2253 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2254      }}
2255  
2256 <    public void testRunAfterEither_sourceCancelled4() {
2256 >    /**
2257 >     * runAfterEither result completes exceptionally if action does
2258 >     */
2259 >    public void testRunAfterEither_actionFailed() {
2260          for (ExecutionMode m : ExecutionMode.values())
2920        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2261          for (Integer v1 : new Integer[] { 1, null })
2262 +        for (Integer v2 : new Integer[] { 2, null })
2263      {
2264          final CompletableFuture<Integer> f = new CompletableFuture<>();
2265          final CompletableFuture<Integer> g = new CompletableFuture<>();
2266 <        final Noop r = new Noop();
2266 >        final FailingRunnable[] rs = new FailingRunnable[6];
2267 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2268  
2269 <        assertTrue(f.cancel(mayInterruptIfRunning));
2270 <        g.complete(v1);
2271 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2272 <
2273 <        // unspecified behavior
2274 <        Integer v;
2275 <        try {
2276 <            assertNull(h.join());
2277 <            assertEquals(1, r.invocationCount);
2278 <        } catch (CompletionException ok) {
2279 <            checkCompletedWithWrappedCancellationException(h);
2280 <            assertEquals(0, r.invocationCount);
2281 <        }
2269 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2270 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2271 >        f.complete(v1);
2272 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2273 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2274 >        checkCompletedWithWrappedCFException(h0);
2275 >        checkCompletedWithWrappedCFException(h1);
2276 >        checkCompletedWithWrappedCFException(h2);
2277 >        checkCompletedWithWrappedCFException(h3);
2278 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2279 >        g.complete(v2);
2280 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2281 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2282 >        checkCompletedWithWrappedCFException(h4);
2283 >        checkCompletedWithWrappedCFException(h5);
2284  
2285 <        checkCancelled(f);
2286 <        checkCompletedNormally(g, v1);
2285 >        checkCompletedNormally(f, v1);
2286 >        checkCompletedNormally(g, v2);
2287 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2288      }}
2289  
2290      /**
# Line 2951 | Line 2296 | public class CompletableFutureTest exten
2296          for (Integer v1 : new Integer[] { 1, null })
2297      {
2298          final CompletableFuture<Integer> f = new CompletableFuture<>();
2299 <        final CompletableFutureInc r = new CompletableFutureInc();
2299 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2300          if (!createIncomplete) f.complete(v1);
2301 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2301 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2302          if (createIncomplete) f.complete(v1);
2303  
2304          checkCompletedNormally(g, inc(v1));
2305          checkCompletedNormally(f, v1);
2306 <        assertEquals(1, r.invocationCount);
2306 >        r.assertInvoked();
2307      }}
2308  
2309      /**
# Line 2970 | Line 2315 | public class CompletableFutureTest exten
2315          for (boolean createIncomplete : new boolean[] { true, false })
2316      {
2317          final CFException ex = new CFException();
2318 <        final CompletableFutureInc r = new CompletableFutureInc();
2318 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2319          final CompletableFuture<Integer> f = new CompletableFuture<>();
2320          if (!createIncomplete) f.completeExceptionally(ex);
2321 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2321 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2322          if (createIncomplete) f.completeExceptionally(ex);
2323  
2324          checkCompletedWithWrappedCFException(g, ex);
2325          checkCompletedWithWrappedCFException(f, ex);
2326 <        assertEquals(0, r.invocationCount);
2326 >        r.assertNotInvoked();
2327      }}
2328  
2329      /**
# Line 2991 | Line 2336 | public class CompletableFutureTest exten
2336      {
2337          final CompletableFuture<Integer> f = new CompletableFuture<>();
2338          final FailingCompletableFutureFunction r
2339 <            = new FailingCompletableFutureFunction();
2339 >            = new FailingCompletableFutureFunction(m);
2340          if (!createIncomplete) f.complete(v1);
2341 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2341 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2342          if (createIncomplete) f.complete(v1);
2343  
2344          checkCompletedWithWrappedCFException(g);
# Line 3009 | Line 2354 | public class CompletableFutureTest exten
2354          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2355      {
2356          final CompletableFuture<Integer> f = new CompletableFuture<>();
2357 <        final CompletableFutureInc r = new CompletableFutureInc();
2357 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2358          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2359 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2359 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2360          if (createIncomplete) {
2361              checkIncomplete(g);
2362              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 3038 | Line 2383 | public class CompletableFutureTest exten
2383       */
2384      public void testAllOf_normal() throws Exception {
2385          for (int k = 1; k < 20; ++k) {
2386 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2386 >            CompletableFuture<Integer>[] fs
2387 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2388              for (int i = 0; i < k; ++i)
2389                  fs[i] = new CompletableFuture<>();
2390              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3052 | Line 2398 | public class CompletableFutureTest exten
2398          }
2399      }
2400  
2401 +    public void testAllOf_backwards() throws Exception {
2402 +        for (int k = 1; k < 20; ++k) {
2403 +            CompletableFuture<Integer>[] fs
2404 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2405 +            for (int i = 0; i < k; ++i)
2406 +                fs[i] = new CompletableFuture<>();
2407 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2408 +            for (int i = k - 1; i >= 0; i--) {
2409 +                checkIncomplete(f);
2410 +                checkIncomplete(CompletableFuture.allOf(fs));
2411 +                fs[i].complete(one);
2412 +            }
2413 +            checkCompletedNormally(f, null);
2414 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2415 +        }
2416 +    }
2417 +
2418      /**
2419       * anyOf(no component futures) returns an incomplete future
2420       */
# Line 3110 | Line 2473 | public class CompletableFutureTest exten
2473          Runnable[] throwingActions = {
2474              () -> CompletableFuture.supplyAsync(null),
2475              () -> CompletableFuture.supplyAsync(null, exec),
2476 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2476 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2477  
2478              () -> CompletableFuture.runAsync(null),
2479              () -> CompletableFuture.runAsync(null, exec),
# Line 3183 | Line 2546 | public class CompletableFutureTest exten
2546  
2547              () -> f.thenCompose(null),
2548              () -> f.thenComposeAsync(null),
2549 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2549 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2550              () -> f.thenComposeAsync(null, exec),
2551  
2552              () -> f.exceptionally(null),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines