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.47 by jsr166, Mon Jun 2 18:21:34 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 246 | Line 247 | public class CompletableFutureTest exten
247          f = new CompletableFuture<>();
248          f.obtrudeValue(three);
249          checkCompletedNormally(f, three);
250 +        f.obtrudeValue(null);
251 +        checkCompletedNormally(f, null);
252          f = new CompletableFuture<>();
253          f.completeExceptionally(new CFException());
254          f.obtrudeValue(four);
# Line 278 | Line 281 | public class CompletableFutureTest exten
281       */
282      public void testGetNumberOfDependents() {
283          CompletableFuture<Integer> f = new CompletableFuture<>();
284 <        assertEquals(f.getNumberOfDependents(), 0);
284 >        assertEquals(0, f.getNumberOfDependents());
285          CompletableFuture g = f.thenRun(new Noop());
286 <        assertEquals(f.getNumberOfDependents(), 1);
287 <        assertEquals(g.getNumberOfDependents(), 0);
286 >        assertEquals(1, f.getNumberOfDependents());
287 >        assertEquals(0, g.getNumberOfDependents());
288          CompletableFuture h = f.thenRun(new Noop());
289 <        assertEquals(f.getNumberOfDependents(), 2);
289 >        assertEquals(2, f.getNumberOfDependents());
290          f.complete(1);
291          checkCompletedNormally(g, null);
292 <        assertEquals(f.getNumberOfDependents(), 0);
293 <        assertEquals(g.getNumberOfDependents(), 0);
292 >        assertEquals(0, f.getNumberOfDependents());
293 >        assertEquals(0, g.getNumberOfDependents());
294      }
295  
296      /**
# Line 317 | Line 320 | public class CompletableFutureTest exten
320  
321      // Choose non-commutative actions for better coverage
322  
323 +    // A non-commutative function that handles and produces null values as well.
324 +    static Integer subtract(Integer x, Integer y) {
325 +        return (x == null && y == null) ? null :
326 +            ((x == null) ? 42 : x.intValue())
327 +            - ((y == null) ? 99 : y.intValue());
328 +    }
329 +
330 +    // A function that handles and produces null values as well.
331 +    static Integer inc(Integer x) {
332 +        return (x == null) ? null : x + 1;
333 +    }
334 +
335      static final Supplier<Integer> supplyOne =
336          () -> Integer.valueOf(1);
337      static final Function<Integer, Integer> inc =
338          (Integer x) -> Integer.valueOf(x.intValue() + 1);
339      static final BiFunction<Integer, Integer, Integer> subtract =
340 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
340 >        (Integer x, Integer y) -> subtract(x, y);
341      static final class IncAction implements Consumer<Integer> {
342 <        int value;
343 <        public void accept(Integer x) { value = x.intValue() + 1; }
342 >        int invocationCount = 0;
343 >        Integer value;
344 >        public void accept(Integer x) {
345 >            invocationCount++;
346 >            value = inc(x);
347 >        }
348 >    }
349 >    static final class IncFunction implements Function<Integer,Integer> {
350 >        int invocationCount = 0;
351 >        Integer value;
352 >        public Integer apply(Integer x) {
353 >            invocationCount++;
354 >            return value = inc(x);
355 >        }
356      }
357      static final class SubtractAction implements BiConsumer<Integer, Integer> {
358 <        int value;
358 >        int invocationCount = 0;
359 >        Integer value;
360 >        // Check this action was invoked exactly once when result is computed.
361          public void accept(Integer x, Integer y) {
362 <            value = x.intValue() - y.intValue();
362 >            invocationCount++;
363 >            value = subtract(x, y);
364 >        }
365 >    }
366 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
367 >        int invocationCount = 0;
368 >        Integer value;
369 >        // Check this action was invoked exactly once when result is computed.
370 >        public Integer apply(Integer x, Integer y) {
371 >            invocationCount++;
372 >            return value = subtract(x, y);
373          }
374      }
375      static final class Noop implements Runnable {
376 <        boolean ran;
377 <        public void run() { ran = true; }
376 >        int invocationCount = 0;
377 >        public void run() {
378 >            invocationCount++;
379 >        }
380      }
381  
382      static final class FailingSupplier implements Supplier<Integer> {
383 <        boolean ran;
384 <        public Integer get() { ran = true; throw new CFException(); }
383 >        int invocationCount = 0;
384 >        public Integer get() {
385 >            invocationCount++;
386 >            throw new CFException();
387 >        }
388      }
389      static final class FailingConsumer implements Consumer<Integer> {
390 <        boolean ran;
391 <        public void accept(Integer x) { ran = true; throw new CFException(); }
390 >        int invocationCount = 0;
391 >        public void accept(Integer x) {
392 >            invocationCount++;
393 >            throw new CFException();
394 >        }
395      }
396      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
397 <        boolean ran;
398 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
397 >        int invocationCount = 0;
398 >        public void accept(Integer x, Integer y) {
399 >            invocationCount++;
400 >            throw new CFException();
401 >        }
402      }
403      static final class FailingFunction implements Function<Integer, Integer> {
404 <        boolean ran;
405 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
404 >        int invocationCount = 0;
405 >        public Integer apply(Integer x) {
406 >            invocationCount++;
407 >            throw new CFException();
408 >        }
409      }
410      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
411 <        boolean ran;
412 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
411 >        int invocationCount = 0;
412 >        public Integer apply(Integer x, Integer y) {
413 >            invocationCount++;
414 >            throw new CFException();
415 >        }
416      }
417      static final class FailingNoop implements Runnable {
418 <        boolean ran;
419 <        public void run() { ran = true; throw new CFException(); }
418 >        int invocationCount = 0;
419 >        public void run() {
420 >            invocationCount++;
421 >            throw new CFException();
422 >        }
423      }
424  
425      static final class CompletableFutureInc
426          implements Function<Integer, CompletableFuture<Integer>> {
427 <        boolean ran;
427 >        int invocationCount = 0;
428          public CompletableFuture<Integer> apply(Integer x) {
429 <            ran = true;
429 >            invocationCount++;
430              CompletableFuture<Integer> f = new CompletableFuture<>();
431 <            f.complete(Integer.valueOf(x.intValue() + 1));
431 >            f.complete(inc(x));
432              return f;
433          }
434      }
435  
436      static final class FailingCompletableFutureFunction
437          implements Function<Integer, CompletableFuture<Integer>> {
438 <        boolean ran;
438 >        int invocationCount = 0;
439          public CompletableFuture<Integer> apply(Integer x) {
440 <            ran = true; throw new CFException();
440 >            invocationCount++;
441 >            throw new CFException();
442          }
443      }
444  
# Line 392 | Line 452 | public class CompletableFutureTest exten
452          }
453      }
454  
455 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
456 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
457 <    }
455 >    /**
456 >     * Permits the testing of parallel code for the 3 different
457 >     * execution modes without repeating all the testing code.
458 >     */
459 >    enum ExecutionMode {
460 >        DEFAULT {
461 >            public <T> CompletableFuture<Void> thenRun
462 >                (CompletableFuture<T> f, Runnable a) {
463 >                return f.thenRun(a);
464 >            }
465 >            public <T> CompletableFuture<Void> thenAccept
466 >                (CompletableFuture<T> f, Consumer<? super T> a) {
467 >                return f.thenAccept(a);
468 >            }
469 >            public <T,U> CompletableFuture<U> thenApply
470 >                (CompletableFuture<T> f, Function<? super T,U> a) {
471 >                return f.thenApply(a);
472 >            }
473 >            public <T,U> CompletableFuture<U> thenCompose
474 >                (CompletableFuture<T> f,
475 >                 Function<? super T,? extends CompletionStage<U>> a) {
476 >                return f.thenCompose(a);
477 >            }
478 >            public <T,U> CompletableFuture<U> handle
479 >                (CompletableFuture<T> f,
480 >                 BiFunction<? super T,Throwable,? extends U> a) {
481 >                return f.handle(a);
482 >            }
483 >            public <T> CompletableFuture<T> whenComplete
484 >                (CompletableFuture<T> f,
485 >                 BiConsumer<? super T,? super Throwable> a) {
486 >                return f.whenComplete(a);
487 >            }
488 >            public <T,U> CompletableFuture<Void> runAfterBoth
489 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
490 >                return f.runAfterBoth(g, a);
491 >            }
492 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
493 >                (CompletableFuture<T> f,
494 >                 CompletionStage<? extends U> g,
495 >                 BiConsumer<? super T,? super U> a) {
496 >                return f.thenAcceptBoth(g, a);
497 >            }
498 >            public <T,U,V> CompletableFuture<V> thenCombine
499 >                (CompletableFuture<T> f,
500 >                 CompletionStage<? extends U> g,
501 >                 BiFunction<? super T,? super U,? extends V> a) {
502 >                return f.thenCombine(g, a);
503 >            }
504 >            public <T> CompletableFuture<Void> runAfterEither
505 >                (CompletableFuture<T> f,
506 >                 CompletionStage<?> g,
507 >                 java.lang.Runnable a) {
508 >                return f.runAfterEither(g, a);
509 >            }
510 >            public <T> CompletableFuture<Void> acceptEither
511 >                (CompletableFuture<T> f,
512 >                 CompletionStage<? extends T> g,
513 >                 Consumer<? super T> a) {
514 >                return f.acceptEither(g, a);
515 >            }
516 >            public <T,U> CompletableFuture<U> applyToEither
517 >                (CompletableFuture<T> f,
518 >                 CompletionStage<? extends T> g,
519 >                 Function<? super T,U> a) {
520 >                return f.applyToEither(g, a);
521 >            }
522 >        },
523  
524 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
525 <        boolean ran;
526 <        public Integer apply(Integer x, Throwable t) {
527 <            ran = true;
528 <            return (t == null) ? two : three;
529 <        }
524 >        DEFAULT_ASYNC {
525 >            public <T> CompletableFuture<Void> thenRun
526 >                (CompletableFuture<T> f, Runnable a) {
527 >                return f.thenRunAsync(a);
528 >            }
529 >            public <T> CompletableFuture<Void> thenAccept
530 >                (CompletableFuture<T> f, Consumer<? super T> a) {
531 >                return f.thenAcceptAsync(a);
532 >            }
533 >            public <T,U> CompletableFuture<U> thenApply
534 >                (CompletableFuture<T> f, Function<? super T,U> a) {
535 >                return f.thenApplyAsync(a);
536 >            }
537 >            public <T,U> CompletableFuture<U> thenCompose
538 >                (CompletableFuture<T> f,
539 >                 Function<? super T,? extends CompletionStage<U>> a) {
540 >                return f.thenComposeAsync(a);
541 >            }
542 >            public <T,U> CompletableFuture<U> handle
543 >                (CompletableFuture<T> f,
544 >                 BiFunction<? super T,Throwable,? extends U> a) {
545 >                return f.handleAsync(a);
546 >            }
547 >            public <T> CompletableFuture<T> whenComplete
548 >                (CompletableFuture<T> f,
549 >                 BiConsumer<? super T,? super Throwable> a) {
550 >                return f.whenCompleteAsync(a);
551 >            }
552 >            public <T,U> CompletableFuture<Void> runAfterBoth
553 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
554 >                return f.runAfterBothAsync(g, a);
555 >            }
556 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
557 >                (CompletableFuture<T> f,
558 >                 CompletionStage<? extends U> g,
559 >                 BiConsumer<? super T,? super U> a) {
560 >                return f.thenAcceptBothAsync(g, a);
561 >            }
562 >            public <T,U,V> CompletableFuture<V> thenCombine
563 >                (CompletableFuture<T> f,
564 >                 CompletionStage<? extends U> g,
565 >                 BiFunction<? super T,? super U,? extends V> a) {
566 >                return f.thenCombineAsync(g, a);
567 >            }
568 >            public <T> CompletableFuture<Void> runAfterEither
569 >                (CompletableFuture<T> f,
570 >                 CompletionStage<?> g,
571 >                 java.lang.Runnable a) {
572 >                return f.runAfterEitherAsync(g, a);
573 >            }
574 >            public <T> CompletableFuture<Void> acceptEither
575 >                (CompletableFuture<T> f,
576 >                 CompletionStage<? extends T> g,
577 >                 Consumer<? super T> a) {
578 >                return f.acceptEitherAsync(g, a);
579 >            }
580 >            public <T,U> CompletableFuture<U> applyToEither
581 >                (CompletableFuture<T> f,
582 >                 CompletionStage<? extends T> g,
583 >                 Function<? super T,U> a) {
584 >                return f.applyToEitherAsync(g, a);
585 >            }
586 >        },
587 >
588 >        EXECUTOR {
589 >            public <T> CompletableFuture<Void> thenRun
590 >                (CompletableFuture<T> f, Runnable a) {
591 >                return f.thenRunAsync(a, new ThreadExecutor());
592 >            }
593 >            public <T> CompletableFuture<Void> thenAccept
594 >                (CompletableFuture<T> f, Consumer<? super T> a) {
595 >                return f.thenAcceptAsync(a, new ThreadExecutor());
596 >            }
597 >            public <T,U> CompletableFuture<U> thenApply
598 >                (CompletableFuture<T> f, Function<? super T,U> a) {
599 >                return f.thenApplyAsync(a, new ThreadExecutor());
600 >            }
601 >            public <T,U> CompletableFuture<U> thenCompose
602 >                (CompletableFuture<T> f,
603 >                 Function<? super T,? extends CompletionStage<U>> a) {
604 >                return f.thenComposeAsync(a, new ThreadExecutor());
605 >            }
606 >            public <T,U> CompletableFuture<U> handle
607 >                (CompletableFuture<T> f,
608 >                 BiFunction<? super T,Throwable,? extends U> a) {
609 >                return f.handleAsync(a, new ThreadExecutor());
610 >            }
611 >            public <T> CompletableFuture<T> whenComplete
612 >                (CompletableFuture<T> f,
613 >                 BiConsumer<? super T,? super Throwable> a) {
614 >                return f.whenCompleteAsync(a, new ThreadExecutor());
615 >            }
616 >            public <T,U> CompletableFuture<Void> runAfterBoth
617 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
618 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
619 >            }
620 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
621 >                (CompletableFuture<T> f,
622 >                 CompletionStage<? extends U> g,
623 >                 BiConsumer<? super T,? super U> a) {
624 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
625 >            }
626 >            public <T,U,V> CompletableFuture<V> thenCombine
627 >                (CompletableFuture<T> f,
628 >                 CompletionStage<? extends U> g,
629 >                 BiFunction<? super T,? super U,? extends V> a) {
630 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
631 >            }
632 >            public <T> CompletableFuture<Void> runAfterEither
633 >                (CompletableFuture<T> f,
634 >                 CompletionStage<?> g,
635 >                 java.lang.Runnable a) {
636 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
637 >            }
638 >            public <T> CompletableFuture<Void> acceptEither
639 >                (CompletableFuture<T> f,
640 >                 CompletionStage<? extends T> g,
641 >                 Consumer<? super T> a) {
642 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
643 >            }
644 >            public <T,U> CompletableFuture<U> applyToEither
645 >                (CompletableFuture<T> f,
646 >                 CompletionStage<? extends T> g,
647 >                 Function<? super T,U> a) {
648 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
649 >            }
650 >        };
651 >
652 >        public abstract <T> CompletableFuture<Void> thenRun
653 >            (CompletableFuture<T> f, Runnable a);
654 >        public abstract <T> CompletableFuture<Void> thenAccept
655 >            (CompletableFuture<T> f, Consumer<? super T> a);
656 >        public abstract <T,U> CompletableFuture<U> thenApply
657 >            (CompletableFuture<T> f, Function<? super T,U> a);
658 >        public abstract <T,U> CompletableFuture<U> thenCompose
659 >            (CompletableFuture<T> f,
660 >             Function<? super T,? extends CompletionStage<U>> a);
661 >        public abstract <T,U> CompletableFuture<U> handle
662 >            (CompletableFuture<T> f,
663 >             BiFunction<? super T,Throwable,? extends U> a);
664 >        public abstract <T> CompletableFuture<T> whenComplete
665 >            (CompletableFuture<T> f,
666 >             BiConsumer<? super T,? super Throwable> a);
667 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
668 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
669 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
670 >            (CompletableFuture<T> f,
671 >             CompletionStage<? extends U> g,
672 >             BiConsumer<? super T,? super U> a);
673 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
674 >            (CompletableFuture<T> f,
675 >             CompletionStage<? extends U> g,
676 >             BiFunction<? super T,? super U,? extends V> a);
677 >        public abstract <T> CompletableFuture<Void> runAfterEither
678 >            (CompletableFuture<T> f,
679 >             CompletionStage<?> g,
680 >             java.lang.Runnable a);
681 >        public abstract <T> CompletableFuture<Void> acceptEither
682 >            (CompletableFuture<T> f,
683 >             CompletionStage<? extends T> g,
684 >             Consumer<? super T> a);
685 >        public abstract <T,U> CompletableFuture<U> applyToEither
686 >            (CompletableFuture<T> f,
687 >             CompletionStage<? extends T> g,
688 >             Function<? super T,U> a);
689      }
690  
691      /**
692 +     * exceptionally action is not invoked when source completes
693 +     * normally, and source result is propagated
694 +     */
695 +    public void testExceptionally_normalCompletion() {
696 +        for (boolean createIncomplete : new boolean[] { true, false })
697 +        for (Integer v1 : new Integer[] { 1, null })
698 +    {
699 +        final AtomicInteger a = new AtomicInteger(0);
700 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
701 +        if (!createIncomplete) f.complete(v1);
702 +        final CompletableFuture<Integer> g = f.exceptionally
703 +            ((Throwable t) -> {
704 +                // Should not be called
705 +                a.getAndIncrement();
706 +                throw new AssertionError();
707 +            });
708 +        if (createIncomplete) f.complete(v1);
709 +
710 +        checkCompletedNormally(g, v1);
711 +        checkCompletedNormally(f, v1);
712 +        assertEquals(0, a.get());
713 +    }}
714 +
715 +
716 +    /**
717       * exceptionally action completes with function value on source
718 <     * exception; otherwise with source value
718 >     * exception
719       */
720 <    public void testExceptionally() {
721 <        CompletableFuture<Integer> f = new CompletableFuture<>();
722 <        ExceptionToInteger r = new ExceptionToInteger();
723 <        CompletableFuture<Integer> g = f.exceptionally(r);
724 <        f.completeExceptionally(new CFException());
725 <        checkCompletedNormally(g, three);
720 >    public void testExceptionally_exceptionalCompletion() {
721 >        for (boolean createIncomplete : new boolean[] { true, false })
722 >        for (Integer v1 : new Integer[] { 1, null })
723 >    {
724 >        final AtomicInteger a = new AtomicInteger(0);
725 >        final CFException ex = new CFException();
726 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
727 >        if (!createIncomplete) f.completeExceptionally(ex);
728 >        final CompletableFuture<Integer> g = f.exceptionally
729 >            ((Throwable t) -> {
730 >                threadAssertSame(t, ex);
731 >                a.getAndIncrement();
732 >                return v1;
733 >            });
734 >        if (createIncomplete) f.completeExceptionally(ex);
735  
736 <        f = new CompletableFuture<>();
737 <        r = new ExceptionToInteger();
738 <        g = f.exceptionally(r);
739 <        f.complete(one);
740 <        checkCompletedNormally(g, one);
741 <    }
736 >        checkCompletedNormally(g, v1);
737 >        assertEquals(1, a.get());
738 >    }}
739 >
740 >    public void testExceptionally_exceptionalCompletionActionFailed() {
741 >        for (boolean createIncomplete : new boolean[] { true, false })
742 >        for (Integer v1 : new Integer[] { 1, null })
743 >    {
744 >        final AtomicInteger a = new AtomicInteger(0);
745 >        final CFException ex1 = new CFException();
746 >        final CFException ex2 = new CFException();
747 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
748 >        if (!createIncomplete) f.completeExceptionally(ex1);
749 >        final CompletableFuture<Integer> g = f.exceptionally
750 >            ((Throwable t) -> {
751 >                threadAssertSame(t, ex1);
752 >                a.getAndIncrement();
753 >                throw ex2;
754 >            });
755 >        if (createIncomplete) f.completeExceptionally(ex1);
756 >
757 >        checkCompletedWithWrappedCFException(g, ex2);
758 >        assertEquals(1, a.get());
759 >    }}
760  
761      /**
762 <     * handle action completes normally with function value on either
763 <     * normal or exceptional completion of source
762 >     * handle action completes normally with function value on normal
763 >     * completion of source
764       */
765 <    public void testHandle() {
766 <        CompletableFuture<Integer> f, g;
767 <        IntegerHandler r;
765 >    public void testHandle_normalCompletion() {
766 >        for (ExecutionMode m : ExecutionMode.values())
767 >        for (boolean createIncomplete : new boolean[] { true, false })
768 >        for (Integer v1 : new Integer[] { 1, null })
769 >    {
770 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
771 >        final AtomicInteger a = new AtomicInteger(0);
772 >        if (!createIncomplete) f.complete(v1);
773 >        final CompletableFuture<Integer> g = m.handle
774 >            (f,
775 >             (Integer x, Throwable t) -> {
776 >                threadAssertSame(x, v1);
777 >                threadAssertNull(t);
778 >                a.getAndIncrement();
779 >                return inc(v1);
780 >            });
781 >        if (createIncomplete) f.complete(v1);
782  
783 <        f = new CompletableFuture<>();
784 <        f.completeExceptionally(new CFException());
785 <        g = f.handle(r = new IntegerHandler());
786 <        assertTrue(r.ran);
437 <        checkCompletedNormally(g, three);
783 >        checkCompletedNormally(g, inc(v1));
784 >        checkCompletedNormally(f, v1);
785 >        assertEquals(1, a.get());
786 >    }}
787  
788 <        f = new CompletableFuture<>();
789 <        g = f.handle(r = new IntegerHandler());
790 <        assertFalse(r.ran);
791 <        f.completeExceptionally(new CFException());
792 <        checkCompletedNormally(g, three);
793 <        assertTrue(r.ran);
788 >    /**
789 >     * handle action completes normally with function value on
790 >     * exceptional completion of source
791 >     */
792 >    public void testHandle_exceptionalCompletion() {
793 >        for (ExecutionMode m : ExecutionMode.values())
794 >        for (boolean createIncomplete : new boolean[] { true, false })
795 >        for (Integer v1 : new Integer[] { 1, null })
796 >    {
797 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
798 >        final AtomicInteger a = new AtomicInteger(0);
799 >        final CFException ex = new CFException();
800 >        if (!createIncomplete) f.completeExceptionally(ex);
801 >        final CompletableFuture<Integer> g = m.handle
802 >            (f,
803 >             (Integer x, Throwable t) -> {
804 >                threadAssertNull(x);
805 >                threadAssertSame(t, ex);
806 >                a.getAndIncrement();
807 >                return v1;
808 >            });
809 >        if (createIncomplete) f.completeExceptionally(ex);
810  
811 <        f = new CompletableFuture<>();
812 <        f.complete(one);
813 <        g = f.handle(r = new IntegerHandler());
814 <        assertTrue(r.ran);
450 <        checkCompletedNormally(g, two);
811 >        checkCompletedNormally(g, v1);
812 >        checkCompletedWithWrappedCFException(f, ex);
813 >        assertEquals(1, a.get());
814 >    }}
815  
816 <        f = new CompletableFuture<>();
817 <        g = f.handle(r = new IntegerHandler());
818 <        assertFalse(r.ran);
819 <        f.complete(one);
820 <        assertTrue(r.ran);
821 <        checkCompletedNormally(g, two);
822 <    }
816 >    /**
817 >     * handle action completes normally with function value on
818 >     * cancelled source
819 >     */
820 >    public void testHandle_sourceCancelled() {
821 >        for (ExecutionMode m : ExecutionMode.values())
822 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
823 >        for (boolean createIncomplete : new boolean[] { true, false })
824 >        for (Integer v1 : new Integer[] { 1, null })
825 >    {
826 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
827 >        final AtomicInteger a = new AtomicInteger(0);
828 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
829 >        final CompletableFuture<Integer> g = m.handle
830 >            (f,
831 >             (Integer x, Throwable t) -> {
832 >                threadAssertNull(x);
833 >                threadAssertTrue(t instanceof CancellationException);
834 >                a.getAndIncrement();
835 >                return v1;
836 >            });
837 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
838 >
839 >        checkCompletedNormally(g, v1);
840 >        checkCancelled(f);
841 >        assertEquals(1, a.get());
842 >    }}
843 >
844 >    /**
845 >     * handle result completes exceptionally if action does
846 >     */
847 >    public void testHandle_sourceFailedActionFailed() {
848 >        for (ExecutionMode m : ExecutionMode.values())
849 >        for (boolean createIncomplete : new boolean[] { true, false })
850 >    {
851 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
852 >        final AtomicInteger a = new AtomicInteger(0);
853 >        final CFException ex1 = new CFException();
854 >        final CFException ex2 = new CFException();
855 >        if (!createIncomplete) f.completeExceptionally(ex1);
856 >        final CompletableFuture<Integer> g = m.handle
857 >            (f,
858 >             (Integer x, Throwable t) -> {
859 >                threadAssertNull(x);
860 >                threadAssertSame(ex1, t);
861 >                a.getAndIncrement();
862 >                throw ex2;
863 >            });
864 >        if (createIncomplete) f.completeExceptionally(ex1);
865 >
866 >        checkCompletedWithWrappedCFException(g, ex2);
867 >        checkCompletedWithWrappedCFException(f, ex1);
868 >        assertEquals(1, a.get());
869 >    }}
870 >
871 >    public void testHandle_sourceCompletedNormallyActionFailed() {
872 >        for (ExecutionMode m : ExecutionMode.values())
873 >        for (boolean createIncomplete : new boolean[] { true, false })
874 >        for (Integer v1 : new Integer[] { 1, null })
875 >    {
876 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
877 >        final AtomicInteger a = new AtomicInteger(0);
878 >        final CFException ex = new CFException();
879 >        if (!createIncomplete) f.complete(v1);
880 >        final CompletableFuture<Integer> g = m.handle
881 >            (f,
882 >             (Integer x, Throwable t) -> {
883 >                threadAssertSame(x, v1);
884 >                threadAssertNull(t);
885 >                a.getAndIncrement();
886 >                throw ex;
887 >            });
888 >        if (createIncomplete) f.complete(v1);
889 >
890 >        checkCompletedWithWrappedCFException(g, ex);
891 >        checkCompletedNormally(f, v1);
892 >        assertEquals(1, a.get());
893 >    }}
894  
895      /**
896       * runAsync completes after running Runnable
# Line 464 | Line 899 | public class CompletableFutureTest exten
899          Noop r = new Noop();
900          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
901          assertNull(f.join());
902 <        assertTrue(r.ran);
902 >        assertEquals(1, r.invocationCount);
903          checkCompletedNormally(f, null);
904      }
905  
# Line 476 | Line 911 | public class CompletableFutureTest exten
911          ThreadExecutor exec = new ThreadExecutor();
912          CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
913          assertNull(f.join());
914 <        assertTrue(r.ran);
914 >        assertEquals(1, r.invocationCount);
915          checkCompletedNormally(f, null);
916          assertEquals(1, exec.count.get());
917      }
# Line 488 | Line 923 | public class CompletableFutureTest exten
923          FailingNoop r = new FailingNoop();
924          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
925          checkCompletedWithWrappedCFException(f);
926 <        assertTrue(r.ran);
926 >        assertEquals(1, r.invocationCount);
927      }
928  
929      /**
# Line 518 | Line 953 | public class CompletableFutureTest exten
953          FailingSupplier r = new FailingSupplier();
954          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
955          checkCompletedWithWrappedCFException(f);
956 <        assertTrue(r.ran);
956 >        assertEquals(1, r.invocationCount);
957      }
958  
959      // seq completion methods
# Line 535 | Line 970 | public class CompletableFutureTest exten
970          g = f.thenRun(r = new Noop());
971          f.complete(null);
972          checkCompletedNormally(g, null);
973 <        assertTrue(r.ran);
973 >        assertEquals(1, r.invocationCount);
974  
975          f = new CompletableFuture<>();
976          f.complete(null);
977          g = f.thenRun(r = new Noop());
978          checkCompletedNormally(g, null);
979 <        assertTrue(r.ran);
979 >        assertEquals(1, r.invocationCount);
980      }
981  
982      /**
# Line 557 | Line 992 | public class CompletableFutureTest exten
992          g = f.thenRun(r = new Noop());
993          f.completeExceptionally(new CFException());
994          checkCompletedWithWrappedCFException(g);
995 <        assertFalse(r.ran);
995 >        assertEquals(0, r.invocationCount);
996  
997          f = new CompletableFuture<>();
998          f.completeExceptionally(new CFException());
999          g = f.thenRun(r = new Noop());
1000          checkCompletedWithWrappedCFException(g);
1001 <        assertFalse(r.ran);
1001 >        assertEquals(0, r.invocationCount);
1002      }
1003  
1004      /**
# Line 654 | Line 1089 | public class CompletableFutureTest exten
1089          CompletableFuture<Void> g = f.thenAccept(r);
1090          f.complete(one);
1091          checkCompletedNormally(g, null);
1092 <        assertEquals(r.value, 2);
1092 >        assertEquals(r.value, (Integer) 2);
1093      }
1094  
1095      /**
# Line 678 | Line 1113 | public class CompletableFutureTest exten
1113          CompletableFuture<Void> g = f.thenAccept(r);
1114          f.complete(one);
1115          checkCompletedWithWrappedCFException(g);
1116 <        assertTrue(r.ran);
1116 >        assertEquals(1, r.invocationCount);
1117      }
1118  
1119      /**
# Line 696 | Line 1131 | public class CompletableFutureTest exten
1131       * thenCombine result completes normally after normal completion
1132       * of sources
1133       */
1134 <    public void testThenCombine() {
1135 <        CompletableFuture<Integer> f, g, h;
1136 <
1137 <        f = new CompletableFuture<>();
1138 <        g = new CompletableFuture<>();
1139 <        h = f.thenCombine(g, subtract);
1140 <        f.complete(3);
1141 <        checkIncomplete(h);
1142 <        g.complete(1);
1143 <        checkCompletedNormally(h, 2);
1144 <
1145 <        f = new CompletableFuture<>();
1146 <        g = new CompletableFuture<>();
1147 <        h = f.thenCombine(g, subtract);
1148 <        g.complete(1);
1149 <        checkIncomplete(h);
1150 <        f.complete(3);
1151 <        checkCompletedNormally(h, 2);
1134 >    public void testThenCombine_normalCompletion1() {
1135 >        for (boolean createIncomplete : new boolean[] { true, false })
1136 >        for (boolean fFirst : new boolean[] { true, false })
1137 >        for (ExecutionMode m : ExecutionMode.values())
1138 >        for (Integer v1 : new Integer[] { 1, null })
1139 >        for (Integer v2 : new Integer[] { 2, null })
1140 >    {
1141 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1142 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1143 >        final SubtractFunction r = new SubtractFunction();
1144 >        CompletableFuture<Integer> h = null;
1145 >        if (createIncomplete) h = m.thenCombine(f, g, r);
1146 >
1147 >        if (fFirst)
1148 >            f.complete(v1);
1149 >        else
1150 >            g.complete(v2);
1151 >        if (createIncomplete) checkIncomplete(h);
1152 >        assertEquals(0, r.invocationCount);
1153 >        if (!fFirst)
1154 >            f.complete(v1);
1155 >        else
1156 >            g.complete(v2);
1157 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
1158  
1159 <        f = new CompletableFuture<>();
1160 <        g = new CompletableFuture<>();
1161 <        g.complete(1);
1162 <        f.complete(3);
1163 <        h = f.thenCombine(g, subtract);
723 <        checkCompletedNormally(h, 2);
724 <    }
1159 >        checkCompletedNormally(h, subtract(v1, v2));
1160 >        checkCompletedNormally(f, v1);
1161 >        checkCompletedNormally(g, v2);
1162 >        assertEquals(1, r.invocationCount);
1163 >    }}
1164  
1165      /**
1166       * thenCombine result completes exceptionally after exceptional
1167       * completion of either source
1168       */
1169 <    public void testThenCombine2() {
1170 <        CompletableFuture<Integer> f, g, h;
1169 >    public void testThenCombine_exceptionalCompletion1() {
1170 >        for (ExecutionMode m : ExecutionMode.values())
1171 >        for (Integer v1 : new Integer[] { 1, null })
1172 >    {
1173 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1174 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1175 >        final SubtractFunction r = new SubtractFunction();
1176 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1177 >        final CFException ex = new CFException();
1178  
1179 <        f = new CompletableFuture<>();
734 <        g = new CompletableFuture<>();
735 <        h = f.thenCombine(g, subtract);
736 <        f.completeExceptionally(new CFException());
1179 >        f.completeExceptionally(ex);
1180          checkIncomplete(h);
1181 <        g.complete(1);
739 <        checkCompletedWithWrappedCFException(h);
1181 >        g.complete(v1);
1182  
1183 <        f = new CompletableFuture<>();
1184 <        g = new CompletableFuture<>();
1185 <        h = f.thenCombine(g, subtract);
1186 <        g.completeExceptionally(new CFException());
1183 >        checkCompletedWithWrappedCFException(h, ex);
1184 >        checkCompletedWithWrappedCFException(f, ex);
1185 >        assertEquals(0, r.invocationCount);
1186 >        checkCompletedNormally(g, v1);
1187 >    }}
1188 >
1189 >    public void testThenCombine_exceptionalCompletion2() {
1190 >        for (ExecutionMode m : ExecutionMode.values())
1191 >        for (Integer v1 : new Integer[] { 1, null })
1192 >    {
1193 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1194 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1195 >        final SubtractFunction r = new SubtractFunction();
1196 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1197 >        final CFException ex = new CFException();
1198 >
1199 >        g.completeExceptionally(ex);
1200          checkIncomplete(h);
1201 <        f.complete(3);
747 <        checkCompletedWithWrappedCFException(h);
1201 >        f.complete(v1);
1202  
1203 <        f = new CompletableFuture<>();
1204 <        g = new CompletableFuture<>();
1205 <        f.complete(3);
1206 <        g.completeExceptionally(new CFException());
1207 <        h = f.thenCombine(g, subtract);
754 <        checkCompletedWithWrappedCFException(h);
1203 >        checkCompletedWithWrappedCFException(h, ex);
1204 >        checkCompletedWithWrappedCFException(g, ex);
1205 >        assertEquals(0, r.invocationCount);
1206 >        checkCompletedNormally(f, v1);
1207 >    }}
1208  
1209 <        f = new CompletableFuture<>();
1210 <        g = new CompletableFuture<>();
1211 <        f.completeExceptionally(new CFException());
1212 <        g.complete(3);
1213 <        h = f.thenCombine(g, subtract);
1214 <        checkCompletedWithWrappedCFException(h);
1215 <    }
1209 >    public void testThenCombine_exceptionalCompletion3() {
1210 >        for (ExecutionMode m : ExecutionMode.values())
1211 >        for (Integer v1 : new Integer[] { 1, null })
1212 >    {
1213 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1214 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1215 >        final SubtractFunction r = new SubtractFunction();
1216 >        final CFException ex = new CFException();
1217 >
1218 >        g.completeExceptionally(ex);
1219 >        f.complete(v1);
1220 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1221 >
1222 >        checkCompletedWithWrappedCFException(h, ex);
1223 >        checkCompletedWithWrappedCFException(g, ex);
1224 >        assertEquals(0, r.invocationCount);
1225 >        checkCompletedNormally(f, v1);
1226 >    }}
1227 >
1228 >    public void testThenCombine_exceptionalCompletion4() {
1229 >        for (ExecutionMode m : ExecutionMode.values())
1230 >        for (Integer v1 : new Integer[] { 1, null })
1231 >    {
1232 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1233 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1234 >        final SubtractFunction r = new SubtractFunction();
1235 >        final CFException ex = new CFException();
1236 >
1237 >        f.completeExceptionally(ex);
1238 >        g.complete(v1);
1239 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1240 >
1241 >        checkCompletedWithWrappedCFException(h, ex);
1242 >        checkCompletedWithWrappedCFException(f, ex);
1243 >        assertEquals(0, r.invocationCount);
1244 >        checkCompletedNormally(g, v1);
1245 >    }}
1246  
1247      /**
1248       * thenCombine result completes exceptionally if action does
1249       */
1250 <    public void testThenCombine3() {
1251 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1252 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1253 <        FailingBiFunction r = new FailingBiFunction();
1254 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1255 <        f.complete(one);
1256 <        checkIncomplete(g);
1257 <        assertFalse(r.ran);
1258 <        f2.complete(two);
1259 <        checkCompletedWithWrappedCFException(g);
1260 <        assertTrue(r.ran);
1261 <    }
1250 >    public void testThenCombine_actionFailed1() {
1251 >        for (ExecutionMode m : ExecutionMode.values())
1252 >        for (Integer v1 : new Integer[] { 1, null })
1253 >        for (Integer v2 : new Integer[] { 2, null })
1254 >    {
1255 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1256 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1257 >        final FailingBiFunction r = new FailingBiFunction();
1258 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1259 >
1260 >        f.complete(v1);
1261 >        checkIncomplete(h);
1262 >        g.complete(v2);
1263 >
1264 >        checkCompletedWithWrappedCFException(h);
1265 >        checkCompletedNormally(f, v1);
1266 >        checkCompletedNormally(g, v2);
1267 >    }}
1268 >
1269 >    public void testThenCombine_actionFailed2() {
1270 >        for (ExecutionMode m : ExecutionMode.values())
1271 >        for (Integer v1 : new Integer[] { 1, null })
1272 >        for (Integer v2 : new Integer[] { 2, null })
1273 >    {
1274 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1276 >        final FailingBiFunction r = new FailingBiFunction();
1277 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1278 >
1279 >        g.complete(v2);
1280 >        checkIncomplete(h);
1281 >        f.complete(v1);
1282 >
1283 >        checkCompletedWithWrappedCFException(h);
1284 >        checkCompletedNormally(f, v1);
1285 >        checkCompletedNormally(g, v2);
1286 >    }}
1287  
1288      /**
1289       * thenCombine result completes exceptionally if either source cancelled
1290       */
1291 <    public void testThenCombine4() {
1292 <        CompletableFuture<Integer> f, g, h;
1291 >    public void testThenCombine_sourceCancelled1() {
1292 >        for (ExecutionMode m : ExecutionMode.values())
1293 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1294 >        for (Integer v1 : new Integer[] { 1, null })
1295 >    {
1296 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1298 >        final SubtractFunction r = new SubtractFunction();
1299 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1300  
1301 <        f = new CompletableFuture<>();
787 <        g = new CompletableFuture<>();
788 <        h = f.thenCombine(g, subtract);
789 <        assertTrue(f.cancel(true));
1301 >        assertTrue(f.cancel(mayInterruptIfRunning));
1302          checkIncomplete(h);
1303 <        g.complete(1);
1303 >        g.complete(v1);
1304 >
1305          checkCompletedWithWrappedCancellationException(h);
1306 +        checkCancelled(f);
1307 +        assertEquals(0, r.invocationCount);
1308 +        checkCompletedNormally(g, v1);
1309 +    }}
1310  
1311 <        f = new CompletableFuture<>();
1312 <        g = new CompletableFuture<>();
1313 <        h = f.thenCombine(g, subtract);
1314 <        assertTrue(g.cancel(true));
1311 >    public void testThenCombine_sourceCancelled2() {
1312 >        for (ExecutionMode m : ExecutionMode.values())
1313 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1314 >        for (Integer v1 : new Integer[] { 1, null })
1315 >    {
1316 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1317 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1318 >        final SubtractFunction r = new SubtractFunction();
1319 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1320 >
1321 >        assertTrue(g.cancel(mayInterruptIfRunning));
1322          checkIncomplete(h);
1323 <        f.complete(3);
1323 >        f.complete(v1);
1324 >
1325          checkCompletedWithWrappedCancellationException(h);
1326 +        checkCancelled(g);
1327 +        assertEquals(0, r.invocationCount);
1328 +        checkCompletedNormally(f, v1);
1329 +    }}
1330 +
1331 +    public void testThenCombine_sourceCancelled3() {
1332 +        for (ExecutionMode m : ExecutionMode.values())
1333 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1334 +        for (Integer v1 : new Integer[] { 1, null })
1335 +    {
1336 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1337 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1338 +        final SubtractFunction r = new SubtractFunction();
1339 +
1340 +        assertTrue(g.cancel(mayInterruptIfRunning));
1341 +        f.complete(v1);
1342 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1343  
802        f = new CompletableFuture<>();
803        g = new CompletableFuture<>();
804        assertTrue(f.cancel(true));
805        assertTrue(g.cancel(true));
806        h = f.thenCombine(g, subtract);
1344          checkCompletedWithWrappedCancellationException(h);
1345 <    }
1345 >        checkCancelled(g);
1346 >        assertEquals(0, r.invocationCount);
1347 >        checkCompletedNormally(f, v1);
1348 >    }}
1349 >
1350 >    public void testThenCombine_sourceCancelled4() {
1351 >        for (ExecutionMode m : ExecutionMode.values())
1352 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1353 >        for (Integer v1 : new Integer[] { 1, null })
1354 >    {
1355 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1356 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1357 >        final SubtractFunction r = new SubtractFunction();
1358 >
1359 >        assertTrue(f.cancel(mayInterruptIfRunning));
1360 >        g.complete(v1);
1361 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1362 >
1363 >        checkCompletedWithWrappedCancellationException(h);
1364 >        checkCancelled(f);
1365 >        assertEquals(0, r.invocationCount);
1366 >        checkCompletedNormally(g, v1);
1367 >    }}
1368  
1369      /**
1370       * thenAcceptBoth result completes normally after normal
1371       * completion of sources
1372       */
1373 <    public void testThenAcceptBoth() {
1374 <        CompletableFuture<Integer> f, g;
1375 <        CompletableFuture<Void> h;
1376 <        SubtractAction r;
1373 >    public void testThenAcceptBoth_normalCompletion1() {
1374 >        for (ExecutionMode m : ExecutionMode.values())
1375 >        for (Integer v1 : new Integer[] { 1, null })
1376 >        for (Integer v2 : new Integer[] { 2, null })
1377 >    {
1378 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1379 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1380 >        final SubtractAction r = new SubtractAction();
1381 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1382  
1383 <        f = new CompletableFuture<>();
820 <        g = new CompletableFuture<>();
821 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
822 <        f.complete(3);
1383 >        f.complete(v1);
1384          checkIncomplete(h);
1385 <        g.complete(1);
1385 >        assertEquals(0, r.invocationCount);
1386 >        g.complete(v2);
1387 >
1388          checkCompletedNormally(h, null);
1389 <        assertEquals(r.value, 2);
1389 >        assertEquals(subtract(v1, v2), r.value);
1390 >        checkCompletedNormally(f, v1);
1391 >        checkCompletedNormally(g, v2);
1392 >    }}
1393  
1394 <        f = new CompletableFuture<>();
1395 <        g = new CompletableFuture<>();
1396 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1397 <        g.complete(1);
1394 >    public void testThenAcceptBoth_normalCompletion2() {
1395 >        for (ExecutionMode m : ExecutionMode.values())
1396 >        for (Integer v1 : new Integer[] { 1, null })
1397 >        for (Integer v2 : new Integer[] { 2, null })
1398 >    {
1399 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1400 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1401 >        final SubtractAction r = new SubtractAction();
1402 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1403 >
1404 >        g.complete(v2);
1405          checkIncomplete(h);
1406 <        f.complete(3);
1406 >        assertEquals(0, r.invocationCount);
1407 >        f.complete(v1);
1408 >
1409          checkCompletedNormally(h, null);
1410 <        assertEquals(r.value, 2);
1410 >        assertEquals(subtract(v1, v2), r.value);
1411 >        checkCompletedNormally(f, v1);
1412 >        checkCompletedNormally(g, v2);
1413 >    }}
1414 >
1415 >    public void testThenAcceptBoth_normalCompletion3() {
1416 >        for (ExecutionMode m : ExecutionMode.values())
1417 >        for (Integer v1 : new Integer[] { 1, null })
1418 >        for (Integer v2 : new Integer[] { 2, null })
1419 >    {
1420 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1421 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1422 >        final SubtractAction r = new SubtractAction();
1423 >
1424 >        g.complete(v2);
1425 >        f.complete(v1);
1426 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1427  
837        f = new CompletableFuture<>();
838        g = new CompletableFuture<>();
839        g.complete(1);
840        f.complete(3);
841        h = f.thenAcceptBoth(g, r = new SubtractAction());
1428          checkCompletedNormally(h, null);
1429 <        assertEquals(r.value, 2);
1430 <    }
1429 >        assertEquals(subtract(v1, v2), r.value);
1430 >        checkCompletedNormally(f, v1);
1431 >        checkCompletedNormally(g, v2);
1432 >    }}
1433 >
1434 >    public void testThenAcceptBoth_normalCompletion4() {
1435 >        for (ExecutionMode m : ExecutionMode.values())
1436 >        for (Integer v1 : new Integer[] { 1, null })
1437 >        for (Integer v2 : new Integer[] { 2, null })
1438 >    {
1439 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1440 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1441 >        final SubtractAction r = new SubtractAction();
1442 >
1443 >        f.complete(v1);
1444 >        g.complete(v2);
1445 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1446 >
1447 >        checkCompletedNormally(h, null);
1448 >        assertEquals(subtract(v1, v2), r.value);
1449 >        checkCompletedNormally(f, v1);
1450 >        checkCompletedNormally(g, v2);
1451 >    }}
1452  
1453      /**
1454       * thenAcceptBoth result completes exceptionally after exceptional
1455       * completion of either source
1456       */
1457 <    public void testThenAcceptBoth2() {
1458 <        CompletableFuture<Integer> f, g;
1459 <        CompletableFuture<Void> h;
1460 <        SubtractAction r;
1457 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1458 >        for (ExecutionMode m : ExecutionMode.values())
1459 >        for (Integer v1 : new Integer[] { 1, null })
1460 >    {
1461 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1462 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1463 >        final SubtractAction r = new SubtractAction();
1464 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1465 >        final CFException ex = new CFException();
1466  
1467 <        f = new CompletableFuture<>();
856 <        g = new CompletableFuture<>();
857 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
858 <        f.completeExceptionally(new CFException());
1467 >        f.completeExceptionally(ex);
1468          checkIncomplete(h);
1469 <        g.complete(1);
861 <        checkCompletedWithWrappedCFException(h);
1469 >        g.complete(v1);
1470  
1471 <        f = new CompletableFuture<>();
1472 <        g = new CompletableFuture<>();
1473 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1474 <        g.completeExceptionally(new CFException());
1471 >        checkCompletedWithWrappedCFException(h, ex);
1472 >        checkCompletedWithWrappedCFException(f, ex);
1473 >        assertEquals(0, r.invocationCount);
1474 >        checkCompletedNormally(g, v1);
1475 >    }}
1476 >
1477 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1478 >        for (ExecutionMode m : ExecutionMode.values())
1479 >        for (Integer v1 : new Integer[] { 1, null })
1480 >    {
1481 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1482 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1483 >        final SubtractAction r = new SubtractAction();
1484 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1485 >        final CFException ex = new CFException();
1486 >
1487 >        g.completeExceptionally(ex);
1488          checkIncomplete(h);
1489 <        f.complete(3);
869 <        checkCompletedWithWrappedCFException(h);
1489 >        f.complete(v1);
1490  
1491 <        f = new CompletableFuture<>();
1492 <        g = new CompletableFuture<>();
1493 <        f.complete(3);
1494 <        g.completeExceptionally(new CFException());
1495 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
876 <        checkCompletedWithWrappedCFException(h);
1491 >        checkCompletedWithWrappedCFException(h, ex);
1492 >        checkCompletedWithWrappedCFException(g, ex);
1493 >        assertEquals(0, r.invocationCount);
1494 >        checkCompletedNormally(f, v1);
1495 >    }}
1496  
1497 <        f = new CompletableFuture<>();
1498 <        g = new CompletableFuture<>();
1499 <        f.completeExceptionally(new CFException());
1500 <        g.complete(3);
1501 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1502 <        checkCompletedWithWrappedCFException(h);
1503 <    }
1497 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1498 >        for (ExecutionMode m : ExecutionMode.values())
1499 >        for (Integer v1 : new Integer[] { 1, null })
1500 >    {
1501 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1502 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1503 >        final SubtractAction r = new SubtractAction();
1504 >        final CFException ex = new CFException();
1505 >
1506 >        g.completeExceptionally(ex);
1507 >        f.complete(v1);
1508 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1509 >
1510 >        checkCompletedWithWrappedCFException(h, ex);
1511 >        checkCompletedWithWrappedCFException(g, ex);
1512 >        assertEquals(0, r.invocationCount);
1513 >        checkCompletedNormally(f, v1);
1514 >    }}
1515 >
1516 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1517 >        for (ExecutionMode m : ExecutionMode.values())
1518 >        for (Integer v1 : new Integer[] { 1, null })
1519 >    {
1520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1521 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1522 >        final SubtractAction r = new SubtractAction();
1523 >        final CFException ex = new CFException();
1524 >
1525 >        f.completeExceptionally(ex);
1526 >        g.complete(v1);
1527 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1528 >
1529 >        checkCompletedWithWrappedCFException(h, ex);
1530 >        checkCompletedWithWrappedCFException(f, ex);
1531 >        assertEquals(0, r.invocationCount);
1532 >        checkCompletedNormally(g, v1);
1533 >    }}
1534  
1535      /**
1536       * thenAcceptBoth result completes exceptionally if action does
1537       */
1538 <    public void testThenAcceptBoth3() {
1539 <        CompletableFuture<Integer> f, g;
1540 <        CompletableFuture<Void> h;
1541 <        FailingBiConsumer r;
1538 >    public void testThenAcceptBoth_actionFailed1() {
1539 >        for (ExecutionMode m : ExecutionMode.values())
1540 >        for (Integer v1 : new Integer[] { 1, null })
1541 >        for (Integer v2 : new Integer[] { 2, null })
1542 >    {
1543 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1544 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1545 >        final FailingBiConsumer r = new FailingBiConsumer();
1546 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1547  
1548 <        f = new CompletableFuture<>();
895 <        g = new CompletableFuture<>();
896 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
897 <        f.complete(3);
1548 >        f.complete(v1);
1549          checkIncomplete(h);
1550 <        g.complete(1);
1550 >        g.complete(v2);
1551 >
1552          checkCompletedWithWrappedCFException(h);
1553 +        checkCompletedNormally(f, v1);
1554 +        checkCompletedNormally(g, v2);
1555 +    }}
1556 +
1557 +    public void testThenAcceptBoth_actionFailed2() {
1558 +        for (ExecutionMode m : ExecutionMode.values())
1559 +        for (Integer v1 : new Integer[] { 1, null })
1560 +        for (Integer v2 : new Integer[] { 2, null })
1561 +    {
1562 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1563 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1564 +        final FailingBiConsumer r = new FailingBiConsumer();
1565 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1566 +
1567 +        g.complete(v2);
1568 +        checkIncomplete(h);
1569 +        f.complete(v1);
1570  
902        f = new CompletableFuture<>();
903        g = new CompletableFuture<>();
904        f.complete(3);
905        g.complete(1);
906        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1571          checkCompletedWithWrappedCFException(h);
1572 <    }
1572 >        checkCompletedNormally(f, v1);
1573 >        checkCompletedNormally(g, v2);
1574 >    }}
1575  
1576      /**
1577       * thenAcceptBoth result completes exceptionally if either source cancelled
1578       */
1579 <    public void testThenAcceptBoth4() {
1580 <        CompletableFuture<Integer> f, g;
1581 <        CompletableFuture<Void> h;
1582 <        SubtractAction r;
1579 >    public void testThenAcceptBoth_sourceCancelled1() {
1580 >        for (ExecutionMode m : ExecutionMode.values())
1581 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1582 >        for (Integer v1 : new Integer[] { 1, null })
1583 >    {
1584 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1585 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1586 >        final SubtractAction r = new SubtractAction();
1587 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1588  
1589 <        f = new CompletableFuture<>();
919 <        g = new CompletableFuture<>();
920 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
921 <        assertTrue(f.cancel(true));
1589 >        assertTrue(f.cancel(mayInterruptIfRunning));
1590          checkIncomplete(h);
1591 <        g.complete(1);
1591 >        g.complete(v1);
1592 >
1593          checkCompletedWithWrappedCancellationException(h);
1594 +        checkCancelled(f);
1595 +        assertEquals(0, r.invocationCount);
1596 +        checkCompletedNormally(g, v1);
1597 +    }}
1598  
1599 <        f = new CompletableFuture<>();
1600 <        g = new CompletableFuture<>();
1601 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1602 <        assertTrue(g.cancel(true));
1599 >    public void testThenAcceptBoth_sourceCancelled2() {
1600 >        for (ExecutionMode m : ExecutionMode.values())
1601 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1602 >        for (Integer v1 : new Integer[] { 1, null })
1603 >    {
1604 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1605 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1606 >        final SubtractAction r = new SubtractAction();
1607 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1608 >
1609 >        assertTrue(g.cancel(mayInterruptIfRunning));
1610          checkIncomplete(h);
1611 <        f.complete(3);
932 <        checkCompletedWithWrappedCancellationException(h);
1611 >        f.complete(v1);
1612  
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());
1613          checkCompletedWithWrappedCancellationException(h);
1614 +        checkCancelled(g);
1615 +        assertEquals(0, r.invocationCount);
1616 +        checkCompletedNormally(f, v1);
1617 +    }}
1618  
1619 <        f = new CompletableFuture<>();
1620 <        g = new CompletableFuture<>();
1621 <        assertTrue(f.cancel(true));
1622 <        g.complete(3);
1623 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1624 <        checkCompletedWithWrappedCancellationException(h);
1625 <    }
1619 >    public void testThenAcceptBoth_sourceCancelled3() {
1620 >        for (ExecutionMode m : ExecutionMode.values())
1621 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1622 >        for (Integer v1 : new Integer[] { 1, null })
1623 >    {
1624 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1625 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1626 >        final SubtractAction r = new SubtractAction();
1627  
1628 <    /**
1629 <     * Permits the testing of parallel code for the 3 different
1630 <     * execution modes without repeating all the testing code.
952 <     */
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 <        },
1628 >        assertTrue(g.cancel(mayInterruptIfRunning));
1629 >        f.complete(v1);
1630 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1631  
1632 <        DEFAULT_ASYNC {
1633 <            public <T,U> CompletableFuture<Void> runAfterBoth
1634 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
1635 <                return f.runAfterBothAsync(g, r);
1636 <            }
966 <        },
1632 >        checkCompletedWithWrappedCancellationException(h);
1633 >        checkCancelled(g);
1634 >        assertEquals(0, r.invocationCount);
1635 >        checkCompletedNormally(f, v1);
1636 >    }}
1637  
1638 <        EXECUTOR {
1639 <            public <T,U> CompletableFuture<Void> runAfterBoth
1640 <                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r) {
1641 <                return f.runAfterBothAsync(g, r, new ThreadExecutor());
1642 <            }
1643 <        };
1638 >    public void testThenAcceptBoth_sourceCancelled4() {
1639 >        for (ExecutionMode m : ExecutionMode.values())
1640 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1641 >        for (Integer v1 : new Integer[] { 1, null })
1642 >    {
1643 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1644 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1645 >        final SubtractAction r = new SubtractAction();
1646  
1647 <        public abstract <T,U> CompletableFuture<Void> runAfterBoth
1648 <            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable r);
1649 <    }
1647 >        assertTrue(f.cancel(mayInterruptIfRunning));
1648 >        g.complete(v1);
1649 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1650 >
1651 >        checkCompletedWithWrappedCancellationException(h);
1652 >        checkCancelled(f);
1653 >        assertEquals(0, r.invocationCount);
1654 >        checkCompletedNormally(g, v1);
1655 >    }}
1656  
1657      /**
1658       * runAfterBoth result completes normally after normal
# Line 983 | Line 1661 | public class CompletableFutureTest exten
1661      public void testRunAfterBoth_normalCompletion1() {
1662          for (ExecutionMode m : ExecutionMode.values())
1663          for (Integer v1 : new Integer[] { 1, null })
1664 <        for (Integer v2 : new Integer[] { 2, null }) {
1665 <
1664 >        for (Integer v2 : new Integer[] { 2, null })
1665 >    {
1666          final CompletableFuture<Integer> f = new CompletableFuture<>();
1667          final CompletableFuture<Integer> g = new CompletableFuture<>();
1668          final Noop r = new Noop();
# Line 992 | Line 1670 | public class CompletableFutureTest exten
1670  
1671          f.complete(v1);
1672          checkIncomplete(h);
1673 <        assertFalse(r.ran);
1673 >        assertEquals(0, r.invocationCount);
1674          g.complete(v2);
1675  
1676          checkCompletedNormally(h, null);
1677 <        assertTrue(r.ran);
1677 >        assertEquals(1, r.invocationCount);
1678          checkCompletedNormally(f, v1);
1679          checkCompletedNormally(g, v2);
1680 <        }
1003 <    }
1680 >    }}
1681  
1682      public void testRunAfterBoth_normalCompletion2() {
1683          for (ExecutionMode m : ExecutionMode.values())
1684          for (Integer v1 : new Integer[] { 1, null })
1685 <        for (Integer v2 : new Integer[] { 2, null }) {
1686 <
1685 >        for (Integer v2 : new Integer[] { 2, null })
1686 >    {
1687          final CompletableFuture<Integer> f = new CompletableFuture<>();
1688          final CompletableFuture<Integer> g = new CompletableFuture<>();
1689          final Noop r = new Noop();
# Line 1014 | Line 1691 | public class CompletableFutureTest exten
1691  
1692          g.complete(v2);
1693          checkIncomplete(h);
1694 <        assertFalse(r.ran);
1694 >        assertEquals(0, r.invocationCount);
1695          f.complete(v1);
1696  
1697          checkCompletedNormally(h, null);
1698 <        assertTrue(r.ran);
1698 >        assertEquals(1, r.invocationCount);
1699          checkCompletedNormally(f, v1);
1700          checkCompletedNormally(g, v2);
1701 <        }
1025 <    }
1701 >    }}
1702  
1703      public void testRunAfterBoth_normalCompletion3() {
1704          for (ExecutionMode m : ExecutionMode.values())
1705          for (Integer v1 : new Integer[] { 1, null })
1706 <        for (Integer v2 : new Integer[] { 2, null }) {
1707 <
1706 >        for (Integer v2 : new Integer[] { 2, null })
1707 >    {
1708          final CompletableFuture<Integer> f = new CompletableFuture<>();
1709          final CompletableFuture<Integer> g = new CompletableFuture<>();
1710          final Noop r = new Noop();
# Line 1038 | Line 1714 | public class CompletableFutureTest exten
1714          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1715  
1716          checkCompletedNormally(h, null);
1717 <        assertTrue(r.ran);
1717 >        assertEquals(1, r.invocationCount);
1718          checkCompletedNormally(f, v1);
1719          checkCompletedNormally(g, v2);
1720 <        }
1045 <    }
1720 >    }}
1721  
1722      public void testRunAfterBoth_normalCompletion4() {
1723          for (ExecutionMode m : ExecutionMode.values())
1724          for (Integer v1 : new Integer[] { 1, null })
1725 <        for (Integer v2 : new Integer[] { 2, null }) {
1726 <
1725 >        for (Integer v2 : new Integer[] { 2, null })
1726 >    {
1727          final CompletableFuture<Integer> f = new CompletableFuture<>();
1728          final CompletableFuture<Integer> g = new CompletableFuture<>();
1729          final Noop r = new Noop();
# Line 1058 | Line 1733 | public class CompletableFutureTest exten
1733          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1734  
1735          checkCompletedNormally(h, null);
1736 <        assertTrue(r.ran);
1736 >        assertEquals(1, r.invocationCount);
1737          checkCompletedNormally(f, v1);
1738          checkCompletedNormally(g, v2);
1739 <        }
1065 <    }
1739 >    }}
1740  
1741      /**
1742       * runAfterBoth result completes exceptionally after exceptional
# Line 1070 | Line 1744 | public class CompletableFutureTest exten
1744       */
1745      public void testRunAfterBoth_exceptionalCompletion1() {
1746          for (ExecutionMode m : ExecutionMode.values())
1747 <        for (Integer v1 : new Integer[] { 1, null }) {
1748 <
1747 >        for (Integer v1 : new Integer[] { 1, null })
1748 >    {
1749          final CompletableFuture<Integer> f = new CompletableFuture<>();
1750          final CompletableFuture<Integer> g = new CompletableFuture<>();
1751          final Noop r = new Noop();
# Line 1084 | Line 1758 | public class CompletableFutureTest exten
1758  
1759          checkCompletedWithWrappedCFException(h, ex);
1760          checkCompletedWithWrappedCFException(f, ex);
1761 <        assertFalse(r.ran);
1761 >        assertEquals(0, r.invocationCount);
1762          checkCompletedNormally(g, v1);
1763 <        }
1090 <    }
1763 >    }}
1764  
1765      public void testRunAfterBoth_exceptionalCompletion2() {
1766          for (ExecutionMode m : ExecutionMode.values())
1767 <        for (Integer v1 : new Integer[] { 1, null }) {
1768 <
1767 >        for (Integer v1 : new Integer[] { 1, null })
1768 >    {
1769          final CompletableFuture<Integer> f = new CompletableFuture<>();
1770          final CompletableFuture<Integer> g = new CompletableFuture<>();
1771          final Noop r = new Noop();
# Line 1105 | Line 1778 | public class CompletableFutureTest exten
1778  
1779          checkCompletedWithWrappedCFException(h, ex);
1780          checkCompletedWithWrappedCFException(g, ex);
1781 <        assertFalse(r.ran);
1781 >        assertEquals(0, r.invocationCount);
1782          checkCompletedNormally(f, v1);
1783 <        }
1111 <    }
1783 >    }}
1784  
1785      public void testRunAfterBoth_exceptionalCompletion3() {
1786          for (ExecutionMode m : ExecutionMode.values())
1787 <        for (Integer v1 : new Integer[] { 1, null }) {
1788 <
1787 >        for (Integer v1 : new Integer[] { 1, null })
1788 >    {
1789          final CompletableFuture<Integer> f = new CompletableFuture<>();
1790          final CompletableFuture<Integer> g = new CompletableFuture<>();
1791          final Noop r = new Noop();
# Line 1125 | Line 1797 | public class CompletableFutureTest exten
1797  
1798          checkCompletedWithWrappedCFException(h, ex);
1799          checkCompletedWithWrappedCFException(g, ex);
1800 <        assertFalse(r.ran);
1800 >        assertEquals(0, r.invocationCount);
1801          checkCompletedNormally(f, v1);
1802 <        }
1131 <    }
1802 >    }}
1803  
1804      public void testRunAfterBoth_exceptionalCompletion4() {
1805          for (ExecutionMode m : ExecutionMode.values())
1806 <        for (Integer v1 : new Integer[] { 1, null }) {
1807 <
1806 >        for (Integer v1 : new Integer[] { 1, null })
1807 >    {
1808          final CompletableFuture<Integer> f = new CompletableFuture<>();
1809          final CompletableFuture<Integer> g = new CompletableFuture<>();
1810          final Noop r = new Noop();
# Line 1145 | Line 1816 | public class CompletableFutureTest exten
1816  
1817          checkCompletedWithWrappedCFException(h, ex);
1818          checkCompletedWithWrappedCFException(f, ex);
1819 <        assertFalse(r.ran);
1819 >        assertEquals(0, r.invocationCount);
1820          checkCompletedNormally(g, v1);
1821 <        }
1151 <    }
1821 >    }}
1822  
1823      /**
1824       * runAfterBoth result completes exceptionally if action does
# Line 1156 | Line 1826 | public class CompletableFutureTest exten
1826      public void testRunAfterBoth_actionFailed1() {
1827          for (ExecutionMode m : ExecutionMode.values())
1828          for (Integer v1 : new Integer[] { 1, null })
1829 <        for (Integer v2 : new Integer[] { 2, null }) {
1830 <
1829 >        for (Integer v2 : new Integer[] { 2, null })
1830 >    {
1831          final CompletableFuture<Integer> f = new CompletableFuture<>();
1832          final CompletableFuture<Integer> g = new CompletableFuture<>();
1833          final FailingNoop r = new FailingNoop();
# Line 1170 | Line 1840 | public class CompletableFutureTest exten
1840          checkCompletedWithWrappedCFException(h);
1841          checkCompletedNormally(f, v1);
1842          checkCompletedNormally(g, v2);
1843 <        }
1174 <    }
1843 >    }}
1844  
1845      public void testRunAfterBoth_actionFailed2() {
1846          for (ExecutionMode m : ExecutionMode.values())
1847          for (Integer v1 : new Integer[] { 1, null })
1848 <        for (Integer v2 : new Integer[] { 2, null }) {
1849 <
1848 >        for (Integer v2 : new Integer[] { 2, null })
1849 >    {
1850          final CompletableFuture<Integer> f = new CompletableFuture<>();
1851          final CompletableFuture<Integer> g = new CompletableFuture<>();
1852          final FailingNoop r = new FailingNoop();
# Line 1190 | Line 1859 | public class CompletableFutureTest exten
1859          checkCompletedWithWrappedCFException(h);
1860          checkCompletedNormally(f, v1);
1861          checkCompletedNormally(g, v2);
1862 <        }
1194 <    }
1862 >    }}
1863  
1864      /**
1865       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1199 | Line 1867 | public class CompletableFutureTest exten
1867      public void testRunAfterBoth_sourceCancelled1() {
1868          for (ExecutionMode m : ExecutionMode.values())
1869          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1870 <        for (Integer v1 : new Integer[] { 1, null }) {
1871 <
1870 >        for (Integer v1 : new Integer[] { 1, null })
1871 >    {
1872          final CompletableFuture<Integer> f = new CompletableFuture<>();
1873          final CompletableFuture<Integer> g = new CompletableFuture<>();
1874          final Noop r = new Noop();
# Line 1212 | Line 1880 | public class CompletableFutureTest exten
1880  
1881          checkCompletedWithWrappedCancellationException(h);
1882          checkCancelled(f);
1883 <        assertFalse(r.ran);
1883 >        assertEquals(0, r.invocationCount);
1884          checkCompletedNormally(g, v1);
1885 <        }
1218 <    }
1885 >    }}
1886  
1887      public void testRunAfterBoth_sourceCancelled2() {
1888          for (ExecutionMode m : ExecutionMode.values())
1889          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1890 <        for (Integer v1 : new Integer[] { 1, null }) {
1891 <
1890 >        for (Integer v1 : new Integer[] { 1, null })
1891 >    {
1892          final CompletableFuture<Integer> f = new CompletableFuture<>();
1893          final CompletableFuture<Integer> g = new CompletableFuture<>();
1894          final Noop r = new Noop();
# Line 1233 | Line 1900 | public class CompletableFutureTest exten
1900  
1901          checkCompletedWithWrappedCancellationException(h);
1902          checkCancelled(g);
1903 <        assertFalse(r.ran);
1903 >        assertEquals(0, r.invocationCount);
1904          checkCompletedNormally(f, v1);
1905 <        }
1239 <    }
1905 >    }}
1906  
1907      public void testRunAfterBoth_sourceCancelled3() {
1908          for (ExecutionMode m : ExecutionMode.values())
1909          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1910 <        for (Integer v1 : new Integer[] { 1, null }) {
1911 <
1910 >        for (Integer v1 : new Integer[] { 1, null })
1911 >    {
1912          final CompletableFuture<Integer> f = new CompletableFuture<>();
1913          final CompletableFuture<Integer> g = new CompletableFuture<>();
1914          final Noop r = new Noop();
# Line 1253 | Line 1919 | public class CompletableFutureTest exten
1919  
1920          checkCompletedWithWrappedCancellationException(h);
1921          checkCancelled(g);
1922 <        assertFalse(r.ran);
1922 >        assertEquals(0, r.invocationCount);
1923          checkCompletedNormally(f, v1);
1924 <        }
1259 <    }
1924 >    }}
1925  
1926      public void testRunAfterBoth_sourceCancelled4() {
1927          for (ExecutionMode m : ExecutionMode.values())
1928          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1929 <        for (Integer v1 : new Integer[] { 1, null }) {
1930 <
1929 >        for (Integer v1 : new Integer[] { 1, null })
1930 >    {
1931          final CompletableFuture<Integer> f = new CompletableFuture<>();
1932          final CompletableFuture<Integer> g = new CompletableFuture<>();
1933          final Noop r = new Noop();
# Line 1273 | Line 1938 | public class CompletableFutureTest exten
1938  
1939          checkCompletedWithWrappedCancellationException(h);
1940          checkCancelled(f);
1941 <        assertFalse(r.ran);
1941 >        assertEquals(0, r.invocationCount);
1942          checkCompletedNormally(g, v1);
1943 <        }
1279 <    }
1943 >    }}
1944  
1945      /**
1946       * applyToEither result completes normally after normal completion
1947       * of either source
1948       */
1949 <    public void testApplyToEither() {
1950 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1951 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1952 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1953 <        f.complete(one);
1954 <        checkCompletedNormally(g, two);
1955 <        f2.complete(one);
1956 <        checkCompletedNormally(g, two);
1949 >    public void testApplyToEither_normalCompletion1() {
1950 >        for (ExecutionMode m : ExecutionMode.values())
1951 >        for (Integer v1 : new Integer[] { 1, null })
1952 >        for (Integer v2 : new Integer[] { 2, null })
1953 >    {
1954 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1955 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1956 >        final IncFunction r = new IncFunction();
1957 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1958  
1959 <        f = new CompletableFuture<>();
1960 <        f.complete(one);
1961 <        f2 = new CompletableFuture<>();
1962 <        g = f.applyToEither(f2, inc);
1963 <        checkCompletedNormally(g, two);
1964 <    }
1959 >        f.complete(v1);
1960 >        checkCompletedNormally(h, inc(v1));
1961 >        g.complete(v2);
1962 >
1963 >        checkCompletedNormally(f, v1);
1964 >        checkCompletedNormally(g, v2);
1965 >        checkCompletedNormally(h, inc(v1));
1966 >    }}
1967 >
1968 >    public void testApplyToEither_normalCompletion2() {
1969 >        for (ExecutionMode m : ExecutionMode.values())
1970 >        for (Integer v1 : new Integer[] { 1, null })
1971 >        for (Integer v2 : new Integer[] { 2, null })
1972 >    {
1973 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1974 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1975 >        final IncFunction r = new IncFunction();
1976 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1977 >
1978 >        g.complete(v2);
1979 >        checkCompletedNormally(h, inc(v2));
1980 >        f.complete(v1);
1981 >
1982 >        checkCompletedNormally(f, v1);
1983 >        checkCompletedNormally(g, v2);
1984 >        checkCompletedNormally(h, inc(v2));
1985 >        }}
1986 >
1987 >    public void testApplyToEither_normalCompletion3() {
1988 >        for (ExecutionMode m : ExecutionMode.values())
1989 >        for (Integer v1 : new Integer[] { 1, null })
1990 >        for (Integer v2 : new Integer[] { 2, null })
1991 >    {
1992 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1993 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1994 >        final IncFunction r = new IncFunction();
1995 >
1996 >        f.complete(v1);
1997 >        g.complete(v2);
1998 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1999 >
2000 >        checkCompletedNormally(f, v1);
2001 >        checkCompletedNormally(g, v2);
2002 >
2003 >        // unspecified behavior
2004 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2005 >                   Objects.equals(h.join(), inc(v2)));
2006 >        assertEquals(1, r.invocationCount);
2007 >    }}
2008  
2009      /**
2010       * applyToEither result completes exceptionally after exceptional
2011       * completion of either source
2012       */
2013 <    public void testApplyToEither2() {
2014 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2015 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2016 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2017 <        f.completeExceptionally(new CFException());
2018 <        f2.complete(one);
2019 <        checkCompletedWithWrappedCFException(g);
2013 >    public void testApplyToEither_exceptionalCompletion1() {
2014 >        for (ExecutionMode m : ExecutionMode.values())
2015 >        for (Integer v1 : new Integer[] { 1, null })
2016 >    {
2017 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2018 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2019 >        final IncFunction r = new IncFunction();
2020 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2021 >        final CFException ex = new CFException();
2022  
2023 <        f = new CompletableFuture<>();
2024 <        f2 = new CompletableFuture<>();
2025 <        f2.completeExceptionally(new CFException());
2026 <        g = f.applyToEither(f2, inc);
2027 <        checkCompletedWithWrappedCFException(g);
2028 <    }
2023 >        f.completeExceptionally(ex);
2024 >        checkCompletedWithWrappedCFException(h, ex);
2025 >        g.complete(v1);
2026 >
2027 >        assertEquals(0, r.invocationCount);
2028 >        checkCompletedNormally(g, v1);
2029 >        checkCompletedWithWrappedCFException(f, ex);
2030 >        checkCompletedWithWrappedCFException(h, ex);
2031 >    }}
2032 >
2033 >    public void testApplyToEither_exceptionalCompletion2() {
2034 >        for (ExecutionMode m : ExecutionMode.values())
2035 >        for (Integer v1 : new Integer[] { 1, null })
2036 >    {
2037 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2038 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2039 >        final IncFunction r = new IncFunction();
2040 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2041 >        final CFException ex = new CFException();
2042 >
2043 >        g.completeExceptionally(ex);
2044 >        checkCompletedWithWrappedCFException(h, ex);
2045 >        f.complete(v1);
2046 >
2047 >        assertEquals(0, r.invocationCount);
2048 >        checkCompletedNormally(f, v1);
2049 >        checkCompletedWithWrappedCFException(g, ex);
2050 >        checkCompletedWithWrappedCFException(h, ex);
2051 >    }}
2052 >
2053 >    public void testApplyToEither_exceptionalCompletion3() {
2054 >        for (ExecutionMode m : ExecutionMode.values())
2055 >        for (Integer v1 : new Integer[] { 1, null })
2056 >    {
2057 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2058 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2059 >        final IncFunction r = new IncFunction();
2060 >        final CFException ex = new CFException();
2061 >
2062 >        g.completeExceptionally(ex);
2063 >        f.complete(v1);
2064 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2065 >
2066 >        // unspecified behavior
2067 >        Integer v;
2068 >        try {
2069 >            assertEquals(inc(v1), h.join());
2070 >            assertEquals(1, r.invocationCount);
2071 >        } catch (CompletionException ok) {
2072 >            checkCompletedWithWrappedCFException(h, ex);
2073 >            assertEquals(0, r.invocationCount);
2074 >        }
2075 >
2076 >        checkCompletedWithWrappedCFException(g, ex);
2077 >        checkCompletedNormally(f, v1);
2078 >    }}
2079 >
2080 >    public void testApplyToEither_exceptionalCompletion4() {
2081 >        for (ExecutionMode m : ExecutionMode.values())
2082 >        for (Integer v1 : new Integer[] { 1, null })
2083 >    {
2084 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2085 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2086 >        final IncFunction r = new IncFunction();
2087 >        final CFException ex = new CFException();
2088 >
2089 >        f.completeExceptionally(ex);
2090 >        g.complete(v1);
2091 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2092 >
2093 >        // unspecified behavior
2094 >        Integer v;
2095 >        try {
2096 >            assertEquals(inc(v1), h.join());
2097 >            assertEquals(1, r.invocationCount);
2098 >        } catch (CompletionException ok) {
2099 >            checkCompletedWithWrappedCFException(h, ex);
2100 >            assertEquals(0, r.invocationCount);
2101 >        }
2102 >
2103 >        checkCompletedWithWrappedCFException(f, ex);
2104 >        checkCompletedNormally(g, v1);
2105 >    }}
2106  
2107      /**
2108       * applyToEither result completes exceptionally if action does
2109       */
2110 <    public void testApplyToEither3() {
2111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2112 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2113 <        FailingFunction r = new FailingFunction();
2114 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
2115 <        f2.complete(two);
2116 <        checkCompletedWithWrappedCFException(g);
2117 <    }
2110 >    public void testApplyToEither_actionFailed1() {
2111 >        for (ExecutionMode m : ExecutionMode.values())
2112 >        for (Integer v1 : new Integer[] { 1, null })
2113 >        for (Integer v2 : new Integer[] { 2, null })
2114 >    {
2115 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2116 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2117 >        final FailingFunction r = new FailingFunction();
2118 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2119 >
2120 >        f.complete(v1);
2121 >        checkCompletedWithWrappedCFException(h);
2122 >        g.complete(v2);
2123 >        checkCompletedNormally(f, v1);
2124 >        checkCompletedNormally(g, v2);
2125 >    }}
2126 >
2127 >    public void testApplyToEither_actionFailed2() {
2128 >        for (ExecutionMode m : ExecutionMode.values())
2129 >        for (Integer v1 : new Integer[] { 1, null })
2130 >        for (Integer v2 : new Integer[] { 2, null })
2131 >    {
2132 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2133 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2134 >        final FailingFunction r = new FailingFunction();
2135 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2136 >
2137 >        g.complete(v2);
2138 >        checkCompletedWithWrappedCFException(h);
2139 >        f.complete(v1);
2140 >        checkCompletedNormally(f, v1);
2141 >        checkCompletedNormally(g, v2);
2142 >    }}
2143  
2144      /**
2145       * applyToEither result completes exceptionally if either source cancelled
2146       */
2147 <    public void testApplyToEither4() {
2148 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2149 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2150 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2151 <        assertTrue(f.cancel(true));
2152 <        checkCompletedWithWrappedCancellationException(g);
2153 <        f = new CompletableFuture<>();
2154 <        f2 = new CompletableFuture<>();
2155 <        assertTrue(f2.cancel(true));
2156 <        checkCompletedWithWrappedCancellationException(g);
2157 <    }
2147 >    public void testApplyToEither_sourceCancelled1() {
2148 >        for (ExecutionMode m : ExecutionMode.values())
2149 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2150 >        for (Integer v1 : new Integer[] { 1, null })
2151 >    {
2152 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2153 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2154 >        final IncFunction r = new IncFunction();
2155 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2156 >
2157 >        assertTrue(f.cancel(mayInterruptIfRunning));
2158 >        checkCompletedWithWrappedCancellationException(h);
2159 >        g.complete(v1);
2160 >
2161 >        checkCancelled(f);
2162 >        assertEquals(0, r.invocationCount);
2163 >        checkCompletedNormally(g, v1);
2164 >        checkCompletedWithWrappedCancellationException(h);
2165 >    }}
2166 >
2167 >    public void testApplyToEither_sourceCancelled2() {
2168 >        for (ExecutionMode m : ExecutionMode.values())
2169 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2170 >        for (Integer v1 : new Integer[] { 1, null })
2171 >    {
2172 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2173 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2174 >        final IncFunction r = new IncFunction();
2175 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2176 >
2177 >        assertTrue(g.cancel(mayInterruptIfRunning));
2178 >        checkCompletedWithWrappedCancellationException(h);
2179 >        f.complete(v1);
2180 >
2181 >        checkCancelled(g);
2182 >        assertEquals(0, r.invocationCount);
2183 >        checkCompletedNormally(f, v1);
2184 >        checkCompletedWithWrappedCancellationException(h);
2185 >    }}
2186 >
2187 >    public void testApplyToEither_sourceCancelled3() {
2188 >        for (ExecutionMode m : ExecutionMode.values())
2189 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2190 >        for (Integer v1 : new Integer[] { 1, null })
2191 >    {
2192 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2193 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2194 >        final IncFunction r = new IncFunction();
2195 >
2196 >        assertTrue(g.cancel(mayInterruptIfRunning));
2197 >        f.complete(v1);
2198 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2199 >
2200 >        // unspecified behavior
2201 >        Integer v;
2202 >        try {
2203 >            assertEquals(inc(v1), h.join());
2204 >            assertEquals(1, r.invocationCount);
2205 >        } catch (CompletionException ok) {
2206 >            checkCompletedWithWrappedCancellationException(h);
2207 >            assertEquals(0, r.invocationCount);
2208 >        }
2209 >
2210 >        checkCancelled(g);
2211 >        checkCompletedNormally(f, v1);
2212 >    }}
2213 >
2214 >    public void testApplyToEither_sourceCancelled4() {
2215 >        for (ExecutionMode m : ExecutionMode.values())
2216 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2217 >        for (Integer v1 : new Integer[] { 1, null })
2218 >    {
2219 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2220 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2221 >        final IncFunction r = new IncFunction();
2222 >
2223 >        assertTrue(f.cancel(mayInterruptIfRunning));
2224 >        g.complete(v1);
2225 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2226 >
2227 >        // unspecified behavior
2228 >        Integer v;
2229 >        try {
2230 >            assertEquals(inc(v1), h.join());
2231 >            assertEquals(1, r.invocationCount);
2232 >        } catch (CompletionException ok) {
2233 >            checkCompletedWithWrappedCancellationException(h);
2234 >            assertEquals(0, r.invocationCount);
2235 >        }
2236 >
2237 >        checkCancelled(f);
2238 >        checkCompletedNormally(g, v1);
2239 >    }}
2240  
2241      /**
2242       * acceptEither result completes normally after normal completion
2243       * of either source
2244       */
2245 <    public void testAcceptEither() {
2246 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2247 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2248 <        IncAction r = new IncAction();
2249 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2250 <        f.complete(one);
2251 <        checkCompletedNormally(g, null);
2252 <        f2.complete(one);
2253 <        checkCompletedNormally(g, null);
1360 <        assertEquals(r.value, 2);
2245 >    public void testAcceptEither_normalCompletion1() {
2246 >        for (ExecutionMode m : ExecutionMode.values())
2247 >        for (Integer v1 : new Integer[] { 1, null })
2248 >        for (Integer v2 : new Integer[] { 2, null })
2249 >    {
2250 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2251 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2252 >        final IncAction r = new IncAction();
2253 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2254  
2255 <        r = new IncAction();
2256 <        f = new CompletableFuture<>();
2257 <        f.complete(one);
2258 <        f2 = new CompletableFuture<>();
2259 <        g = f.acceptEither(f2, r);
2260 <        checkCompletedNormally(g, null);
2261 <        assertEquals(r.value, 2);
2262 <    }
2255 >        f.complete(v1);
2256 >        checkCompletedNormally(h, null);
2257 >        assertEquals(inc(v1), r.value);
2258 >        g.complete(v2);
2259 >
2260 >        checkCompletedNormally(f, v1);
2261 >        checkCompletedNormally(g, v2);
2262 >        checkCompletedNormally(h, null);
2263 >    }}
2264 >
2265 >    public void testAcceptEither_normalCompletion2() {
2266 >        for (ExecutionMode m : ExecutionMode.values())
2267 >        for (Integer v1 : new Integer[] { 1, null })
2268 >        for (Integer v2 : new Integer[] { 2, null })
2269 >    {
2270 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2271 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2272 >        final IncAction r = new IncAction();
2273 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2274 >
2275 >        g.complete(v2);
2276 >        checkCompletedNormally(h, null);
2277 >        assertEquals(inc(v2), r.value);
2278 >        f.complete(v1);
2279 >
2280 >        checkCompletedNormally(f, v1);
2281 >        checkCompletedNormally(g, v2);
2282 >        checkCompletedNormally(h, null);
2283 >    }}
2284 >
2285 >    public void testAcceptEither_normalCompletion3() {
2286 >        for (ExecutionMode m : ExecutionMode.values())
2287 >        for (Integer v1 : new Integer[] { 1, null })
2288 >        for (Integer v2 : new Integer[] { 2, null })
2289 >    {
2290 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2291 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2292 >        final IncAction r = new IncAction();
2293 >
2294 >        f.complete(v1);
2295 >        g.complete(v2);
2296 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2297 >
2298 >        checkCompletedNormally(h, null);
2299 >        checkCompletedNormally(f, v1);
2300 >        checkCompletedNormally(g, v2);
2301 >
2302 >        // unspecified behavior
2303 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2304 >                   Objects.equals(r.value, inc(v2)));
2305 >    }}
2306  
2307      /**
2308       * acceptEither result completes exceptionally after exceptional
2309       * completion of either source
2310       */
2311 <    public void testAcceptEither2() {
2312 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2313 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2314 <        IncAction r = new IncAction();
2315 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2316 <        f.completeExceptionally(new CFException());
2317 <        f2.complete(one);
2318 <        checkCompletedWithWrappedCFException(g);
2311 >    public void testAcceptEither_exceptionalCompletion1() {
2312 >        for (ExecutionMode m : ExecutionMode.values())
2313 >        for (Integer v1 : new Integer[] { 1, null })
2314 >    {
2315 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2316 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2317 >        final IncAction r = new IncAction();
2318 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2319 >        final CFException ex = new CFException();
2320  
2321 <        r = new IncAction();
2322 <        f = new CompletableFuture<>();
2323 <        f2 = new CompletableFuture<>();
2324 <        f2.completeExceptionally(new CFException());
2325 <        g = f.acceptEither(f2, r);
2326 <        checkCompletedWithWrappedCFException(g);
2327 <    }
2321 >        f.completeExceptionally(ex);
2322 >        checkCompletedWithWrappedCFException(h, ex);
2323 >        g.complete(v1);
2324 >
2325 >        assertEquals(0, r.invocationCount);
2326 >        checkCompletedNormally(g, v1);
2327 >        checkCompletedWithWrappedCFException(f, ex);
2328 >        checkCompletedWithWrappedCFException(h, ex);
2329 >    }}
2330 >
2331 >    public void testAcceptEither_exceptionalCompletion2() {
2332 >        for (ExecutionMode m : ExecutionMode.values())
2333 >        for (Integer v1 : new Integer[] { 1, null })
2334 >    {
2335 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2336 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2337 >        final IncAction r = new IncAction();
2338 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2339 >        final CFException ex = new CFException();
2340 >
2341 >        g.completeExceptionally(ex);
2342 >        checkCompletedWithWrappedCFException(h, ex);
2343 >        f.complete(v1);
2344 >
2345 >        assertEquals(0, r.invocationCount);
2346 >        checkCompletedNormally(f, v1);
2347 >        checkCompletedWithWrappedCFException(g, ex);
2348 >        checkCompletedWithWrappedCFException(h, ex);
2349 >    }}
2350 >
2351 >    public void testAcceptEither_exceptionalCompletion3() {
2352 >        for (ExecutionMode m : ExecutionMode.values())
2353 >        for (Integer v1 : new Integer[] { 1, null })
2354 >    {
2355 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2356 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2357 >        final IncAction r = new IncAction();
2358 >        final CFException ex = new CFException();
2359 >
2360 >        g.completeExceptionally(ex);
2361 >        f.complete(v1);
2362 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2363 >
2364 >        // unspecified behavior
2365 >        Integer v;
2366 >        try {
2367 >            assertNull(h.join());
2368 >            assertEquals(1, r.invocationCount);
2369 >            assertEquals(inc(v1), r.value);
2370 >        } catch (CompletionException ok) {
2371 >            checkCompletedWithWrappedCFException(h, ex);
2372 >            assertEquals(0, r.invocationCount);
2373 >        }
2374 >
2375 >        checkCompletedWithWrappedCFException(g, ex);
2376 >        checkCompletedNormally(f, v1);
2377 >    }}
2378 >
2379 >    public void testAcceptEither_exceptionalCompletion4() {
2380 >        for (ExecutionMode m : ExecutionMode.values())
2381 >        for (Integer v1 : new Integer[] { 1, null })
2382 >    {
2383 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2384 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2385 >        final IncAction r = new IncAction();
2386 >        final CFException ex = new CFException();
2387 >
2388 >        f.completeExceptionally(ex);
2389 >        g.complete(v1);
2390 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2391 >
2392 >        // unspecified behavior
2393 >        Integer v;
2394 >        try {
2395 >            assertNull(h.join());
2396 >            assertEquals(1, r.invocationCount);
2397 >            assertEquals(inc(v1), r.value);
2398 >        } catch (CompletionException ok) {
2399 >            checkCompletedWithWrappedCFException(h, ex);
2400 >            assertEquals(0, r.invocationCount);
2401 >        }
2402 >
2403 >        checkCompletedWithWrappedCFException(f, ex);
2404 >        checkCompletedNormally(g, v1);
2405 >    }}
2406  
2407      /**
2408       * acceptEither result completes exceptionally if action does
2409       */
2410 <    public void testAcceptEither3() {
2411 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2412 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2413 <        FailingConsumer r = new FailingConsumer();
2414 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2415 <        f2.complete(two);
2416 <        checkCompletedWithWrappedCFException(g);
2417 <    }
2410 >    public void testAcceptEither_actionFailed1() {
2411 >        for (ExecutionMode m : ExecutionMode.values())
2412 >        for (Integer v1 : new Integer[] { 1, null })
2413 >        for (Integer v2 : new Integer[] { 2, null })
2414 >    {
2415 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2416 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2417 >        final FailingConsumer r = new FailingConsumer();
2418 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2419 >
2420 >        f.complete(v1);
2421 >        checkCompletedWithWrappedCFException(h);
2422 >        g.complete(v2);
2423 >        checkCompletedNormally(f, v1);
2424 >        checkCompletedNormally(g, v2);
2425 >    }}
2426 >
2427 >    public void testAcceptEither_actionFailed2() {
2428 >        for (ExecutionMode m : ExecutionMode.values())
2429 >        for (Integer v1 : new Integer[] { 1, null })
2430 >        for (Integer v2 : new Integer[] { 2, null })
2431 >    {
2432 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434 >        final FailingConsumer r = new FailingConsumer();
2435 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2436 >
2437 >        g.complete(v2);
2438 >        checkCompletedWithWrappedCFException(h);
2439 >        f.complete(v1);
2440 >        checkCompletedNormally(f, v1);
2441 >        checkCompletedNormally(g, v2);
2442 >    }}
2443  
2444      /**
2445       * acceptEither result completes exceptionally if either source cancelled
2446       */
2447 <    public void testAcceptEither4() {
2448 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2449 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2450 <        IncAction r = new IncAction();
2451 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2452 <        assertTrue(f.cancel(true));
2453 <        checkCompletedWithWrappedCancellationException(g);
2454 <        f = new CompletableFuture<>();
2455 <        f2 = new CompletableFuture<>();
2456 <        assertTrue(f2.cancel(true));
2457 <        checkCompletedWithWrappedCancellationException(g);
2458 <    }
2447 >    public void testAcceptEither_sourceCancelled1() {
2448 >        for (ExecutionMode m : ExecutionMode.values())
2449 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2450 >        for (Integer v1 : new Integer[] { 1, null })
2451 >    {
2452 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2453 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2454 >        final IncAction r = new IncAction();
2455 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2456 >
2457 >        assertTrue(f.cancel(mayInterruptIfRunning));
2458 >        checkCompletedWithWrappedCancellationException(h);
2459 >        g.complete(v1);
2460 >
2461 >        checkCancelled(f);
2462 >        assertEquals(0, r.invocationCount);
2463 >        checkCompletedNormally(g, v1);
2464 >        checkCompletedWithWrappedCancellationException(h);
2465 >    }}
2466 >
2467 >    public void testAcceptEither_sourceCancelled2() {
2468 >        for (ExecutionMode m : ExecutionMode.values())
2469 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2470 >        for (Integer v1 : new Integer[] { 1, null })
2471 >    {
2472 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474 >        final IncAction r = new IncAction();
2475 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2476 >
2477 >        assertTrue(g.cancel(mayInterruptIfRunning));
2478 >        checkCompletedWithWrappedCancellationException(h);
2479 >        f.complete(v1);
2480 >
2481 >        checkCancelled(g);
2482 >        assertEquals(0, r.invocationCount);
2483 >        checkCompletedNormally(f, v1);
2484 >        checkCompletedWithWrappedCancellationException(h);
2485 >    }}
2486 >
2487 >    public void testAcceptEither_sourceCancelled3() {
2488 >        for (ExecutionMode m : ExecutionMode.values())
2489 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2490 >        for (Integer v1 : new Integer[] { 1, null })
2491 >    {
2492 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2493 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2494 >        final IncAction r = new IncAction();
2495 >
2496 >        assertTrue(g.cancel(mayInterruptIfRunning));
2497 >        f.complete(v1);
2498 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2499 >
2500 >        // unspecified behavior
2501 >        Integer v;
2502 >        try {
2503 >            assertNull(h.join());
2504 >            assertEquals(1, r.invocationCount);
2505 >            assertEquals(inc(v1), r.value);
2506 >        } catch (CompletionException ok) {
2507 >            checkCompletedWithWrappedCancellationException(h);
2508 >            assertEquals(0, r.invocationCount);
2509 >        }
2510 >
2511 >        checkCancelled(g);
2512 >        checkCompletedNormally(f, v1);
2513 >    }}
2514 >
2515 >    public void testAcceptEither_sourceCancelled4() {
2516 >        for (ExecutionMode m : ExecutionMode.values())
2517 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2518 >        for (Integer v1 : new Integer[] { 1, null })
2519 >    {
2520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2521 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2522 >        final IncAction r = new IncAction();
2523 >
2524 >        assertTrue(f.cancel(mayInterruptIfRunning));
2525 >        g.complete(v1);
2526 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2527 >
2528 >        // unspecified behavior
2529 >        Integer v;
2530 >        try {
2531 >            assertNull(h.join());
2532 >            assertEquals(1, r.invocationCount);
2533 >            assertEquals(inc(v1), r.value);
2534 >        } catch (CompletionException ok) {
2535 >            checkCompletedWithWrappedCancellationException(h);
2536 >            assertEquals(0, r.invocationCount);
2537 >        }
2538 >
2539 >        checkCancelled(f);
2540 >        checkCompletedNormally(g, v1);
2541 >    }}
2542  
2543      /**
2544       * runAfterEither result completes normally after normal completion
2545       * of either source
2546       */
2547 <    public void testRunAfterEither() {
2548 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2549 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2550 <        Noop r = new Noop();
2551 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2552 <        f.complete(one);
2553 <        checkCompletedNormally(g, null);
2554 <        f2.complete(one);
2555 <        checkCompletedNormally(g, null);
1433 <        assertTrue(r.ran);
2547 >    public void testRunAfterEither_normalCompletion1() {
2548 >        for (ExecutionMode m : ExecutionMode.values())
2549 >        for (Integer v1 : new Integer[] { 1, null })
2550 >        for (Integer v2 : new Integer[] { 2, null })
2551 >    {
2552 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2553 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2554 >        final Noop r = new Noop();
2555 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2556  
2557 <        r = new Noop();
2558 <        f = new CompletableFuture<>();
2559 <        f.complete(one);
2560 <        f2 = new CompletableFuture<>();
2561 <        g = f.runAfterEither(f2, r);
2562 <        checkCompletedNormally(g, null);
2563 <        assertTrue(r.ran);
2564 <    }
2557 >        f.complete(v1);
2558 >        checkCompletedNormally(h, null);
2559 >        assertEquals(1, r.invocationCount);
2560 >        g.complete(v2);
2561 >
2562 >        checkCompletedNormally(f, v1);
2563 >        checkCompletedNormally(g, v2);
2564 >        checkCompletedNormally(h, null);
2565 >        assertEquals(1, r.invocationCount);
2566 >    }}
2567 >
2568 >    public void testRunAfterEither_normalCompletion2() {
2569 >        for (ExecutionMode m : ExecutionMode.values())
2570 >        for (Integer v1 : new Integer[] { 1, null })
2571 >        for (Integer v2 : new Integer[] { 2, null })
2572 >    {
2573 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2574 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2575 >        final Noop r = new Noop();
2576 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2577 >
2578 >        g.complete(v2);
2579 >        checkCompletedNormally(h, null);
2580 >        assertEquals(1, r.invocationCount);
2581 >        f.complete(v1);
2582 >
2583 >        checkCompletedNormally(f, v1);
2584 >        checkCompletedNormally(g, v2);
2585 >        checkCompletedNormally(h, null);
2586 >        assertEquals(1, r.invocationCount);
2587 >        }}
2588 >
2589 >    public void testRunAfterEither_normalCompletion3() {
2590 >        for (ExecutionMode m : ExecutionMode.values())
2591 >        for (Integer v1 : new Integer[] { 1, null })
2592 >        for (Integer v2 : new Integer[] { 2, null })
2593 >    {
2594 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2595 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2596 >        final Noop r = new Noop();
2597 >
2598 >        f.complete(v1);
2599 >        g.complete(v2);
2600 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2601 >
2602 >        checkCompletedNormally(h, null);
2603 >        checkCompletedNormally(f, v1);
2604 >        checkCompletedNormally(g, v2);
2605 >        assertEquals(1, r.invocationCount);
2606 >    }}
2607  
2608      /**
2609       * runAfterEither result completes exceptionally after exceptional
2610       * completion of either source
2611       */
2612 <    public void testRunAfterEither2() {
2613 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2614 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2615 <        Noop r = new Noop();
2616 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2617 <        f.completeExceptionally(new CFException());
2618 <        f2.complete(one);
2619 <        checkCompletedWithWrappedCFException(g);
2612 >    public void testRunAfterEither_exceptionalCompletion1() {
2613 >        for (ExecutionMode m : ExecutionMode.values())
2614 >        for (Integer v1 : new Integer[] { 1, null })
2615 >    {
2616 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2617 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2618 >        final Noop r = new Noop();
2619 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2620 >        final CFException ex = new CFException();
2621  
2622 <        r = new Noop();
2623 <        f = new CompletableFuture<>();
2624 <        f2 = new CompletableFuture<>();
2625 <        f2.completeExceptionally(new CFException());
2626 <        g = f.runAfterEither(f2, r);
2627 <        checkCompletedWithWrappedCFException(g);
2628 <    }
2622 >        f.completeExceptionally(ex);
2623 >        checkCompletedWithWrappedCFException(h, ex);
2624 >        g.complete(v1);
2625 >
2626 >        assertEquals(0, r.invocationCount);
2627 >        checkCompletedNormally(g, v1);
2628 >        checkCompletedWithWrappedCFException(f, ex);
2629 >        checkCompletedWithWrappedCFException(h, ex);
2630 >    }}
2631 >
2632 >    public void testRunAfterEither_exceptionalCompletion2() {
2633 >        for (ExecutionMode m : ExecutionMode.values())
2634 >        for (Integer v1 : new Integer[] { 1, null })
2635 >    {
2636 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2637 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2638 >        final Noop r = new Noop();
2639 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2640 >        final CFException ex = new CFException();
2641 >
2642 >        g.completeExceptionally(ex);
2643 >        checkCompletedWithWrappedCFException(h, ex);
2644 >        f.complete(v1);
2645 >
2646 >        assertEquals(0, r.invocationCount);
2647 >        checkCompletedNormally(f, v1);
2648 >        checkCompletedWithWrappedCFException(g, ex);
2649 >        checkCompletedWithWrappedCFException(h, ex);
2650 >    }}
2651 >
2652 >    public void testRunAfterEither_exceptionalCompletion3() {
2653 >        for (ExecutionMode m : ExecutionMode.values())
2654 >        for (Integer v1 : new Integer[] { 1, null })
2655 >    {
2656 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2657 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2658 >        final Noop r = new Noop();
2659 >        final CFException ex = new CFException();
2660 >
2661 >        g.completeExceptionally(ex);
2662 >        f.complete(v1);
2663 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2664 >
2665 >        // unspecified behavior
2666 >        Integer v;
2667 >        try {
2668 >            assertNull(h.join());
2669 >            assertEquals(1, r.invocationCount);
2670 >        } catch (CompletionException ok) {
2671 >            checkCompletedWithWrappedCFException(h, ex);
2672 >            assertEquals(0, r.invocationCount);
2673 >        }
2674 >
2675 >        checkCompletedWithWrappedCFException(g, ex);
2676 >        checkCompletedNormally(f, v1);
2677 >    }}
2678 >
2679 >    public void testRunAfterEither_exceptionalCompletion4() {
2680 >        for (ExecutionMode m : ExecutionMode.values())
2681 >        for (Integer v1 : new Integer[] { 1, null })
2682 >    {
2683 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2684 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2685 >        final Noop r = new Noop();
2686 >        final CFException ex = new CFException();
2687 >
2688 >        f.completeExceptionally(ex);
2689 >        g.complete(v1);
2690 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2691 >
2692 >        // unspecified behavior
2693 >        Integer v;
2694 >        try {
2695 >            assertNull(h.join());
2696 >            assertEquals(1, r.invocationCount);
2697 >        } catch (CompletionException ok) {
2698 >            checkCompletedWithWrappedCFException(h, ex);
2699 >            assertEquals(0, r.invocationCount);
2700 >        }
2701 >
2702 >        checkCompletedWithWrappedCFException(f, ex);
2703 >        checkCompletedNormally(g, v1);
2704 >    }}
2705  
2706      /**
2707       * runAfterEither result completes exceptionally if action does
2708       */
2709 <    public void testRunAfterEither3() {
2710 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2711 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2712 <        FailingNoop r = new FailingNoop();
2713 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2714 <        f2.complete(two);
2715 <        checkCompletedWithWrappedCFException(g);
2716 <    }
2709 >    public void testRunAfterEither_actionFailed1() {
2710 >        for (ExecutionMode m : ExecutionMode.values())
2711 >        for (Integer v1 : new Integer[] { 1, null })
2712 >        for (Integer v2 : new Integer[] { 2, null })
2713 >    {
2714 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2715 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2716 >        final FailingNoop r = new FailingNoop();
2717 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2718 >
2719 >        f.complete(v1);
2720 >        checkCompletedWithWrappedCFException(h);
2721 >        g.complete(v2);
2722 >        checkCompletedNormally(f, v1);
2723 >        checkCompletedNormally(g, v2);
2724 >    }}
2725 >
2726 >    public void testRunAfterEither_actionFailed2() {
2727 >        for (ExecutionMode m : ExecutionMode.values())
2728 >        for (Integer v1 : new Integer[] { 1, null })
2729 >        for (Integer v2 : new Integer[] { 2, null })
2730 >    {
2731 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2732 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2733 >        final FailingNoop r = new FailingNoop();
2734 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2735 >
2736 >        g.complete(v2);
2737 >        checkCompletedWithWrappedCFException(h);
2738 >        f.complete(v1);
2739 >        checkCompletedNormally(f, v1);
2740 >        checkCompletedNormally(g, v2);
2741 >    }}
2742  
2743      /**
2744       * runAfterEither result completes exceptionally if either source cancelled
2745       */
2746 <    public void testRunAfterEither4() {
2747 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2748 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2749 <        Noop r = new Noop();
2750 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2751 <        assertTrue(f.cancel(true));
2752 <        checkCompletedWithWrappedCancellationException(g);
2753 <        f = new CompletableFuture<>();
2754 <        f2 = new CompletableFuture<>();
2755 <        assertTrue(f2.cancel(true));
2756 <        checkCompletedWithWrappedCancellationException(g);
2757 <    }
2746 >    public void testRunAfterEither_sourceCancelled1() {
2747 >        for (ExecutionMode m : ExecutionMode.values())
2748 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2749 >        for (Integer v1 : new Integer[] { 1, null })
2750 >    {
2751 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2752 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2753 >        final Noop r = new Noop();
2754 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2755 >
2756 >        assertTrue(f.cancel(mayInterruptIfRunning));
2757 >        checkCompletedWithWrappedCancellationException(h);
2758 >        g.complete(v1);
2759 >
2760 >        checkCancelled(f);
2761 >        assertEquals(0, r.invocationCount);
2762 >        checkCompletedNormally(g, v1);
2763 >        checkCompletedWithWrappedCancellationException(h);
2764 >    }}
2765 >
2766 >    public void testRunAfterEither_sourceCancelled2() {
2767 >        for (ExecutionMode m : ExecutionMode.values())
2768 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2769 >        for (Integer v1 : new Integer[] { 1, null })
2770 >    {
2771 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2772 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2773 >        final Noop r = new Noop();
2774 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2775 >
2776 >        assertTrue(g.cancel(mayInterruptIfRunning));
2777 >        checkCompletedWithWrappedCancellationException(h);
2778 >        f.complete(v1);
2779 >
2780 >        checkCancelled(g);
2781 >        assertEquals(0, r.invocationCount);
2782 >        checkCompletedNormally(f, v1);
2783 >        checkCompletedWithWrappedCancellationException(h);
2784 >    }}
2785 >
2786 >    public void testRunAfterEither_sourceCancelled3() {
2787 >        for (ExecutionMode m : ExecutionMode.values())
2788 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2789 >        for (Integer v1 : new Integer[] { 1, null })
2790 >    {
2791 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2792 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2793 >        final Noop r = new Noop();
2794 >
2795 >        assertTrue(g.cancel(mayInterruptIfRunning));
2796 >        f.complete(v1);
2797 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2798 >
2799 >        // unspecified behavior
2800 >        Integer v;
2801 >        try {
2802 >            assertNull(h.join());
2803 >            assertEquals(1, r.invocationCount);
2804 >        } catch (CompletionException ok) {
2805 >            checkCompletedWithWrappedCancellationException(h);
2806 >            assertEquals(0, r.invocationCount);
2807 >        }
2808 >
2809 >        checkCancelled(g);
2810 >        checkCompletedNormally(f, v1);
2811 >    }}
2812 >
2813 >    public void testRunAfterEither_sourceCancelled4() {
2814 >        for (ExecutionMode m : ExecutionMode.values())
2815 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2816 >        for (Integer v1 : new Integer[] { 1, null })
2817 >    {
2818 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2819 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2820 >        final Noop r = new Noop();
2821 >
2822 >        assertTrue(f.cancel(mayInterruptIfRunning));
2823 >        g.complete(v1);
2824 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2825 >
2826 >        // unspecified behavior
2827 >        Integer v;
2828 >        try {
2829 >            assertNull(h.join());
2830 >            assertEquals(1, r.invocationCount);
2831 >        } catch (CompletionException ok) {
2832 >            checkCompletedWithWrappedCancellationException(h);
2833 >            assertEquals(0, r.invocationCount);
2834 >        }
2835 >
2836 >        checkCancelled(f);
2837 >        checkCompletedNormally(g, v1);
2838 >    }}
2839  
2840      /**
2841       * thenCompose result completes normally after normal completion of source
2842       */
2843 <    public void testThenCompose() {
2844 <        CompletableFuture<Integer> f, g;
2845 <        CompletableFutureInc r;
2846 <
2847 <        f = new CompletableFuture<>();
2848 <        g = f.thenCompose(r = new CompletableFutureInc());
2849 <        f.complete(one);
2850 <        checkCompletedNormally(g, two);
2851 <        assertTrue(r.ran);
2843 >    public void testThenCompose_normalCompletion1() {
2844 >        for (ExecutionMode m : ExecutionMode.values())
2845 >        for (Integer v1 : new Integer[] { 1, null })
2846 >    {
2847 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2848 >        final CompletableFutureInc r = new CompletableFutureInc();
2849 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2850 >        f.complete(v1);
2851 >        checkCompletedNormally(g, inc(v1));
2852 >        checkCompletedNormally(f, v1);
2853 >        assertEquals(1, r.invocationCount);
2854 >    }}
2855  
2856 <        f = new CompletableFuture<>();
2857 <        f.complete(one);
2858 <        g = f.thenCompose(r = new CompletableFutureInc());
2859 <        checkCompletedNormally(g, two);
2860 <        assertTrue(r.ran);
2861 <    }
2856 >    public void testThenCompose_normalCompletion2() {
2857 >        for (ExecutionMode m : ExecutionMode.values())
2858 >        for (Integer v1 : new Integer[] { 1, null })
2859 >    {
2860 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2861 >        final CompletableFutureInc r = new CompletableFutureInc();
2862 >        f.complete(v1);
2863 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2864 >        checkCompletedNormally(g, inc(v1));
2865 >        checkCompletedNormally(f, v1);
2866 >        assertEquals(1, r.invocationCount);
2867 >    }}
2868  
2869      /**
2870       * thenCompose result completes exceptionally after exceptional
2871       * completion of source
2872       */
2873 <    public void testThenCompose2() {
2874 <        CompletableFuture<Integer> f, g;
2875 <        CompletableFutureInc r;
2876 <
2877 <        f = new CompletableFuture<>();
2878 <        g = f.thenCompose(r = new CompletableFutureInc());
2879 <        f.completeExceptionally(new CFException());
2880 <        checkCompletedWithWrappedCFException(g);
2873 >    public void testThenCompose_exceptionalCompletion1() {
2874 >        for (ExecutionMode m : ExecutionMode.values())
2875 >    {
2876 >        final CFException ex = new CFException();
2877 >        final CompletableFutureInc r = new CompletableFutureInc();
2878 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2879 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2880 >        f.completeExceptionally(ex);
2881 >        checkCompletedWithWrappedCFException(g, ex);
2882 >        checkCompletedWithWrappedCFException(f, ex);
2883 >    }}
2884  
2885 <        f = new CompletableFuture<>();
2886 <        f.completeExceptionally(new CFException());
2887 <        g = f.thenCompose(r = new CompletableFutureInc());
2888 <        checkCompletedWithWrappedCFException(g);
2889 <    }
2885 >    public void testThenCompose_exceptionalCompletion2() {
2886 >        for (ExecutionMode m : ExecutionMode.values())
2887 >    {
2888 >        final CFException ex = new CFException();
2889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2890 >        f.completeExceptionally(ex);
2891 >        final CompletableFutureInc r = new CompletableFutureInc();
2892 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2893 >        checkCompletedWithWrappedCFException(g, ex);
2894 >        checkCompletedWithWrappedCFException(f, ex);
2895 >    }}
2896  
2897      /**
2898       * thenCompose result completes exceptionally if action does
2899       */
2900 <    public void testThenCompose3() {
2901 <        CompletableFuture<Integer> f, g;
2902 <        FailingCompletableFutureFunction r;
2903 <
2904 <        f = new CompletableFuture<>();
2905 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2906 <        f.complete(one);
2900 >    public void testThenCompose_actionFailed1() {
2901 >        for (ExecutionMode m : ExecutionMode.values())
2902 >        for (Integer v1 : new Integer[] { 1, null })
2903 >    {
2904 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2905 >        final FailingCompletableFutureFunction r
2906 >            = new FailingCompletableFutureFunction();
2907 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2908 >        f.complete(v1);
2909          checkCompletedWithWrappedCFException(g);
2910 +        checkCompletedNormally(f, v1);
2911 +    }}
2912  
2913 <        f = new CompletableFuture<>();
2914 <        f.complete(one);
2915 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2913 >    public void testThenCompose_actionFailed2() {
2914 >        for (ExecutionMode m : ExecutionMode.values())
2915 >        for (Integer v1 : new Integer[] { 1, null })
2916 >    {
2917 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2918 >        f.complete(v1);
2919 >        final FailingCompletableFutureFunction r
2920 >            = new FailingCompletableFutureFunction();
2921 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2922          checkCompletedWithWrappedCFException(g);
2923 <    }
2923 >        checkCompletedNormally(f, v1);
2924 >    }}
2925  
2926      /**
2927       * thenCompose result completes exceptionally if source cancelled
2928       */
2929 <    public void testThenCompose4() {
2930 <        CompletableFuture<Integer> f, g;
2931 <        CompletableFutureInc r;
2932 <
2933 <        f = new CompletableFuture<>();
2934 <        g = f.thenCompose(r = new CompletableFutureInc());
2935 <        assertTrue(f.cancel(true));
2929 >    public void testThenCompose_sourceCancelled1() {
2930 >        for (ExecutionMode m : ExecutionMode.values())
2931 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2932 >    {
2933 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2934 >        final CompletableFutureInc r = new CompletableFutureInc();
2935 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2936 >        assertTrue(f.cancel(mayInterruptIfRunning));
2937          checkCompletedWithWrappedCancellationException(g);
2938 +        checkCancelled(f);
2939 +    }}
2940  
2941 <        f = new CompletableFuture<>();
2942 <        assertTrue(f.cancel(true));
2943 <        g = f.thenCompose(r = new CompletableFutureInc());
2941 >    public void testThenCompose_sourceCancelled2() {
2942 >        for (ExecutionMode m : ExecutionMode.values())
2943 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2944 >    {
2945 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2946 >        assertTrue(f.cancel(mayInterruptIfRunning));
2947 >        final CompletableFutureInc r = new CompletableFutureInc();
2948 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2949          checkCompletedWithWrappedCancellationException(g);
2950 <    }
2950 >        checkCancelled(f);
2951 >    }}
2952  
2953      // asyncs
2954  
# Line 1675 | Line 3060 | public class CompletableFutureTest exten
3060          CompletableFuture<Void> g = f.thenAcceptAsync(r);
3061          f.complete(one);
3062          checkCompletedNormally(g, null);
3063 <        assertEquals(r.value, 2);
3063 >        assertEquals(r.value, (Integer) 2);
3064      }
3065  
3066      /**
# Line 1712 | Line 3097 | public class CompletableFutureTest exten
3097          checkCompletedWithWrappedCancellationException(g);
3098      }
3099  
1715    /**
1716     * thenCombineAsync result completes normally after normal
1717     * completion of sources
1718     */
1719    public void testThenCombineAsync() {
1720        CompletableFuture<Integer> f, g, h;
1721
1722        f = new CompletableFuture<>();
1723        g = new CompletableFuture<>();
1724        h = f.thenCombineAsync(g, subtract);
1725        f.complete(3);
1726        checkIncomplete(h);
1727        g.complete(1);
1728        checkCompletedNormally(h, 2);
1729
1730        f = new CompletableFuture<>();
1731        g = new CompletableFuture<>();
1732        h = f.thenCombineAsync(g, subtract);
1733        g.complete(1);
1734        checkIncomplete(h);
1735        f.complete(3);
1736        checkCompletedNormally(h, 2);
1737
1738        f = new CompletableFuture<>();
1739        g = new CompletableFuture<>();
1740        g.complete(1);
1741        f.complete(3);
1742        h = f.thenCombineAsync(g, subtract);
1743        checkCompletedNormally(h, 2);
1744    }
1745
1746    /**
1747     * thenCombineAsync result completes exceptionally after exceptional
1748     * completion of either source
1749     */
1750    public void testThenCombineAsync2() {
1751        CompletableFuture<Integer> f, g, h;
1752
1753        f = new CompletableFuture<>();
1754        g = new CompletableFuture<>();
1755        h = f.thenCombineAsync(g, subtract);
1756        f.completeExceptionally(new CFException());
1757        checkIncomplete(h);
1758        g.complete(1);
1759        checkCompletedWithWrappedCFException(h);
1760
1761        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);
1767        checkCompletedWithWrappedCFException(h);
1768
1769        f = new CompletableFuture<>();
1770        g = new CompletableFuture<>();
1771        g.completeExceptionally(new CFException());
1772        f.complete(3);
1773        h = f.thenCombineAsync(g, subtract);
1774        checkCompletedWithWrappedCFException(h);
1775    }
1776
1777    /**
1778     * thenCombineAsync result completes exceptionally if action does
1779     */
1780    public void testThenCombineAsync3() {
1781        CompletableFuture<Integer> f = new CompletableFuture<>();
1782        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1783        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    }
1792
1793    /**
1794     * thenCombineAsync result completes exceptionally if either source cancelled
1795     */
1796    public void testThenCombineAsync4() {
1797        CompletableFuture<Integer> f, g, h;
1798
1799        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);
1805        checkCompletedWithWrappedCancellationException(h);
1806
1807        f = new CompletableFuture<>();
1808        g = new CompletableFuture<>();
1809        h = f.thenCombineAsync(g, subtract);
1810        assertTrue(g.cancel(true));
1811        checkIncomplete(h);
1812        f.complete(3);
1813        checkCompletedWithWrappedCancellationException(h);
1814
1815        f = new CompletableFuture<>();
1816        g = new CompletableFuture<>();
1817        g.complete(3);
1818        assertTrue(f.cancel(true));
1819        h = f.thenCombineAsync(g, subtract);
1820        checkCompletedWithWrappedCancellationException(h);
1821
1822        f = new CompletableFuture<>();
1823        g = new CompletableFuture<>();
1824        f.complete(3);
1825        assertTrue(g.cancel(true));
1826        h = f.thenCombineAsync(g, subtract);
1827        checkCompletedWithWrappedCancellationException(h);
1828    }
1829
1830    /**
1831     * thenAcceptBothAsync result completes normally after normal
1832     * completion of sources
1833     */
1834    public void testThenAcceptBothAsync() {
1835        CompletableFuture<Integer> f, g;
1836        CompletableFuture<Void> h;
1837        SubtractAction r;
1838
1839        f = new CompletableFuture<>();
1840        g = new CompletableFuture<>();
1841        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);
1847
1848        f = new CompletableFuture<>();
1849        g = new CompletableFuture<>();
1850        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);
1856
1857        f = new CompletableFuture<>();
1858        g = new CompletableFuture<>();
1859        g.complete(1);
1860        f.complete(3);
1861        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1862        checkCompletedNormally(h, null);
1863        assertEquals(r.value, 2);
1864    }
1865
1866    /**
1867     * thenAcceptBothAsync result completes exceptionally after exceptional
1868     * completion of source
1869     */
1870    public void testThenAcceptBothAsync2() {
1871        CompletableFuture<Integer> f, g;
1872        CompletableFuture<Void> h;
1873        SubtractAction r;
1874
1875        f = new CompletableFuture<>();
1876        g = new CompletableFuture<>();
1877        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1878        f.completeExceptionally(new CFException());
1879        checkIncomplete(h);
1880        g.complete(1);
1881        checkCompletedWithWrappedCFException(h);
1882
1883        f = new CompletableFuture<>();
1884        g = new CompletableFuture<>();
1885        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1886        g.completeExceptionally(new CFException());
1887        checkIncomplete(h);
1888        f.complete(3);
1889        checkCompletedWithWrappedCFException(h);
1890
1891        f = new CompletableFuture<>();
1892        g = new CompletableFuture<>();
1893        f.complete(3);
1894        g.completeExceptionally(new CFException());
1895        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1896        checkCompletedWithWrappedCFException(h);
1897
1898        f = new CompletableFuture<>();
1899        g = new CompletableFuture<>();
1900        f.completeExceptionally(new CFException());
1901        g.complete(3);
1902        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1903        checkCompletedWithWrappedCFException(h);
1904    }
1905
1906    /**
1907     * thenAcceptBothAsync result completes exceptionally if action does
1908     */
1909    public void testThenAcceptBothAsync3() {
1910        CompletableFuture<Integer> f, g;
1911        CompletableFuture<Void> h;
1912        FailingBiConsumer r;
1913
1914        f = new CompletableFuture<>();
1915        g = new CompletableFuture<>();
1916        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1917        f.complete(3);
1918        checkIncomplete(h);
1919        g.complete(1);
1920        checkCompletedWithWrappedCFException(h);
1921
1922        f = new CompletableFuture<>();
1923        g = new CompletableFuture<>();
1924        f.complete(3);
1925        g.complete(1);
1926        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1927        checkCompletedWithWrappedCFException(h);
1928    }
1929
1930    /**
1931     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1932     */
1933    public void testThenAcceptBothAsync4() {
1934        CompletableFuture<Integer> f, g;
1935        CompletableFuture<Void> h;
1936        SubtractAction r;
1937
1938        f = new CompletableFuture<>();
1939        g = new CompletableFuture<>();
1940        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1941        assertTrue(f.cancel(true));
1942        checkIncomplete(h);
1943        g.complete(1);
1944        checkCompletedWithWrappedCancellationException(h);
1945
1946        f = new CompletableFuture<>();
1947        g = new CompletableFuture<>();
1948        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1949        assertTrue(g.cancel(true));
1950        checkIncomplete(h);
1951        f.complete(3);
1952        checkCompletedWithWrappedCancellationException(h);
1953
1954        f = new CompletableFuture<>();
1955        g = new CompletableFuture<>();
1956        f.complete(3);
1957        assertTrue(g.cancel(true));
1958        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1959        checkCompletedWithWrappedCancellationException(h);
1960
1961        f = new CompletableFuture<>();
1962        g = new CompletableFuture<>();
1963        assertTrue(f.cancel(true));
1964        g.complete(3);
1965        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1966        checkCompletedWithWrappedCancellationException(h);
1967    }
1968
1969    /**
1970     * applyToEitherAsync result completes normally after normal
1971     * completion of sources
1972     */
1973    public void testApplyToEitherAsync() {
1974        CompletableFuture<Integer> f = new CompletableFuture<>();
1975        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1976        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1977        f.complete(one);
1978        checkCompletedNormally(g, two);
1979
1980        f = new CompletableFuture<>();
1981        f.complete(one);
1982        f2 = new CompletableFuture<>();
1983        g = f.applyToEitherAsync(f2, inc);
1984        checkCompletedNormally(g, two);
1985    }
1986
1987    /**
1988     * applyToEitherAsync result completes exceptionally after exceptional
1989     * 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);
1997
1998        f = new CompletableFuture<>();
1999        f2 = new CompletableFuture<>();
2000        f2.completeExceptionally(new CFException());
2001        g = f.applyToEitherAsync(f2, inc);
2002        f.complete(one);
2003        checkCompletedWithWrappedCFException(g);
2004    }
2005
2006    /**
2007     * applyToEitherAsync result completes exceptionally if action does
2008     */
2009    public void testApplyToEitherAsync3() {
2010        CompletableFuture<Integer> f = new CompletableFuture<>();
2011        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2012        FailingFunction r = new FailingFunction();
2013        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2014        f.complete(one);
2015        checkCompletedWithWrappedCFException(g);
2016    }
2017
2018    /**
2019     * applyToEitherAsync result completes exceptionally if either source cancelled
2020     */
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);
2027
2028        f = new CompletableFuture<>();
2029        f2 = new CompletableFuture<>();
2030        assertTrue(f2.cancel(true));
2031        g = f.applyToEitherAsync(f2, inc);
2032        checkCompletedWithWrappedCancellationException(g);
2033    }
2034
2035    /**
2036     * acceptEitherAsync result completes normally after normal
2037     * completion of sources
2038     */
2039    public void testAcceptEitherAsync() {
2040        CompletableFuture<Integer> f = new CompletableFuture<>();
2041        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2042        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);
2047
2048        r = new IncAction();
2049        f = new CompletableFuture<>();
2050        f.complete(one);
2051        f2 = new CompletableFuture<>();
2052        g = f.acceptEitherAsync(f2, r);
2053        checkCompletedNormally(g, null);
2054        assertEquals(r.value, 2);
2055    }
2056
2057    /**
2058     * acceptEitherAsync result completes exceptionally after exceptional
2059     * completion of source
2060     */
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);
2068
2069        r = new IncAction();
2070        f = new CompletableFuture<>();
2071        f2 = new CompletableFuture<>();
2072        f2.completeExceptionally(new CFException());
2073        g = f.acceptEitherAsync(f2, r);
2074        f.complete(one);
2075        checkCompletedWithWrappedCFException(g);
2076    }
2077
2078    /**
2079     * acceptEitherAsync result completes exceptionally if action does
2080     */
2081    public void testAcceptEitherAsync3() {
2082        CompletableFuture<Integer> f = new CompletableFuture<>();
2083        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2084        FailingConsumer r = new FailingConsumer();
2085        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2086        f.complete(one);
2087        checkCompletedWithWrappedCFException(g);
2088    }
2089
2090    /**
2091     * acceptEitherAsync result completes exceptionally if either
2092     * source cancelled
2093     */
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);
2101
2102        r = new IncAction();
2103        f = new CompletableFuture<>();
2104        f2 = new CompletableFuture<>();
2105        assertTrue(f2.cancel(true));
2106        g = f.acceptEitherAsync(f2, r);
2107        checkCompletedWithWrappedCancellationException(g);
2108    }
2109
2110    /**
2111     * runAfterEitherAsync result completes normally after normal
2112     * completion of sources
2113     */
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);
2122
2123        r = new Noop();
2124        f = new CompletableFuture<>();
2125        f.complete(one);
2126        f2 = new CompletableFuture<>();
2127        g = f.runAfterEitherAsync(f2, r);
2128        checkCompletedNormally(g, null);
2129        assertTrue(r.ran);
2130    }
2131
2132    /**
2133     * runAfterEitherAsync result completes exceptionally after exceptional
2134     * completion of source
2135     */
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);
2143
2144        r = new Noop();
2145        f = new CompletableFuture<>();
2146        f2 = new CompletableFuture<>();
2147        f2.completeExceptionally(new CFException());
2148        g = f.runAfterEitherAsync(f2, r);
2149        f.complete(one);
2150        checkCompletedWithWrappedCFException(g);
2151    }
2152
2153    /**
2154     * runAfterEitherAsync result completes exceptionally if action does
2155     */
2156    public void testRunAfterEitherAsync3() {
2157        CompletableFuture<Integer> f = new CompletableFuture<>();
2158        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2159        FailingNoop r = new FailingNoop();
2160        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2161        f.complete(one);
2162        checkCompletedWithWrappedCFException(g);
2163    }
2164
2165    /**
2166     * runAfterEitherAsync result completes exceptionally if either
2167     * 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);
2176
2177        r = new Noop();
2178        f = new CompletableFuture<>();
2179        f2 = new CompletableFuture<>();
2180        assertTrue(f2.cancel(true));
2181        g = f.runAfterEitherAsync(f2, r);
2182        checkCompletedWithWrappedCancellationException(g);
2183    }
2184
2185    /**
2186     * thenComposeAsync result completes normally after normal
2187     * completion of source
2188     */
2189    public void testThenComposeAsync() {
2190        CompletableFuture<Integer> f, g;
2191        CompletableFutureInc r;
2192
2193        f = new CompletableFuture<>();
2194        g = f.thenComposeAsync(r = new CompletableFutureInc());
2195        f.complete(one);
2196        checkCompletedNormally(g, two);
2197
2198        f = new CompletableFuture<>();
2199        f.complete(one);
2200        g = f.thenComposeAsync(r = new CompletableFutureInc());
2201        checkCompletedNormally(g, two);
2202    }
2203
2204    /**
2205     * thenComposeAsync result completes exceptionally after
2206     * exceptional completion of source
2207     */
2208    public void testThenComposeAsync2() {
2209        CompletableFuture<Integer> f, g;
2210        CompletableFutureInc r;
2211
2212        f = new CompletableFuture<>();
2213        g = f.thenComposeAsync(r = new CompletableFutureInc());
2214        f.completeExceptionally(new CFException());
2215        checkCompletedWithWrappedCFException(g);
2216        assertFalse(r.ran);
2217
2218        f = new CompletableFuture<>();
2219        f.completeExceptionally(new CFException());
2220        g = f.thenComposeAsync(r = new CompletableFutureInc());
2221        checkCompletedWithWrappedCFException(g);
2222        assertFalse(r.ran);
2223    }
2224
2225    /**
2226     * thenComposeAsync result completes exceptionally if action does
2227     */
2228    public void testThenComposeAsync3() {
2229        CompletableFuture<Integer> f, g;
2230        FailingCompletableFutureFunction r;
2231
2232        f = new CompletableFuture<>();
2233        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2234        f.complete(one);
2235        checkCompletedWithWrappedCFException(g);
2236
2237        f = new CompletableFuture<>();
2238        f.complete(one);
2239        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2240        checkCompletedWithWrappedCFException(g);
2241    }
2242
2243    /**
2244     * thenComposeAsync result completes exceptionally if source cancelled
2245     */
2246    public void testThenComposeAsync4() {
2247        CompletableFuture<Integer> f, g;
2248        CompletableFutureInc r;
2249
2250        f = new CompletableFuture<>();
2251        g = f.thenComposeAsync(r = new CompletableFutureInc());
2252        assertTrue(f.cancel(true));
2253        checkCompletedWithWrappedCancellationException(g);
2254
2255        f = new CompletableFuture<>();
2256        assertTrue(f.cancel(true));
2257        g = f.thenComposeAsync(r = new CompletableFutureInc());
2258        checkCompletedWithWrappedCancellationException(g);
2259    }
2260
3100      // async with explicit executors
3101  
3102      /**
# Line 2368 | Line 3207 | public class CompletableFutureTest exten
3207          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3208          f.complete(one);
3209          checkCompletedNormally(g, null);
3210 <        assertEquals(r.value, 2);
3210 >        assertEquals(r.value, (Integer) 2);
3211      }
3212  
3213      /**
# Line 2405 | Line 3244 | public class CompletableFutureTest exten
3244          checkCompletedWithWrappedCancellationException(g);
3245      }
3246  
2408    /**
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    }
2753
2754    /**
2755     * acceptEitherAsync result completes normally after normal
2756     * completion of sources
2757     */
2758    public void testAcceptEitherAsyncE() {
2759        CompletableFuture<Integer> f = new CompletableFuture<>();
2760        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2761        IncAction r = new IncAction();
2762        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2763        f.complete(one);
2764        checkCompletedNormally(g, null);
2765        assertEquals(r.value, 2);
2766
2767        r = new IncAction();
2768        f = new CompletableFuture<>();
2769        f.complete(one);
2770        f2 = new CompletableFuture<>();
2771        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2772        checkCompletedNormally(g, null);
2773        assertEquals(r.value, 2);
2774    }
2775
2776    /**
2777     * acceptEitherAsync result completes exceptionally after exceptional
2778     * completion of source
2779     */
2780    public void testAcceptEitherAsync2E() {
2781        CompletableFuture<Integer> f = new CompletableFuture<>();
2782        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2783        IncAction r = new IncAction();
2784        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2785        f.completeExceptionally(new CFException());
2786        checkCompletedWithWrappedCFException(g);
2787
2788        r = new IncAction();
2789        f = new CompletableFuture<>();
2790        f2 = new CompletableFuture<>();
2791        f2.completeExceptionally(new CFException());
2792        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2793        f.complete(one);
2794        checkCompletedWithWrappedCFException(g);
2795    }
2796
2797    /**
2798     * acceptEitherAsync result completes exceptionally if action does
2799     */
2800    public void testAcceptEitherAsync3E() {
2801        CompletableFuture<Integer> f = new CompletableFuture<>();
2802        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2803        FailingConsumer r = new FailingConsumer();
2804        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2805        f.complete(one);
2806        checkCompletedWithWrappedCFException(g);
2807    }
2808
2809    /**
2810     * acceptEitherAsync result completes exceptionally if either
2811     * source cancelled
2812     */
2813    public void testAcceptEitherAsync4E() {
2814        CompletableFuture<Integer> f = new CompletableFuture<>();
2815        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2816        IncAction r = new IncAction();
2817        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2818        assertTrue(f.cancel(true));
2819        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);
2827    }
2828
2829    /**
2830     * runAfterEitherAsync result completes normally after normal
2831     * completion of sources
2832     */
2833    public void testRunAfterEitherAsyncE() {
2834        CompletableFuture<Integer> f = new CompletableFuture<>();
2835        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<>();
2844        f.complete(one);
2845        f2 = new CompletableFuture<>();
2846        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2847        checkCompletedNormally(g, null);
2848        assertTrue(r.ran);
2849    }
2850
2851    /**
2852     * runAfterEitherAsync result completes exceptionally after exceptional
2853     * completion of source
2854     */
2855    public void testRunAfterEitherAsync2E() {
2856        CompletableFuture<Integer> f = new CompletableFuture<>();
2857        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2858        Noop r = new Noop();
2859        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2860        f.completeExceptionally(new CFException());
2861        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);
2870    }
2871
2872    /**
2873     * runAfterEitherAsync result completes exceptionally if action does
2874     */
2875    public void testRunAfterEitherAsync3E() {
2876        CompletableFuture<Integer> f = new CompletableFuture<>();
2877        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2878        FailingNoop r = new FailingNoop();
2879        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2880        f.complete(one);
2881        checkCompletedWithWrappedCFException(g);
2882    }
2883
2884    /**
2885     * runAfterEitherAsync result completes exceptionally if either
2886     * source cancelled
2887     */
2888    public void testRunAfterEitherAsync4E() {
2889        CompletableFuture<Integer> f = new CompletableFuture<>();
2890        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2891        Noop r = new Noop();
2892        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2893        assertTrue(f.cancel(true));
2894        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);
2902    }
2903
2904    /**
2905     * thenComposeAsync result completes normally after normal
2906     * completion of source
2907     */
2908    public void testThenComposeAsyncE() {
2909        CompletableFuture<Integer> f = new CompletableFuture<>();
2910        CompletableFutureInc r = new CompletableFutureInc();
2911        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2912        f.complete(one);
2913        checkCompletedNormally(g, two);
2914    }
2915
2916    /**
2917     * thenComposeAsync result completes exceptionally after
2918     * exceptional completion of source
2919     */
2920    public void testThenComposeAsync2E() {
2921        CompletableFuture<Integer> f = new CompletableFuture<>();
2922        CompletableFutureInc r = new CompletableFutureInc();
2923        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2924        f.completeExceptionally(new CFException());
2925        checkCompletedWithWrappedCFException(g);
2926    }
2927
2928    /**
2929     * thenComposeAsync result completes exceptionally if action does
2930     */
2931    public void testThenComposeAsync3E() {
2932        CompletableFuture<Integer> f = new CompletableFuture<>();
2933        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2934        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2935        f.complete(one);
2936        checkCompletedWithWrappedCFException(g);
2937    }
2938
2939    /**
2940     * thenComposeAsync result completes exceptionally if source cancelled
2941     */
2942    public void testThenComposeAsync4E() {
2943        CompletableFuture<Integer> f = new CompletableFuture<>();
2944        CompletableFutureInc r = new CompletableFutureInc();
2945        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2946        assertTrue(f.cancel(true));
2947        checkCompletedWithWrappedCancellationException(g);
2948    }
2949
3247      // other static methods
3248  
3249      /**
# Line 3145 | Line 3442 | public class CompletableFutureTest exten
3442       * whenComplete action executes on normal completion, propagating
3443       * source result.
3444       */
3445 <    public void testWhenComplete1() {
3446 <        final AtomicInteger a = new AtomicInteger();
3447 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3448 <        CompletableFuture<Integer> g =
3449 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3450 <        f.complete(three);
3451 <        checkCompletedNormally(f, three);
3452 <        checkCompletedNormally(g, three);
3453 <        assertEquals(a.get(), 1);
3454 <    }
3455 <
3456 <    /**
3457 <     * whenComplete action executes on exceptional completion, propagating
3458 <     * source result.
3459 <     */
3460 <    public void testWhenComplete2() {
3164 <        final AtomicInteger a = new AtomicInteger();
3165 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3166 <        CompletableFuture<Integer> g =
3167 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3168 <        f.completeExceptionally(new CFException());
3169 <        assertTrue(f.isCompletedExceptionally());
3170 <        assertTrue(g.isCompletedExceptionally());
3171 <        assertEquals(a.get(), 1);
3172 <    }
3173 <
3174 <    /**
3175 <     * If a whenComplete action throws an exception when triggered by
3176 <     * a normal completion, it completes exceptionally
3177 <     */
3178 <    public void testWhenComplete3() {
3179 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3180 <        CompletableFuture<Integer> g =
3181 <            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 <    }
3203 <
3204 <    /**
3205 <     * whenCompleteAsync action executes on exceptional completion, propagating
3206 <     * source result.
3207 <     */
3208 <    public void testWhenCompleteAsync2() {
3209 <        final AtomicInteger a = new AtomicInteger();
3210 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3211 <        CompletableFuture<Integer> g =
3212 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3213 <        f.completeExceptionally(new CFException());
3214 <        checkCompletedWithWrappedCFException(f);
3215 <        checkCompletedWithWrappedCFException(g);
3216 <    }
3445 >    public void testWhenComplete_normalCompletion1() {
3446 >        for (ExecutionMode m : ExecutionMode.values())
3447 >        for (boolean createIncomplete : new boolean[] { true, false })
3448 >        for (Integer v1 : new Integer[] { 1, null })
3449 >    {
3450 >        final AtomicInteger a = new AtomicInteger(0);
3451 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3452 >        if (!createIncomplete) f.complete(v1);
3453 >        final CompletableFuture<Integer> g = m.whenComplete
3454 >            (f,
3455 >             (Integer x, Throwable t) -> {
3456 >                threadAssertSame(x, v1);
3457 >                threadAssertNull(t);
3458 >                a.getAndIncrement();
3459 >            });
3460 >        if (createIncomplete) f.complete(v1);
3461  
3462 <    /**
3463 <     * If a whenCompleteAsync action throws an exception when
3464 <     * triggered by a normal completion, it completes exceptionally
3465 <     */
3222 <    public void testWhenCompleteAsync3() {
3223 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3224 <        CompletableFuture<Integer> g =
3225 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3226 <                           { throw new CFException(); } );
3227 <        f.complete(three);
3228 <        checkCompletedNormally(f, three);
3229 <        checkCompletedWithWrappedCFException(g);
3230 <    }
3462 >        checkCompletedNormally(g, v1);
3463 >        checkCompletedNormally(f, v1);
3464 >        assertEquals(1, a.get());
3465 >    }}
3466  
3467      /**
3468 <     * whenCompleteAsync action executes on normal completion, propagating
3468 >     * whenComplete action executes on exceptional completion, propagating
3469       * source result.
3470       */
3471 <    public void testWhenCompleteAsync1e() {
3472 <        final AtomicInteger a = new AtomicInteger();
3473 <        ThreadExecutor exec = new ThreadExecutor();
3474 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3475 <        CompletableFuture<Integer> g =
3476 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3477 <                                exec);
3478 <        f.complete(three);
3479 <        checkCompletedNormally(f, three);
3480 <        checkCompletedNormally(g, three);
3481 <        assertEquals(a.get(), 1);
3482 <    }
3471 >    public void testWhenComplete_exceptionalCompletion() {
3472 >        for (ExecutionMode m : ExecutionMode.values())
3473 >        for (boolean createIncomplete : new boolean[] { true, false })
3474 >        for (Integer v1 : new Integer[] { 1, null })
3475 >    {
3476 >        final AtomicInteger a = new AtomicInteger(0);
3477 >        final CFException ex = new CFException();
3478 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3479 >        if (!createIncomplete) f.completeExceptionally(ex);
3480 >        final CompletableFuture<Integer> g = m.whenComplete
3481 >            (f,
3482 >             (Integer x, Throwable t) -> {
3483 >                threadAssertNull(x);
3484 >                threadAssertSame(t, ex);
3485 >                a.getAndIncrement();
3486 >            });
3487 >        if (createIncomplete) f.completeExceptionally(ex);
3488 >        checkCompletedWithWrappedCFException(f, ex);
3489 >        checkCompletedWithWrappedCFException(g, ex);
3490 >        assertEquals(1, a.get());
3491 >    }}
3492  
3493      /**
3494 <     * whenCompleteAsync action executes on exceptional completion, propagating
3495 <     * source result.
3494 >     * whenComplete action executes on cancelled source, propagating
3495 >     * CancellationException.
3496       */
3497 <    public void testWhenCompleteAsync2e() {
3498 <        final AtomicInteger a = new AtomicInteger();
3499 <        ThreadExecutor exec = new ThreadExecutor();
3500 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3501 <        CompletableFuture<Integer> g =
3502 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3503 <                                exec);
3504 <        f.completeExceptionally(new CFException());
3505 <        checkCompletedWithWrappedCFException(f);
3506 <        checkCompletedWithWrappedCFException(g);
3507 <    }
3497 >    public void testWhenComplete_sourceCancelled() {
3498 >        for (ExecutionMode m : ExecutionMode.values())
3499 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3500 >        for (boolean createIncomplete : new boolean[] { true, false })
3501 >    {
3502 >        final AtomicInteger a = new AtomicInteger(0);
3503 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3504 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3505 >        final CompletableFuture<Integer> g = m.whenComplete
3506 >            (f,
3507 >             (Integer x, Throwable t) -> {
3508 >                threadAssertNull(x);
3509 >                threadAssertTrue(t instanceof CancellationException);
3510 >                a.getAndIncrement();
3511 >            });
3512 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3513  
3514 <    /**
3515 <     * If a whenCompleteAsync action throws an exception when triggered
3516 <     * by a normal completion, it completes exceptionally
3517 <     */
3518 <    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);
3279 <    }
3514 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3515 >        checkCompletedWithWrappedCancellationException(g);
3516 >        checkCancelled(f);
3517 >        assertEquals(1, a.get());
3518 >    }}
3519  
3520      /**
3521 <     * handleAsync action completes normally with function value on
3522 <     * either normal or exceptional completion of source
3521 >     * If a whenComplete action throws an exception when triggered by
3522 >     * a normal completion, it completes exceptionally
3523       */
3524 <    public void testHandleAsync() {
3525 <        CompletableFuture<Integer> f, g;
3526 <        IntegerHandler r;
3527 <
3528 <        f = new CompletableFuture<>();
3529 <        g = f.handleAsync(r = new IntegerHandler());
3530 <        assertFalse(r.ran);
3531 <        f.completeExceptionally(new CFException());
3532 <        checkCompletedWithWrappedCFException(f);
3533 <        checkCompletedNormally(g, three);
3534 <        assertTrue(r.ran);
3535 <
3536 <        f = new CompletableFuture<>();
3537 <        g = f.handleAsync(r = new IntegerHandler());
3538 <        assertFalse(r.ran);
3539 <        f.completeExceptionally(new CFException());
3540 <        checkCompletedWithWrappedCFException(f);
3541 <        checkCompletedNormally(g, three);
3542 <        assertTrue(r.ran);
3543 <
3544 <        f = new CompletableFuture<>();
3545 <        g = f.handleAsync(r = new IntegerHandler());
3307 <        assertFalse(r.ran);
3308 <        f.complete(one);
3309 <        checkCompletedNormally(f, one);
3310 <        checkCompletedNormally(g, two);
3311 <        assertTrue(r.ran);
3312 <
3313 <        f = new CompletableFuture<>();
3314 <        g = f.handleAsync(r = new IntegerHandler());
3315 <        assertFalse(r.ran);
3316 <        f.complete(one);
3317 <        checkCompletedNormally(f, one);
3318 <        checkCompletedNormally(g, two);
3319 <        assertTrue(r.ran);
3320 <    }
3524 >    public void testWhenComplete_actionFailed() {
3525 >        for (boolean createIncomplete : new boolean[] { true, false })
3526 >        for (ExecutionMode m : ExecutionMode.values())
3527 >        for (Integer v1 : new Integer[] { 1, null })
3528 >    {
3529 >        final AtomicInteger a = new AtomicInteger(0);
3530 >        final CFException ex = new CFException();
3531 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3532 >        if (!createIncomplete) f.complete(v1);
3533 >        final CompletableFuture<Integer> g = m.whenComplete
3534 >            (f,
3535 >             (Integer x, Throwable t) -> {
3536 >                threadAssertSame(x, v1);
3537 >                threadAssertNull(t);
3538 >                a.getAndIncrement();
3539 >                throw ex;
3540 >            });
3541 >        if (createIncomplete) f.complete(v1);
3542 >        checkCompletedNormally(f, v1);
3543 >        checkCompletedWithWrappedCFException(g, ex);
3544 >        assertEquals(1, a.get());
3545 >    }}
3546  
3547      /**
3548 <     * handleAsync action with Executor completes normally with
3549 <     * function value on either normal or exceptional completion of
3550 <     * source
3548 >     * If a whenComplete action throws an exception when triggered by
3549 >     * a source completion that also throws an exception, the source
3550 >     * exception takes precedence.
3551       */
3552 <    public void testHandleAsync2() {
3553 <        CompletableFuture<Integer> f, g;
3554 <        ThreadExecutor exec = new ThreadExecutor();
3555 <        IntegerHandler r;
3556 <
3557 <        f = new CompletableFuture<>();
3558 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3559 <        assertFalse(r.ran);
3560 <        f.completeExceptionally(new CFException());
3336 <        checkCompletedWithWrappedCFException(f);
3337 <        checkCompletedNormally(g, three);
3338 <        assertTrue(r.ran);
3339 <
3340 <        f = new CompletableFuture<>();
3341 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3342 <        assertFalse(r.ran);
3343 <        f.completeExceptionally(new CFException());
3344 <        checkCompletedWithWrappedCFException(f);
3345 <        checkCompletedNormally(g, three);
3346 <        assertTrue(r.ran);
3347 <
3348 <        f = new CompletableFuture<>();
3349 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3350 <        assertFalse(r.ran);
3351 <        f.complete(one);
3352 <        checkCompletedNormally(f, one);
3353 <        checkCompletedNormally(g, two);
3354 <        assertTrue(r.ran);
3552 >    public void testWhenComplete_actionFailedSourceFailed() {
3553 >        for (boolean createIncomplete : new boolean[] { true, false })
3554 >        for (ExecutionMode m : ExecutionMode.values())
3555 >        for (Integer v1 : new Integer[] { 1, null })
3556 >    {
3557 >        final AtomicInteger a = new AtomicInteger(0);
3558 >        final CFException ex1 = new CFException();
3559 >        final CFException ex2 = new CFException();
3560 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3561  
3562 <        f = new CompletableFuture<>();
3563 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3564 <        assertFalse(r.ran);
3565 <        f.complete(one);
3566 <        checkCompletedNormally(f, one);
3567 <        checkCompletedNormally(g, two);
3568 <        assertTrue(r.ran);
3569 <    }
3562 >        if (!createIncomplete) f.completeExceptionally(ex1);
3563 >        final CompletableFuture<Integer> g = m.whenComplete
3564 >            (f,
3565 >             (Integer x, Throwable t) -> {
3566 >                threadAssertSame(t, ex1);
3567 >                threadAssertNull(x);
3568 >                a.getAndIncrement();
3569 >                throw ex2;
3570 >            });
3571 >        if (createIncomplete) f.completeExceptionally(ex1);
3572 >
3573 >        checkCompletedWithWrappedCFException(f, ex1);
3574 >        checkCompletedWithWrappedCFException(g, ex1);
3575 >        assertEquals(1, a.get());
3576 >    }}
3577  
3578   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines