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.53 by jsr166, Mon Jun 2 20:20:47 2014 UTC vs.
Revision 1.69 by jsr166, Fri Jun 6 19:39:50 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      /**
# Line 1280 | Line 1372 | public class CompletableFutureTest exten
1372          final CompletableFuture<Integer> f = new CompletableFuture<>();
1373          final CompletableFuture<Integer> g = new CompletableFuture<>();
1374          final CFException ex = new CFException();
1375 <        final SubtractFunction r = new SubtractFunction();
1375 >        final SubtractFunction r = new SubtractFunction(m);
1376  
1377          (fFirst ? f : g).complete(v1);
1378          if (!createIncomplete)
# Line 1292 | Line 1384 | public class CompletableFutureTest exten
1384          }
1385  
1386          checkCompletedWithWrappedCFException(h, ex);
1387 <        assertEquals(0, r.invocationCount);
1387 >        r.assertNotInvoked();
1388          checkCompletedNormally(fFirst ? f : g, v1);
1389          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1390      }}
1391  
1392      /**
1301     * thenCombine result completes exceptionally if action does
1302     */
1303    public void testThenCombine_actionFailed() {
1304        for (ExecutionMode m : ExecutionMode.values())
1305        for (boolean fFirst : new boolean[] { true, false })
1306        for (Integer v1 : new Integer[] { 1, null })
1307        for (Integer v2 : new Integer[] { 2, null })
1308    {
1309        final CompletableFuture<Integer> f = new CompletableFuture<>();
1310        final CompletableFuture<Integer> g = new CompletableFuture<>();
1311        final FailingBiFunction r = new FailingBiFunction();
1312        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1313
1314        if (fFirst) {
1315            f.complete(v1);
1316            g.complete(v2);
1317        } else {
1318            g.complete(v2);
1319            f.complete(v1);
1320        }
1321
1322        checkCompletedWithWrappedCFException(h);
1323        checkCompletedNormally(f, v1);
1324        checkCompletedNormally(g, v2);
1325    }}
1326
1327    /**
1393       * thenCombine result completes exceptionally if either source cancelled
1394       */
1395      public void testThenCombine_sourceCancelled() {
# Line 1336 | Line 1401 | public class CompletableFutureTest exten
1401      {
1402          final CompletableFuture<Integer> f = new CompletableFuture<>();
1403          final CompletableFuture<Integer> g = new CompletableFuture<>();
1404 <        final SubtractFunction r = new SubtractFunction();
1404 >        final SubtractFunction r = new SubtractFunction(m);
1405  
1406          (fFirst ? f : g).complete(v1);
1407          if (!createIncomplete)
# Line 1349 | Line 1414 | public class CompletableFutureTest exten
1414  
1415          checkCompletedWithWrappedCancellationException(h);
1416          checkCancelled(!fFirst ? f : g);
1417 <        assertEquals(0, r.invocationCount);
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_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(m);
1433 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1434 +
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);
1445 +        checkCompletedNormally(g, v2);
1446 +    }}
1447 +
1448 +    /**
1449       * thenAcceptBoth result completes normally after normal
1450       * completion of sources
1451       */
# Line 1366 | Line 1458 | public class CompletableFutureTest exten
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          if (fFirst) f.complete(v1); else g.complete(v2);
1464          if (!createIncomplete)
# Line 1374 | Line 1466 | public class CompletableFutureTest exten
1466          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1467          if (createIncomplete) {
1468              checkIncomplete(h);
1469 <            assertEquals(0, r.invocationCount);
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 1397 | Line 1489 | public class CompletableFutureTest exten
1489          final CompletableFuture<Integer> f = new CompletableFuture<>();
1490          final CompletableFuture<Integer> g = new CompletableFuture<>();
1491          final CFException ex = new CFException();
1492 <        final SubtractAction r = new SubtractAction();
1492 >        final SubtractAction r = new SubtractAction(m);
1493  
1494          (fFirst ? f : g).complete(v1);
1495          if (!createIncomplete)
# Line 1409 | Line 1501 | public class CompletableFutureTest exten
1501          }
1502  
1503          checkCompletedWithWrappedCFException(h, ex);
1504 <        assertEquals(0, r.invocationCount);
1504 >        r.assertNotInvoked();
1505          checkCompletedNormally(fFirst ? f : g, v1);
1506          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1507      }}
1508  
1509      /**
1418     * thenAcceptBoth result completes exceptionally if action does
1419     */
1420    public void testThenAcceptBoth_actionFailed() {
1421        for (ExecutionMode m : ExecutionMode.values())
1422        for (boolean fFirst : new boolean[] { true, false })
1423        for (Integer v1 : new Integer[] { 1, null })
1424        for (Integer v2 : new Integer[] { 2, null })
1425    {
1426        final CompletableFuture<Integer> f = new CompletableFuture<>();
1427        final CompletableFuture<Integer> g = new CompletableFuture<>();
1428        final FailingBiConsumer r = new FailingBiConsumer();
1429        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1430
1431        if (fFirst) {
1432            f.complete(v1);
1433            g.complete(v2);
1434        } else {
1435            g.complete(v2);
1436            f.complete(v1);
1437        }
1438
1439        checkCompletedWithWrappedCFException(h);
1440        checkCompletedNormally(f, v1);
1441        checkCompletedNormally(g, v2);
1442    }}
1443
1444    /**
1510       * thenAcceptBoth result completes exceptionally if either source cancelled
1511       */
1512      public void testThenAcceptBoth_sourceCancelled() {
# Line 1453 | Line 1518 | public class CompletableFutureTest exten
1518      {
1519          final CompletableFuture<Integer> f = new CompletableFuture<>();
1520          final CompletableFuture<Integer> g = new CompletableFuture<>();
1521 <        final SubtractAction r = new SubtractAction();
1521 >        final SubtractAction r = new SubtractAction(m);
1522  
1523          (fFirst ? f : g).complete(v1);
1524          if (!createIncomplete)
# Line 1466 | Line 1531 | public class CompletableFutureTest exten
1531  
1532          checkCompletedWithWrappedCancellationException(h);
1533          checkCancelled(!fFirst ? f : g);
1534 <        assertEquals(0, r.invocationCount);
1534 >        r.assertNotInvoked();
1535          checkCompletedNormally(fFirst ? f : g, v1);
1536      }}
1537  
1538      /**
1539 <     * runAfterBoth result completes normally after normal
1475 <     * completion of sources
1539 >     * thenAcceptBoth result completes exceptionally if action does
1540       */
1541 <    public void testRunAfterBoth_normalCompletion1() {
1478 <        for (ExecutionMode m : ExecutionMode.values())
1479 <        for (Integer v1 : new Integer[] { 1, null })
1480 <        for (Integer v2 : new Integer[] { 2, null })
1481 <    {
1482 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1483 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1484 <        final Noop r = new Noop();
1485 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1486 <
1487 <        f.complete(v1);
1488 <        checkIncomplete(h);
1489 <        assertEquals(0, r.invocationCount);
1490 <        g.complete(v2);
1491 <
1492 <        checkCompletedNormally(h, null);
1493 <        assertEquals(1, r.invocationCount);
1494 <        checkCompletedNormally(f, v1);
1495 <        checkCompletedNormally(g, v2);
1496 <    }}
1497 <
1498 <    public void testRunAfterBoth_normalCompletion2() {
1499 <        for (ExecutionMode m : ExecutionMode.values())
1500 <        for (Integer v1 : new Integer[] { 1, null })
1501 <        for (Integer v2 : new Integer[] { 2, null })
1502 <    {
1503 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1504 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1505 <        final Noop r = new Noop();
1506 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1507 <
1508 <        g.complete(v2);
1509 <        checkIncomplete(h);
1510 <        assertEquals(0, r.invocationCount);
1511 <        f.complete(v1);
1512 <
1513 <        checkCompletedNormally(h, null);
1514 <        assertEquals(1, r.invocationCount);
1515 <        checkCompletedNormally(f, v1);
1516 <        checkCompletedNormally(g, v2);
1517 <    }}
1518 <
1519 <    public void testRunAfterBoth_normalCompletion3() {
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 Noop r = new Noop();
1549 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1550 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551  
1552 <        g.complete(v2);
1553 <        f.complete(v1);
1554 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1552 >        if (fFirst) {
1553 >            f.complete(v1);
1554 >            g.complete(v2);
1555 >        } else {
1556 >            g.complete(v2);
1557 >            f.complete(v1);
1558 >        }
1559  
1560 <        checkCompletedNormally(h, null);
1533 <        assertEquals(1, r.invocationCount);
1560 >        checkCompletedWithWrappedCFException(h);
1561          checkCompletedNormally(f, v1);
1562          checkCompletedNormally(g, v2);
1563      }}
1564  
1565 <    public void testRunAfterBoth_normalCompletion4() {
1565 >    /**
1566 >     * runAfterBoth result completes normally after normal
1567 >     * completion of sources
1568 >     */
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 1558 | Line 1597 | public class CompletableFutureTest exten
1597       * runAfterBoth result completes exceptionally after exceptional
1598       * completion of either source
1599       */
1600 <    public void testRunAfterBoth_exceptionalCompletion1() {
1562 <        for (ExecutionMode m : ExecutionMode.values())
1563 <        for (Integer v1 : new Integer[] { 1, null })
1564 <    {
1565 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1566 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1567 <        final Noop r = new Noop();
1568 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1569 <        final CFException ex = new CFException();
1570 <
1571 <        f.completeExceptionally(ex);
1572 <        checkIncomplete(h);
1573 <        g.complete(v1);
1574 <
1575 <        checkCompletedWithWrappedCFException(h, ex);
1576 <        checkCompletedWithWrappedCFException(f, ex);
1577 <        assertEquals(0, r.invocationCount);
1578 <        checkCompletedNormally(g, v1);
1579 <    }}
1580 <
1581 <    public void testRunAfterBoth_exceptionalCompletion2() {
1582 <        for (ExecutionMode m : ExecutionMode.values())
1583 <        for (Integer v1 : new Integer[] { 1, null })
1584 <    {
1585 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1586 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1587 <        final Noop r = new Noop();
1588 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1589 <        final CFException ex = new CFException();
1590 <
1591 <        g.completeExceptionally(ex);
1592 <        checkIncomplete(h);
1593 <        f.complete(v1);
1594 <
1595 <        checkCompletedWithWrappedCFException(h, ex);
1596 <        checkCompletedWithWrappedCFException(g, ex);
1597 <        assertEquals(0, r.invocationCount);
1598 <        checkCompletedNormally(f, v1);
1599 <    }}
1600 <
1601 <    public void testRunAfterBoth_exceptionalCompletion3() {
1602 <        for (ExecutionMode m : ExecutionMode.values())
1603 <        for (Integer v1 : new Integer[] { 1, null })
1604 <    {
1605 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1606 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1607 <        final Noop r = new Noop();
1608 <        final CFException ex = new CFException();
1609 <
1610 <        g.completeExceptionally(ex);
1611 <        f.complete(v1);
1612 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1613 <
1614 <        checkCompletedWithWrappedCFException(h, ex);
1615 <        checkCompletedWithWrappedCFException(g, ex);
1616 <        assertEquals(0, r.invocationCount);
1617 <        checkCompletedNormally(f, v1);
1618 <    }}
1619 <
1620 <    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<>();
1626        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);
1637 <    }}
1638 <
1639 <    /**
1640 <     * runAfterBoth result completes exceptionally if action does
1641 <     */
1642 <    public void testRunAfterBoth_actionFailed1() {
1643 <        for (ExecutionMode m : ExecutionMode.values())
1644 <        for (Integer v1 : new Integer[] { 1, null })
1645 <        for (Integer v2 : new Integer[] { 2, null })
1646 <    {
1647 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1648 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1649 <        final FailingRunnable r = new FailingRunnable();
1650 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1651 <
1652 <        f.complete(v1);
1653 <        checkIncomplete(h);
1654 <        g.complete(v2);
1655 <
1656 <        checkCompletedWithWrappedCFException(h);
1657 <        checkCompletedNormally(f, v1);
1658 <        checkCompletedNormally(g, v2);
1659 <    }}
1660 <
1661 <    public void testRunAfterBoth_actionFailed2() {
1662 <        for (ExecutionMode m : ExecutionMode.values())
1663 <        for (Integer v1 : new Integer[] { 1, null })
1664 <        for (Integer v2 : new Integer[] { 2, null })
1665 <    {
1666 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final FailingRunnable r = new FailingRunnable();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 <
1671 <        g.complete(v2);
1672 <        checkIncomplete(h);
1673 <        f.complete(v1);
1674 <
1675 <        checkCompletedWithWrappedCFException(h);
1676 <        checkCompletedNormally(f, v1);
1677 <        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();
1691 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1638 >        final Noop r = new Noop(m);
1639  
1693        assertTrue(f.cancel(mayInterruptIfRunning));
1694        checkIncomplete(h);
1695        g.complete(v1);
1640  
1641 <        checkCompletedWithWrappedCancellationException(h);
1642 <        checkCancelled(f);
1643 <        assertEquals(0, r.invocationCount);
1700 <        checkCompletedNormally(g, v1);
1701 <    }}
1702 <
1703 <    public void testRunAfterBoth_sourceCancelled2() {
1704 <        for (ExecutionMode m : ExecutionMode.values())
1705 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1706 <        for (Integer v1 : new Integer[] { 1, null })
1707 <    {
1708 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1709 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 <        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);
1738 <        assertEquals(0, r.invocationCount);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682          checkCompletedNormally(f, v1);
1683 <    }}
1741 <
1742 <    public void testRunAfterBoth_sourceCancelled4() {
1743 <        for (ExecutionMode m : ExecutionMode.values())
1744 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1745 <        for (Integer v1 : new Integer[] { 1, null })
1746 <    {
1747 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1748 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1749 <        final Noop r = new Noop();
1750 <
1751 <        assertTrue(f.cancel(mayInterruptIfRunning));
1752 <        g.complete(v1);
1753 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1754 <
1755 <        checkCompletedWithWrappedCancellationException(h);
1756 <        checkCancelled(f);
1757 <        assertEquals(0, r.invocationCount);
1758 <        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 })
1788 <    {
1789 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1790 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1791 <        final IncFunction r = new IncFunction();
1792 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1793 <
1794 <        g.complete(v2);
1795 <        checkCompletedNormally(h, inc(v2));
1796 <        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())
1805 <        for (Integer v1 : new Integer[] { 1, null })
1806 <        for (Integer v2 : new Integer[] { 2, null })
1807 <    {
1808 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1809 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1810 <        final IncFunction r = new IncFunction();
1811 <
1812 <        f.complete(v1);
1813 <        g.complete(v2);
1814 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1815 <
1816 <        checkCompletedNormally(f, v1);
1817 <        checkCompletedNormally(g, v2);
1818 <
1819 <        // unspecified behavior
1820 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1821 <                   Objects.equals(h.join(), inc(v2)));
1822 <        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<>();
1835        final IncFunction r = new IncFunction();
1836        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);
1846 <        checkCompletedWithWrappedCFException(h, ex);
1847 <    }}
1848 <
1849 <    public void testApplyToEither_exceptionalCompletion2() {
1850 <        for (ExecutionMode m : ExecutionMode.values())
1851 <        for (Integer v1 : new Integer[] { 1, null })
1852 <    {
1853 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1854 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1855 <        final IncFunction r = new IncFunction();
1856 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1857 <        final CFException ex = new CFException();
1858 <
1859 <        g.completeExceptionally(ex);
1860 <        checkCompletedWithWrappedCFException(h, ex);
1861 <        f.complete(v1);
1862 <
1863 <        assertEquals(0, r.invocationCount);
1864 <        checkCompletedNormally(f, v1);
1865 <        checkCompletedWithWrappedCFException(g, ex);
1866 <        checkCompletedWithWrappedCFException(h, ex);
1867 <    }}
1868 <
1869 <    public void testApplyToEither_exceptionalCompletion3() {
1870 <        for (ExecutionMode m : ExecutionMode.values())
1871 <        for (Integer v1 : new Integer[] { 1, null })
1872 <    {
1873 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1874 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1875 <        final IncFunction r = new IncFunction();
1876 <        final CFException ex = new CFException();
1877 <
1878 <        g.completeExceptionally(ex);
1879 <        f.complete(v1);
1880 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1881 <
1882 <        // unspecified behavior
1883 <        Integer v;
1763 >        // unspecified behavior - both source completions available
1764 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1765 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1766          try {
1767 <            assertEquals(inc(v1), h.join());
1768 <            assertEquals(1, r.invocationCount);
1767 >            assertEquals(inc(v1), h4.join());
1768 >            rs[4].assertValue(inc(v1));
1769          } catch (CompletionException ok) {
1770 <            checkCompletedWithWrappedCFException(h, ex);
1771 <            assertEquals(0, r.invocationCount);
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772          }
1891
1892        checkCompletedWithWrappedCFException(g, ex);
1893        checkCompletedNormally(f, v1);
1894    }}
1895
1896    public void testApplyToEither_exceptionalCompletion4() {
1897        for (ExecutionMode m : ExecutionMode.values())
1898        for (Integer v1 : new Integer[] { 1, null })
1899    {
1900        final CompletableFuture<Integer> f = new CompletableFuture<>();
1901        final CompletableFuture<Integer> g = new CompletableFuture<>();
1902        final IncFunction r = new IncFunction();
1903        final CFException ex = new CFException();
1904
1905        f.completeExceptionally(ex);
1906        g.complete(v1);
1907        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1908
1909        // unspecified behavior
1910        Integer v;
1773          try {
1774 <            assertEquals(inc(v1), h.join());
1775 <            assertEquals(1, r.invocationCount);
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertValue(inc(v1));
1776          } catch (CompletionException ok) {
1777 <            checkCompletedWithWrappedCFException(h, ex);
1778 <            assertEquals(0, r.invocationCount);
1777 >            checkCompletedWithWrappedCFException(h5, ex);
1778 >            rs[5].assertNotInvoked();
1779          }
1780  
1781          checkCompletedWithWrappedCFException(f, ex);
1782          checkCompletedNormally(g, v1);
1783 +        checkCompletedWithWrappedCFException(h0, ex);
1784 +        checkCompletedWithWrappedCFException(h1, ex);
1785 +        checkCompletedWithWrappedCFException(h2, ex);
1786 +        checkCompletedWithWrappedCFException(h3, ex);
1787 +        checkCompletedWithWrappedCFException(h4, ex);
1788 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1789      }}
1790  
1791 <    /**
1924 <     * applyToEither result completes exceptionally if action does
1925 <     */
1926 <    public void testApplyToEither_actionFailed1() {
1791 >    public void testApplyToEither_exceptionalCompletion2() {
1792          for (ExecutionMode m : ExecutionMode.values())
1793 +        for (boolean fFirst : new boolean[] { true, false })
1794          for (Integer v1 : new Integer[] { 1, null })
1929        for (Integer v2 : new Integer[] { 2, null })
1795      {
1796          final CompletableFuture<Integer> f = new CompletableFuture<>();
1797          final CompletableFuture<Integer> g = new CompletableFuture<>();
1798 <        final FailingFunction r = new FailingFunction();
1799 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1798 >        final CFException ex = new CFException();
1799 >        final IncFunction[] rs = new IncFunction[6];
1800 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1801  
1802 <        f.complete(v1);
1803 <        checkCompletedWithWrappedCFException(h);
1804 <        g.complete(v2);
1805 <        checkCompletedNormally(f, v1);
1806 <        checkCompletedNormally(g, v2);
1807 <    }}
1802 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1803 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1804 >        if (fFirst) {
1805 >            f.complete(v1);
1806 >            g.completeExceptionally(ex);
1807 >        } else {
1808 >            g.completeExceptionally(ex);
1809 >            f.complete(v1);
1810 >        }
1811 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1812 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1813  
1814 <    public void testApplyToEither_actionFailed2() {
1815 <        for (ExecutionMode m : ExecutionMode.values())
1816 <        for (Integer v1 : new Integer[] { 1, null })
1817 <        for (Integer v2 : new Integer[] { 2, null })
1818 <    {
1819 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1820 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1821 <        final FailingFunction r = new FailingFunction();
1822 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1814 >        // unspecified behavior - both source completions available
1815 >        try {
1816 >            assertEquals(inc(v1), h0.join());
1817 >            rs[0].assertValue(inc(v1));
1818 >        } catch (CompletionException ok) {
1819 >            checkCompletedWithWrappedCFException(h0, ex);
1820 >            rs[0].assertNotInvoked();
1821 >        }
1822 >        try {
1823 >            assertEquals(inc(v1), h1.join());
1824 >            rs[1].assertValue(inc(v1));
1825 >        } catch (CompletionException ok) {
1826 >            checkCompletedWithWrappedCFException(h1, ex);
1827 >            rs[1].assertNotInvoked();
1828 >        }
1829 >        try {
1830 >            assertEquals(inc(v1), h2.join());
1831 >            rs[2].assertValue(inc(v1));
1832 >        } catch (CompletionException ok) {
1833 >            checkCompletedWithWrappedCFException(h2, ex);
1834 >            rs[2].assertNotInvoked();
1835 >        }
1836 >        try {
1837 >            assertEquals(inc(v1), h3.join());
1838 >            rs[3].assertValue(inc(v1));
1839 >        } catch (CompletionException ok) {
1840 >            checkCompletedWithWrappedCFException(h3, ex);
1841 >            rs[3].assertNotInvoked();
1842 >        }
1843  
1953        g.complete(v2);
1954        checkCompletedWithWrappedCFException(h);
1955        f.complete(v1);
1844          checkCompletedNormally(f, v1);
1845 <        checkCompletedNormally(g, v2);
1845 >        checkCompletedWithWrappedCFException(g, ex);
1846      }}
1847  
1848      /**
1849       * applyToEither result completes exceptionally if either source cancelled
1850       */
1851 <    public void testApplyToEither_sourceCancelled1() {
1851 >    public void testApplyToEither_sourceCancelled() {
1852          for (ExecutionMode m : ExecutionMode.values())
1853          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1854          for (Integer v1 : new Integer[] { 1, null })
1855      {
1856          final CompletableFuture<Integer> f = new CompletableFuture<>();
1857          final CompletableFuture<Integer> g = new CompletableFuture<>();
1858 <        final IncFunction r = new IncFunction();
1859 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1858 >        final IncFunction[] rs = new IncFunction[6];
1859 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1860  
1861 <        assertTrue(f.cancel(mayInterruptIfRunning));
1862 <        checkCompletedWithWrappedCancellationException(h);
1861 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1862 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1863 >        checkIncomplete(h0);
1864 >        checkIncomplete(h1);
1865 >        rs[0].assertNotInvoked();
1866 >        rs[1].assertNotInvoked();
1867 >        f.cancel(mayInterruptIfRunning);
1868 >        checkCompletedWithWrappedCancellationException(h0);
1869 >        checkCompletedWithWrappedCancellationException(h1);
1870 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1871 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1872 >        checkCompletedWithWrappedCancellationException(h2);
1873 >        checkCompletedWithWrappedCancellationException(h3);
1874          g.complete(v1);
1875  
1876 +        // unspecified behavior - both source completions available
1877 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1878 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1879 +        try {
1880 +            assertEquals(inc(v1), h4.join());
1881 +            rs[4].assertValue(inc(v1));
1882 +        } catch (CompletionException ok) {
1883 +            checkCompletedWithWrappedCancellationException(h4);
1884 +            rs[4].assertNotInvoked();
1885 +        }
1886 +        try {
1887 +            assertEquals(inc(v1), h5.join());
1888 +            rs[5].assertValue(inc(v1));
1889 +        } catch (CompletionException ok) {
1890 +            checkCompletedWithWrappedCancellationException(h5);
1891 +            rs[5].assertNotInvoked();
1892 +        }
1893 +
1894          checkCancelled(f);
1978        assertEquals(0, r.invocationCount);
1895          checkCompletedNormally(g, v1);
1896 <        checkCompletedWithWrappedCancellationException(h);
1896 >        checkCompletedWithWrappedCancellationException(h0);
1897 >        checkCompletedWithWrappedCancellationException(h1);
1898 >        checkCompletedWithWrappedCancellationException(h2);
1899 >        checkCompletedWithWrappedCancellationException(h3);
1900 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1901      }}
1902  
1903      public void testApplyToEither_sourceCancelled2() {
1904          for (ExecutionMode m : ExecutionMode.values())
1905          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1906 +        for (boolean fFirst : new boolean[] { true, false })
1907          for (Integer v1 : new Integer[] { 1, null })
1908      {
1909          final CompletableFuture<Integer> f = new CompletableFuture<>();
1910          final CompletableFuture<Integer> g = new CompletableFuture<>();
1911 <        final IncFunction r = new IncFunction();
1912 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1992 <
1993 <        assertTrue(g.cancel(mayInterruptIfRunning));
1994 <        checkCompletedWithWrappedCancellationException(h);
1995 <        f.complete(v1);
1996 <
1997 <        checkCancelled(g);
1998 <        assertEquals(0, r.invocationCount);
1999 <        checkCompletedNormally(f, v1);
2000 <        checkCompletedWithWrappedCancellationException(h);
2001 <    }}
2002 <
2003 <    public void testApplyToEither_sourceCancelled3() {
2004 <        for (ExecutionMode m : ExecutionMode.values())
2005 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2006 <        for (Integer v1 : new Integer[] { 1, null })
2007 <    {
2008 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2009 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2010 <        final IncFunction r = new IncFunction();
1911 >        final IncFunction[] rs = new IncFunction[6];
1912 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1913  
1914 <        assertTrue(g.cancel(mayInterruptIfRunning));
1915 <        f.complete(v1);
1916 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1914 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1915 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1916 >        if (fFirst) {
1917 >            f.complete(v1);
1918 >            g.cancel(mayInterruptIfRunning);
1919 >        } else {
1920 >            g.cancel(mayInterruptIfRunning);
1921 >            f.complete(v1);
1922 >        }
1923 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1924 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1925  
1926 <        // unspecified behavior
2017 <        Integer v;
1926 >        // unspecified behavior - both source completions available
1927          try {
1928 <            assertEquals(inc(v1), h.join());
1929 <            assertEquals(1, r.invocationCount);
1928 >            assertEquals(inc(v1), h0.join());
1929 >            rs[0].assertValue(inc(v1));
1930          } catch (CompletionException ok) {
1931 <            checkCompletedWithWrappedCancellationException(h);
1932 <            assertEquals(0, r.invocationCount);
1931 >            checkCompletedWithWrappedCancellationException(h0);
1932 >            rs[0].assertNotInvoked();
1933          }
2025
2026        checkCancelled(g);
2027        checkCompletedNormally(f, v1);
2028    }}
2029
2030    public void testApplyToEither_sourceCancelled4() {
2031        for (ExecutionMode m : ExecutionMode.values())
2032        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2033        for (Integer v1 : new Integer[] { 1, null })
2034    {
2035        final CompletableFuture<Integer> f = new CompletableFuture<>();
2036        final CompletableFuture<Integer> g = new CompletableFuture<>();
2037        final IncFunction r = new IncFunction();
2038
2039        assertTrue(f.cancel(mayInterruptIfRunning));
2040        g.complete(v1);
2041        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2042
2043        // unspecified behavior
2044        Integer v;
1934          try {
1935 <            assertEquals(inc(v1), h.join());
1936 <            assertEquals(1, r.invocationCount);
1935 >            assertEquals(inc(v1), h1.join());
1936 >            rs[1].assertValue(inc(v1));
1937          } catch (CompletionException ok) {
1938 <            checkCompletedWithWrappedCancellationException(h);
1939 <            assertEquals(0, r.invocationCount);
1938 >            checkCompletedWithWrappedCancellationException(h1);
1939 >            rs[1].assertNotInvoked();
1940 >        }
1941 >        try {
1942 >            assertEquals(inc(v1), h2.join());
1943 >            rs[2].assertValue(inc(v1));
1944 >        } catch (CompletionException ok) {
1945 >            checkCompletedWithWrappedCancellationException(h2);
1946 >            rs[2].assertNotInvoked();
1947 >        }
1948 >        try {
1949 >            assertEquals(inc(v1), h3.join());
1950 >            rs[3].assertValue(inc(v1));
1951 >        } catch (CompletionException ok) {
1952 >            checkCompletedWithWrappedCancellationException(h3);
1953 >            rs[3].assertNotInvoked();
1954          }
1955  
1956 <        checkCancelled(f);
1957 <        checkCompletedNormally(g, v1);
1956 >        checkCompletedNormally(f, v1);
1957 >        checkCancelled(g);
1958      }}
1959  
1960      /**
1961 <     * acceptEither result completes normally after normal completion
2059 <     * of either source
1961 >     * applyToEither result completes exceptionally if action does
1962       */
1963 <    public void testAcceptEither_normalCompletion1() {
1963 >    public void testApplyToEither_actionFailed() {
1964          for (ExecutionMode m : ExecutionMode.values())
1965          for (Integer v1 : new Integer[] { 1, null })
1966          for (Integer v2 : new Integer[] { 2, null })
1967      {
1968          final CompletableFuture<Integer> f = new CompletableFuture<>();
1969          final CompletableFuture<Integer> g = new CompletableFuture<>();
1970 <        final IncAction r = new IncAction();
1971 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1970 >        final FailingFunction[] rs = new FailingFunction[6];
1971 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1972  
1973 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1974 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1975          f.complete(v1);
1976 <        checkCompletedNormally(h, null);
1977 <        assertEquals(inc(v1), r.value);
1976 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1977 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1978 >        checkCompletedWithWrappedCFException(h0);
1979 >        checkCompletedWithWrappedCFException(h1);
1980 >        checkCompletedWithWrappedCFException(h2);
1981 >        checkCompletedWithWrappedCFException(h3);
1982 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1983 >
1984          g.complete(v2);
1985  
1986 <        checkCompletedNormally(f, v1);
1987 <        checkCompletedNormally(g, v2);
1988 <        checkCompletedNormally(h, null);
2079 <    }}
1986 >        // unspecified behavior - both source completions available
1987 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1988 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1989  
1990 <    public void testAcceptEither_normalCompletion2() {
1991 <        for (ExecutionMode m : ExecutionMode.values())
1992 <        for (Integer v1 : new Integer[] { 1, null })
1993 <        for (Integer v2 : new Integer[] { 2, null })
1994 <    {
1995 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2087 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2088 <        final IncAction r = new IncAction();
2089 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2090 <
2091 <        g.complete(v2);
2092 <        checkCompletedNormally(h, null);
2093 <        assertEquals(inc(v2), r.value);
2094 <        f.complete(v1);
1990 >        checkCompletedWithWrappedCFException(h4);
1991 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1992 >                   Objects.equals(v2, rs[4].value));
1993 >        checkCompletedWithWrappedCFException(h5);
1994 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1995 >                   Objects.equals(v2, rs[5].value));
1996  
1997          checkCompletedNormally(f, v1);
1998          checkCompletedNormally(g, v2);
2098        checkCompletedNormally(h, null);
1999      }}
2000  
2001 <    public void testAcceptEither_normalCompletion3() {
2001 >    /**
2002 >     * acceptEither result completes normally after normal completion
2003 >     * of either source
2004 >     */
2005 >    public void testAcceptEither_normalCompletion() {
2006          for (ExecutionMode m : ExecutionMode.values())
2007          for (Integer v1 : new Integer[] { 1, null })
2008          for (Integer v2 : new Integer[] { 2, null })
2009      {
2010          final CompletableFuture<Integer> f = new CompletableFuture<>();
2011          final CompletableFuture<Integer> g = new CompletableFuture<>();
2012 <        final IncAction r = new IncAction();
2012 >        final NoopConsumer[] rs = new NoopConsumer[6];
2013 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2014  
2015 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2016 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2017 +        checkIncomplete(h0);
2018 +        checkIncomplete(h1);
2019 +        rs[0].assertNotInvoked();
2020 +        rs[1].assertNotInvoked();
2021          f.complete(v1);
2022 +        checkCompletedNormally(h0, null);
2023 +        checkCompletedNormally(h1, null);
2024 +        rs[0].assertValue(v1);
2025 +        rs[1].assertValue(v1);
2026 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2027 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2028 +        checkCompletedNormally(h2, null);
2029 +        checkCompletedNormally(h3, null);
2030 +        rs[2].assertValue(v1);
2031 +        rs[3].assertValue(v1);
2032          g.complete(v2);
2112        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2033  
2034 <        checkCompletedNormally(h, null);
2034 >        // unspecified behavior - both source completions available
2035 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2036 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2037 >        checkCompletedNormally(h4, null);
2038 >        checkCompletedNormally(h5, null);
2039 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2040 >                   Objects.equals(v2, rs[4].value));
2041 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2042 >                   Objects.equals(v2, rs[5].value));
2043 >
2044          checkCompletedNormally(f, v1);
2045          checkCompletedNormally(g, v2);
2046 <
2047 <        // unspecified behavior
2048 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2049 <                   Objects.equals(r.value, inc(v2)));
2046 >        checkCompletedNormally(h0, null);
2047 >        checkCompletedNormally(h1, null);
2048 >        checkCompletedNormally(h2, null);
2049 >        checkCompletedNormally(h3, null);
2050 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2051      }}
2052  
2053      /**
2054       * acceptEither result completes exceptionally after exceptional
2055       * completion of either source
2056       */
2057 <    public void testAcceptEither_exceptionalCompletion1() {
2057 >    public void testAcceptEither_exceptionalCompletion() {
2058          for (ExecutionMode m : ExecutionMode.values())
2059          for (Integer v1 : new Integer[] { 1, null })
2060      {
2061          final CompletableFuture<Integer> f = new CompletableFuture<>();
2062          final CompletableFuture<Integer> g = new CompletableFuture<>();
2133        final IncAction r = new IncAction();
2134        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2063          final CFException ex = new CFException();
2064 +        final NoopConsumer[] rs = new NoopConsumer[6];
2065 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2066  
2067 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2068 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2069 +        checkIncomplete(h0);
2070 +        checkIncomplete(h1);
2071 +        rs[0].assertNotInvoked();
2072 +        rs[1].assertNotInvoked();
2073          f.completeExceptionally(ex);
2074 <        checkCompletedWithWrappedCFException(h, ex);
2075 <        g.complete(v1);
2076 <
2077 <        assertEquals(0, r.invocationCount);
2078 <        checkCompletedNormally(g, v1);
2079 <        checkCompletedWithWrappedCFException(f, ex);
2144 <        checkCompletedWithWrappedCFException(h, ex);
2145 <    }}
2146 <
2147 <    public void testAcceptEither_exceptionalCompletion2() {
2148 <        for (ExecutionMode m : ExecutionMode.values())
2149 <        for (Integer v1 : new Integer[] { 1, null })
2150 <    {
2151 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2152 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2153 <        final IncAction r = new IncAction();
2154 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2155 <        final CFException ex = new CFException();
2156 <
2157 <        g.completeExceptionally(ex);
2158 <        checkCompletedWithWrappedCFException(h, ex);
2159 <        f.complete(v1);
2074 >        checkCompletedWithWrappedCFException(h0, ex);
2075 >        checkCompletedWithWrappedCFException(h1, ex);
2076 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2077 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2078 >        checkCompletedWithWrappedCFException(h2, ex);
2079 >        checkCompletedWithWrappedCFException(h3, ex);
2080  
2081 <        assertEquals(0, r.invocationCount);
2162 <        checkCompletedNormally(f, v1);
2163 <        checkCompletedWithWrappedCFException(g, ex);
2164 <        checkCompletedWithWrappedCFException(h, ex);
2165 <    }}
2166 <
2167 <    public void testAcceptEither_exceptionalCompletion3() {
2168 <        for (ExecutionMode m : ExecutionMode.values())
2169 <        for (Integer v1 : new Integer[] { 1, null })
2170 <    {
2171 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2172 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2173 <        final IncAction r = new IncAction();
2174 <        final CFException ex = new CFException();
2175 <
2176 <        g.completeExceptionally(ex);
2177 <        f.complete(v1);
2178 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2081 >        g.complete(v1);
2082  
2083 <        // unspecified behavior
2084 <        Integer v;
2083 >        // unspecified behavior - both source completions available
2084 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2085 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2086          try {
2087 <            assertNull(h.join());
2088 <            assertEquals(1, r.invocationCount);
2185 <            assertEquals(inc(v1), r.value);
2087 >            assertNull(h4.join());
2088 >            rs[4].assertValue(v1);
2089          } catch (CompletionException ok) {
2090 <            checkCompletedWithWrappedCFException(h, ex);
2091 <            assertEquals(0, r.invocationCount);
2090 >            checkCompletedWithWrappedCFException(h4, ex);
2091 >            rs[4].assertNotInvoked();
2092          }
2190
2191        checkCompletedWithWrappedCFException(g, ex);
2192        checkCompletedNormally(f, v1);
2193    }}
2194
2195    public void testAcceptEither_exceptionalCompletion4() {
2196        for (ExecutionMode m : ExecutionMode.values())
2197        for (Integer v1 : new Integer[] { 1, null })
2198    {
2199        final CompletableFuture<Integer> f = new CompletableFuture<>();
2200        final CompletableFuture<Integer> g = new CompletableFuture<>();
2201        final IncAction r = new IncAction();
2202        final CFException ex = new CFException();
2203
2204        f.completeExceptionally(ex);
2205        g.complete(v1);
2206        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2207
2208        // unspecified behavior
2209        Integer v;
2093          try {
2094 <            assertNull(h.join());
2095 <            assertEquals(1, r.invocationCount);
2213 <            assertEquals(inc(v1), r.value);
2094 >            assertNull(h5.join());
2095 >            rs[5].assertValue(v1);
2096          } catch (CompletionException ok) {
2097 <            checkCompletedWithWrappedCFException(h, ex);
2098 <            assertEquals(0, r.invocationCount);
2097 >            checkCompletedWithWrappedCFException(h5, ex);
2098 >            rs[5].assertNotInvoked();
2099          }
2100  
2101          checkCompletedWithWrappedCFException(f, ex);
2102          checkCompletedNormally(g, v1);
2103 +        checkCompletedWithWrappedCFException(h0, ex);
2104 +        checkCompletedWithWrappedCFException(h1, ex);
2105 +        checkCompletedWithWrappedCFException(h2, ex);
2106 +        checkCompletedWithWrappedCFException(h3, ex);
2107 +        checkCompletedWithWrappedCFException(h4, ex);
2108 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2109      }}
2110  
2111 <    /**
2224 <     * acceptEither result completes exceptionally if action does
2225 <     */
2226 <    public void testAcceptEither_actionFailed1() {
2111 >    public void testAcceptEither_exceptionalCompletion2() {
2112          for (ExecutionMode m : ExecutionMode.values())
2113 +        for (boolean fFirst : new boolean[] { true, false })
2114          for (Integer v1 : new Integer[] { 1, null })
2229        for (Integer v2 : new Integer[] { 2, null })
2115      {
2116          final CompletableFuture<Integer> f = new CompletableFuture<>();
2117          final CompletableFuture<Integer> g = new CompletableFuture<>();
2118 <        final FailingConsumer r = new FailingConsumer();
2119 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2118 >        final CFException ex = new CFException();
2119 >        final NoopConsumer[] rs = new NoopConsumer[6];
2120 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2121  
2122 <        f.complete(v1);
2123 <        checkCompletedWithWrappedCFException(h);
2124 <        g.complete(v2);
2125 <        checkCompletedNormally(f, v1);
2126 <        checkCompletedNormally(g, v2);
2127 <    }}
2122 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2123 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2124 >        if (fFirst) {
2125 >            f.complete(v1);
2126 >            g.completeExceptionally(ex);
2127 >        } else {
2128 >            g.completeExceptionally(ex);
2129 >            f.complete(v1);
2130 >        }
2131 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2132 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2133  
2134 <    public void testAcceptEither_actionFailed2() {
2135 <        for (ExecutionMode m : ExecutionMode.values())
2136 <        for (Integer v1 : new Integer[] { 1, null })
2137 <        for (Integer v2 : new Integer[] { 2, null })
2138 <    {
2139 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2140 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2141 <        final FailingConsumer r = new FailingConsumer();
2142 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2134 >        // unspecified behavior - both source completions available
2135 >        try {
2136 >            assertEquals(null, h0.join());
2137 >            rs[0].assertValue(v1);
2138 >        } catch (CompletionException ok) {
2139 >            checkCompletedWithWrappedCFException(h0, ex);
2140 >            rs[0].assertNotInvoked();
2141 >        }
2142 >        try {
2143 >            assertEquals(null, h1.join());
2144 >            rs[1].assertValue(v1);
2145 >        } catch (CompletionException ok) {
2146 >            checkCompletedWithWrappedCFException(h1, ex);
2147 >            rs[1].assertNotInvoked();
2148 >        }
2149 >        try {
2150 >            assertEquals(null, h2.join());
2151 >            rs[2].assertValue(v1);
2152 >        } catch (CompletionException ok) {
2153 >            checkCompletedWithWrappedCFException(h2, ex);
2154 >            rs[2].assertNotInvoked();
2155 >        }
2156 >        try {
2157 >            assertEquals(null, h3.join());
2158 >            rs[3].assertValue(v1);
2159 >        } catch (CompletionException ok) {
2160 >            checkCompletedWithWrappedCFException(h3, ex);
2161 >            rs[3].assertNotInvoked();
2162 >        }
2163  
2253        g.complete(v2);
2254        checkCompletedWithWrappedCFException(h);
2255        f.complete(v1);
2164          checkCompletedNormally(f, v1);
2165 <        checkCompletedNormally(g, v2);
2165 >        checkCompletedWithWrappedCFException(g, ex);
2166      }}
2167  
2168      /**
2169       * acceptEither result completes exceptionally if either source cancelled
2170       */
2171 <    public void testAcceptEither_sourceCancelled1() {
2264 <        for (ExecutionMode m : ExecutionMode.values())
2265 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2266 <        for (Integer v1 : new Integer[] { 1, null })
2267 <    {
2268 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2269 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2270 <        final IncAction r = new IncAction();
2271 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2272 <
2273 <        assertTrue(f.cancel(mayInterruptIfRunning));
2274 <        checkCompletedWithWrappedCancellationException(h);
2275 <        g.complete(v1);
2276 <
2277 <        checkCancelled(f);
2278 <        assertEquals(0, r.invocationCount);
2279 <        checkCompletedNormally(g, v1);
2280 <        checkCompletedWithWrappedCancellationException(h);
2281 <    }}
2282 <
2283 <    public void testAcceptEither_sourceCancelled2() {
2171 >    public void testAcceptEither_sourceCancelled() {
2172          for (ExecutionMode m : ExecutionMode.values())
2173          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2174          for (Integer v1 : new Integer[] { 1, null })
2175      {
2176          final CompletableFuture<Integer> f = new CompletableFuture<>();
2177          final CompletableFuture<Integer> g = new CompletableFuture<>();
2178 <        final IncAction r = new IncAction();
2179 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2178 >        final NoopConsumer[] rs = new NoopConsumer[6];
2179 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2180  
2181 <        assertTrue(g.cancel(mayInterruptIfRunning));
2182 <        checkCompletedWithWrappedCancellationException(h);
2183 <        f.complete(v1);
2181 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2182 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2183 >        checkIncomplete(h0);
2184 >        checkIncomplete(h1);
2185 >        rs[0].assertNotInvoked();
2186 >        rs[1].assertNotInvoked();
2187 >        f.cancel(mayInterruptIfRunning);
2188 >        checkCompletedWithWrappedCancellationException(h0);
2189 >        checkCompletedWithWrappedCancellationException(h1);
2190 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2191 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2192 >        checkCompletedWithWrappedCancellationException(h2);
2193 >        checkCompletedWithWrappedCancellationException(h3);
2194  
2195 <        checkCancelled(g);
2298 <        assertEquals(0, r.invocationCount);
2299 <        checkCompletedNormally(f, v1);
2300 <        checkCompletedWithWrappedCancellationException(h);
2301 <    }}
2302 <
2303 <    public void testAcceptEither_sourceCancelled3() {
2304 <        for (ExecutionMode m : ExecutionMode.values())
2305 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2306 <        for (Integer v1 : new Integer[] { 1, null })
2307 <    {
2308 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2309 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2310 <        final IncAction r = new IncAction();
2311 <
2312 <        assertTrue(g.cancel(mayInterruptIfRunning));
2313 <        f.complete(v1);
2314 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2195 >        g.complete(v1);
2196  
2197 <        // unspecified behavior
2198 <        Integer v;
2197 >        // unspecified behavior - both source completions available
2198 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2199 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2200          try {
2201 <            assertNull(h.join());
2202 <            assertEquals(1, r.invocationCount);
2321 <            assertEquals(inc(v1), r.value);
2201 >            assertNull(h4.join());
2202 >            rs[4].assertValue(v1);
2203          } catch (CompletionException ok) {
2204 <            checkCompletedWithWrappedCancellationException(h);
2205 <            assertEquals(0, r.invocationCount);
2204 >            checkCompletedWithWrappedCancellationException(h4);
2205 >            rs[4].assertNotInvoked();
2206          }
2326
2327        checkCancelled(g);
2328        checkCompletedNormally(f, v1);
2329    }}
2330
2331    public void testAcceptEither_sourceCancelled4() {
2332        for (ExecutionMode m : ExecutionMode.values())
2333        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2334        for (Integer v1 : new Integer[] { 1, null })
2335    {
2336        final CompletableFuture<Integer> f = new CompletableFuture<>();
2337        final CompletableFuture<Integer> g = new CompletableFuture<>();
2338        final IncAction r = new IncAction();
2339
2340        assertTrue(f.cancel(mayInterruptIfRunning));
2341        g.complete(v1);
2342        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343
2344        // unspecified behavior
2345        Integer v;
2207          try {
2208 <            assertNull(h.join());
2209 <            assertEquals(1, r.invocationCount);
2349 <            assertEquals(inc(v1), r.value);
2208 >            assertNull(h5.join());
2209 >            rs[5].assertValue(v1);
2210          } catch (CompletionException ok) {
2211 <            checkCompletedWithWrappedCancellationException(h);
2212 <            assertEquals(0, r.invocationCount);
2211 >            checkCompletedWithWrappedCancellationException(h5);
2212 >            rs[5].assertNotInvoked();
2213          }
2214  
2215          checkCancelled(f);
2216          checkCompletedNormally(g, v1);
2217 +        checkCompletedWithWrappedCancellationException(h0);
2218 +        checkCompletedWithWrappedCancellationException(h1);
2219 +        checkCompletedWithWrappedCancellationException(h2);
2220 +        checkCompletedWithWrappedCancellationException(h3);
2221 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2222      }}
2223  
2224      /**
2225 <     * runAfterEither result completes normally after normal completion
2361 <     * of either source
2225 >     * acceptEither result completes exceptionally if action does
2226       */
2227 <    public void testRunAfterEither_normalCompletion1() {
2227 >    public void testAcceptEither_actionFailed() {
2228          for (ExecutionMode m : ExecutionMode.values())
2229          for (Integer v1 : new Integer[] { 1, null })
2230          for (Integer v2 : new Integer[] { 2, null })
2231      {
2232          final CompletableFuture<Integer> f = new CompletableFuture<>();
2233          final CompletableFuture<Integer> g = new CompletableFuture<>();
2234 <        final Noop r = new Noop();
2235 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2234 >        final FailingConsumer[] rs = new FailingConsumer[6];
2235 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2236  
2237 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2238 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2239          f.complete(v1);
2240 <        checkCompletedNormally(h, null);
2241 <        assertEquals(1, r.invocationCount);
2240 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2241 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2242 >        checkCompletedWithWrappedCFException(h0);
2243 >        checkCompletedWithWrappedCFException(h1);
2244 >        checkCompletedWithWrappedCFException(h2);
2245 >        checkCompletedWithWrappedCFException(h3);
2246 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2247 >
2248          g.complete(v2);
2249  
2250 <        checkCompletedNormally(f, v1);
2251 <        checkCompletedNormally(g, v2);
2252 <        checkCompletedNormally(h, null);
2381 <        assertEquals(1, r.invocationCount);
2382 <    }}
2250 >        // unspecified behavior - both source completions available
2251 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2252 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2253  
2254 <    public void testRunAfterEither_normalCompletion2() {
2255 <        for (ExecutionMode m : ExecutionMode.values())
2256 <        for (Integer v1 : new Integer[] { 1, null })
2257 <        for (Integer v2 : new Integer[] { 2, null })
2258 <    {
2259 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2390 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final Noop r = new Noop();
2392 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2393 <
2394 <        g.complete(v2);
2395 <        checkCompletedNormally(h, null);
2396 <        assertEquals(1, r.invocationCount);
2397 <        f.complete(v1);
2254 >        checkCompletedWithWrappedCFException(h4);
2255 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2256 >                   Objects.equals(v2, rs[4].value));
2257 >        checkCompletedWithWrappedCFException(h5);
2258 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2259 >                   Objects.equals(v2, rs[5].value));
2260  
2261          checkCompletedNormally(f, v1);
2262          checkCompletedNormally(g, v2);
2263 <        checkCompletedNormally(h, null);
2402 <        assertEquals(1, r.invocationCount);
2403 <        }}
2263 >    }}
2264  
2265 <    public void testRunAfterEither_normalCompletion3() {
2265 >    /**
2266 >     * runAfterEither result completes normally after normal completion
2267 >     * of either source
2268 >     */
2269 >    public void testRunAfterEither_normalCompletion() {
2270          for (ExecutionMode m : ExecutionMode.values())
2271          for (Integer v1 : new Integer[] { 1, null })
2272          for (Integer v2 : new Integer[] { 2, null })
2273      {
2274          final CompletableFuture<Integer> f = new CompletableFuture<>();
2275          final CompletableFuture<Integer> g = new CompletableFuture<>();
2276 <        final Noop r = new Noop();
2276 >        final Noop[] rs = new Noop[6];
2277 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2278  
2279 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2280 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2281 +        checkIncomplete(h0);
2282 +        checkIncomplete(h1);
2283 +        rs[0].assertNotInvoked();
2284 +        rs[1].assertNotInvoked();
2285          f.complete(v1);
2286 +        checkCompletedNormally(h0, null);
2287 +        checkCompletedNormally(h1, null);
2288 +        rs[0].assertInvoked();
2289 +        rs[1].assertInvoked();
2290 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2291 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2292 +        checkCompletedNormally(h2, null);
2293 +        checkCompletedNormally(h3, null);
2294 +        rs[2].assertInvoked();
2295 +        rs[3].assertInvoked();
2296 +
2297          g.complete(v2);
2416        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2298  
2299 <        checkCompletedNormally(h, null);
2299 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2300 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2301 >
2302          checkCompletedNormally(f, v1);
2303          checkCompletedNormally(g, v2);
2304 <        assertEquals(1, r.invocationCount);
2304 >        checkCompletedNormally(h0, null);
2305 >        checkCompletedNormally(h1, null);
2306 >        checkCompletedNormally(h2, null);
2307 >        checkCompletedNormally(h3, null);
2308 >        checkCompletedNormally(h4, null);
2309 >        checkCompletedNormally(h5, null);
2310 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2311      }}
2312  
2313      /**
2314       * runAfterEither result completes exceptionally after exceptional
2315       * completion of either source
2316       */
2317 <    public void testRunAfterEither_exceptionalCompletion1() {
2317 >    public void testRunAfterEither_exceptionalCompletion() {
2318          for (ExecutionMode m : ExecutionMode.values())
2319          for (Integer v1 : new Integer[] { 1, null })
2320      {
2321          final CompletableFuture<Integer> f = new CompletableFuture<>();
2322          final CompletableFuture<Integer> g = new CompletableFuture<>();
2434        final Noop r = new Noop();
2435        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2323          final CFException ex = new CFException();
2324 +        final Noop[] rs = new Noop[6];
2325 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2326  
2327 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2328 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2329 +        checkIncomplete(h0);
2330 +        checkIncomplete(h1);
2331 +        rs[0].assertNotInvoked();
2332 +        rs[1].assertNotInvoked();
2333          f.completeExceptionally(ex);
2334 <        checkCompletedWithWrappedCFException(h, ex);
2334 >        checkCompletedWithWrappedCFException(h0, ex);
2335 >        checkCompletedWithWrappedCFException(h1, ex);
2336 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2337 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2338 >        checkCompletedWithWrappedCFException(h2, ex);
2339 >        checkCompletedWithWrappedCFException(h3, ex);
2340 >
2341          g.complete(v1);
2342  
2343 <        assertEquals(0, r.invocationCount);
2344 <        checkCompletedNormally(g, v1);
2343 >        // unspecified behavior - both source completions available
2344 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2345 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2346 >        try {
2347 >            assertNull(h4.join());
2348 >            rs[4].assertInvoked();
2349 >        } catch (CompletionException ok) {
2350 >            checkCompletedWithWrappedCFException(h4, ex);
2351 >            rs[4].assertNotInvoked();
2352 >        }
2353 >        try {
2354 >            assertNull(h5.join());
2355 >            rs[5].assertInvoked();
2356 >        } catch (CompletionException ok) {
2357 >            checkCompletedWithWrappedCFException(h5, ex);
2358 >            rs[5].assertNotInvoked();
2359 >        }
2360 >
2361          checkCompletedWithWrappedCFException(f, ex);
2362 <        checkCompletedWithWrappedCFException(h, ex);
2362 >        checkCompletedNormally(g, v1);
2363 >        checkCompletedWithWrappedCFException(h0, ex);
2364 >        checkCompletedWithWrappedCFException(h1, ex);
2365 >        checkCompletedWithWrappedCFException(h2, ex);
2366 >        checkCompletedWithWrappedCFException(h3, ex);
2367 >        checkCompletedWithWrappedCFException(h4, ex);
2368 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2369      }}
2370  
2371      public void testRunAfterEither_exceptionalCompletion2() {
2372          for (ExecutionMode m : ExecutionMode.values())
2373 +        for (boolean fFirst : new boolean[] { true, false })
2374          for (Integer v1 : new Integer[] { 1, null })
2375      {
2376          final CompletableFuture<Integer> f = new CompletableFuture<>();
2377          final CompletableFuture<Integer> g = new CompletableFuture<>();
2454        final Noop r = new Noop();
2455        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456        final CFException ex = new CFException();
2457
2458        g.completeExceptionally(ex);
2459        checkCompletedWithWrappedCFException(h, ex);
2460        f.complete(v1);
2461
2462        assertEquals(0, r.invocationCount);
2463        checkCompletedNormally(f, v1);
2464        checkCompletedWithWrappedCFException(g, ex);
2465        checkCompletedWithWrappedCFException(h, ex);
2466    }}
2467
2468    public void testRunAfterEither_exceptionalCompletion3() {
2469        for (ExecutionMode m : ExecutionMode.values())
2470        for (Integer v1 : new Integer[] { 1, null })
2471    {
2472        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474        final Noop r = new Noop();
2378          final CFException ex = new CFException();
2379 +        final Noop[] rs = new Noop[6];
2380 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2381  
2382 <        g.completeExceptionally(ex);
2383 <        f.complete(v1);
2384 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2382 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2383 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2384 >        if (fFirst) {
2385 >            f.complete(v1);
2386 >            g.completeExceptionally(ex);
2387 >        } else {
2388 >            g.completeExceptionally(ex);
2389 >            f.complete(v1);
2390 >        }
2391 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2392 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2393  
2394 <        // unspecified behavior
2482 <        Integer v;
2394 >        // unspecified behavior - both source completions available
2395          try {
2396 <            assertNull(h.join());
2397 <            assertEquals(1, r.invocationCount);
2396 >            assertEquals(null, h0.join());
2397 >            rs[0].assertInvoked();
2398          } catch (CompletionException ok) {
2399 <            checkCompletedWithWrappedCFException(h, ex);
2400 <            assertEquals(0, r.invocationCount);
2399 >            checkCompletedWithWrappedCFException(h0, ex);
2400 >            rs[0].assertNotInvoked();
2401 >        }
2402 >        try {
2403 >            assertEquals(null, h1.join());
2404 >            rs[1].assertInvoked();
2405 >        } catch (CompletionException ok) {
2406 >            checkCompletedWithWrappedCFException(h1, ex);
2407 >            rs[1].assertNotInvoked();
2408 >        }
2409 >        try {
2410 >            assertEquals(null, h2.join());
2411 >            rs[2].assertInvoked();
2412 >        } catch (CompletionException ok) {
2413 >            checkCompletedWithWrappedCFException(h2, ex);
2414 >            rs[2].assertNotInvoked();
2415 >        }
2416 >        try {
2417 >            assertEquals(null, h3.join());
2418 >            rs[3].assertInvoked();
2419 >        } catch (CompletionException ok) {
2420 >            checkCompletedWithWrappedCFException(h3, ex);
2421 >            rs[3].assertNotInvoked();
2422          }
2423  
2491        checkCompletedWithWrappedCFException(g, ex);
2424          checkCompletedNormally(f, v1);
2425 +        checkCompletedWithWrappedCFException(g, ex);
2426      }}
2427  
2428 <    public void testRunAfterEither_exceptionalCompletion4() {
2428 >    /**
2429 >     * runAfterEither result completes exceptionally if either source cancelled
2430 >     */
2431 >    public void testRunAfterEither_sourceCancelled() {
2432          for (ExecutionMode m : ExecutionMode.values())
2433 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2434          for (Integer v1 : new Integer[] { 1, null })
2435      {
2436          final CompletableFuture<Integer> f = new CompletableFuture<>();
2437          final CompletableFuture<Integer> g = new CompletableFuture<>();
2438 <        final Noop r = new Noop();
2439 <        final CFException ex = new CFException();
2438 >        final Noop[] rs = new Noop[6];
2439 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2440 >
2441 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2442 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2443 >        checkIncomplete(h0);
2444 >        checkIncomplete(h1);
2445 >        rs[0].assertNotInvoked();
2446 >        rs[1].assertNotInvoked();
2447 >        f.cancel(mayInterruptIfRunning);
2448 >        checkCompletedWithWrappedCancellationException(h0);
2449 >        checkCompletedWithWrappedCancellationException(h1);
2450 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2451 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2452 >        checkCompletedWithWrappedCancellationException(h2);
2453 >        checkCompletedWithWrappedCancellationException(h3);
2454  
2504        f.completeExceptionally(ex);
2455          g.complete(v1);
2506        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456  
2457 <        // unspecified behavior
2458 <        Integer v;
2457 >        // unspecified behavior - both source completions available
2458 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2459 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2460 >        try {
2461 >            assertNull(h4.join());
2462 >            rs[4].assertInvoked();
2463 >        } catch (CompletionException ok) {
2464 >            checkCompletedWithWrappedCancellationException(h4);
2465 >            rs[4].assertNotInvoked();
2466 >        }
2467          try {
2468 <            assertNull(h.join());
2469 <            assertEquals(1, r.invocationCount);
2468 >            assertNull(h5.join());
2469 >            rs[5].assertInvoked();
2470          } catch (CompletionException ok) {
2471 <            checkCompletedWithWrappedCFException(h, ex);
2472 <            assertEquals(0, r.invocationCount);
2471 >            checkCompletedWithWrappedCancellationException(h5);
2472 >            rs[5].assertNotInvoked();
2473          }
2474  
2475 <        checkCompletedWithWrappedCFException(f, ex);
2475 >        checkCancelled(f);
2476          checkCompletedNormally(g, v1);
2477 +        checkCompletedWithWrappedCancellationException(h0);
2478 +        checkCompletedWithWrappedCancellationException(h1);
2479 +        checkCompletedWithWrappedCancellationException(h2);
2480 +        checkCompletedWithWrappedCancellationException(h3);
2481 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2482      }}
2483  
2484      /**
2485       * runAfterEither result completes exceptionally if action does
2486       */
2487 <    public void testRunAfterEither_actionFailed1() {
2487 >    public void testRunAfterEither_actionFailed() {
2488          for (ExecutionMode m : ExecutionMode.values())
2489          for (Integer v1 : new Integer[] { 1, null })
2490          for (Integer v2 : new Integer[] { 2, null })
2491      {
2492          final CompletableFuture<Integer> f = new CompletableFuture<>();
2493          final CompletableFuture<Integer> g = new CompletableFuture<>();
2494 <        final FailingRunnable r = new FailingRunnable();
2495 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2494 >        final FailingRunnable[] rs = new FailingRunnable[6];
2495 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2496  
2497 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2498 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2499          f.complete(v1);
2500 <        checkCompletedWithWrappedCFException(h);
2500 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2501 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2502 >        checkCompletedWithWrappedCFException(h0);
2503 >        checkCompletedWithWrappedCFException(h1);
2504 >        checkCompletedWithWrappedCFException(h2);
2505 >        checkCompletedWithWrappedCFException(h3);
2506 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2507          g.complete(v2);
2508 <        checkCompletedNormally(f, v1);
2509 <        checkCompletedNormally(g, v2);
2510 <    }}
2508 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2509 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2510 >        checkCompletedWithWrappedCFException(h4);
2511 >        checkCompletedWithWrappedCFException(h5);
2512  
2542    public void testRunAfterEither_actionFailed2() {
2543        for (ExecutionMode m : ExecutionMode.values())
2544        for (Integer v1 : new Integer[] { 1, null })
2545        for (Integer v2 : new Integer[] { 2, null })
2546    {
2547        final CompletableFuture<Integer> f = new CompletableFuture<>();
2548        final CompletableFuture<Integer> g = new CompletableFuture<>();
2549        final FailingRunnable r = new FailingRunnable();
2550        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2551
2552        g.complete(v2);
2553        checkCompletedWithWrappedCFException(h);
2554        f.complete(v1);
2513          checkCompletedNormally(f, v1);
2514          checkCompletedNormally(g, v2);
2515 <    }}
2558 <
2559 <    /**
2560 <     * runAfterEither result completes exceptionally if either source cancelled
2561 <     */
2562 <    public void testRunAfterEither_sourceCancelled1() {
2563 <        for (ExecutionMode m : ExecutionMode.values())
2564 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2565 <        for (Integer v1 : new Integer[] { 1, null })
2566 <    {
2567 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2568 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2569 <        final Noop r = new Noop();
2570 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2571 <
2572 <        assertTrue(f.cancel(mayInterruptIfRunning));
2573 <        checkCompletedWithWrappedCancellationException(h);
2574 <        g.complete(v1);
2575 <
2576 <        checkCancelled(f);
2577 <        assertEquals(0, r.invocationCount);
2578 <        checkCompletedNormally(g, v1);
2579 <        checkCompletedWithWrappedCancellationException(h);
2580 <    }}
2581 <
2582 <    public void testRunAfterEither_sourceCancelled2() {
2583 <        for (ExecutionMode m : ExecutionMode.values())
2584 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2585 <        for (Integer v1 : new Integer[] { 1, null })
2586 <    {
2587 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2588 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2589 <        final Noop r = new Noop();
2590 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2591 <
2592 <        assertTrue(g.cancel(mayInterruptIfRunning));
2593 <        checkCompletedWithWrappedCancellationException(h);
2594 <        f.complete(v1);
2595 <
2596 <        checkCancelled(g);
2597 <        assertEquals(0, r.invocationCount);
2598 <        checkCompletedNormally(f, v1);
2599 <        checkCompletedWithWrappedCancellationException(h);
2600 <    }}
2601 <
2602 <    public void testRunAfterEither_sourceCancelled3() {
2603 <        for (ExecutionMode m : ExecutionMode.values())
2604 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2605 <        for (Integer v1 : new Integer[] { 1, null })
2606 <    {
2607 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2608 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2609 <        final Noop r = new Noop();
2610 <
2611 <        assertTrue(g.cancel(mayInterruptIfRunning));
2612 <        f.complete(v1);
2613 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2614 <
2615 <        // unspecified behavior
2616 <        Integer v;
2617 <        try {
2618 <            assertNull(h.join());
2619 <            assertEquals(1, r.invocationCount);
2620 <        } catch (CompletionException ok) {
2621 <            checkCompletedWithWrappedCancellationException(h);
2622 <            assertEquals(0, r.invocationCount);
2623 <        }
2624 <
2625 <        checkCancelled(g);
2626 <        checkCompletedNormally(f, v1);
2627 <    }}
2628 <
2629 <    public void testRunAfterEither_sourceCancelled4() {
2630 <        for (ExecutionMode m : ExecutionMode.values())
2631 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2632 <        for (Integer v1 : new Integer[] { 1, null })
2633 <    {
2634 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2635 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2636 <        final Noop r = new Noop();
2637 <
2638 <        assertTrue(f.cancel(mayInterruptIfRunning));
2639 <        g.complete(v1);
2640 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2641 <
2642 <        // unspecified behavior
2643 <        Integer v;
2644 <        try {
2645 <            assertNull(h.join());
2646 <            assertEquals(1, r.invocationCount);
2647 <        } catch (CompletionException ok) {
2648 <            checkCompletedWithWrappedCancellationException(h);
2649 <            assertEquals(0, r.invocationCount);
2650 <        }
2651 <
2652 <        checkCancelled(f);
2653 <        checkCompletedNormally(g, v1);
2515 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2516      }}
2517  
2518      /**
# Line 2662 | Line 2524 | public class CompletableFutureTest exten
2524          for (Integer v1 : new Integer[] { 1, null })
2525      {
2526          final CompletableFuture<Integer> f = new CompletableFuture<>();
2527 <        final CompletableFutureInc r = new CompletableFutureInc();
2527 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2528          if (!createIncomplete) f.complete(v1);
2529 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2529 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2530          if (createIncomplete) f.complete(v1);
2531  
2532          checkCompletedNormally(g, inc(v1));
2533          checkCompletedNormally(f, v1);
2534 <        assertEquals(1, r.invocationCount);
2534 >        r.assertInvoked();
2535      }}
2536  
2537      /**
# Line 2681 | Line 2543 | public class CompletableFutureTest exten
2543          for (boolean createIncomplete : new boolean[] { true, false })
2544      {
2545          final CFException ex = new CFException();
2546 <        final CompletableFutureInc r = new CompletableFutureInc();
2546 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2547          final CompletableFuture<Integer> f = new CompletableFuture<>();
2548          if (!createIncomplete) f.completeExceptionally(ex);
2549 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2549 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2550          if (createIncomplete) f.completeExceptionally(ex);
2551  
2552          checkCompletedWithWrappedCFException(g, ex);
2553          checkCompletedWithWrappedCFException(f, ex);
2554 <        assertEquals(0, r.invocationCount);
2554 >        r.assertNotInvoked();
2555      }}
2556  
2557      /**
# Line 2702 | Line 2564 | public class CompletableFutureTest exten
2564      {
2565          final CompletableFuture<Integer> f = new CompletableFuture<>();
2566          final FailingCompletableFutureFunction r
2567 <            = new FailingCompletableFutureFunction();
2567 >            = new FailingCompletableFutureFunction(m);
2568          if (!createIncomplete) f.complete(v1);
2569 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2569 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2570          if (createIncomplete) f.complete(v1);
2571  
2572          checkCompletedWithWrappedCFException(g);
# Line 2720 | Line 2582 | public class CompletableFutureTest exten
2582          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2583      {
2584          final CompletableFuture<Integer> f = new CompletableFuture<>();
2585 <        final CompletableFutureInc r = new CompletableFutureInc();
2585 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2586          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2587 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2587 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2588          if (createIncomplete) {
2589              checkIncomplete(g);
2590              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2749 | Line 2611 | public class CompletableFutureTest exten
2611       */
2612      public void testAllOf_normal() throws Exception {
2613          for (int k = 1; k < 20; ++k) {
2614 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2614 >            CompletableFuture<Integer>[] fs
2615 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2616              for (int i = 0; i < k; ++i)
2617                  fs[i] = new CompletableFuture<>();
2618              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 2763 | Line 2626 | public class CompletableFutureTest exten
2626          }
2627      }
2628  
2629 +    public void testAllOf_backwards() throws Exception {
2630 +        for (int k = 1; k < 20; ++k) {
2631 +            CompletableFuture<Integer>[] fs
2632 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2633 +            for (int i = 0; i < k; ++i)
2634 +                fs[i] = new CompletableFuture<>();
2635 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2636 +            for (int i = k - 1; i >= 0; i--) {
2637 +                checkIncomplete(f);
2638 +                checkIncomplete(CompletableFuture.allOf(fs));
2639 +                fs[i].complete(one);
2640 +            }
2641 +            checkCompletedNormally(f, null);
2642 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2643 +        }
2644 +    }
2645 +
2646      /**
2647       * anyOf(no component futures) returns an incomplete future
2648       */
# Line 2821 | Line 2701 | public class CompletableFutureTest exten
2701          Runnable[] throwingActions = {
2702              () -> CompletableFuture.supplyAsync(null),
2703              () -> CompletableFuture.supplyAsync(null, exec),
2704 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2704 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2705  
2706              () -> CompletableFuture.runAsync(null),
2707              () -> CompletableFuture.runAsync(null, exec),
# Line 2894 | Line 2774 | public class CompletableFutureTest exten
2774  
2775              () -> f.thenCompose(null),
2776              () -> f.thenComposeAsync(null),
2777 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2777 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2778              () -> f.thenComposeAsync(null, exec),
2779  
2780              () -> f.exceptionally(null),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines