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.34 by jsr166, Sun Jun 1 21:17:05 2014 UTC vs.
Revision 1.44 by jsr166, Mon Jun 2 06:06:30 2014 UTC

# Line 16 | Line 16 | import java.util.concurrent.ExecutionExc
16   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.TimeoutException;
21   import java.util.concurrent.atomic.AtomicInteger;
22   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 317 | Line 318 | public class CompletableFutureTest exten
318  
319      // Choose non-commutative actions for better coverage
320  
321 +    // A non-commutative function that handles and produces null values as well.
322 +    static Integer subtract(Integer x, Integer y) {
323 +        return (x == null && y == null) ? null :
324 +            ((x == null) ? 42 : x.intValue())
325 +            - ((y == null) ? 99 : y.intValue());
326 +    }
327 +
328 +    // A function that handles and produces null values as well.
329 +    static Integer inc(Integer x) {
330 +        return (x == null) ? null : x + 1;
331 +    }
332 +
333      static final Supplier<Integer> supplyOne =
334          () -> Integer.valueOf(1);
335      static final Function<Integer, Integer> inc =
336          (Integer x) -> Integer.valueOf(x.intValue() + 1);
337      static final BiFunction<Integer, Integer, Integer> subtract =
338 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
338 >        (Integer x, Integer y) -> subtract(x, y);
339      static final class IncAction implements Consumer<Integer> {
340 <        int value;
341 <        public void accept(Integer x) { value = x.intValue() + 1; }
340 >        int invocationCount = 0;
341 >        Integer value;
342 >        public void accept(Integer x) {
343 >            invocationCount++;
344 >            value = inc(x);
345 >        }
346 >    }
347 >    static final class IncFunction implements Function<Integer,Integer> {
348 >        int invocationCount = 0;
349 >        Integer value;
350 >        public Integer apply(Integer x) {
351 >            invocationCount++;
352 >            return value = inc(x);
353 >        }
354      }
355      static final class SubtractAction implements BiConsumer<Integer, Integer> {
356 <        int value;
356 >        int invocationCount = 0;
357 >        Integer value;
358 >        // Check this action was invoked exactly once when result is computed.
359          public void accept(Integer x, Integer y) {
360 <            value = x.intValue() - y.intValue();
360 >            invocationCount++;
361 >            value = subtract(x, y);
362 >        }
363 >    }
364 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
365 >        int invocationCount = 0;
366 >        Integer value;
367 >        // Check this action was invoked exactly once when result is computed.
368 >        public Integer apply(Integer x, Integer y) {
369 >            invocationCount++;
370 >            return value = subtract(x, y);
371          }
372      }
373      static final class Noop implements Runnable {
374 <        boolean ran;
375 <        public void run() { ran = true; }
374 >        int invocationCount = 0;
375 >        public void run() {
376 >            invocationCount++;
377 >        }
378      }
379  
380      static final class FailingSupplier implements Supplier<Integer> {
381 <        boolean ran;
382 <        public Integer get() { ran = true; throw new CFException(); }
381 >        int invocationCount = 0;
382 >        public Integer get() {
383 >            invocationCount++;
384 >            throw new CFException();
385 >        }
386      }
387      static final class FailingConsumer implements Consumer<Integer> {
388 <        boolean ran;
389 <        public void accept(Integer x) { ran = true; throw new CFException(); }
388 >        int invocationCount = 0;
389 >        public void accept(Integer x) {
390 >            invocationCount++;
391 >            throw new CFException();
392 >        }
393      }
394      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
395 <        boolean ran;
396 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
395 >        int invocationCount = 0;
396 >        public void accept(Integer x, Integer y) {
397 >            invocationCount++;
398 >            throw new CFException();
399 >        }
400      }
401      static final class FailingFunction implements Function<Integer, Integer> {
402 <        boolean ran;
403 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
402 >        int invocationCount = 0;
403 >        public Integer apply(Integer x) {
404 >            invocationCount++;
405 >            throw new CFException();
406 >        }
407      }
408      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
409 <        boolean ran;
410 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
409 >        int invocationCount = 0;
410 >        public Integer apply(Integer x, Integer y) {
411 >            invocationCount++;
412 >            throw new CFException();
413 >        }
414      }
415      static final class FailingNoop implements Runnable {
416 <        boolean ran;
417 <        public void run() { ran = true; throw new CFException(); }
416 >        int invocationCount = 0;
417 >        public void run() {
418 >            invocationCount++;
419 >            throw new CFException();
420 >        }
421      }
422  
423      static final class CompletableFutureInc
424          implements Function<Integer, CompletableFuture<Integer>> {
425 <        boolean ran;
425 >        int invocationCount = 0;
426          public CompletableFuture<Integer> apply(Integer x) {
427 <            ran = true;
427 >            invocationCount++;
428              CompletableFuture<Integer> f = new CompletableFuture<>();
429 <            f.complete(Integer.valueOf(x.intValue() + 1));
429 >            f.complete(inc(x));
430              return f;
431          }
432      }
433  
434      static final class FailingCompletableFutureFunction
435          implements Function<Integer, CompletableFuture<Integer>> {
436 <        boolean ran;
436 >        int invocationCount = 0;
437          public CompletableFuture<Integer> apply(Integer x) {
438 <            ran = true; throw new CFException();
438 >            invocationCount++;
439 >            throw new CFException();
440          }
441      }
442  
# Line 397 | Line 455 | public class CompletableFutureTest exten
455      }
456  
457      static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
458 <        boolean ran;
458 >        int invocationCount = 0;
459          public Integer apply(Integer x, Throwable t) {
460 <            ran = true;
460 >            invocationCount++;
461              return (t == null) ? two : three;
462          }
463      }
464  
465      /**
466 +     * Permits the testing of parallel code for the 3 different
467 +     * execution modes without repeating all the testing code.
468 +     */
469 +    enum ExecutionMode {
470 +        DEFAULT {
471 +            public <T,U> CompletableFuture<Void> runAfterBoth
472 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
473 +                return f.runAfterBoth(g, a);
474 +            }
475 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
476 +                (CompletableFuture<T> f,
477 +                 CompletionStage<? extends U> g,
478 +                 BiConsumer<? super T,? super U> a) {
479 +                return f.thenAcceptBoth(g, a);
480 +            }
481 +            public <T,U,V> CompletableFuture<V> thenCombine
482 +                (CompletableFuture<T> f,
483 +                 CompletionStage<? extends U> g,
484 +                 BiFunction<? super T,? super U,? extends V> a) {
485 +                return f.thenCombine(g, a);
486 +            }
487 +            public <T,U> CompletableFuture<U> applyToEither
488 +                (CompletableFuture<T> f,
489 +                 CompletionStage<? extends T> g,
490 +                 Function<? super T,U> a) {
491 +                return f.applyToEither(g, a);
492 +            }
493 +            public <T> CompletableFuture<Void> acceptEither
494 +                (CompletableFuture<T> f,
495 +                 CompletionStage<? extends T> g,
496 +                 Consumer<? super T> a) {
497 +                return f.acceptEither(g, a);
498 +            }
499 +            public <T> CompletableFuture<Void> runAfterEither
500 +                (CompletableFuture<T> f,
501 +                 CompletionStage<?> g,
502 +                 java.lang.Runnable a) {
503 +                return f.runAfterEither(g, a);
504 +            }
505 +            public <T,U> CompletableFuture<U> thenCompose
506 +                (CompletableFuture<T> f,
507 +                 Function<? super T,? extends CompletionStage<U>> a) {
508 +                return f.thenCompose(a);
509 +            }
510 +            public <T> CompletableFuture<T> whenComplete
511 +                (CompletableFuture<T> f,
512 +                 BiConsumer<? super T,? super Throwable> a) {
513 +                return f.whenComplete(a);
514 +            }
515 +        },
516 +
517 + //             /** Experimental way to do more testing */
518 + //         REVERSE_DEFAULT {
519 + //             public <T,U> CompletableFuture<Void> runAfterBoth
520 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
521 + //                 return g.runAfterBoth(f, a);
522 + //             }
523 + //             public <T,U> CompletableFuture<Void> thenAcceptBoth
524 + //                 (CompletableFuture<T> f,
525 + //                  CompletionStage<? extends U> g,
526 + //                  BiConsumer<? super T,? super U> a) {
527 + //                 return DEFAULT.thenAcceptBoth(f, g, a);
528 + //             }
529 + //         },
530 +
531 +        DEFAULT_ASYNC {
532 +            public <T,U> CompletableFuture<Void> runAfterBoth
533 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
534 +                return f.runAfterBothAsync(g, a);
535 +            }
536 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
537 +                (CompletableFuture<T> f,
538 +                 CompletionStage<? extends U> g,
539 +                 BiConsumer<? super T,? super U> a) {
540 +                return f.thenAcceptBothAsync(g, a);
541 +            }
542 +            public <T,U,V> CompletableFuture<V> thenCombine
543 +                (CompletableFuture<T> f,
544 +                 CompletionStage<? extends U> g,
545 +                 BiFunction<? super T,? super U,? extends V> a) {
546 +                return f.thenCombineAsync(g, a);
547 +            }
548 +            public <T,U> CompletableFuture<U> applyToEither
549 +                (CompletableFuture<T> f,
550 +                 CompletionStage<? extends T> g,
551 +                 Function<? super T,U> a) {
552 +                return f.applyToEitherAsync(g, a);
553 +            }
554 +            public <T> CompletableFuture<Void> acceptEither
555 +                (CompletableFuture<T> f,
556 +                 CompletionStage<? extends T> g,
557 +                 Consumer<? super T> a) {
558 +                return f.acceptEitherAsync(g, a);
559 +            }
560 +            public <T> CompletableFuture<Void> runAfterEither
561 +                (CompletableFuture<T> f,
562 +                 CompletionStage<?> g,
563 +                 java.lang.Runnable a) {
564 +                return f.runAfterEitherAsync(g, a);
565 +            }
566 +            public <T,U> CompletableFuture<U> thenCompose
567 +                (CompletableFuture<T> f,
568 +                 Function<? super T,? extends CompletionStage<U>> a) {
569 +                return f.thenComposeAsync(a);
570 +            }
571 +            public <T> CompletableFuture<T> whenComplete
572 +                (CompletableFuture<T> f,
573 +                 BiConsumer<? super T,? super Throwable> a) {
574 +                return f.whenCompleteAsync(a);
575 +            }
576 +        },
577 +
578 + //         REVERSE_DEFAULT_ASYNC {
579 + //             public <T,U> CompletableFuture<Void> runAfterBoth
580 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
581 + //                 return f.runAfterBothAsync(g, a);
582 + //             }
583 + //             public <T,U> CompletableFuture<Void> thenAcceptBoth
584 + //                 (CompletableFuture<T> f,
585 + //                  CompletionStage<? extends U> g,
586 + //                  BiConsumer<? super T,? super U> a) {
587 + //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
588 + //             }
589 + //         },
590 +
591 +        EXECUTOR {
592 +            public <T,U> CompletableFuture<Void> runAfterBoth
593 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
594 +                return f.runAfterBothAsync(g, a, new ThreadExecutor());
595 +            }
596 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
597 +                (CompletableFuture<T> f,
598 +                 CompletionStage<? extends U> g,
599 +                 BiConsumer<? super T,? super U> a) {
600 +                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
601 +            }
602 +            public <T,U,V> CompletableFuture<V> thenCombine
603 +                (CompletableFuture<T> f,
604 +                 CompletionStage<? extends U> g,
605 +                 BiFunction<? super T,? super U,? extends V> a) {
606 +                return f.thenCombineAsync(g, a, new ThreadExecutor());
607 +            }
608 +            public <T,U> CompletableFuture<U> applyToEither
609 +                (CompletableFuture<T> f,
610 +                 CompletionStage<? extends T> g,
611 +                 Function<? super T,U> a) {
612 +                return f.applyToEitherAsync(g, a, new ThreadExecutor());
613 +            }
614 +            public <T> CompletableFuture<Void> acceptEither
615 +                (CompletableFuture<T> f,
616 +                 CompletionStage<? extends T> g,
617 +                 Consumer<? super T> a) {
618 +                return f.acceptEitherAsync(g, a, new ThreadExecutor());
619 +            }
620 +            public <T> CompletableFuture<Void> runAfterEither
621 +                (CompletableFuture<T> f,
622 +                 CompletionStage<?> g,
623 +                 java.lang.Runnable a) {
624 +                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
625 +            }
626 +            public <T,U> CompletableFuture<U> thenCompose
627 +                (CompletableFuture<T> f,
628 +                 Function<? super T,? extends CompletionStage<U>> a) {
629 +                return f.thenComposeAsync(a, new ThreadExecutor());
630 +            }
631 +            public <T> CompletableFuture<T> whenComplete
632 +                (CompletableFuture<T> f,
633 +                 BiConsumer<? super T,? super Throwable> a) {
634 +                return f.whenCompleteAsync(a, new ThreadExecutor());
635 +            }
636 +        };
637 +
638 +        public abstract <T,U> CompletableFuture<Void> runAfterBoth
639 +            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
640 +        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
641 +            (CompletableFuture<T> f,
642 +             CompletionStage<? extends U> g,
643 +             BiConsumer<? super T,? super U> a);
644 +        public abstract <T,U,V> CompletableFuture<V> thenCombine
645 +            (CompletableFuture<T> f,
646 +             CompletionStage<? extends U> g,
647 +             BiFunction<? super T,? super U,? extends V> a);
648 +        public abstract <T,U> CompletableFuture<U> applyToEither
649 +            (CompletableFuture<T> f,
650 +             CompletionStage<? extends T> g,
651 +             Function<? super T,U> a);
652 +        public abstract <T> CompletableFuture<Void> acceptEither
653 +            (CompletableFuture<T> f,
654 +             CompletionStage<? extends T> g,
655 +             Consumer<? super T> a);
656 +        public abstract <T> CompletableFuture<Void> runAfterEither
657 +            (CompletableFuture<T> f,
658 +             CompletionStage<?> g,
659 +             java.lang.Runnable a);
660 +        public abstract <T,U> CompletableFuture<U> thenCompose
661 +            (CompletableFuture<T> f,
662 +             Function<? super T,? extends CompletionStage<U>> a);
663 +        public abstract <T> CompletableFuture<T> whenComplete
664 +            (CompletableFuture<T> f,
665 +             BiConsumer<? super T,? super Throwable> a);
666 +
667 +
668 +    }
669 +
670 +    /**
671       * exceptionally action completes with function value on source
672       * exception; otherwise with source value
673       */
# Line 433 | Line 696 | public class CompletableFutureTest exten
696          f = new CompletableFuture<>();
697          f.completeExceptionally(new CFException());
698          g = f.handle(r = new IntegerHandler());
699 <        assertTrue(r.ran);
699 >        assertEquals(1, r.invocationCount);
700 >        assertEquals(1, r.invocationCount);
701          checkCompletedNormally(g, three);
702  
703          f = new CompletableFuture<>();
704          g = f.handle(r = new IntegerHandler());
705 <        assertFalse(r.ran);
705 >        assertEquals(0, r.invocationCount);
706          f.completeExceptionally(new CFException());
707          checkCompletedNormally(g, three);
708 <        assertTrue(r.ran);
708 >        assertEquals(1, r.invocationCount);
709  
710          f = new CompletableFuture<>();
711          f.complete(one);
712          g = f.handle(r = new IntegerHandler());
713 <        assertTrue(r.ran);
713 >        assertEquals(1, r.invocationCount);
714          checkCompletedNormally(g, two);
715  
716          f = new CompletableFuture<>();
717          g = f.handle(r = new IntegerHandler());
718 <        assertFalse(r.ran);
718 >        assertEquals(0, r.invocationCount);
719          f.complete(one);
720 <        assertTrue(r.ran);
720 >        assertEquals(1, r.invocationCount);
721          checkCompletedNormally(g, two);
722      }
723  
# Line 464 | Line 728 | public class CompletableFutureTest exten
728          Noop r = new Noop();
729          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
730          assertNull(f.join());
731 <        assertTrue(r.ran);
731 >        assertEquals(1, r.invocationCount);
732          checkCompletedNormally(f, null);
733      }
734  
# Line 476 | Line 740 | public class CompletableFutureTest exten
740          ThreadExecutor exec = new ThreadExecutor();
741          CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
742          assertNull(f.join());
743 <        assertTrue(r.ran);
743 >        assertEquals(1, r.invocationCount);
744          checkCompletedNormally(f, null);
745          assertEquals(1, exec.count.get());
746      }
# Line 488 | Line 752 | public class CompletableFutureTest exten
752          FailingNoop r = new FailingNoop();
753          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
754          checkCompletedWithWrappedCFException(f);
755 <        assertTrue(r.ran);
755 >        assertEquals(1, r.invocationCount);
756      }
757  
758      /**
# Line 518 | Line 782 | public class CompletableFutureTest exten
782          FailingSupplier r = new FailingSupplier();
783          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
784          checkCompletedWithWrappedCFException(f);
785 <        assertTrue(r.ran);
785 >        assertEquals(1, r.invocationCount);
786      }
787  
788      // seq completion methods
# Line 535 | Line 799 | public class CompletableFutureTest exten
799          g = f.thenRun(r = new Noop());
800          f.complete(null);
801          checkCompletedNormally(g, null);
802 <        assertTrue(r.ran);
802 >        assertEquals(1, r.invocationCount);
803  
804          f = new CompletableFuture<>();
805          f.complete(null);
806          g = f.thenRun(r = new Noop());
807          checkCompletedNormally(g, null);
808 <        assertTrue(r.ran);
808 >        assertEquals(1, r.invocationCount);
809      }
810  
811      /**
# Line 557 | Line 821 | public class CompletableFutureTest exten
821          g = f.thenRun(r = new Noop());
822          f.completeExceptionally(new CFException());
823          checkCompletedWithWrappedCFException(g);
824 <        assertFalse(r.ran);
824 >        assertEquals(0, r.invocationCount);
825  
826          f = new CompletableFuture<>();
827          f.completeExceptionally(new CFException());
828          g = f.thenRun(r = new Noop());
829          checkCompletedWithWrappedCFException(g);
830 <        assertFalse(r.ran);
830 >        assertEquals(0, r.invocationCount);
831      }
832  
833      /**
# Line 654 | Line 918 | public class CompletableFutureTest exten
918          CompletableFuture<Void> g = f.thenAccept(r);
919          f.complete(one);
920          checkCompletedNormally(g, null);
921 <        assertEquals(r.value, 2);
921 >        assertEquals(r.value, (Integer) 2);
922      }
923  
924      /**
# Line 678 | Line 942 | public class CompletableFutureTest exten
942          CompletableFuture<Void> g = f.thenAccept(r);
943          f.complete(one);
944          checkCompletedWithWrappedCFException(g);
945 <        assertTrue(r.ran);
945 >        assertEquals(1, r.invocationCount);
946      }
947  
948      /**
# Line 696 | Line 960 | public class CompletableFutureTest exten
960       * thenCombine result completes normally after normal completion
961       * of sources
962       */
963 <    public void testThenCombine() {
964 <        CompletableFuture<Integer> f, g, h;
965 <
966 <        f = new CompletableFuture<>();
967 <        g = new CompletableFuture<>();
968 <        h = f.thenCombine(g, subtract);
705 <        f.complete(3);
706 <        checkIncomplete(h);
707 <        g.complete(1);
708 <        checkCompletedNormally(h, 2);
963 >    public void testThenCombine_normalCompletion1() {
964 >        for (boolean createIncomplete : new boolean[] { true, false })
965 >        for (boolean fFirst : new boolean[] { true, false })
966 >        for (ExecutionMode m : ExecutionMode.values())
967 >        for (Integer v1 : new Integer[] { 1, null })
968 >        for (Integer v2 : new Integer[] { 2, null }) {
969  
970 <        f = new CompletableFuture<>();
971 <        g = new CompletableFuture<>();
972 <        h = f.thenCombine(g, subtract);
973 <        g.complete(1);
974 <        checkIncomplete(h);
975 <        f.complete(3);
976 <        checkCompletedNormally(h, 2);
970 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
971 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
972 >        final SubtractFunction r = new SubtractFunction();
973 >        CompletableFuture<Integer> h = null;
974 >        if (createIncomplete) h = m.thenCombine(f, g, r);
975 >
976 >        if (fFirst)
977 >            f.complete(v1);
978 >        else
979 >            g.complete(v2);
980 >        if (createIncomplete) checkIncomplete(h);
981 >        assertEquals(0, r.invocationCount);
982 >        if (!fFirst)
983 >            f.complete(v1);
984 >        else
985 >            g.complete(v2);
986 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
987  
988 <        f = new CompletableFuture<>();
989 <        g = new CompletableFuture<>();
990 <        g.complete(1);
991 <        f.complete(3);
992 <        h = f.thenCombine(g, subtract);
723 <        checkCompletedNormally(h, 2);
988 >        checkCompletedNormally(h, subtract(v1, v2));
989 >        checkCompletedNormally(f, v1);
990 >        checkCompletedNormally(g, v2);
991 >        assertEquals(1, r.invocationCount);
992 >        }
993      }
994  
995      /**
996       * thenCombine result completes exceptionally after exceptional
997       * completion of either source
998       */
999 <    public void testThenCombine2() {
1000 <        CompletableFuture<Integer> f, g, h;
999 >    public void testThenCombine_exceptionalCompletion1() {
1000 >        for (ExecutionMode m : ExecutionMode.values())
1001 >        for (Integer v1 : new Integer[] { 1, null }) {
1002  
1003 <        f = new CompletableFuture<>();
1004 <        g = new CompletableFuture<>();
1005 <        h = f.thenCombine(g, subtract);
1006 <        f.completeExceptionally(new CFException());
1003 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1004 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1005 >        final SubtractFunction r = new SubtractFunction();
1006 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1007 >        final CFException ex = new CFException();
1008 >
1009 >        f.completeExceptionally(ex);
1010          checkIncomplete(h);
1011 <        g.complete(1);
739 <        checkCompletedWithWrappedCFException(h);
1011 >        g.complete(v1);
1012  
1013 <        f = new CompletableFuture<>();
1014 <        g = new CompletableFuture<>();
1015 <        h = f.thenCombine(g, subtract);
1016 <        g.completeExceptionally(new CFException());
1013 >        checkCompletedWithWrappedCFException(h, ex);
1014 >        checkCompletedWithWrappedCFException(f, ex);
1015 >        assertEquals(0, r.invocationCount);
1016 >        checkCompletedNormally(g, v1);
1017 >        }
1018 >    }
1019 >
1020 >    public void testThenCombine_exceptionalCompletion2() {
1021 >        for (ExecutionMode m : ExecutionMode.values())
1022 >        for (Integer v1 : new Integer[] { 1, null }) {
1023 >
1024 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1025 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1026 >        final SubtractFunction r = new SubtractFunction();
1027 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1028 >        final CFException ex = new CFException();
1029 >
1030 >        g.completeExceptionally(ex);
1031          checkIncomplete(h);
1032 <        f.complete(3);
747 <        checkCompletedWithWrappedCFException(h);
1032 >        f.complete(v1);
1033  
1034 <        f = new CompletableFuture<>();
1035 <        g = new CompletableFuture<>();
1036 <        f.complete(3);
1037 <        g.completeExceptionally(new CFException());
1038 <        h = f.thenCombine(g, subtract);
1039 <        checkCompletedWithWrappedCFException(h);
1034 >        checkCompletedWithWrappedCFException(h, ex);
1035 >        checkCompletedWithWrappedCFException(g, ex);
1036 >        assertEquals(0, r.invocationCount);
1037 >        checkCompletedNormally(f, v1);
1038 >        }
1039 >    }
1040  
1041 <        f = new CompletableFuture<>();
1042 <        g = new CompletableFuture<>();
1043 <        f.completeExceptionally(new CFException());
1044 <        g.complete(3);
1045 <        h = f.thenCombine(g, subtract);
1046 <        checkCompletedWithWrappedCFException(h);
1041 >    public void testThenCombine_exceptionalCompletion3() {
1042 >        for (ExecutionMode m : ExecutionMode.values())
1043 >        for (Integer v1 : new Integer[] { 1, null }) {
1044 >
1045 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1046 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1047 >        final SubtractFunction r = new SubtractFunction();
1048 >        final CFException ex = new CFException();
1049 >
1050 >        g.completeExceptionally(ex);
1051 >        f.complete(v1);
1052 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1053 >
1054 >        checkCompletedWithWrappedCFException(h, ex);
1055 >        checkCompletedWithWrappedCFException(g, ex);
1056 >        assertEquals(0, r.invocationCount);
1057 >        checkCompletedNormally(f, v1);
1058 >        }
1059 >    }
1060 >
1061 >    public void testThenCombine_exceptionalCompletion4() {
1062 >        for (ExecutionMode m : ExecutionMode.values())
1063 >        for (Integer v1 : new Integer[] { 1, null }) {
1064 >
1065 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1066 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1067 >        final SubtractFunction r = new SubtractFunction();
1068 >        final CFException ex = new CFException();
1069 >
1070 >        f.completeExceptionally(ex);
1071 >        g.complete(v1);
1072 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1073 >
1074 >        checkCompletedWithWrappedCFException(h, ex);
1075 >        checkCompletedWithWrappedCFException(f, ex);
1076 >        assertEquals(0, r.invocationCount);
1077 >        checkCompletedNormally(g, v1);
1078 >        }
1079      }
1080  
1081      /**
1082       * thenCombine result completes exceptionally if action does
1083       */
1084 <    public void testThenCombine3() {
1085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1086 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1087 <        FailingBiFunction r = new FailingBiFunction();
1088 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1089 <        f.complete(one);
1090 <        checkIncomplete(g);
1091 <        assertFalse(r.ran);
1092 <        f2.complete(two);
1093 <        checkCompletedWithWrappedCFException(g);
1094 <        assertTrue(r.ran);
1084 >    public void testThenCombine_actionFailed1() {
1085 >        for (ExecutionMode m : ExecutionMode.values())
1086 >        for (Integer v1 : new Integer[] { 1, null })
1087 >        for (Integer v2 : new Integer[] { 2, null }) {
1088 >
1089 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1090 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1091 >        final FailingBiFunction r = new FailingBiFunction();
1092 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1093 >
1094 >        f.complete(v1);
1095 >        checkIncomplete(h);
1096 >        g.complete(v2);
1097 >
1098 >        checkCompletedWithWrappedCFException(h);
1099 >        checkCompletedNormally(f, v1);
1100 >        checkCompletedNormally(g, v2);
1101 >        }
1102 >    }
1103 >
1104 >    public void testThenCombine_actionFailed2() {
1105 >        for (ExecutionMode m : ExecutionMode.values())
1106 >        for (Integer v1 : new Integer[] { 1, null })
1107 >        for (Integer v2 : new Integer[] { 2, null }) {
1108 >
1109 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1110 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1111 >        final FailingBiFunction r = new FailingBiFunction();
1112 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1113 >
1114 >        g.complete(v2);
1115 >        checkIncomplete(h);
1116 >        f.complete(v1);
1117 >
1118 >        checkCompletedWithWrappedCFException(h);
1119 >        checkCompletedNormally(f, v1);
1120 >        checkCompletedNormally(g, v2);
1121 >        }
1122      }
1123  
1124      /**
1125       * thenCombine result completes exceptionally if either source cancelled
1126       */
1127 <    public void testThenCombine4() {
1128 <        CompletableFuture<Integer> f, g, h;
1127 >    public void testThenCombine_sourceCancelled1() {
1128 >        for (ExecutionMode m : ExecutionMode.values())
1129 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1130 >        for (Integer v1 : new Integer[] { 1, null }) {
1131  
1132 <        f = new CompletableFuture<>();
1133 <        g = new CompletableFuture<>();
1134 <        h = f.thenCombine(g, subtract);
1135 <        assertTrue(f.cancel(true));
1132 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1133 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1134 >        final SubtractFunction r = new SubtractFunction();
1135 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1136 >
1137 >        assertTrue(f.cancel(mayInterruptIfRunning));
1138          checkIncomplete(h);
1139 <        g.complete(1);
1139 >        g.complete(v1);
1140 >
1141          checkCompletedWithWrappedCancellationException(h);
1142 +        checkCancelled(f);
1143 +        assertEquals(0, r.invocationCount);
1144 +        checkCompletedNormally(g, v1);
1145 +        }
1146 +    }
1147  
1148 <        f = new CompletableFuture<>();
1149 <        g = new CompletableFuture<>();
1150 <        h = f.thenCombine(g, subtract);
1151 <        assertTrue(g.cancel(true));
1148 >    public void testThenCombine_sourceCancelled2() {
1149 >        for (ExecutionMode m : ExecutionMode.values())
1150 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1151 >        for (Integer v1 : new Integer[] { 1, null }) {
1152 >
1153 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1154 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1155 >        final SubtractFunction r = new SubtractFunction();
1156 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1157 >
1158 >        assertTrue(g.cancel(mayInterruptIfRunning));
1159          checkIncomplete(h);
1160 <        f.complete(3);
1160 >        f.complete(v1);
1161 >
1162          checkCompletedWithWrappedCancellationException(h);
1163 +        checkCancelled(g);
1164 +        assertEquals(0, r.invocationCount);
1165 +        checkCompletedNormally(f, v1);
1166 +        }
1167 +    }
1168 +
1169 +    public void testThenCombine_sourceCancelled3() {
1170 +        for (ExecutionMode m : ExecutionMode.values())
1171 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1172 +        for (Integer v1 : new Integer[] { 1, null }) {
1173 +
1174 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1175 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1176 +        final SubtractFunction r = new SubtractFunction();
1177 +
1178 +        assertTrue(g.cancel(mayInterruptIfRunning));
1179 +        f.complete(v1);
1180 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1181 +
1182 +        checkCompletedWithWrappedCancellationException(h);
1183 +        checkCancelled(g);
1184 +        assertEquals(0, r.invocationCount);
1185 +        checkCompletedNormally(f, v1);
1186 +        }
1187 +    }
1188 +
1189 +    public void testThenCombine_sourceCancelled4() {
1190 +        for (ExecutionMode m : ExecutionMode.values())
1191 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1192 +        for (Integer v1 : new Integer[] { 1, null }) {
1193 +
1194 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1195 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1196 +        final SubtractFunction r = new SubtractFunction();
1197 +
1198 +        assertTrue(f.cancel(mayInterruptIfRunning));
1199 +        g.complete(v1);
1200 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1201  
802        f = new CompletableFuture<>();
803        g = new CompletableFuture<>();
804        assertTrue(f.cancel(true));
805        assertTrue(g.cancel(true));
806        h = f.thenCombine(g, subtract);
1202          checkCompletedWithWrappedCancellationException(h);
1203 +        checkCancelled(f);
1204 +        assertEquals(0, r.invocationCount);
1205 +        checkCompletedNormally(g, v1);
1206 +        }
1207      }
1208  
1209      /**
1210       * thenAcceptBoth result completes normally after normal
1211       * completion of sources
1212       */
1213 <    public void testThenAcceptBoth() {
1214 <        CompletableFuture<Integer> f, g;
1215 <        CompletableFuture<Void> h;
1216 <        SubtractAction r;
1213 >    public void testThenAcceptBoth_normalCompletion1() {
1214 >        for (ExecutionMode m : ExecutionMode.values())
1215 >        for (Integer v1 : new Integer[] { 1, null })
1216 >        for (Integer v2 : new Integer[] { 2, null }) {
1217  
1218 <        f = new CompletableFuture<>();
1219 <        g = new CompletableFuture<>();
1220 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1221 <        f.complete(3);
1218 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1219 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1220 >        final SubtractAction r = new SubtractAction();
1221 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1222 >
1223 >        f.complete(v1);
1224          checkIncomplete(h);
1225 <        g.complete(1);
1225 >        assertEquals(0, r.invocationCount);
1226 >        g.complete(v2);
1227 >
1228          checkCompletedNormally(h, null);
1229 <        assertEquals(r.value, 2);
1229 >        assertEquals(r.value, subtract(v1, v2));
1230 >        checkCompletedNormally(f, v1);
1231 >        checkCompletedNormally(g, v2);
1232 >        }
1233 >    }
1234  
1235 <        f = new CompletableFuture<>();
1236 <        g = new CompletableFuture<>();
1237 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1238 <        g.complete(1);
1235 >    public void testThenAcceptBoth_normalCompletion2() {
1236 >        for (ExecutionMode m : ExecutionMode.values())
1237 >        for (Integer v1 : new Integer[] { 1, null })
1238 >        for (Integer v2 : new Integer[] { 2, null }) {
1239 >
1240 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1241 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1242 >        final SubtractAction r = new SubtractAction();
1243 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1244 >
1245 >        g.complete(v2);
1246          checkIncomplete(h);
1247 <        f.complete(3);
1247 >        assertEquals(0, r.invocationCount);
1248 >        f.complete(v1);
1249 >
1250          checkCompletedNormally(h, null);
1251 <        assertEquals(r.value, 2);
1251 >        assertEquals(r.value, subtract(v1, v2));
1252 >        checkCompletedNormally(f, v1);
1253 >        checkCompletedNormally(g, v2);
1254 >        }
1255 >    }
1256 >
1257 >    public void testThenAcceptBoth_normalCompletion3() {
1258 >        for (ExecutionMode m : ExecutionMode.values())
1259 >        for (Integer v1 : new Integer[] { 1, null })
1260 >        for (Integer v2 : new Integer[] { 2, null }) {
1261 >
1262 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1263 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1264 >        final SubtractAction r = new SubtractAction();
1265 >
1266 >        g.complete(v2);
1267 >        f.complete(v1);
1268 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1269  
837        f = new CompletableFuture<>();
838        g = new CompletableFuture<>();
839        g.complete(1);
840        f.complete(3);
841        h = f.thenAcceptBoth(g, r = new SubtractAction());
1270          checkCompletedNormally(h, null);
1271 <        assertEquals(r.value, 2);
1271 >        assertEquals(r.value, subtract(v1, v2));
1272 >        checkCompletedNormally(f, v1);
1273 >        checkCompletedNormally(g, v2);
1274 >        }
1275 >    }
1276 >
1277 >    public void testThenAcceptBoth_normalCompletion4() {
1278 >        for (ExecutionMode m : ExecutionMode.values())
1279 >        for (Integer v1 : new Integer[] { 1, null })
1280 >        for (Integer v2 : new Integer[] { 2, null }) {
1281 >
1282 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1283 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1284 >        final SubtractAction r = new SubtractAction();
1285 >
1286 >        f.complete(v1);
1287 >        g.complete(v2);
1288 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1289 >
1290 >        checkCompletedNormally(h, null);
1291 >        assertEquals(r.value, subtract(v1, v2));
1292 >        checkCompletedNormally(f, v1);
1293 >        checkCompletedNormally(g, v2);
1294 >        }
1295      }
1296  
1297      /**
1298       * thenAcceptBoth result completes exceptionally after exceptional
1299       * completion of either source
1300       */
1301 <    public void testThenAcceptBoth2() {
1302 <        CompletableFuture<Integer> f, g;
1303 <        CompletableFuture<Void> h;
853 <        SubtractAction r;
1301 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1302 >        for (ExecutionMode m : ExecutionMode.values())
1303 >        for (Integer v1 : new Integer[] { 1, null }) {
1304  
1305 <        f = new CompletableFuture<>();
1306 <        g = new CompletableFuture<>();
1307 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1308 <        f.completeExceptionally(new CFException());
1305 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1306 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1307 >        final SubtractAction r = new SubtractAction();
1308 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1309 >        final CFException ex = new CFException();
1310 >
1311 >        f.completeExceptionally(ex);
1312          checkIncomplete(h);
1313 <        g.complete(1);
861 <        checkCompletedWithWrappedCFException(h);
1313 >        g.complete(v1);
1314  
1315 <        f = new CompletableFuture<>();
1316 <        g = new CompletableFuture<>();
1317 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1318 <        g.completeExceptionally(new CFException());
1315 >        checkCompletedWithWrappedCFException(h, ex);
1316 >        checkCompletedWithWrappedCFException(f, ex);
1317 >        assertEquals(0, r.invocationCount);
1318 >        checkCompletedNormally(g, v1);
1319 >        }
1320 >    }
1321 >
1322 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1323 >        for (ExecutionMode m : ExecutionMode.values())
1324 >        for (Integer v1 : new Integer[] { 1, null }) {
1325 >
1326 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1327 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1328 >        final SubtractAction r = new SubtractAction();
1329 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1330 >        final CFException ex = new CFException();
1331 >
1332 >        g.completeExceptionally(ex);
1333          checkIncomplete(h);
1334 <        f.complete(3);
869 <        checkCompletedWithWrappedCFException(h);
1334 >        f.complete(v1);
1335  
1336 <        f = new CompletableFuture<>();
1337 <        g = new CompletableFuture<>();
1338 <        f.complete(3);
1339 <        g.completeExceptionally(new CFException());
1340 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1341 <        checkCompletedWithWrappedCFException(h);
1336 >        checkCompletedWithWrappedCFException(h, ex);
1337 >        checkCompletedWithWrappedCFException(g, ex);
1338 >        assertEquals(0, r.invocationCount);
1339 >        checkCompletedNormally(f, v1);
1340 >        }
1341 >    }
1342  
1343 <        f = new CompletableFuture<>();
1344 <        g = new CompletableFuture<>();
1345 <        f.completeExceptionally(new CFException());
1346 <        g.complete(3);
1347 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1348 <        checkCompletedWithWrappedCFException(h);
1343 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1344 >        for (ExecutionMode m : ExecutionMode.values())
1345 >        for (Integer v1 : new Integer[] { 1, null }) {
1346 >
1347 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1348 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1349 >        final SubtractAction r = new SubtractAction();
1350 >        final CFException ex = new CFException();
1351 >
1352 >        g.completeExceptionally(ex);
1353 >        f.complete(v1);
1354 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1355 >
1356 >        checkCompletedWithWrappedCFException(h, ex);
1357 >        checkCompletedWithWrappedCFException(g, ex);
1358 >        assertEquals(0, r.invocationCount);
1359 >        checkCompletedNormally(f, v1);
1360 >        }
1361 >    }
1362 >
1363 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1364 >        for (ExecutionMode m : ExecutionMode.values())
1365 >        for (Integer v1 : new Integer[] { 1, null }) {
1366 >
1367 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1368 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1369 >        final SubtractAction r = new SubtractAction();
1370 >        final CFException ex = new CFException();
1371 >
1372 >        f.completeExceptionally(ex);
1373 >        g.complete(v1);
1374 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1375 >
1376 >        checkCompletedWithWrappedCFException(h, ex);
1377 >        checkCompletedWithWrappedCFException(f, ex);
1378 >        assertEquals(0, r.invocationCount);
1379 >        checkCompletedNormally(g, v1);
1380 >        }
1381      }
1382  
1383      /**
1384       * thenAcceptBoth result completes exceptionally if action does
1385       */
1386 <    public void testThenAcceptBoth3() {
1387 <        CompletableFuture<Integer> f, g;
1388 <        CompletableFuture<Void> h;
1389 <        FailingBiConsumer r;
1386 >    public void testThenAcceptBoth_actionFailed1() {
1387 >        for (ExecutionMode m : ExecutionMode.values())
1388 >        for (Integer v1 : new Integer[] { 1, null })
1389 >        for (Integer v2 : new Integer[] { 2, null }) {
1390  
1391 <        f = new CompletableFuture<>();
1392 <        g = new CompletableFuture<>();
1393 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1394 <        f.complete(3);
1391 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1392 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1393 >        final FailingBiConsumer r = new FailingBiConsumer();
1394 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1395 >
1396 >        f.complete(v1);
1397          checkIncomplete(h);
1398 <        g.complete(1);
1398 >        g.complete(v2);
1399 >
1400          checkCompletedWithWrappedCFException(h);
1401 +        checkCompletedNormally(f, v1);
1402 +        checkCompletedNormally(g, v2);
1403 +        }
1404 +    }
1405 +
1406 +    public void testThenAcceptBoth_actionFailed2() {
1407 +        for (ExecutionMode m : ExecutionMode.values())
1408 +        for (Integer v1 : new Integer[] { 1, null })
1409 +        for (Integer v2 : new Integer[] { 2, null }) {
1410 +
1411 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1412 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1413 +        final FailingBiConsumer r = new FailingBiConsumer();
1414 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1415 +
1416 +        g.complete(v2);
1417 +        checkIncomplete(h);
1418 +        f.complete(v1);
1419  
902        f = new CompletableFuture<>();
903        g = new CompletableFuture<>();
904        f.complete(3);
905        g.complete(1);
906        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1420          checkCompletedWithWrappedCFException(h);
1421 +        checkCompletedNormally(f, v1);
1422 +        checkCompletedNormally(g, v2);
1423 +        }
1424      }
1425  
1426      /**
1427       * thenAcceptBoth result completes exceptionally if either source cancelled
1428       */
1429 <    public void testThenAcceptBoth4() {
1430 <        CompletableFuture<Integer> f, g;
1431 <        CompletableFuture<Void> h;
1432 <        SubtractAction r;
1429 >    public void testThenAcceptBoth_sourceCancelled1() {
1430 >        for (ExecutionMode m : ExecutionMode.values())
1431 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1432 >        for (Integer v1 : new Integer[] { 1, null }) {
1433  
1434 <        f = new CompletableFuture<>();
1435 <        g = new CompletableFuture<>();
1436 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1437 <        assertTrue(f.cancel(true));
1434 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1435 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1436 >        final SubtractAction r = new SubtractAction();
1437 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1438 >
1439 >        assertTrue(f.cancel(mayInterruptIfRunning));
1440          checkIncomplete(h);
1441 <        g.complete(1);
1441 >        g.complete(v1);
1442 >
1443          checkCompletedWithWrappedCancellationException(h);
1444 +        checkCancelled(f);
1445 +        assertEquals(0, r.invocationCount);
1446 +        checkCompletedNormally(g, v1);
1447 +        }
1448 +    }
1449  
1450 <        f = new CompletableFuture<>();
1451 <        g = new CompletableFuture<>();
1452 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1453 <        assertTrue(g.cancel(true));
1450 >    public void testThenAcceptBoth_sourceCancelled2() {
1451 >        for (ExecutionMode m : ExecutionMode.values())
1452 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1453 >        for (Integer v1 : new Integer[] { 1, null }) {
1454 >
1455 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1456 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1457 >        final SubtractAction r = new SubtractAction();
1458 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1459 >
1460 >        assertTrue(g.cancel(mayInterruptIfRunning));
1461          checkIncomplete(h);
1462 <        f.complete(3);
932 <        checkCompletedWithWrappedCancellationException(h);
1462 >        f.complete(v1);
1463  
934        f = new CompletableFuture<>();
935        g = new CompletableFuture<>();
936        f.complete(3);
937        assertTrue(g.cancel(true));
938        h = f.thenAcceptBoth(g, r = new SubtractAction());
1464          checkCompletedWithWrappedCancellationException(h);
1465 +        checkCancelled(g);
1466 +        assertEquals(0, r.invocationCount);
1467 +        checkCompletedNormally(f, v1);
1468 +        }
1469 +    }
1470 +
1471 +    public void testThenAcceptBoth_sourceCancelled3() {
1472 +        for (ExecutionMode m : ExecutionMode.values())
1473 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1474 +        for (Integer v1 : new Integer[] { 1, null }) {
1475 +
1476 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1477 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1478 +        final SubtractAction r = new SubtractAction();
1479 +
1480 +        assertTrue(g.cancel(mayInterruptIfRunning));
1481 +        f.complete(v1);
1482 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1483  
941        f = new CompletableFuture<>();
942        g = new CompletableFuture<>();
943        assertTrue(f.cancel(true));
944        g.complete(3);
945        h = f.thenAcceptBoth(g, r = new SubtractAction());
1484          checkCompletedWithWrappedCancellationException(h);
1485 +        checkCancelled(g);
1486 +        assertEquals(0, r.invocationCount);
1487 +        checkCompletedNormally(f, v1);
1488 +        }
1489      }
1490  
1491 <    /**
1492 <     * Permits the testing of parallel code for the 3 different
1493 <     * execution modes without repeating all the testing code.
1494 <     */
953 <    enum ExecutionMode {
954 <        DEFAULT {
955 <            public <T,U> CompletableFuture<Void> runAfterBoth
956 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
957 <                return f.runAfterBoth(g, r);
958 <            }
959 <        },
1491 >    public void testThenAcceptBoth_sourceCancelled4() {
1492 >        for (ExecutionMode m : ExecutionMode.values())
1493 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1494 >        for (Integer v1 : new Integer[] { 1, null }) {
1495  
1496 <        DEFAULT_ASYNC {
1497 <            public <T,U> CompletableFuture<Void> runAfterBoth
1498 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
964 <                return f.runAfterBothAsync(g, r);
965 <            }
966 <        },
1496 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1497 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1498 >        final SubtractAction r = new SubtractAction();
1499  
1500 <        EXECUTOR {
1501 <            public <T,U> CompletableFuture<Void> runAfterBoth
1502 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
971 <                return f.runAfterBothAsync(g, r, new ThreadExecutor());
972 <            }
973 <        };
1500 >        assertTrue(f.cancel(mayInterruptIfRunning));
1501 >        g.complete(v1);
1502 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1503  
1504 <        public abstract <T,U> CompletableFuture<Void> runAfterBoth
1505 <            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r);
1504 >        checkCompletedWithWrappedCancellationException(h);
1505 >        checkCancelled(f);
1506 >        assertEquals(0, r.invocationCount);
1507 >        checkCompletedNormally(g, v1);
1508 >        }
1509      }
1510  
1511      /**
# Line 992 | Line 1524 | public class CompletableFutureTest exten
1524  
1525          f.complete(v1);
1526          checkIncomplete(h);
1527 <        assertFalse(r.ran);
1527 >        assertEquals(0, r.invocationCount);
1528          g.complete(v2);
1529  
1530          checkCompletedNormally(h, null);
1531 <        assertTrue(r.ran);
1531 >        assertEquals(1, r.invocationCount);
1532          checkCompletedNormally(f, v1);
1533          checkCompletedNormally(g, v2);
1534          }
# Line 1014 | Line 1546 | public class CompletableFutureTest exten
1546  
1547          g.complete(v2);
1548          checkIncomplete(h);
1549 <        assertFalse(r.ran);
1549 >        assertEquals(0, r.invocationCount);
1550          f.complete(v1);
1551  
1552          checkCompletedNormally(h, null);
1553 <        assertTrue(r.ran);
1553 >        assertEquals(1, r.invocationCount);
1554          checkCompletedNormally(f, v1);
1555          checkCompletedNormally(g, v2);
1556          }
# Line 1038 | Line 1570 | public class CompletableFutureTest exten
1570          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1571  
1572          checkCompletedNormally(h, null);
1573 <        assertTrue(r.ran);
1573 >        assertEquals(1, r.invocationCount);
1574          checkCompletedNormally(f, v1);
1575          checkCompletedNormally(g, v2);
1576          }
# Line 1058 | Line 1590 | public class CompletableFutureTest exten
1590          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1591  
1592          checkCompletedNormally(h, null);
1593 <        assertTrue(r.ran);
1593 >        assertEquals(1, r.invocationCount);
1594          checkCompletedNormally(f, v1);
1595          checkCompletedNormally(g, v2);
1596          }
# Line 1084 | Line 1616 | public class CompletableFutureTest exten
1616  
1617          checkCompletedWithWrappedCFException(h, ex);
1618          checkCompletedWithWrappedCFException(f, ex);
1619 <        assertFalse(r.ran);
1619 >        assertEquals(0, r.invocationCount);
1620          checkCompletedNormally(g, v1);
1621          }
1622      }
# Line 1105 | Line 1637 | public class CompletableFutureTest exten
1637  
1638          checkCompletedWithWrappedCFException(h, ex);
1639          checkCompletedWithWrappedCFException(g, ex);
1640 <        assertFalse(r.ran);
1640 >        assertEquals(0, r.invocationCount);
1641          checkCompletedNormally(f, v1);
1642          }
1643      }
# Line 1125 | Line 1657 | public class CompletableFutureTest exten
1657  
1658          checkCompletedWithWrappedCFException(h, ex);
1659          checkCompletedWithWrappedCFException(g, ex);
1660 <        assertFalse(r.ran);
1660 >        assertEquals(0, r.invocationCount);
1661          checkCompletedNormally(f, v1);
1662          }
1663      }
# Line 1145 | Line 1677 | public class CompletableFutureTest exten
1677  
1678          checkCompletedWithWrappedCFException(h, ex);
1679          checkCompletedWithWrappedCFException(f, ex);
1680 <        assertFalse(r.ran);
1680 >        assertEquals(0, r.invocationCount);
1681          checkCompletedNormally(g, v1);
1682          }
1683      }
# Line 1212 | Line 1744 | public class CompletableFutureTest exten
1744  
1745          checkCompletedWithWrappedCancellationException(h);
1746          checkCancelled(f);
1747 <        assertFalse(r.ran);
1747 >        assertEquals(0, r.invocationCount);
1748          checkCompletedNormally(g, v1);
1749          }
1750      }
# Line 1233 | Line 1765 | public class CompletableFutureTest exten
1765  
1766          checkCompletedWithWrappedCancellationException(h);
1767          checkCancelled(g);
1768 <        assertFalse(r.ran);
1768 >        assertEquals(0, r.invocationCount);
1769          checkCompletedNormally(f, v1);
1770          }
1771      }
# Line 1253 | Line 1785 | public class CompletableFutureTest exten
1785  
1786          checkCompletedWithWrappedCancellationException(h);
1787          checkCancelled(g);
1788 <        assertFalse(r.ran);
1788 >        assertEquals(0, r.invocationCount);
1789          checkCompletedNormally(f, v1);
1790          }
1791      }
# Line 1273 | Line 1805 | public class CompletableFutureTest exten
1805  
1806          checkCompletedWithWrappedCancellationException(h);
1807          checkCancelled(f);
1808 <        assertFalse(r.ran);
1808 >        assertEquals(0, r.invocationCount);
1809          checkCompletedNormally(g, v1);
1810          }
1811      }
# Line 1282 | Line 1814 | public class CompletableFutureTest exten
1814       * applyToEither result completes normally after normal completion
1815       * of either source
1816       */
1817 <    public void testApplyToEither() {
1818 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1819 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1820 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1289 <        f.complete(one);
1290 <        checkCompletedNormally(g, two);
1291 <        f2.complete(one);
1292 <        checkCompletedNormally(g, two);
1817 >    public void testApplyToEither_normalCompletion1() {
1818 >        for (ExecutionMode m : ExecutionMode.values())
1819 >        for (Integer v1 : new Integer[] { 1, null })
1820 >        for (Integer v2 : new Integer[] { 2, null }) {
1821  
1822 <        f = new CompletableFuture<>();
1823 <        f.complete(one);
1824 <        f2 = new CompletableFuture<>();
1825 <        g = f.applyToEither(f2, inc);
1298 <        checkCompletedNormally(g, two);
1299 <    }
1822 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1823 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1824 >        final IncFunction r = new IncFunction();
1825 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1826  
1827 <    /**
1828 <     * applyToEither result completes exceptionally after exceptional
1829 <     * completion of either source
1304 <     */
1305 <    public void testApplyToEither2() {
1306 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1307 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1308 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1309 <        f.completeExceptionally(new CFException());
1310 <        f2.complete(one);
1311 <        checkCompletedWithWrappedCFException(g);
1827 >        f.complete(v1);
1828 >        checkCompletedNormally(h, inc(v1));
1829 >        g.complete(v2);
1830  
1831 <        f = new CompletableFuture<>();
1832 <        f2 = new CompletableFuture<>();
1833 <        f2.completeExceptionally(new CFException());
1834 <        g = f.applyToEither(f2, inc);
1317 <        checkCompletedWithWrappedCFException(g);
1831 >        checkCompletedNormally(f, v1);
1832 >        checkCompletedNormally(g, v2);
1833 >        checkCompletedNormally(h, inc(v1));
1834 >        }
1835      }
1836  
1837 <    /**
1838 <     * applyToEither result completes exceptionally if action does
1839 <     */
1840 <    public void testApplyToEither3() {
1324 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1325 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1326 <        FailingFunction r = new FailingFunction();
1327 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1328 <        f2.complete(two);
1329 <        checkCompletedWithWrappedCFException(g);
1330 <    }
1837 >    public void testApplyToEither_normalCompletion2() {
1838 >        for (ExecutionMode m : ExecutionMode.values())
1839 >        for (Integer v1 : new Integer[] { 1, null })
1840 >        for (Integer v2 : new Integer[] { 2, null }) {
1841  
1842 <    /**
1843 <     * applyToEither result completes exceptionally if either source cancelled
1844 <     */
1845 <    public void testApplyToEither4() {
1846 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1847 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1848 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1849 <        assertTrue(f.cancel(true));
1850 <        checkCompletedWithWrappedCancellationException(g);
1851 <        f = new CompletableFuture<>();
1852 <        f2 = new CompletableFuture<>();
1853 <        assertTrue(f2.cancel(true));
1854 <        checkCompletedWithWrappedCancellationException(g);
1842 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1843 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1844 >        final IncFunction r = new IncFunction();
1845 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1846 >
1847 >        g.complete(v2);
1848 >        checkCompletedNormally(h, inc(v2));
1849 >        f.complete(v1);
1850 >
1851 >        checkCompletedNormally(f, v1);
1852 >        checkCompletedNormally(g, v2);
1853 >        checkCompletedNormally(h, inc(v2));
1854 >        }
1855      }
1856 +    public void testApplyToEither_normalCompletion3() {
1857 +        for (ExecutionMode m : ExecutionMode.values())
1858 +        for (Integer v1 : new Integer[] { 1, null })
1859 +        for (Integer v2 : new Integer[] { 2, null }) {
1860  
1861 <    /**
1862 <     * acceptEither result completes normally after normal completion
1863 <     * of either source
1350 <     */
1351 <    public void testAcceptEither() {
1352 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1353 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1354 <        IncAction r = new IncAction();
1355 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1356 <        f.complete(one);
1357 <        checkCompletedNormally(g, null);
1358 <        f2.complete(one);
1359 <        checkCompletedNormally(g, null);
1360 <        assertEquals(r.value, 2);
1861 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1862 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1863 >        final IncFunction r = new IncFunction();
1864  
1865 <        r = new IncAction();
1866 <        f = new CompletableFuture<>();
1867 <        f.complete(one);
1868 <        f2 = new CompletableFuture<>();
1869 <        g = f.acceptEither(f2, r);
1870 <        checkCompletedNormally(g, null);
1871 <        assertEquals(r.value, 2);
1865 >        f.complete(v1);
1866 >        g.complete(v2);
1867 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1868 >
1869 >        checkCompletedNormally(f, v1);
1870 >        checkCompletedNormally(g, v2);
1871 >
1872 >        // unspecified behavior
1873 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1874 >                   Objects.equals(h.join(), inc(v2)));
1875 >        assertEquals(1, r.invocationCount);
1876 >        }
1877      }
1878  
1879      /**
1880 <     * acceptEither result completes exceptionally after exceptional
1880 >     * applyToEither result completes exceptionally after exceptional
1881       * completion of either source
1882       */
1883 <    public void testAcceptEither2() {
1884 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1885 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1378 <        IncAction r = new IncAction();
1379 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1380 <        f.completeExceptionally(new CFException());
1381 <        f2.complete(one);
1382 <        checkCompletedWithWrappedCFException(g);
1883 >    public void testApplyToEither_exceptionalCompletion1() {
1884 >        for (ExecutionMode m : ExecutionMode.values())
1885 >        for (Integer v1 : new Integer[] { 1, null }) {
1886  
1887 <        r = new IncAction();
1888 <        f = new CompletableFuture<>();
1889 <        f2 = new CompletableFuture<>();
1890 <        f2.completeExceptionally(new CFException());
1891 <        g = f.acceptEither(f2, r);
1389 <        checkCompletedWithWrappedCFException(g);
1390 <    }
1887 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1888 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1889 >        final IncFunction r = new IncFunction();
1890 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1891 >        final CFException ex = new CFException();
1892  
1893 <    /**
1894 <     * acceptEither result completes exceptionally if action does
1895 <     */
1395 <    public void testAcceptEither3() {
1396 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1397 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1398 <        FailingConsumer r = new FailingConsumer();
1399 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1400 <        f2.complete(two);
1401 <        checkCompletedWithWrappedCFException(g);
1402 <    }
1893 >        f.completeExceptionally(ex);
1894 >        checkCompletedWithWrappedCFException(h, ex);
1895 >        g.complete(v1);
1896  
1897 <    /**
1898 <     * acceptEither result completes exceptionally if either source cancelled
1899 <     */
1900 <    public void testAcceptEither4() {
1901 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1409 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1410 <        IncAction r = new IncAction();
1411 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1412 <        assertTrue(f.cancel(true));
1413 <        checkCompletedWithWrappedCancellationException(g);
1414 <        f = new CompletableFuture<>();
1415 <        f2 = new CompletableFuture<>();
1416 <        assertTrue(f2.cancel(true));
1417 <        checkCompletedWithWrappedCancellationException(g);
1897 >        assertEquals(0, r.invocationCount);
1898 >        checkCompletedNormally(g, v1);
1899 >        checkCompletedWithWrappedCFException(f, ex);
1900 >        checkCompletedWithWrappedCFException(h, ex);
1901 >        }
1902      }
1903  
1904 <    /**
1905 <     * runAfterEither result completes normally after normal completion
1906 <     * of either source
1423 <     */
1424 <    public void testRunAfterEither() {
1425 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1426 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1427 <        Noop r = new Noop();
1428 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1429 <        f.complete(one);
1430 <        checkCompletedNormally(g, null);
1431 <        f2.complete(one);
1432 <        checkCompletedNormally(g, null);
1433 <        assertTrue(r.ran);
1904 >    public void testApplyToEither_exceptionalCompletion2() {
1905 >        for (ExecutionMode m : ExecutionMode.values())
1906 >        for (Integer v1 : new Integer[] { 1, null }) {
1907  
1908 <        r = new Noop();
1909 <        f = new CompletableFuture<>();
1910 <        f.complete(one);
1911 <        f2 = new CompletableFuture<>();
1912 <        g = f.runAfterEither(f2, r);
1440 <        checkCompletedNormally(g, null);
1441 <        assertTrue(r.ran);
1442 <    }
1908 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1909 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1910 >        final IncFunction r = new IncFunction();
1911 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1912 >        final CFException ex = new CFException();
1913  
1914 <    /**
1915 <     * runAfterEither result completes exceptionally after exceptional
1916 <     * completion of either source
1447 <     */
1448 <    public void testRunAfterEither2() {
1449 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1450 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1451 <        Noop r = new Noop();
1452 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1453 <        f.completeExceptionally(new CFException());
1454 <        f2.complete(one);
1455 <        checkCompletedWithWrappedCFException(g);
1914 >        g.completeExceptionally(ex);
1915 >        checkCompletedWithWrappedCFException(h, ex);
1916 >        f.complete(v1);
1917  
1918 <        r = new Noop();
1919 <        f = new CompletableFuture<>();
1920 <        f2 = new CompletableFuture<>();
1921 <        f2.completeExceptionally(new CFException());
1922 <        g = f.runAfterEither(f2, r);
1462 <        checkCompletedWithWrappedCFException(g);
1918 >        assertEquals(0, r.invocationCount);
1919 >        checkCompletedNormally(f, v1);
1920 >        checkCompletedWithWrappedCFException(g, ex);
1921 >        checkCompletedWithWrappedCFException(h, ex);
1922 >        }
1923      }
1924  
1925 <    /**
1926 <     * runAfterEither result completes exceptionally if action does
1927 <     */
1468 <    public void testRunAfterEither3() {
1469 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1471 <        FailingNoop r = new FailingNoop();
1472 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1473 <        f2.complete(two);
1474 <        checkCompletedWithWrappedCFException(g);
1475 <    }
1925 >    public void testApplyToEither_exceptionalCompletion3() {
1926 >        for (ExecutionMode m : ExecutionMode.values())
1927 >        for (Integer v1 : new Integer[] { 1, null }) {
1928  
1929 <    /**
1930 <     * runAfterEither result completes exceptionally if either source cancelled
1931 <     */
1932 <    public void testRunAfterEither4() {
1933 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1934 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1935 <        Noop r = new Noop();
1936 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1937 <        assertTrue(f.cancel(true));
1938 <        checkCompletedWithWrappedCancellationException(g);
1939 <        f = new CompletableFuture<>();
1940 <        f2 = new CompletableFuture<>();
1941 <        assertTrue(f2.cancel(true));
1942 <        checkCompletedWithWrappedCancellationException(g);
1929 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1930 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 >        final IncFunction r = new IncFunction();
1932 >        final CFException ex = new CFException();
1933 >
1934 >        g.completeExceptionally(ex);
1935 >        f.complete(v1);
1936 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1937 >
1938 >        // unspecified behavior
1939 >        Integer v;
1940 >        try {
1941 >            assertEquals(h.join(), inc(v1));
1942 >            assertEquals(1, r.invocationCount);
1943 >        } catch (CompletionException ok) {
1944 >            checkCompletedWithWrappedCFException(h, ex);
1945 >            assertEquals(0, r.invocationCount);
1946 >        }
1947 >
1948 >        checkCompletedWithWrappedCFException(g, ex);
1949 >        checkCompletedNormally(f, v1);
1950 >        }
1951      }
1952  
1953 <    /**
1954 <     * thenCompose result completes normally after normal completion of source
1955 <     */
1496 <    public void testThenCompose() {
1497 <        CompletableFuture<Integer> f, g;
1498 <        CompletableFutureInc r;
1953 >    public void testApplyToEither_exceptionalCompletion4() {
1954 >        for (ExecutionMode m : ExecutionMode.values())
1955 >        for (Integer v1 : new Integer[] { 1, null }) {
1956  
1957 <        f = new CompletableFuture<>();
1958 <        g = f.thenCompose(r = new CompletableFutureInc());
1959 <        f.complete(one);
1960 <        checkCompletedNormally(g, two);
1504 <        assertTrue(r.ran);
1957 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1958 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1959 >        final IncFunction r = new IncFunction();
1960 >        final CFException ex = new CFException();
1961  
1962 <        f = new CompletableFuture<>();
1963 <        f.complete(one);
1964 <        g = f.thenCompose(r = new CompletableFutureInc());
1965 <        checkCompletedNormally(g, two);
1966 <        assertTrue(r.ran);
1962 >        f.completeExceptionally(ex);
1963 >        g.complete(v1);
1964 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1965 >
1966 >        // unspecified behavior
1967 >        Integer v;
1968 >        try {
1969 >            assertEquals(h.join(), inc(v1));
1970 >            assertEquals(1, r.invocationCount);
1971 >        } catch (CompletionException ok) {
1972 >            checkCompletedWithWrappedCFException(h, ex);
1973 >            assertEquals(0, r.invocationCount);
1974 >        }
1975 >
1976 >        checkCompletedWithWrappedCFException(f, ex);
1977 >        checkCompletedNormally(g, v1);
1978 >        }
1979      }
1980  
1981      /**
1982 <     * thenCompose result completes exceptionally after exceptional
1515 <     * completion of source
1982 >     * applyToEither result completes exceptionally if action does
1983       */
1984 <    public void testThenCompose2() {
1985 <        CompletableFuture<Integer> f, g;
1986 <        CompletableFutureInc r;
1984 >    public void testApplyToEither_actionFailed1() {
1985 >        for (ExecutionMode m : ExecutionMode.values())
1986 >        for (Integer v1 : new Integer[] { 1, null })
1987 >        for (Integer v2 : new Integer[] { 2, null }) {
1988  
1989 <        f = new CompletableFuture<>();
1990 <        g = f.thenCompose(r = new CompletableFutureInc());
1991 <        f.completeExceptionally(new CFException());
1992 <        checkCompletedWithWrappedCFException(g);
1989 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1990 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1991 >        final FailingFunction r = new FailingFunction();
1992 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1993  
1994 <        f = new CompletableFuture<>();
1995 <        f.completeExceptionally(new CFException());
1996 <        g = f.thenCompose(r = new CompletableFutureInc());
1997 <        checkCompletedWithWrappedCFException(g);
1994 >        f.complete(v1);
1995 >        checkCompletedWithWrappedCFException(h);
1996 >        g.complete(v2);
1997 >        checkCompletedNormally(f, v1);
1998 >        checkCompletedNormally(g, v2);
1999 >        }
2000      }
2001  
2002 <    /**
2003 <     * thenCompose result completes exceptionally if action does
2004 <     */
2005 <    public void testThenCompose3() {
1536 <        CompletableFuture<Integer> f, g;
1537 <        FailingCompletableFutureFunction r;
2002 >    public void testApplyToEither_actionFailed2() {
2003 >        for (ExecutionMode m : ExecutionMode.values())
2004 >        for (Integer v1 : new Integer[] { 1, null })
2005 >        for (Integer v2 : new Integer[] { 2, null }) {
2006  
2007 <        f = new CompletableFuture<>();
2008 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2009 <        f.complete(one);
2010 <        checkCompletedWithWrappedCFException(g);
2007 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2008 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2009 >        final FailingFunction r = new FailingFunction();
2010 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2011  
2012 <        f = new CompletableFuture<>();
2013 <        f.complete(one);
2014 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2015 <        checkCompletedWithWrappedCFException(g);
2012 >        g.complete(v2);
2013 >        checkCompletedWithWrappedCFException(h);
2014 >        f.complete(v1);
2015 >        checkCompletedNormally(f, v1);
2016 >        checkCompletedNormally(g, v2);
2017 >        }
2018      }
2019  
2020      /**
2021 <     * thenCompose result completes exceptionally if source cancelled
2021 >     * applyToEither result completes exceptionally if either source cancelled
2022       */
2023 <    public void testThenCompose4() {
2024 <        CompletableFuture<Integer> f, g;
2025 <        CompletableFutureInc r;
2023 >    public void testApplyToEither_sourceCancelled1() {
2024 >        for (ExecutionMode m : ExecutionMode.values())
2025 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2026 >        for (Integer v1 : new Integer[] { 1, null }) {
2027  
2028 <        f = new CompletableFuture<>();
2029 <        g = f.thenCompose(r = new CompletableFutureInc());
2030 <        assertTrue(f.cancel(true));
2031 <        checkCompletedWithWrappedCancellationException(g);
2028 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2029 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2030 >        final IncFunction r = new IncFunction();
2031 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2032  
2033 <        f = new CompletableFuture<>();
2034 <        assertTrue(f.cancel(true));
2035 <        g = f.thenCompose(r = new CompletableFutureInc());
2036 <        checkCompletedWithWrappedCancellationException(g);
2033 >        assertTrue(f.cancel(mayInterruptIfRunning));
2034 >        checkCompletedWithWrappedCancellationException(h);
2035 >        g.complete(v1);
2036 >
2037 >        checkCancelled(f);
2038 >        assertEquals(0, r.invocationCount);
2039 >        checkCompletedNormally(g, v1);
2040 >        checkCompletedWithWrappedCancellationException(h);
2041 >        }
2042      }
2043  
2044 <    // asyncs
2044 >    public void testApplyToEither_sourceCancelled2() {
2045 >        for (ExecutionMode m : ExecutionMode.values())
2046 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2047 >        for (Integer v1 : new Integer[] { 1, null }) {
2048  
2049 <    /**
2050 <     * thenRunAsync result completes normally after normal completion of source
2051 <     */
2052 <    public void testThenRunAsync() {
1574 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1575 <        Noop r = new Noop();
1576 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1577 <        f.complete(null);
1578 <        checkCompletedNormally(g, null);
2049 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2050 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2051 >        final IncFunction r = new IncFunction();
2052 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2053  
2054 <        // reordered version
2055 <        f = new CompletableFuture<>();
2056 <        f.complete(null);
2057 <        r = new Noop();
2058 <        g = f.thenRunAsync(r);
2059 <        checkCompletedNormally(g, null);
2054 >        assertTrue(g.cancel(mayInterruptIfRunning));
2055 >        checkCompletedWithWrappedCancellationException(h);
2056 >        f.complete(v1);
2057 >
2058 >        checkCancelled(g);
2059 >        assertEquals(0, r.invocationCount);
2060 >        checkCompletedNormally(f, v1);
2061 >        checkCompletedWithWrappedCancellationException(h);
2062 >        }
2063      }
2064  
2065 <    /**
2066 <     * thenRunAsync result completes exceptionally after exceptional
2067 <     * completion of source
2068 <     */
2069 <    public void testThenRunAsync2() {
2070 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2071 <        Noop r = new Noop();
2072 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2073 <        f.completeExceptionally(new CFException());
2065 >    public void testApplyToEither_sourceCancelled3() {
2066 >        for (ExecutionMode m : ExecutionMode.values())
2067 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2068 >        for (Integer v1 : new Integer[] { 1, null }) {
2069 >
2070 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2071 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2072 >        final IncFunction r = new IncFunction();
2073 >
2074 >        assertTrue(g.cancel(mayInterruptIfRunning));
2075 >        f.complete(v1);
2076 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2077 >
2078 >        // unspecified behavior
2079 >        Integer v;
2080          try {
2081 <            g.join();
2082 <            shouldThrow();
2083 <        } catch (CompletionException success) {}
2084 <        checkCompletedWithWrappedCFException(g);
2085 <    }
2081 >            assertEquals(h.join(), inc(v1));
2082 >            assertEquals(1, r.invocationCount);
2083 >        } catch (CompletionException ok) {
2084 >            checkCompletedWithWrappedCancellationException(h);
2085 >            assertEquals(0, r.invocationCount);
2086 >        }
2087  
2088 <    /**
2089 <     * thenRunAsync result completes exceptionally if action does
2090 <     */
1607 <    public void testThenRunAsync3() {
1608 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1609 <        FailingNoop r = new FailingNoop();
1610 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1611 <        f.complete(null);
1612 <        checkCompletedWithWrappedCFException(g);
2088 >        checkCancelled(g);
2089 >        checkCompletedNormally(f, v1);
2090 >        }
2091      }
2092  
2093 <    /**
2094 <     * thenRunAsync result completes exceptionally if source cancelled
2095 <     */
2096 <    public void testThenRunAsync4() {
1619 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1620 <        Noop r = new Noop();
1621 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1622 <        assertTrue(f.cancel(true));
1623 <        checkCompletedWithWrappedCancellationException(g);
1624 <    }
2093 >    public void testApplyToEither_sourceCancelled4() {
2094 >        for (ExecutionMode m : ExecutionMode.values())
2095 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2096 >        for (Integer v1 : new Integer[] { 1, null }) {
2097  
2098 <    /**
2099 <     * thenApplyAsync result completes normally after normal completion of source
2100 <     */
1629 <    public void testThenApplyAsync() {
1630 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1631 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1632 <        f.complete(one);
1633 <        checkCompletedNormally(g, two);
1634 <    }
2098 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2099 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2100 >        final IncFunction r = new IncFunction();
2101  
2102 <    /**
2103 <     * thenApplyAsync result completes exceptionally after exceptional
2104 <     * completion of source
2105 <     */
2106 <    public void testThenApplyAsync2() {
2107 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2108 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2109 <        f.completeExceptionally(new CFException());
2110 <        checkCompletedWithWrappedCFException(g);
2102 >        assertTrue(f.cancel(mayInterruptIfRunning));
2103 >        g.complete(v1);
2104 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2105 >
2106 >        // unspecified behavior
2107 >        Integer v;
2108 >        try {
2109 >            assertEquals(h.join(), inc(v1));
2110 >            assertEquals(1, r.invocationCount);
2111 >        } catch (CompletionException ok) {
2112 >            checkCompletedWithWrappedCancellationException(h);
2113 >            assertEquals(0, r.invocationCount);
2114 >        }
2115 >
2116 >        checkCancelled(f);
2117 >        checkCompletedNormally(g, v1);
2118 >        }
2119      }
2120  
2121      /**
2122 <     * thenApplyAsync result completes exceptionally if action does
2122 >     * acceptEither result completes normally after normal completion
2123 >     * of either source
2124       */
2125 <    public void testThenApplyAsync3() {
2126 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2127 <        FailingFunction r = new FailingFunction();
2128 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2129 <        f.complete(null);
2130 <        checkCompletedWithWrappedCFException(g);
2125 >    public void testAcceptEither_normalCompletion1() {
2126 >        for (ExecutionMode m : ExecutionMode.values())
2127 >        for (Integer v1 : new Integer[] { 1, null })
2128 >        for (Integer v2 : new Integer[] { 2, null }) {
2129 >
2130 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2131 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2132 >        final IncAction r = new IncAction();
2133 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2134 >
2135 >        f.complete(v1);
2136 >        checkCompletedNormally(h, null);
2137 >        assertEquals(r.value, inc(v1));
2138 >        g.complete(v2);
2139 >
2140 >        checkCompletedNormally(f, v1);
2141 >        checkCompletedNormally(g, v2);
2142 >        checkCompletedNormally(h, null);
2143 >        }
2144      }
2145  
2146 <    /**
2147 <     * thenApplyAsync result completes exceptionally if source cancelled
2148 <     */
2149 <    public void testThenApplyAsync4() {
2150 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2151 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2152 <        assertTrue(f.cancel(true));
2153 <        checkCompletedWithWrappedCancellationException(g);
2146 >    public void testAcceptEither_normalCompletion2() {
2147 >        for (ExecutionMode m : ExecutionMode.values())
2148 >        for (Integer v1 : new Integer[] { 1, null })
2149 >        for (Integer v2 : new Integer[] { 2, null }) {
2150 >
2151 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2152 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2153 >        final IncAction r = new IncAction();
2154 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2155 >
2156 >        g.complete(v2);
2157 >        checkCompletedNormally(h, null);
2158 >        assertEquals(r.value, inc(v2));
2159 >        f.complete(v1);
2160 >
2161 >        checkCompletedNormally(f, v1);
2162 >        checkCompletedNormally(g, v2);
2163 >        checkCompletedNormally(h, null);
2164 >        }
2165      }
2166 +    public void testAcceptEither_normalCompletion3() {
2167 +        for (ExecutionMode m : ExecutionMode.values())
2168 +        for (Integer v1 : new Integer[] { 1, null })
2169 +        for (Integer v2 : new Integer[] { 2, null }) {
2170  
2171 <    /**
2172 <     * thenAcceptAsync result completes normally after normal
2173 <     * completion of source
2174 <     */
2175 <    public void testThenAcceptAsync() {
2176 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2177 <        IncAction r = new IncAction();
2178 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2179 <        f.complete(one);
2180 <        checkCompletedNormally(g, null);
2181 <        assertEquals(r.value, 2);
2171 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2172 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2173 >        final IncAction r = new IncAction();
2174 >
2175 >        f.complete(v1);
2176 >        g.complete(v2);
2177 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2178 >
2179 >        checkCompletedNormally(h, null);
2180 >        checkCompletedNormally(f, v1);
2181 >        checkCompletedNormally(g, v2);
2182 >
2183 >        // unspecified behavior
2184 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2185 >                   Objects.equals(r.value, inc(v2)));
2186 >        }
2187      }
2188  
2189      /**
2190 <     * thenAcceptAsync result completes exceptionally after exceptional
2191 <     * completion of source
2190 >     * acceptEither result completes exceptionally after exceptional
2191 >     * completion of either source
2192       */
2193 <    public void testThenAcceptAsync2() {
2194 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2195 <        IncAction r = new IncAction();
2196 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2197 <        f.completeExceptionally(new CFException());
2198 <        checkCompletedWithWrappedCFException(g);
2193 >    public void testAcceptEither_exceptionalCompletion1() {
2194 >        for (ExecutionMode m : ExecutionMode.values())
2195 >        for (Integer v1 : new Integer[] { 1, null }) {
2196 >
2197 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2198 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2199 >        final IncAction r = new IncAction();
2200 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2201 >        final CFException ex = new CFException();
2202 >
2203 >        f.completeExceptionally(ex);
2204 >        checkCompletedWithWrappedCFException(h, ex);
2205 >        g.complete(v1);
2206 >
2207 >        assertEquals(0, r.invocationCount);
2208 >        checkCompletedNormally(g, v1);
2209 >        checkCompletedWithWrappedCFException(f, ex);
2210 >        checkCompletedWithWrappedCFException(h, ex);
2211 >        }
2212      }
2213  
2214 <    /**
2215 <     * thenAcceptAsync result completes exceptionally if action does
2216 <     */
2217 <    public void testThenAcceptAsync3() {
2218 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2219 <        FailingConsumer r = new FailingConsumer();
2220 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2221 <        f.complete(null);
2222 <        checkCompletedWithWrappedCFException(g);
2214 >    public void testAcceptEither_exceptionalCompletion2() {
2215 >        for (ExecutionMode m : ExecutionMode.values())
2216 >        for (Integer v1 : new Integer[] { 1, null }) {
2217 >
2218 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2219 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2220 >        final IncAction r = new IncAction();
2221 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2222 >        final CFException ex = new CFException();
2223 >
2224 >        g.completeExceptionally(ex);
2225 >        checkCompletedWithWrappedCFException(h, ex);
2226 >        f.complete(v1);
2227 >
2228 >        assertEquals(0, r.invocationCount);
2229 >        checkCompletedNormally(f, v1);
2230 >        checkCompletedWithWrappedCFException(g, ex);
2231 >        checkCompletedWithWrappedCFException(h, ex);
2232 >        }
2233      }
2234  
2235 <    /**
2236 <     * thenAcceptAsync result completes exceptionally if source cancelled
2237 <     */
2238 <    public void testThenAcceptAsync4() {
2239 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2240 <        IncAction r = new IncAction();
2241 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2242 <        assertTrue(f.cancel(true));
2243 <        checkCompletedWithWrappedCancellationException(g);
2235 >    public void testAcceptEither_exceptionalCompletion3() {
2236 >        for (ExecutionMode m : ExecutionMode.values())
2237 >        for (Integer v1 : new Integer[] { 1, null }) {
2238 >
2239 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2240 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2241 >        final IncAction r = new IncAction();
2242 >        final CFException ex = new CFException();
2243 >
2244 >        g.completeExceptionally(ex);
2245 >        f.complete(v1);
2246 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2247 >
2248 >        // unspecified behavior
2249 >        Integer v;
2250 >        try {
2251 >            assertEquals(h.join(), null);
2252 >            assertEquals(1, r.invocationCount);
2253 >            assertEquals(inc(v1), r.value);
2254 >        } catch (CompletionException ok) {
2255 >            checkCompletedWithWrappedCFException(h, ex);
2256 >            assertEquals(0, r.invocationCount);
2257 >        }
2258 >
2259 >        checkCompletedWithWrappedCFException(g, ex);
2260 >        checkCompletedNormally(f, v1);
2261 >        }
2262      }
2263  
2264 <    /**
2265 <     * thenCombineAsync result completes normally after normal
2266 <     * completion of sources
1718 <     */
1719 <    public void testThenCombineAsync() {
1720 <        CompletableFuture<Integer> f, g, h;
2264 >    public void testAcceptEither_exceptionalCompletion4() {
2265 >        for (ExecutionMode m : ExecutionMode.values())
2266 >        for (Integer v1 : new Integer[] { 1, null }) {
2267  
2268 <        f = new CompletableFuture<>();
2269 <        g = new CompletableFuture<>();
2270 <        h = f.thenCombineAsync(g, subtract);
2271 <        f.complete(3);
1726 <        checkIncomplete(h);
1727 <        g.complete(1);
1728 <        checkCompletedNormally(h, 2);
2268 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2269 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2270 >        final IncAction r = new IncAction();
2271 >        final CFException ex = new CFException();
2272  
2273 <        f = new CompletableFuture<>();
2274 <        g = new CompletableFuture<>();
2275 <        h = f.thenCombineAsync(g, subtract);
1733 <        g.complete(1);
1734 <        checkIncomplete(h);
1735 <        f.complete(3);
1736 <        checkCompletedNormally(h, 2);
2273 >        f.completeExceptionally(ex);
2274 >        g.complete(v1);
2275 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2276  
2277 <        f = new CompletableFuture<>();
2278 <        g = new CompletableFuture<>();
2279 <        g.complete(1);
2280 <        f.complete(3);
2281 <        h = f.thenCombineAsync(g, subtract);
2282 <        checkCompletedNormally(h, 2);
2277 >        // unspecified behavior
2278 >        Integer v;
2279 >        try {
2280 >            assertEquals(h.join(), null);
2281 >            assertEquals(1, r.invocationCount);
2282 >            assertEquals(inc(v1), r.value);
2283 >        } catch (CompletionException ok) {
2284 >            checkCompletedWithWrappedCFException(h, ex);
2285 >            assertEquals(0, r.invocationCount);
2286 >        }
2287 >
2288 >        checkCompletedWithWrappedCFException(f, ex);
2289 >        checkCompletedNormally(g, v1);
2290 >        }
2291      }
2292  
2293      /**
2294 <     * thenCombineAsync result completes exceptionally after exceptional
1748 <     * completion of either source
2294 >     * acceptEither result completes exceptionally if action does
2295       */
2296 <    public void testThenCombineAsync2() {
2297 <        CompletableFuture<Integer> f, g, h;
2296 >    public void testAcceptEither_actionFailed1() {
2297 >        for (ExecutionMode m : ExecutionMode.values())
2298 >        for (Integer v1 : new Integer[] { 1, null })
2299 >        for (Integer v2 : new Integer[] { 2, null }) {
2300  
2301 <        f = new CompletableFuture<>();
2302 <        g = new CompletableFuture<>();
2303 <        h = f.thenCombineAsync(g, subtract);
2304 <        f.completeExceptionally(new CFException());
1757 <        checkIncomplete(h);
1758 <        g.complete(1);
1759 <        checkCompletedWithWrappedCFException(h);
2301 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2302 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2303 >        final FailingConsumer r = new FailingConsumer();
2304 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2305  
2306 <        f = new CompletableFuture<>();
1762 <        g = new CompletableFuture<>();
1763 <        h = f.thenCombineAsync(g, subtract);
1764 <        g.completeExceptionally(new CFException());
1765 <        checkIncomplete(h);
1766 <        f.complete(3);
2306 >        f.complete(v1);
2307          checkCompletedWithWrappedCFException(h);
2308 +        g.complete(v2);
2309 +        checkCompletedNormally(f, v1);
2310 +        checkCompletedNormally(g, v2);
2311 +        }
2312 +    }
2313  
2314 <        f = new CompletableFuture<>();
2315 <        g = new CompletableFuture<>();
2316 <        g.completeExceptionally(new CFException());
2317 <        f.complete(3);
2318 <        h = f.thenCombineAsync(g, subtract);
2314 >    public void testAcceptEither_actionFailed2() {
2315 >        for (ExecutionMode m : ExecutionMode.values())
2316 >        for (Integer v1 : new Integer[] { 1, null })
2317 >        for (Integer v2 : new Integer[] { 2, null }) {
2318 >
2319 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2320 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2321 >        final FailingConsumer r = new FailingConsumer();
2322 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2323 >
2324 >        g.complete(v2);
2325          checkCompletedWithWrappedCFException(h);
2326 +        f.complete(v1);
2327 +        checkCompletedNormally(f, v1);
2328 +        checkCompletedNormally(g, v2);
2329 +        }
2330      }
2331  
2332      /**
2333 <     * thenCombineAsync result completes exceptionally if action does
2333 >     * acceptEither result completes exceptionally if either source cancelled
2334       */
2335 <    public void testThenCombineAsync3() {
2336 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2337 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2338 <        FailingBiFunction r = new FailingBiFunction();
1784 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1785 <        f.complete(one);
1786 <        checkIncomplete(g);
1787 <        assertFalse(r.ran);
1788 <        f2.complete(two);
1789 <        checkCompletedWithWrappedCFException(g);
1790 <        assertTrue(r.ran);
1791 <    }
2335 >    public void testAcceptEither_sourceCancelled1() {
2336 >        for (ExecutionMode m : ExecutionMode.values())
2337 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2338 >        for (Integer v1 : new Integer[] { 1, null }) {
2339  
2340 <    /**
2341 <     * thenCombineAsync result completes exceptionally if either source cancelled
2342 <     */
2343 <    public void testThenCombineAsync4() {
1797 <        CompletableFuture<Integer> f, g, h;
2340 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2341 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2342 >        final IncAction r = new IncAction();
2343 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2344  
2345 <        f = new CompletableFuture<>();
1800 <        g = new CompletableFuture<>();
1801 <        h = f.thenCombineAsync(g, subtract);
1802 <        assertTrue(f.cancel(true));
1803 <        checkIncomplete(h);
1804 <        g.complete(1);
2345 >        assertTrue(f.cancel(mayInterruptIfRunning));
2346          checkCompletedWithWrappedCancellationException(h);
2347 +        g.complete(v1);
2348  
2349 <        f = new CompletableFuture<>();
2350 <        g = new CompletableFuture<>();
2351 <        h = f.thenCombineAsync(g, subtract);
1810 <        assertTrue(g.cancel(true));
1811 <        checkIncomplete(h);
1812 <        f.complete(3);
2349 >        checkCancelled(f);
2350 >        assertEquals(0, r.invocationCount);
2351 >        checkCompletedNormally(g, v1);
2352          checkCompletedWithWrappedCancellationException(h);
2353 +        }
2354 +    }
2355  
2356 <        f = new CompletableFuture<>();
2357 <        g = new CompletableFuture<>();
2358 <        g.complete(3);
2359 <        assertTrue(f.cancel(true));
2360 <        h = f.thenCombineAsync(g, subtract);
2356 >    public void testAcceptEither_sourceCancelled2() {
2357 >        for (ExecutionMode m : ExecutionMode.values())
2358 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2359 >        for (Integer v1 : new Integer[] { 1, null }) {
2360 >
2361 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2362 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2363 >        final IncAction r = new IncAction();
2364 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2365 >
2366 >        assertTrue(g.cancel(mayInterruptIfRunning));
2367          checkCompletedWithWrappedCancellationException(h);
2368 +        f.complete(v1);
2369  
2370 <        f = new CompletableFuture<>();
2371 <        g = new CompletableFuture<>();
2372 <        f.complete(3);
1825 <        assertTrue(g.cancel(true));
1826 <        h = f.thenCombineAsync(g, subtract);
2370 >        checkCancelled(g);
2371 >        assertEquals(0, r.invocationCount);
2372 >        checkCompletedNormally(f, v1);
2373          checkCompletedWithWrappedCancellationException(h);
2374 +        }
2375      }
2376  
2377 <    /**
2378 <     * thenAcceptBothAsync result completes normally after normal
2379 <     * completion of sources
2380 <     */
1834 <    public void testThenAcceptBothAsync() {
1835 <        CompletableFuture<Integer> f, g;
1836 <        CompletableFuture<Void> h;
1837 <        SubtractAction r;
2377 >    public void testAcceptEither_sourceCancelled3() {
2378 >        for (ExecutionMode m : ExecutionMode.values())
2379 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2380 >        for (Integer v1 : new Integer[] { 1, null }) {
2381  
2382 <        f = new CompletableFuture<>();
2383 <        g = new CompletableFuture<>();
2384 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1842 <        f.complete(3);
1843 <        checkIncomplete(h);
1844 <        g.complete(1);
1845 <        checkCompletedNormally(h, null);
1846 <        assertEquals(r.value, 2);
2382 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2383 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2384 >        final IncAction r = new IncAction();
2385  
2386 <        f = new CompletableFuture<>();
2387 <        g = new CompletableFuture<>();
2388 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1851 <        g.complete(1);
1852 <        checkIncomplete(h);
1853 <        f.complete(3);
1854 <        checkCompletedNormally(h, null);
1855 <        assertEquals(r.value, 2);
2386 >        assertTrue(g.cancel(mayInterruptIfRunning));
2387 >        f.complete(v1);
2388 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2389  
2390 <        f = new CompletableFuture<>();
2391 <        g = new CompletableFuture<>();
2392 <        g.complete(1);
2393 <        f.complete(3);
2394 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2395 <        checkCompletedNormally(h, null);
2396 <        assertEquals(r.value, 2);
2390 >        // unspecified behavior
2391 >        Integer v;
2392 >        try {
2393 >            assertEquals(h.join(), null);
2394 >            assertEquals(1, r.invocationCount);
2395 >            assertEquals(inc(v1), r.value);
2396 >        } catch (CompletionException ok) {
2397 >            checkCompletedWithWrappedCancellationException(h);
2398 >            assertEquals(0, r.invocationCount);
2399 >        }
2400 >
2401 >        checkCancelled(g);
2402 >        checkCompletedNormally(f, v1);
2403 >        }
2404      }
2405  
2406 <    /**
2407 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2408 <     * completion of source
2409 <     */
1870 <    public void testThenAcceptBothAsync2() {
1871 <        CompletableFuture<Integer> f, g;
1872 <        CompletableFuture<Void> h;
1873 <        SubtractAction r;
2406 >    public void testAcceptEither_sourceCancelled4() {
2407 >        for (ExecutionMode m : ExecutionMode.values())
2408 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2409 >        for (Integer v1 : new Integer[] { 1, null }) {
2410  
2411 <        f = new CompletableFuture<>();
2412 <        g = new CompletableFuture<>();
2413 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1878 <        f.completeExceptionally(new CFException());
1879 <        checkIncomplete(h);
1880 <        g.complete(1);
1881 <        checkCompletedWithWrappedCFException(h);
2411 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2412 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2413 >        final IncAction r = new IncAction();
2414  
2415 <        f = new CompletableFuture<>();
2416 <        g = new CompletableFuture<>();
2417 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1886 <        g.completeExceptionally(new CFException());
1887 <        checkIncomplete(h);
1888 <        f.complete(3);
1889 <        checkCompletedWithWrappedCFException(h);
2415 >        assertTrue(f.cancel(mayInterruptIfRunning));
2416 >        g.complete(v1);
2417 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2418  
2419 <        f = new CompletableFuture<>();
2420 <        g = new CompletableFuture<>();
2421 <        f.complete(3);
2422 <        g.completeExceptionally(new CFException());
2423 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2424 <        checkCompletedWithWrappedCFException(h);
2419 >        // unspecified behavior
2420 >        Integer v;
2421 >        try {
2422 >            assertEquals(h.join(), null);
2423 >            assertEquals(1, r.invocationCount);
2424 >            assertEquals(inc(v1), r.value);
2425 >        } catch (CompletionException ok) {
2426 >            checkCompletedWithWrappedCancellationException(h);
2427 >            assertEquals(0, r.invocationCount);
2428 >        }
2429  
2430 <        f = new CompletableFuture<>();
2431 <        g = new CompletableFuture<>();
2432 <        f.completeExceptionally(new CFException());
1901 <        g.complete(3);
1902 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1903 <        checkCompletedWithWrappedCFException(h);
2430 >        checkCancelled(f);
2431 >        checkCompletedNormally(g, v1);
2432 >        }
2433      }
2434  
2435      /**
2436 <     * thenAcceptBothAsync result completes exceptionally if action does
2436 >     * runAfterEither result completes normally after normal completion
2437 >     * of either source
2438       */
2439 <    public void testThenAcceptBothAsync3() {
2440 <        CompletableFuture<Integer> f, g;
2441 <        CompletableFuture<Void> h;
2442 <        FailingBiConsumer r;
2439 >    public void testRunAfterEither_normalCompletion1() {
2440 >        for (ExecutionMode m : ExecutionMode.values())
2441 >        for (Integer v1 : new Integer[] { 1, null })
2442 >        for (Integer v2 : new Integer[] { 2, null }) {
2443  
2444 <        f = new CompletableFuture<>();
2445 <        g = new CompletableFuture<>();
2446 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
2447 <        f.complete(3);
1918 <        checkIncomplete(h);
1919 <        g.complete(1);
1920 <        checkCompletedWithWrappedCFException(h);
2444 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2445 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2446 >        final Noop r = new Noop();
2447 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2448  
2449 <        f = new CompletableFuture<>();
2450 <        g = new CompletableFuture<>();
2451 <        f.complete(3);
2452 <        g.complete(1);
2453 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
2454 <        checkCompletedWithWrappedCFException(h);
2449 >        f.complete(v1);
2450 >        checkCompletedNormally(h, null);
2451 >        assertEquals(1, r.invocationCount);
2452 >        g.complete(v2);
2453 >
2454 >        checkCompletedNormally(f, v1);
2455 >        checkCompletedNormally(g, v2);
2456 >        checkCompletedNormally(h, null);
2457 >        assertEquals(1, r.invocationCount);
2458 >        }
2459      }
2460  
2461 <    /**
2462 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2463 <     */
2464 <    public void testThenAcceptBothAsync4() {
1934 <        CompletableFuture<Integer> f, g;
1935 <        CompletableFuture<Void> h;
1936 <        SubtractAction r;
2461 >    public void testRunAfterEither_normalCompletion2() {
2462 >        for (ExecutionMode m : ExecutionMode.values())
2463 >        for (Integer v1 : new Integer[] { 1, null })
2464 >        for (Integer v2 : new Integer[] { 2, null }) {
2465  
2466 <        f = new CompletableFuture<>();
2467 <        g = new CompletableFuture<>();
2468 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2469 <        assertTrue(f.cancel(true));
1942 <        checkIncomplete(h);
1943 <        g.complete(1);
1944 <        checkCompletedWithWrappedCancellationException(h);
2466 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2467 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2468 >        final Noop r = new Noop();
2469 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2470  
2471 <        f = new CompletableFuture<>();
2472 <        g = new CompletableFuture<>();
2473 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2474 <        assertTrue(g.cancel(true));
1950 <        checkIncomplete(h);
1951 <        f.complete(3);
1952 <        checkCompletedWithWrappedCancellationException(h);
2471 >        g.complete(v2);
2472 >        checkCompletedNormally(h, null);
2473 >        assertEquals(1, r.invocationCount);
2474 >        f.complete(v1);
2475  
2476 <        f = new CompletableFuture<>();
2477 <        g = new CompletableFuture<>();
2478 <        f.complete(3);
2479 <        assertTrue(g.cancel(true));
2480 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2481 <        checkCompletedWithWrappedCancellationException(h);
2476 >        checkCompletedNormally(f, v1);
2477 >        checkCompletedNormally(g, v2);
2478 >        checkCompletedNormally(h, null);
2479 >        assertEquals(1, r.invocationCount);
2480 >        }
2481 >    }
2482 >    public void testRunAfterEither_normalCompletion3() {
2483 >        for (ExecutionMode m : ExecutionMode.values())
2484 >        for (Integer v1 : new Integer[] { 1, null })
2485 >        for (Integer v2 : new Integer[] { 2, null }) {
2486  
2487 <        f = new CompletableFuture<>();
2488 <        g = new CompletableFuture<>();
2489 <        assertTrue(f.cancel(true));
2490 <        g.complete(3);
2491 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2492 <        checkCompletedWithWrappedCancellationException(h);
2487 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2488 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2489 >        final Noop r = new Noop();
2490 >
2491 >        f.complete(v1);
2492 >        g.complete(v2);
2493 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2494 >
2495 >        checkCompletedNormally(h, null);
2496 >        checkCompletedNormally(f, v1);
2497 >        checkCompletedNormally(g, v2);
2498 >        assertEquals(1, r.invocationCount);
2499 >        }
2500      }
2501  
2502      /**
2503 <     * applyToEitherAsync result completes normally after normal
2504 <     * completion of sources
2503 >     * runAfterEither result completes exceptionally after exceptional
2504 >     * completion of either source
2505       */
2506 <    public void testApplyToEitherAsync() {
2507 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2508 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1976 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1977 <        f.complete(one);
1978 <        checkCompletedNormally(g, two);
2506 >    public void testRunAfterEither_exceptionalCompletion1() {
2507 >        for (ExecutionMode m : ExecutionMode.values())
2508 >        for (Integer v1 : new Integer[] { 1, null }) {
2509  
2510 <        f = new CompletableFuture<>();
2511 <        f.complete(one);
2512 <        f2 = new CompletableFuture<>();
2513 <        g = f.applyToEitherAsync(f2, inc);
2514 <        checkCompletedNormally(g, two);
2510 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2511 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2512 >        final Noop r = new Noop();
2513 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2514 >        final CFException ex = new CFException();
2515 >
2516 >        f.completeExceptionally(ex);
2517 >        checkCompletedWithWrappedCFException(h, ex);
2518 >        g.complete(v1);
2519 >
2520 >        assertEquals(0, r.invocationCount);
2521 >        checkCompletedNormally(g, v1);
2522 >        checkCompletedWithWrappedCFException(f, ex);
2523 >        checkCompletedWithWrappedCFException(h, ex);
2524 >        }
2525      }
2526  
2527 <    /**
2528 <     * applyToEitherAsync result completes exceptionally after exceptional
2529 <     * completion of source
1990 <     */
1991 <    public void testApplyToEitherAsync2() {
1992 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1993 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1994 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1995 <        f.completeExceptionally(new CFException());
1996 <        checkCompletedWithWrappedCFException(g);
2527 >    public void testRunAfterEither_exceptionalCompletion2() {
2528 >        for (ExecutionMode m : ExecutionMode.values())
2529 >        for (Integer v1 : new Integer[] { 1, null }) {
2530  
2531 <        f = new CompletableFuture<>();
2532 <        f2 = new CompletableFuture<>();
2533 <        f2.completeExceptionally(new CFException());
2534 <        g = f.applyToEitherAsync(f2, inc);
2535 <        f.complete(one);
2536 <        checkCompletedWithWrappedCFException(g);
2531 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2532 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2533 >        final Noop r = new Noop();
2534 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2535 >        final CFException ex = new CFException();
2536 >
2537 >        g.completeExceptionally(ex);
2538 >        checkCompletedWithWrappedCFException(h, ex);
2539 >        f.complete(v1);
2540 >
2541 >        assertEquals(0, r.invocationCount);
2542 >        checkCompletedNormally(f, v1);
2543 >        checkCompletedWithWrappedCFException(g, ex);
2544 >        checkCompletedWithWrappedCFException(h, ex);
2545 >        }
2546      }
2547  
2548 <    /**
2549 <     * applyToEitherAsync result completes exceptionally if action does
2550 <     */
2551 <    public void testApplyToEitherAsync3() {
2552 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2553 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2554 <        FailingFunction r = new FailingFunction();
2555 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2556 <        f.complete(one);
2557 <        checkCompletedWithWrappedCFException(g);
2548 >    public void testRunAfterEither_exceptionalCompletion3() {
2549 >        for (ExecutionMode m : ExecutionMode.values())
2550 >        for (Integer v1 : new Integer[] { 1, null }) {
2551 >
2552 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2553 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2554 >        final Noop r = new Noop();
2555 >        final CFException ex = new CFException();
2556 >
2557 >        g.completeExceptionally(ex);
2558 >        f.complete(v1);
2559 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2560 >
2561 >        // unspecified behavior
2562 >        Integer v;
2563 >        try {
2564 >            assertEquals(h.join(), null);
2565 >            assertEquals(1, r.invocationCount);
2566 >        } catch (CompletionException ok) {
2567 >            checkCompletedWithWrappedCFException(h, ex);
2568 >            assertEquals(0, r.invocationCount);
2569 >        }
2570 >
2571 >        checkCompletedWithWrappedCFException(g, ex);
2572 >        checkCompletedNormally(f, v1);
2573 >        }
2574      }
2575  
2576 <    /**
2577 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2578 <     */
2021 <    public void testApplyToEitherAsync4() {
2022 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2023 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2024 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2025 <        assertTrue(f.cancel(true));
2026 <        checkCompletedWithWrappedCancellationException(g);
2576 >    public void testRunAfterEither_exceptionalCompletion4() {
2577 >        for (ExecutionMode m : ExecutionMode.values())
2578 >        for (Integer v1 : new Integer[] { 1, null }) {
2579  
2580 <        f = new CompletableFuture<>();
2581 <        f2 = new CompletableFuture<>();
2582 <        assertTrue(f2.cancel(true));
2583 <        g = f.applyToEitherAsync(f2, inc);
2584 <        checkCompletedWithWrappedCancellationException(g);
2580 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2581 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2582 >        final Noop r = new Noop();
2583 >        final CFException ex = new CFException();
2584 >
2585 >        f.completeExceptionally(ex);
2586 >        g.complete(v1);
2587 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2588 >
2589 >        // unspecified behavior
2590 >        Integer v;
2591 >        try {
2592 >            assertEquals(h.join(), null);
2593 >            assertEquals(1, r.invocationCount);
2594 >        } catch (CompletionException ok) {
2595 >            checkCompletedWithWrappedCFException(h, ex);
2596 >            assertEquals(0, r.invocationCount);
2597 >        }
2598 >
2599 >        checkCompletedWithWrappedCFException(f, ex);
2600 >        checkCompletedNormally(g, v1);
2601 >        }
2602      }
2603  
2604      /**
2605 <     * acceptEitherAsync result completes normally after normal
2037 <     * completion of sources
2605 >     * runAfterEither result completes exceptionally if action does
2606       */
2607 <    public void testAcceptEitherAsync() {
2608 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2609 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2610 <        IncAction r = new IncAction();
2043 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2044 <        f.complete(one);
2045 <        checkCompletedNormally(g, null);
2046 <        assertEquals(r.value, 2);
2607 >    public void testRunAfterEither_actionFailed1() {
2608 >        for (ExecutionMode m : ExecutionMode.values())
2609 >        for (Integer v1 : new Integer[] { 1, null })
2610 >        for (Integer v2 : new Integer[] { 2, null }) {
2611  
2612 <        r = new IncAction();
2613 <        f = new CompletableFuture<>();
2614 <        f.complete(one);
2615 <        f2 = new CompletableFuture<>();
2616 <        g = f.acceptEitherAsync(f2, r);
2617 <        checkCompletedNormally(g, null);
2618 <        assertEquals(r.value, 2);
2612 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2613 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2614 >        final FailingNoop r = new FailingNoop();
2615 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2616 >
2617 >        f.complete(v1);
2618 >        checkCompletedWithWrappedCFException(h);
2619 >        g.complete(v2);
2620 >        checkCompletedNormally(f, v1);
2621 >        checkCompletedNormally(g, v2);
2622 >        }
2623      }
2624  
2625 <    /**
2626 <     * acceptEitherAsync result completes exceptionally after exceptional
2627 <     * completion of source
2628 <     */
2061 <    public void testAcceptEitherAsync2() {
2062 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2063 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2064 <        IncAction r = new IncAction();
2065 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2066 <        f.completeExceptionally(new CFException());
2067 <        checkCompletedWithWrappedCFException(g);
2625 >    public void testRunAfterEither_actionFailed2() {
2626 >        for (ExecutionMode m : ExecutionMode.values())
2627 >        for (Integer v1 : new Integer[] { 1, null })
2628 >        for (Integer v2 : new Integer[] { 2, null }) {
2629  
2630 <        r = new IncAction();
2631 <        f = new CompletableFuture<>();
2632 <        f2 = new CompletableFuture<>();
2633 <        f2.completeExceptionally(new CFException());
2634 <        g = f.acceptEitherAsync(f2, r);
2635 <        f.complete(one);
2636 <        checkCompletedWithWrappedCFException(g);
2630 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2631 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2632 >        final FailingNoop r = new FailingNoop();
2633 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2634 >
2635 >        g.complete(v2);
2636 >        checkCompletedWithWrappedCFException(h);
2637 >        f.complete(v1);
2638 >        checkCompletedNormally(f, v1);
2639 >        checkCompletedNormally(g, v2);
2640 >        }
2641      }
2642  
2643      /**
2644 <     * acceptEitherAsync result completes exceptionally if action does
2644 >     * runAfterEither result completes exceptionally if either source cancelled
2645       */
2646 <    public void testAcceptEitherAsync3() {
2647 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2648 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2649 <        FailingConsumer r = new FailingConsumer();
2650 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2651 <        f.complete(one);
2652 <        checkCompletedWithWrappedCFException(g);
2646 >    public void testRunAfterEither_sourceCancelled1() {
2647 >        for (ExecutionMode m : ExecutionMode.values())
2648 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2649 >        for (Integer v1 : new Integer[] { 1, null }) {
2650 >
2651 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2652 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2653 >        final Noop r = new Noop();
2654 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2655 >
2656 >        assertTrue(f.cancel(mayInterruptIfRunning));
2657 >        checkCompletedWithWrappedCancellationException(h);
2658 >        g.complete(v1);
2659 >
2660 >        checkCancelled(f);
2661 >        assertEquals(0, r.invocationCount);
2662 >        checkCompletedNormally(g, v1);
2663 >        checkCompletedWithWrappedCancellationException(h);
2664 >        }
2665      }
2666  
2667 <    /**
2668 <     * acceptEitherAsync result completes exceptionally if either
2669 <     * source cancelled
2670 <     */
2094 <    public void testAcceptEitherAsync4() {
2095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2096 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2097 <        IncAction r = new IncAction();
2098 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2099 <        assertTrue(f.cancel(true));
2100 <        checkCompletedWithWrappedCancellationException(g);
2667 >    public void testRunAfterEither_sourceCancelled2() {
2668 >        for (ExecutionMode m : ExecutionMode.values())
2669 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2670 >        for (Integer v1 : new Integer[] { 1, null }) {
2671  
2672 <        r = new IncAction();
2673 <        f = new CompletableFuture<>();
2674 <        f2 = new CompletableFuture<>();
2675 <        assertTrue(f2.cancel(true));
2676 <        g = f.acceptEitherAsync(f2, r);
2677 <        checkCompletedWithWrappedCancellationException(g);
2672 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2673 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2674 >        final Noop r = new Noop();
2675 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2676 >
2677 >        assertTrue(g.cancel(mayInterruptIfRunning));
2678 >        checkCompletedWithWrappedCancellationException(h);
2679 >        f.complete(v1);
2680 >
2681 >        checkCancelled(g);
2682 >        assertEquals(0, r.invocationCount);
2683 >        checkCompletedNormally(f, v1);
2684 >        checkCompletedWithWrappedCancellationException(h);
2685 >        }
2686      }
2687  
2688 <    /**
2689 <     * runAfterEitherAsync result completes normally after normal
2690 <     * completion of sources
2691 <     */
2114 <    public void testRunAfterEitherAsync() {
2115 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2116 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2117 <        Noop r = new Noop();
2118 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2119 <        f.complete(one);
2120 <        checkCompletedNormally(g, null);
2121 <        assertTrue(r.ran);
2688 >    public void testRunAfterEither_sourceCancelled3() {
2689 >        for (ExecutionMode m : ExecutionMode.values())
2690 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2691 >        for (Integer v1 : new Integer[] { 1, null }) {
2692  
2693 <        r = new Noop();
2694 <        f = new CompletableFuture<>();
2695 <        f.complete(one);
2696 <        f2 = new CompletableFuture<>();
2697 <        g = f.runAfterEitherAsync(f2, r);
2698 <        checkCompletedNormally(g, null);
2699 <        assertTrue(r.ran);
2693 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2694 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2695 >        final Noop r = new Noop();
2696 >
2697 >        assertTrue(g.cancel(mayInterruptIfRunning));
2698 >        f.complete(v1);
2699 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2700 >
2701 >        // unspecified behavior
2702 >        Integer v;
2703 >        try {
2704 >            assertEquals(h.join(), null);
2705 >            assertEquals(1, r.invocationCount);
2706 >        } catch (CompletionException ok) {
2707 >            checkCompletedWithWrappedCancellationException(h);
2708 >            assertEquals(0, r.invocationCount);
2709 >        }
2710 >
2711 >        checkCancelled(g);
2712 >        checkCompletedNormally(f, v1);
2713 >        }
2714      }
2715  
2716 <    /**
2717 <     * runAfterEitherAsync result completes exceptionally after exceptional
2718 <     * completion of source
2719 <     */
2136 <    public void testRunAfterEitherAsync2() {
2137 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2138 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2139 <        Noop r = new Noop();
2140 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2141 <        f.completeExceptionally(new CFException());
2142 <        checkCompletedWithWrappedCFException(g);
2716 >    public void testRunAfterEither_sourceCancelled4() {
2717 >        for (ExecutionMode m : ExecutionMode.values())
2718 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2719 >        for (Integer v1 : new Integer[] { 1, null }) {
2720  
2721 <        r = new Noop();
2722 <        f = new CompletableFuture<>();
2723 <        f2 = new CompletableFuture<>();
2724 <        f2.completeExceptionally(new CFException());
2725 <        g = f.runAfterEitherAsync(f2, r);
2726 <        f.complete(one);
2727 <        checkCompletedWithWrappedCFException(g);
2721 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2722 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2723 >        final Noop r = new Noop();
2724 >
2725 >        assertTrue(f.cancel(mayInterruptIfRunning));
2726 >        g.complete(v1);
2727 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2728 >
2729 >        // unspecified behavior
2730 >        Integer v;
2731 >        try {
2732 >            assertEquals(h.join(), null);
2733 >            assertEquals(1, r.invocationCount);
2734 >        } catch (CompletionException ok) {
2735 >            checkCompletedWithWrappedCancellationException(h);
2736 >            assertEquals(0, r.invocationCount);
2737 >        }
2738 >
2739 >        checkCancelled(f);
2740 >        checkCompletedNormally(g, v1);
2741 >        }
2742      }
2743  
2744      /**
2745 <     * runAfterEitherAsync result completes exceptionally if action does
2745 >     * thenCompose result completes normally after normal completion of source
2746       */
2747 <    public void testRunAfterEitherAsync3() {
2748 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2749 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2750 <        FailingNoop r = new FailingNoop();
2751 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2752 <        f.complete(one);
2753 <        checkCompletedWithWrappedCFException(g);
2747 >    public void testThenCompose_normalCompletion1() {
2748 >        for (ExecutionMode m : ExecutionMode.values())
2749 >        for (Integer v1 : new Integer[] { 1, null }) {
2750 >
2751 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2752 >        final CompletableFutureInc r = new CompletableFutureInc();
2753 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2754 >        f.complete(v1);
2755 >        checkCompletedNormally(g, inc(v1));
2756 >        checkCompletedNormally(f, v1);
2757 >        assertEquals(1, r.invocationCount);
2758 >        }
2759      }
2760  
2761 <    /**
2762 <     * runAfterEitherAsync result completes exceptionally if either
2763 <     * source cancelled
2168 <     */
2169 <    public void testRunAfterEitherAsync4() {
2170 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2171 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2172 <        Noop r = new Noop();
2173 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2174 <        assertTrue(f.cancel(true));
2175 <        checkCompletedWithWrappedCancellationException(g);
2761 >    public void testThenCompose_normalCompletion2() {
2762 >        for (ExecutionMode m : ExecutionMode.values())
2763 >        for (Integer v1 : new Integer[] { 1, null }) {
2764  
2765 <        r = new Noop();
2766 <        f = new CompletableFuture<>();
2767 <        f2 = new CompletableFuture<>();
2768 <        assertTrue(f2.cancel(true));
2769 <        g = f.runAfterEitherAsync(f2, r);
2770 <        checkCompletedWithWrappedCancellationException(g);
2765 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2766 >        final CompletableFutureInc r = new CompletableFutureInc();
2767 >        f.complete(v1);
2768 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2769 >        checkCompletedNormally(g, inc(v1));
2770 >        checkCompletedNormally(f, v1);
2771 >        assertEquals(1, r.invocationCount);
2772 >        }
2773      }
2774  
2775      /**
2776 <     * thenComposeAsync result completes normally after normal
2776 >     * thenCompose result completes exceptionally after exceptional
2777       * completion of source
2778       */
2779 <    public void testThenComposeAsync() {
2780 <        CompletableFuture<Integer> f, g;
2191 <        CompletableFutureInc r;
2779 >    public void testThenCompose_exceptionalCompletion1() {
2780 >        for (ExecutionMode m : ExecutionMode.values()) {
2781  
2782 <        f = new CompletableFuture<>();
2783 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2784 <        f.complete(one);
2785 <        checkCompletedNormally(g, two);
2786 <
2787 <        f = new CompletableFuture<>();
2788 <        f.complete(one);
2789 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2201 <        checkCompletedNormally(g, two);
2782 >        final CFException ex = new CFException();
2783 >        final CompletableFutureInc r = new CompletableFutureInc();
2784 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2785 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2786 >        f.completeExceptionally(ex);
2787 >        checkCompletedWithWrappedCFException(g, ex);
2788 >        checkCompletedWithWrappedCFException(f, ex);
2789 >        }
2790      }
2791  
2792 <    /**
2793 <     * thenComposeAsync result completes exceptionally after
2206 <     * exceptional completion of source
2207 <     */
2208 <    public void testThenComposeAsync2() {
2209 <        CompletableFuture<Integer> f, g;
2210 <        CompletableFutureInc r;
2792 >    public void testThenCompose_exceptionalCompletion2() {
2793 >        for (ExecutionMode m : ExecutionMode.values()) {
2794  
2795 <        f = new CompletableFuture<>();
2796 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2797 <        f.completeExceptionally(new CFException());
2798 <        checkCompletedWithWrappedCFException(g);
2799 <        assertFalse(r.ran);
2800 <
2801 <        f = new CompletableFuture<>();
2802 <        f.completeExceptionally(new CFException());
2220 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2221 <        checkCompletedWithWrappedCFException(g);
2222 <        assertFalse(r.ran);
2795 >        final CFException ex = new CFException();
2796 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2797 >        f.completeExceptionally(ex);
2798 >        final CompletableFutureInc r = new CompletableFutureInc();
2799 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2800 >        checkCompletedWithWrappedCFException(g, ex);
2801 >        checkCompletedWithWrappedCFException(f, ex);
2802 >        }
2803      }
2804  
2805      /**
2806 <     * thenComposeAsync result completes exceptionally if action does
2806 >     * thenCompose result completes exceptionally if action does
2807       */
2808 <    public void testThenComposeAsync3() {
2809 <        CompletableFuture<Integer> f, g;
2810 <        FailingCompletableFutureFunction r;
2808 >    public void testThenCompose_actionFailed1() {
2809 >        for (ExecutionMode m : ExecutionMode.values())
2810 >        for (Integer v1 : new Integer[] { 1, null }) {
2811  
2812 <        f = new CompletableFuture<>();
2813 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2814 <        f.complete(one);
2812 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2813 >        final FailingCompletableFutureFunction r
2814 >            = new FailingCompletableFutureFunction();
2815 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2816 >        f.complete(v1);
2817          checkCompletedWithWrappedCFException(g);
2818 +        checkCompletedNormally(f, v1);
2819 +        }
2820 +    }
2821  
2822 <        f = new CompletableFuture<>();
2823 <        f.complete(one);
2824 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2822 >    public void testThenCompose_actionFailed2() {
2823 >        for (ExecutionMode m : ExecutionMode.values())
2824 >        for (Integer v1 : new Integer[] { 1, null }) {
2825 >
2826 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2827 >        f.complete(v1);
2828 >        final FailingCompletableFutureFunction r
2829 >            = new FailingCompletableFutureFunction();
2830 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2831          checkCompletedWithWrappedCFException(g);
2832 +        checkCompletedNormally(f, v1);
2833 +        }
2834      }
2835  
2836      /**
2837 <     * thenComposeAsync result completes exceptionally if source cancelled
2837 >     * thenCompose result completes exceptionally if source cancelled
2838       */
2839 <    public void testThenComposeAsync4() {
2840 <        CompletableFuture<Integer> f, g;
2841 <        CompletableFutureInc r;
2839 >    public void testThenCompose_sourceCancelled1() {
2840 >        for (ExecutionMode m : ExecutionMode.values())
2841 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2842  
2843 <        f = new CompletableFuture<>();
2844 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2845 <        assertTrue(f.cancel(true));
2843 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2844 >        final CompletableFutureInc r = new CompletableFutureInc();
2845 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2846 >        assertTrue(f.cancel(mayInterruptIfRunning));
2847          checkCompletedWithWrappedCancellationException(g);
2848 +        checkCancelled(f);
2849 +        }
2850 +    }
2851  
2852 <        f = new CompletableFuture<>();
2853 <        assertTrue(f.cancel(true));
2854 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2852 >    public void testThenCompose_sourceCancelled2() {
2853 >        for (ExecutionMode m : ExecutionMode.values())
2854 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2855 >
2856 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 >        assertTrue(f.cancel(mayInterruptIfRunning));
2858 >        final CompletableFutureInc r = new CompletableFutureInc();
2859 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2860          checkCompletedWithWrappedCancellationException(g);
2861 +        checkCancelled(f);
2862 +        }
2863      }
2864  
2865 <    // async with explicit executors
2865 >    // asyncs
2866  
2867      /**
2868       * thenRunAsync result completes normally after normal completion of source
2869       */
2870 <    public void testThenRunAsyncE() {
2870 >    public void testThenRunAsync() {
2871          CompletableFuture<Integer> f = new CompletableFuture<>();
2872          Noop r = new Noop();
2873 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2873 >        CompletableFuture<Void> g = f.thenRunAsync(r);
2874          f.complete(null);
2875          checkCompletedNormally(g, null);
2876  
# Line 2274 | Line 2878 | public class CompletableFutureTest exten
2878          f = new CompletableFuture<>();
2879          f.complete(null);
2880          r = new Noop();
2881 <        g = f.thenRunAsync(r, new ThreadExecutor());
2881 >        g = f.thenRunAsync(r);
2882          checkCompletedNormally(g, null);
2883      }
2884  
# Line 2282 | Line 2886 | public class CompletableFutureTest exten
2886       * thenRunAsync result completes exceptionally after exceptional
2887       * completion of source
2888       */
2889 <    public void testThenRunAsync2E() {
2889 >    public void testThenRunAsync2() {
2890          CompletableFuture<Integer> f = new CompletableFuture<>();
2891          Noop r = new Noop();
2892 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2892 >        CompletableFuture<Void> g = f.thenRunAsync(r);
2893          f.completeExceptionally(new CFException());
2894          try {
2895              g.join();
# Line 2297 | Line 2901 | public class CompletableFutureTest exten
2901      /**
2902       * thenRunAsync result completes exceptionally if action does
2903       */
2904 <    public void testThenRunAsync3E() {
2904 >    public void testThenRunAsync3() {
2905          CompletableFuture<Integer> f = new CompletableFuture<>();
2906          FailingNoop r = new FailingNoop();
2907 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2907 >        CompletableFuture<Void> g = f.thenRunAsync(r);
2908          f.complete(null);
2909          checkCompletedWithWrappedCFException(g);
2910      }
# Line 2308 | Line 2912 | public class CompletableFutureTest exten
2912      /**
2913       * thenRunAsync result completes exceptionally if source cancelled
2914       */
2915 <    public void testThenRunAsync4E() {
2915 >    public void testThenRunAsync4() {
2916          CompletableFuture<Integer> f = new CompletableFuture<>();
2917          Noop r = new Noop();
2918 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2918 >        CompletableFuture<Void> g = f.thenRunAsync(r);
2919          assertTrue(f.cancel(true));
2920          checkCompletedWithWrappedCancellationException(g);
2921      }
# Line 2319 | Line 2923 | public class CompletableFutureTest exten
2923      /**
2924       * thenApplyAsync result completes normally after normal completion of source
2925       */
2926 <    public void testThenApplyAsyncE() {
2926 >    public void testThenApplyAsync() {
2927          CompletableFuture<Integer> f = new CompletableFuture<>();
2928 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2928 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2929          f.complete(one);
2930          checkCompletedNormally(g, two);
2931      }
# Line 2330 | Line 2934 | public class CompletableFutureTest exten
2934       * thenApplyAsync result completes exceptionally after exceptional
2935       * completion of source
2936       */
2937 <    public void testThenApplyAsync2E() {
2937 >    public void testThenApplyAsync2() {
2938          CompletableFuture<Integer> f = new CompletableFuture<>();
2939 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2939 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2940          f.completeExceptionally(new CFException());
2941          checkCompletedWithWrappedCFException(g);
2942      }
# Line 2340 | Line 2944 | public class CompletableFutureTest exten
2944      /**
2945       * thenApplyAsync result completes exceptionally if action does
2946       */
2947 <    public void testThenApplyAsync3E() {
2947 >    public void testThenApplyAsync3() {
2948          CompletableFuture<Integer> f = new CompletableFuture<>();
2949          FailingFunction r = new FailingFunction();
2950 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2950 >        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2951          f.complete(null);
2952          checkCompletedWithWrappedCFException(g);
2953      }
# Line 2351 | Line 2955 | public class CompletableFutureTest exten
2955      /**
2956       * thenApplyAsync result completes exceptionally if source cancelled
2957       */
2958 <    public void testThenApplyAsync4E() {
2958 >    public void testThenApplyAsync4() {
2959          CompletableFuture<Integer> f = new CompletableFuture<>();
2960 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2960 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2961          assertTrue(f.cancel(true));
2962          checkCompletedWithWrappedCancellationException(g);
2963      }
# Line 2362 | Line 2966 | public class CompletableFutureTest exten
2966       * thenAcceptAsync result completes normally after normal
2967       * completion of source
2968       */
2969 <    public void testThenAcceptAsyncE() {
2969 >    public void testThenAcceptAsync() {
2970          CompletableFuture<Integer> f = new CompletableFuture<>();
2971          IncAction r = new IncAction();
2972 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2972 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2973          f.complete(one);
2974          checkCompletedNormally(g, null);
2975 <        assertEquals(r.value, 2);
2975 >        assertEquals(r.value, (Integer) 2);
2976      }
2977  
2978      /**
2979       * thenAcceptAsync result completes exceptionally after exceptional
2980       * completion of source
2981       */
2982 <    public void testThenAcceptAsync2E() {
2982 >    public void testThenAcceptAsync2() {
2983          CompletableFuture<Integer> f = new CompletableFuture<>();
2984          IncAction r = new IncAction();
2985 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2985 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2986          f.completeExceptionally(new CFException());
2987          checkCompletedWithWrappedCFException(g);
2988      }
# Line 2386 | Line 2990 | public class CompletableFutureTest exten
2990      /**
2991       * thenAcceptAsync result completes exceptionally if action does
2992       */
2993 <    public void testThenAcceptAsync3E() {
2993 >    public void testThenAcceptAsync3() {
2994          CompletableFuture<Integer> f = new CompletableFuture<>();
2995          FailingConsumer r = new FailingConsumer();
2996 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2996 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2997          f.complete(null);
2998          checkCompletedWithWrappedCFException(g);
2999      }
# Line 2397 | Line 3001 | public class CompletableFutureTest exten
3001      /**
3002       * thenAcceptAsync result completes exceptionally if source cancelled
3003       */
3004 <    public void testThenAcceptAsync4E() {
3004 >    public void testThenAcceptAsync4() {
3005          CompletableFuture<Integer> f = new CompletableFuture<>();
3006          IncAction r = new IncAction();
3007 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3007 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3008          assertTrue(f.cancel(true));
3009          checkCompletedWithWrappedCancellationException(g);
3010      }
3011  
3012 <    /**
2409 <     * thenCombineAsync result completes normally after normal
2410 <     * completion of sources
2411 <     */
2412 <    public void testThenCombineAsyncE() {
2413 <        CompletableFuture<Integer> f, g, h;
2414 <        ThreadExecutor e = new ThreadExecutor();
2415 <        int count = 0;
2416 <
2417 <        f = new CompletableFuture<>();
2418 <        g = new CompletableFuture<>();
2419 <        h = f.thenCombineAsync(g, subtract, e);
2420 <        f.complete(3);
2421 <        checkIncomplete(h);
2422 <        g.complete(1);
2423 <        checkCompletedNormally(h, 2);
2424 <        assertEquals(++count, e.count.get());
2425 <
2426 <        f = new CompletableFuture<>();
2427 <        g = new CompletableFuture<>();
2428 <        h = f.thenCombineAsync(g, subtract, e);
2429 <        g.complete(1);
2430 <        checkIncomplete(h);
2431 <        f.complete(3);
2432 <        checkCompletedNormally(h, 2);
2433 <        assertEquals(++count, e.count.get());
2434 <
2435 <        f = new CompletableFuture<>();
2436 <        g = new CompletableFuture<>();
2437 <        g.complete(1);
2438 <        f.complete(3);
2439 <        h = f.thenCombineAsync(g, subtract, e);
2440 <        checkCompletedNormally(h, 2);
2441 <        assertEquals(++count, e.count.get());
2442 <    }
2443 <
2444 <    /**
2445 <     * thenCombineAsync result completes exceptionally after exceptional
2446 <     * completion of either source
2447 <     */
2448 <    public void testThenCombineAsync2E() {
2449 <        CompletableFuture<Integer> f, g, h;
2450 <        ThreadExecutor e = new ThreadExecutor();
2451 <        int count = 0;
2452 <
2453 <        f = new CompletableFuture<>();
2454 <        g = new CompletableFuture<>();
2455 <        h = f.thenCombineAsync(g, subtract, e);
2456 <        f.completeExceptionally(new CFException());
2457 <        checkIncomplete(h);
2458 <        g.complete(1);
2459 <        checkCompletedWithWrappedCFException(h);
2460 <
2461 <        f = new CompletableFuture<>();
2462 <        g = new CompletableFuture<>();
2463 <        h = f.thenCombineAsync(g, subtract, e);
2464 <        g.completeExceptionally(new CFException());
2465 <        checkIncomplete(h);
2466 <        f.complete(3);
2467 <        checkCompletedWithWrappedCFException(h);
2468 <
2469 <        f = new CompletableFuture<>();
2470 <        g = new CompletableFuture<>();
2471 <        g.completeExceptionally(new CFException());
2472 <        h = f.thenCombineAsync(g, subtract, e);
2473 <        checkIncomplete(h);
2474 <        f.complete(3);
2475 <        checkCompletedWithWrappedCFException(h);
2476 <
2477 <        assertEquals(0, e.count.get());
2478 <    }
2479 <
2480 <    /**
2481 <     * thenCombineAsync result completes exceptionally if action does
2482 <     */
2483 <    public void testThenCombineAsync3E() {
2484 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2485 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2486 <        FailingBiFunction r = new FailingBiFunction();
2487 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2488 <        f.complete(one);
2489 <        checkIncomplete(g);
2490 <        assertFalse(r.ran);
2491 <        f2.complete(two);
2492 <        checkCompletedWithWrappedCFException(g);
2493 <        assertTrue(r.ran);
2494 <    }
2495 <
2496 <    /**
2497 <     * thenCombineAsync result completes exceptionally if either source cancelled
2498 <     */
2499 <    public void testThenCombineAsync4E() {
2500 <        CompletableFuture<Integer> f, g, h;
2501 <        ThreadExecutor e = new ThreadExecutor();
2502 <
2503 <        f = new CompletableFuture<>();
2504 <        g = new CompletableFuture<>();
2505 <        h = f.thenCombineAsync(g, subtract, e);
2506 <        assertTrue(f.cancel(true));
2507 <        checkIncomplete(h);
2508 <        g.complete(1);
2509 <        checkCompletedWithWrappedCancellationException(h);
2510 <
2511 <        f = new CompletableFuture<>();
2512 <        g = new CompletableFuture<>();
2513 <        h = f.thenCombineAsync(g, subtract, e);
2514 <        assertTrue(g.cancel(true));
2515 <        checkIncomplete(h);
2516 <        f.complete(3);
2517 <        checkCompletedWithWrappedCancellationException(h);
2518 <
2519 <        f = new CompletableFuture<>();
2520 <        g = new CompletableFuture<>();
2521 <        assertTrue(g.cancel(true));
2522 <        h = f.thenCombineAsync(g, subtract, e);
2523 <        checkIncomplete(h);
2524 <        f.complete(3);
2525 <        checkCompletedWithWrappedCancellationException(h);
2526 <
2527 <        f = new CompletableFuture<>();
2528 <        g = new CompletableFuture<>();
2529 <        assertTrue(f.cancel(true));
2530 <        assertTrue(g.cancel(true));
2531 <        h = f.thenCombineAsync(g, subtract, e);
2532 <        checkCompletedWithWrappedCancellationException(h);
2533 <
2534 <        assertEquals(0, e.count.get());
2535 <    }
2536 <
2537 <    /**
2538 <     * thenAcceptBothAsync result completes normally after normal
2539 <     * completion of sources
2540 <     */
2541 <    public void testThenAcceptBothAsyncE() {
2542 <        CompletableFuture<Integer> f, g;
2543 <        CompletableFuture<Void> h;
2544 <        SubtractAction r;
2545 <        ThreadExecutor e = new ThreadExecutor();
2546 <
2547 <        f = new CompletableFuture<>();
2548 <        g = new CompletableFuture<>();
2549 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2550 <        f.complete(3);
2551 <        checkIncomplete(h);
2552 <        g.complete(1);
2553 <        checkCompletedNormally(h, null);
2554 <        assertEquals(r.value, 2);
2555 <
2556 <        f = new CompletableFuture<>();
2557 <        g = new CompletableFuture<>();
2558 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2559 <        g.complete(1);
2560 <        checkIncomplete(h);
2561 <        f.complete(3);
2562 <        checkCompletedNormally(h, null);
2563 <        assertEquals(r.value, 2);
2564 <
2565 <        f = new CompletableFuture<>();
2566 <        g = new CompletableFuture<>();
2567 <        g.complete(1);
2568 <        f.complete(3);
2569 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2570 <        checkCompletedNormally(h, null);
2571 <        assertEquals(r.value, 2);
2572 <
2573 <        assertEquals(3, e.count.get());
2574 <    }
2575 <
2576 <    /**
2577 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2578 <     * completion of source
2579 <     */
2580 <    public void testThenAcceptBothAsync2E() {
2581 <        CompletableFuture<Integer> f, g;
2582 <        CompletableFuture<Void> h;
2583 <        SubtractAction r;
2584 <        ThreadExecutor e = new ThreadExecutor();
2585 <
2586 <        f = new CompletableFuture<>();
2587 <        g = new CompletableFuture<>();
2588 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2589 <        f.completeExceptionally(new CFException());
2590 <        checkIncomplete(h);
2591 <        g.complete(1);
2592 <        checkCompletedWithWrappedCFException(h);
2593 <
2594 <        f = new CompletableFuture<>();
2595 <        g = new CompletableFuture<>();
2596 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2597 <        g.completeExceptionally(new CFException());
2598 <        checkIncomplete(h);
2599 <        f.complete(3);
2600 <        checkCompletedWithWrappedCFException(h);
2601 <
2602 <        f = new CompletableFuture<>();
2603 <        g = new CompletableFuture<>();
2604 <        f.complete(3);
2605 <        g.completeExceptionally(new CFException());
2606 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2607 <        checkCompletedWithWrappedCFException(h);
2608 <
2609 <        f = new CompletableFuture<>();
2610 <        g = new CompletableFuture<>();
2611 <        f.completeExceptionally(new CFException());
2612 <        g.complete(3);
2613 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2614 <        checkCompletedWithWrappedCFException(h);
2615 <
2616 <        assertEquals(0, e.count.get());
2617 <    }
2618 <
2619 <    /**
2620 <     * thenAcceptBothAsync result completes exceptionally if action does
2621 <     */
2622 <    public void testThenAcceptBothAsync3E() {
2623 <        CompletableFuture<Integer> f, g;
2624 <        CompletableFuture<Void> h;
2625 <        FailingBiConsumer r;
2626 <        ThreadExecutor e = new ThreadExecutor();
2627 <
2628 <        f = new CompletableFuture<>();
2629 <        g = new CompletableFuture<>();
2630 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2631 <        f.complete(3);
2632 <        checkIncomplete(h);
2633 <        g.complete(1);
2634 <        checkCompletedWithWrappedCFException(h);
2635 <
2636 <        f = new CompletableFuture<>();
2637 <        g = new CompletableFuture<>();
2638 <        f.complete(3);
2639 <        g.complete(1);
2640 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2641 <        checkCompletedWithWrappedCFException(h);
2642 <
2643 <        assertEquals(2, e.count.get());
2644 <    }
2645 <
2646 <    /**
2647 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2648 <     */
2649 <    public void testThenAcceptBothAsync4E() {
2650 <        CompletableFuture<Integer> f, g;
2651 <        CompletableFuture<Void> h;
2652 <        SubtractAction r;
2653 <        ThreadExecutor e = new ThreadExecutor();
2654 <
2655 <        f = new CompletableFuture<>();
2656 <        g = new CompletableFuture<>();
2657 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2658 <        assertTrue(f.cancel(true));
2659 <        checkIncomplete(h);
2660 <        g.complete(1);
2661 <        checkCompletedWithWrappedCancellationException(h);
2662 <
2663 <        f = new CompletableFuture<>();
2664 <        g = new CompletableFuture<>();
2665 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2666 <        assertTrue(g.cancel(true));
2667 <        checkIncomplete(h);
2668 <        f.complete(3);
2669 <        checkCompletedWithWrappedCancellationException(h);
2670 <
2671 <        f = new CompletableFuture<>();
2672 <        g = new CompletableFuture<>();
2673 <        f.complete(3);
2674 <        assertTrue(g.cancel(true));
2675 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2676 <        checkCompletedWithWrappedCancellationException(h);
2677 <
2678 <        f = new CompletableFuture<>();
2679 <        g = new CompletableFuture<>();
2680 <        assertTrue(f.cancel(true));
2681 <        g.complete(3);
2682 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2683 <        checkCompletedWithWrappedCancellationException(h);
2684 <
2685 <        assertEquals(0, e.count.get());
2686 <    }
2687 <
2688 <    /**
2689 <     * applyToEitherAsync result completes normally after normal
2690 <     * completion of sources
2691 <     */
2692 <    public void testApplyToEitherAsyncE() {
2693 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2694 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2695 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2696 <        f.complete(one);
2697 <        checkCompletedNormally(g, two);
2698 <
2699 <        f = new CompletableFuture<>();
2700 <        f.complete(one);
2701 <        f2 = new CompletableFuture<>();
2702 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2703 <        checkCompletedNormally(g, two);
2704 <    }
2705 <
2706 <    /**
2707 <     * applyToEitherAsync result completes exceptionally after exceptional
2708 <     * completion of source
2709 <     */
2710 <    public void testApplyToEitherAsync2E() {
2711 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2712 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2713 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2714 <        f.completeExceptionally(new CFException());
2715 <        checkCompletedWithWrappedCFException(g);
2716 <
2717 <        f = new CompletableFuture<>();
2718 <        f2 = new CompletableFuture<>();
2719 <        f2.completeExceptionally(new CFException());
2720 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2721 <        f.complete(one);
2722 <        checkCompletedWithWrappedCFException(g);
2723 <    }
2724 <
2725 <    /**
2726 <     * applyToEitherAsync result completes exceptionally if action does
2727 <     */
2728 <    public void testApplyToEitherAsync3E() {
2729 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2730 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2731 <        FailingFunction r = new FailingFunction();
2732 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2733 <        f.complete(one);
2734 <        checkCompletedWithWrappedCFException(g);
2735 <    }
2736 <
2737 <    /**
2738 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2739 <     */
2740 <    public void testApplyToEitherAsync4E() {
2741 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2742 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2743 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2744 <        assertTrue(f.cancel(true));
2745 <        checkCompletedWithWrappedCancellationException(g);
2746 <
2747 <        f = new CompletableFuture<>();
2748 <        f2 = new CompletableFuture<>();
2749 <        assertTrue(f2.cancel(true));
2750 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2751 <        checkCompletedWithWrappedCancellationException(g);
2752 <    }
3012 >    // async with explicit executors
3013  
3014      /**
3015 <     * acceptEitherAsync result completes normally after normal
2756 <     * completion of sources
3015 >     * thenRunAsync result completes normally after normal completion of source
3016       */
3017 <    public void testAcceptEitherAsyncE() {
3017 >    public void testThenRunAsyncE() {
3018          CompletableFuture<Integer> f = new CompletableFuture<>();
3019 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3020 <        IncAction r = new IncAction();
3021 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2763 <        f.complete(one);
3019 >        Noop r = new Noop();
3020 >        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3021 >        f.complete(null);
3022          checkCompletedNormally(g, null);
2765        assertEquals(r.value, 2);
3023  
3024 <        r = new IncAction();
3024 >        // reordered version
3025          f = new CompletableFuture<>();
3026 <        f.complete(one);
3027 <        f2 = new CompletableFuture<>();
3028 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3026 >        f.complete(null);
3027 >        r = new Noop();
3028 >        g = f.thenRunAsync(r, new ThreadExecutor());
3029          checkCompletedNormally(g, null);
2773        assertEquals(r.value, 2);
3030      }
3031  
3032      /**
3033 <     * acceptEitherAsync result completes exceptionally after exceptional
3033 >     * thenRunAsync result completes exceptionally after exceptional
3034       * completion of source
3035       */
3036 <    public void testAcceptEitherAsync2E() {
3036 >    public void testThenRunAsync2E() {
3037          CompletableFuture<Integer> f = new CompletableFuture<>();
3038 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3039 <        IncAction r = new IncAction();
2784 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3038 >        Noop r = new Noop();
3039 >        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3040          f.completeExceptionally(new CFException());
3041 <        checkCompletedWithWrappedCFException(g);
3042 <
3043 <        r = new IncAction();
3044 <        f = new CompletableFuture<>();
2790 <        f2 = new CompletableFuture<>();
2791 <        f2.completeExceptionally(new CFException());
2792 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2793 <        f.complete(one);
3041 >        try {
3042 >            g.join();
3043 >            shouldThrow();
3044 >        } catch (CompletionException success) {}
3045          checkCompletedWithWrappedCFException(g);
3046      }
3047  
3048      /**
3049 <     * acceptEitherAsync result completes exceptionally if action does
3049 >     * thenRunAsync result completes exceptionally if action does
3050       */
3051 <    public void testAcceptEitherAsync3E() {
3051 >    public void testThenRunAsync3E() {
3052          CompletableFuture<Integer> f = new CompletableFuture<>();
3053 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3054 <        FailingConsumer r = new FailingConsumer();
3055 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2805 <        f.complete(one);
3053 >        FailingNoop r = new FailingNoop();
3054 >        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3055 >        f.complete(null);
3056          checkCompletedWithWrappedCFException(g);
3057      }
3058  
3059      /**
3060 <     * acceptEitherAsync result completes exceptionally if either
2811 <     * source cancelled
3060 >     * thenRunAsync result completes exceptionally if source cancelled
3061       */
3062 <    public void testAcceptEitherAsync4E() {
3062 >    public void testThenRunAsync4E() {
3063          CompletableFuture<Integer> f = new CompletableFuture<>();
3064 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3065 <        IncAction r = new IncAction();
2817 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3064 >        Noop r = new Noop();
3065 >        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3066          assertTrue(f.cancel(true));
3067          checkCompletedWithWrappedCancellationException(g);
2820
2821        r = new IncAction();
2822        f = new CompletableFuture<>();
2823        f2 = new CompletableFuture<>();
2824        assertTrue(f2.cancel(true));
2825        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2826        checkCompletedWithWrappedCancellationException(g);
3068      }
3069  
3070      /**
3071 <     * runAfterEitherAsync result completes normally after normal
2831 <     * completion of sources
3071 >     * thenApplyAsync result completes normally after normal completion of source
3072       */
3073 <    public void testRunAfterEitherAsyncE() {
3073 >    public void testThenApplyAsyncE() {
3074          CompletableFuture<Integer> f = new CompletableFuture<>();
3075 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2836 <        Noop r = new Noop();
2837 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2838 <        f.complete(one);
2839 <        checkCompletedNormally(g, null);
2840 <        assertTrue(r.ran);
2841 <
2842 <        r = new Noop();
2843 <        f = new CompletableFuture<>();
3075 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3076          f.complete(one);
3077 <        f2 = new CompletableFuture<>();
2846 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2847 <        checkCompletedNormally(g, null);
2848 <        assertTrue(r.ran);
3077 >        checkCompletedNormally(g, two);
3078      }
3079  
3080      /**
3081 <     * runAfterEitherAsync result completes exceptionally after exceptional
3081 >     * thenApplyAsync result completes exceptionally after exceptional
3082       * completion of source
3083       */
3084 <    public void testRunAfterEitherAsync2E() {
3084 >    public void testThenApplyAsync2E() {
3085          CompletableFuture<Integer> f = new CompletableFuture<>();
3086 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2858 <        Noop r = new Noop();
2859 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3086 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3087          f.completeExceptionally(new CFException());
3088          checkCompletedWithWrappedCFException(g);
2862
2863        r = new Noop();
2864        f = new CompletableFuture<>();
2865        f2 = new CompletableFuture<>();
2866        f2.completeExceptionally(new CFException());
2867        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2868        f.complete(one);
2869        checkCompletedWithWrappedCFException(g);
3089      }
3090  
3091      /**
3092 <     * runAfterEitherAsync result completes exceptionally if action does
3092 >     * thenApplyAsync result completes exceptionally if action does
3093       */
3094 <    public void testRunAfterEitherAsync3E() {
3094 >    public void testThenApplyAsync3E() {
3095          CompletableFuture<Integer> f = new CompletableFuture<>();
3096 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3097 <        FailingNoop r = new FailingNoop();
3098 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2880 <        f.complete(one);
3096 >        FailingFunction r = new FailingFunction();
3097 >        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3098 >        f.complete(null);
3099          checkCompletedWithWrappedCFException(g);
3100      }
3101  
3102      /**
3103 <     * runAfterEitherAsync result completes exceptionally if either
2886 <     * source cancelled
3103 >     * thenApplyAsync result completes exceptionally if source cancelled
3104       */
3105 <    public void testRunAfterEitherAsync4E() {
3105 >    public void testThenApplyAsync4E() {
3106          CompletableFuture<Integer> f = new CompletableFuture<>();
3107 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2891 <        Noop r = new Noop();
2892 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3107 >        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3108          assertTrue(f.cancel(true));
3109          checkCompletedWithWrappedCancellationException(g);
2895
2896        r = new Noop();
2897        f = new CompletableFuture<>();
2898        f2 = new CompletableFuture<>();
2899        assertTrue(f2.cancel(true));
2900        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2901        checkCompletedWithWrappedCancellationException(g);
3110      }
3111  
3112      /**
3113 <     * thenComposeAsync result completes normally after normal
3113 >     * thenAcceptAsync result completes normally after normal
3114       * completion of source
3115       */
3116 <    public void testThenComposeAsyncE() {
3116 >    public void testThenAcceptAsyncE() {
3117          CompletableFuture<Integer> f = new CompletableFuture<>();
3118 <        CompletableFutureInc r = new CompletableFutureInc();
3119 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3118 >        IncAction r = new IncAction();
3119 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3120          f.complete(one);
3121 <        checkCompletedNormally(g, two);
3121 >        checkCompletedNormally(g, null);
3122 >        assertEquals(r.value, (Integer) 2);
3123      }
3124  
3125      /**
3126 <     * thenComposeAsync result completes exceptionally after
3127 <     * exceptional completion of source
3126 >     * thenAcceptAsync result completes exceptionally after exceptional
3127 >     * completion of source
3128       */
3129 <    public void testThenComposeAsync2E() {
3129 >    public void testThenAcceptAsync2E() {
3130          CompletableFuture<Integer> f = new CompletableFuture<>();
3131 <        CompletableFutureInc r = new CompletableFutureInc();
3132 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3131 >        IncAction r = new IncAction();
3132 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3133          f.completeExceptionally(new CFException());
3134          checkCompletedWithWrappedCFException(g);
3135      }
3136  
3137      /**
3138 <     * thenComposeAsync result completes exceptionally if action does
3138 >     * thenAcceptAsync result completes exceptionally if action does
3139       */
3140 <    public void testThenComposeAsync3E() {
3140 >    public void testThenAcceptAsync3E() {
3141          CompletableFuture<Integer> f = new CompletableFuture<>();
3142 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3143 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3144 <        f.complete(one);
3142 >        FailingConsumer r = new FailingConsumer();
3143 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3144 >        f.complete(null);
3145          checkCompletedWithWrappedCFException(g);
3146      }
3147  
3148      /**
3149 <     * thenComposeAsync result completes exceptionally if source cancelled
3149 >     * thenAcceptAsync result completes exceptionally if source cancelled
3150       */
3151 <    public void testThenComposeAsync4E() {
3151 >    public void testThenAcceptAsync4E() {
3152          CompletableFuture<Integer> f = new CompletableFuture<>();
3153 <        CompletableFutureInc r = new CompletableFutureInc();
3154 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3153 >        IncAction r = new IncAction();
3154 >        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3155          assertTrue(f.cancel(true));
3156          checkCompletedWithWrappedCancellationException(g);
3157      }
# Line 3145 | Line 3354 | public class CompletableFutureTest exten
3354       * whenComplete action executes on normal completion, propagating
3355       * source result.
3356       */
3357 <    public void testWhenComplete1() {
3357 >    public void testWhenComplete_normalCompletion1() {
3358 >        for (boolean createIncomplete : new boolean[] { true, false })
3359 >        for (ExecutionMode m : ExecutionMode.values())
3360 >        for (Integer v1 : new Integer[] { 1, null }) {
3361 >
3362          final AtomicInteger a = new AtomicInteger();
3363 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3364 <        CompletableFuture<Integer> g =
3365 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3366 <        f.complete(three);
3367 <        checkCompletedNormally(f, three);
3368 <        checkCompletedNormally(g, three);
3363 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3364 >        if (!createIncomplete) f.complete(v1);
3365 >        final CompletableFuture<Integer> g =
3366 >            m.whenComplete(f,
3367 >                           (Integer x, Throwable t) -> {
3368 >                               threadAssertSame(x, v1);
3369 >                               threadAssertNull(t);
3370 >                               a.getAndIncrement();
3371 >                           });
3372 >        if (createIncomplete) f.complete(v1);
3373 >        checkCompletedNormally(f, v1);
3374 >        checkCompletedNormally(g, v1);
3375          assertEquals(a.get(), 1);
3376 +        }
3377      }
3378  
3379      /**
3380       * whenComplete action executes on exceptional completion, propagating
3381       * source result.
3382       */
3383 <    public void testWhenComplete2() {
3383 >    public void testWhenComplete_exceptionalCompletion() {
3384 >        for (boolean createIncomplete : new boolean[] { true, false })
3385 >        for (ExecutionMode m : ExecutionMode.values())
3386 >        for (Integer v1 : new Integer[] { 1, null }) {
3387 >
3388          final AtomicInteger a = new AtomicInteger();
3389 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3390 <        CompletableFuture<Integer> g =
3391 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3392 <        f.completeExceptionally(new CFException());
3393 <        assertTrue(f.isCompletedExceptionally());
3394 <        assertTrue(g.isCompletedExceptionally());
3389 >        final CFException ex = new CFException();
3390 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3391 >        if (!createIncomplete) f.completeExceptionally(ex);
3392 >        final CompletableFuture<Integer> g = m.whenComplete
3393 >            (f,
3394 >             (Integer x, Throwable t) -> {
3395 >                threadAssertNull(x);
3396 >                threadAssertSame(t, ex);
3397 >                a.getAndIncrement();
3398 >            });
3399 >        if (createIncomplete) f.completeExceptionally(ex);
3400 >        checkCompletedWithWrappedCFException(f, ex);
3401 >        checkCompletedWithWrappedCFException(g, ex);
3402          assertEquals(a.get(), 1);
3403 +        }
3404      }
3405  
3406      /**
3407       * If a whenComplete action throws an exception when triggered by
3408       * a normal completion, it completes exceptionally
3409       */
3410 <    public void testWhenComplete3() {
3411 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3412 <        CompletableFuture<Integer> g =
3413 <            f.whenComplete((Integer x, Throwable t) ->
3182 <                           { throw new CFException(); } );
3183 <        f.complete(three);
3184 <        checkCompletedNormally(f, three);
3185 <        assertTrue(g.isCompletedExceptionally());
3186 <        checkCompletedWithWrappedCFException(g);
3187 <    }
3188 <
3189 <    /**
3190 <     * whenCompleteAsync action executes on normal completion, propagating
3191 <     * source result.
3192 <     */
3193 <    public void testWhenCompleteAsync1() {
3194 <        final AtomicInteger a = new AtomicInteger();
3195 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3196 <        CompletableFuture<Integer> g =
3197 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3198 <        f.complete(three);
3199 <        checkCompletedNormally(f, three);
3200 <        checkCompletedNormally(g, three);
3201 <        assertEquals(a.get(), 1);
3202 <    }
3410 >    public void testWhenComplete_actionFailed() {
3411 >        for (boolean createIncomplete : new boolean[] { true, false })
3412 >        for (ExecutionMode m : ExecutionMode.values())
3413 >        for (Integer v1 : new Integer[] { 1, null }) {
3414  
3415 <    /**
3416 <     * whenCompleteAsync action executes on exceptional completion, propagating
3417 <     * source result.
3418 <     */
3419 <    public void testWhenCompleteAsync2() {
3420 <        final AtomicInteger a = new AtomicInteger();
3421 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3422 <        CompletableFuture<Integer> g =
3423 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3424 <        f.completeExceptionally(new CFException());
3425 <        checkCompletedWithWrappedCFException(f);
3426 <        checkCompletedWithWrappedCFException(g);
3415 >        final CFException ex = new CFException();
3416 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3417 >        if (!createIncomplete) f.complete(v1);
3418 >        final CompletableFuture<Integer> g = m.whenComplete
3419 >            (f,
3420 >             (Integer x, Throwable t) -> {
3421 >                threadAssertSame(x, v1);
3422 >                threadAssertNull(t);
3423 >                throw ex;
3424 >            });
3425 >        if (createIncomplete) f.complete(v1);
3426 >        checkCompletedNormally(f, v1);
3427 >        checkCompletedWithWrappedCFException(g, ex);
3428 >        }
3429      }
3430  
3431      /**
3432 <     * If a whenCompleteAsync action throws an exception when
3433 <     * triggered by a normal completion, it completes exceptionally
3432 >     * If a whenComplete action throws an exception when triggered by
3433 >     * a source completion that also throws an exception, the source
3434 >     * exception takes precedence.
3435       */
3436 <    public void testWhenCompleteAsync3() {
3437 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3438 <        CompletableFuture<Integer> g =
3439 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3226 <                           { throw new CFException(); } );
3227 <        f.complete(three);
3228 <        checkCompletedNormally(f, three);
3229 <        checkCompletedWithWrappedCFException(g);
3230 <    }
3436 >    public void testWhenComplete_actionFailedSourceFailed() {
3437 >        for (boolean createIncomplete : new boolean[] { true, false })
3438 >        for (ExecutionMode m : ExecutionMode.values())
3439 >        for (Integer v1 : new Integer[] { 1, null }) {
3440  
3441 <    /**
3442 <     * whenCompleteAsync action executes on normal completion, propagating
3443 <     * source result.
3235 <     */
3236 <    public void testWhenCompleteAsync1e() {
3237 <        final AtomicInteger a = new AtomicInteger();
3238 <        ThreadExecutor exec = new ThreadExecutor();
3239 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3240 <        CompletableFuture<Integer> g =
3241 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3242 <                                exec);
3243 <        f.complete(three);
3244 <        checkCompletedNormally(f, three);
3245 <        checkCompletedNormally(g, three);
3246 <        assertEquals(a.get(), 1);
3247 <    }
3441 >        final CFException ex1 = new CFException();
3442 >        final CFException ex2 = new CFException();
3443 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3444  
3445 <    /**
3446 <     * whenCompleteAsync action executes on exceptional completion, propagating
3447 <     * source result.
3448 <     */
3449 <    public void testWhenCompleteAsync2e() {
3450 <        final AtomicInteger a = new AtomicInteger();
3451 <        ThreadExecutor exec = new ThreadExecutor();
3452 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3453 <        CompletableFuture<Integer> g =
3258 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3259 <                                exec);
3260 <        f.completeExceptionally(new CFException());
3261 <        checkCompletedWithWrappedCFException(f);
3262 <        checkCompletedWithWrappedCFException(g);
3263 <    }
3445 >        if (!createIncomplete) f.completeExceptionally(ex1);
3446 >        final CompletableFuture<Integer> g = m.whenComplete
3447 >            (f,
3448 >             (Integer x, Throwable t) -> {
3449 >                threadAssertSame(t, ex1);
3450 >                threadAssertNull(x);
3451 >                throw ex2;
3452 >            });
3453 >        if (createIncomplete) f.completeExceptionally(ex1);
3454  
3455 <    /**
3456 <     * If a whenCompleteAsync action throws an exception when triggered
3457 <     * by a normal completion, it completes exceptionally
3268 <     */
3269 <    public void testWhenCompleteAsync3e() {
3270 <        ThreadExecutor exec = new ThreadExecutor();
3271 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3272 <        CompletableFuture<Integer> g =
3273 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3274 <                                { throw new CFException(); },
3275 <                                exec);
3276 <        f.complete(three);
3277 <        checkCompletedNormally(f, three);
3278 <        checkCompletedWithWrappedCFException(g);
3455 >        checkCompletedWithWrappedCFException(f, ex1);
3456 >        checkCompletedWithWrappedCFException(g, ex1);
3457 >        }
3458      }
3459  
3460      /**
# Line 3288 | Line 3467 | public class CompletableFutureTest exten
3467  
3468          f = new CompletableFuture<>();
3469          g = f.handleAsync(r = new IntegerHandler());
3470 <        assertFalse(r.ran);
3470 >        assertEquals(0, r.invocationCount);
3471          f.completeExceptionally(new CFException());
3472          checkCompletedWithWrappedCFException(f);
3473          checkCompletedNormally(g, three);
3474 <        assertTrue(r.ran);
3474 >        assertEquals(1, r.invocationCount);
3475  
3476          f = new CompletableFuture<>();
3477          g = f.handleAsync(r = new IntegerHandler());
3478 <        assertFalse(r.ran);
3478 >        assertEquals(0, r.invocationCount);
3479          f.completeExceptionally(new CFException());
3480          checkCompletedWithWrappedCFException(f);
3481          checkCompletedNormally(g, three);
3482 <        assertTrue(r.ran);
3482 >        assertEquals(1, r.invocationCount);
3483  
3484          f = new CompletableFuture<>();
3485          g = f.handleAsync(r = new IntegerHandler());
3486 <        assertFalse(r.ran);
3486 >        assertEquals(0, r.invocationCount);
3487          f.complete(one);
3488          checkCompletedNormally(f, one);
3489          checkCompletedNormally(g, two);
3490 <        assertTrue(r.ran);
3490 >        assertEquals(1, r.invocationCount);
3491  
3492          f = new CompletableFuture<>();
3493          g = f.handleAsync(r = new IntegerHandler());
3494 <        assertFalse(r.ran);
3494 >        assertEquals(0, r.invocationCount);
3495          f.complete(one);
3496          checkCompletedNormally(f, one);
3497          checkCompletedNormally(g, two);
3498 <        assertTrue(r.ran);
3498 >        assertEquals(1, r.invocationCount);
3499      }
3500  
3501      /**
# Line 3331 | Line 3510 | public class CompletableFutureTest exten
3510  
3511          f = new CompletableFuture<>();
3512          g = f.handleAsync(r = new IntegerHandler(), exec);
3513 <        assertFalse(r.ran);
3513 >        assertEquals(0, r.invocationCount);
3514          f.completeExceptionally(new CFException());
3515          checkCompletedWithWrappedCFException(f);
3516          checkCompletedNormally(g, three);
3517 <        assertTrue(r.ran);
3517 >        assertEquals(1, r.invocationCount);
3518  
3519          f = new CompletableFuture<>();
3520          g = f.handleAsync(r = new IntegerHandler(), exec);
3521 <        assertFalse(r.ran);
3521 >        assertEquals(0, r.invocationCount);
3522          f.completeExceptionally(new CFException());
3523          checkCompletedWithWrappedCFException(f);
3524          checkCompletedNormally(g, three);
3525 <        assertTrue(r.ran);
3525 >        assertEquals(1, r.invocationCount);
3526  
3527          f = new CompletableFuture<>();
3528          g = f.handleAsync(r = new IntegerHandler(), exec);
3529 <        assertFalse(r.ran);
3529 >        assertEquals(0, r.invocationCount);
3530          f.complete(one);
3531          checkCompletedNormally(f, one);
3532          checkCompletedNormally(g, two);
3533 <        assertTrue(r.ran);
3533 >        assertEquals(1, r.invocationCount);
3534  
3535          f = new CompletableFuture<>();
3536          g = f.handleAsync(r = new IntegerHandler(), exec);
3537 <        assertFalse(r.ran);
3537 >        assertEquals(0, r.invocationCount);
3538          f.complete(one);
3539          checkCompletedNormally(f, one);
3540          checkCompletedNormally(g, two);
3541 <        assertTrue(r.ran);
3541 >        assertEquals(1, r.invocationCount);
3542      }
3543  
3544   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines