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.46 by jsr166, Mon Jun 2 17:41:22 2014 UTC vs.
Revision 1.63 by jsr166, Fri Jun 6 16:54:16 2014 UTC

# Line 17 | Line 17 | import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19   import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 282 | Line 284 | public class CompletableFutureTest exten
284      public void testGetNumberOfDependents() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286          assertEquals(0, f.getNumberOfDependents());
287 <        CompletableFuture g = f.thenRun(new Noop());
287 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
288          assertEquals(1, f.getNumberOfDependents());
289          assertEquals(0, g.getNumberOfDependents());
290 <        CompletableFuture h = f.thenRun(new Noop());
290 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
291          assertEquals(2, f.getNumberOfDependents());
292          f.complete(1);
293          checkCompletedNormally(g, null);
# Line 318 | 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 332 | 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);
339 <    static final BiFunction<Integer, Integer, Integer> subtract =
340 <        (Integer x, Integer y) -> subtract(x, y);
341 <    static final class IncAction implements Consumer<Integer> {
342 <        int invocationCount = 0;
343 <        Integer value;
363 >    class IncAction extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        IncAction(ExecutionMode m) { super(m); }
367          public void accept(Integer x) {
368 <            invocationCount++;
368 >            invoked();
369              value = inc(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 FailingNoop 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 521 | Line 595 | public class CompletableFutureTest exten
595              }
596          },
597  
598 <        DEFAULT_ASYNC {
598 >        ASYNC {
599 >            public void checkExecutionMode() {
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 586 | Line 670 | public class CompletableFutureTest exten
670          },
671  
672          EXECUTOR {
673 +            public void checkExecutionMode() {
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) {
684                  return f.thenRunAsync(a, new ThreadExecutor());
# Line 649 | Line 742 | public class CompletableFutureTest exten
742              }
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 727 | 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 748 | 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 773 | 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 801 | 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 829 | 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 856 | 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 880 | 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 895 | 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 <    /**
907 <     * runAsync with executor completes after running Runnable
908 <     */
909 <    public void testRunAsync2() {
910 <        Noop r = new Noop();
911 <        ThreadExecutor exec = new ThreadExecutor();
912 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
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());
914        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 <        FailingNoop r = new FailingNoop();
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);
946 <        checkCompletedNormally(f, one);
947 <    }
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  
1067      /**
1068       * thenRun result completes normally after normal completion of source
1069       */
1070 <    public void testThenRun() {
1071 <        CompletableFuture<Integer> f;
1072 <        CompletableFuture<Void> g;
1073 <        Noop r;
1074 <
1075 <        f = new CompletableFuture<>();
1076 <        g = f.thenRun(r = new Noop());
1077 <        f.complete(null);
1078 <        checkCompletedNormally(g, null);
1079 <        assertEquals(1, r.invocationCount);
1070 >    public void testThenRun_normalCompletion() {
1071 >        for (ExecutionMode m : ExecutionMode.values())
1072 >        for (boolean createIncomplete : new boolean[] { true, false })
1073 >        for (Integer v1 : new Integer[] { 1, null })
1074 >    {
1075 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
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) {
1080 >            checkIncomplete(g);
1081 >            f.complete(v1);
1082 >        }
1083  
975        f = new CompletableFuture<>();
976        f.complete(null);
977        g = f.thenRun(r = new Noop());
1084          checkCompletedNormally(g, null);
1085 <        assertEquals(1, r.invocationCount);
1086 <    }
1085 >        checkCompletedNormally(f, v1);
1086 >        r.assertInvoked();
1087 >    }}
1088  
1089      /**
1090       * thenRun result completes exceptionally after exceptional
1091       * completion of source
1092       */
1093 <    public void testThenRun2() {
1094 <        CompletableFuture<Integer> f;
1095 <        CompletableFuture<Void> g;
1096 <        Noop r;
1097 <
1098 <        f = new CompletableFuture<>();
1099 <        g = f.thenRun(r = new Noop());
1100 <        f.completeExceptionally(new CFException());
1101 <        checkCompletedWithWrappedCFException(g);
1102 <        assertEquals(0, r.invocationCount);
1103 <
1104 <        f = new CompletableFuture<>();
1105 <        f.completeExceptionally(new CFException());
999 <        g = f.thenRun(r = new Noop());
1000 <        checkCompletedWithWrappedCFException(g);
1001 <        assertEquals(0, r.invocationCount);
1002 <    }
1003 <
1004 <    /**
1005 <     * thenRun result completes exceptionally if action does
1006 <     */
1007 <    public void testThenRun3() {
1008 <        CompletableFuture<Integer> f;
1009 <        CompletableFuture<Void> g;
1010 <        FailingNoop r;
1011 <
1012 <        f = new CompletableFuture<>();
1013 <        g = f.thenRun(r = new FailingNoop());
1014 <        f.complete(null);
1015 <        checkCompletedWithWrappedCFException(g);
1093 >    public void testThenRun_exceptionalCompletion() {
1094 >        for (ExecutionMode m : ExecutionMode.values())
1095 >        for (boolean createIncomplete : new boolean[] { true, false })
1096 >    {
1097 >        final CFException ex = new CFException();
1098 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
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) {
1103 >            checkIncomplete(g);
1104 >            f.completeExceptionally(ex);
1105 >        }
1106  
1107 <        f = new CompletableFuture<>();
1108 <        f.complete(null);
1109 <        g = f.thenRun(r = new FailingNoop());
1110 <        checkCompletedWithWrappedCFException(g);
1021 <    }
1107 >        checkCompletedWithWrappedCFException(g, ex);
1108 >        checkCompletedWithWrappedCFException(f, ex);
1109 >        r.assertNotInvoked();
1110 >    }}
1111  
1112      /**
1113       * thenRun result completes exceptionally if source cancelled
1114       */
1115 <    public void testThenRun4() {
1116 <        CompletableFuture<Integer> f;
1117 <        CompletableFuture<Void> g;
1118 <        Noop r;
1119 <
1120 <        f = new CompletableFuture<>();
1121 <        g = f.thenRun(r = new Noop());
1122 <        assertTrue(f.cancel(true));
1123 <        checkCompletedWithWrappedCancellationException(g);
1124 <
1125 <        f = new CompletableFuture<>();
1126 <        assertTrue(f.cancel(true));
1127 <        g = f.thenRun(r = new Noop());
1039 <        checkCompletedWithWrappedCancellationException(g);
1040 <    }
1041 <
1042 <    /**
1043 <     * thenApply result completes normally after normal completion of source
1044 <     */
1045 <    public void testThenApply() {
1046 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1047 <        CompletableFuture<Integer> g = f.thenApply(inc);
1048 <        f.complete(one);
1049 <        checkCompletedNormally(g, two);
1050 <    }
1051 <
1052 <    /**
1053 <     * thenApply result completes exceptionally after exceptional
1054 <     * completion of source
1055 <     */
1056 <    public void testThenApply2() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        CompletableFuture<Integer> g = f.thenApply(inc);
1059 <        f.completeExceptionally(new CFException());
1060 <        checkCompletedWithWrappedCFException(g);
1061 <    }
1062 <
1063 <    /**
1064 <     * thenApply result completes exceptionally if action does
1065 <     */
1066 <    public void testThenApply3() {
1067 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1068 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1069 <        f.complete(one);
1070 <        checkCompletedWithWrappedCFException(g);
1071 <    }
1115 >    public void testThenRun_sourceCancelled() {
1116 >        for (ExecutionMode m : ExecutionMode.values())
1117 >        for (boolean createIncomplete : new boolean[] { true, false })
1118 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1119 >    {
1120 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1121 >        final Noop r = new Noop(m);
1122 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1124 >        if (createIncomplete) {
1125 >            checkIncomplete(g);
1126 >            assertTrue(f.cancel(mayInterruptIfRunning));
1127 >        }
1128  
1073    /**
1074     * thenApply result completes exceptionally if source cancelled
1075     */
1076    public void testThenApply4() {
1077        CompletableFuture<Integer> f = new CompletableFuture<>();
1078        CompletableFuture<Integer> g = f.thenApply(inc);
1079        assertTrue(f.cancel(true));
1129          checkCompletedWithWrappedCancellationException(g);
1130 <    }
1131 <
1132 <    /**
1084 <     * thenAccept result completes normally after normal completion of source
1085 <     */
1086 <    public void testThenAccept() {
1087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1088 <        IncAction r = new IncAction();
1089 <        CompletableFuture<Void> g = f.thenAccept(r);
1090 <        f.complete(one);
1091 <        checkCompletedNormally(g, null);
1092 <        assertEquals(r.value, (Integer) 2);
1093 <    }
1130 >        checkCancelled(f);
1131 >        r.assertNotInvoked();
1132 >    }}
1133  
1134      /**
1135 <     * thenAccept result completes exceptionally after exceptional
1097 <     * completion of source
1135 >     * thenRun result completes exceptionally if action does
1136       */
1137 <    public void testThenAccept2() {
1138 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1139 <        IncAction r = new IncAction();
1140 <        CompletableFuture<Void> g = f.thenAccept(r);
1141 <        f.completeExceptionally(new CFException());
1142 <        checkCompletedWithWrappedCFException(g);
1143 <    }
1137 >    public void testThenRun_actionFailed() {
1138 >        for (ExecutionMode m : ExecutionMode.values())
1139 >        for (boolean createIncomplete : new boolean[] { true, false })
1140 >        for (Integer v1 : new Integer[] { 1, null })
1141 >    {
1142 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1143 >        final FailingRunnable r = new FailingRunnable(m);
1144 >        if (!createIncomplete) f.complete(v1);
1145 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1146 >        if (createIncomplete) {
1147 >            checkIncomplete(g);
1148 >            f.complete(v1);
1149 >        }
1150  
1107    /**
1108     * thenAccept result completes exceptionally if action does
1109     */
1110    public void testThenAccept3() {
1111        CompletableFuture<Integer> f = new CompletableFuture<>();
1112        FailingConsumer r = new FailingConsumer();
1113        CompletableFuture<Void> g = f.thenAccept(r);
1114        f.complete(one);
1151          checkCompletedWithWrappedCFException(g);
1152 <        assertEquals(1, r.invocationCount);
1153 <    }
1118 <
1119 <    /**
1120 <     * thenAccept result completes exceptionally if source cancelled
1121 <     */
1122 <    public void testThenAccept4() {
1123 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1124 <        IncAction r = new IncAction();
1125 <        CompletableFuture<Void> g = f.thenAccept(r);
1126 <        assertTrue(f.cancel(true));
1127 <        checkCompletedWithWrappedCancellationException(g);
1128 <    }
1152 >        checkCompletedNormally(f, v1);
1153 >    }}
1154  
1155      /**
1156 <     * thenCombine result completes normally after normal completion
1132 <     * of sources
1156 >     * thenApply result completes normally after normal completion of source
1157       */
1158 <    public void testThenCombine_normalCompletion1() {
1135 <        for (boolean createIncomplete : new boolean[] { true, false })
1136 <        for (boolean fFirst : new boolean[] { true, false })
1158 >    public void testThenApply_normalCompletion() {
1159          for (ExecutionMode m : ExecutionMode.values())
1160 +        for (boolean createIncomplete : new boolean[] { true, false })
1161          for (Integer v1 : new Integer[] { 1, null })
1162 <        for (Integer v2 : new Integer[] { 2, null }) {
1140 <
1162 >    {
1163          final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1165 <        final SubtractFunction r = new SubtractFunction();
1166 <        CompletableFuture<Integer> h = null;
1167 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1168 <
1147 <        if (fFirst)
1148 <            f.complete(v1);
1149 <        else
1150 <            g.complete(v2);
1151 <        if (createIncomplete) checkIncomplete(h);
1152 <        assertEquals(0, r.invocationCount);
1153 <        if (!fFirst)
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) {
1168 >            checkIncomplete(g);
1169              f.complete(v1);
1170 <        else
1156 <            g.complete(v2);
1157 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1170 >        }
1171  
1172 <        checkCompletedNormally(h, subtract(v1, v2));
1172 >        checkCompletedNormally(g, inc(v1));
1173          checkCompletedNormally(f, v1);
1174 <        checkCompletedNormally(g, v2);
1175 <        assertEquals(1, r.invocationCount);
1163 <        }
1164 <    }
1174 >        r.assertInvoked();
1175 >    }}
1176  
1177      /**
1178 <     * thenCombine result completes exceptionally after exceptional
1179 <     * completion of either source
1178 >     * thenApply result completes exceptionally after exceptional
1179 >     * completion of source
1180       */
1181 <    public void testThenCombine_exceptionalCompletion1() {
1181 >    public void testThenApply_exceptionalCompletion() {
1182          for (ExecutionMode m : ExecutionMode.values())
1183 <        for (Integer v1 : new Integer[] { 1, null }) {
1184 <
1174 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1175 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1176 <        final SubtractFunction r = new SubtractFunction();
1177 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1183 >        for (boolean createIncomplete : new boolean[] { true, false })
1184 >    {
1185          final CFException ex = new CFException();
1179
1180        f.completeExceptionally(ex);
1181        checkIncomplete(h);
1182        g.complete(v1);
1183
1184        checkCompletedWithWrappedCFException(h, ex);
1185        checkCompletedWithWrappedCFException(f, ex);
1186        assertEquals(0, r.invocationCount);
1187        checkCompletedNormally(g, v1);
1188        }
1189    }
1190
1191    public void testThenCombine_exceptionalCompletion2() {
1192        for (ExecutionMode m : ExecutionMode.values())
1193        for (Integer v1 : new Integer[] { 1, null }) {
1194
1186          final CompletableFuture<Integer> f = new CompletableFuture<>();
1187 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1188 <        final SubtractFunction r = new SubtractFunction();
1189 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1190 <        final CFException ex = new CFException();
1191 <
1192 <        g.completeExceptionally(ex);
1202 <        checkIncomplete(h);
1203 <        f.complete(v1);
1204 <
1205 <        checkCompletedWithWrappedCFException(h, ex);
1206 <        checkCompletedWithWrappedCFException(g, ex);
1207 <        assertEquals(0, r.invocationCount);
1208 <        checkCompletedNormally(f, v1);
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) {
1191 >            checkIncomplete(g);
1192 >            f.completeExceptionally(ex);
1193          }
1210    }
1194  
1212    public void testThenCombine_exceptionalCompletion3() {
1213        for (ExecutionMode m : ExecutionMode.values())
1214        for (Integer v1 : new Integer[] { 1, null }) {
1215
1216        final CompletableFuture<Integer> f = new CompletableFuture<>();
1217        final CompletableFuture<Integer> g = new CompletableFuture<>();
1218        final SubtractFunction r = new SubtractFunction();
1219        final CFException ex = new CFException();
1220
1221        g.completeExceptionally(ex);
1222        f.complete(v1);
1223        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1224
1225        checkCompletedWithWrappedCFException(h, ex);
1195          checkCompletedWithWrappedCFException(g, ex);
1196 <        assertEquals(0, r.invocationCount);
1197 <        checkCompletedNormally(f, v1);
1198 <        }
1230 <    }
1196 >        checkCompletedWithWrappedCFException(f, ex);
1197 >        r.assertNotInvoked();
1198 >    }}
1199  
1200 <    public void testThenCombine_exceptionalCompletion4() {
1200 >    /**
1201 >     * thenApply result completes exceptionally if source cancelled
1202 >     */
1203 >    public void testThenApply_sourceCancelled() {
1204          for (ExecutionMode m : ExecutionMode.values())
1205 <        for (Integer v1 : new Integer[] { 1, null }) {
1206 <
1205 >        for (boolean createIncomplete : new boolean[] { true, false })
1206 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1207 >    {
1208          final CompletableFuture<Integer> f = new CompletableFuture<>();
1209 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1210 <        final SubtractFunction r = new SubtractFunction();
1211 <        final CFException ex = new CFException();
1212 <
1213 <        f.completeExceptionally(ex);
1214 <        g.complete(v1);
1243 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1244 <
1245 <        checkCompletedWithWrappedCFException(h, ex);
1246 <        checkCompletedWithWrappedCFException(f, ex);
1247 <        assertEquals(0, r.invocationCount);
1248 <        checkCompletedNormally(g, v1);
1209 >        final IncFunction r = new IncFunction(m);
1210 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212 >        if (createIncomplete) {
1213 >            checkIncomplete(g);
1214 >            assertTrue(f.cancel(mayInterruptIfRunning));
1215          }
1216 <    }
1216 >
1217 >        checkCompletedWithWrappedCancellationException(g);
1218 >        checkCancelled(f);
1219 >        r.assertNotInvoked();
1220 >    }}
1221  
1222      /**
1223 <     * thenCombine result completes exceptionally if action does
1223 >     * thenApply result completes exceptionally if action does
1224       */
1225 <    public void testThenCombine_actionFailed1() {
1225 >    public void testThenApply_actionFailed() {
1226          for (ExecutionMode m : ExecutionMode.values())
1227 +        for (boolean createIncomplete : new boolean[] { true, false })
1228          for (Integer v1 : new Integer[] { 1, null })
1229 <        for (Integer v2 : new Integer[] { 2, null }) {
1259 <
1229 >    {
1230          final CompletableFuture<Integer> f = new CompletableFuture<>();
1231 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1232 <        final FailingBiFunction r = new FailingBiFunction();
1233 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1234 <
1235 <        f.complete(v1);
1236 <        checkIncomplete(h);
1237 <        g.complete(v2);
1231 >        final FailingFunction r = new FailingFunction(m);
1232 >        if (!createIncomplete) f.complete(v1);
1233 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234 >        if (createIncomplete) {
1235 >            checkIncomplete(g);
1236 >            f.complete(v1);
1237 >        }
1238  
1239 <        checkCompletedWithWrappedCFException(h);
1239 >        checkCompletedWithWrappedCFException(g);
1240          checkCompletedNormally(f, v1);
1241 <        checkCompletedNormally(g, v2);
1272 <        }
1273 <    }
1241 >    }}
1242  
1243 <    public void testThenCombine_actionFailed2() {
1243 >    /**
1244 >     * thenAccept result completes normally after normal completion of source
1245 >     */
1246 >    public void testThenAccept_normalCompletion() {
1247          for (ExecutionMode m : ExecutionMode.values())
1248 +        for (boolean createIncomplete : new boolean[] { true, false })
1249          for (Integer v1 : new Integer[] { 1, null })
1250 <        for (Integer v2 : new Integer[] { 2, null }) {
1279 <
1250 >    {
1251          final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1253 <        final FailingBiFunction r = new FailingBiFunction();
1254 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1255 <
1256 <        g.complete(v2);
1257 <        checkIncomplete(h);
1258 <        f.complete(v1);
1252 >        final IncAction r = new IncAction(m);
1253 >        if (!createIncomplete) f.complete(v1);
1254 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 >        if (createIncomplete) {
1256 >            checkIncomplete(g);
1257 >            f.complete(v1);
1258 >        }
1259  
1260 <        checkCompletedWithWrappedCFException(h);
1260 >        checkCompletedNormally(g, null);
1261          checkCompletedNormally(f, v1);
1262 <        checkCompletedNormally(g, v2);
1263 <        }
1264 <    }
1262 >        r.assertInvoked();
1263 >        r.assertValue(inc(v1));
1264 >    }}
1265  
1266      /**
1267 <     * thenCombine result completes exceptionally if either source cancelled
1267 >     * thenAccept result completes exceptionally after exceptional
1268 >     * completion of source
1269       */
1270 <    public void testThenCombine_sourceCancelled1() {
1270 >    public void testThenAccept_exceptionalCompletion() {
1271          for (ExecutionMode m : ExecutionMode.values())
1272 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1273 <        for (Integer v1 : new Integer[] { 1, null }) {
1274 <
1272 >        for (boolean createIncomplete : new boolean[] { true, false })
1273 >    {
1274 >        final CFException ex = new CFException();
1275          final CompletableFuture<Integer> f = new CompletableFuture<>();
1276 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1277 <        final SubtractFunction r = new SubtractFunction();
1278 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1279 <
1280 <        assertTrue(f.cancel(mayInterruptIfRunning));
1281 <        checkIncomplete(h);
1310 <        g.complete(v1);
1311 <
1312 <        checkCompletedWithWrappedCancellationException(h);
1313 <        checkCancelled(f);
1314 <        assertEquals(0, r.invocationCount);
1315 <        checkCompletedNormally(g, v1);
1276 >        final IncAction r = new IncAction(m);
1277 >        if (!createIncomplete) f.completeExceptionally(ex);
1278 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1279 >        if (createIncomplete) {
1280 >            checkIncomplete(g);
1281 >            f.completeExceptionally(ex);
1282          }
1317    }
1283  
1284 <    public void testThenCombine_sourceCancelled2() {
1285 <        for (ExecutionMode m : ExecutionMode.values())
1286 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1287 <        for (Integer v1 : new Integer[] { 1, null }) {
1323 <
1324 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1325 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1326 <        final SubtractFunction r = new SubtractFunction();
1327 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1328 <
1329 <        assertTrue(g.cancel(mayInterruptIfRunning));
1330 <        checkIncomplete(h);
1331 <        f.complete(v1);
1332 <
1333 <        checkCompletedWithWrappedCancellationException(h);
1334 <        checkCancelled(g);
1335 <        assertEquals(0, r.invocationCount);
1336 <        checkCompletedNormally(f, v1);
1337 <        }
1338 <    }
1284 >        checkCompletedWithWrappedCFException(g, ex);
1285 >        checkCompletedWithWrappedCFException(f, ex);
1286 >        r.assertNotInvoked();
1287 >    }}
1288  
1289 <    public void testThenCombine_sourceCancelled3() {
1289 >    /**
1290 >     * thenAccept result completes exceptionally if source cancelled
1291 >     */
1292 >    public void testThenAccept_sourceCancelled() {
1293          for (ExecutionMode m : ExecutionMode.values())
1294 +        for (boolean createIncomplete : new boolean[] { true, false })
1295          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1296 <        for (Integer v1 : new Integer[] { 1, null }) {
1344 <
1296 >    {
1297          final CompletableFuture<Integer> f = new CompletableFuture<>();
1298 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1299 <        final SubtractFunction r = new SubtractFunction();
1300 <
1301 <        assertTrue(g.cancel(mayInterruptIfRunning));
1302 <        f.complete(v1);
1303 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1352 <
1353 <        checkCompletedWithWrappedCancellationException(h);
1354 <        checkCancelled(g);
1355 <        assertEquals(0, r.invocationCount);
1356 <        checkCompletedNormally(f, v1);
1298 >        final IncAction r = new IncAction(m);
1299 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1300 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1301 >        if (createIncomplete) {
1302 >            checkIncomplete(g);
1303 >            assertTrue(f.cancel(mayInterruptIfRunning));
1304          }
1358    }
1305  
1306 <    public void testThenCombine_sourceCancelled4() {
1361 <        for (ExecutionMode m : ExecutionMode.values())
1362 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1363 <        for (Integer v1 : new Integer[] { 1, null }) {
1364 <
1365 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1366 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1367 <        final SubtractFunction r = new SubtractFunction();
1368 <
1369 <        assertTrue(f.cancel(mayInterruptIfRunning));
1370 <        g.complete(v1);
1371 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1372 <
1373 <        checkCompletedWithWrappedCancellationException(h);
1306 >        checkCompletedWithWrappedCancellationException(g);
1307          checkCancelled(f);
1308 <        assertEquals(0, r.invocationCount);
1309 <        checkCompletedNormally(g, v1);
1377 <        }
1378 <    }
1308 >        r.assertNotInvoked();
1309 >    }}
1310  
1311      /**
1312 <     * thenAcceptBoth result completes normally after normal
1382 <     * completion of sources
1312 >     * thenAccept result completes exceptionally if action does
1313       */
1314 <    public void testThenAcceptBoth_normalCompletion1() {
1314 >    public void testThenAccept_actionFailed() {
1315          for (ExecutionMode m : ExecutionMode.values())
1316 +        for (boolean createIncomplete : new boolean[] { true, false })
1317          for (Integer v1 : new Integer[] { 1, null })
1318 <        for (Integer v2 : new Integer[] { 2, null }) {
1388 <
1318 >    {
1319          final CompletableFuture<Integer> f = new CompletableFuture<>();
1320 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1321 <        final SubtractAction r = new SubtractAction();
1322 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1323 <
1324 <        f.complete(v1);
1325 <        checkIncomplete(h);
1396 <        assertEquals(0, r.invocationCount);
1397 <        g.complete(v2);
1398 <
1399 <        checkCompletedNormally(h, null);
1400 <        assertEquals(subtract(v1, v2), r.value);
1401 <        checkCompletedNormally(f, v1);
1402 <        checkCompletedNormally(g, v2);
1320 >        final FailingConsumer r = new FailingConsumer(m);
1321 >        if (!createIncomplete) f.complete(v1);
1322 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1323 >        if (createIncomplete) {
1324 >            checkIncomplete(g);
1325 >            f.complete(v1);
1326          }
1404    }
1405
1406    public void testThenAcceptBoth_normalCompletion2() {
1407        for (ExecutionMode m : ExecutionMode.values())
1408        for (Integer v1 : new Integer[] { 1, null })
1409        for (Integer v2 : new Integer[] { 2, null }) {
1327  
1328 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1412 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1413 <        final SubtractAction r = new SubtractAction();
1414 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1415 <
1416 <        g.complete(v2);
1417 <        checkIncomplete(h);
1418 <        assertEquals(0, r.invocationCount);
1419 <        f.complete(v1);
1420 <
1421 <        checkCompletedNormally(h, null);
1422 <        assertEquals(subtract(v1, v2), r.value);
1328 >        checkCompletedWithWrappedCFException(g);
1329          checkCompletedNormally(f, v1);
1330 <        checkCompletedNormally(g, v2);
1425 <        }
1426 <    }
1330 >    }}
1331  
1332 <    public void testThenAcceptBoth_normalCompletion3() {
1332 >    /**
1333 >     * thenCombine result completes normally after normal completion
1334 >     * of sources
1335 >     */
1336 >    public void testThenCombine_normalCompletion() {
1337          for (ExecutionMode m : ExecutionMode.values())
1338 +        for (boolean createIncomplete : new boolean[] { true, false })
1339 +        for (boolean fFirst : new boolean[] { true, false })
1340          for (Integer v1 : new Integer[] { 1, null })
1341 <        for (Integer v2 : new Integer[] { 2, null }) {
1342 <
1341 >        for (Integer v2 : new Integer[] { 2, null })
1342 >    {
1343          final CompletableFuture<Integer> f = new CompletableFuture<>();
1344          final CompletableFuture<Integer> g = new CompletableFuture<>();
1345 <        final SubtractAction r = new SubtractAction();
1436 <
1437 <        g.complete(v2);
1438 <        f.complete(v1);
1439 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1345 >        final SubtractFunction r = new SubtractFunction(m);
1346  
1347 <        checkCompletedNormally(h, null);
1348 <        assertEquals(subtract(v1, v2), r.value);
1349 <        checkCompletedNormally(f, v1);
1350 <        checkCompletedNormally(g, v2);
1347 >        if (fFirst) f.complete(v1); else g.complete(v2);
1348 >        if (!createIncomplete)
1349 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1350 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1351 >        if (createIncomplete) {
1352 >            checkIncomplete(h);
1353 >            r.assertNotInvoked();
1354 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1355          }
1446    }
1447
1448    public void testThenAcceptBoth_normalCompletion4() {
1449        for (ExecutionMode m : ExecutionMode.values())
1450        for (Integer v1 : new Integer[] { 1, null })
1451        for (Integer v2 : new Integer[] { 2, null }) {
1356  
1357 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1454 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1455 <        final SubtractAction r = new SubtractAction();
1456 <
1457 <        f.complete(v1);
1458 <        g.complete(v2);
1459 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1460 <
1461 <        checkCompletedNormally(h, null);
1462 <        assertEquals(subtract(v1, v2), r.value);
1357 >        checkCompletedNormally(h, subtract(v1, v2));
1358          checkCompletedNormally(f, v1);
1359          checkCompletedNormally(g, v2);
1360 <        }
1361 <    }
1360 >        r.assertInvoked();
1361 >    }}
1362  
1363      /**
1364 <     * thenAcceptBoth result completes exceptionally after exceptional
1364 >     * thenCombine result completes exceptionally after exceptional
1365       * completion of either source
1366       */
1367 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1367 >    public void testThenCombine_exceptionalCompletion() {
1368          for (ExecutionMode m : ExecutionMode.values())
1369 <        for (Integer v1 : new Integer[] { 1, null }) {
1370 <
1369 >        for (boolean createIncomplete : new boolean[] { true, false })
1370 >        for (boolean fFirst : new boolean[] { true, false })
1371 >        for (Integer v1 : new Integer[] { 1, null })
1372 >    {
1373          final CompletableFuture<Integer> f = new CompletableFuture<>();
1374          final CompletableFuture<Integer> g = new CompletableFuture<>();
1478        final SubtractAction r = new SubtractAction();
1479        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1375          final CFException ex = new CFException();
1376 +        final SubtractFunction r = new SubtractFunction(m);
1377  
1378 <        f.completeExceptionally(ex);
1379 <        checkIncomplete(h);
1380 <        g.complete(v1);
1381 <
1382 <        checkCompletedWithWrappedCFException(h, ex);
1383 <        checkCompletedWithWrappedCFException(f, ex);
1384 <        assertEquals(0, r.invocationCount);
1489 <        checkCompletedNormally(g, v1);
1378 >        (fFirst ? f : g).complete(v1);
1379 >        if (!createIncomplete)
1380 >            (!fFirst ? f : g).completeExceptionally(ex);
1381 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1382 >        if (createIncomplete) {
1383 >            checkIncomplete(h);
1384 >            (!fFirst ? f : g).completeExceptionally(ex);
1385          }
1491    }
1492
1493    public void testThenAcceptBoth_exceptionalCompletion2() {
1494        for (ExecutionMode m : ExecutionMode.values())
1495        for (Integer v1 : new Integer[] { 1, null }) {
1496
1497        final CompletableFuture<Integer> f = new CompletableFuture<>();
1498        final CompletableFuture<Integer> g = new CompletableFuture<>();
1499        final SubtractAction r = new SubtractAction();
1500        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1501        final CFException ex = new CFException();
1502
1503        g.completeExceptionally(ex);
1504        checkIncomplete(h);
1505        f.complete(v1);
1386  
1387          checkCompletedWithWrappedCFException(h, ex);
1388 <        checkCompletedWithWrappedCFException(g, ex);
1389 <        assertEquals(0, r.invocationCount);
1390 <        checkCompletedNormally(f, v1);
1391 <        }
1512 <    }
1388 >        r.assertNotInvoked();
1389 >        checkCompletedNormally(fFirst ? f : g, v1);
1390 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1391 >    }}
1392  
1393 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1393 >    /**
1394 >     * thenCombine result completes exceptionally if either source cancelled
1395 >     */
1396 >    public void testThenCombine_sourceCancelled() {
1397          for (ExecutionMode m : ExecutionMode.values())
1398 <        for (Integer v1 : new Integer[] { 1, null }) {
1399 <
1398 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399 >        for (boolean createIncomplete : new boolean[] { true, false })
1400 >        for (boolean fFirst : new boolean[] { true, false })
1401 >        for (Integer v1 : new Integer[] { 1, null })
1402 >    {
1403          final CompletableFuture<Integer> f = new CompletableFuture<>();
1404          final CompletableFuture<Integer> g = new CompletableFuture<>();
1405 <        final SubtractAction r = new SubtractAction();
1521 <        final CFException ex = new CFException();
1522 <
1523 <        g.completeExceptionally(ex);
1524 <        f.complete(v1);
1525 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1405 >        final SubtractFunction r = new SubtractFunction(m);
1406  
1407 <        checkCompletedWithWrappedCFException(h, ex);
1408 <        checkCompletedWithWrappedCFException(g, ex);
1409 <        assertEquals(0, r.invocationCount);
1410 <        checkCompletedNormally(f, v1);
1407 >        (fFirst ? f : g).complete(v1);
1408 >        if (!createIncomplete)
1409 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1410 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1411 >        if (createIncomplete) {
1412 >            checkIncomplete(h);
1413 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1414          }
1532    }
1533
1534    public void testThenAcceptBoth_exceptionalCompletion4() {
1535        for (ExecutionMode m : ExecutionMode.values())
1536        for (Integer v1 : new Integer[] { 1, null }) {
1537
1538        final CompletableFuture<Integer> f = new CompletableFuture<>();
1539        final CompletableFuture<Integer> g = new CompletableFuture<>();
1540        final SubtractAction r = new SubtractAction();
1541        final CFException ex = new CFException();
1542
1543        f.completeExceptionally(ex);
1544        g.complete(v1);
1545        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1415  
1416 <        checkCompletedWithWrappedCFException(h, ex);
1417 <        checkCompletedWithWrappedCFException(f, ex);
1418 <        assertEquals(0, r.invocationCount);
1419 <        checkCompletedNormally(g, v1);
1420 <        }
1552 <    }
1416 >        checkCompletedWithWrappedCancellationException(h);
1417 >        checkCancelled(!fFirst ? f : g);
1418 >        r.assertNotInvoked();
1419 >        checkCompletedNormally(fFirst ? f : g, v1);
1420 >    }}
1421  
1422      /**
1423 <     * thenAcceptBoth result completes exceptionally if action does
1423 >     * thenCombine result completes exceptionally if action does
1424       */
1425 <    public void testThenAcceptBoth_actionFailed1() {
1425 >    public void testThenCombine_actionFailed() {
1426          for (ExecutionMode m : ExecutionMode.values())
1427 +        for (boolean fFirst : new boolean[] { true, false })
1428          for (Integer v1 : new Integer[] { 1, null })
1429 <        for (Integer v2 : new Integer[] { 2, null }) {
1430 <
1429 >        for (Integer v2 : new Integer[] { 2, null })
1430 >    {
1431          final CompletableFuture<Integer> f = new CompletableFuture<>();
1432          final CompletableFuture<Integer> g = new CompletableFuture<>();
1433 <        final FailingBiConsumer r = new FailingBiConsumer();
1434 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1433 >        final FailingBiFunction r = new FailingBiFunction(m);
1434 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1435  
1436 <        f.complete(v1);
1437 <        checkIncomplete(h);
1438 <        g.complete(v2);
1436 >        if (fFirst) {
1437 >            f.complete(v1);
1438 >            g.complete(v2);
1439 >        } else {
1440 >            g.complete(v2);
1441 >            f.complete(v1);
1442 >        }
1443  
1444          checkCompletedWithWrappedCFException(h);
1445          checkCompletedNormally(f, v1);
1446          checkCompletedNormally(g, v2);
1447 <        }
1575 <    }
1447 >    }}
1448  
1449 <    public void testThenAcceptBoth_actionFailed2() {
1449 >    /**
1450 >     * thenAcceptBoth result completes normally after normal
1451 >     * completion of sources
1452 >     */
1453 >    public void testThenAcceptBoth_normalCompletion() {
1454          for (ExecutionMode m : ExecutionMode.values())
1455 +        for (boolean createIncomplete : new boolean[] { true, false })
1456 +        for (boolean fFirst : new boolean[] { true, false })
1457          for (Integer v1 : new Integer[] { 1, null })
1458 <        for (Integer v2 : new Integer[] { 2, null }) {
1459 <
1458 >        for (Integer v2 : new Integer[] { 2, null })
1459 >    {
1460          final CompletableFuture<Integer> f = new CompletableFuture<>();
1461          final CompletableFuture<Integer> g = new CompletableFuture<>();
1462 <        final FailingBiConsumer r = new FailingBiConsumer();
1585 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1462 >        final SubtractAction r = new SubtractAction(m);
1463  
1464 <        g.complete(v2);
1465 <        checkIncomplete(h);
1466 <        f.complete(v1);
1464 >        if (fFirst) f.complete(v1); else g.complete(v2);
1465 >        if (!createIncomplete)
1466 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1467 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1468 >        if (createIncomplete) {
1469 >            checkIncomplete(h);
1470 >            r.assertNotInvoked();
1471 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1472 >        }
1473  
1474 <        checkCompletedWithWrappedCFException(h);
1474 >        checkCompletedNormally(h, null);
1475 >        r.assertValue(subtract(v1, v2));
1476          checkCompletedNormally(f, v1);
1477          checkCompletedNormally(g, v2);
1478 <        }
1595 <    }
1478 >    }}
1479  
1480      /**
1481 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1481 >     * thenAcceptBoth result completes exceptionally after exceptional
1482 >     * completion of either source
1483       */
1484 <    public void testThenAcceptBoth_sourceCancelled1() {
1484 >    public void testThenAcceptBoth_exceptionalCompletion() {
1485          for (ExecutionMode m : ExecutionMode.values())
1486 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1487 <        for (Integer v1 : new Integer[] { 1, null }) {
1488 <
1486 >        for (boolean createIncomplete : new boolean[] { true, false })
1487 >        for (boolean fFirst : new boolean[] { true, false })
1488 >        for (Integer v1 : new Integer[] { 1, null })
1489 >    {
1490          final CompletableFuture<Integer> f = new CompletableFuture<>();
1491          final CompletableFuture<Integer> g = new CompletableFuture<>();
1492 <        final SubtractAction r = new SubtractAction();
1493 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1609 <
1610 <        assertTrue(f.cancel(mayInterruptIfRunning));
1611 <        checkIncomplete(h);
1612 <        g.complete(v1);
1613 <
1614 <        checkCompletedWithWrappedCancellationException(h);
1615 <        checkCancelled(f);
1616 <        assertEquals(0, r.invocationCount);
1617 <        checkCompletedNormally(g, v1);
1618 <        }
1619 <    }
1620 <
1621 <    public void testThenAcceptBoth_sourceCancelled2() {
1622 <        for (ExecutionMode m : ExecutionMode.values())
1623 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1624 <        for (Integer v1 : new Integer[] { 1, null }) {
1492 >        final CFException ex = new CFException();
1493 >        final SubtractAction r = new SubtractAction(m);
1494  
1495 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1496 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1497 <        final SubtractAction r = new SubtractAction();
1495 >        (fFirst ? f : g).complete(v1);
1496 >        if (!createIncomplete)
1497 >            (!fFirst ? f : g).completeExceptionally(ex);
1498          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1499 <
1500 <        assertTrue(g.cancel(mayInterruptIfRunning));
1501 <        checkIncomplete(h);
1633 <        f.complete(v1);
1634 <
1635 <        checkCompletedWithWrappedCancellationException(h);
1636 <        checkCancelled(g);
1637 <        assertEquals(0, r.invocationCount);
1638 <        checkCompletedNormally(f, v1);
1499 >        if (createIncomplete) {
1500 >            checkIncomplete(h);
1501 >            (!fFirst ? f : g).completeExceptionally(ex);
1502          }
1640    }
1641
1642    public void testThenAcceptBoth_sourceCancelled3() {
1643        for (ExecutionMode m : ExecutionMode.values())
1644        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1645        for (Integer v1 : new Integer[] { 1, null }) {
1646
1647        final CompletableFuture<Integer> f = new CompletableFuture<>();
1648        final CompletableFuture<Integer> g = new CompletableFuture<>();
1649        final SubtractAction r = new SubtractAction();
1503  
1504 <        assertTrue(g.cancel(mayInterruptIfRunning));
1505 <        f.complete(v1);
1506 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1507 <
1508 <        checkCompletedWithWrappedCancellationException(h);
1656 <        checkCancelled(g);
1657 <        assertEquals(0, r.invocationCount);
1658 <        checkCompletedNormally(f, v1);
1659 <        }
1660 <    }
1504 >        checkCompletedWithWrappedCFException(h, ex);
1505 >        r.assertNotInvoked();
1506 >        checkCompletedNormally(fFirst ? f : g, v1);
1507 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1508 >    }}
1509  
1510 <    public void testThenAcceptBoth_sourceCancelled4() {
1510 >    /**
1511 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1512 >     */
1513 >    public void testThenAcceptBoth_sourceCancelled() {
1514          for (ExecutionMode m : ExecutionMode.values())
1515          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1516 <        for (Integer v1 : new Integer[] { 1, null }) {
1517 <
1516 >        for (boolean createIncomplete : new boolean[] { true, false })
1517 >        for (boolean fFirst : new boolean[] { true, false })
1518 >        for (Integer v1 : new Integer[] { 1, null })
1519 >    {
1520          final CompletableFuture<Integer> f = new CompletableFuture<>();
1521          final CompletableFuture<Integer> g = new CompletableFuture<>();
1522 <        final SubtractAction r = new SubtractAction();
1522 >        final SubtractAction r = new SubtractAction(m);
1523  
1524 <        assertTrue(f.cancel(mayInterruptIfRunning));
1525 <        g.complete(v1);
1524 >        (fFirst ? f : g).complete(v1);
1525 >        if (!createIncomplete)
1526 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1527          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1528 +        if (createIncomplete) {
1529 +            checkIncomplete(h);
1530 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1531 +        }
1532  
1533          checkCompletedWithWrappedCancellationException(h);
1534 <        checkCancelled(f);
1535 <        assertEquals(0, r.invocationCount);
1536 <        checkCompletedNormally(g, v1);
1537 <        }
1680 <    }
1534 >        checkCancelled(!fFirst ? f : g);
1535 >        r.assertNotInvoked();
1536 >        checkCompletedNormally(fFirst ? f : g, v1);
1537 >    }}
1538  
1539      /**
1540 <     * runAfterBoth result completes normally after normal
1684 <     * completion of sources
1540 >     * thenAcceptBoth result completes exceptionally if action does
1541       */
1542 <    public void testRunAfterBoth_normalCompletion1() {
1542 >    public void testThenAcceptBoth_actionFailed() {
1543          for (ExecutionMode m : ExecutionMode.values())
1544 +        for (boolean fFirst : new boolean[] { true, false })
1545          for (Integer v1 : new Integer[] { 1, null })
1546 <        for (Integer v2 : new Integer[] { 2, null }) {
1547 <
1546 >        for (Integer v2 : new Integer[] { 2, null })
1547 >    {
1548          final CompletableFuture<Integer> f = new CompletableFuture<>();
1549          final CompletableFuture<Integer> g = new CompletableFuture<>();
1550 <        final Noop r = new Noop();
1551 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1695 <
1696 <        f.complete(v1);
1697 <        checkIncomplete(h);
1698 <        assertEquals(0, r.invocationCount);
1699 <        g.complete(v2);
1550 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1551 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1552  
1553 <        checkCompletedNormally(h, null);
1554 <        assertEquals(1, r.invocationCount);
1555 <        checkCompletedNormally(f, v1);
1556 <        checkCompletedNormally(g, v2);
1553 >        if (fFirst) {
1554 >            f.complete(v1);
1555 >            g.complete(v2);
1556 >        } else {
1557 >            g.complete(v2);
1558 >            f.complete(v1);
1559          }
1706    }
1560  
1561 <    public void testRunAfterBoth_normalCompletion2() {
1709 <        for (ExecutionMode m : ExecutionMode.values())
1710 <        for (Integer v1 : new Integer[] { 1, null })
1711 <        for (Integer v2 : new Integer[] { 2, null }) {
1712 <
1713 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1714 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1715 <        final Noop r = new Noop();
1716 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1717 <
1718 <        g.complete(v2);
1719 <        checkIncomplete(h);
1720 <        assertEquals(0, r.invocationCount);
1721 <        f.complete(v1);
1722 <
1723 <        checkCompletedNormally(h, null);
1724 <        assertEquals(1, r.invocationCount);
1561 >        checkCompletedWithWrappedCFException(h);
1562          checkCompletedNormally(f, v1);
1563          checkCompletedNormally(g, v2);
1564 <        }
1728 <    }
1564 >    }}
1565  
1566 <    public void testRunAfterBoth_normalCompletion3() {
1566 >    /**
1567 >     * runAfterBoth result completes normally after normal
1568 >     * completion of sources
1569 >     */
1570 >    public void testRunAfterBoth_normalCompletion() {
1571          for (ExecutionMode m : ExecutionMode.values())
1572 +        for (boolean createIncomplete : new boolean[] { true, false })
1573 +        for (boolean fFirst : new boolean[] { true, false })
1574          for (Integer v1 : new Integer[] { 1, null })
1575 <        for (Integer v2 : new Integer[] { 2, null }) {
1576 <
1575 >        for (Integer v2 : new Integer[] { 2, null })
1576 >    {
1577          final CompletableFuture<Integer> f = new CompletableFuture<>();
1578          final CompletableFuture<Integer> g = new CompletableFuture<>();
1579 <        final Noop r = new Noop();
1579 >        final Noop r = new Noop(m);
1580  
1581 <        g.complete(v2);
1582 <        f.complete(v1);
1581 >        if (fFirst) f.complete(v1); else g.complete(v2);
1582 >        if (!createIncomplete)
1583 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1584          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1585 <
1586 <        checkCompletedNormally(h, null);
1587 <        assertEquals(1, r.invocationCount);
1588 <        checkCompletedNormally(f, v1);
1746 <        checkCompletedNormally(g, v2);
1585 >        if (createIncomplete) {
1586 >            checkIncomplete(h);
1587 >            r.assertNotInvoked();
1588 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1589          }
1748    }
1749
1750    public void testRunAfterBoth_normalCompletion4() {
1751        for (ExecutionMode m : ExecutionMode.values())
1752        for (Integer v1 : new Integer[] { 1, null })
1753        for (Integer v2 : new Integer[] { 2, null }) {
1754
1755        final CompletableFuture<Integer> f = new CompletableFuture<>();
1756        final CompletableFuture<Integer> g = new CompletableFuture<>();
1757        final Noop r = new Noop();
1758
1759        f.complete(v1);
1760        g.complete(v2);
1761        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1590  
1591          checkCompletedNormally(h, null);
1592 <        assertEquals(1, r.invocationCount);
1592 >        r.assertInvoked();
1593          checkCompletedNormally(f, v1);
1594          checkCompletedNormally(g, v2);
1595 <        }
1768 <    }
1595 >    }}
1596  
1597      /**
1598       * runAfterBoth result completes exceptionally after exceptional
1599       * completion of either source
1600       */
1601 <    public void testRunAfterBoth_exceptionalCompletion1() {
1775 <        for (ExecutionMode m : ExecutionMode.values())
1776 <        for (Integer v1 : new Integer[] { 1, null }) {
1777 <
1778 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1779 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1780 <        final Noop r = new Noop();
1781 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1782 <        final CFException ex = new CFException();
1783 <
1784 <        f.completeExceptionally(ex);
1785 <        checkIncomplete(h);
1786 <        g.complete(v1);
1787 <
1788 <        checkCompletedWithWrappedCFException(h, ex);
1789 <        checkCompletedWithWrappedCFException(f, ex);
1790 <        assertEquals(0, r.invocationCount);
1791 <        checkCompletedNormally(g, v1);
1792 <        }
1793 <    }
1794 <
1795 <    public void testRunAfterBoth_exceptionalCompletion2() {
1796 <        for (ExecutionMode m : ExecutionMode.values())
1797 <        for (Integer v1 : new Integer[] { 1, null }) {
1798 <
1799 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1800 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1801 <        final Noop r = new Noop();
1802 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1803 <        final CFException ex = new CFException();
1804 <
1805 <        g.completeExceptionally(ex);
1806 <        checkIncomplete(h);
1807 <        f.complete(v1);
1808 <
1809 <        checkCompletedWithWrappedCFException(h, ex);
1810 <        checkCompletedWithWrappedCFException(g, ex);
1811 <        assertEquals(0, r.invocationCount);
1812 <        checkCompletedNormally(f, v1);
1813 <        }
1814 <    }
1815 <
1816 <    public void testRunAfterBoth_exceptionalCompletion3() {
1601 >    public void testRunAfterBoth_exceptionalCompletion() {
1602          for (ExecutionMode m : ExecutionMode.values())
1603 <        for (Integer v1 : new Integer[] { 1, null }) {
1604 <
1603 >        for (boolean createIncomplete : new boolean[] { true, false })
1604 >        for (boolean fFirst : new boolean[] { true, false })
1605 >        for (Integer v1 : new Integer[] { 1, null })
1606 >    {
1607          final CompletableFuture<Integer> f = new CompletableFuture<>();
1608          final CompletableFuture<Integer> g = new CompletableFuture<>();
1822        final Noop r = new Noop();
1609          final CFException ex = new CFException();
1610 +        final Noop r = new Noop(m);
1611  
1612 <        g.completeExceptionally(ex);
1613 <        f.complete(v1);
1612 >        (fFirst ? f : g).complete(v1);
1613 >        if (!createIncomplete)
1614 >            (!fFirst ? f : g).completeExceptionally(ex);
1615          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1616 <
1617 <        checkCompletedWithWrappedCFException(h, ex);
1618 <        checkCompletedWithWrappedCFException(g, ex);
1831 <        assertEquals(0, r.invocationCount);
1832 <        checkCompletedNormally(f, v1);
1616 >        if (createIncomplete) {
1617 >            checkIncomplete(h);
1618 >            (!fFirst ? f : g).completeExceptionally(ex);
1619          }
1834    }
1835
1836    public void testRunAfterBoth_exceptionalCompletion4() {
1837        for (ExecutionMode m : ExecutionMode.values())
1838        for (Integer v1 : new Integer[] { 1, null }) {
1839
1840        final CompletableFuture<Integer> f = new CompletableFuture<>();
1841        final CompletableFuture<Integer> g = new CompletableFuture<>();
1842        final Noop r = new Noop();
1843        final CFException ex = new CFException();
1844
1845        f.completeExceptionally(ex);
1846        g.complete(v1);
1847        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1620  
1621          checkCompletedWithWrappedCFException(h, ex);
1622 <        checkCompletedWithWrappedCFException(f, ex);
1623 <        assertEquals(0, r.invocationCount);
1624 <        checkCompletedNormally(g, v1);
1625 <        }
1854 <    }
1855 <
1856 <    /**
1857 <     * runAfterBoth result completes exceptionally if action does
1858 <     */
1859 <    public void testRunAfterBoth_actionFailed1() {
1860 <        for (ExecutionMode m : ExecutionMode.values())
1861 <        for (Integer v1 : new Integer[] { 1, null })
1862 <        for (Integer v2 : new Integer[] { 2, null }) {
1863 <
1864 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1865 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1866 <        final FailingNoop r = new FailingNoop();
1867 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1868 <
1869 <        f.complete(v1);
1870 <        checkIncomplete(h);
1871 <        g.complete(v2);
1872 <
1873 <        checkCompletedWithWrappedCFException(h);
1874 <        checkCompletedNormally(f, v1);
1875 <        checkCompletedNormally(g, v2);
1876 <        }
1877 <    }
1878 <
1879 <    public void testRunAfterBoth_actionFailed2() {
1880 <        for (ExecutionMode m : ExecutionMode.values())
1881 <        for (Integer v1 : new Integer[] { 1, null })
1882 <        for (Integer v2 : new Integer[] { 2, null }) {
1883 <
1884 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1885 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1886 <        final FailingNoop r = new FailingNoop();
1887 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1888 <
1889 <        g.complete(v2);
1890 <        checkIncomplete(h);
1891 <        f.complete(v1);
1892 <
1893 <        checkCompletedWithWrappedCFException(h);
1894 <        checkCompletedNormally(f, v1);
1895 <        checkCompletedNormally(g, v2);
1896 <        }
1897 <    }
1622 >        r.assertNotInvoked();
1623 >        checkCompletedNormally(fFirst ? f : g, v1);
1624 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1625 >    }}
1626  
1627      /**
1628       * runAfterBoth result completes exceptionally if either source cancelled
1629       */
1630 <    public void testRunAfterBoth_sourceCancelled1() {
1630 >    public void testRunAfterBoth_sourceCancelled() {
1631          for (ExecutionMode m : ExecutionMode.values())
1632          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1633 <        for (Integer v1 : new Integer[] { 1, null }) {
1634 <
1633 >        for (boolean createIncomplete : new boolean[] { true, false })
1634 >        for (boolean fFirst : new boolean[] { true, false })
1635 >        for (Integer v1 : new Integer[] { 1, null })
1636 >    {
1637          final CompletableFuture<Integer> f = new CompletableFuture<>();
1638          final CompletableFuture<Integer> g = new CompletableFuture<>();
1639 <        final Noop r = new Noop();
1910 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1911 <
1912 <        assertTrue(f.cancel(mayInterruptIfRunning));
1913 <        checkIncomplete(h);
1914 <        g.complete(v1);
1915 <
1916 <        checkCompletedWithWrappedCancellationException(h);
1917 <        checkCancelled(f);
1918 <        assertEquals(0, r.invocationCount);
1919 <        checkCompletedNormally(g, v1);
1920 <        }
1921 <    }
1639 >        final Noop r = new Noop(m);
1640  
1923    public void testRunAfterBoth_sourceCancelled2() {
1924        for (ExecutionMode m : ExecutionMode.values())
1925        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1926        for (Integer v1 : new Integer[] { 1, null }) {
1641  
1642 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1643 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1644 <        final Noop r = new Noop();
1642 >        (fFirst ? f : g).complete(v1);
1643 >        if (!createIncomplete)
1644 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1645          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1646 <
1647 <        assertTrue(g.cancel(mayInterruptIfRunning));
1648 <        checkIncomplete(h);
1935 <        f.complete(v1);
1936 <
1937 <        checkCompletedWithWrappedCancellationException(h);
1938 <        checkCancelled(g);
1939 <        assertEquals(0, r.invocationCount);
1940 <        checkCompletedNormally(f, v1);
1646 >        if (createIncomplete) {
1647 >            checkIncomplete(h);
1648 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1649          }
1942    }
1943
1944    public void testRunAfterBoth_sourceCancelled3() {
1945        for (ExecutionMode m : ExecutionMode.values())
1946        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1947        for (Integer v1 : new Integer[] { 1, null }) {
1948
1949        final CompletableFuture<Integer> f = new CompletableFuture<>();
1950        final CompletableFuture<Integer> g = new CompletableFuture<>();
1951        final Noop r = new Noop();
1952
1953        assertTrue(g.cancel(mayInterruptIfRunning));
1954        f.complete(v1);
1955        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1650  
1651          checkCompletedWithWrappedCancellationException(h);
1652 <        checkCancelled(g);
1653 <        assertEquals(0, r.invocationCount);
1654 <        checkCompletedNormally(f, v1);
1655 <        }
1962 <    }
1963 <
1964 <    public void testRunAfterBoth_sourceCancelled4() {
1965 <        for (ExecutionMode m : ExecutionMode.values())
1966 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1967 <        for (Integer v1 : new Integer[] { 1, null }) {
1968 <
1969 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1970 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1971 <        final Noop r = new Noop();
1972 <
1973 <        assertTrue(f.cancel(mayInterruptIfRunning));
1974 <        g.complete(v1);
1975 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1976 <
1977 <        checkCompletedWithWrappedCancellationException(h);
1978 <        checkCancelled(f);
1979 <        assertEquals(0, r.invocationCount);
1980 <        checkCompletedNormally(g, v1);
1981 <        }
1982 <    }
1652 >        checkCancelled(!fFirst ? f : g);
1653 >        r.assertNotInvoked();
1654 >        checkCompletedNormally(fFirst ? f : g, v1);
1655 >    }}
1656  
1657      /**
1658 <     * applyToEither result completes normally after normal completion
1986 <     * of either source
1658 >     * runAfterBoth result completes exceptionally if action does
1659       */
1660 <    public void testApplyToEither_normalCompletion1() {
1660 >    public void testRunAfterBoth_actionFailed() {
1661          for (ExecutionMode m : ExecutionMode.values())
1662 +        for (boolean fFirst : new boolean[] { true, false })
1663          for (Integer v1 : new Integer[] { 1, null })
1664 <        for (Integer v2 : new Integer[] { 2, null }) {
1665 <
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 IncFunction r = new IncFunction();
1669 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1668 >        final FailingRunnable r1 = new FailingRunnable(m);
1669 >        final FailingRunnable r2 = new FailingRunnable(m);
1670  
1671 <        f.complete(v1);
1672 <        checkCompletedNormally(h, inc(v1));
1673 <        g.complete(v2);
1674 <
1675 <        checkCompletedNormally(f, v1);
1676 <        checkCompletedNormally(g, v2);
1677 <        checkCompletedNormally(h, inc(v1));
1671 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1672 >        if (fFirst) {
1673 >            f.complete(v1);
1674 >            g.complete(v2);
1675 >        } else {
1676 >            g.complete(v2);
1677 >            f.complete(v1);
1678          }
1679 <    }
2007 <
2008 <    public void testApplyToEither_normalCompletion2() {
2009 <        for (ExecutionMode m : ExecutionMode.values())
2010 <        for (Integer v1 : new Integer[] { 1, null })
2011 <        for (Integer v2 : new Integer[] { 2, null }) {
2012 <
2013 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2014 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2015 <        final IncFunction r = new IncFunction();
2016 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2017 <
2018 <        g.complete(v2);
2019 <        checkCompletedNormally(h, inc(v2));
2020 <        f.complete(v1);
1679 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1680  
1681 +        checkCompletedWithWrappedCFException(h1);
1682 +        checkCompletedWithWrappedCFException(h2);
1683          checkCompletedNormally(f, v1);
1684          checkCompletedNormally(g, v2);
1685 <        checkCompletedNormally(h, inc(v2));
1686 <        }
1687 <    }
1688 <    public void testApplyToEither_normalCompletion3() {
1685 >    }}
1686 >
1687 >    /**
1688 >     * applyToEither result completes normally after normal completion
1689 >     * of either source
1690 >     */
1691 >    public void testApplyToEither_normalCompletion() {
1692          for (ExecutionMode m : ExecutionMode.values())
1693          for (Integer v1 : new Integer[] { 1, null })
1694 <        for (Integer v2 : new Integer[] { 2, null }) {
1695 <
1694 >        for (Integer v2 : new Integer[] { 2, null })
1695 >    {
1696          final CompletableFuture<Integer> f = new CompletableFuture<>();
1697          final CompletableFuture<Integer> g = new CompletableFuture<>();
1698 <        final IncFunction r = new IncFunction();
1698 >        final IncFunction[] rs = new IncFunction[6];
1699 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1700  
1701 <        f.complete(v1);
1702 <        g.complete(v2);
1703 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1701 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1702 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1703 >        checkIncomplete(h0);
1704 >        checkIncomplete(h1);
1705 >        rs[0].assertNotInvoked();
1706 >        rs[1].assertNotInvoked();
1707 >        f.complete(v1);
1708 >        checkCompletedNormally(h0, inc(v1));
1709 >        checkCompletedNormally(h1, inc(v1));
1710 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1711 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1712 >        checkCompletedNormally(h2, inc(v1));
1713 >        checkCompletedNormally(h3, inc(v1));
1714 >        g.complete(v2);
1715 >
1716 >        // unspecified behavior - both source completions available
1717 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1718 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1719 >        rs[4].assertValue(h4.join());
1720 >        rs[5].assertValue(h5.join());
1721 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1722 >                   Objects.equals(inc(v2), h4.join()));
1723 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1724 >                   Objects.equals(inc(v2), h5.join()));
1725  
1726          checkCompletedNormally(f, v1);
1727          checkCompletedNormally(g, v2);
1728 <
1729 <        // unspecified behavior
1730 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1731 <                   Objects.equals(h.join(), inc(v2)));
1732 <        assertEquals(1, r.invocationCount);
1733 <        }
2048 <    }
1728 >        checkCompletedNormally(h0, inc(v1));
1729 >        checkCompletedNormally(h1, inc(v1));
1730 >        checkCompletedNormally(h2, inc(v1));
1731 >        checkCompletedNormally(h3, inc(v1));
1732 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1733 >    }}
1734  
1735      /**
1736       * applyToEither result completes exceptionally after exceptional
1737       * completion of either source
1738       */
1739 <    public void testApplyToEither_exceptionalCompletion1() {
1739 >    public void testApplyToEither_exceptionalCompletion() {
1740          for (ExecutionMode m : ExecutionMode.values())
1741 <        for (Integer v1 : new Integer[] { 1, null }) {
1742 <
1741 >        for (Integer v1 : new Integer[] { 1, null })
1742 >    {
1743          final CompletableFuture<Integer> f = new CompletableFuture<>();
1744          final CompletableFuture<Integer> g = new CompletableFuture<>();
2060        final IncFunction r = new IncFunction();
2061        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1745          final CFException ex = new CFException();
1746 +        final IncFunction[] rs = new IncFunction[6];
1747 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1748  
1749 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1750 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1751 +        checkIncomplete(h0);
1752 +        checkIncomplete(h1);
1753 +        rs[0].assertNotInvoked();
1754 +        rs[1].assertNotInvoked();
1755          f.completeExceptionally(ex);
1756 <        checkCompletedWithWrappedCFException(h, ex);
1756 >        checkCompletedWithWrappedCFException(h0, ex);
1757 >        checkCompletedWithWrappedCFException(h1, ex);
1758 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1759 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1760 >        checkCompletedWithWrappedCFException(h2, ex);
1761 >        checkCompletedWithWrappedCFException(h3, ex);
1762          g.complete(v1);
1763  
1764 <        assertEquals(0, r.invocationCount);
1765 <        checkCompletedNormally(g, v1);
1766 <        checkCompletedWithWrappedCFException(f, ex);
2071 <        checkCompletedWithWrappedCFException(h, ex);
2072 <        }
2073 <    }
2074 <
2075 <    public void testApplyToEither_exceptionalCompletion2() {
2076 <        for (ExecutionMode m : ExecutionMode.values())
2077 <        for (Integer v1 : new Integer[] { 1, null }) {
2078 <
2079 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2080 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 <        final IncFunction r = new IncFunction();
2082 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2083 <        final CFException ex = new CFException();
2084 <
2085 <        g.completeExceptionally(ex);
2086 <        checkCompletedWithWrappedCFException(h, ex);
2087 <        f.complete(v1);
2088 <
2089 <        assertEquals(0, r.invocationCount);
2090 <        checkCompletedNormally(f, v1);
2091 <        checkCompletedWithWrappedCFException(g, ex);
2092 <        checkCompletedWithWrappedCFException(h, ex);
2093 <        }
2094 <    }
2095 <
2096 <    public void testApplyToEither_exceptionalCompletion3() {
2097 <        for (ExecutionMode m : ExecutionMode.values())
2098 <        for (Integer v1 : new Integer[] { 1, null }) {
2099 <
2100 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2101 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2102 <        final IncFunction r = new IncFunction();
2103 <        final CFException ex = new CFException();
2104 <
2105 <        g.completeExceptionally(ex);
2106 <        f.complete(v1);
2107 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2108 <
2109 <        // unspecified behavior
2110 <        Integer v;
1764 >        // unspecified behavior - both source completions available
1765 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1766 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1767          try {
1768 <            assertEquals(inc(v1), h.join());
1769 <            assertEquals(1, r.invocationCount);
1768 >            assertEquals(inc(v1), h4.join());
1769 >            rs[4].assertInvoked();
1770          } catch (CompletionException ok) {
1771 <            checkCompletedWithWrappedCFException(h, ex);
1772 <            assertEquals(0, r.invocationCount);
2117 <        }
2118 <
2119 <        checkCompletedWithWrappedCFException(g, ex);
2120 <        checkCompletedNormally(f, v1);
1771 >            checkCompletedWithWrappedCFException(h4, ex);
1772 >            rs[4].assertNotInvoked();
1773          }
2122    }
2123
2124    public void testApplyToEither_exceptionalCompletion4() {
2125        for (ExecutionMode m : ExecutionMode.values())
2126        for (Integer v1 : new Integer[] { 1, null }) {
2127
2128        final CompletableFuture<Integer> f = new CompletableFuture<>();
2129        final CompletableFuture<Integer> g = new CompletableFuture<>();
2130        final IncFunction r = new IncFunction();
2131        final CFException ex = new CFException();
2132
2133        f.completeExceptionally(ex);
2134        g.complete(v1);
2135        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2136
2137        // unspecified behavior
2138        Integer v;
1774          try {
1775 <            assertEquals(inc(v1), h.join());
1776 <            assertEquals(1, r.invocationCount);
1775 >            assertEquals(inc(v1), h5.join());
1776 >            rs[5].assertInvoked();
1777          } catch (CompletionException ok) {
1778 <            checkCompletedWithWrappedCFException(h, ex);
1779 <            assertEquals(0, r.invocationCount);
1778 >            checkCompletedWithWrappedCFException(h5, ex);
1779 >            rs[5].assertNotInvoked();
1780          }
1781  
1782          checkCompletedWithWrappedCFException(f, ex);
1783          checkCompletedNormally(g, v1);
1784 <        }
1785 <    }
1786 <
1787 <    /**
1788 <     * applyToEither result completes exceptionally if action does
1789 <     */
1790 <    public void testApplyToEither_actionFailed1() {
2156 <        for (ExecutionMode m : ExecutionMode.values())
2157 <        for (Integer v1 : new Integer[] { 1, null })
2158 <        for (Integer v2 : new Integer[] { 2, null }) {
2159 <
2160 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2161 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2162 <        final FailingFunction r = new FailingFunction();
2163 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2164 <
2165 <        f.complete(v1);
2166 <        checkCompletedWithWrappedCFException(h);
2167 <        g.complete(v2);
2168 <        checkCompletedNormally(f, v1);
2169 <        checkCompletedNormally(g, v2);
2170 <        }
2171 <    }
2172 <
2173 <    public void testApplyToEither_actionFailed2() {
2174 <        for (ExecutionMode m : ExecutionMode.values())
2175 <        for (Integer v1 : new Integer[] { 1, null })
2176 <        for (Integer v2 : new Integer[] { 2, null }) {
2177 <
2178 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2179 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2180 <        final FailingFunction r = new FailingFunction();
2181 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2182 <
2183 <        g.complete(v2);
2184 <        checkCompletedWithWrappedCFException(h);
2185 <        f.complete(v1);
2186 <        checkCompletedNormally(f, v1);
2187 <        checkCompletedNormally(g, v2);
2188 <        }
2189 <    }
1784 >        checkCompletedWithWrappedCFException(h0, ex);
1785 >        checkCompletedWithWrappedCFException(h1, ex);
1786 >        checkCompletedWithWrappedCFException(h2, ex);
1787 >        checkCompletedWithWrappedCFException(h3, ex);
1788 >        checkCompletedWithWrappedCFException(h4, ex);
1789 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1790 >    }}
1791  
1792      /**
1793       * applyToEither result completes exceptionally if either source cancelled
1794       */
1795 <    public void testApplyToEither_sourceCancelled1() {
1795 >    public void testApplyToEither_sourceCancelled() {
1796          for (ExecutionMode m : ExecutionMode.values())
1797          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1798 <        for (Integer v1 : new Integer[] { 1, null }) {
1799 <
2199 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2200 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2201 <        final IncFunction r = new IncFunction();
2202 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2203 <
2204 <        assertTrue(f.cancel(mayInterruptIfRunning));
2205 <        checkCompletedWithWrappedCancellationException(h);
2206 <        g.complete(v1);
2207 <
2208 <        checkCancelled(f);
2209 <        assertEquals(0, r.invocationCount);
2210 <        checkCompletedNormally(g, v1);
2211 <        checkCompletedWithWrappedCancellationException(h);
2212 <        }
2213 <    }
2214 <
2215 <    public void testApplyToEither_sourceCancelled2() {
2216 <        for (ExecutionMode m : ExecutionMode.values())
2217 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2218 <        for (Integer v1 : new Integer[] { 1, null }) {
2219 <
2220 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2221 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2222 <        final IncFunction r = new IncFunction();
2223 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2224 <
2225 <        assertTrue(g.cancel(mayInterruptIfRunning));
2226 <        checkCompletedWithWrappedCancellationException(h);
2227 <        f.complete(v1);
2228 <
2229 <        checkCancelled(g);
2230 <        assertEquals(0, r.invocationCount);
2231 <        checkCompletedNormally(f, v1);
2232 <        checkCompletedWithWrappedCancellationException(h);
2233 <        }
2234 <    }
2235 <
2236 <    public void testApplyToEither_sourceCancelled3() {
2237 <        for (ExecutionMode m : ExecutionMode.values())
2238 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2239 <        for (Integer v1 : new Integer[] { 1, null }) {
2240 <
1798 >        for (Integer v1 : new Integer[] { 1, null })
1799 >    {
1800          final CompletableFuture<Integer> f = new CompletableFuture<>();
1801          final CompletableFuture<Integer> g = new CompletableFuture<>();
1802 <        final IncFunction r = new IncFunction();
1802 >        final IncFunction[] rs = new IncFunction[6];
1803 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1804  
1805 <        assertTrue(g.cancel(mayInterruptIfRunning));
1806 <        f.complete(v1);
1807 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1808 <
1809 <        // unspecified behavior
1810 <        Integer v;
1805 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1806 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1807 >        checkIncomplete(h0);
1808 >        checkIncomplete(h1);
1809 >        rs[0].assertNotInvoked();
1810 >        rs[1].assertNotInvoked();
1811 >        f.cancel(mayInterruptIfRunning);
1812 >        checkCompletedWithWrappedCancellationException(h0);
1813 >        checkCompletedWithWrappedCancellationException(h1);
1814 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1815 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1816 >        checkCompletedWithWrappedCancellationException(h2);
1817 >        checkCompletedWithWrappedCancellationException(h3);
1818 >        g.complete(v1);
1819 >
1820 >        // unspecified behavior - both source completions available
1821 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1822 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1823          try {
1824 <            assertEquals(inc(v1), h.join());
1825 <            assertEquals(1, r.invocationCount);
1824 >            assertEquals(inc(v1), h4.join());
1825 >            rs[4].assertInvoked();
1826          } catch (CompletionException ok) {
1827 <            checkCompletedWithWrappedCancellationException(h);
1828 <            assertEquals(0, r.invocationCount);
1827 >            checkCompletedWithWrappedCancellationException(h4);
1828 >            rs[4].assertNotInvoked();
1829          }
2258
2259        checkCancelled(g);
2260        checkCompletedNormally(f, v1);
2261        }
2262    }
2263
2264    public void testApplyToEither_sourceCancelled4() {
2265        for (ExecutionMode m : ExecutionMode.values())
2266        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2267        for (Integer v1 : new Integer[] { 1, null }) {
2268
2269        final CompletableFuture<Integer> f = new CompletableFuture<>();
2270        final CompletableFuture<Integer> g = new CompletableFuture<>();
2271        final IncFunction r = new IncFunction();
2272
2273        assertTrue(f.cancel(mayInterruptIfRunning));
2274        g.complete(v1);
2275        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2276
2277        // unspecified behavior
2278        Integer v;
1830          try {
1831 <            assertEquals(inc(v1), h.join());
1832 <            assertEquals(1, r.invocationCount);
1831 >            assertEquals(inc(v1), h5.join());
1832 >            rs[5].assertInvoked();
1833          } catch (CompletionException ok) {
1834 <            checkCompletedWithWrappedCancellationException(h);
1835 <            assertEquals(0, r.invocationCount);
1834 >            checkCompletedWithWrappedCancellationException(h5);
1835 >            rs[5].assertNotInvoked();
1836          }
1837  
1838          checkCancelled(f);
1839          checkCompletedNormally(g, v1);
1840 <        }
1841 <    }
1840 >        checkCompletedWithWrappedCancellationException(h0);
1841 >        checkCompletedWithWrappedCancellationException(h1);
1842 >        checkCompletedWithWrappedCancellationException(h2);
1843 >        checkCompletedWithWrappedCancellationException(h3);
1844 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1845 >    }}
1846  
1847      /**
1848 <     * acceptEither result completes normally after normal completion
2294 <     * of either source
1848 >     * applyToEither result completes exceptionally if action does
1849       */
1850 <    public void testAcceptEither_normalCompletion1() {
1850 >    public void testApplyToEither_actionFailed() {
1851          for (ExecutionMode m : ExecutionMode.values())
1852          for (Integer v1 : new Integer[] { 1, null })
1853 <        for (Integer v2 : new Integer[] { 2, null }) {
1854 <
1853 >        for (Integer v2 : new Integer[] { 2, null })
1854 >    {
1855          final CompletableFuture<Integer> f = new CompletableFuture<>();
1856          final CompletableFuture<Integer> g = new CompletableFuture<>();
1857 <        final IncAction r = new IncAction();
1858 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1857 >        final FailingFunction[] rs = new FailingFunction[6];
1858 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1859  
1860 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1861 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1862          f.complete(v1);
1863 <        checkCompletedNormally(h, null);
1864 <        assertEquals(inc(v1), r.value);
1865 <        g.complete(v2);
1866 <
1867 <        checkCompletedNormally(f, v1);
1868 <        checkCompletedNormally(g, v2);
1869 <        checkCompletedNormally(h, null);
2314 <        }
2315 <    }
2316 <
2317 <    public void testAcceptEither_normalCompletion2() {
2318 <        for (ExecutionMode m : ExecutionMode.values())
2319 <        for (Integer v1 : new Integer[] { 1, null })
2320 <        for (Integer v2 : new Integer[] { 2, null }) {
2321 <
2322 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2323 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 <        final IncAction r = new IncAction();
2325 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1863 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1864 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1865 >        checkCompletedWithWrappedCFException(h0);
1866 >        checkCompletedWithWrappedCFException(h1);
1867 >        checkCompletedWithWrappedCFException(h2);
1868 >        checkCompletedWithWrappedCFException(h3);
1869 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1870  
1871          g.complete(v2);
1872 <        checkCompletedNormally(h, null);
1873 <        assertEquals(inc(v2), r.value);
1874 <        f.complete(v1);
1872 >
1873 >        // unspecified behavior - both source completions available
1874 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1875 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1876 >
1877 >        checkCompletedWithWrappedCFException(h4);
1878 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1879 >                   Objects.equals(v2, rs[4].value));
1880 >        checkCompletedWithWrappedCFException(h5);
1881 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1882 >                   Objects.equals(v2, rs[5].value));
1883  
1884          checkCompletedNormally(f, v1);
1885          checkCompletedNormally(g, v2);
1886 <        checkCompletedNormally(h, null);
1887 <        }
1888 <    }
1889 <    public void testAcceptEither_normalCompletion3() {
1886 >    }}
1887 >
1888 >    /**
1889 >     * acceptEither result completes normally after normal completion
1890 >     * of either source
1891 >     */
1892 >    public void testAcceptEither_normalCompletion() {
1893          for (ExecutionMode m : ExecutionMode.values())
1894          for (Integer v1 : new Integer[] { 1, null })
1895 <        for (Integer v2 : new Integer[] { 2, null }) {
1896 <
1895 >        for (Integer v2 : new Integer[] { 2, null })
1896 >    {
1897          final CompletableFuture<Integer> f = new CompletableFuture<>();
1898          final CompletableFuture<Integer> g = new CompletableFuture<>();
1899 <        final IncAction r = new IncAction();
1899 >        final IncAction[] rs = new IncAction[6];
1900 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1901  
1902 <        f.complete(v1);
1903 <        g.complete(v2);
1904 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1902 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1903 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1904 >        checkIncomplete(h0);
1905 >        checkIncomplete(h1);
1906 >        rs[0].assertNotInvoked();
1907 >        rs[1].assertNotInvoked();
1908 >        f.complete(v1);
1909 >        checkCompletedNormally(h0, null);
1910 >        checkCompletedNormally(h1, null);
1911 >        rs[0].assertValue(inc(v1));
1912 >        rs[1].assertValue(inc(v1));
1913 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1914 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1915 >        checkCompletedNormally(h2, null);
1916 >        checkCompletedNormally(h3, null);
1917 >        rs[2].assertValue(inc(v1));
1918 >        rs[3].assertValue(inc(v1));
1919 >        g.complete(v2);
1920 >
1921 >        // unspecified behavior - both source completions available
1922 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1923 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1924 >        checkCompletedNormally(h4, null);
1925 >        checkCompletedNormally(h5, null);
1926 >        assertTrue(Objects.equals(inc(v1), rs[4].value) ||
1927 >                   Objects.equals(inc(v2), rs[4].value));
1928 >        assertTrue(Objects.equals(inc(v1), rs[5].value) ||
1929 >                   Objects.equals(inc(v2), rs[5].value));
1930  
2350        checkCompletedNormally(h, null);
1931          checkCompletedNormally(f, v1);
1932          checkCompletedNormally(g, v2);
1933 <
1934 <        // unspecified behavior
1935 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
1936 <                   Objects.equals(r.value, inc(v2)));
1937 <        }
1938 <    }
1933 >        checkCompletedNormally(h0, null);
1934 >        checkCompletedNormally(h1, null);
1935 >        checkCompletedNormally(h2, null);
1936 >        checkCompletedNormally(h3, null);
1937 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1938 >    }}
1939  
1940      /**
1941       * acceptEither result completes exceptionally after exceptional
1942       * completion of either source
1943       */
1944 <    public void testAcceptEither_exceptionalCompletion1() {
1944 >    public void testAcceptEither_exceptionalCompletion() {
1945          for (ExecutionMode m : ExecutionMode.values())
1946 <        for (Integer v1 : new Integer[] { 1, null }) {
1947 <
1946 >        for (Integer v1 : new Integer[] { 1, null })
1947 >    {
1948          final CompletableFuture<Integer> f = new CompletableFuture<>();
1949          final CompletableFuture<Integer> g = new CompletableFuture<>();
2370        final IncAction r = new IncAction();
2371        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1950          final CFException ex = new CFException();
1951 +        final IncAction[] rs = new IncAction[6];
1952 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1953  
1954 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1955 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1956 +        checkIncomplete(h0);
1957 +        checkIncomplete(h1);
1958 +        rs[0].assertNotInvoked();
1959 +        rs[1].assertNotInvoked();
1960          f.completeExceptionally(ex);
1961 <        checkCompletedWithWrappedCFException(h, ex);
1962 <        g.complete(v1);
1963 <
1964 <        assertEquals(0, r.invocationCount);
1965 <        checkCompletedNormally(g, v1);
1966 <        checkCompletedWithWrappedCFException(f, ex);
2381 <        checkCompletedWithWrappedCFException(h, ex);
2382 <        }
2383 <    }
2384 <
2385 <    public void testAcceptEither_exceptionalCompletion2() {
2386 <        for (ExecutionMode m : ExecutionMode.values())
2387 <        for (Integer v1 : new Integer[] { 1, null }) {
2388 <
2389 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2390 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final IncAction r = new IncAction();
2392 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2393 <        final CFException ex = new CFException();
1961 >        checkCompletedWithWrappedCFException(h0, ex);
1962 >        checkCompletedWithWrappedCFException(h1, ex);
1963 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1964 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1965 >        checkCompletedWithWrappedCFException(h2, ex);
1966 >        checkCompletedWithWrappedCFException(h3, ex);
1967  
1968 <        g.completeExceptionally(ex);
2396 <        checkCompletedWithWrappedCFException(h, ex);
2397 <        f.complete(v1);
2398 <
2399 <        assertEquals(0, r.invocationCount);
2400 <        checkCompletedNormally(f, v1);
2401 <        checkCompletedWithWrappedCFException(g, ex);
2402 <        checkCompletedWithWrappedCFException(h, ex);
2403 <        }
2404 <    }
2405 <
2406 <    public void testAcceptEither_exceptionalCompletion3() {
2407 <        for (ExecutionMode m : ExecutionMode.values())
2408 <        for (Integer v1 : new Integer[] { 1, null }) {
2409 <
2410 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2411 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2412 <        final IncAction r = new IncAction();
2413 <        final CFException ex = new CFException();
2414 <
2415 <        g.completeExceptionally(ex);
2416 <        f.complete(v1);
2417 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1968 >        g.complete(v1);
1969  
1970 <        // unspecified behavior
1971 <        Integer v;
1970 >        // unspecified behavior - both source completions available
1971 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1972 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1973          try {
1974 <            assertNull(h.join());
1975 <            assertEquals(1, r.invocationCount);
2424 <            assertEquals(inc(v1), r.value);
1974 >            assertNull(h4.join());
1975 >            rs[4].assertValue(inc(v1));
1976          } catch (CompletionException ok) {
1977 <            checkCompletedWithWrappedCFException(h, ex);
1978 <            assertEquals(0, r.invocationCount);
1977 >            checkCompletedWithWrappedCFException(h4, ex);
1978 >            rs[4].assertNotInvoked();
1979          }
2429
2430        checkCompletedWithWrappedCFException(g, ex);
2431        checkCompletedNormally(f, v1);
2432        }
2433    }
2434
2435    public void testAcceptEither_exceptionalCompletion4() {
2436        for (ExecutionMode m : ExecutionMode.values())
2437        for (Integer v1 : new Integer[] { 1, null }) {
2438
2439        final CompletableFuture<Integer> f = new CompletableFuture<>();
2440        final CompletableFuture<Integer> g = new CompletableFuture<>();
2441        final IncAction r = new IncAction();
2442        final CFException ex = new CFException();
2443
2444        f.completeExceptionally(ex);
2445        g.complete(v1);
2446        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2447
2448        // unspecified behavior
2449        Integer v;
1980          try {
1981 <            assertNull(h.join());
1982 <            assertEquals(1, r.invocationCount);
2453 <            assertEquals(inc(v1), r.value);
1981 >            assertNull(h5.join());
1982 >            rs[5].assertValue(inc(v1));
1983          } catch (CompletionException ok) {
1984 <            checkCompletedWithWrappedCFException(h, ex);
1985 <            assertEquals(0, r.invocationCount);
1984 >            checkCompletedWithWrappedCFException(h5, ex);
1985 >            rs[5].assertNotInvoked();
1986          }
1987  
1988          checkCompletedWithWrappedCFException(f, ex);
1989          checkCompletedNormally(g, v1);
1990 <        }
1991 <    }
1990 >        checkCompletedWithWrappedCFException(h0, ex);
1991 >        checkCompletedWithWrappedCFException(h1, ex);
1992 >        checkCompletedWithWrappedCFException(h2, ex);
1993 >        checkCompletedWithWrappedCFException(h3, ex);
1994 >        checkCompletedWithWrappedCFException(h4, ex);
1995 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1996 >    }}
1997  
1998      /**
1999 <     * acceptEither result completes exceptionally if action does
1999 >     * acceptEither result completes exceptionally if either source cancelled
2000       */
2001 <    public void testAcceptEither_actionFailed1() {
2001 >    public void testAcceptEither_sourceCancelled() {
2002          for (ExecutionMode m : ExecutionMode.values())
2003 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2004          for (Integer v1 : new Integer[] { 1, null })
2005 <        for (Integer v2 : new Integer[] { 2, null }) {
2471 <
2005 >    {
2006          final CompletableFuture<Integer> f = new CompletableFuture<>();
2007          final CompletableFuture<Integer> g = new CompletableFuture<>();
2008 <        final FailingConsumer r = new FailingConsumer();
2009 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2008 >        final IncAction[] rs = new IncAction[6];
2009 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
2010  
2011 <        f.complete(v1);
2012 <        checkCompletedWithWrappedCFException(h);
2013 <        g.complete(v2);
2014 <        checkCompletedNormally(f, v1);
2015 <        checkCompletedNormally(g, v2);
2016 <        }
2017 <    }
2018 <
2019 <    public void testAcceptEither_actionFailed2() {
2020 <        for (ExecutionMode m : ExecutionMode.values())
2021 <        for (Integer v1 : new Integer[] { 1, null })
2022 <        for (Integer v2 : new Integer[] { 2, null }) {
2011 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2012 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2013 >        checkIncomplete(h0);
2014 >        checkIncomplete(h1);
2015 >        rs[0].assertNotInvoked();
2016 >        rs[1].assertNotInvoked();
2017 >        f.cancel(mayInterruptIfRunning);
2018 >        checkCompletedWithWrappedCancellationException(h0);
2019 >        checkCompletedWithWrappedCancellationException(h1);
2020 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2021 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2022 >        checkCompletedWithWrappedCancellationException(h2);
2023 >        checkCompletedWithWrappedCancellationException(h3);
2024  
2025 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2491 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2492 <        final FailingConsumer r = new FailingConsumer();
2493 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2025 >        g.complete(v1);
2026  
2027 <        g.complete(v2);
2028 <        checkCompletedWithWrappedCFException(h);
2029 <        f.complete(v1);
2030 <        checkCompletedNormally(f, v1);
2031 <        checkCompletedNormally(g, v2);
2027 >        // unspecified behavior - both source completions available
2028 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2029 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2030 >        try {
2031 >            assertNull(h4.join());
2032 >            rs[4].assertValue(inc(v1));
2033 >        } catch (CompletionException ok) {
2034 >            checkCompletedWithWrappedCancellationException(h4);
2035 >            rs[4].assertNotInvoked();
2036 >        }
2037 >        try {
2038 >            assertNull(h5.join());
2039 >            rs[5].assertValue(inc(v1));
2040 >        } catch (CompletionException ok) {
2041 >            checkCompletedWithWrappedCancellationException(h5);
2042 >            rs[5].assertNotInvoked();
2043          }
2501    }
2502
2503    /**
2504     * acceptEither result completes exceptionally if either source cancelled
2505     */
2506    public void testAcceptEither_sourceCancelled1() {
2507        for (ExecutionMode m : ExecutionMode.values())
2508        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2509        for (Integer v1 : new Integer[] { 1, null }) {
2510
2511        final CompletableFuture<Integer> f = new CompletableFuture<>();
2512        final CompletableFuture<Integer> g = new CompletableFuture<>();
2513        final IncAction r = new IncAction();
2514        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2515
2516        assertTrue(f.cancel(mayInterruptIfRunning));
2517        checkCompletedWithWrappedCancellationException(h);
2518        g.complete(v1);
2044  
2045          checkCancelled(f);
2521        assertEquals(0, r.invocationCount);
2046          checkCompletedNormally(g, v1);
2047 <        checkCompletedWithWrappedCancellationException(h);
2048 <        }
2049 <    }
2047 >        checkCompletedWithWrappedCancellationException(h0);
2048 >        checkCompletedWithWrappedCancellationException(h1);
2049 >        checkCompletedWithWrappedCancellationException(h2);
2050 >        checkCompletedWithWrappedCancellationException(h3);
2051 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2052 >    }}
2053  
2054 <    public void testAcceptEither_sourceCancelled2() {
2054 >    /**
2055 >     * acceptEither result completes exceptionally if action does
2056 >     */
2057 >    public void testAcceptEither_actionFailed() {
2058          for (ExecutionMode m : ExecutionMode.values())
2059 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2060 <        for (Integer v1 : new Integer[] { 1, null }) {
2061 <
2059 >        for (Integer v1 : new Integer[] { 1, null })
2060 >        for (Integer v2 : new Integer[] { 2, null })
2061 >    {
2062          final CompletableFuture<Integer> f = new CompletableFuture<>();
2063          final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 <        final IncAction r = new IncAction();
2065 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2064 >        final FailingConsumer[] rs = new FailingConsumer[6];
2065 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2066  
2067 <        assertTrue(g.cancel(mayInterruptIfRunning));
2068 <        checkCompletedWithWrappedCancellationException(h);
2067 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2068 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2069          f.complete(v1);
2070 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2071 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2072 +        checkCompletedWithWrappedCFException(h0);
2073 +        checkCompletedWithWrappedCFException(h1);
2074 +        checkCompletedWithWrappedCFException(h2);
2075 +        checkCompletedWithWrappedCFException(h3);
2076 +        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2077  
2078 <        checkCancelled(g);
2542 <        assertEquals(0, r.invocationCount);
2543 <        checkCompletedNormally(f, v1);
2544 <        checkCompletedWithWrappedCancellationException(h);
2545 <        }
2546 <    }
2547 <
2548 <    public void testAcceptEither_sourceCancelled3() {
2549 <        for (ExecutionMode m : ExecutionMode.values())
2550 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2551 <        for (Integer v1 : new Integer[] { 1, null }) {
2552 <
2553 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2554 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2555 <        final IncAction r = new IncAction();
2556 <
2557 <        assertTrue(g.cancel(mayInterruptIfRunning));
2558 <        f.complete(v1);
2559 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2078 >        g.complete(v2);
2079  
2080 <        // unspecified behavior
2081 <        Integer v;
2082 <        try {
2083 <            assertNull(h.join());
2084 <            assertEquals(1, r.invocationCount);
2085 <            assertEquals(inc(v1), r.value);
2086 <        } catch (CompletionException ok) {
2087 <            checkCompletedWithWrappedCancellationException(h);
2088 <            assertEquals(0, r.invocationCount);
2089 <        }
2080 >        // unspecified behavior - both source completions available
2081 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2082 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2083 >
2084 >        checkCompletedWithWrappedCFException(h4);
2085 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2086 >                   Objects.equals(v2, rs[4].value));
2087 >        checkCompletedWithWrappedCFException(h5);
2088 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2089 >                   Objects.equals(v2, rs[5].value));
2090  
2572        checkCancelled(g);
2091          checkCompletedNormally(f, v1);
2092 <        }
2093 <    }
2576 <
2577 <    public void testAcceptEither_sourceCancelled4() {
2578 <        for (ExecutionMode m : ExecutionMode.values())
2579 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2580 <        for (Integer v1 : new Integer[] { 1, null }) {
2581 <
2582 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2583 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2584 <        final IncAction r = new IncAction();
2585 <
2586 <        assertTrue(f.cancel(mayInterruptIfRunning));
2587 <        g.complete(v1);
2588 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2589 <
2590 <        // unspecified behavior
2591 <        Integer v;
2592 <        try {
2593 <            assertNull(h.join());
2594 <            assertEquals(1, r.invocationCount);
2595 <            assertEquals(inc(v1), r.value);
2596 <        } catch (CompletionException ok) {
2597 <            checkCompletedWithWrappedCancellationException(h);
2598 <            assertEquals(0, r.invocationCount);
2599 <        }
2600 <
2601 <        checkCancelled(f);
2602 <        checkCompletedNormally(g, v1);
2603 <        }
2604 <    }
2092 >        checkCompletedNormally(g, v2);
2093 >    }}
2094  
2095      /**
2096       * runAfterEither result completes normally after normal completion
# Line 2610 | Line 2099 | public class CompletableFutureTest exten
2099      public void testRunAfterEither_normalCompletion1() {
2100          for (ExecutionMode m : ExecutionMode.values())
2101          for (Integer v1 : new Integer[] { 1, null })
2102 <        for (Integer v2 : new Integer[] { 2, null }) {
2103 <
2102 >        for (Integer v2 : new Integer[] { 2, null })
2103 >    {
2104          final CompletableFuture<Integer> f = new CompletableFuture<>();
2105          final CompletableFuture<Integer> g = new CompletableFuture<>();
2106 <        final Noop r = new Noop();
2106 >        final Noop r = new Noop(m);
2107          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2108  
2109          f.complete(v1);
2110          checkCompletedNormally(h, null);
2111 <        assertEquals(1, r.invocationCount);
2111 >        r.assertInvoked();
2112          g.complete(v2);
2113  
2114          checkCompletedNormally(f, v1);
2115          checkCompletedNormally(g, v2);
2116          checkCompletedNormally(h, null);
2117 <        assertEquals(1, r.invocationCount);
2118 <        }
2630 <    }
2117 >        r.assertInvoked();
2118 >    }}
2119  
2120      public void testRunAfterEither_normalCompletion2() {
2121          for (ExecutionMode m : ExecutionMode.values())
2122          for (Integer v1 : new Integer[] { 1, null })
2123 <        for (Integer v2 : new Integer[] { 2, null }) {
2124 <
2123 >        for (Integer v2 : new Integer[] { 2, null })
2124 >    {
2125          final CompletableFuture<Integer> f = new CompletableFuture<>();
2126          final CompletableFuture<Integer> g = new CompletableFuture<>();
2127 <        final Noop r = new Noop();
2127 >        final Noop r = new Noop(m);
2128          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2129  
2130          g.complete(v2);
2131          checkCompletedNormally(h, null);
2132 <        assertEquals(1, r.invocationCount);
2132 >        r.assertInvoked();
2133          f.complete(v1);
2134  
2135          checkCompletedNormally(f, v1);
2136          checkCompletedNormally(g, v2);
2137          checkCompletedNormally(h, null);
2138 <        assertEquals(1, r.invocationCount);
2139 <        }
2140 <    }
2138 >        r.assertInvoked();
2139 >        }}
2140 >
2141      public void testRunAfterEither_normalCompletion3() {
2142          for (ExecutionMode m : ExecutionMode.values())
2143          for (Integer v1 : new Integer[] { 1, null })
2144 <        for (Integer v2 : new Integer[] { 2, null }) {
2145 <
2144 >        for (Integer v2 : new Integer[] { 2, null })
2145 >    {
2146          final CompletableFuture<Integer> f = new CompletableFuture<>();
2147          final CompletableFuture<Integer> g = new CompletableFuture<>();
2148 <        final Noop r = new Noop();
2148 >        final Noop r = new Noop(m);
2149  
2150          f.complete(v1);
2151          g.complete(v2);
# Line 2666 | Line 2154 | public class CompletableFutureTest exten
2154          checkCompletedNormally(h, null);
2155          checkCompletedNormally(f, v1);
2156          checkCompletedNormally(g, v2);
2157 <        assertEquals(1, r.invocationCount);
2158 <        }
2671 <    }
2157 >        r.assertInvoked();
2158 >    }}
2159  
2160      /**
2161       * runAfterEither result completes exceptionally after exceptional
# Line 2676 | Line 2163 | public class CompletableFutureTest exten
2163       */
2164      public void testRunAfterEither_exceptionalCompletion1() {
2165          for (ExecutionMode m : ExecutionMode.values())
2166 <        for (Integer v1 : new Integer[] { 1, null }) {
2167 <
2166 >        for (Integer v1 : new Integer[] { 1, null })
2167 >    {
2168          final CompletableFuture<Integer> f = new CompletableFuture<>();
2169          final CompletableFuture<Integer> g = new CompletableFuture<>();
2170 <        final Noop r = new Noop();
2170 >        final Noop r = new Noop(m);
2171          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2172          final CFException ex = new CFException();
2173  
# Line 2688 | Line 2175 | public class CompletableFutureTest exten
2175          checkCompletedWithWrappedCFException(h, ex);
2176          g.complete(v1);
2177  
2178 <        assertEquals(0, r.invocationCount);
2178 >        r.assertNotInvoked();
2179          checkCompletedNormally(g, v1);
2180          checkCompletedWithWrappedCFException(f, ex);
2181          checkCompletedWithWrappedCFException(h, ex);
2182 <        }
2696 <    }
2182 >    }}
2183  
2184      public void testRunAfterEither_exceptionalCompletion2() {
2185          for (ExecutionMode m : ExecutionMode.values())
2186 <        for (Integer v1 : new Integer[] { 1, null }) {
2187 <
2186 >        for (Integer v1 : new Integer[] { 1, null })
2187 >    {
2188          final CompletableFuture<Integer> f = new CompletableFuture<>();
2189          final CompletableFuture<Integer> g = new CompletableFuture<>();
2190 <        final Noop r = new Noop();
2190 >        final Noop r = new Noop(m);
2191          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2192          final CFException ex = new CFException();
2193  
# Line 2709 | Line 2195 | public class CompletableFutureTest exten
2195          checkCompletedWithWrappedCFException(h, ex);
2196          f.complete(v1);
2197  
2198 <        assertEquals(0, r.invocationCount);
2198 >        r.assertNotInvoked();
2199          checkCompletedNormally(f, v1);
2200          checkCompletedWithWrappedCFException(g, ex);
2201          checkCompletedWithWrappedCFException(h, ex);
2202 <        }
2717 <    }
2202 >    }}
2203  
2204      public void testRunAfterEither_exceptionalCompletion3() {
2205          for (ExecutionMode m : ExecutionMode.values())
2206 <        for (Integer v1 : new Integer[] { 1, null }) {
2207 <
2206 >        for (Integer v1 : new Integer[] { 1, null })
2207 >    {
2208          final CompletableFuture<Integer> f = new CompletableFuture<>();
2209          final CompletableFuture<Integer> g = new CompletableFuture<>();
2210 <        final Noop r = new Noop();
2210 >        final Noop r = new Noop(m);
2211          final CFException ex = new CFException();
2212  
2213          g.completeExceptionally(ex);
# Line 2733 | Line 2218 | public class CompletableFutureTest exten
2218          Integer v;
2219          try {
2220              assertNull(h.join());
2221 <            assertEquals(1, r.invocationCount);
2221 >            r.assertInvoked();
2222          } catch (CompletionException ok) {
2223              checkCompletedWithWrappedCFException(h, ex);
2224 <            assertEquals(0, r.invocationCount);
2224 >            r.assertNotInvoked();
2225          }
2226  
2227          checkCompletedWithWrappedCFException(g, ex);
2228          checkCompletedNormally(f, v1);
2229 <        }
2745 <    }
2229 >    }}
2230  
2231      public void testRunAfterEither_exceptionalCompletion4() {
2232          for (ExecutionMode m : ExecutionMode.values())
2233 <        for (Integer v1 : new Integer[] { 1, null }) {
2234 <
2233 >        for (Integer v1 : new Integer[] { 1, null })
2234 >    {
2235          final CompletableFuture<Integer> f = new CompletableFuture<>();
2236          final CompletableFuture<Integer> g = new CompletableFuture<>();
2237 <        final Noop r = new Noop();
2237 >        final Noop r = new Noop(m);
2238          final CFException ex = new CFException();
2239  
2240          f.completeExceptionally(ex);
# Line 2761 | Line 2245 | public class CompletableFutureTest exten
2245          Integer v;
2246          try {
2247              assertNull(h.join());
2248 <            assertEquals(1, r.invocationCount);
2248 >            r.assertInvoked();
2249          } catch (CompletionException ok) {
2250              checkCompletedWithWrappedCFException(h, ex);
2251 <            assertEquals(0, r.invocationCount);
2251 >            r.assertNotInvoked();
2252          }
2253  
2254          checkCompletedWithWrappedCFException(f, ex);
2255          checkCompletedNormally(g, v1);
2256 <        }
2773 <    }
2256 >    }}
2257  
2258      /**
2259       * runAfterEither result completes exceptionally if action does
# Line 2778 | Line 2261 | public class CompletableFutureTest exten
2261      public void testRunAfterEither_actionFailed1() {
2262          for (ExecutionMode m : ExecutionMode.values())
2263          for (Integer v1 : new Integer[] { 1, null })
2264 <        for (Integer v2 : new Integer[] { 2, null }) {
2265 <
2264 >        for (Integer v2 : new Integer[] { 2, null })
2265 >    {
2266          final CompletableFuture<Integer> f = new CompletableFuture<>();
2267          final CompletableFuture<Integer> g = new CompletableFuture<>();
2268 <        final FailingNoop r = new FailingNoop();
2268 >        final FailingRunnable r = new FailingRunnable(m);
2269          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2270  
2271          f.complete(v1);
# Line 2790 | Line 2273 | public class CompletableFutureTest exten
2273          g.complete(v2);
2274          checkCompletedNormally(f, v1);
2275          checkCompletedNormally(g, v2);
2276 <        }
2794 <    }
2276 >    }}
2277  
2278      public void testRunAfterEither_actionFailed2() {
2279          for (ExecutionMode m : ExecutionMode.values())
2280          for (Integer v1 : new Integer[] { 1, null })
2281 <        for (Integer v2 : new Integer[] { 2, null }) {
2282 <
2281 >        for (Integer v2 : new Integer[] { 2, null })
2282 >    {
2283          final CompletableFuture<Integer> f = new CompletableFuture<>();
2284          final CompletableFuture<Integer> g = new CompletableFuture<>();
2285 <        final FailingNoop r = new FailingNoop();
2285 >        final FailingRunnable r = new FailingRunnable(m);
2286          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2287  
2288          g.complete(v2);
# Line 2808 | Line 2290 | public class CompletableFutureTest exten
2290          f.complete(v1);
2291          checkCompletedNormally(f, v1);
2292          checkCompletedNormally(g, v2);
2293 <        }
2812 <    }
2293 >    }}
2294  
2295      /**
2296       * runAfterEither result completes exceptionally if either source cancelled
# Line 2817 | Line 2298 | public class CompletableFutureTest exten
2298      public void testRunAfterEither_sourceCancelled1() {
2299          for (ExecutionMode m : ExecutionMode.values())
2300          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2301 <        for (Integer v1 : new Integer[] { 1, null }) {
2302 <
2301 >        for (Integer v1 : new Integer[] { 1, null })
2302 >    {
2303          final CompletableFuture<Integer> f = new CompletableFuture<>();
2304          final CompletableFuture<Integer> g = new CompletableFuture<>();
2305 <        final Noop r = new Noop();
2305 >        final Noop r = new Noop(m);
2306          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2307  
2308          assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2829 | Line 2310 | public class CompletableFutureTest exten
2310          g.complete(v1);
2311  
2312          checkCancelled(f);
2313 <        assertEquals(0, r.invocationCount);
2313 >        r.assertNotInvoked();
2314          checkCompletedNormally(g, v1);
2315          checkCompletedWithWrappedCancellationException(h);
2316 <        }
2836 <    }
2316 >    }}
2317  
2318      public void testRunAfterEither_sourceCancelled2() {
2319          for (ExecutionMode m : ExecutionMode.values())
2320          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2321 <        for (Integer v1 : new Integer[] { 1, null }) {
2322 <
2321 >        for (Integer v1 : new Integer[] { 1, null })
2322 >    {
2323          final CompletableFuture<Integer> f = new CompletableFuture<>();
2324          final CompletableFuture<Integer> g = new CompletableFuture<>();
2325 <        final Noop r = new Noop();
2325 >        final Noop r = new Noop(m);
2326          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2327  
2328          assertTrue(g.cancel(mayInterruptIfRunning));
# Line 2850 | Line 2330 | public class CompletableFutureTest exten
2330          f.complete(v1);
2331  
2332          checkCancelled(g);
2333 <        assertEquals(0, r.invocationCount);
2333 >        r.assertNotInvoked();
2334          checkCompletedNormally(f, v1);
2335          checkCompletedWithWrappedCancellationException(h);
2336 <        }
2857 <    }
2336 >    }}
2337  
2338      public void testRunAfterEither_sourceCancelled3() {
2339          for (ExecutionMode m : ExecutionMode.values())
2340          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2341 <        for (Integer v1 : new Integer[] { 1, null }) {
2342 <
2341 >        for (Integer v1 : new Integer[] { 1, null })
2342 >    {
2343          final CompletableFuture<Integer> f = new CompletableFuture<>();
2344          final CompletableFuture<Integer> g = new CompletableFuture<>();
2345 <        final Noop r = new Noop();
2345 >        final Noop r = new Noop(m);
2346  
2347          assertTrue(g.cancel(mayInterruptIfRunning));
2348          f.complete(v1);
# Line 2873 | Line 2352 | public class CompletableFutureTest exten
2352          Integer v;
2353          try {
2354              assertNull(h.join());
2355 <            assertEquals(1, r.invocationCount);
2355 >            r.assertInvoked();
2356          } catch (CompletionException ok) {
2357              checkCompletedWithWrappedCancellationException(h);
2358 <            assertEquals(0, r.invocationCount);
2358 >            r.assertNotInvoked();
2359          }
2360  
2361          checkCancelled(g);
2362          checkCompletedNormally(f, v1);
2363 <        }
2885 <    }
2363 >    }}
2364  
2365      public void testRunAfterEither_sourceCancelled4() {
2366          for (ExecutionMode m : ExecutionMode.values())
2367          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2368 <        for (Integer v1 : new Integer[] { 1, null }) {
2369 <
2368 >        for (Integer v1 : new Integer[] { 1, null })
2369 >    {
2370          final CompletableFuture<Integer> f = new CompletableFuture<>();
2371          final CompletableFuture<Integer> g = new CompletableFuture<>();
2372 <        final Noop r = new Noop();
2372 >        final Noop r = new Noop(m);
2373  
2374          assertTrue(f.cancel(mayInterruptIfRunning));
2375          g.complete(v1);
# Line 2901 | Line 2379 | public class CompletableFutureTest exten
2379          Integer v;
2380          try {
2381              assertNull(h.join());
2382 <            assertEquals(1, r.invocationCount);
2382 >            r.assertInvoked();
2383          } catch (CompletionException ok) {
2384              checkCompletedWithWrappedCancellationException(h);
2385 <            assertEquals(0, r.invocationCount);
2385 >            r.assertNotInvoked();
2386          }
2387  
2388          checkCancelled(f);
2389          checkCompletedNormally(g, v1);
2390 <        }
2913 <    }
2390 >    }}
2391  
2392      /**
2393       * thenCompose result completes normally after normal completion of source
2394       */
2395 <    public void testThenCompose_normalCompletion1() {
2395 >    public void testThenCompose_normalCompletion() {
2396          for (ExecutionMode m : ExecutionMode.values())
2397 <        for (Integer v1 : new Integer[] { 1, null }) {
2398 <
2397 >        for (boolean createIncomplete : new boolean[] { true, false })
2398 >        for (Integer v1 : new Integer[] { 1, null })
2399 >    {
2400          final CompletableFuture<Integer> f = new CompletableFuture<>();
2401 <        final CompletableFutureInc r = new CompletableFutureInc();
2402 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2403 <        f.complete(v1);
2404 <        checkCompletedNormally(g, inc(v1));
2927 <        checkCompletedNormally(f, v1);
2928 <        assertEquals(1, r.invocationCount);
2929 <        }
2930 <    }
2931 <
2932 <    public void testThenCompose_normalCompletion2() {
2933 <        for (ExecutionMode m : ExecutionMode.values())
2934 <        for (Integer v1 : new Integer[] { 1, null }) {
2401 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2402 >        if (!createIncomplete) f.complete(v1);
2403 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2404 >        if (createIncomplete) f.complete(v1);
2405  
2936        final CompletableFuture<Integer> f = new CompletableFuture<>();
2937        final CompletableFutureInc r = new CompletableFutureInc();
2938        f.complete(v1);
2939        final CompletableFuture<Integer> g = f.thenCompose(r);
2406          checkCompletedNormally(g, inc(v1));
2407          checkCompletedNormally(f, v1);
2408 <        assertEquals(1, r.invocationCount);
2409 <        }
2944 <    }
2408 >        r.assertInvoked();
2409 >    }}
2410  
2411      /**
2412       * thenCompose result completes exceptionally after exceptional
2413       * completion of source
2414       */
2415 <    public void testThenCompose_exceptionalCompletion1() {
2416 <        for (ExecutionMode m : ExecutionMode.values()) {
2417 <
2415 >    public void testThenCompose_exceptionalCompletion() {
2416 >        for (ExecutionMode m : ExecutionMode.values())
2417 >        for (boolean createIncomplete : new boolean[] { true, false })
2418 >    {
2419          final CFException ex = new CFException();
2420 <        final CompletableFutureInc r = new CompletableFutureInc();
2420 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2421          final CompletableFuture<Integer> f = new CompletableFuture<>();
2422 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2423 <        f.completeExceptionally(ex);
2424 <        checkCompletedWithWrappedCFException(g, ex);
2959 <        checkCompletedWithWrappedCFException(f, ex);
2960 <        }
2961 <    }
2962 <
2963 <    public void testThenCompose_exceptionalCompletion2() {
2964 <        for (ExecutionMode m : ExecutionMode.values()) {
2422 >        if (!createIncomplete) f.completeExceptionally(ex);
2423 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2424 >        if (createIncomplete) f.completeExceptionally(ex);
2425  
2966        final CFException ex = new CFException();
2967        final CompletableFuture<Integer> f = new CompletableFuture<>();
2968        f.completeExceptionally(ex);
2969        final CompletableFutureInc r = new CompletableFutureInc();
2970        final CompletableFuture<Integer> g = f.thenCompose(r);
2426          checkCompletedWithWrappedCFException(g, ex);
2427          checkCompletedWithWrappedCFException(f, ex);
2428 <        }
2429 <    }
2428 >        r.assertNotInvoked();
2429 >    }}
2430  
2431      /**
2432       * thenCompose result completes exceptionally if action does
2433       */
2434 <    public void testThenCompose_actionFailed1() {
2434 >    public void testThenCompose_actionFailed() {
2435          for (ExecutionMode m : ExecutionMode.values())
2436 <        for (Integer v1 : new Integer[] { 1, null }) {
2437 <
2436 >        for (boolean createIncomplete : new boolean[] { true, false })
2437 >        for (Integer v1 : new Integer[] { 1, null })
2438 >    {
2439          final CompletableFuture<Integer> f = new CompletableFuture<>();
2440          final FailingCompletableFutureFunction r
2441 <            = new FailingCompletableFutureFunction();
2442 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2443 <        f.complete(v1);
2444 <        checkCompletedWithWrappedCFException(g);
2989 <        checkCompletedNormally(f, v1);
2990 <        }
2991 <    }
2992 <
2993 <    public void testThenCompose_actionFailed2() {
2994 <        for (ExecutionMode m : ExecutionMode.values())
2995 <        for (Integer v1 : new Integer[] { 1, null }) {
2441 >            = new FailingCompletableFutureFunction(m);
2442 >        if (!createIncomplete) f.complete(v1);
2443 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2444 >        if (createIncomplete) f.complete(v1);
2445  
2997        final CompletableFuture<Integer> f = new CompletableFuture<>();
2998        f.complete(v1);
2999        final FailingCompletableFutureFunction r
3000            = new FailingCompletableFutureFunction();
3001        final CompletableFuture<Integer> g = f.thenCompose(r);
2446          checkCompletedWithWrappedCFException(g);
2447          checkCompletedNormally(f, v1);
2448 <        }
3005 <    }
2448 >    }}
2449  
2450      /**
2451       * thenCompose result completes exceptionally if source cancelled
2452       */
2453 <    public void testThenCompose_sourceCancelled1() {
2453 >    public void testThenCompose_sourceCancelled() {
2454          for (ExecutionMode m : ExecutionMode.values())
2455 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2456 <
2455 >        for (boolean createIncomplete : new boolean[] { true, false })
2456 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2457 >    {
2458          final CompletableFuture<Integer> f = new CompletableFuture<>();
2459 <        final CompletableFutureInc r = new CompletableFutureInc();
2460 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2461 <        assertTrue(f.cancel(mayInterruptIfRunning));
2462 <        checkCompletedWithWrappedCancellationException(g);
2463 <        checkCancelled(f);
2459 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2460 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2461 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2462 >        if (createIncomplete) {
2463 >            checkIncomplete(g);
2464 >            assertTrue(f.cancel(mayInterruptIfRunning));
2465          }
3021    }
2466  
3023    public void testThenCompose_sourceCancelled2() {
3024        for (ExecutionMode m : ExecutionMode.values())
3025        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
3026
3027        final CompletableFuture<Integer> f = new CompletableFuture<>();
3028        assertTrue(f.cancel(mayInterruptIfRunning));
3029        final CompletableFutureInc r = new CompletableFutureInc();
3030        final CompletableFuture<Integer> g = f.thenCompose(r);
2467          checkCompletedWithWrappedCancellationException(g);
2468          checkCancelled(f);
2469 <        }
3034 <    }
3035 <
3036 <    // asyncs
3037 <
3038 <    /**
3039 <     * thenRunAsync result completes normally after normal completion of source
3040 <     */
3041 <    public void testThenRunAsync() {
3042 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3043 <        Noop r = new Noop();
3044 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3045 <        f.complete(null);
3046 <        checkCompletedNormally(g, null);
3047 <
3048 <        // reordered version
3049 <        f = new CompletableFuture<>();
3050 <        f.complete(null);
3051 <        r = new Noop();
3052 <        g = f.thenRunAsync(r);
3053 <        checkCompletedNormally(g, null);
3054 <    }
3055 <
3056 <    /**
3057 <     * thenRunAsync result completes exceptionally after exceptional
3058 <     * completion of source
3059 <     */
3060 <    public void testThenRunAsync2() {
3061 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3062 <        Noop r = new Noop();
3063 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3064 <        f.completeExceptionally(new CFException());
3065 <        try {
3066 <            g.join();
3067 <            shouldThrow();
3068 <        } catch (CompletionException success) {}
3069 <        checkCompletedWithWrappedCFException(g);
3070 <    }
3071 <
3072 <    /**
3073 <     * thenRunAsync result completes exceptionally if action does
3074 <     */
3075 <    public void testThenRunAsync3() {
3076 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3077 <        FailingNoop r = new FailingNoop();
3078 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3079 <        f.complete(null);
3080 <        checkCompletedWithWrappedCFException(g);
3081 <    }
3082 <
3083 <    /**
3084 <     * thenRunAsync result completes exceptionally if source cancelled
3085 <     */
3086 <    public void testThenRunAsync4() {
3087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3088 <        Noop r = new Noop();
3089 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3090 <        assertTrue(f.cancel(true));
3091 <        checkCompletedWithWrappedCancellationException(g);
3092 <    }
3093 <
3094 <    /**
3095 <     * thenApplyAsync result completes normally after normal completion of source
3096 <     */
3097 <    public void testThenApplyAsync() {
3098 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3099 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3100 <        f.complete(one);
3101 <        checkCompletedNormally(g, two);
3102 <    }
3103 <
3104 <    /**
3105 <     * thenApplyAsync result completes exceptionally after exceptional
3106 <     * completion of source
3107 <     */
3108 <    public void testThenApplyAsync2() {
3109 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3110 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3111 <        f.completeExceptionally(new CFException());
3112 <        checkCompletedWithWrappedCFException(g);
3113 <    }
3114 <
3115 <    /**
3116 <     * thenApplyAsync result completes exceptionally if action does
3117 <     */
3118 <    public void testThenApplyAsync3() {
3119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3120 <        FailingFunction r = new FailingFunction();
3121 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3122 <        f.complete(null);
3123 <        checkCompletedWithWrappedCFException(g);
3124 <    }
3125 <
3126 <    /**
3127 <     * thenApplyAsync result completes exceptionally if source cancelled
3128 <     */
3129 <    public void testThenApplyAsync4() {
3130 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3131 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3132 <        assertTrue(f.cancel(true));
3133 <        checkCompletedWithWrappedCancellationException(g);
3134 <    }
3135 <
3136 <    /**
3137 <     * thenAcceptAsync result completes normally after normal
3138 <     * completion of source
3139 <     */
3140 <    public void testThenAcceptAsync() {
3141 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3142 <        IncAction r = new IncAction();
3143 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3144 <        f.complete(one);
3145 <        checkCompletedNormally(g, null);
3146 <        assertEquals(r.value, (Integer) 2);
3147 <    }
3148 <
3149 <    /**
3150 <     * thenAcceptAsync result completes exceptionally after exceptional
3151 <     * completion of source
3152 <     */
3153 <    public void testThenAcceptAsync2() {
3154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3155 <        IncAction r = new IncAction();
3156 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3157 <        f.completeExceptionally(new CFException());
3158 <        checkCompletedWithWrappedCFException(g);
3159 <    }
3160 <
3161 <    /**
3162 <     * thenAcceptAsync result completes exceptionally if action does
3163 <     */
3164 <    public void testThenAcceptAsync3() {
3165 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3166 <        FailingConsumer r = new FailingConsumer();
3167 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3168 <        f.complete(null);
3169 <        checkCompletedWithWrappedCFException(g);
3170 <    }
3171 <
3172 <    /**
3173 <     * thenAcceptAsync result completes exceptionally if source cancelled
3174 <     */
3175 <    public void testThenAcceptAsync4() {
3176 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3177 <        IncAction r = new IncAction();
3178 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3179 <        assertTrue(f.cancel(true));
3180 <        checkCompletedWithWrappedCancellationException(g);
3181 <    }
3182 <
3183 <    // async with explicit executors
3184 <
3185 <    /**
3186 <     * thenRunAsync result completes normally after normal completion of source
3187 <     */
3188 <    public void testThenRunAsyncE() {
3189 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3190 <        Noop r = new Noop();
3191 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3192 <        f.complete(null);
3193 <        checkCompletedNormally(g, null);
3194 <
3195 <        // reordered version
3196 <        f = new CompletableFuture<>();
3197 <        f.complete(null);
3198 <        r = new Noop();
3199 <        g = f.thenRunAsync(r, new ThreadExecutor());
3200 <        checkCompletedNormally(g, null);
3201 <    }
3202 <
3203 <    /**
3204 <     * thenRunAsync result completes exceptionally after exceptional
3205 <     * completion of source
3206 <     */
3207 <    public void testThenRunAsync2E() {
3208 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3209 <        Noop r = new Noop();
3210 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3211 <        f.completeExceptionally(new CFException());
3212 <        try {
3213 <            g.join();
3214 <            shouldThrow();
3215 <        } catch (CompletionException success) {}
3216 <        checkCompletedWithWrappedCFException(g);
3217 <    }
3218 <
3219 <    /**
3220 <     * thenRunAsync result completes exceptionally if action does
3221 <     */
3222 <    public void testThenRunAsync3E() {
3223 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3224 <        FailingNoop r = new FailingNoop();
3225 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3226 <        f.complete(null);
3227 <        checkCompletedWithWrappedCFException(g);
3228 <    }
3229 <
3230 <    /**
3231 <     * thenRunAsync result completes exceptionally if source cancelled
3232 <     */
3233 <    public void testThenRunAsync4E() {
3234 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3235 <        Noop r = new Noop();
3236 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3237 <        assertTrue(f.cancel(true));
3238 <        checkCompletedWithWrappedCancellationException(g);
3239 <    }
3240 <
3241 <    /**
3242 <     * thenApplyAsync result completes normally after normal completion of source
3243 <     */
3244 <    public void testThenApplyAsyncE() {
3245 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3246 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3247 <        f.complete(one);
3248 <        checkCompletedNormally(g, two);
3249 <    }
3250 <
3251 <    /**
3252 <     * thenApplyAsync result completes exceptionally after exceptional
3253 <     * completion of source
3254 <     */
3255 <    public void testThenApplyAsync2E() {
3256 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3257 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3258 <        f.completeExceptionally(new CFException());
3259 <        checkCompletedWithWrappedCFException(g);
3260 <    }
3261 <
3262 <    /**
3263 <     * thenApplyAsync result completes exceptionally if action does
3264 <     */
3265 <    public void testThenApplyAsync3E() {
3266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3267 <        FailingFunction r = new FailingFunction();
3268 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3269 <        f.complete(null);
3270 <        checkCompletedWithWrappedCFException(g);
3271 <    }
3272 <
3273 <    /**
3274 <     * thenApplyAsync result completes exceptionally if source cancelled
3275 <     */
3276 <    public void testThenApplyAsync4E() {
3277 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3278 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3279 <        assertTrue(f.cancel(true));
3280 <        checkCompletedWithWrappedCancellationException(g);
3281 <    }
3282 <
3283 <    /**
3284 <     * thenAcceptAsync result completes normally after normal
3285 <     * completion of source
3286 <     */
3287 <    public void testThenAcceptAsyncE() {
3288 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3289 <        IncAction r = new IncAction();
3290 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3291 <        f.complete(one);
3292 <        checkCompletedNormally(g, null);
3293 <        assertEquals(r.value, (Integer) 2);
3294 <    }
3295 <
3296 <    /**
3297 <     * thenAcceptAsync result completes exceptionally after exceptional
3298 <     * completion of source
3299 <     */
3300 <    public void testThenAcceptAsync2E() {
3301 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3302 <        IncAction r = new IncAction();
3303 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3304 <        f.completeExceptionally(new CFException());
3305 <        checkCompletedWithWrappedCFException(g);
3306 <    }
3307 <
3308 <    /**
3309 <     * thenAcceptAsync result completes exceptionally if action does
3310 <     */
3311 <    public void testThenAcceptAsync3E() {
3312 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3313 <        FailingConsumer r = new FailingConsumer();
3314 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3315 <        f.complete(null);
3316 <        checkCompletedWithWrappedCFException(g);
3317 <    }
3318 <
3319 <    /**
3320 <     * thenAcceptAsync result completes exceptionally if source cancelled
3321 <     */
3322 <    public void testThenAcceptAsync4E() {
3323 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3324 <        IncAction r = new IncAction();
3325 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3326 <        assertTrue(f.cancel(true));
3327 <        checkCompletedWithWrappedCancellationException(g);
3328 <    }
2469 >    }}
2470  
2471      // other static methods
2472  
# Line 3344 | Line 2485 | public class CompletableFutureTest exten
2485       */
2486      public void testAllOf_normal() throws Exception {
2487          for (int k = 1; k < 20; ++k) {
2488 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2488 >            CompletableFuture<Integer>[] fs
2489 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2490              for (int i = 0; i < k; ++i)
2491                  fs[i] = new CompletableFuture<>();
2492              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3358 | Line 2500 | public class CompletableFutureTest exten
2500          }
2501      }
2502  
2503 +    public void testAllOf_backwards() throws Exception {
2504 +        for (int k = 1; k < 20; ++k) {
2505 +            CompletableFuture<Integer>[] fs
2506 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2507 +            for (int i = 0; i < k; ++i)
2508 +                fs[i] = new CompletableFuture<>();
2509 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2510 +            for (int i = k - 1; i >= 0; i--) {
2511 +                checkIncomplete(f);
2512 +                checkIncomplete(CompletableFuture.allOf(fs));
2513 +                fs[i].complete(one);
2514 +            }
2515 +            checkCompletedNormally(f, null);
2516 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2517 +        }
2518 +    }
2519 +
2520      /**
2521       * anyOf(no component futures) returns an incomplete future
2522       */
# Line 3416 | Line 2575 | public class CompletableFutureTest exten
2575          Runnable[] throwingActions = {
2576              () -> CompletableFuture.supplyAsync(null),
2577              () -> CompletableFuture.supplyAsync(null, exec),
2578 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2578 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2579  
2580              () -> CompletableFuture.runAsync(null),
2581              () -> CompletableFuture.runAsync(null, exec),
# Line 3489 | Line 2648 | public class CompletableFutureTest exten
2648  
2649              () -> f.thenCompose(null),
2650              () -> f.thenComposeAsync(null),
2651 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2651 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2652              () -> f.thenComposeAsync(null, exec),
2653  
2654              () -> f.exceptionally(null),
# Line 3607 | Line 2766 | public class CompletableFutureTest exten
2766      public void testWhenComplete_actionFailed() {
2767          for (boolean createIncomplete : new boolean[] { true, false })
2768          for (ExecutionMode m : ExecutionMode.values())
2769 <        for (Integer v1 : new Integer[] { 1, null }) {
2770 <
2769 >        for (Integer v1 : new Integer[] { 1, null })
2770 >    {
2771          final AtomicInteger a = new AtomicInteger(0);
2772          final CFException ex = new CFException();
2773          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 3625 | Line 2784 | public class CompletableFutureTest exten
2784          checkCompletedNormally(f, v1);
2785          checkCompletedWithWrappedCFException(g, ex);
2786          assertEquals(1, a.get());
2787 <        }
3629 <    }
2787 >    }}
2788  
2789      /**
2790       * If a whenComplete action throws an exception when triggered by
# Line 3636 | Line 2794 | public class CompletableFutureTest exten
2794      public void testWhenComplete_actionFailedSourceFailed() {
2795          for (boolean createIncomplete : new boolean[] { true, false })
2796          for (ExecutionMode m : ExecutionMode.values())
2797 <        for (Integer v1 : new Integer[] { 1, null }) {
2798 <
2797 >        for (Integer v1 : new Integer[] { 1, null })
2798 >    {
2799          final AtomicInteger a = new AtomicInteger(0);
2800          final CFException ex1 = new CFException();
2801          final CFException ex2 = new CFException();
# Line 3657 | Line 2815 | public class CompletableFutureTest exten
2815          checkCompletedWithWrappedCFException(f, ex1);
2816          checkCompletedWithWrappedCFException(g, ex1);
2817          assertEquals(1, a.get());
2818 <        }
3661 <    }
2818 >    }}
2819  
2820   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines