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.27 by jsr166, Mon Jul 8 21:12:28 2013 UTC vs.
Revision 1.49 by jsr166, Mon Jun 2 19:20:51 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.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 102 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 +                                              CFException ex) {
110 +        try {
111 +            f.get(LONG_DELAY_MS, MILLISECONDS);
112 +            shouldThrow();
113 +        } catch (ExecutionException success) {
114 +            assertSame(ex, success.getCause());
115 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
116 +        try {
117 +            f.join();
118 +            shouldThrow();
119 +        } catch (CompletionException success) {
120 +            assertSame(ex, success.getCause());
121 +        }
122 +        try {
123 +            f.getNow(null);
124 +            shouldThrow();
125 +        } catch (CompletionException success) {
126 +            assertSame(ex, success.getCause());
127 +        }
128 +        try {
129 +            f.get();
130 +            shouldThrow();
131 +        } catch (ExecutionException success) {
132 +            assertSame(ex, success.getCause());
133 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +        assertTrue(f.isDone());
135 +        assertFalse(f.isCancelled());
136 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
137 +    }
138 +
139      void checkCancelled(CompletableFuture<?> f) {
140          try {
141              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 215 | Line 249 | public class CompletableFutureTest exten
249          f = new CompletableFuture<>();
250          f.obtrudeValue(three);
251          checkCompletedNormally(f, three);
252 +        f.obtrudeValue(null);
253 +        checkCompletedNormally(f, null);
254          f = new CompletableFuture<>();
255          f.completeExceptionally(new CFException());
256          f.obtrudeValue(four);
# Line 247 | Line 283 | public class CompletableFutureTest exten
283       */
284      public void testGetNumberOfDependents() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286 <        assertEquals(f.getNumberOfDependents(), 0);
286 >        assertEquals(0, f.getNumberOfDependents());
287          CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290          CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
291 >        assertEquals(2, f.getNumberOfDependents());
292          f.complete(1);
293          checkCompletedNormally(g, null);
294 <        assertEquals(f.getNumberOfDependents(), 0);
295 <        assertEquals(g.getNumberOfDependents(), 0);
294 >        assertEquals(0, f.getNumberOfDependents());
295 >        assertEquals(0, g.getNumberOfDependents());
296      }
297  
262
298      /**
299       * toString indicates current completion state
300       */
# Line 287 | Line 322 | public class CompletableFutureTest exten
322  
323      // Choose non-commutative actions for better coverage
324  
325 +    // A non-commutative function that handles and produces null values as well.
326 +    static Integer subtract(Integer x, Integer y) {
327 +        return (x == null && y == null) ? null :
328 +            ((x == null) ? 42 : x.intValue())
329 +            - ((y == null) ? 99 : y.intValue());
330 +    }
331 +
332 +    // A function that handles and produces null values as well.
333 +    static Integer inc(Integer x) {
334 +        return (x == null) ? null : x + 1;
335 +    }
336 +
337      static final Supplier<Integer> supplyOne =
338          () -> Integer.valueOf(1);
339      static final Function<Integer, Integer> inc =
340          (Integer x) -> Integer.valueOf(x.intValue() + 1);
341      static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
342 >        (Integer x, Integer y) -> subtract(x, y);
343      static final class IncAction implements Consumer<Integer> {
344 <        int value;
345 <        public void accept(Integer x) { value = x.intValue() + 1; }
344 >        int invocationCount = 0;
345 >        Integer value;
346 >        public void accept(Integer x) {
347 >            invocationCount++;
348 >            value = inc(x);
349 >        }
350 >    }
351 >    static final class IncFunction implements Function<Integer,Integer> {
352 >        int invocationCount = 0;
353 >        Integer value;
354 >        public Integer apply(Integer x) {
355 >            invocationCount++;
356 >            return value = inc(x);
357 >        }
358      }
359      static final class SubtractAction implements BiConsumer<Integer, Integer> {
360 <        int value;
360 >        int invocationCount = 0;
361 >        Integer value;
362 >        // Check this action was invoked exactly once when result is computed.
363          public void accept(Integer x, Integer y) {
364 <            value = x.intValue() - y.intValue();
364 >            invocationCount++;
365 >            value = subtract(x, y);
366 >        }
367 >    }
368 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
369 >        int invocationCount = 0;
370 >        Integer value;
371 >        // Check this action was invoked exactly once when result is computed.
372 >        public Integer apply(Integer x, Integer y) {
373 >            invocationCount++;
374 >            return value = subtract(x, y);
375          }
376      }
377      static final class Noop implements Runnable {
378 <        boolean ran;
379 <        public void run() { ran = true; }
378 >        int invocationCount = 0;
379 >        public void run() {
380 >            invocationCount++;
381 >        }
382      }
383  
384      static final class FailingSupplier implements Supplier<Integer> {
385 <        boolean ran;
386 <        public Integer get() { ran = true; throw new CFException(); }
385 >        int invocationCount = 0;
386 >        public Integer get() {
387 >            invocationCount++;
388 >            throw new CFException();
389 >        }
390      }
391      static final class FailingConsumer implements Consumer<Integer> {
392 <        boolean ran;
393 <        public void accept(Integer x) { ran = true; throw new CFException(); }
392 >        int invocationCount = 0;
393 >        public void accept(Integer x) {
394 >            invocationCount++;
395 >            throw new CFException();
396 >        }
397      }
398      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
399 <        boolean ran;
400 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
399 >        int invocationCount = 0;
400 >        public void accept(Integer x, Integer y) {
401 >            invocationCount++;
402 >            throw new CFException();
403 >        }
404      }
405      static final class FailingFunction implements Function<Integer, Integer> {
406 <        boolean ran;
407 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
406 >        int invocationCount = 0;
407 >        public Integer apply(Integer x) {
408 >            invocationCount++;
409 >            throw new CFException();
410 >        }
411      }
412      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
413 <        boolean ran;
414 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
413 >        int invocationCount = 0;
414 >        public Integer apply(Integer x, Integer y) {
415 >            invocationCount++;
416 >            throw new CFException();
417 >        }
418      }
419      static final class FailingNoop implements Runnable {
420 <        boolean ran;
421 <        public void run() { ran = true; throw new CFException(); }
420 >        int invocationCount = 0;
421 >        public void run() {
422 >            invocationCount++;
423 >            throw new CFException();
424 >        }
425      }
426  
427      static final class CompletableFutureInc
428          implements Function<Integer, CompletableFuture<Integer>> {
429 <        boolean ran;
429 >        int invocationCount = 0;
430          public CompletableFuture<Integer> apply(Integer x) {
431 <            ran = true;
431 >            invocationCount++;
432              CompletableFuture<Integer> f = new CompletableFuture<>();
433 <            f.complete(Integer.valueOf(x.intValue() + 1));
433 >            f.complete(inc(x));
434              return f;
435          }
436      }
437  
438      static final class FailingCompletableFutureFunction
439          implements Function<Integer, CompletableFuture<Integer>> {
440 <        boolean ran;
440 >        int invocationCount = 0;
441          public CompletableFuture<Integer> apply(Integer x) {
442 <            ran = true; throw new CFException();
442 >            invocationCount++;
443 >            throw new CFException();
444          }
445      }
446  
# Line 362 | Line 454 | public class CompletableFutureTest exten
454          }
455      }
456  
457 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
458 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
459 <    }
457 >    /**
458 >     * Permits the testing of parallel code for the 3 different
459 >     * execution modes without repeating all the testing code.
460 >     */
461 >    enum ExecutionMode {
462 >        DEFAULT {
463 >            public void checkExecutionMode() {
464 >                assertNull(ForkJoinTask.getPool());
465 >            }
466 >            public <T> CompletableFuture<Void> thenRun
467 >                (CompletableFuture<T> f, Runnable a) {
468 >                return f.thenRun(a);
469 >            }
470 >            public <T> CompletableFuture<Void> thenAccept
471 >                (CompletableFuture<T> f, Consumer<? super T> a) {
472 >                return f.thenAccept(a);
473 >            }
474 >            public <T,U> CompletableFuture<U> thenApply
475 >                (CompletableFuture<T> f, Function<? super T,U> a) {
476 >                return f.thenApply(a);
477 >            }
478 >            public <T,U> CompletableFuture<U> thenCompose
479 >                (CompletableFuture<T> f,
480 >                 Function<? super T,? extends CompletionStage<U>> a) {
481 >                return f.thenCompose(a);
482 >            }
483 >            public <T,U> CompletableFuture<U> handle
484 >                (CompletableFuture<T> f,
485 >                 BiFunction<? super T,Throwable,? extends U> a) {
486 >                return f.handle(a);
487 >            }
488 >            public <T> CompletableFuture<T> whenComplete
489 >                (CompletableFuture<T> f,
490 >                 BiConsumer<? super T,? super Throwable> a) {
491 >                return f.whenComplete(a);
492 >            }
493 >            public <T,U> CompletableFuture<Void> runAfterBoth
494 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
495 >                return f.runAfterBoth(g, a);
496 >            }
497 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
498 >                (CompletableFuture<T> f,
499 >                 CompletionStage<? extends U> g,
500 >                 BiConsumer<? super T,? super U> a) {
501 >                return f.thenAcceptBoth(g, a);
502 >            }
503 >            public <T,U,V> CompletableFuture<V> thenCombine
504 >                (CompletableFuture<T> f,
505 >                 CompletionStage<? extends U> g,
506 >                 BiFunction<? super T,? super U,? extends V> a) {
507 >                return f.thenCombine(g, a);
508 >            }
509 >            public <T> CompletableFuture<Void> runAfterEither
510 >                (CompletableFuture<T> f,
511 >                 CompletionStage<?> g,
512 >                 java.lang.Runnable a) {
513 >                return f.runAfterEither(g, a);
514 >            }
515 >            public <T> CompletableFuture<Void> acceptEither
516 >                (CompletableFuture<T> f,
517 >                 CompletionStage<? extends T> g,
518 >                 Consumer<? super T> a) {
519 >                return f.acceptEither(g, a);
520 >            }
521 >            public <T,U> CompletableFuture<U> applyToEither
522 >                (CompletableFuture<T> f,
523 >                 CompletionStage<? extends T> g,
524 >                 Function<? super T,U> a) {
525 >                return f.applyToEither(g, a);
526 >            }
527 >        },
528  
529 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
530 <        boolean ran;
531 <        public Integer apply(Integer x, Throwable t) {
532 <            ran = true;
533 <            return (t == null) ? two : three;
534 <        }
529 >        ASYNC {
530 >            public void checkExecutionMode() {
531 >                assertSame(ForkJoinPool.commonPool(),
532 >                           ForkJoinTask.getPool());
533 >            }
534 >            public <T> CompletableFuture<Void> thenRun
535 >                (CompletableFuture<T> f, Runnable a) {
536 >                return f.thenRunAsync(a);
537 >            }
538 >            public <T> CompletableFuture<Void> thenAccept
539 >                (CompletableFuture<T> f, Consumer<? super T> a) {
540 >                return f.thenAcceptAsync(a);
541 >            }
542 >            public <T,U> CompletableFuture<U> thenApply
543 >                (CompletableFuture<T> f, Function<? super T,U> a) {
544 >                return f.thenApplyAsync(a);
545 >            }
546 >            public <T,U> CompletableFuture<U> thenCompose
547 >                (CompletableFuture<T> f,
548 >                 Function<? super T,? extends CompletionStage<U>> a) {
549 >                return f.thenComposeAsync(a);
550 >            }
551 >            public <T,U> CompletableFuture<U> handle
552 >                (CompletableFuture<T> f,
553 >                 BiFunction<? super T,Throwable,? extends U> a) {
554 >                return f.handleAsync(a);
555 >            }
556 >            public <T> CompletableFuture<T> whenComplete
557 >                (CompletableFuture<T> f,
558 >                 BiConsumer<? super T,? super Throwable> a) {
559 >                return f.whenCompleteAsync(a);
560 >            }
561 >            public <T,U> CompletableFuture<Void> runAfterBoth
562 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
563 >                return f.runAfterBothAsync(g, a);
564 >            }
565 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
566 >                (CompletableFuture<T> f,
567 >                 CompletionStage<? extends U> g,
568 >                 BiConsumer<? super T,? super U> a) {
569 >                return f.thenAcceptBothAsync(g, a);
570 >            }
571 >            public <T,U,V> CompletableFuture<V> thenCombine
572 >                (CompletableFuture<T> f,
573 >                 CompletionStage<? extends U> g,
574 >                 BiFunction<? super T,? super U,? extends V> a) {
575 >                return f.thenCombineAsync(g, a);
576 >            }
577 >            public <T> CompletableFuture<Void> runAfterEither
578 >                (CompletableFuture<T> f,
579 >                 CompletionStage<?> g,
580 >                 java.lang.Runnable a) {
581 >                return f.runAfterEitherAsync(g, a);
582 >            }
583 >            public <T> CompletableFuture<Void> acceptEither
584 >                (CompletableFuture<T> f,
585 >                 CompletionStage<? extends T> g,
586 >                 Consumer<? super T> a) {
587 >                return f.acceptEitherAsync(g, a);
588 >            }
589 >            public <T,U> CompletableFuture<U> applyToEither
590 >                (CompletableFuture<T> f,
591 >                 CompletionStage<? extends T> g,
592 >                 Function<? super T,U> a) {
593 >                return f.applyToEitherAsync(g, a);
594 >            }
595 >        },
596 >
597 >        EXECUTOR {
598 >            public void checkExecutionMode() {
599 >                //TODO
600 >            }
601 >            public <T> CompletableFuture<Void> thenRun
602 >                (CompletableFuture<T> f, Runnable a) {
603 >                return f.thenRunAsync(a, new ThreadExecutor());
604 >            }
605 >            public <T> CompletableFuture<Void> thenAccept
606 >                (CompletableFuture<T> f, Consumer<? super T> a) {
607 >                return f.thenAcceptAsync(a, new ThreadExecutor());
608 >            }
609 >            public <T,U> CompletableFuture<U> thenApply
610 >                (CompletableFuture<T> f, Function<? super T,U> a) {
611 >                return f.thenApplyAsync(a, new ThreadExecutor());
612 >            }
613 >            public <T,U> CompletableFuture<U> thenCompose
614 >                (CompletableFuture<T> f,
615 >                 Function<? super T,? extends CompletionStage<U>> a) {
616 >                return f.thenComposeAsync(a, new ThreadExecutor());
617 >            }
618 >            public <T,U> CompletableFuture<U> handle
619 >                (CompletableFuture<T> f,
620 >                 BiFunction<? super T,Throwable,? extends U> a) {
621 >                return f.handleAsync(a, new ThreadExecutor());
622 >            }
623 >            public <T> CompletableFuture<T> whenComplete
624 >                (CompletableFuture<T> f,
625 >                 BiConsumer<? super T,? super Throwable> a) {
626 >                return f.whenCompleteAsync(a, new ThreadExecutor());
627 >            }
628 >            public <T,U> CompletableFuture<Void> runAfterBoth
629 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
630 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
631 >            }
632 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
633 >                (CompletableFuture<T> f,
634 >                 CompletionStage<? extends U> g,
635 >                 BiConsumer<? super T,? super U> a) {
636 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
637 >            }
638 >            public <T,U,V> CompletableFuture<V> thenCombine
639 >                (CompletableFuture<T> f,
640 >                 CompletionStage<? extends U> g,
641 >                 BiFunction<? super T,? super U,? extends V> a) {
642 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
643 >            }
644 >            public <T> CompletableFuture<Void> runAfterEither
645 >                (CompletableFuture<T> f,
646 >                 CompletionStage<?> g,
647 >                 java.lang.Runnable a) {
648 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
649 >            }
650 >            public <T> CompletableFuture<Void> acceptEither
651 >                (CompletableFuture<T> f,
652 >                 CompletionStage<? extends T> g,
653 >                 Consumer<? super T> a) {
654 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
655 >            }
656 >            public <T,U> CompletableFuture<U> applyToEither
657 >                (CompletableFuture<T> f,
658 >                 CompletionStage<? extends T> g,
659 >                 Function<? super T,U> a) {
660 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
661 >            }
662 >        };
663 >
664 >        public abstract void checkExecutionMode();
665 >        public abstract <T> CompletableFuture<Void> thenRun
666 >            (CompletableFuture<T> f, Runnable a);
667 >        public abstract <T> CompletableFuture<Void> thenAccept
668 >            (CompletableFuture<T> f, Consumer<? super T> a);
669 >        public abstract <T,U> CompletableFuture<U> thenApply
670 >            (CompletableFuture<T> f, Function<? super T,U> a);
671 >        public abstract <T,U> CompletableFuture<U> thenCompose
672 >            (CompletableFuture<T> f,
673 >             Function<? super T,? extends CompletionStage<U>> a);
674 >        public abstract <T,U> CompletableFuture<U> handle
675 >            (CompletableFuture<T> f,
676 >             BiFunction<? super T,Throwable,? extends U> a);
677 >        public abstract <T> CompletableFuture<T> whenComplete
678 >            (CompletableFuture<T> f,
679 >             BiConsumer<? super T,? super Throwable> a);
680 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
681 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
682 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
683 >            (CompletableFuture<T> f,
684 >             CompletionStage<? extends U> g,
685 >             BiConsumer<? super T,? super U> a);
686 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
687 >            (CompletableFuture<T> f,
688 >             CompletionStage<? extends U> g,
689 >             BiFunction<? super T,? super U,? extends V> a);
690 >        public abstract <T> CompletableFuture<Void> runAfterEither
691 >            (CompletableFuture<T> f,
692 >             CompletionStage<?> g,
693 >             java.lang.Runnable a);
694 >        public abstract <T> CompletableFuture<Void> acceptEither
695 >            (CompletableFuture<T> f,
696 >             CompletionStage<? extends T> g,
697 >             Consumer<? super T> a);
698 >        public abstract <T,U> CompletableFuture<U> applyToEither
699 >            (CompletableFuture<T> f,
700 >             CompletionStage<? extends T> g,
701 >             Function<? super T,U> a);
702      }
703  
704 +    /**
705 +     * exceptionally action is not invoked when source completes
706 +     * normally, and source result is propagated
707 +     */
708 +    public void testExceptionally_normalCompletion() {
709 +        for (boolean createIncomplete : new boolean[] { true, false })
710 +        for (Integer v1 : new Integer[] { 1, null })
711 +    {
712 +        final AtomicInteger a = new AtomicInteger(0);
713 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
714 +        if (!createIncomplete) f.complete(v1);
715 +        final CompletableFuture<Integer> g = f.exceptionally
716 +            ((Throwable t) -> {
717 +                // Should not be called
718 +                a.getAndIncrement();
719 +                throw new AssertionError();
720 +            });
721 +        if (createIncomplete) f.complete(v1);
722 +
723 +        checkCompletedNormally(g, v1);
724 +        checkCompletedNormally(f, v1);
725 +        assertEquals(0, a.get());
726 +    }}
727 +
728  
729      /**
730       * exceptionally action completes with function value on source
731 <     * exception;  otherwise with source value
731 >     * exception
732       */
733 <    public void testExceptionally() {
734 <        CompletableFuture<Integer> f = new CompletableFuture<>();
735 <        ExceptionToInteger r = new ExceptionToInteger();
736 <        CompletableFuture<Integer> g = f.exceptionally(r);
737 <        f.completeExceptionally(new CFException());
738 <        checkCompletedNormally(g, three);
739 <
740 <        f = new CompletableFuture<>();
741 <        r = new ExceptionToInteger();
742 <        g = f.exceptionally(r);
743 <        f.complete(one);
744 <        checkCompletedNormally(g, one);
745 <    }
733 >    public void testExceptionally_exceptionalCompletion() {
734 >        for (boolean createIncomplete : new boolean[] { true, false })
735 >        for (Integer v1 : new Integer[] { 1, null })
736 >    {
737 >        final AtomicInteger a = new AtomicInteger(0);
738 >        final CFException ex = new CFException();
739 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
740 >        if (!createIncomplete) f.completeExceptionally(ex);
741 >        final CompletableFuture<Integer> g = f.exceptionally
742 >            ((Throwable t) -> {
743 >                threadAssertSame(t, ex);
744 >                a.getAndIncrement();
745 >                return v1;
746 >            });
747 >        if (createIncomplete) f.completeExceptionally(ex);
748 >
749 >        checkCompletedNormally(g, v1);
750 >        assertEquals(1, a.get());
751 >    }}
752 >
753 >    public void testExceptionally_exceptionalCompletionActionFailed() {
754 >        for (boolean createIncomplete : new boolean[] { true, false })
755 >        for (Integer v1 : new Integer[] { 1, null })
756 >    {
757 >        final AtomicInteger a = new AtomicInteger(0);
758 >        final CFException ex1 = new CFException();
759 >        final CFException ex2 = new CFException();
760 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
761 >        if (!createIncomplete) f.completeExceptionally(ex1);
762 >        final CompletableFuture<Integer> g = f.exceptionally
763 >            ((Throwable t) -> {
764 >                threadAssertSame(t, ex1);
765 >                a.getAndIncrement();
766 >                throw ex2;
767 >            });
768 >        if (createIncomplete) f.completeExceptionally(ex1);
769 >
770 >        checkCompletedWithWrappedCFException(g, ex2);
771 >        assertEquals(1, a.get());
772 >    }}
773 >
774 >    /**
775 >     * handle action completes normally with function value on normal
776 >     * completion of source
777 >     */
778 >    public void testHandle_normalCompletion() {
779 >        for (ExecutionMode m : ExecutionMode.values())
780 >        for (boolean createIncomplete : new boolean[] { true, false })
781 >        for (Integer v1 : new Integer[] { 1, null })
782 >    {
783 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
784 >        final AtomicInteger a = new AtomicInteger(0);
785 >        if (!createIncomplete) f.complete(v1);
786 >        final CompletableFuture<Integer> g = m.handle
787 >            (f,
788 >             (Integer x, Throwable t) -> {
789 >                threadAssertSame(x, v1);
790 >                threadAssertNull(t);
791 >                a.getAndIncrement();
792 >                return inc(v1);
793 >            });
794 >        if (createIncomplete) f.complete(v1);
795 >
796 >        checkCompletedNormally(g, inc(v1));
797 >        checkCompletedNormally(f, v1);
798 >        assertEquals(1, a.get());
799 >    }}
800  
801      /**
802 <     * handle action completes normally with function value on either
803 <     * normal or exceptional completion of source
802 >     * handle action completes normally with function value on
803 >     * exceptional completion of source
804       */
805 <    public void testHandle() {
806 <        CompletableFuture<Integer> f, g;
807 <        IntegerHandler r;
805 >    public void testHandle_exceptionalCompletion() {
806 >        for (ExecutionMode m : ExecutionMode.values())
807 >        for (boolean createIncomplete : new boolean[] { true, false })
808 >        for (Integer v1 : new Integer[] { 1, null })
809 >    {
810 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
811 >        final AtomicInteger a = new AtomicInteger(0);
812 >        final CFException ex = new CFException();
813 >        if (!createIncomplete) f.completeExceptionally(ex);
814 >        final CompletableFuture<Integer> g = m.handle
815 >            (f,
816 >             (Integer x, Throwable t) -> {
817 >                threadAssertNull(x);
818 >                threadAssertSame(t, ex);
819 >                a.getAndIncrement();
820 >                return v1;
821 >            });
822 >        if (createIncomplete) f.completeExceptionally(ex);
823 >
824 >        checkCompletedNormally(g, v1);
825 >        checkCompletedWithWrappedCFException(f, ex);
826 >        assertEquals(1, a.get());
827 >    }}
828 >
829 >    /**
830 >     * handle action completes normally with function value on
831 >     * cancelled source
832 >     */
833 >    public void testHandle_sourceCancelled() {
834 >        for (ExecutionMode m : ExecutionMode.values())
835 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
836 >        for (boolean createIncomplete : new boolean[] { true, false })
837 >        for (Integer v1 : new Integer[] { 1, null })
838 >    {
839 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
840 >        final AtomicInteger a = new AtomicInteger(0);
841 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
842 >        final CompletableFuture<Integer> g = m.handle
843 >            (f,
844 >             (Integer x, Throwable t) -> {
845 >                threadAssertNull(x);
846 >                threadAssertTrue(t instanceof CancellationException);
847 >                a.getAndIncrement();
848 >                return v1;
849 >            });
850 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
851  
852 <        f = new CompletableFuture<>();
853 <        f.completeExceptionally(new CFException());
854 <        g = f.handle(r = new IntegerHandler());
855 <        assertTrue(r.ran);
408 <        checkCompletedNormally(g, three);
409 <
410 <        f = new CompletableFuture<>();
411 <        g = f.handle(r = new IntegerHandler());
412 <        assertFalse(r.ran);
413 <        f.completeExceptionally(new CFException());
414 <        checkCompletedNormally(g, three);
415 <        assertTrue(r.ran);
416 <
417 <        f = new CompletableFuture<>();
418 <        f.complete(one);
419 <        g = f.handle(r = new IntegerHandler());
420 <        assertTrue(r.ran);
421 <        checkCompletedNormally(g, two);
852 >        checkCompletedNormally(g, v1);
853 >        checkCancelled(f);
854 >        assertEquals(1, a.get());
855 >    }}
856  
857 <        f = new CompletableFuture<>();
858 <        g = f.handle(r = new IntegerHandler());
859 <        assertFalse(r.ran);
860 <        f.complete(one);
861 <        assertTrue(r.ran);
862 <        checkCompletedNormally(g, two);
863 <    }
857 >    /**
858 >     * handle result completes exceptionally if action does
859 >     */
860 >    public void testHandle_sourceFailedActionFailed() {
861 >        for (ExecutionMode m : ExecutionMode.values())
862 >        for (boolean createIncomplete : new boolean[] { true, false })
863 >    {
864 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
865 >        final AtomicInteger a = new AtomicInteger(0);
866 >        final CFException ex1 = new CFException();
867 >        final CFException ex2 = new CFException();
868 >        if (!createIncomplete) f.completeExceptionally(ex1);
869 >        final CompletableFuture<Integer> g = m.handle
870 >            (f,
871 >             (Integer x, Throwable t) -> {
872 >                threadAssertNull(x);
873 >                threadAssertSame(ex1, t);
874 >                a.getAndIncrement();
875 >                throw ex2;
876 >            });
877 >        if (createIncomplete) f.completeExceptionally(ex1);
878 >
879 >        checkCompletedWithWrappedCFException(g, ex2);
880 >        checkCompletedWithWrappedCFException(f, ex1);
881 >        assertEquals(1, a.get());
882 >    }}
883 >
884 >    public void testHandle_sourceCompletedNormallyActionFailed() {
885 >        for (ExecutionMode m : ExecutionMode.values())
886 >        for (boolean createIncomplete : new boolean[] { true, false })
887 >        for (Integer v1 : new Integer[] { 1, null })
888 >    {
889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
890 >        final AtomicInteger a = new AtomicInteger(0);
891 >        final CFException ex = new CFException();
892 >        if (!createIncomplete) f.complete(v1);
893 >        final CompletableFuture<Integer> g = m.handle
894 >            (f,
895 >             (Integer x, Throwable t) -> {
896 >                threadAssertSame(x, v1);
897 >                threadAssertNull(t);
898 >                a.getAndIncrement();
899 >                throw ex;
900 >            });
901 >        if (createIncomplete) f.complete(v1);
902 >
903 >        checkCompletedWithWrappedCFException(g, ex);
904 >        checkCompletedNormally(f, v1);
905 >        assertEquals(1, a.get());
906 >    }}
907  
908      /**
909       * runAsync completes after running Runnable
# Line 435 | Line 912 | public class CompletableFutureTest exten
912          Noop r = new Noop();
913          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
914          assertNull(f.join());
915 <        assertTrue(r.ran);
915 >        assertEquals(1, r.invocationCount);
916          checkCompletedNormally(f, null);
917      }
918  
# Line 447 | Line 924 | public class CompletableFutureTest exten
924          ThreadExecutor exec = new ThreadExecutor();
925          CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
926          assertNull(f.join());
927 <        assertTrue(r.ran);
927 >        assertEquals(1, r.invocationCount);
928          checkCompletedNormally(f, null);
929          assertEquals(1, exec.count.get());
930      }
# Line 459 | Line 936 | public class CompletableFutureTest exten
936          FailingNoop r = new FailingNoop();
937          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
938          checkCompletedWithWrappedCFException(f);
939 <        assertTrue(r.ran);
939 >        assertEquals(1, r.invocationCount);
940      }
941  
942      /**
# Line 489 | Line 966 | public class CompletableFutureTest exten
966          FailingSupplier r = new FailingSupplier();
967          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
968          checkCompletedWithWrappedCFException(f);
969 <        assertTrue(r.ran);
969 >        assertEquals(1, r.invocationCount);
970      }
971  
972      // seq completion methods
# Line 497 | Line 974 | public class CompletableFutureTest exten
974      /**
975       * thenRun result completes normally after normal completion of source
976       */
977 <    public void testThenRun() {
978 <        CompletableFuture<Integer> f;
979 <        CompletableFuture<Void> g;
980 <        Noop r;
977 >    public void testThenRun_normalCompletion() {
978 >        for (ExecutionMode m : ExecutionMode.values())
979 >        for (boolean createIncomplete : new boolean[] { true, false })
980 >        for (Integer v1 : new Integer[] { 1, null })
981 >    {
982 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
983 >        final Noop r = new Noop();
984 >        if (!createIncomplete) f.complete(v1);
985 >        final CompletableFuture<Void> g = m.thenRun(f, r);
986 >        if (createIncomplete) f.complete(v1);
987  
505        f = new CompletableFuture<>();
506        g = f.thenRun(r = new Noop());
507        f.complete(null);
988          checkCompletedNormally(g, null);
989 <        assertTrue(r.ran);
990 <
991 <        f = new CompletableFuture<>();
512 <        f.complete(null);
513 <        g = f.thenRun(r = new Noop());
514 <        checkCompletedNormally(g, null);
515 <        assertTrue(r.ran);
516 <    }
989 >        checkCompletedNormally(f, v1);
990 >        assertEquals(1, r.invocationCount);
991 >    }}
992  
993      /**
994       * thenRun result completes exceptionally after exceptional
995       * completion of source
996       */
997 <    public void testThenRun2() {
998 <        CompletableFuture<Integer> f;
999 <        CompletableFuture<Void> g;
1000 <        Noop r;
1001 <
1002 <        f = new CompletableFuture<>();
1003 <        g = f.thenRun(r = new Noop());
1004 <        f.completeExceptionally(new CFException());
1005 <        checkCompletedWithWrappedCFException(g);
1006 <        assertFalse(r.ran);
1007 <
1008 <        f = new CompletableFuture<>();
1009 <        f.completeExceptionally(new CFException());
1010 <        g = f.thenRun(r = new Noop());
1011 <        checkCompletedWithWrappedCFException(g);
537 <        assertFalse(r.ran);
538 <    }
997 >    public void testThenRun_exceptionalCompletion() {
998 >        for (ExecutionMode m : ExecutionMode.values())
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >    {
1001 >        final CFException ex = new CFException();
1002 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1003 >        final Noop r = new Noop();
1004 >        if (!createIncomplete) f.completeExceptionally(ex);
1005 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 >        if (createIncomplete) f.completeExceptionally(ex);
1007 >
1008 >        checkCompletedWithWrappedCFException(g, ex);
1009 >        checkCompletedWithWrappedCFException(f, ex);
1010 >        assertEquals(0, r.invocationCount);
1011 >    }}
1012  
1013      /**
1014 <     * thenRun result completes exceptionally if action does
1014 >     * thenRun result completes exceptionally if source cancelled
1015       */
1016 <    public void testThenRun3() {
1017 <        CompletableFuture<Integer> f;
1018 <        CompletableFuture<Void> g;
1019 <        FailingNoop r;
1020 <
1021 <        f = new CompletableFuture<>();
1022 <        g = f.thenRun(r = new FailingNoop());
1023 <        f.complete(null);
1024 <        checkCompletedWithWrappedCFException(g);
1016 >    public void testThenRun_sourceCancelled() {
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1020 >    {
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        final Noop r = new Noop();
1023 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 >        final CompletableFuture<Void> g = f.thenRun(r);
1025 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1026  
1027 <        f = new CompletableFuture<>();
1028 <        f.complete(null);
1029 <        g = f.thenRun(r = new FailingNoop());
1030 <        checkCompletedWithWrappedCFException(g);
557 <    }
1027 >        checkCompletedWithWrappedCancellationException(g);
1028 >        checkCancelled(f);
1029 >        assertEquals(0, r.invocationCount);
1030 >    }}
1031  
1032      /**
1033 <     * thenRun result completes exceptionally if source cancelled
1033 >     * thenRun result completes exceptionally if action does
1034       */
1035 <    public void testThenRun4() {
1036 <        CompletableFuture<Integer> f;
1037 <        CompletableFuture<Void> g;
1038 <        Noop r;
1035 >    public void testThenRun_actionFailed() {
1036 >        for (ExecutionMode m : ExecutionMode.values())
1037 >        for (boolean createIncomplete : new boolean[] { true, false })
1038 >        for (Integer v1 : new Integer[] { 1, null })
1039 >    {
1040 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1041 >        final FailingNoop r = new FailingNoop();
1042 >        if (!createIncomplete) f.complete(v1);
1043 >        final CompletableFuture<Void> g = f.thenRun(r);
1044 >        if (createIncomplete) f.complete(v1);
1045  
1046 <        f = new CompletableFuture<>();
1047 <        g = f.thenRun(r = new Noop());
1048 <        assertTrue(f.cancel(true));
570 <        checkCompletedWithWrappedCancellationException(g);
571 <
572 <        f = new CompletableFuture<>();
573 <        assertTrue(f.cancel(true));
574 <        g = f.thenRun(r = new Noop());
575 <        checkCompletedWithWrappedCancellationException(g);
576 <    }
1046 >        checkCompletedWithWrappedCFException(g);
1047 >        checkCompletedNormally(f, v1);
1048 >    }}
1049  
1050      /**
1051       * thenApply result completes normally after normal completion of source
1052       */
1053 <    public void testThenApply() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1055 <        CompletableFuture<Integer> g = f.thenApply(inc);
1056 <        f.complete(one);
1057 <        checkCompletedNormally(g, two);
1058 <    }
1053 >    public void testThenApply_normalCompletion() {
1054 >        for (ExecutionMode m : ExecutionMode.values())
1055 >        for (boolean createIncomplete : new boolean[] { true, false })
1056 >        for (Integer v1 : new Integer[] { 1, null })
1057 >    {
1058 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1059 >        final IncFunction r = new IncFunction();
1060 >        if (!createIncomplete) f.complete(v1);
1061 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1062 >        if (createIncomplete) {
1063 >            checkIncomplete(g);
1064 >            f.complete(v1);
1065 >        }
1066 >
1067 >        checkCompletedNormally(g, inc(v1));
1068 >        checkCompletedNormally(f, v1);
1069 >        assertEquals(1, r.invocationCount);
1070 >    }}
1071  
1072      /**
1073       * thenApply result completes exceptionally after exceptional
1074       * completion of source
1075       */
1076 <    public void testThenApply2() {
1077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1078 <        CompletableFuture<Integer> g = f.thenApply(inc);
1079 <        f.completeExceptionally(new CFException());
1080 <        checkCompletedWithWrappedCFException(g);
1081 <    }
1076 >    public void testThenApply_exceptionalCompletion() {
1077 >        for (ExecutionMode m : ExecutionMode.values())
1078 >        for (boolean createIncomplete : new boolean[] { true, false })
1079 >    {
1080 >        final CFException ex = new CFException();
1081 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1082 >        final IncFunction r = new IncFunction();
1083 >        if (!createIncomplete) f.completeExceptionally(ex);
1084 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1085 >        if (createIncomplete) f.completeExceptionally(ex);
1086 >
1087 >        checkCompletedWithWrappedCFException(g, ex);
1088 >        checkCompletedWithWrappedCFException(f, ex);
1089 >        assertEquals(0, r.invocationCount);
1090 >    }}
1091  
1092      /**
1093 <     * thenApply result completes exceptionally if action does
1093 >     * thenApply result completes exceptionally if source cancelled
1094       */
1095 <    public void testThenApply3() {
1096 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1097 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1098 <        f.complete(one);
1099 <        checkCompletedWithWrappedCFException(g);
1100 <    }
1095 >    public void testThenApply_sourceCancelled() {
1096 >        for (ExecutionMode m : ExecutionMode.values())
1097 >        for (boolean createIncomplete : new boolean[] { true, false })
1098 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1099 >    {
1100 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1101 >        final IncFunction r = new IncFunction();
1102 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1103 >        final CompletableFuture<Integer> g = f.thenApply(r);
1104 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1105 >
1106 >        checkCompletedWithWrappedCancellationException(g);
1107 >        checkCancelled(f);
1108 >        assertEquals(0, r.invocationCount);
1109 >    }}
1110  
1111      /**
1112 <     * thenApply result completes exceptionally if source cancelled
1112 >     * thenApply result completes exceptionally if action does
1113       */
1114 <    public void testThenApply4() {
1115 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1116 <        CompletableFuture<Integer> g = f.thenApply(inc);
1117 <        assertTrue(f.cancel(true));
1118 <        checkCompletedWithWrappedCancellationException(g);
1119 <    }
1114 >    public void testThenApply_actionFailed() {
1115 >        for (ExecutionMode m : ExecutionMode.values())
1116 >        for (boolean createIncomplete : new boolean[] { true, false })
1117 >        for (Integer v1 : new Integer[] { 1, null })
1118 >    {
1119 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1120 >        final FailingFunction r = new FailingFunction();
1121 >        if (!createIncomplete) f.complete(v1);
1122 >        final CompletableFuture<Integer> g = f.thenApply(r);
1123 >        if (createIncomplete) f.complete(v1);
1124 >
1125 >        checkCompletedWithWrappedCFException(g);
1126 >        checkCompletedNormally(f, v1);
1127 >    }}
1128  
1129      /**
1130       * thenAccept result completes normally after normal completion of source
# Line 625 | Line 1135 | public class CompletableFutureTest exten
1135          CompletableFuture<Void> g = f.thenAccept(r);
1136          f.complete(one);
1137          checkCompletedNormally(g, null);
1138 <        assertEquals(r.value, 2);
1138 >        assertEquals(r.value, (Integer) 2);
1139      }
1140  
1141      /**
# Line 649 | Line 1159 | public class CompletableFutureTest exten
1159          CompletableFuture<Void> g = f.thenAccept(r);
1160          f.complete(one);
1161          checkCompletedWithWrappedCFException(g);
1162 <        assertTrue(r.ran);
1162 >        assertEquals(1, r.invocationCount);
1163      }
1164  
1165      /**
# Line 663 | Line 1173 | public class CompletableFutureTest exten
1173          checkCompletedWithWrappedCancellationException(g);
1174      }
1175  
666
1176      /**
1177       * thenCombine result completes normally after normal completion
1178       * of sources
1179       */
1180 <    public void testThenCombine() {
1181 <        CompletableFuture<Integer> f, g, h;
1182 <
1183 <        f = new CompletableFuture<>();
1184 <        g = new CompletableFuture<>();
1185 <        h = f.thenCombine(g, subtract);
1186 <        f.complete(3);
1187 <        checkIncomplete(h);
1188 <        g.complete(1);
1189 <        checkCompletedNormally(h, 2);
1190 <
1191 <        f = new CompletableFuture<>();
1192 <        g = new CompletableFuture<>();
1193 <        h = f.thenCombine(g, subtract);
1194 <        g.complete(1);
1195 <        checkIncomplete(h);
1196 <        f.complete(3);
1197 <        checkCompletedNormally(h, 2);
1198 <
1199 <        f = new CompletableFuture<>();
1200 <        g = new CompletableFuture<>();
1201 <        g.complete(1);
1202 <        f.complete(3);
1203 <        h = f.thenCombine(g, subtract);
1204 <        checkCompletedNormally(h, 2);
1205 <    }
1180 >    public void testThenCombine_normalCompletion1() {
1181 >        for (boolean createIncomplete : new boolean[] { true, false })
1182 >        for (boolean fFirst : new boolean[] { true, false })
1183 >        for (ExecutionMode m : ExecutionMode.values())
1184 >        for (Integer v1 : new Integer[] { 1, null })
1185 >        for (Integer v2 : new Integer[] { 2, null })
1186 >    {
1187 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1188 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1189 >        final SubtractFunction r = new SubtractFunction();
1190 >        CompletableFuture<Integer> h = null;
1191 >        if (createIncomplete) h = m.thenCombine(f, g, r);
1192 >
1193 >        if (fFirst)
1194 >            f.complete(v1);
1195 >        else
1196 >            g.complete(v2);
1197 >        if (createIncomplete) checkIncomplete(h);
1198 >        assertEquals(0, r.invocationCount);
1199 >        if (!fFirst)
1200 >            f.complete(v1);
1201 >        else
1202 >            g.complete(v2);
1203 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
1204 >
1205 >        checkCompletedNormally(h, subtract(v1, v2));
1206 >        checkCompletedNormally(f, v1);
1207 >        checkCompletedNormally(g, v2);
1208 >        assertEquals(1, r.invocationCount);
1209 >    }}
1210  
1211      /**
1212       * thenCombine result completes exceptionally after exceptional
1213       * completion of either source
1214       */
1215 <    public void testThenCombine2() {
1216 <        CompletableFuture<Integer> f, g, h;
1217 <
1218 <        f = new CompletableFuture<>();
1219 <        g = new CompletableFuture<>();
1220 <        h = f.thenCombine(g, subtract);
1221 <        f.completeExceptionally(new CFException());
1222 <        checkIncomplete(h);
1223 <        g.complete(1);
1224 <        checkCompletedWithWrappedCFException(h);
1225 <
1226 <        f = new CompletableFuture<>();
1227 <        g = new CompletableFuture<>();
1228 <        h = f.thenCombine(g, subtract);
1229 <        g.completeExceptionally(new CFException());
1230 <        checkIncomplete(h);
1231 <        f.complete(3);
1232 <        checkCompletedWithWrappedCFException(h);
1233 <
1234 <        f = new CompletableFuture<>();
1235 <        g = new CompletableFuture<>();
1236 <        f.complete(3);
1237 <        g.completeExceptionally(new CFException());
1238 <        h = f.thenCombine(g, subtract);
1239 <        checkCompletedWithWrappedCFException(h);
1240 <
1241 <        f = new CompletableFuture<>();
1242 <        g = new CompletableFuture<>();
1243 <        f.completeExceptionally(new CFException());
1244 <        g.complete(3);
1245 <        h = f.thenCombine(g, subtract);
1246 <        checkCompletedWithWrappedCFException(h);
1247 <    }
1215 >    public void testThenCombine_exceptionalCompletion1() {
1216 >        for (ExecutionMode m : ExecutionMode.values())
1217 >        for (Integer v1 : new Integer[] { 1, null })
1218 >    {
1219 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1220 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1221 >        final SubtractFunction r = new SubtractFunction();
1222 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1223 >        final CFException ex = new CFException();
1224 >
1225 >        f.completeExceptionally(ex);
1226 >        checkIncomplete(h);
1227 >        g.complete(v1);
1228 >
1229 >        checkCompletedWithWrappedCFException(h, ex);
1230 >        checkCompletedWithWrappedCFException(f, ex);
1231 >        assertEquals(0, r.invocationCount);
1232 >        checkCompletedNormally(g, v1);
1233 >    }}
1234 >
1235 >    public void testThenCombine_exceptionalCompletion2() {
1236 >        for (ExecutionMode m : ExecutionMode.values())
1237 >        for (Integer v1 : new Integer[] { 1, null })
1238 >    {
1239 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1240 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1241 >        final SubtractFunction r = new SubtractFunction();
1242 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1243 >        final CFException ex = new CFException();
1244 >
1245 >        g.completeExceptionally(ex);
1246 >        checkIncomplete(h);
1247 >        f.complete(v1);
1248 >
1249 >        checkCompletedWithWrappedCFException(h, ex);
1250 >        checkCompletedWithWrappedCFException(g, ex);
1251 >        assertEquals(0, r.invocationCount);
1252 >        checkCompletedNormally(f, v1);
1253 >    }}
1254 >
1255 >    public void testThenCombine_exceptionalCompletion3() {
1256 >        for (ExecutionMode m : ExecutionMode.values())
1257 >        for (Integer v1 : new Integer[] { 1, null })
1258 >    {
1259 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1260 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1261 >        final SubtractFunction r = new SubtractFunction();
1262 >        final CFException ex = new CFException();
1263 >
1264 >        g.completeExceptionally(ex);
1265 >        f.complete(v1);
1266 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1267 >
1268 >        checkCompletedWithWrappedCFException(h, ex);
1269 >        checkCompletedWithWrappedCFException(g, ex);
1270 >        assertEquals(0, r.invocationCount);
1271 >        checkCompletedNormally(f, v1);
1272 >    }}
1273 >
1274 >    public void testThenCombine_exceptionalCompletion4() {
1275 >        for (ExecutionMode m : ExecutionMode.values())
1276 >        for (Integer v1 : new Integer[] { 1, null })
1277 >    {
1278 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280 >        final SubtractFunction r = new SubtractFunction();
1281 >        final CFException ex = new CFException();
1282 >
1283 >        f.completeExceptionally(ex);
1284 >        g.complete(v1);
1285 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1286 >
1287 >        checkCompletedWithWrappedCFException(h, ex);
1288 >        checkCompletedWithWrappedCFException(f, ex);
1289 >        assertEquals(0, r.invocationCount);
1290 >        checkCompletedNormally(g, v1);
1291 >    }}
1292  
1293      /**
1294       * thenCombine result completes exceptionally if action does
1295       */
1296 <    public void testThenCombine3() {
1297 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1298 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1299 <        FailingBiFunction r = new FailingBiFunction();
1300 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1301 <        f.complete(one);
1302 <        checkIncomplete(g);
1303 <        assertFalse(r.ran);
1304 <        f2.complete(two);
1305 <        checkCompletedWithWrappedCFException(g);
1306 <        assertTrue(r.ran);
1307 <    }
1296 >    public void testThenCombine_actionFailed1() {
1297 >        for (ExecutionMode m : ExecutionMode.values())
1298 >        for (Integer v1 : new Integer[] { 1, null })
1299 >        for (Integer v2 : new Integer[] { 2, null })
1300 >    {
1301 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1302 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1303 >        final FailingBiFunction r = new FailingBiFunction();
1304 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1305 >
1306 >        f.complete(v1);
1307 >        checkIncomplete(h);
1308 >        g.complete(v2);
1309 >
1310 >        checkCompletedWithWrappedCFException(h);
1311 >        checkCompletedNormally(f, v1);
1312 >        checkCompletedNormally(g, v2);
1313 >    }}
1314 >
1315 >    public void testThenCombine_actionFailed2() {
1316 >        for (ExecutionMode m : ExecutionMode.values())
1317 >        for (Integer v1 : new Integer[] { 1, null })
1318 >        for (Integer v2 : new Integer[] { 2, null })
1319 >    {
1320 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1321 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1322 >        final FailingBiFunction r = new FailingBiFunction();
1323 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1324 >
1325 >        g.complete(v2);
1326 >        checkIncomplete(h);
1327 >        f.complete(v1);
1328 >
1329 >        checkCompletedWithWrappedCFException(h);
1330 >        checkCompletedNormally(f, v1);
1331 >        checkCompletedNormally(g, v2);
1332 >    }}
1333  
1334      /**
1335       * thenCombine result completes exceptionally if either source cancelled
1336       */
1337 <    public void testThenCombine4() {
1338 <        CompletableFuture<Integer> f, g, h;
1337 >    public void testThenCombine_sourceCancelled1() {
1338 >        for (ExecutionMode m : ExecutionMode.values())
1339 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1340 >        for (Integer v1 : new Integer[] { 1, null })
1341 >    {
1342 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1343 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1344 >        final SubtractFunction r = new SubtractFunction();
1345 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1346  
1347 <        f = new CompletableFuture<>();
759 <        g = new CompletableFuture<>();
760 <        h = f.thenCombine(g, subtract);
761 <        assertTrue(f.cancel(true));
1347 >        assertTrue(f.cancel(mayInterruptIfRunning));
1348          checkIncomplete(h);
1349 <        g.complete(1);
764 <        checkCompletedWithWrappedCancellationException(h);
1349 >        g.complete(v1);
1350  
766        f = new CompletableFuture<>();
767        g = new CompletableFuture<>();
768        h = f.thenCombine(g, subtract);
769        assertTrue(g.cancel(true));
770        checkIncomplete(h);
771        f.complete(3);
1351          checkCompletedWithWrappedCancellationException(h);
1352 +        checkCancelled(f);
1353 +        assertEquals(0, r.invocationCount);
1354 +        checkCompletedNormally(g, v1);
1355 +    }}
1356 +
1357 +    public void testThenCombine_sourceCancelled2() {
1358 +        for (ExecutionMode m : ExecutionMode.values())
1359 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1360 +        for (Integer v1 : new Integer[] { 1, null })
1361 +    {
1362 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1363 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1364 +        final SubtractFunction r = new SubtractFunction();
1365 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1366 +
1367 +        assertTrue(g.cancel(mayInterruptIfRunning));
1368 +        checkIncomplete(h);
1369 +        f.complete(v1);
1370 +
1371 +        checkCompletedWithWrappedCancellationException(h);
1372 +        checkCancelled(g);
1373 +        assertEquals(0, r.invocationCount);
1374 +        checkCompletedNormally(f, v1);
1375 +    }}
1376 +
1377 +    public void testThenCombine_sourceCancelled3() {
1378 +        for (ExecutionMode m : ExecutionMode.values())
1379 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1380 +        for (Integer v1 : new Integer[] { 1, null })
1381 +    {
1382 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1383 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1384 +        final SubtractFunction r = new SubtractFunction();
1385 +
1386 +        assertTrue(g.cancel(mayInterruptIfRunning));
1387 +        f.complete(v1);
1388 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1389 +
1390 +        checkCompletedWithWrappedCancellationException(h);
1391 +        checkCancelled(g);
1392 +        assertEquals(0, r.invocationCount);
1393 +        checkCompletedNormally(f, v1);
1394 +    }}
1395 +
1396 +    public void testThenCombine_sourceCancelled4() {
1397 +        for (ExecutionMode m : ExecutionMode.values())
1398 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399 +        for (Integer v1 : new Integer[] { 1, null })
1400 +    {
1401 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1402 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1403 +        final SubtractFunction r = new SubtractFunction();
1404 +
1405 +        assertTrue(f.cancel(mayInterruptIfRunning));
1406 +        g.complete(v1);
1407 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1408  
774        f = new CompletableFuture<>();
775        g = new CompletableFuture<>();
776        assertTrue(f.cancel(true));
777        assertTrue(g.cancel(true));
778        h = f.thenCombine(g, subtract);
1409          checkCompletedWithWrappedCancellationException(h);
1410 <    }
1410 >        checkCancelled(f);
1411 >        assertEquals(0, r.invocationCount);
1412 >        checkCompletedNormally(g, v1);
1413 >    }}
1414  
1415      /**
1416       * thenAcceptBoth result completes normally after normal
1417       * completion of sources
1418       */
1419 <    public void testThenAcceptBoth() {
1420 <        CompletableFuture<Integer> f, g;
1421 <        CompletableFuture<Void> h;
1422 <        SubtractAction r;
1419 >    public void testThenAcceptBoth_normalCompletion1() {
1420 >        for (ExecutionMode m : ExecutionMode.values())
1421 >        for (Integer v1 : new Integer[] { 1, null })
1422 >        for (Integer v2 : new Integer[] { 2, null })
1423 >    {
1424 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1425 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1426 >        final SubtractAction r = new SubtractAction();
1427 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1428  
1429 <        f = new CompletableFuture<>();
792 <        g = new CompletableFuture<>();
793 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
794 <        f.complete(3);
1429 >        f.complete(v1);
1430          checkIncomplete(h);
1431 <        g.complete(1);
1431 >        assertEquals(0, r.invocationCount);
1432 >        g.complete(v2);
1433 >
1434          checkCompletedNormally(h, null);
1435 <        assertEquals(r.value, 2);
1435 >        assertEquals(subtract(v1, v2), r.value);
1436 >        checkCompletedNormally(f, v1);
1437 >        checkCompletedNormally(g, v2);
1438 >    }}
1439 >
1440 >    public void testThenAcceptBoth_normalCompletion2() {
1441 >        for (ExecutionMode m : ExecutionMode.values())
1442 >        for (Integer v1 : new Integer[] { 1, null })
1443 >        for (Integer v2 : new Integer[] { 2, null })
1444 >    {
1445 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1446 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1447 >        final SubtractAction r = new SubtractAction();
1448 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1449  
1450 <        f = new CompletableFuture<>();
801 <        g = new CompletableFuture<>();
802 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
803 <        g.complete(1);
1450 >        g.complete(v2);
1451          checkIncomplete(h);
1452 <        f.complete(3);
1452 >        assertEquals(0, r.invocationCount);
1453 >        f.complete(v1);
1454 >
1455          checkCompletedNormally(h, null);
1456 <        assertEquals(r.value, 2);
1456 >        assertEquals(subtract(v1, v2), r.value);
1457 >        checkCompletedNormally(f, v1);
1458 >        checkCompletedNormally(g, v2);
1459 >    }}
1460 >
1461 >    public void testThenAcceptBoth_normalCompletion3() {
1462 >        for (ExecutionMode m : ExecutionMode.values())
1463 >        for (Integer v1 : new Integer[] { 1, null })
1464 >        for (Integer v2 : new Integer[] { 2, null })
1465 >    {
1466 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1467 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1468 >        final SubtractAction r = new SubtractAction();
1469 >
1470 >        g.complete(v2);
1471 >        f.complete(v1);
1472 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1473  
809        f = new CompletableFuture<>();
810        g = new CompletableFuture<>();
811        g.complete(1);
812        f.complete(3);
813        h = f.thenAcceptBoth(g, r = new SubtractAction());
1474          checkCompletedNormally(h, null);
1475 <        assertEquals(r.value, 2);
1476 <    }
1475 >        assertEquals(subtract(v1, v2), r.value);
1476 >        checkCompletedNormally(f, v1);
1477 >        checkCompletedNormally(g, v2);
1478 >    }}
1479 >
1480 >    public void testThenAcceptBoth_normalCompletion4() {
1481 >        for (ExecutionMode m : ExecutionMode.values())
1482 >        for (Integer v1 : new Integer[] { 1, null })
1483 >        for (Integer v2 : new Integer[] { 2, null })
1484 >    {
1485 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1487 >        final SubtractAction r = new SubtractAction();
1488 >
1489 >        f.complete(v1);
1490 >        g.complete(v2);
1491 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1492 >
1493 >        checkCompletedNormally(h, null);
1494 >        assertEquals(subtract(v1, v2), r.value);
1495 >        checkCompletedNormally(f, v1);
1496 >        checkCompletedNormally(g, v2);
1497 >    }}
1498  
1499      /**
1500       * thenAcceptBoth result completes exceptionally after exceptional
1501       * completion of either source
1502       */
1503 <    public void testThenAcceptBoth2() {
1504 <        CompletableFuture<Integer> f, g;
1505 <        CompletableFuture<Void> h;
1506 <        SubtractAction r;
1507 <
1508 <        f = new CompletableFuture<>();
1509 <        g = new CompletableFuture<>();
1510 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1511 <        f.completeExceptionally(new CFException());
1512 <        checkIncomplete(h);
1513 <        g.complete(1);
1514 <        checkCompletedWithWrappedCFException(h);
1515 <
1516 <        f = new CompletableFuture<>();
1517 <        g = new CompletableFuture<>();
1518 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1519 <        g.completeExceptionally(new CFException());
1520 <        checkIncomplete(h);
1521 <        f.complete(3);
1522 <        checkCompletedWithWrappedCFException(h);
1523 <
1524 <        f = new CompletableFuture<>();
1525 <        g = new CompletableFuture<>();
1526 <        f.complete(3);
1527 <        g.completeExceptionally(new CFException());
1528 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1529 <        checkCompletedWithWrappedCFException(h);
1530 <
1531 <        f = new CompletableFuture<>();
1532 <        g = new CompletableFuture<>();
1533 <        f.completeExceptionally(new CFException());
1534 <        g.complete(3);
1535 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1536 <        checkCompletedWithWrappedCFException(h);
1537 <    }
1503 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1504 >        for (ExecutionMode m : ExecutionMode.values())
1505 >        for (Integer v1 : new Integer[] { 1, null })
1506 >    {
1507 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1508 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1509 >        final SubtractAction r = new SubtractAction();
1510 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1511 >        final CFException ex = new CFException();
1512 >
1513 >        f.completeExceptionally(ex);
1514 >        checkIncomplete(h);
1515 >        g.complete(v1);
1516 >
1517 >        checkCompletedWithWrappedCFException(h, ex);
1518 >        checkCompletedWithWrappedCFException(f, ex);
1519 >        assertEquals(0, r.invocationCount);
1520 >        checkCompletedNormally(g, v1);
1521 >    }}
1522 >
1523 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1524 >        for (ExecutionMode m : ExecutionMode.values())
1525 >        for (Integer v1 : new Integer[] { 1, null })
1526 >    {
1527 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1528 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1529 >        final SubtractAction r = new SubtractAction();
1530 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1531 >        final CFException ex = new CFException();
1532 >
1533 >        g.completeExceptionally(ex);
1534 >        checkIncomplete(h);
1535 >        f.complete(v1);
1536 >
1537 >        checkCompletedWithWrappedCFException(h, ex);
1538 >        checkCompletedWithWrappedCFException(g, ex);
1539 >        assertEquals(0, r.invocationCount);
1540 >        checkCompletedNormally(f, v1);
1541 >    }}
1542 >
1543 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1544 >        for (ExecutionMode m : ExecutionMode.values())
1545 >        for (Integer v1 : new Integer[] { 1, null })
1546 >    {
1547 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1548 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1549 >        final SubtractAction r = new SubtractAction();
1550 >        final CFException ex = new CFException();
1551 >
1552 >        g.completeExceptionally(ex);
1553 >        f.complete(v1);
1554 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1555 >
1556 >        checkCompletedWithWrappedCFException(h, ex);
1557 >        checkCompletedWithWrappedCFException(g, ex);
1558 >        assertEquals(0, r.invocationCount);
1559 >        checkCompletedNormally(f, v1);
1560 >    }}
1561 >
1562 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1563 >        for (ExecutionMode m : ExecutionMode.values())
1564 >        for (Integer v1 : new Integer[] { 1, null })
1565 >    {
1566 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1567 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1568 >        final SubtractAction r = new SubtractAction();
1569 >        final CFException ex = new CFException();
1570 >
1571 >        f.completeExceptionally(ex);
1572 >        g.complete(v1);
1573 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1574 >
1575 >        checkCompletedWithWrappedCFException(h, ex);
1576 >        checkCompletedWithWrappedCFException(f, ex);
1577 >        assertEquals(0, r.invocationCount);
1578 >        checkCompletedNormally(g, v1);
1579 >    }}
1580  
1581      /**
1582       * thenAcceptBoth result completes exceptionally if action does
1583       */
1584 <    public void testThenAcceptBoth3() {
1585 <        CompletableFuture<Integer> f, g;
1586 <        CompletableFuture<Void> h;
1587 <        FailingBiConsumer r;
1588 <
1589 <        f = new CompletableFuture<>();
1590 <        g = new CompletableFuture<>();
1591 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1592 <        f.complete(3);
1593 <        checkIncomplete(h);
1594 <        g.complete(1);
1595 <        checkCompletedWithWrappedCFException(h);
1596 <
1597 <        f = new CompletableFuture<>();
1598 <        g = new CompletableFuture<>();
1599 <        f.complete(3);
1600 <        g.complete(1);
1601 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1602 <        checkCompletedWithWrappedCFException(h);
1603 <    }
1584 >    public void testThenAcceptBoth_actionFailed1() {
1585 >        for (ExecutionMode m : ExecutionMode.values())
1586 >        for (Integer v1 : new Integer[] { 1, null })
1587 >        for (Integer v2 : new Integer[] { 2, null })
1588 >    {
1589 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1590 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1591 >        final FailingBiConsumer r = new FailingBiConsumer();
1592 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1593 >
1594 >        f.complete(v1);
1595 >        checkIncomplete(h);
1596 >        g.complete(v2);
1597 >
1598 >        checkCompletedWithWrappedCFException(h);
1599 >        checkCompletedNormally(f, v1);
1600 >        checkCompletedNormally(g, v2);
1601 >    }}
1602 >
1603 >    public void testThenAcceptBoth_actionFailed2() {
1604 >        for (ExecutionMode m : ExecutionMode.values())
1605 >        for (Integer v1 : new Integer[] { 1, null })
1606 >        for (Integer v2 : new Integer[] { 2, null })
1607 >    {
1608 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1609 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1610 >        final FailingBiConsumer r = new FailingBiConsumer();
1611 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1612 >
1613 >        g.complete(v2);
1614 >        checkIncomplete(h);
1615 >        f.complete(v1);
1616 >
1617 >        checkCompletedWithWrappedCFException(h);
1618 >        checkCompletedNormally(f, v1);
1619 >        checkCompletedNormally(g, v2);
1620 >    }}
1621  
1622      /**
1623       * thenAcceptBoth result completes exceptionally if either source cancelled
1624       */
1625 <    public void testThenAcceptBoth4() {
1626 <        CompletableFuture<Integer> f, g;
1627 <        CompletableFuture<Void> h;
1628 <        SubtractAction r;
1625 >    public void testThenAcceptBoth_sourceCancelled1() {
1626 >        for (ExecutionMode m : ExecutionMode.values())
1627 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1628 >        for (Integer v1 : new Integer[] { 1, null })
1629 >    {
1630 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1631 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1632 >        final SubtractAction r = new SubtractAction();
1633 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1634  
1635 <        f = new CompletableFuture<>();
891 <        g = new CompletableFuture<>();
892 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
893 <        assertTrue(f.cancel(true));
1635 >        assertTrue(f.cancel(mayInterruptIfRunning));
1636          checkIncomplete(h);
1637 <        g.complete(1);
896 <        checkCompletedWithWrappedCancellationException(h);
1637 >        g.complete(v1);
1638  
898        f = new CompletableFuture<>();
899        g = new CompletableFuture<>();
900        h = f.thenAcceptBoth(g, r = new SubtractAction());
901        assertTrue(g.cancel(true));
902        checkIncomplete(h);
903        f.complete(3);
904        checkCompletedWithWrappedCancellationException(h);
905
906        f = new CompletableFuture<>();
907        g = new CompletableFuture<>();
908        f.complete(3);
909        assertTrue(g.cancel(true));
910        h = f.thenAcceptBoth(g, r = new SubtractAction());
1639          checkCompletedWithWrappedCancellationException(h);
1640 +        checkCancelled(f);
1641 +        assertEquals(0, r.invocationCount);
1642 +        checkCompletedNormally(g, v1);
1643 +    }}
1644 +
1645 +    public void testThenAcceptBoth_sourceCancelled2() {
1646 +        for (ExecutionMode m : ExecutionMode.values())
1647 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1648 +        for (Integer v1 : new Integer[] { 1, null })
1649 +    {
1650 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1651 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1652 +        final SubtractAction r = new SubtractAction();
1653 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1654 +
1655 +        assertTrue(g.cancel(mayInterruptIfRunning));
1656 +        checkIncomplete(h);
1657 +        f.complete(v1);
1658 +
1659 +        checkCompletedWithWrappedCancellationException(h);
1660 +        checkCancelled(g);
1661 +        assertEquals(0, r.invocationCount);
1662 +        checkCompletedNormally(f, v1);
1663 +    }}
1664 +
1665 +    public void testThenAcceptBoth_sourceCancelled3() {
1666 +        for (ExecutionMode m : ExecutionMode.values())
1667 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1668 +        for (Integer v1 : new Integer[] { 1, null })
1669 +    {
1670 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1671 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1672 +        final SubtractAction r = new SubtractAction();
1673 +
1674 +        assertTrue(g.cancel(mayInterruptIfRunning));
1675 +        f.complete(v1);
1676 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1677 +
1678 +        checkCompletedWithWrappedCancellationException(h);
1679 +        checkCancelled(g);
1680 +        assertEquals(0, r.invocationCount);
1681 +        checkCompletedNormally(f, v1);
1682 +    }}
1683 +
1684 +    public void testThenAcceptBoth_sourceCancelled4() {
1685 +        for (ExecutionMode m : ExecutionMode.values())
1686 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1687 +        for (Integer v1 : new Integer[] { 1, null })
1688 +    {
1689 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1690 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1691 +        final SubtractAction r = new SubtractAction();
1692 +
1693 +        assertTrue(f.cancel(mayInterruptIfRunning));
1694 +        g.complete(v1);
1695 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1696  
913        f = new CompletableFuture<>();
914        g = new CompletableFuture<>();
915        assertTrue(f.cancel(true));
916        g.complete(3);
917        h = f.thenAcceptBoth(g, r = new SubtractAction());
1697          checkCompletedWithWrappedCancellationException(h);
1698 <    }
1698 >        checkCancelled(f);
1699 >        assertEquals(0, r.invocationCount);
1700 >        checkCompletedNormally(g, v1);
1701 >    }}
1702  
1703      /**
1704       * runAfterBoth result completes normally after normal
1705       * completion of sources
1706       */
1707 <    public void testRunAfterBoth() {
1708 <        CompletableFuture<Integer> f, g;
1709 <        CompletableFuture<Void> h;
1710 <        Noop r;
1707 >    public void testRunAfterBoth_normalCompletion1() {
1708 >        for (ExecutionMode m : ExecutionMode.values())
1709 >        for (Integer v1 : new Integer[] { 1, null })
1710 >        for (Integer v2 : new Integer[] { 2, null })
1711 >    {
1712 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1713 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1714 >        final Noop r = new Noop();
1715 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1716  
1717 <        f = new CompletableFuture<>();
931 <        g = new CompletableFuture<>();
932 <        h = f.runAfterBoth(g, r = new Noop());
933 <        f.complete(3);
1717 >        f.complete(v1);
1718          checkIncomplete(h);
1719 <        g.complete(1);
1719 >        assertEquals(0, r.invocationCount);
1720 >        g.complete(v2);
1721 >
1722          checkCompletedNormally(h, null);
1723 <        assertTrue(r.ran);
1723 >        assertEquals(1, r.invocationCount);
1724 >        checkCompletedNormally(f, v1);
1725 >        checkCompletedNormally(g, v2);
1726 >    }}
1727 >
1728 >    public void testRunAfterBoth_normalCompletion2() {
1729 >        for (ExecutionMode m : ExecutionMode.values())
1730 >        for (Integer v1 : new Integer[] { 1, null })
1731 >        for (Integer v2 : new Integer[] { 2, null })
1732 >    {
1733 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1734 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1735 >        final Noop r = new Noop();
1736 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1737  
1738 <        f = new CompletableFuture<>();
940 <        g = new CompletableFuture<>();
941 <        h = f.runAfterBoth(g, r = new Noop());
942 <        g.complete(1);
1738 >        g.complete(v2);
1739          checkIncomplete(h);
1740 <        f.complete(3);
1740 >        assertEquals(0, r.invocationCount);
1741 >        f.complete(v1);
1742 >
1743          checkCompletedNormally(h, null);
1744 <        assertTrue(r.ran);
1744 >        assertEquals(1, r.invocationCount);
1745 >        checkCompletedNormally(f, v1);
1746 >        checkCompletedNormally(g, v2);
1747 >    }}
1748 >
1749 >    public void testRunAfterBoth_normalCompletion3() {
1750 >        for (ExecutionMode m : ExecutionMode.values())
1751 >        for (Integer v1 : new Integer[] { 1, null })
1752 >        for (Integer v2 : new Integer[] { 2, null })
1753 >    {
1754 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1755 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1756 >        final Noop r = new Noop();
1757 >
1758 >        g.complete(v2);
1759 >        f.complete(v1);
1760 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1761  
948        f = new CompletableFuture<>();
949        g = new CompletableFuture<>();
950        g.complete(1);
951        f.complete(3);
952        h = f.runAfterBoth(g, r = new Noop());
1762          checkCompletedNormally(h, null);
1763 <        assertTrue(r.ran);
1764 <    }
1763 >        assertEquals(1, r.invocationCount);
1764 >        checkCompletedNormally(f, v1);
1765 >        checkCompletedNormally(g, v2);
1766 >    }}
1767 >
1768 >    public void testRunAfterBoth_normalCompletion4() {
1769 >        for (ExecutionMode m : ExecutionMode.values())
1770 >        for (Integer v1 : new Integer[] { 1, null })
1771 >        for (Integer v2 : new Integer[] { 2, null })
1772 >    {
1773 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1774 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1775 >        final Noop r = new Noop();
1776 >
1777 >        f.complete(v1);
1778 >        g.complete(v2);
1779 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1780 >
1781 >        checkCompletedNormally(h, null);
1782 >        assertEquals(1, r.invocationCount);
1783 >        checkCompletedNormally(f, v1);
1784 >        checkCompletedNormally(g, v2);
1785 >    }}
1786  
1787      /**
1788       * runAfterBoth result completes exceptionally after exceptional
1789       * completion of either source
1790       */
1791 <    public void testRunAfterBoth2() {
1792 <        CompletableFuture<Integer> f, g;
1793 <        CompletableFuture<Void> h;
1794 <        Noop r;
1795 <
1796 <        f = new CompletableFuture<>();
1797 <        g = new CompletableFuture<>();
1798 <        h = f.runAfterBoth(g, r = new Noop());
1799 <        f.completeExceptionally(new CFException());
1800 <        checkIncomplete(h);
1801 <        g.complete(1);
1802 <        checkCompletedWithWrappedCFException(h);
1803 <        assertFalse(r.ran);
1804 <
1805 <        f = new CompletableFuture<>();
1806 <        g = new CompletableFuture<>();
1807 <        h = f.runAfterBoth(g, r = new Noop());
1808 <        g.completeExceptionally(new CFException());
1809 <        checkIncomplete(h);
1810 <        f.complete(3);
1811 <        checkCompletedWithWrappedCFException(h);
1812 <        assertFalse(r.ran);
1813 <
1814 <        f = new CompletableFuture<>();
1815 <        g = new CompletableFuture<>();
1816 <        g.completeExceptionally(new CFException());
1817 <        f.complete(3);
1818 <        h = f.runAfterBoth(g, r = new Noop());
1819 <        checkCompletedWithWrappedCFException(h);
1820 <        assertFalse(r.ran);
1821 <
1822 <        f = new CompletableFuture<>();
1823 <        g = new CompletableFuture<>();
1824 <        f.completeExceptionally(new CFException());
1825 <        g.complete(1);
1826 <        h = f.runAfterBoth(g, r = new Noop());
1827 <        checkCompletedWithWrappedCFException(h);
1828 <        assertFalse(r.ran);
1829 <    }
1791 >    public void testRunAfterBoth_exceptionalCompletion1() {
1792 >        for (ExecutionMode m : ExecutionMode.values())
1793 >        for (Integer v1 : new Integer[] { 1, null })
1794 >    {
1795 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1796 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1797 >        final Noop r = new Noop();
1798 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1799 >        final CFException ex = new CFException();
1800 >
1801 >        f.completeExceptionally(ex);
1802 >        checkIncomplete(h);
1803 >        g.complete(v1);
1804 >
1805 >        checkCompletedWithWrappedCFException(h, ex);
1806 >        checkCompletedWithWrappedCFException(f, ex);
1807 >        assertEquals(0, r.invocationCount);
1808 >        checkCompletedNormally(g, v1);
1809 >    }}
1810 >
1811 >    public void testRunAfterBoth_exceptionalCompletion2() {
1812 >        for (ExecutionMode m : ExecutionMode.values())
1813 >        for (Integer v1 : new Integer[] { 1, null })
1814 >    {
1815 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1816 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1817 >        final Noop r = new Noop();
1818 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1819 >        final CFException ex = new CFException();
1820 >
1821 >        g.completeExceptionally(ex);
1822 >        checkIncomplete(h);
1823 >        f.complete(v1);
1824 >
1825 >        checkCompletedWithWrappedCFException(h, ex);
1826 >        checkCompletedWithWrappedCFException(g, ex);
1827 >        assertEquals(0, r.invocationCount);
1828 >        checkCompletedNormally(f, v1);
1829 >    }}
1830 >
1831 >    public void testRunAfterBoth_exceptionalCompletion3() {
1832 >        for (ExecutionMode m : ExecutionMode.values())
1833 >        for (Integer v1 : new Integer[] { 1, null })
1834 >    {
1835 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1836 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1837 >        final Noop r = new Noop();
1838 >        final CFException ex = new CFException();
1839 >
1840 >        g.completeExceptionally(ex);
1841 >        f.complete(v1);
1842 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1843 >
1844 >        checkCompletedWithWrappedCFException(h, ex);
1845 >        checkCompletedWithWrappedCFException(g, ex);
1846 >        assertEquals(0, r.invocationCount);
1847 >        checkCompletedNormally(f, v1);
1848 >    }}
1849 >
1850 >    public void testRunAfterBoth_exceptionalCompletion4() {
1851 >        for (ExecutionMode m : ExecutionMode.values())
1852 >        for (Integer v1 : new Integer[] { 1, null })
1853 >    {
1854 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1855 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1856 >        final Noop r = new Noop();
1857 >        final CFException ex = new CFException();
1858 >
1859 >        f.completeExceptionally(ex);
1860 >        g.complete(v1);
1861 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1862 >
1863 >        checkCompletedWithWrappedCFException(h, ex);
1864 >        checkCompletedWithWrappedCFException(f, ex);
1865 >        assertEquals(0, r.invocationCount);
1866 >        checkCompletedNormally(g, v1);
1867 >    }}
1868  
1869      /**
1870       * runAfterBoth result completes exceptionally if action does
1871       */
1872 <    public void testRunAfterBoth3() {
1873 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1874 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1875 <        FailingNoop r = new FailingNoop();
1876 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1877 <        f.complete(one);
1878 <        checkIncomplete(g);
1879 <        f2.complete(two);
1880 <        checkCompletedWithWrappedCFException(g);
1881 <    }
1872 >    public void testRunAfterBoth_actionFailed1() {
1873 >        for (ExecutionMode m : ExecutionMode.values())
1874 >        for (Integer v1 : new Integer[] { 1, null })
1875 >        for (Integer v2 : new Integer[] { 2, null })
1876 >    {
1877 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1878 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1879 >        final FailingNoop r = new FailingNoop();
1880 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1881 >
1882 >        f.complete(v1);
1883 >        checkIncomplete(h);
1884 >        g.complete(v2);
1885 >
1886 >        checkCompletedWithWrappedCFException(h);
1887 >        checkCompletedNormally(f, v1);
1888 >        checkCompletedNormally(g, v2);
1889 >    }}
1890 >
1891 >    public void testRunAfterBoth_actionFailed2() {
1892 >        for (ExecutionMode m : ExecutionMode.values())
1893 >        for (Integer v1 : new Integer[] { 1, null })
1894 >        for (Integer v2 : new Integer[] { 2, null })
1895 >    {
1896 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1897 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1898 >        final FailingNoop r = new FailingNoop();
1899 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1900 >
1901 >        g.complete(v2);
1902 >        checkIncomplete(h);
1903 >        f.complete(v1);
1904 >
1905 >        checkCompletedWithWrappedCFException(h);
1906 >        checkCompletedNormally(f, v1);
1907 >        checkCompletedNormally(g, v2);
1908 >    }}
1909  
1910      /**
1911       * runAfterBoth result completes exceptionally if either source cancelled
1912       */
1913 <    public void testRunAfterBoth4() {
1914 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1915 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1916 <        Noop r = new Noop();
1917 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1918 <        assertTrue(f.cancel(true));
1919 <        f2.complete(two);
1920 <        checkCompletedWithWrappedCancellationException(g);
1921 <        f = new CompletableFuture<>();
1027 <        f2 = new CompletableFuture<>();
1028 <        r = new Noop();
1029 <        g = f.runAfterBoth(f2, r);
1030 <        f.complete(one);
1031 <        assertTrue(f2.cancel(true));
1032 <        checkCompletedWithWrappedCancellationException(g);
1033 <    }
1913 >    public void testRunAfterBoth_sourceCancelled1() {
1914 >        for (ExecutionMode m : ExecutionMode.values())
1915 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1916 >        for (Integer v1 : new Integer[] { 1, null })
1917 >    {
1918 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1919 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1920 >        final Noop r = new Noop();
1921 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1922  
1923 <    /**
1924 <     * applyToEither result completes normally after normal completion
1925 <     * of either source
1038 <     */
1039 <    public void testApplyToEither() {
1040 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1041 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1042 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1043 <        f.complete(one);
1044 <        checkCompletedNormally(g, two);
1045 <        f2.complete(one);
1046 <        checkCompletedNormally(g, two);
1047 <
1048 <        f = new CompletableFuture<>();
1049 <        f.complete(one);
1050 <        f2 = new CompletableFuture<>();
1051 <        g = f.applyToEither(f2, inc);
1052 <        checkCompletedNormally(g, two);
1053 <    }
1054 <
1055 <    /**
1056 <     * applyToEither result completes exceptionally after exceptional
1057 <     * completion of either source
1058 <     */
1059 <    public void testApplyToEither2() {
1060 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1061 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1062 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1063 <        f.completeExceptionally(new CFException());
1064 <        f2.complete(one);
1065 <        checkCompletedWithWrappedCFException(g);
1066 <
1067 <        f = new CompletableFuture<>();
1068 <        f2 = new CompletableFuture<>();
1069 <        f2.completeExceptionally(new CFException());
1070 <        g = f.applyToEither(f2, inc);
1071 <        checkCompletedWithWrappedCFException(g);
1072 <    }
1923 >        assertTrue(f.cancel(mayInterruptIfRunning));
1924 >        checkIncomplete(h);
1925 >        g.complete(v1);
1926  
1927 <    /**
1928 <     * applyToEither result completes exceptionally if action does
1929 <     */
1930 <    public void testApplyToEither3() {
1931 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1932 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1933 <        FailingFunction r = new FailingFunction();
1934 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1935 <        f2.complete(two);
1936 <        checkCompletedWithWrappedCFException(g);
1937 <    }
1927 >        checkCompletedWithWrappedCancellationException(h);
1928 >        checkCancelled(f);
1929 >        assertEquals(0, r.invocationCount);
1930 >        checkCompletedNormally(g, v1);
1931 >    }}
1932 >
1933 >    public void testRunAfterBoth_sourceCancelled2() {
1934 >        for (ExecutionMode m : ExecutionMode.values())
1935 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1936 >        for (Integer v1 : new Integer[] { 1, null })
1937 >    {
1938 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1939 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1940 >        final Noop r = new Noop();
1941 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1942 >
1943 >        assertTrue(g.cancel(mayInterruptIfRunning));
1944 >        checkIncomplete(h);
1945 >        f.complete(v1);
1946 >
1947 >        checkCompletedWithWrappedCancellationException(h);
1948 >        checkCancelled(g);
1949 >        assertEquals(0, r.invocationCount);
1950 >        checkCompletedNormally(f, v1);
1951 >    }}
1952 >
1953 >    public void testRunAfterBoth_sourceCancelled3() {
1954 >        for (ExecutionMode m : ExecutionMode.values())
1955 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1956 >        for (Integer v1 : new Integer[] { 1, null })
1957 >    {
1958 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1959 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1960 >        final Noop r = new Noop();
1961 >
1962 >        assertTrue(g.cancel(mayInterruptIfRunning));
1963 >        f.complete(v1);
1964 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1965 >
1966 >        checkCompletedWithWrappedCancellationException(h);
1967 >        checkCancelled(g);
1968 >        assertEquals(0, r.invocationCount);
1969 >        checkCompletedNormally(f, v1);
1970 >    }}
1971 >
1972 >    public void testRunAfterBoth_sourceCancelled4() {
1973 >        for (ExecutionMode m : ExecutionMode.values())
1974 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1975 >        for (Integer v1 : new Integer[] { 1, null })
1976 >    {
1977 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1978 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1979 >        final Noop r = new Noop();
1980 >
1981 >        assertTrue(f.cancel(mayInterruptIfRunning));
1982 >        g.complete(v1);
1983 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1984  
1985 <    /**
1986 <     * applyToEither result completes exceptionally if either source cancelled
1987 <     */
1988 <    public void testApplyToEither4() {
1989 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1091 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1092 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1093 <        assertTrue(f.cancel(true));
1094 <        checkCompletedWithWrappedCancellationException(g);
1095 <        f = new CompletableFuture<>();
1096 <        f2 = new CompletableFuture<>();
1097 <        assertTrue(f2.cancel(true));
1098 <        checkCompletedWithWrappedCancellationException(g);
1099 <    }
1985 >        checkCompletedWithWrappedCancellationException(h);
1986 >        checkCancelled(f);
1987 >        assertEquals(0, r.invocationCount);
1988 >        checkCompletedNormally(g, v1);
1989 >    }}
1990  
1991      /**
1992 <     * acceptEither result completes normally after normal completion
1992 >     * applyToEither result completes normally after normal completion
1993       * of either source
1994       */
1995 <    public void testAcceptEither() {
1996 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1997 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1998 <        IncAction r = new IncAction();
1999 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2000 <        f.complete(one);
2001 <        checkCompletedNormally(g, null);
2002 <        f2.complete(one);
2003 <        checkCompletedNormally(g, null);
2004 <        assertEquals(r.value, 2);
2005 <
2006 <        r = new IncAction();
2007 <        f = new CompletableFuture<>();
2008 <        f.complete(one);
2009 <        f2 = new CompletableFuture<>();
2010 <        g = f.acceptEither(f2, r);
2011 <        checkCompletedNormally(g, null);
2012 <        assertEquals(r.value, 2);
2013 <    }
1995 >    public void testApplyToEither_normalCompletion1() {
1996 >        for (ExecutionMode m : ExecutionMode.values())
1997 >        for (Integer v1 : new Integer[] { 1, null })
1998 >        for (Integer v2 : new Integer[] { 2, null })
1999 >    {
2000 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 >        final IncFunction r = new IncFunction();
2003 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2004 >
2005 >        f.complete(v1);
2006 >        checkCompletedNormally(h, inc(v1));
2007 >        g.complete(v2);
2008 >
2009 >        checkCompletedNormally(f, v1);
2010 >        checkCompletedNormally(g, v2);
2011 >        checkCompletedNormally(h, inc(v1));
2012 >    }}
2013 >
2014 >    public void testApplyToEither_normalCompletion2() {
2015 >        for (ExecutionMode m : ExecutionMode.values())
2016 >        for (Integer v1 : new Integer[] { 1, null })
2017 >        for (Integer v2 : new Integer[] { 2, null })
2018 >    {
2019 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2020 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2021 >        final IncFunction r = new IncFunction();
2022 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2023 >
2024 >        g.complete(v2);
2025 >        checkCompletedNormally(h, inc(v2));
2026 >        f.complete(v1);
2027 >
2028 >        checkCompletedNormally(f, v1);
2029 >        checkCompletedNormally(g, v2);
2030 >        checkCompletedNormally(h, inc(v2));
2031 >        }}
2032 >
2033 >    public void testApplyToEither_normalCompletion3() {
2034 >        for (ExecutionMode m : ExecutionMode.values())
2035 >        for (Integer v1 : new Integer[] { 1, null })
2036 >        for (Integer v2 : new Integer[] { 2, null })
2037 >    {
2038 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2039 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2040 >        final IncFunction r = new IncFunction();
2041 >
2042 >        f.complete(v1);
2043 >        g.complete(v2);
2044 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2045 >
2046 >        checkCompletedNormally(f, v1);
2047 >        checkCompletedNormally(g, v2);
2048 >
2049 >        // unspecified behavior
2050 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2051 >                   Objects.equals(h.join(), inc(v2)));
2052 >        assertEquals(1, r.invocationCount);
2053 >    }}
2054  
2055      /**
2056 <     * acceptEither result completes exceptionally after exceptional
2056 >     * applyToEither result completes exceptionally after exceptional
2057       * completion of either source
2058       */
2059 <    public void testAcceptEither2() {
2060 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2061 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2062 <        IncAction r = new IncAction();
2063 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2064 <        f.completeExceptionally(new CFException());
2065 <        f2.complete(one);
2066 <        checkCompletedWithWrappedCFException(g);
2067 <
2068 <        r = new IncAction();
2069 <        f = new CompletableFuture<>();
2070 <        f2 = new CompletableFuture<>();
2071 <        f2.completeExceptionally(new CFException());
2072 <        g = f.acceptEither(f2, r);
2073 <        checkCompletedWithWrappedCFException(g);
2074 <    }
2075 <
2076 <    /**
2077 <     * acceptEither result completes exceptionally if action does
2078 <     */
2079 <    public void testAcceptEither3() {
2080 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2081 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2082 <        FailingConsumer r = new FailingConsumer();
2083 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2084 <        f2.complete(two);
2085 <        checkCompletedWithWrappedCFException(g);
2086 <    }
2059 >    public void testApplyToEither_exceptionalCompletion1() {
2060 >        for (ExecutionMode m : ExecutionMode.values())
2061 >        for (Integer v1 : new Integer[] { 1, null })
2062 >    {
2063 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2064 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2065 >        final IncFunction r = new IncFunction();
2066 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2067 >        final CFException ex = new CFException();
2068 >
2069 >        f.completeExceptionally(ex);
2070 >        checkCompletedWithWrappedCFException(h, ex);
2071 >        g.complete(v1);
2072 >
2073 >        assertEquals(0, r.invocationCount);
2074 >        checkCompletedNormally(g, v1);
2075 >        checkCompletedWithWrappedCFException(f, ex);
2076 >        checkCompletedWithWrappedCFException(h, ex);
2077 >    }}
2078 >
2079 >    public void testApplyToEither_exceptionalCompletion2() {
2080 >        for (ExecutionMode m : ExecutionMode.values())
2081 >        for (Integer v1 : new Integer[] { 1, null })
2082 >    {
2083 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2084 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2085 >        final IncFunction r = new IncFunction();
2086 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2087 >        final CFException ex = new CFException();
2088 >
2089 >        g.completeExceptionally(ex);
2090 >        checkCompletedWithWrappedCFException(h, ex);
2091 >        f.complete(v1);
2092 >
2093 >        assertEquals(0, r.invocationCount);
2094 >        checkCompletedNormally(f, v1);
2095 >        checkCompletedWithWrappedCFException(g, ex);
2096 >        checkCompletedWithWrappedCFException(h, ex);
2097 >    }}
2098 >
2099 >    public void testApplyToEither_exceptionalCompletion3() {
2100 >        for (ExecutionMode m : ExecutionMode.values())
2101 >        for (Integer v1 : new Integer[] { 1, null })
2102 >    {
2103 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2104 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2105 >        final IncFunction r = new IncFunction();
2106 >        final CFException ex = new CFException();
2107 >
2108 >        g.completeExceptionally(ex);
2109 >        f.complete(v1);
2110 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2111  
2112 <    /**
2113 <     * acceptEither result completes exceptionally if either source cancelled
2114 <     */
2115 <    public void testAcceptEither4() {
2116 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2117 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2118 <        IncAction r = new IncAction();
2119 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2120 <        assertTrue(f.cancel(true));
1167 <        checkCompletedWithWrappedCancellationException(g);
1168 <        f = new CompletableFuture<>();
1169 <        f2 = new CompletableFuture<>();
1170 <        assertTrue(f2.cancel(true));
1171 <        checkCompletedWithWrappedCancellationException(g);
1172 <    }
2112 >        // unspecified behavior
2113 >        Integer v;
2114 >        try {
2115 >            assertEquals(inc(v1), h.join());
2116 >            assertEquals(1, r.invocationCount);
2117 >        } catch (CompletionException ok) {
2118 >            checkCompletedWithWrappedCFException(h, ex);
2119 >            assertEquals(0, r.invocationCount);
2120 >        }
2121  
2122 +        checkCompletedWithWrappedCFException(g, ex);
2123 +        checkCompletedNormally(f, v1);
2124 +    }}
2125 +
2126 +    public void testApplyToEither_exceptionalCompletion4() {
2127 +        for (ExecutionMode m : ExecutionMode.values())
2128 +        for (Integer v1 : new Integer[] { 1, null })
2129 +    {
2130 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2131 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2132 +        final IncFunction r = new IncFunction();
2133 +        final CFException ex = new CFException();
2134 +
2135 +        f.completeExceptionally(ex);
2136 +        g.complete(v1);
2137 +        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2138  
2139 <    /**
2140 <     * runAfterEither result completes normally after normal completion
2141 <     * of either source
2142 <     */
2143 <    public void testRunAfterEither() {
2144 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2145 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2146 <        Noop r = new Noop();
2147 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1184 <        f.complete(one);
1185 <        checkCompletedNormally(g, null);
1186 <        f2.complete(one);
1187 <        checkCompletedNormally(g, null);
1188 <        assertTrue(r.ran);
2139 >        // unspecified behavior
2140 >        Integer v;
2141 >        try {
2142 >            assertEquals(inc(v1), h.join());
2143 >            assertEquals(1, r.invocationCount);
2144 >        } catch (CompletionException ok) {
2145 >            checkCompletedWithWrappedCFException(h, ex);
2146 >            assertEquals(0, r.invocationCount);
2147 >        }
2148  
2149 <        r = new Noop();
2150 <        f = new CompletableFuture<>();
2151 <        f.complete(one);
1193 <        f2 = new CompletableFuture<>();
1194 <        g = f.runAfterEither(f2, r);
1195 <        checkCompletedNormally(g, null);
1196 <        assertTrue(r.ran);
1197 <    }
2149 >        checkCompletedWithWrappedCFException(f, ex);
2150 >        checkCompletedNormally(g, v1);
2151 >    }}
2152  
2153      /**
2154 <     * runAfterEither result completes exceptionally after exceptional
1201 <     * completion of either source
2154 >     * applyToEither result completes exceptionally if action does
2155       */
2156 <    public void testRunAfterEither2() {
2157 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2158 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2159 <        Noop r = new Noop();
2160 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2161 <        f.completeExceptionally(new CFException());
2162 <        f2.complete(one);
2163 <        checkCompletedWithWrappedCFException(g);
2164 <
2165 <        r = new Noop();
2166 <        f = new CompletableFuture<>();
2167 <        f2 = new CompletableFuture<>();
2168 <        f2.completeExceptionally(new CFException());
2169 <        g = f.runAfterEither(f2, r);
2170 <        checkCompletedWithWrappedCFException(g);
2171 <    }
2156 >    public void testApplyToEither_actionFailed1() {
2157 >        for (ExecutionMode m : ExecutionMode.values())
2158 >        for (Integer v1 : new Integer[] { 1, null })
2159 >        for (Integer v2 : new Integer[] { 2, null })
2160 >    {
2161 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2162 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2163 >        final FailingFunction r = new FailingFunction();
2164 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2165 >
2166 >        f.complete(v1);
2167 >        checkCompletedWithWrappedCFException(h);
2168 >        g.complete(v2);
2169 >        checkCompletedNormally(f, v1);
2170 >        checkCompletedNormally(g, v2);
2171 >    }}
2172 >
2173 >    public void testApplyToEither_actionFailed2() {
2174 >        for (ExecutionMode m : ExecutionMode.values())
2175 >        for (Integer v1 : new Integer[] { 1, null })
2176 >        for (Integer v2 : new Integer[] { 2, null })
2177 >    {
2178 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2179 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2180 >        final FailingFunction r = new FailingFunction();
2181 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2182 >
2183 >        g.complete(v2);
2184 >        checkCompletedWithWrappedCFException(h);
2185 >        f.complete(v1);
2186 >        checkCompletedNormally(f, v1);
2187 >        checkCompletedNormally(g, v2);
2188 >    }}
2189  
2190      /**
2191 <     * runAfterEither result completes exceptionally if action does
2191 >     * applyToEither result completes exceptionally if either source cancelled
2192       */
2193 <    public void testRunAfterEither3() {
2194 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2195 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2196 <        FailingNoop r = new FailingNoop();
2197 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2198 <        f2.complete(two);
2199 <        checkCompletedWithWrappedCFException(g);
2200 <    }
2193 >    public void testApplyToEither_sourceCancelled1() {
2194 >        for (ExecutionMode m : ExecutionMode.values())
2195 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2196 >        for (Integer v1 : new Integer[] { 1, null })
2197 >    {
2198 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2199 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2200 >        final IncFunction r = new IncFunction();
2201 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2202  
2203 <    /**
2204 <     * runAfterEither result completes exceptionally if either source cancelled
2205 <     */
1235 <    public void testRunAfterEither4() {
1236 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1237 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1238 <        Noop r = new Noop();
1239 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1240 <        assertTrue(f.cancel(true));
1241 <        checkCompletedWithWrappedCancellationException(g);
1242 <        f = new CompletableFuture<>();
1243 <        f2 = new CompletableFuture<>();
1244 <        assertTrue(f2.cancel(true));
1245 <        checkCompletedWithWrappedCancellationException(g);
1246 <    }
2203 >        assertTrue(f.cancel(mayInterruptIfRunning));
2204 >        checkCompletedWithWrappedCancellationException(h);
2205 >        g.complete(v1);
2206  
2207 <    /**
2208 <     * thenCompose result completes normally after normal completion of source
2209 <     */
2210 <    public void testThenCompose() {
2211 <        CompletableFuture<Integer> f, g;
1253 <        CompletableFutureInc r;
2207 >        checkCancelled(f);
2208 >        assertEquals(0, r.invocationCount);
2209 >        checkCompletedNormally(g, v1);
2210 >        checkCompletedWithWrappedCancellationException(h);
2211 >    }}
2212  
2213 <        f = new CompletableFuture<>();
2214 <        g = f.thenCompose(r = new CompletableFutureInc());
2215 <        f.complete(one);
2216 <        checkCompletedNormally(g, two);
2217 <        assertTrue(r.ran);
2213 >    public void testApplyToEither_sourceCancelled2() {
2214 >        for (ExecutionMode m : ExecutionMode.values())
2215 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2216 >        for (Integer v1 : new Integer[] { 1, null })
2217 >    {
2218 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2219 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2220 >        final IncFunction r = new IncFunction();
2221 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2222 >
2223 >        assertTrue(g.cancel(mayInterruptIfRunning));
2224 >        checkCompletedWithWrappedCancellationException(h);
2225 >        f.complete(v1);
2226 >
2227 >        checkCancelled(g);
2228 >        assertEquals(0, r.invocationCount);
2229 >        checkCompletedNormally(f, v1);
2230 >        checkCompletedWithWrappedCancellationException(h);
2231 >    }}
2232 >
2233 >    public void testApplyToEither_sourceCancelled3() {
2234 >        for (ExecutionMode m : ExecutionMode.values())
2235 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2236 >        for (Integer v1 : new Integer[] { 1, null })
2237 >    {
2238 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2239 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2240 >        final IncFunction r = new IncFunction();
2241 >
2242 >        assertTrue(g.cancel(mayInterruptIfRunning));
2243 >        f.complete(v1);
2244 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2245  
2246 <        f = new CompletableFuture<>();
2247 <        f.complete(one);
2248 <        g = f.thenCompose(r = new CompletableFutureInc());
2249 <        checkCompletedNormally(g, two);
2250 <        assertTrue(r.ran);
2251 <    }
2246 >        // unspecified behavior
2247 >        Integer v;
2248 >        try {
2249 >            assertEquals(inc(v1), h.join());
2250 >            assertEquals(1, r.invocationCount);
2251 >        } catch (CompletionException ok) {
2252 >            checkCompletedWithWrappedCancellationException(h);
2253 >            assertEquals(0, r.invocationCount);
2254 >        }
2255  
2256 <    /**
2257 <     * thenCompose result completes exceptionally after exceptional
2258 <     * completion of source
2259 <     */
2260 <    public void testThenCompose2() {
2261 <        CompletableFuture<Integer> f, g;
2262 <        CompletableFutureInc r;
2256 >        checkCancelled(g);
2257 >        checkCompletedNormally(f, v1);
2258 >    }}
2259 >
2260 >    public void testApplyToEither_sourceCancelled4() {
2261 >        for (ExecutionMode m : ExecutionMode.values())
2262 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2263 >        for (Integer v1 : new Integer[] { 1, null })
2264 >    {
2265 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2266 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2267 >        final IncFunction r = new IncFunction();
2268 >
2269 >        assertTrue(f.cancel(mayInterruptIfRunning));
2270 >        g.complete(v1);
2271 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2272  
2273 <        f = new CompletableFuture<>();
2274 <        g = f.thenCompose(r = new CompletableFutureInc());
2275 <        f.completeExceptionally(new CFException());
2276 <        checkCompletedWithWrappedCFException(g);
2273 >        // unspecified behavior
2274 >        Integer v;
2275 >        try {
2276 >            assertEquals(inc(v1), h.join());
2277 >            assertEquals(1, r.invocationCount);
2278 >        } catch (CompletionException ok) {
2279 >            checkCompletedWithWrappedCancellationException(h);
2280 >            assertEquals(0, r.invocationCount);
2281 >        }
2282  
2283 <        f = new CompletableFuture<>();
2284 <        f.completeExceptionally(new CFException());
2285 <        g = f.thenCompose(r = new CompletableFutureInc());
1284 <        checkCompletedWithWrappedCFException(g);
1285 <    }
2283 >        checkCancelled(f);
2284 >        checkCompletedNormally(g, v1);
2285 >    }}
2286  
2287      /**
2288 <     * thenCompose result completes exceptionally if action does
2288 >     * acceptEither result completes normally after normal completion
2289 >     * of either source
2290       */
2291 <    public void testThenCompose3() {
2292 <        CompletableFuture<Integer> f, g;
2293 <        FailingCompletableFutureFunction r;
2291 >    public void testAcceptEither_normalCompletion1() {
2292 >        for (ExecutionMode m : ExecutionMode.values())
2293 >        for (Integer v1 : new Integer[] { 1, null })
2294 >        for (Integer v2 : new Integer[] { 2, null })
2295 >    {
2296 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2297 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2298 >        final IncAction r = new IncAction();
2299 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2300  
2301 <        f = new CompletableFuture<>();
2302 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2303 <        f.complete(one);
2304 <        checkCompletedWithWrappedCFException(g);
1298 <
1299 <        f = new CompletableFuture<>();
1300 <        f.complete(one);
1301 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1302 <        checkCompletedWithWrappedCFException(g);
1303 <    }
2301 >        f.complete(v1);
2302 >        checkCompletedNormally(h, null);
2303 >        assertEquals(inc(v1), r.value);
2304 >        g.complete(v2);
2305  
2306 <    /**
2307 <     * thenCompose result completes exceptionally if source cancelled
2308 <     */
2309 <    public void testThenCompose4() {
1309 <        CompletableFuture<Integer> f, g;
1310 <        CompletableFutureInc r;
2306 >        checkCompletedNormally(f, v1);
2307 >        checkCompletedNormally(g, v2);
2308 >        checkCompletedNormally(h, null);
2309 >    }}
2310  
2311 <        f = new CompletableFuture<>();
2312 <        g = f.thenCompose(r = new CompletableFutureInc());
2313 <        assertTrue(f.cancel(true));
2314 <        checkCompletedWithWrappedCancellationException(g);
2311 >    public void testAcceptEither_normalCompletion2() {
2312 >        for (ExecutionMode m : ExecutionMode.values())
2313 >        for (Integer v1 : new Integer[] { 1, null })
2314 >        for (Integer v2 : new Integer[] { 2, null })
2315 >    {
2316 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2317 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2318 >        final IncAction r = new IncAction();
2319 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2320  
2321 <        f = new CompletableFuture<>();
2322 <        assertTrue(f.cancel(true));
2323 <        g = f.thenCompose(r = new CompletableFutureInc());
2324 <        checkCompletedWithWrappedCancellationException(g);
1321 <    }
2321 >        g.complete(v2);
2322 >        checkCompletedNormally(h, null);
2323 >        assertEquals(inc(v2), r.value);
2324 >        f.complete(v1);
2325  
2326 +        checkCompletedNormally(f, v1);
2327 +        checkCompletedNormally(g, v2);
2328 +        checkCompletedNormally(h, null);
2329 +    }}
2330  
2331 <    // asyncs
2331 >    public void testAcceptEither_normalCompletion3() {
2332 >        for (ExecutionMode m : ExecutionMode.values())
2333 >        for (Integer v1 : new Integer[] { 1, null })
2334 >        for (Integer v2 : new Integer[] { 2, null })
2335 >    {
2336 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2337 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2338 >        final IncAction r = new IncAction();
2339 >
2340 >        f.complete(v1);
2341 >        g.complete(v2);
2342 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343  
2344 <    /**
2345 <     * thenRunAsync result completes normally after normal completion of source
2346 <     */
1329 <    public void testThenRunAsync() {
1330 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1331 <        Noop r = new Noop();
1332 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1333 <        f.complete(null);
1334 <        checkCompletedNormally(g, null);
2344 >        checkCompletedNormally(h, null);
2345 >        checkCompletedNormally(f, v1);
2346 >        checkCompletedNormally(g, v2);
2347  
2348 <        // reordered version
2349 <        f = new CompletableFuture<>();
2350 <        f.complete(null);
2351 <        r = new Noop();
1340 <        g = f.thenRunAsync(r);
1341 <        checkCompletedNormally(g, null);
1342 <    }
2348 >        // unspecified behavior
2349 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2350 >                   Objects.equals(r.value, inc(v2)));
2351 >    }}
2352  
2353      /**
2354 <     * thenRunAsync result completes exceptionally after exceptional
2355 <     * completion of source
2354 >     * acceptEither result completes exceptionally after exceptional
2355 >     * completion of either source
2356       */
2357 <    public void testThenRunAsync2() {
2358 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2359 <        Noop r = new Noop();
2360 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2361 <        f.completeExceptionally(new CFException());
2357 >    public void testAcceptEither_exceptionalCompletion1() {
2358 >        for (ExecutionMode m : ExecutionMode.values())
2359 >        for (Integer v1 : new Integer[] { 1, null })
2360 >    {
2361 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2362 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2363 >        final IncAction r = new IncAction();
2364 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2365 >        final CFException ex = new CFException();
2366 >
2367 >        f.completeExceptionally(ex);
2368 >        checkCompletedWithWrappedCFException(h, ex);
2369 >        g.complete(v1);
2370 >
2371 >        assertEquals(0, r.invocationCount);
2372 >        checkCompletedNormally(g, v1);
2373 >        checkCompletedWithWrappedCFException(f, ex);
2374 >        checkCompletedWithWrappedCFException(h, ex);
2375 >    }}
2376 >
2377 >    public void testAcceptEither_exceptionalCompletion2() {
2378 >        for (ExecutionMode m : ExecutionMode.values())
2379 >        for (Integer v1 : new Integer[] { 1, null })
2380 >    {
2381 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2382 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2383 >        final IncAction r = new IncAction();
2384 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2385 >        final CFException ex = new CFException();
2386 >
2387 >        g.completeExceptionally(ex);
2388 >        checkCompletedWithWrappedCFException(h, ex);
2389 >        f.complete(v1);
2390 >
2391 >        assertEquals(0, r.invocationCount);
2392 >        checkCompletedNormally(f, v1);
2393 >        checkCompletedWithWrappedCFException(g, ex);
2394 >        checkCompletedWithWrappedCFException(h, ex);
2395 >    }}
2396 >
2397 >    public void testAcceptEither_exceptionalCompletion3() {
2398 >        for (ExecutionMode m : ExecutionMode.values())
2399 >        for (Integer v1 : new Integer[] { 1, null })
2400 >    {
2401 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2402 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2403 >        final IncAction r = new IncAction();
2404 >        final CFException ex = new CFException();
2405 >
2406 >        g.completeExceptionally(ex);
2407 >        f.complete(v1);
2408 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2409 >
2410 >        // unspecified behavior
2411 >        Integer v;
2412          try {
2413 <            g.join();
2414 <            shouldThrow();
2415 <        } catch (Exception ok) {
2413 >            assertNull(h.join());
2414 >            assertEquals(1, r.invocationCount);
2415 >            assertEquals(inc(v1), r.value);
2416 >        } catch (CompletionException ok) {
2417 >            checkCompletedWithWrappedCFException(h, ex);
2418 >            assertEquals(0, r.invocationCount);
2419          }
1358        checkCompletedWithWrappedCFException(g);
1359    }
2420  
2421 <    /**
2422 <     * thenRunAsync result completes exceptionally if action does
2423 <     */
2424 <    public void testThenRunAsync3() {
2425 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2426 <        FailingNoop r = new FailingNoop();
2427 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2428 <        f.complete(null);
2429 <        checkCompletedWithWrappedCFException(g);
2430 <    }
2421 >        checkCompletedWithWrappedCFException(g, ex);
2422 >        checkCompletedNormally(f, v1);
2423 >    }}
2424 >
2425 >    public void testAcceptEither_exceptionalCompletion4() {
2426 >        for (ExecutionMode m : ExecutionMode.values())
2427 >        for (Integer v1 : new Integer[] { 1, null })
2428 >    {
2429 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2430 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2431 >        final IncAction r = new IncAction();
2432 >        final CFException ex = new CFException();
2433 >
2434 >        f.completeExceptionally(ex);
2435 >        g.complete(v1);
2436 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2437  
2438 <    /**
2439 <     * thenRunAsync result completes exceptionally if source cancelled
2440 <     */
2441 <    public void testThenRunAsync4() {
2442 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2443 <        Noop r = new Noop();
2444 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2445 <        assertTrue(f.cancel(true));
2446 <        checkCompletedWithWrappedCancellationException(g);
2447 <    }
1382 <
1383 <    /**
1384 <     * thenApplyAsync result completes normally after normal completion of source
1385 <     */
1386 <    public void testThenApplyAsync() {
1387 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1388 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1389 <        f.complete(one);
1390 <        checkCompletedNormally(g, two);
1391 <    }
1392 <
1393 <    /**
1394 <     * thenApplyAsync result completes exceptionally after exceptional
1395 <     * completion of source
1396 <     */
1397 <    public void testThenApplyAsync2() {
1398 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1399 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1400 <        f.completeExceptionally(new CFException());
1401 <        checkCompletedWithWrappedCFException(g);
1402 <    }
1403 <
1404 <    /**
1405 <     * thenApplyAsync result completes exceptionally if action does
1406 <     */
1407 <    public void testThenApplyAsync3() {
1408 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1409 <        FailingFunction r = new FailingFunction();
1410 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1411 <        f.complete(null);
1412 <        checkCompletedWithWrappedCFException(g);
1413 <    }
1414 <
1415 <    /**
1416 <     * thenApplyAsync result completes exceptionally if source cancelled
1417 <     */
1418 <    public void testThenApplyAsync4() {
1419 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1420 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1421 <        assertTrue(f.cancel(true));
1422 <        checkCompletedWithWrappedCancellationException(g);
1423 <    }
1424 <
1425 <    /**
1426 <     * thenAcceptAsync result completes normally after normal
1427 <     * completion of source
1428 <     */
1429 <    public void testThenAcceptAsync() {
1430 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1431 <        IncAction r = new IncAction();
1432 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1433 <        f.complete(one);
1434 <        checkCompletedNormally(g, null);
1435 <        assertEquals(r.value, 2);
1436 <    }
1437 <
1438 <    /**
1439 <     * thenAcceptAsync result completes exceptionally after exceptional
1440 <     * completion of source
1441 <     */
1442 <    public void testThenAcceptAsync2() {
1443 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1444 <        IncAction r = new IncAction();
1445 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1446 <        f.completeExceptionally(new CFException());
1447 <        checkCompletedWithWrappedCFException(g);
1448 <    }
2438 >        // unspecified behavior
2439 >        Integer v;
2440 >        try {
2441 >            assertNull(h.join());
2442 >            assertEquals(1, r.invocationCount);
2443 >            assertEquals(inc(v1), r.value);
2444 >        } catch (CompletionException ok) {
2445 >            checkCompletedWithWrappedCFException(h, ex);
2446 >            assertEquals(0, r.invocationCount);
2447 >        }
2448  
2449 <    /**
2450 <     * thenAcceptAsync result completes exceptionally if action does
2451 <     */
1453 <    public void testThenAcceptAsync3() {
1454 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1455 <        FailingConsumer r = new FailingConsumer();
1456 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1457 <        f.complete(null);
1458 <        checkCompletedWithWrappedCFException(g);
1459 <    }
2449 >        checkCompletedWithWrappedCFException(f, ex);
2450 >        checkCompletedNormally(g, v1);
2451 >    }}
2452  
2453      /**
2454 <     * thenAcceptAsync result completes exceptionally if source cancelled
2454 >     * acceptEither result completes exceptionally if action does
2455       */
2456 <    public void testThenAcceptAsync4() {
2457 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2458 <        IncAction r = new IncAction();
2459 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2460 <        assertTrue(f.cancel(true));
2461 <        checkCompletedWithWrappedCancellationException(g);
2462 <    }
2456 >    public void testAcceptEither_actionFailed1() {
2457 >        for (ExecutionMode m : ExecutionMode.values())
2458 >        for (Integer v1 : new Integer[] { 1, null })
2459 >        for (Integer v2 : new Integer[] { 2, null })
2460 >    {
2461 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2462 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2463 >        final FailingConsumer r = new FailingConsumer();
2464 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2465 >
2466 >        f.complete(v1);
2467 >        checkCompletedWithWrappedCFException(h);
2468 >        g.complete(v2);
2469 >        checkCompletedNormally(f, v1);
2470 >        checkCompletedNormally(g, v2);
2471 >    }}
2472 >
2473 >    public void testAcceptEither_actionFailed2() {
2474 >        for (ExecutionMode m : ExecutionMode.values())
2475 >        for (Integer v1 : new Integer[] { 1, null })
2476 >        for (Integer v2 : new Integer[] { 2, null })
2477 >    {
2478 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2479 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2480 >        final FailingConsumer r = new FailingConsumer();
2481 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2482 >
2483 >        g.complete(v2);
2484 >        checkCompletedWithWrappedCFException(h);
2485 >        f.complete(v1);
2486 >        checkCompletedNormally(f, v1);
2487 >        checkCompletedNormally(g, v2);
2488 >    }}
2489  
2490      /**
2491 <     * thenCombineAsync result completes normally after normal
1474 <     * completion of sources
2491 >     * acceptEither result completes exceptionally if either source cancelled
2492       */
2493 <    public void testThenCombineAsync() {
2494 <        CompletableFuture<Integer> f, g, h;
2493 >    public void testAcceptEither_sourceCancelled1() {
2494 >        for (ExecutionMode m : ExecutionMode.values())
2495 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2496 >        for (Integer v1 : new Integer[] { 1, null })
2497 >    {
2498 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2499 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2500 >        final IncAction r = new IncAction();
2501 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2502  
2503 <        f = new CompletableFuture<>();
2504 <        g = new CompletableFuture<>();
2505 <        h = f.thenCombineAsync(g, subtract);
1482 <        f.complete(3);
1483 <        checkIncomplete(h);
1484 <        g.complete(1);
1485 <        checkCompletedNormally(h, 2);
1486 <
1487 <        f = new CompletableFuture<>();
1488 <        g = new CompletableFuture<>();
1489 <        h = f.thenCombineAsync(g, subtract);
1490 <        g.complete(1);
1491 <        checkIncomplete(h);
1492 <        f.complete(3);
1493 <        checkCompletedNormally(h, 2);
2503 >        assertTrue(f.cancel(mayInterruptIfRunning));
2504 >        checkCompletedWithWrappedCancellationException(h);
2505 >        g.complete(v1);
2506  
2507 <        f = new CompletableFuture<>();
2508 <        g = new CompletableFuture<>();
2509 <        g.complete(1);
2510 <        f.complete(3);
2511 <        h = f.thenCombineAsync(g, subtract);
1500 <        checkCompletedNormally(h, 2);
1501 <    }
2507 >        checkCancelled(f);
2508 >        assertEquals(0, r.invocationCount);
2509 >        checkCompletedNormally(g, v1);
2510 >        checkCompletedWithWrappedCancellationException(h);
2511 >    }}
2512  
2513 <    /**
2514 <     * thenCombineAsync result completes exceptionally after exceptional
2515 <     * completion of either source
2516 <     */
2517 <    public void testThenCombineAsync2() {
2518 <        CompletableFuture<Integer> f, g, h;
2513 >    public void testAcceptEither_sourceCancelled2() {
2514 >        for (ExecutionMode m : ExecutionMode.values())
2515 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2516 >        for (Integer v1 : new Integer[] { 1, null })
2517 >    {
2518 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2519 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2520 >        final IncAction r = new IncAction();
2521 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2522 >
2523 >        assertTrue(g.cancel(mayInterruptIfRunning));
2524 >        checkCompletedWithWrappedCancellationException(h);
2525 >        f.complete(v1);
2526 >
2527 >        checkCancelled(g);
2528 >        assertEquals(0, r.invocationCount);
2529 >        checkCompletedNormally(f, v1);
2530 >        checkCompletedWithWrappedCancellationException(h);
2531 >    }}
2532 >
2533 >    public void testAcceptEither_sourceCancelled3() {
2534 >        for (ExecutionMode m : ExecutionMode.values())
2535 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2536 >        for (Integer v1 : new Integer[] { 1, null })
2537 >    {
2538 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2539 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2540 >        final IncAction r = new IncAction();
2541 >
2542 >        assertTrue(g.cancel(mayInterruptIfRunning));
2543 >        f.complete(v1);
2544 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2545  
2546 <        f = new CompletableFuture<>();
2547 <        g = new CompletableFuture<>();
2548 <        h = f.thenCombineAsync(g, subtract);
2549 <        f.completeExceptionally(new CFException());
2550 <        checkIncomplete(h);
2551 <        g.complete(1);
2552 <        checkCompletedWithWrappedCFException(h);
2546 >        // unspecified behavior
2547 >        Integer v;
2548 >        try {
2549 >            assertNull(h.join());
2550 >            assertEquals(1, r.invocationCount);
2551 >            assertEquals(inc(v1), r.value);
2552 >        } catch (CompletionException ok) {
2553 >            checkCompletedWithWrappedCancellationException(h);
2554 >            assertEquals(0, r.invocationCount);
2555 >        }
2556  
2557 <        f = new CompletableFuture<>();
2558 <        g = new CompletableFuture<>();
2559 <        h = f.thenCombineAsync(g, subtract);
2560 <        g.completeExceptionally(new CFException());
2561 <        checkIncomplete(h);
2562 <        f.complete(3);
2563 <        checkCompletedWithWrappedCFException(h);
2557 >        checkCancelled(g);
2558 >        checkCompletedNormally(f, v1);
2559 >    }}
2560 >
2561 >    public void testAcceptEither_sourceCancelled4() {
2562 >        for (ExecutionMode m : ExecutionMode.values())
2563 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2564 >        for (Integer v1 : new Integer[] { 1, null })
2565 >    {
2566 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2567 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2568 >        final IncAction r = new IncAction();
2569 >
2570 >        assertTrue(f.cancel(mayInterruptIfRunning));
2571 >        g.complete(v1);
2572 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2573  
2574 <        f = new CompletableFuture<>();
2575 <        g = new CompletableFuture<>();
2576 <        g.completeExceptionally(new CFException());
2577 <        f.complete(3);
2578 <        h = f.thenCombineAsync(g, subtract);
2579 <        checkCompletedWithWrappedCFException(h);
2580 <    }
2574 >        // unspecified behavior
2575 >        Integer v;
2576 >        try {
2577 >            assertNull(h.join());
2578 >            assertEquals(1, r.invocationCount);
2579 >            assertEquals(inc(v1), r.value);
2580 >        } catch (CompletionException ok) {
2581 >            checkCompletedWithWrappedCancellationException(h);
2582 >            assertEquals(0, r.invocationCount);
2583 >        }
2584  
2585 <    /**
2586 <     * thenCombineAsync result completes exceptionally if action does
2587 <     */
1537 <    public void testThenCombineAsync3() {
1538 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1539 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1540 <        FailingBiFunction r = new FailingBiFunction();
1541 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1542 <        f.complete(one);
1543 <        checkIncomplete(g);
1544 <        assertFalse(r.ran);
1545 <        f2.complete(two);
1546 <        checkCompletedWithWrappedCFException(g);
1547 <        assertTrue(r.ran);
1548 <    }
2585 >        checkCancelled(f);
2586 >        checkCompletedNormally(g, v1);
2587 >    }}
2588  
2589      /**
2590 <     * thenCombineAsync result completes exceptionally if either source cancelled
2590 >     * runAfterEither result completes normally after normal completion
2591 >     * of either source
2592       */
2593 <    public void testThenCombineAsync4() {
2594 <        CompletableFuture<Integer> f, g, h;
2595 <
2596 <        f = new CompletableFuture<>();
2597 <        g = new CompletableFuture<>();
2598 <        h = f.thenCombineAsync(g, subtract);
2599 <        assertTrue(f.cancel(true));
2600 <        checkIncomplete(h);
2601 <        g.complete(1);
1562 <        checkCompletedWithWrappedCancellationException(h);
2593 >    public void testRunAfterEither_normalCompletion1() {
2594 >        for (ExecutionMode m : ExecutionMode.values())
2595 >        for (Integer v1 : new Integer[] { 1, null })
2596 >        for (Integer v2 : new Integer[] { 2, null })
2597 >    {
2598 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2599 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2600 >        final Noop r = new Noop();
2601 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2602  
2603 <        f = new CompletableFuture<>();
2604 <        g = new CompletableFuture<>();
2605 <        h = f.thenCombineAsync(g, subtract);
2606 <        assertTrue(g.cancel(true));
1568 <        checkIncomplete(h);
1569 <        f.complete(3);
1570 <        checkCompletedWithWrappedCancellationException(h);
1571 <
1572 <        f = new CompletableFuture<>();
1573 <        g = new CompletableFuture<>();
1574 <        g.complete(3);
1575 <        assertTrue(f.cancel(true));
1576 <        h = f.thenCombineAsync(g, subtract);
1577 <        checkCompletedWithWrappedCancellationException(h);
2603 >        f.complete(v1);
2604 >        checkCompletedNormally(h, null);
2605 >        assertEquals(1, r.invocationCount);
2606 >        g.complete(v2);
2607  
2608 <        f = new CompletableFuture<>();
2609 <        g = new CompletableFuture<>();
2610 <        f.complete(3);
2611 <        assertTrue(g.cancel(true));
2612 <        h = f.thenCombineAsync(g, subtract);
1584 <        checkCompletedWithWrappedCancellationException(h);
1585 <    }
2608 >        checkCompletedNormally(f, v1);
2609 >        checkCompletedNormally(g, v2);
2610 >        checkCompletedNormally(h, null);
2611 >        assertEquals(1, r.invocationCount);
2612 >    }}
2613  
2614 <    /**
2615 <     * thenAcceptBothAsync result completes normally after normal
2616 <     * completion of sources
2617 <     */
2618 <    public void testThenAcceptBothAsync() {
2619 <        CompletableFuture<Integer> f, g;
2620 <        CompletableFuture<Void> h;
2621 <        SubtractAction r;
2614 >    public void testRunAfterEither_normalCompletion2() {
2615 >        for (ExecutionMode m : ExecutionMode.values())
2616 >        for (Integer v1 : new Integer[] { 1, null })
2617 >        for (Integer v2 : new Integer[] { 2, null })
2618 >    {
2619 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2620 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2621 >        final Noop r = new Noop();
2622 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2623  
2624 <        f = new CompletableFuture<>();
1597 <        g = new CompletableFuture<>();
1598 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1599 <        f.complete(3);
1600 <        checkIncomplete(h);
1601 <        g.complete(1);
2624 >        g.complete(v2);
2625          checkCompletedNormally(h, null);
2626 <        assertEquals(r.value, 2);
2626 >        assertEquals(1, r.invocationCount);
2627 >        f.complete(v1);
2628  
2629 <        f = new CompletableFuture<>();
2630 <        g = new CompletableFuture<>();
1607 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1608 <        g.complete(1);
1609 <        checkIncomplete(h);
1610 <        f.complete(3);
2629 >        checkCompletedNormally(f, v1);
2630 >        checkCompletedNormally(g, v2);
2631          checkCompletedNormally(h, null);
2632 <        assertEquals(r.value, 2);
2632 >        assertEquals(1, r.invocationCount);
2633 >        }}
2634 >
2635 >    public void testRunAfterEither_normalCompletion3() {
2636 >        for (ExecutionMode m : ExecutionMode.values())
2637 >        for (Integer v1 : new Integer[] { 1, null })
2638 >        for (Integer v2 : new Integer[] { 2, null })
2639 >    {
2640 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2641 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2642 >        final Noop r = new Noop();
2643 >
2644 >        f.complete(v1);
2645 >        g.complete(v2);
2646 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2647  
1614        f = new CompletableFuture<>();
1615        g = new CompletableFuture<>();
1616        g.complete(1);
1617        f.complete(3);
1618        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2648          checkCompletedNormally(h, null);
2649 <        assertEquals(r.value, 2);
2650 <    }
2649 >        checkCompletedNormally(f, v1);
2650 >        checkCompletedNormally(g, v2);
2651 >        assertEquals(1, r.invocationCount);
2652 >    }}
2653  
2654      /**
2655 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2656 <     * completion of source
2655 >     * runAfterEither result completes exceptionally after exceptional
2656 >     * completion of either source
2657       */
2658 <    public void testThenAcceptBothAsync2() {
2659 <        CompletableFuture<Integer> f, g;
2660 <        CompletableFuture<Void> h;
2661 <        SubtractAction r;
2658 >    public void testRunAfterEither_exceptionalCompletion1() {
2659 >        for (ExecutionMode m : ExecutionMode.values())
2660 >        for (Integer v1 : new Integer[] { 1, null })
2661 >    {
2662 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2663 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2664 >        final Noop r = new Noop();
2665 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2666 >        final CFException ex = new CFException();
2667 >
2668 >        f.completeExceptionally(ex);
2669 >        checkCompletedWithWrappedCFException(h, ex);
2670 >        g.complete(v1);
2671 >
2672 >        assertEquals(0, r.invocationCount);
2673 >        checkCompletedNormally(g, v1);
2674 >        checkCompletedWithWrappedCFException(f, ex);
2675 >        checkCompletedWithWrappedCFException(h, ex);
2676 >    }}
2677 >
2678 >    public void testRunAfterEither_exceptionalCompletion2() {
2679 >        for (ExecutionMode m : ExecutionMode.values())
2680 >        for (Integer v1 : new Integer[] { 1, null })
2681 >    {
2682 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2683 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2684 >        final Noop r = new Noop();
2685 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2686 >        final CFException ex = new CFException();
2687 >
2688 >        g.completeExceptionally(ex);
2689 >        checkCompletedWithWrappedCFException(h, ex);
2690 >        f.complete(v1);
2691 >
2692 >        assertEquals(0, r.invocationCount);
2693 >        checkCompletedNormally(f, v1);
2694 >        checkCompletedWithWrappedCFException(g, ex);
2695 >        checkCompletedWithWrappedCFException(h, ex);
2696 >    }}
2697 >
2698 >    public void testRunAfterEither_exceptionalCompletion3() {
2699 >        for (ExecutionMode m : ExecutionMode.values())
2700 >        for (Integer v1 : new Integer[] { 1, null })
2701 >    {
2702 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2703 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2704 >        final Noop r = new Noop();
2705 >        final CFException ex = new CFException();
2706 >
2707 >        g.completeExceptionally(ex);
2708 >        f.complete(v1);
2709 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2710  
2711 <        f = new CompletableFuture<>();
2712 <        g = new CompletableFuture<>();
2713 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2714 <        f.completeExceptionally(new CFException());
2715 <        checkIncomplete(h);
2716 <        g.complete(1);
2717 <        checkCompletedWithWrappedCFException(h);
2711 >        // unspecified behavior
2712 >        Integer v;
2713 >        try {
2714 >            assertNull(h.join());
2715 >            assertEquals(1, r.invocationCount);
2716 >        } catch (CompletionException ok) {
2717 >            checkCompletedWithWrappedCFException(h, ex);
2718 >            assertEquals(0, r.invocationCount);
2719 >        }
2720  
2721 <        f = new CompletableFuture<>();
2722 <        g = new CompletableFuture<>();
2723 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2724 <        g.completeExceptionally(new CFException());
2725 <        checkIncomplete(h);
2726 <        f.complete(3);
2727 <        checkCompletedWithWrappedCFException(h);
2721 >        checkCompletedWithWrappedCFException(g, ex);
2722 >        checkCompletedNormally(f, v1);
2723 >    }}
2724 >
2725 >    public void testRunAfterEither_exceptionalCompletion4() {
2726 >        for (ExecutionMode m : ExecutionMode.values())
2727 >        for (Integer v1 : new Integer[] { 1, null })
2728 >    {
2729 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2730 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2731 >        final Noop r = new Noop();
2732 >        final CFException ex = new CFException();
2733 >
2734 >        f.completeExceptionally(ex);
2735 >        g.complete(v1);
2736 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2737  
2738 <        f = new CompletableFuture<>();
2739 <        g = new CompletableFuture<>();
2740 <        f.complete(3);
2741 <        g.completeExceptionally(new CFException());
2742 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2743 <        checkCompletedWithWrappedCFException(h);
2738 >        // unspecified behavior
2739 >        Integer v;
2740 >        try {
2741 >            assertNull(h.join());
2742 >            assertEquals(1, r.invocationCount);
2743 >        } catch (CompletionException ok) {
2744 >            checkCompletedWithWrappedCFException(h, ex);
2745 >            assertEquals(0, r.invocationCount);
2746 >        }
2747  
2748 <        f = new CompletableFuture<>();
2749 <        g = new CompletableFuture<>();
2750 <        f.completeExceptionally(new CFException());
1658 <        g.complete(3);
1659 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1660 <        checkCompletedWithWrappedCFException(h);
1661 <    }
2748 >        checkCompletedWithWrappedCFException(f, ex);
2749 >        checkCompletedNormally(g, v1);
2750 >    }}
2751  
2752      /**
2753 <     * thenAcceptBothAsync result completes exceptionally if action does
2753 >     * runAfterEither result completes exceptionally if action does
2754       */
2755 <    public void testThenAcceptBothAsync3() {
2756 <        CompletableFuture<Integer> f, g;
2757 <        CompletableFuture<Void> h;
2758 <        FailingBiConsumer r;
2759 <
2760 <        f = new CompletableFuture<>();
2761 <        g = new CompletableFuture<>();
2762 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
2763 <        f.complete(3);
2764 <        checkIncomplete(h);
2765 <        g.complete(1);
2766 <        checkCompletedWithWrappedCFException(h);
2767 <
2768 <        f = new CompletableFuture<>();
2769 <        g = new CompletableFuture<>();
2770 <        f.complete(3);
2771 <        g.complete(1);
2772 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
2773 <        checkCompletedWithWrappedCFException(h);
2774 <    }
2755 >    public void testRunAfterEither_actionFailed1() {
2756 >        for (ExecutionMode m : ExecutionMode.values())
2757 >        for (Integer v1 : new Integer[] { 1, null })
2758 >        for (Integer v2 : new Integer[] { 2, null })
2759 >    {
2760 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2761 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2762 >        final FailingNoop r = new FailingNoop();
2763 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2764 >
2765 >        f.complete(v1);
2766 >        checkCompletedWithWrappedCFException(h);
2767 >        g.complete(v2);
2768 >        checkCompletedNormally(f, v1);
2769 >        checkCompletedNormally(g, v2);
2770 >    }}
2771 >
2772 >    public void testRunAfterEither_actionFailed2() {
2773 >        for (ExecutionMode m : ExecutionMode.values())
2774 >        for (Integer v1 : new Integer[] { 1, null })
2775 >        for (Integer v2 : new Integer[] { 2, null })
2776 >    {
2777 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2778 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2779 >        final FailingNoop r = new FailingNoop();
2780 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2781 >
2782 >        g.complete(v2);
2783 >        checkCompletedWithWrappedCFException(h);
2784 >        f.complete(v1);
2785 >        checkCompletedNormally(f, v1);
2786 >        checkCompletedNormally(g, v2);
2787 >    }}
2788  
2789      /**
2790 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2790 >     * runAfterEither result completes exceptionally if either source cancelled
2791       */
2792 <    public void testThenAcceptBothAsync4() {
2793 <        CompletableFuture<Integer> f, g;
2794 <        CompletableFuture<Void> h;
2795 <        SubtractAction r;
2792 >    public void testRunAfterEither_sourceCancelled1() {
2793 >        for (ExecutionMode m : ExecutionMode.values())
2794 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2795 >        for (Integer v1 : new Integer[] { 1, null })
2796 >    {
2797 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2798 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2799 >        final Noop r = new Noop();
2800 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2801  
2802 <        f = new CompletableFuture<>();
1696 <        g = new CompletableFuture<>();
1697 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1698 <        assertTrue(f.cancel(true));
1699 <        checkIncomplete(h);
1700 <        g.complete(1);
1701 <        checkCompletedWithWrappedCancellationException(h);
1702 <
1703 <        f = new CompletableFuture<>();
1704 <        g = new CompletableFuture<>();
1705 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1706 <        assertTrue(g.cancel(true));
1707 <        checkIncomplete(h);
1708 <        f.complete(3);
2802 >        assertTrue(f.cancel(mayInterruptIfRunning));
2803          checkCompletedWithWrappedCancellationException(h);
2804 +        g.complete(v1);
2805  
2806 <        f = new CompletableFuture<>();
2807 <        g = new CompletableFuture<>();
2808 <        f.complete(3);
1714 <        assertTrue(g.cancel(true));
1715 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2806 >        checkCancelled(f);
2807 >        assertEquals(0, r.invocationCount);
2808 >        checkCompletedNormally(g, v1);
2809          checkCompletedWithWrappedCancellationException(h);
2810 +    }}
2811  
2812 <        f = new CompletableFuture<>();
2813 <        g = new CompletableFuture<>();
2814 <        assertTrue(f.cancel(true));
2815 <        g.complete(3);
2816 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2817 <        checkCompletedWithWrappedCancellationException(h);
2818 <    }
2812 >    public void testRunAfterEither_sourceCancelled2() {
2813 >        for (ExecutionMode m : ExecutionMode.values())
2814 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2815 >        for (Integer v1 : new Integer[] { 1, null })
2816 >    {
2817 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2818 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2819 >        final Noop r = new Noop();
2820 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2821 >
2822 >        assertTrue(g.cancel(mayInterruptIfRunning));
2823 >        checkCompletedWithWrappedCancellationException(h);
2824 >        f.complete(v1);
2825 >
2826 >        checkCancelled(g);
2827 >        assertEquals(0, r.invocationCount);
2828 >        checkCompletedNormally(f, v1);
2829 >        checkCompletedWithWrappedCancellationException(h);
2830 >    }}
2831 >
2832 >    public void testRunAfterEither_sourceCancelled3() {
2833 >        for (ExecutionMode m : ExecutionMode.values())
2834 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2835 >        for (Integer v1 : new Integer[] { 1, null })
2836 >    {
2837 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2838 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2839 >        final Noop r = new Noop();
2840 >
2841 >        assertTrue(g.cancel(mayInterruptIfRunning));
2842 >        f.complete(v1);
2843 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2844  
2845 <    /**
2846 <     * runAfterBothAsync result completes normally after normal
2847 <     * completion of sources
2848 <     */
2849 <    public void testRunAfterBothAsync() {
2850 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2851 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2852 <        Noop r = new Noop();
2853 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1735 <        f.complete(one);
1736 <        checkIncomplete(g);
1737 <        f2.complete(two);
1738 <        checkCompletedNormally(g, null);
1739 <        assertTrue(r.ran);
1740 <    }
2845 >        // unspecified behavior
2846 >        Integer v;
2847 >        try {
2848 >            assertNull(h.join());
2849 >            assertEquals(1, r.invocationCount);
2850 >        } catch (CompletionException ok) {
2851 >            checkCompletedWithWrappedCancellationException(h);
2852 >            assertEquals(0, r.invocationCount);
2853 >        }
2854  
2855 <    /**
2856 <     * runAfterBothAsync result completes exceptionally after exceptional
2857 <     * completion of source
2858 <     */
2859 <    public void testRunAfterBothAsync2() {
2860 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2861 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2862 <        Noop r = new Noop();
2863 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
2864 <        f.completeExceptionally(new CFException());
2865 <        f2.complete(two);
2866 <        checkCompletedWithWrappedCFException(g);
2855 >        checkCancelled(g);
2856 >        checkCompletedNormally(f, v1);
2857 >    }}
2858 >
2859 >    public void testRunAfterEither_sourceCancelled4() {
2860 >        for (ExecutionMode m : ExecutionMode.values())
2861 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2862 >        for (Integer v1 : new Integer[] { 1, null })
2863 >    {
2864 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2865 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2866 >        final Noop r = new Noop();
2867 >
2868 >        assertTrue(f.cancel(mayInterruptIfRunning));
2869 >        g.complete(v1);
2870 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2871  
2872 <        r = new Noop();
2873 <        f = new CompletableFuture<>();
2874 <        f2 = new CompletableFuture<>();
2875 <        g = f.runAfterBothAsync(f2, r);
2876 <        f.complete(one);
2877 <        f2.completeExceptionally(new CFException());
2878 <        checkCompletedWithWrappedCFException(g);
2879 <    }
2872 >        // unspecified behavior
2873 >        Integer v;
2874 >        try {
2875 >            assertNull(h.join());
2876 >            assertEquals(1, r.invocationCount);
2877 >        } catch (CompletionException ok) {
2878 >            checkCompletedWithWrappedCancellationException(h);
2879 >            assertEquals(0, r.invocationCount);
2880 >        }
2881  
2882 <    /**
2883 <     * runAfterBothAsync result completes exceptionally if action does
2884 <     */
1767 <    public void testRunAfterBothAsync3() {
1768 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1769 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1770 <        FailingNoop r = new FailingNoop();
1771 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1772 <        f.complete(one);
1773 <        checkIncomplete(g);
1774 <        f2.complete(two);
1775 <        checkCompletedWithWrappedCFException(g);
1776 <    }
2882 >        checkCancelled(f);
2883 >        checkCompletedNormally(g, v1);
2884 >    }}
2885  
2886      /**
2887 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2887 >     * thenCompose result completes normally after normal completion of source
2888       */
2889 <    public void testRunAfterBothAsync4() {
2890 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2891 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2892 <        Noop r = new Noop();
2893 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
2894 <        assertTrue(f.cancel(true));
2895 <        f2.complete(two);
2896 <        checkCompletedWithWrappedCancellationException(g);
2897 <
2898 <        r = new Noop();
2899 <        f = new CompletableFuture<>();
2900 <        f2 = new CompletableFuture<>();
2901 <        g = f.runAfterBothAsync(f2, r);
2902 <        f.complete(one);
2903 <        assertTrue(f2.cancel(true));
1796 <        checkCompletedWithWrappedCancellationException(g);
1797 <    }
2889 >    public void testThenCompose_normalCompletion() {
2890 >        for (ExecutionMode m : ExecutionMode.values())
2891 >        for (boolean createIncomplete : new boolean[] { true, false })
2892 >        for (Integer v1 : new Integer[] { 1, null })
2893 >    {
2894 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2895 >        final CompletableFutureInc r = new CompletableFutureInc();
2896 >        if (!createIncomplete) f.complete(v1);
2897 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2898 >        if (createIncomplete) f.complete(v1);
2899 >
2900 >        checkCompletedNormally(g, inc(v1));
2901 >        checkCompletedNormally(f, v1);
2902 >        assertEquals(1, r.invocationCount);
2903 >    }}
2904  
2905      /**
2906 <     * applyToEitherAsync result completes normally after normal
2907 <     * completion of sources
2906 >     * thenCompose result completes exceptionally after exceptional
2907 >     * completion of source
2908       */
2909 <    public void testApplyToEitherAsync() {
2910 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2911 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2912 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2913 <        f.complete(one);
2914 <        checkCompletedNormally(g, two);
2915 <
2916 <        f = new CompletableFuture<>();
2917 <        f.complete(one);
2918 <        f2 = new CompletableFuture<>();
2919 <        g = f.applyToEitherAsync(f2, inc);
2920 <        checkCompletedNormally(g, two);
2921 <    }
2909 >    public void testThenCompose_exceptionalCompletion() {
2910 >        for (ExecutionMode m : ExecutionMode.values())
2911 >        for (boolean createIncomplete : new boolean[] { true, false })
2912 >    {
2913 >        final CFException ex = new CFException();
2914 >        final CompletableFutureInc r = new CompletableFutureInc();
2915 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2916 >        if (!createIncomplete) f.completeExceptionally(ex);
2917 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2918 >        if (createIncomplete) f.completeExceptionally(ex);
2919 >
2920 >        checkCompletedWithWrappedCFException(g, ex);
2921 >        checkCompletedWithWrappedCFException(f, ex);
2922 >        assertEquals(0, r.invocationCount);
2923 >    }}
2924  
2925      /**
2926 <     * applyToEitherAsync result completes exceptionally after exceptional
1819 <     * completion of source
2926 >     * thenCompose result completes exceptionally if action does
2927       */
2928 <    public void testApplyToEitherAsync2() {
2929 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2930 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2931 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2932 <        f.completeExceptionally(new CFException());
2933 <        checkCompletedWithWrappedCFException(g);
2928 >    public void testThenCompose_actionFailed() {
2929 >        for (ExecutionMode m : ExecutionMode.values())
2930 >        for (boolean createIncomplete : new boolean[] { true, false })
2931 >        for (Integer v1 : new Integer[] { 1, null })
2932 >    {
2933 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2934 >        final FailingCompletableFutureFunction r
2935 >            = new FailingCompletableFutureFunction();
2936 >        if (!createIncomplete) f.complete(v1);
2937 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2938 >        if (createIncomplete) f.complete(v1);
2939  
1828        f = new CompletableFuture<>();
1829        f2 = new CompletableFuture<>();
1830        f2.completeExceptionally(new CFException());
1831        g = f.applyToEitherAsync(f2, inc);
1832        f.complete(one);
2940          checkCompletedWithWrappedCFException(g);
2941 <    }
2941 >        checkCompletedNormally(f, v1);
2942 >    }}
2943  
2944      /**
2945 <     * applyToEitherAsync result completes exceptionally if action does
2945 >     * thenCompose result completes exceptionally if source cancelled
2946       */
2947 <    public void testApplyToEitherAsync3() {
2948 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2949 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2950 <        FailingFunction r = new FailingFunction();
2951 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2952 <        f.complete(one);
2953 <        checkCompletedWithWrappedCFException(g);
2954 <    }
2947 >    public void testThenCompose_sourceCancelled() {
2948 >        for (ExecutionMode m : ExecutionMode.values())
2949 >        for (boolean createIncomplete : new boolean[] { true, false })
2950 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2951 >    {
2952 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2953 >        final CompletableFutureInc r = new CompletableFutureInc();
2954 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2955 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2956 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2957  
1848    /**
1849     * applyToEitherAsync result completes exceptionally if either source cancelled
1850     */
1851    public void testApplyToEitherAsync4() {
1852        CompletableFuture<Integer> f = new CompletableFuture<>();
1853        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1854        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1855        assertTrue(f.cancel(true));
2958          checkCompletedWithWrappedCancellationException(g);
2959 +        checkCancelled(f);
2960 +    }}
2961  
2962 <        f = new CompletableFuture<>();
1859 <        f2 = new CompletableFuture<>();
1860 <        assertTrue(f2.cancel(true));
1861 <        g = f.applyToEitherAsync(f2, inc);
1862 <        checkCompletedWithWrappedCancellationException(g);
1863 <    }
2962 >    // asyncs
2963  
2964      /**
2965 <     * acceptEitherAsync result completes normally after normal
2966 <     * completion of sources
2965 >     * thenAcceptAsync result completes normally after normal
2966 >     * completion of source
2967       */
2968 <    public void testAcceptEitherAsync() {
2968 >    public void testThenAcceptAsync() {
2969          CompletableFuture<Integer> f = new CompletableFuture<>();
1871        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2970          IncAction r = new IncAction();
2971 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1874 <        f.complete(one);
1875 <        checkCompletedNormally(g, null);
1876 <        assertEquals(r.value, 2);
1877 <
1878 <        r = new IncAction();
1879 <        f = new CompletableFuture<>();
2971 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2972          f.complete(one);
1881        f2 = new CompletableFuture<>();
1882        g = f.acceptEitherAsync(f2, r);
2973          checkCompletedNormally(g, null);
2974 <        assertEquals(r.value, 2);
2974 >        assertEquals(r.value, (Integer) 2);
2975      }
2976  
2977      /**
2978 <     * acceptEitherAsync result completes exceptionally after exceptional
2978 >     * thenAcceptAsync result completes exceptionally after exceptional
2979       * completion of source
2980       */
2981 <    public void testAcceptEitherAsync2() {
2981 >    public void testThenAcceptAsync2() {
2982          CompletableFuture<Integer> f = new CompletableFuture<>();
1893        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2983          IncAction r = new IncAction();
2984 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2984 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2985          f.completeExceptionally(new CFException());
2986          checkCompletedWithWrappedCFException(g);
1898
1899        r = new IncAction();
1900        f = new CompletableFuture<>();
1901        f2 = new CompletableFuture<>();
1902        f2.completeExceptionally(new CFException());
1903        g = f.acceptEitherAsync(f2, r);
1904        f.complete(one);
1905        checkCompletedWithWrappedCFException(g);
2987      }
2988  
2989      /**
2990 <     * acceptEitherAsync result completes exceptionally if action does
2990 >     * thenAcceptAsync result completes exceptionally if action does
2991       */
2992 <    public void testAcceptEitherAsync3() {
2992 >    public void testThenAcceptAsync3() {
2993          CompletableFuture<Integer> f = new CompletableFuture<>();
1913        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2994          FailingConsumer r = new FailingConsumer();
2995 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2996 <        f.complete(one);
2995 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2996 >        f.complete(null);
2997          checkCompletedWithWrappedCFException(g);
2998      }
2999  
3000      /**
3001 <     * acceptEitherAsync result completes exceptionally if either
1922 <     * source cancelled
3001 >     * thenAcceptAsync result completes exceptionally if source cancelled
3002       */
3003 <    public void testAcceptEitherAsync4() {
3003 >    public void testThenAcceptAsync4() {
3004          CompletableFuture<Integer> f = new CompletableFuture<>();
1926        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3005          IncAction r = new IncAction();
3006 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1929 <        assertTrue(f.cancel(true));
1930 <        checkCompletedWithWrappedCancellationException(g);
1931 <
1932 <        r = new IncAction();
1933 <        f = new CompletableFuture<>();
1934 <        f2 = new CompletableFuture<>();
1935 <        assertTrue(f2.cancel(true));
1936 <        g = f.acceptEitherAsync(f2, r);
1937 <        checkCompletedWithWrappedCancellationException(g);
1938 <    }
1939 <
1940 <    /**
1941 <     * runAfterEitherAsync result completes normally after normal
1942 <     * completion of sources
1943 <     */
1944 <    public void testRunAfterEitherAsync() {
1945 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1946 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1947 <        Noop r = new Noop();
1948 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1949 <        f.complete(one);
1950 <        checkCompletedNormally(g, null);
1951 <        assertTrue(r.ran);
1952 <
1953 <        r = new Noop();
1954 <        f = new CompletableFuture<>();
1955 <        f.complete(one);
1956 <        f2 = new CompletableFuture<>();
1957 <        g = f.runAfterEitherAsync(f2, r);
1958 <        checkCompletedNormally(g, null);
1959 <        assertTrue(r.ran);
1960 <    }
1961 <
1962 <    /**
1963 <     * runAfterEitherAsync result completes exceptionally after exceptional
1964 <     * completion of source
1965 <     */
1966 <    public void testRunAfterEitherAsync2() {
1967 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1968 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1969 <        Noop r = new Noop();
1970 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1971 <        f.completeExceptionally(new CFException());
1972 <        checkCompletedWithWrappedCFException(g);
1973 <
1974 <        r = new Noop();
1975 <        f = new CompletableFuture<>();
1976 <        f2 = new CompletableFuture<>();
1977 <        f2.completeExceptionally(new CFException());
1978 <        g = f.runAfterEitherAsync(f2, r);
1979 <        f.complete(one);
1980 <        checkCompletedWithWrappedCFException(g);
1981 <    }
1982 <
1983 <    /**
1984 <     * runAfterEitherAsync result completes exceptionally if action does
1985 <     */
1986 <    public void testRunAfterEitherAsync3() {
1987 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1988 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1989 <        FailingNoop r = new FailingNoop();
1990 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1991 <        f.complete(one);
1992 <        checkCompletedWithWrappedCFException(g);
1993 <    }
1994 <
1995 <    /**
1996 <     * runAfterEitherAsync result completes exceptionally if either
1997 <     * source cancelled
1998 <     */
1999 <    public void testRunAfterEitherAsync4() {
2000 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2001 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2002 <        Noop r = new Noop();
2003 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2004 <        assertTrue(f.cancel(true));
2005 <        checkCompletedWithWrappedCancellationException(g);
2006 <
2007 <        r = new Noop();
2008 <        f = new CompletableFuture<>();
2009 <        f2 = new CompletableFuture<>();
2010 <        assertTrue(f2.cancel(true));
2011 <        g = f.runAfterEitherAsync(f2, r);
2012 <        checkCompletedWithWrappedCancellationException(g);
2013 <    }
2014 <
2015 <    /**
2016 <     * thenComposeAsync result completes normally after normal
2017 <     * completion of source
2018 <     */
2019 <    public void testThenComposeAsync() {
2020 <        CompletableFuture<Integer> f, g;
2021 <        CompletableFutureInc r;
2022 <
2023 <        f = new CompletableFuture<>();
2024 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2025 <        f.complete(one);
2026 <        checkCompletedNormally(g, two);
2027 <
2028 <        f = new CompletableFuture<>();
2029 <        f.complete(one);
2030 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2031 <        checkCompletedNormally(g, two);
2032 <    }
2033 <
2034 <    /**
2035 <     * thenComposeAsync result completes exceptionally after
2036 <     * exceptional completion of source
2037 <     */
2038 <    public void testThenComposeAsync2() {
2039 <        CompletableFuture<Integer> f, g;
2040 <        CompletableFutureInc r;
2041 <
2042 <        f = new CompletableFuture<>();
2043 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2044 <        f.completeExceptionally(new CFException());
2045 <        checkCompletedWithWrappedCFException(g);
2046 <        assertFalse(r.ran);
2047 <
2048 <        f = new CompletableFuture<>();
2049 <        f.completeExceptionally(new CFException());
2050 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2051 <        checkCompletedWithWrappedCFException(g);
2052 <        assertFalse(r.ran);
2053 <    }
2054 <
2055 <    /**
2056 <     * thenComposeAsync result completes exceptionally if action does
2057 <     */
2058 <    public void testThenComposeAsync3() {
2059 <        CompletableFuture<Integer> f, g;
2060 <        FailingCompletableFutureFunction r;
2061 <
2062 <        f = new CompletableFuture<>();
2063 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2064 <        f.complete(one);
2065 <        checkCompletedWithWrappedCFException(g);
2066 <
2067 <        f = new CompletableFuture<>();
2068 <        f.complete(one);
2069 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2070 <        checkCompletedWithWrappedCFException(g);
2071 <    }
2072 <
2073 <    /**
2074 <     * thenComposeAsync result completes exceptionally if source cancelled
2075 <     */
2076 <    public void testThenComposeAsync4() {
2077 <        CompletableFuture<Integer> f, g;
2078 <        CompletableFutureInc r;
2079 <
2080 <        f = new CompletableFuture<>();
2081 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2082 <        assertTrue(f.cancel(true));
2083 <        checkCompletedWithWrappedCancellationException(g);
2084 <
2085 <        f = new CompletableFuture<>();
3006 >        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3007          assertTrue(f.cancel(true));
2087        g = f.thenComposeAsync(r = new CompletableFutureInc());
3008          checkCompletedWithWrappedCancellationException(g);
3009      }
3010  
2091
3011      // async with explicit executors
3012  
3013      /**
2095     * thenRunAsync result completes normally after normal completion of source
2096     */
2097    public void testThenRunAsyncE() {
2098        CompletableFuture<Integer> f = new CompletableFuture<>();
2099        Noop r = new Noop();
2100        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2101        f.complete(null);
2102        checkCompletedNormally(g, null);
2103
2104        // reordered version
2105        f = new CompletableFuture<>();
2106        f.complete(null);
2107        r = new Noop();
2108        g = f.thenRunAsync(r, new ThreadExecutor());
2109        checkCompletedNormally(g, null);
2110    }
2111
2112    /**
2113     * thenRunAsync result completes exceptionally after exceptional
2114     * completion of source
2115     */
2116    public void testThenRunAsync2E() {
2117        CompletableFuture<Integer> f = new CompletableFuture<>();
2118        Noop r = new Noop();
2119        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2120        f.completeExceptionally(new CFException());
2121        try {
2122            g.join();
2123            shouldThrow();
2124        } catch (Exception ok) {
2125        }
2126        checkCompletedWithWrappedCFException(g);
2127    }
2128
2129    /**
2130     * thenRunAsync result completes exceptionally if action does
2131     */
2132    public void testThenRunAsync3E() {
2133        CompletableFuture<Integer> f = new CompletableFuture<>();
2134        FailingNoop r = new FailingNoop();
2135        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2136        f.complete(null);
2137        checkCompletedWithWrappedCFException(g);
2138    }
2139
2140    /**
2141     * thenRunAsync result completes exceptionally if source cancelled
2142     */
2143    public void testThenRunAsync4E() {
2144        CompletableFuture<Integer> f = new CompletableFuture<>();
2145        Noop r = new Noop();
2146        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2147        assertTrue(f.cancel(true));
2148        checkCompletedWithWrappedCancellationException(g);
2149    }
2150
2151    /**
2152     * thenApplyAsync result completes normally after normal completion of source
2153     */
2154    public void testThenApplyAsyncE() {
2155        CompletableFuture<Integer> f = new CompletableFuture<>();
2156        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2157        f.complete(one);
2158        checkCompletedNormally(g, two);
2159    }
2160
2161    /**
2162     * thenApplyAsync result completes exceptionally after exceptional
2163     * completion of source
2164     */
2165    public void testThenApplyAsync2E() {
2166        CompletableFuture<Integer> f = new CompletableFuture<>();
2167        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2168        f.completeExceptionally(new CFException());
2169        checkCompletedWithWrappedCFException(g);
2170    }
2171
2172    /**
2173     * thenApplyAsync result completes exceptionally if action does
2174     */
2175    public void testThenApplyAsync3E() {
2176        CompletableFuture<Integer> f = new CompletableFuture<>();
2177        FailingFunction r = new FailingFunction();
2178        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2179        f.complete(null);
2180        checkCompletedWithWrappedCFException(g);
2181    }
2182
2183    /**
2184     * thenApplyAsync result completes exceptionally if source cancelled
2185     */
2186    public void testThenApplyAsync4E() {
2187        CompletableFuture<Integer> f = new CompletableFuture<>();
2188        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2189        assertTrue(f.cancel(true));
2190        checkCompletedWithWrappedCancellationException(g);
2191    }
2192
2193    /**
3014       * thenAcceptAsync result completes normally after normal
3015       * completion of source
3016       */
# Line 2200 | Line 3020 | public class CompletableFutureTest exten
3020          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3021          f.complete(one);
3022          checkCompletedNormally(g, null);
3023 <        assertEquals(r.value, 2);
3023 >        assertEquals(r.value, (Integer) 2);
3024      }
3025  
3026      /**
# Line 2237 | Line 3057 | public class CompletableFutureTest exten
3057          checkCompletedWithWrappedCancellationException(g);
3058      }
3059  
2240    /**
2241     * thenCombineAsync result completes normally after normal
2242     * completion of sources
2243     */
2244    public void testThenCombineAsyncE() {
2245        CompletableFuture<Integer> f, g, h;
2246        ThreadExecutor e = new ThreadExecutor();
2247        int count = 0;
2248
2249        f = new CompletableFuture<>();
2250        g = new CompletableFuture<>();
2251        h = f.thenCombineAsync(g, subtract, e);
2252        f.complete(3);
2253        checkIncomplete(h);
2254        g.complete(1);
2255        checkCompletedNormally(h, 2);
2256        assertEquals(++count, e.count.get());
2257
2258        f = new CompletableFuture<>();
2259        g = new CompletableFuture<>();
2260        h = f.thenCombineAsync(g, subtract, e);
2261        g.complete(1);
2262        checkIncomplete(h);
2263        f.complete(3);
2264        checkCompletedNormally(h, 2);
2265        assertEquals(++count, e.count.get());
2266
2267        f = new CompletableFuture<>();
2268        g = new CompletableFuture<>();
2269        g.complete(1);
2270        f.complete(3);
2271        h = f.thenCombineAsync(g, subtract, e);
2272        checkCompletedNormally(h, 2);
2273        assertEquals(++count, e.count.get());
2274    }
2275
2276    /**
2277     * thenCombineAsync result completes exceptionally after exceptional
2278     * completion of either source
2279     */
2280    public void testThenCombineAsync2E() {
2281        CompletableFuture<Integer> f, g, h;
2282        ThreadExecutor e = new ThreadExecutor();
2283        int count = 0;
2284
2285        f = new CompletableFuture<>();
2286        g = new CompletableFuture<>();
2287        h = f.thenCombineAsync(g, subtract, e);
2288        f.completeExceptionally(new CFException());
2289        checkIncomplete(h);
2290        g.complete(1);
2291        checkCompletedWithWrappedCFException(h);
2292
2293        f = new CompletableFuture<>();
2294        g = new CompletableFuture<>();
2295        h = f.thenCombineAsync(g, subtract, e);
2296        g.completeExceptionally(new CFException());
2297        checkIncomplete(h);
2298        f.complete(3);
2299        checkCompletedWithWrappedCFException(h);
2300
2301        f = new CompletableFuture<>();
2302        g = new CompletableFuture<>();
2303        g.completeExceptionally(new CFException());
2304        h = f.thenCombineAsync(g, subtract, e);
2305        checkIncomplete(h);
2306        f.complete(3);
2307        checkCompletedWithWrappedCFException(h);
2308
2309        assertEquals(0, e.count.get());
2310    }
2311
2312    /**
2313     * thenCombineAsync result completes exceptionally if action does
2314     */
2315    public void testThenCombineAsync3E() {
2316        CompletableFuture<Integer> f = new CompletableFuture<>();
2317        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2318        FailingBiFunction r = new FailingBiFunction();
2319        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2320        f.complete(one);
2321        checkIncomplete(g);
2322        assertFalse(r.ran);
2323        f2.complete(two);
2324        checkCompletedWithWrappedCFException(g);
2325        assertTrue(r.ran);
2326    }
2327
2328    /**
2329     * thenCombineAsync result completes exceptionally if either source cancelled
2330     */
2331    public void testThenCombineAsync4E() {
2332        CompletableFuture<Integer> f, g, h;
2333        ThreadExecutor e = new ThreadExecutor();
2334
2335        f = new CompletableFuture<>();
2336        g = new CompletableFuture<>();
2337        h = f.thenCombineAsync(g, subtract, e);
2338        assertTrue(f.cancel(true));
2339        checkIncomplete(h);
2340        g.complete(1);
2341        checkCompletedWithWrappedCancellationException(h);
2342
2343        f = new CompletableFuture<>();
2344        g = new CompletableFuture<>();
2345        h = f.thenCombineAsync(g, subtract, e);
2346        assertTrue(g.cancel(true));
2347        checkIncomplete(h);
2348        f.complete(3);
2349        checkCompletedWithWrappedCancellationException(h);
2350
2351        f = new CompletableFuture<>();
2352        g = new CompletableFuture<>();
2353        assertTrue(g.cancel(true));
2354        h = f.thenCombineAsync(g, subtract, e);
2355        checkIncomplete(h);
2356        f.complete(3);
2357        checkCompletedWithWrappedCancellationException(h);
2358
2359        f = new CompletableFuture<>();
2360        g = new CompletableFuture<>();
2361        assertTrue(f.cancel(true));
2362        assertTrue(g.cancel(true));
2363        h = f.thenCombineAsync(g, subtract, e);
2364        checkCompletedWithWrappedCancellationException(h);
2365
2366        assertEquals(0, e.count.get());
2367    }
2368
2369    /**
2370     * thenAcceptBothAsync result completes normally after normal
2371     * completion of sources
2372     */
2373    public void testThenAcceptBothAsyncE() {
2374        CompletableFuture<Integer> f, g;
2375        CompletableFuture<Void> h;
2376        SubtractAction r;
2377        ThreadExecutor e = new ThreadExecutor();
2378
2379        f = new CompletableFuture<>();
2380        g = new CompletableFuture<>();
2381        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2382        f.complete(3);
2383        checkIncomplete(h);
2384        g.complete(1);
2385        checkCompletedNormally(h, null);
2386        assertEquals(r.value, 2);
2387
2388        f = new CompletableFuture<>();
2389        g = new CompletableFuture<>();
2390        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2391        g.complete(1);
2392        checkIncomplete(h);
2393        f.complete(3);
2394        checkCompletedNormally(h, null);
2395        assertEquals(r.value, 2);
2396
2397        f = new CompletableFuture<>();
2398        g = new CompletableFuture<>();
2399        g.complete(1);
2400        f.complete(3);
2401        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2402        checkCompletedNormally(h, null);
2403        assertEquals(r.value, 2);
2404
2405        assertEquals(3, e.count.get());
2406    }
2407
2408    /**
2409     * thenAcceptBothAsync result completes exceptionally after exceptional
2410     * completion of source
2411     */
2412    public void testThenAcceptBothAsync2E() {
2413        CompletableFuture<Integer> f, g;
2414        CompletableFuture<Void> h;
2415        SubtractAction r;
2416        ThreadExecutor e = new ThreadExecutor();
2417
2418        f = new CompletableFuture<>();
2419        g = new CompletableFuture<>();
2420        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2421        f.completeExceptionally(new CFException());
2422        checkIncomplete(h);
2423        g.complete(1);
2424        checkCompletedWithWrappedCFException(h);
2425
2426        f = new CompletableFuture<>();
2427        g = new CompletableFuture<>();
2428        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2429        g.completeExceptionally(new CFException());
2430        checkIncomplete(h);
2431        f.complete(3);
2432        checkCompletedWithWrappedCFException(h);
2433
2434        f = new CompletableFuture<>();
2435        g = new CompletableFuture<>();
2436        f.complete(3);
2437        g.completeExceptionally(new CFException());
2438        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2439        checkCompletedWithWrappedCFException(h);
2440
2441        f = new CompletableFuture<>();
2442        g = new CompletableFuture<>();
2443        f.completeExceptionally(new CFException());
2444        g.complete(3);
2445        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2446        checkCompletedWithWrappedCFException(h);
2447
2448        assertEquals(0, e.count.get());
2449    }
2450
2451    /**
2452     * thenAcceptBothAsync result completes exceptionally if action does
2453     */
2454    public void testThenAcceptBothAsync3E() {
2455        CompletableFuture<Integer> f, g;
2456        CompletableFuture<Void> h;
2457        FailingBiConsumer r;
2458        ThreadExecutor e = new ThreadExecutor();
2459
2460        f = new CompletableFuture<>();
2461        g = new CompletableFuture<>();
2462        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2463        f.complete(3);
2464        checkIncomplete(h);
2465        g.complete(1);
2466        checkCompletedWithWrappedCFException(h);
2467
2468        f = new CompletableFuture<>();
2469        g = new CompletableFuture<>();
2470        f.complete(3);
2471        g.complete(1);
2472        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2473        checkCompletedWithWrappedCFException(h);
2474
2475        assertEquals(2, e.count.get());
2476    }
2477
2478    /**
2479     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2480     */
2481    public void testThenAcceptBothAsync4E() {
2482        CompletableFuture<Integer> f, g;
2483        CompletableFuture<Void> h;
2484        SubtractAction r;
2485        ThreadExecutor e = new ThreadExecutor();
2486
2487        f = new CompletableFuture<>();
2488        g = new CompletableFuture<>();
2489        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2490        assertTrue(f.cancel(true));
2491        checkIncomplete(h);
2492        g.complete(1);
2493        checkCompletedWithWrappedCancellationException(h);
2494
2495        f = new CompletableFuture<>();
2496        g = new CompletableFuture<>();
2497        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2498        assertTrue(g.cancel(true));
2499        checkIncomplete(h);
2500        f.complete(3);
2501        checkCompletedWithWrappedCancellationException(h);
2502
2503        f = new CompletableFuture<>();
2504        g = new CompletableFuture<>();
2505        f.complete(3);
2506        assertTrue(g.cancel(true));
2507        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2508        checkCompletedWithWrappedCancellationException(h);
2509
2510        f = new CompletableFuture<>();
2511        g = new CompletableFuture<>();
2512        assertTrue(f.cancel(true));
2513        g.complete(3);
2514        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2515        checkCompletedWithWrappedCancellationException(h);
2516
2517        assertEquals(0, e.count.get());
2518    }
2519
2520    /**
2521     * runAfterBothAsync result completes normally after normal
2522     * completion of sources
2523     */
2524    public void testRunAfterBothAsyncE() {
2525        CompletableFuture<Integer> f = new CompletableFuture<>();
2526        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2527        Noop r = new Noop();
2528        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2529        f.complete(one);
2530        checkIncomplete(g);
2531        f2.complete(two);
2532        checkCompletedNormally(g, null);
2533        assertTrue(r.ran);
2534    }
2535
2536    /**
2537     * runAfterBothAsync result completes exceptionally after exceptional
2538     * completion of source
2539     */
2540    public void testRunAfterBothAsync2E() {
2541        CompletableFuture<Integer> f = new CompletableFuture<>();
2542        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2543        Noop r = new Noop();
2544        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2545        f.completeExceptionally(new CFException());
2546        f2.complete(two);
2547        checkCompletedWithWrappedCFException(g);
2548
2549        r = new Noop();
2550        f = new CompletableFuture<>();
2551        f2 = new CompletableFuture<>();
2552        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2553        f.complete(one);
2554        f2.completeExceptionally(new CFException());
2555        checkCompletedWithWrappedCFException(g);
2556    }
2557
2558    /**
2559     * runAfterBothAsync result completes exceptionally if action does
2560     */
2561    public void testRunAfterBothAsync3E() {
2562        CompletableFuture<Integer> f = new CompletableFuture<>();
2563        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2564        FailingNoop r = new FailingNoop();
2565        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2566        f.complete(one);
2567        checkIncomplete(g);
2568        f2.complete(two);
2569        checkCompletedWithWrappedCFException(g);
2570    }
2571
2572    /**
2573     * runAfterBothAsync result completes exceptionally if either source cancelled
2574     */
2575    public void testRunAfterBothAsync4E() {
2576        CompletableFuture<Integer> f = new CompletableFuture<>();
2577        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2578        Noop r = new Noop();
2579        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2580        assertTrue(f.cancel(true));
2581        f2.complete(two);
2582        checkCompletedWithWrappedCancellationException(g);
2583
2584        r = new Noop();
2585        f = new CompletableFuture<>();
2586        f2 = new CompletableFuture<>();
2587        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2588        f.complete(one);
2589        assertTrue(f2.cancel(true));
2590        checkCompletedWithWrappedCancellationException(g);
2591    }
2592
2593    /**
2594     * applyToEitherAsync result completes normally after normal
2595     * completion of sources
2596     */
2597    public void testApplyToEitherAsyncE() {
2598        CompletableFuture<Integer> f = new CompletableFuture<>();
2599        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2600        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2601        f.complete(one);
2602        checkCompletedNormally(g, two);
2603
2604        f = new CompletableFuture<>();
2605        f.complete(one);
2606        f2 = new CompletableFuture<>();
2607        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2608        checkCompletedNormally(g, two);
2609    }
2610
2611    /**
2612     * applyToEitherAsync result completes exceptionally after exceptional
2613     * completion of source
2614     */
2615    public void testApplyToEitherAsync2E() {
2616        CompletableFuture<Integer> f = new CompletableFuture<>();
2617        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2618        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2619        f.completeExceptionally(new CFException());
2620        checkCompletedWithWrappedCFException(g);
2621
2622        f = new CompletableFuture<>();
2623        f2 = new CompletableFuture<>();
2624        f2.completeExceptionally(new CFException());
2625        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2626        f.complete(one);
2627        checkCompletedWithWrappedCFException(g);
2628    }
2629
2630    /**
2631     * applyToEitherAsync result completes exceptionally if action does
2632     */
2633    public void testApplyToEitherAsync3E() {
2634        CompletableFuture<Integer> f = new CompletableFuture<>();
2635        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2636        FailingFunction r = new FailingFunction();
2637        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2638        f.complete(one);
2639        checkCompletedWithWrappedCFException(g);
2640    }
2641
2642    /**
2643     * applyToEitherAsync result completes exceptionally if either source cancelled
2644     */
2645    public void testApplyToEitherAsync4E() {
2646        CompletableFuture<Integer> f = new CompletableFuture<>();
2647        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2648        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2649        assertTrue(f.cancel(true));
2650        checkCompletedWithWrappedCancellationException(g);
2651
2652        f = new CompletableFuture<>();
2653        f2 = new CompletableFuture<>();
2654        assertTrue(f2.cancel(true));
2655        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2656        checkCompletedWithWrappedCancellationException(g);
2657    }
2658
2659    /**
2660     * acceptEitherAsync result completes normally after normal
2661     * completion of sources
2662     */
2663    public void testAcceptEitherAsyncE() {
2664        CompletableFuture<Integer> f = new CompletableFuture<>();
2665        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2666        IncAction r = new IncAction();
2667        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2668        f.complete(one);
2669        checkCompletedNormally(g, null);
2670        assertEquals(r.value, 2);
2671
2672        r = new IncAction();
2673        f = new CompletableFuture<>();
2674        f.complete(one);
2675        f2 = new CompletableFuture<>();
2676        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2677        checkCompletedNormally(g, null);
2678        assertEquals(r.value, 2);
2679    }
2680
2681    /**
2682     * acceptEitherAsync result completes exceptionally after exceptional
2683     * completion of source
2684     */
2685    public void testAcceptEitherAsync2E() {
2686        CompletableFuture<Integer> f = new CompletableFuture<>();
2687        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2688        IncAction r = new IncAction();
2689        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2690        f.completeExceptionally(new CFException());
2691        checkCompletedWithWrappedCFException(g);
2692
2693        r = new IncAction();
2694        f = new CompletableFuture<>();
2695        f2 = new CompletableFuture<>();
2696        f2.completeExceptionally(new CFException());
2697        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2698        f.complete(one);
2699        checkCompletedWithWrappedCFException(g);
2700    }
2701
2702    /**
2703     * acceptEitherAsync result completes exceptionally if action does
2704     */
2705    public void testAcceptEitherAsync3E() {
2706        CompletableFuture<Integer> f = new CompletableFuture<>();
2707        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2708        FailingConsumer r = new FailingConsumer();
2709        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2710        f.complete(one);
2711        checkCompletedWithWrappedCFException(g);
2712    }
2713
2714    /**
2715     * acceptEitherAsync result completes exceptionally if either
2716     * source cancelled
2717     */
2718    public void testAcceptEitherAsync4E() {
2719        CompletableFuture<Integer> f = new CompletableFuture<>();
2720        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2721        IncAction r = new IncAction();
2722        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2723        assertTrue(f.cancel(true));
2724        checkCompletedWithWrappedCancellationException(g);
2725
2726        r = new IncAction();
2727        f = new CompletableFuture<>();
2728        f2 = new CompletableFuture<>();
2729        assertTrue(f2.cancel(true));
2730        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2731        checkCompletedWithWrappedCancellationException(g);
2732    }
2733
2734    /**
2735     * runAfterEitherAsync result completes normally after normal
2736     * completion of sources
2737     */
2738    public void testRunAfterEitherAsyncE() {
2739        CompletableFuture<Integer> f = new CompletableFuture<>();
2740        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2741        Noop r = new Noop();
2742        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2743        f.complete(one);
2744        checkCompletedNormally(g, null);
2745        assertTrue(r.ran);
2746
2747        r = new Noop();
2748        f = new CompletableFuture<>();
2749        f.complete(one);
2750        f2 = new CompletableFuture<>();
2751        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2752        checkCompletedNormally(g, null);
2753        assertTrue(r.ran);
2754    }
2755
2756    /**
2757     * runAfterEitherAsync result completes exceptionally after exceptional
2758     * completion of source
2759     */
2760    public void testRunAfterEitherAsync2E() {
2761        CompletableFuture<Integer> f = new CompletableFuture<>();
2762        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2763        Noop r = new Noop();
2764        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2765        f.completeExceptionally(new CFException());
2766        checkCompletedWithWrappedCFException(g);
2767
2768        r = new Noop();
2769        f = new CompletableFuture<>();
2770        f2 = new CompletableFuture<>();
2771        f2.completeExceptionally(new CFException());
2772        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2773        f.complete(one);
2774        checkCompletedWithWrappedCFException(g);
2775    }
2776
2777    /**
2778     * runAfterEitherAsync result completes exceptionally if action does
2779     */
2780    public void testRunAfterEitherAsync3E() {
2781        CompletableFuture<Integer> f = new CompletableFuture<>();
2782        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2783        FailingNoop r = new FailingNoop();
2784        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2785        f.complete(one);
2786        checkCompletedWithWrappedCFException(g);
2787    }
2788
2789    /**
2790     * runAfterEitherAsync result completes exceptionally if either
2791     * source cancelled
2792     */
2793    public void testRunAfterEitherAsync4E() {
2794        CompletableFuture<Integer> f = new CompletableFuture<>();
2795        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2796        Noop r = new Noop();
2797        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2798        assertTrue(f.cancel(true));
2799        checkCompletedWithWrappedCancellationException(g);
2800
2801        r = new Noop();
2802        f = new CompletableFuture<>();
2803        f2 = new CompletableFuture<>();
2804        assertTrue(f2.cancel(true));
2805        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2806        checkCompletedWithWrappedCancellationException(g);
2807    }
2808
2809    /**
2810     * thenComposeAsync result completes normally after normal
2811     * completion of source
2812     */
2813    public void testThenComposeAsyncE() {
2814        CompletableFuture<Integer> f = new CompletableFuture<>();
2815        CompletableFutureInc r = new CompletableFutureInc();
2816        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2817        f.complete(one);
2818        checkCompletedNormally(g, two);
2819    }
2820
2821    /**
2822     * thenComposeAsync result completes exceptionally after
2823     * exceptional completion of source
2824     */
2825    public void testThenComposeAsync2E() {
2826        CompletableFuture<Integer> f = new CompletableFuture<>();
2827        CompletableFutureInc r = new CompletableFutureInc();
2828        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2829        f.completeExceptionally(new CFException());
2830        checkCompletedWithWrappedCFException(g);
2831    }
2832
2833    /**
2834     * thenComposeAsync result completes exceptionally if action does
2835     */
2836    public void testThenComposeAsync3E() {
2837        CompletableFuture<Integer> f = new CompletableFuture<>();
2838        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2839        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2840        f.complete(one);
2841        checkCompletedWithWrappedCFException(g);
2842    }
2843
2844    /**
2845     * thenComposeAsync result completes exceptionally if source cancelled
2846     */
2847    public void testThenComposeAsync4E() {
2848        CompletableFuture<Integer> f = new CompletableFuture<>();
2849        CompletableFutureInc r = new CompletableFutureInc();
2850        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2851        assertTrue(f.cancel(true));
2852        checkCompletedWithWrappedCancellationException(g);
2853    }
2854
3060      // other static methods
3061  
3062      /**
# Line 2939 | Line 3144 | public class CompletableFutureTest exten
3144          ThreadExecutor exec = new ThreadExecutor();
3145  
3146          Runnable[] throwingActions = {
3147 <            () -> { CompletableFuture.supplyAsync(null); },
3148 <            () -> { CompletableFuture.supplyAsync(null, exec); },
3149 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
3150 <
3151 <            () -> { CompletableFuture.runAsync(null); },
3152 <            () -> { CompletableFuture.runAsync(null, exec); },
3153 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
3154 <
3155 <            () -> { f.completeExceptionally(null); },
3156 <
3157 <            () -> { f.thenApply(null); },
3158 <            () -> { f.thenApplyAsync(null); },
3159 <            () -> { f.thenApplyAsync((x) -> x, null); },
3160 <            () -> { f.thenApplyAsync(null, exec); },
3161 <
3162 <            () -> { f.thenAccept(null); },
3163 <            () -> { f.thenAcceptAsync(null); },
3164 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
3165 <            () -> { f.thenAcceptAsync(null, exec); },
3166 <
3167 <            () -> { f.thenRun(null); },
3168 <            () -> { f.thenRunAsync(null); },
3169 <            () -> { f.thenRunAsync(() -> { ; }, null); },
3170 <            () -> { f.thenRunAsync(null, exec); },
3171 <
3172 <            () -> { f.thenCombine(g, null); },
3173 <            () -> { f.thenCombineAsync(g, null); },
3174 <            () -> { f.thenCombineAsync(g, null, exec); },
3175 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
3176 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
3177 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
3178 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
3179 <
3180 <            () -> { f.thenAcceptBoth(g, null); },
3181 <            () -> { f.thenAcceptBothAsync(g, null); },
3182 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
3183 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
3184 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
3185 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
3186 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
3187 <
3188 <            () -> { f.runAfterBoth(g, null); },
3189 <            () -> { f.runAfterBothAsync(g, null); },
3190 <            () -> { f.runAfterBothAsync(g, null, exec); },
3191 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
3192 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
3193 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
3194 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
3195 <
3196 <            () -> { f.applyToEither(g, null); },
3197 <            () -> { f.applyToEitherAsync(g, null); },
3198 <            () -> { f.applyToEitherAsync(g, null, exec); },
3199 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
3200 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
3201 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
3202 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
3203 <
3204 <            () -> { f.acceptEither(g, null); },
3205 <            () -> { f.acceptEitherAsync(g, null); },
3206 <            () -> { f.acceptEitherAsync(g, null, exec); },
3207 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
3208 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
3209 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
3210 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
3211 <
3212 <            () -> { f.runAfterEither(g, null); },
3213 <            () -> { f.runAfterEitherAsync(g, null); },
3214 <            () -> { f.runAfterEitherAsync(g, null, exec); },
3215 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
3216 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
3217 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
3218 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
3219 <
3220 <            () -> { f.thenCompose(null); },
3221 <            () -> { f.thenComposeAsync(null); },
3222 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
3223 <            () -> { f.thenComposeAsync(null, exec); },
3224 <
3225 <            () -> { f.exceptionally(null); },
3226 <
3227 <            () -> { f.handle(null); },
3228 <
3229 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
3230 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3231 <            () -> { CompletableFuture.allOf(f, null); },
3232 <            () -> { CompletableFuture.allOf(null, f); },
3233 <
3234 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3235 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3236 <            () -> { CompletableFuture.anyOf(f, null); },
3237 <            () -> { CompletableFuture.anyOf(null, f); },
3147 >            () -> CompletableFuture.supplyAsync(null),
3148 >            () -> CompletableFuture.supplyAsync(null, exec),
3149 >            () -> CompletableFuture.supplyAsync(supplyOne, null),
3150 >
3151 >            () -> CompletableFuture.runAsync(null),
3152 >            () -> CompletableFuture.runAsync(null, exec),
3153 >            () -> CompletableFuture.runAsync(() -> {}, null),
3154 >
3155 >            () -> f.completeExceptionally(null),
3156 >
3157 >            () -> f.thenApply(null),
3158 >            () -> f.thenApplyAsync(null),
3159 >            () -> f.thenApplyAsync((x) -> x, null),
3160 >            () -> f.thenApplyAsync(null, exec),
3161 >
3162 >            () -> f.thenAccept(null),
3163 >            () -> f.thenAcceptAsync(null),
3164 >            () -> f.thenAcceptAsync((x) -> {} , null),
3165 >            () -> f.thenAcceptAsync(null, exec),
3166 >
3167 >            () -> f.thenRun(null),
3168 >            () -> f.thenRunAsync(null),
3169 >            () -> f.thenRunAsync(() -> {} , null),
3170 >            () -> f.thenRunAsync(null, exec),
3171 >
3172 >            () -> f.thenCombine(g, null),
3173 >            () -> f.thenCombineAsync(g, null),
3174 >            () -> f.thenCombineAsync(g, null, exec),
3175 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3176 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3177 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3178 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3179 >
3180 >            () -> f.thenAcceptBoth(g, null),
3181 >            () -> f.thenAcceptBothAsync(g, null),
3182 >            () -> f.thenAcceptBothAsync(g, null, exec),
3183 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3184 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3185 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3186 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3187 >
3188 >            () -> f.runAfterBoth(g, null),
3189 >            () -> f.runAfterBothAsync(g, null),
3190 >            () -> f.runAfterBothAsync(g, null, exec),
3191 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3192 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3193 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3194 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3195 >
3196 >            () -> f.applyToEither(g, null),
3197 >            () -> f.applyToEitherAsync(g, null),
3198 >            () -> f.applyToEitherAsync(g, null, exec),
3199 >            () -> f.applyToEither(nullFuture, (x) -> x),
3200 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3201 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3202 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3203 >
3204 >            () -> f.acceptEither(g, null),
3205 >            () -> f.acceptEitherAsync(g, null),
3206 >            () -> f.acceptEitherAsync(g, null, exec),
3207 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3208 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3209 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3210 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3211 >
3212 >            () -> f.runAfterEither(g, null),
3213 >            () -> f.runAfterEitherAsync(g, null),
3214 >            () -> f.runAfterEitherAsync(g, null, exec),
3215 >            () -> f.runAfterEither(nullFuture, () -> {}),
3216 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3217 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3218 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3219 >
3220 >            () -> f.thenCompose(null),
3221 >            () -> f.thenComposeAsync(null),
3222 >            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3223 >            () -> f.thenComposeAsync(null, exec),
3224 >
3225 >            () -> f.exceptionally(null),
3226 >
3227 >            () -> f.handle(null),
3228 >
3229 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3230 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3231 >            () -> CompletableFuture.allOf(f, null),
3232 >            () -> CompletableFuture.allOf(null, f),
3233 >
3234 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3235 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3236 >            () -> CompletableFuture.anyOf(f, null),
3237 >            () -> CompletableFuture.anyOf(null, f),
3238 >
3239 >            () -> f.obtrudeException(null),
3240          };
3241  
3242          assertThrows(NullPointerException.class, throwingActions);
# Line 3048 | Line 3255 | public class CompletableFutureTest exten
3255       * whenComplete action executes on normal completion, propagating
3256       * source result.
3257       */
3258 <    public void testWhenComplete1() {
3259 <        final AtomicInteger a = new AtomicInteger();
3260 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3261 <        CompletableFuture<Integer> g =
3262 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3263 <        f.complete(three);
3264 <        checkCompletedNormally(f, three);
3265 <        checkCompletedNormally(g, three);
3266 <        assertEquals(a.get(), 1);
3267 <    }
3258 >    public void testWhenComplete_normalCompletion1() {
3259 >        for (ExecutionMode m : ExecutionMode.values())
3260 >        for (boolean createIncomplete : new boolean[] { true, false })
3261 >        for (Integer v1 : new Integer[] { 1, null })
3262 >    {
3263 >        final AtomicInteger a = new AtomicInteger(0);
3264 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3265 >        if (!createIncomplete) f.complete(v1);
3266 >        final CompletableFuture<Integer> g = m.whenComplete
3267 >            (f,
3268 >             (Integer x, Throwable t) -> {
3269 >                threadAssertSame(x, v1);
3270 >                threadAssertNull(t);
3271 >                a.getAndIncrement();
3272 >            });
3273 >        if (createIncomplete) f.complete(v1);
3274 >
3275 >        checkCompletedNormally(g, v1);
3276 >        checkCompletedNormally(f, v1);
3277 >        assertEquals(1, a.get());
3278 >    }}
3279  
3280      /**
3281       * whenComplete action executes on exceptional completion, propagating
3282       * source result.
3283       */
3284 <    public void testWhenComplete2() {
3285 <        final AtomicInteger a = new AtomicInteger();
3286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3287 <        CompletableFuture<Integer> g =
3288 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3289 <        f.completeExceptionally(new CFException());
3290 <        assertTrue(f.isCompletedExceptionally());
3291 <        assertTrue(g.isCompletedExceptionally());
3292 <        assertEquals(a.get(), 1);
3293 <    }
3284 >    public void testWhenComplete_exceptionalCompletion() {
3285 >        for (ExecutionMode m : ExecutionMode.values())
3286 >        for (boolean createIncomplete : new boolean[] { true, false })
3287 >        for (Integer v1 : new Integer[] { 1, null })
3288 >    {
3289 >        final AtomicInteger a = new AtomicInteger(0);
3290 >        final CFException ex = new CFException();
3291 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3292 >        if (!createIncomplete) f.completeExceptionally(ex);
3293 >        final CompletableFuture<Integer> g = m.whenComplete
3294 >            (f,
3295 >             (Integer x, Throwable t) -> {
3296 >                threadAssertNull(x);
3297 >                threadAssertSame(t, ex);
3298 >                a.getAndIncrement();
3299 >            });
3300 >        if (createIncomplete) f.completeExceptionally(ex);
3301 >        checkCompletedWithWrappedCFException(f, ex);
3302 >        checkCompletedWithWrappedCFException(g, ex);
3303 >        assertEquals(1, a.get());
3304 >    }}
3305 >
3306 >    /**
3307 >     * whenComplete action executes on cancelled source, propagating
3308 >     * CancellationException.
3309 >     */
3310 >    public void testWhenComplete_sourceCancelled() {
3311 >        for (ExecutionMode m : ExecutionMode.values())
3312 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3313 >        for (boolean createIncomplete : new boolean[] { true, false })
3314 >    {
3315 >        final AtomicInteger a = new AtomicInteger(0);
3316 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3317 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3318 >        final CompletableFuture<Integer> g = m.whenComplete
3319 >            (f,
3320 >             (Integer x, Throwable t) -> {
3321 >                threadAssertNull(x);
3322 >                threadAssertTrue(t instanceof CancellationException);
3323 >                a.getAndIncrement();
3324 >            });
3325 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3326 >
3327 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3328 >        checkCompletedWithWrappedCancellationException(g);
3329 >        checkCancelled(f);
3330 >        assertEquals(1, a.get());
3331 >    }}
3332  
3333      /**
3334       * If a whenComplete action throws an exception when triggered by
3335       * a normal completion, it completes exceptionally
3336       */
3337 <    public void testWhenComplete3() {
3338 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3339 <        CompletableFuture<Integer> g =
3340 <            f.whenComplete((Integer x, Throwable t) ->
3341 <                           { throw new CFException(); } );
3342 <        f.complete(three);
3343 <        checkCompletedNormally(f, three);
3344 <        assertTrue(g.isCompletedExceptionally());
3345 <        checkCompletedWithWrappedCFException(g);
3346 <    }
3347 <
3348 <    /**
3349 <     * whenCompleteAsync action executes on normal completion, propagating
3350 <     * source result.
3351 <     */
3352 <    public void testWhenCompleteAsync1() {
3353 <        final AtomicInteger a = new AtomicInteger();
3354 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3355 <        CompletableFuture<Integer> g =
3356 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3357 <        f.complete(three);
3358 <        checkCompletedNormally(f, three);
3103 <        checkCompletedNormally(g, three);
3104 <        assertEquals(a.get(), 1);
3105 <    }
3106 <
3107 <    /**
3108 <     * whenCompleteAsync action executes on exceptional completion, propagating
3109 <     * source result.
3110 <     */
3111 <    public void testWhenCompleteAsync2() {
3112 <        final AtomicInteger a = new AtomicInteger();
3113 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3114 <        CompletableFuture<Integer> g =
3115 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3116 <        f.completeExceptionally(new CFException());
3117 <        checkCompletedWithWrappedCFException(f);
3118 <        checkCompletedWithWrappedCFException(g);
3119 <    }
3120 <
3121 <    /**
3122 <     * If a whenCompleteAsync action throws an exception when
3123 <     * triggered by a normal completion, it completes exceptionally
3124 <     */
3125 <    public void testWhenCompleteAsync3() {
3126 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3127 <        CompletableFuture<Integer> g =
3128 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3129 <                           { throw new CFException(); } );
3130 <        f.complete(three);
3131 <        checkCompletedNormally(f, three);
3132 <        checkCompletedWithWrappedCFException(g);
3133 <    }
3134 <
3135 <    /**
3136 <     * whenCompleteAsync action executes on normal completion, propagating
3137 <     * source result.
3138 <     */
3139 <    public void testWhenCompleteAsync1e() {
3140 <        final AtomicInteger a = new AtomicInteger();
3141 <        ThreadExecutor exec = new ThreadExecutor();
3142 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3143 <        CompletableFuture<Integer> g =
3144 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3145 <                                exec);
3146 <        f.complete(three);
3147 <        checkCompletedNormally(f, three);
3148 <        checkCompletedNormally(g, three);
3149 <        assertEquals(a.get(), 1);
3150 <    }
3151 <
3152 <    /**
3153 <     * whenCompleteAsync action executes on exceptional completion, propagating
3154 <     * source result.
3155 <     */
3156 <    public void testWhenCompleteAsync2e() {
3157 <        final AtomicInteger a = new AtomicInteger();
3158 <        ThreadExecutor exec = new ThreadExecutor();
3159 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3160 <        CompletableFuture<Integer> g =
3161 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3162 <                                exec);
3163 <        f.completeExceptionally(new CFException());
3164 <        checkCompletedWithWrappedCFException(f);
3165 <        checkCompletedWithWrappedCFException(g);
3166 <    }
3337 >    public void testWhenComplete_actionFailed() {
3338 >        for (boolean createIncomplete : new boolean[] { true, false })
3339 >        for (ExecutionMode m : ExecutionMode.values())
3340 >        for (Integer v1 : new Integer[] { 1, null })
3341 >    {
3342 >        final AtomicInteger a = new AtomicInteger(0);
3343 >        final CFException ex = new CFException();
3344 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3345 >        if (!createIncomplete) f.complete(v1);
3346 >        final CompletableFuture<Integer> g = m.whenComplete
3347 >            (f,
3348 >             (Integer x, Throwable t) -> {
3349 >                threadAssertSame(x, v1);
3350 >                threadAssertNull(t);
3351 >                a.getAndIncrement();
3352 >                throw ex;
3353 >            });
3354 >        if (createIncomplete) f.complete(v1);
3355 >        checkCompletedNormally(f, v1);
3356 >        checkCompletedWithWrappedCFException(g, ex);
3357 >        assertEquals(1, a.get());
3358 >    }}
3359  
3360      /**
3361 <     * If a whenCompleteAsync action throws an exception when triggered
3362 <     * by a normal completion, it completes exceptionally
3363 <     */
3172 <    public void testWhenCompleteAsync3e() {
3173 <        ThreadExecutor exec = new ThreadExecutor();
3174 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3175 <        CompletableFuture<Integer> g =
3176 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3177 <                                { throw new CFException(); },
3178 <                                exec);
3179 <        f.complete(three);
3180 <        checkCompletedNormally(f, three);
3181 <        checkCompletedWithWrappedCFException(g);
3182 <    }
3183 <
3184 <
3185 <    /**
3186 <     * handleAsync action completes normally with function value on
3187 <     * either normal or exceptional completion of source
3188 <     */
3189 <    public void testHandleAsync() {
3190 <        CompletableFuture<Integer> f, g;
3191 <        IntegerHandler r;
3192 <
3193 <        f = new CompletableFuture<>();
3194 <        g = f.handleAsync(r = new IntegerHandler());
3195 <        assertFalse(r.ran);
3196 <        f.completeExceptionally(new CFException());
3197 <        checkCompletedWithWrappedCFException(f);
3198 <        checkCompletedNormally(g, three);
3199 <        assertTrue(r.ran);
3200 <
3201 <        f = new CompletableFuture<>();
3202 <        g = f.handleAsync(r = new IntegerHandler());
3203 <        assertFalse(r.ran);
3204 <        f.completeExceptionally(new CFException());
3205 <        checkCompletedWithWrappedCFException(f);
3206 <        checkCompletedNormally(g, three);
3207 <        assertTrue(r.ran);
3208 <
3209 <        f = new CompletableFuture<>();
3210 <        g = f.handleAsync(r = new IntegerHandler());
3211 <        assertFalse(r.ran);
3212 <        f.complete(one);
3213 <        checkCompletedNormally(f, one);
3214 <        checkCompletedNormally(g, two);
3215 <        assertTrue(r.ran);
3216 <
3217 <        f = new CompletableFuture<>();
3218 <        g = f.handleAsync(r = new IntegerHandler());
3219 <        assertFalse(r.ran);
3220 <        f.complete(one);
3221 <        checkCompletedNormally(f, one);
3222 <        checkCompletedNormally(g, two);
3223 <        assertTrue(r.ran);
3224 <    }
3225 <
3226 <    /**
3227 <     * handleAsync action with Executor completes normally with
3228 <     * function value on either normal or exceptional completion of
3229 <     * source
3361 >     * If a whenComplete action throws an exception when triggered by
3362 >     * a source completion that also throws an exception, the source
3363 >     * exception takes precedence.
3364       */
3365 <    public void testHandleAsync2() {
3366 <        CompletableFuture<Integer> f, g;
3367 <        ThreadExecutor exec = new ThreadExecutor();
3368 <        IntegerHandler r;
3369 <
3370 <        f = new CompletableFuture<>();
3371 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3372 <        assertFalse(r.ran);
3373 <        f.completeExceptionally(new CFException());
3374 <        checkCompletedWithWrappedCFException(f);
3375 <        checkCompletedNormally(g, three);
3376 <        assertTrue(r.ran);
3377 <
3378 <        f = new CompletableFuture<>();
3379 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3380 <        assertFalse(r.ran);
3381 <        f.completeExceptionally(new CFException());
3382 <        checkCompletedWithWrappedCFException(f);
3383 <        checkCompletedNormally(g, three);
3384 <        assertTrue(r.ran);
3385 <
3386 <        f = new CompletableFuture<>();
3387 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3388 <        assertFalse(r.ran);
3389 <        f.complete(one);
3256 <        checkCompletedNormally(f, one);
3257 <        checkCompletedNormally(g, two);
3258 <        assertTrue(r.ran);
3259 <
3260 <        f = new CompletableFuture<>();
3261 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3262 <        assertFalse(r.ran);
3263 <        f.complete(one);
3264 <        checkCompletedNormally(f, one);
3265 <        checkCompletedNormally(g, two);
3266 <        assertTrue(r.ran);
3267 <    }
3365 >    public void testWhenComplete_actionFailedSourceFailed() {
3366 >        for (boolean createIncomplete : new boolean[] { true, false })
3367 >        for (ExecutionMode m : ExecutionMode.values())
3368 >        for (Integer v1 : new Integer[] { 1, null })
3369 >    {
3370 >        final AtomicInteger a = new AtomicInteger(0);
3371 >        final CFException ex1 = new CFException();
3372 >        final CFException ex2 = new CFException();
3373 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3374 >
3375 >        if (!createIncomplete) f.completeExceptionally(ex1);
3376 >        final CompletableFuture<Integer> g = m.whenComplete
3377 >            (f,
3378 >             (Integer x, Throwable t) -> {
3379 >                threadAssertSame(t, ex1);
3380 >                threadAssertNull(x);
3381 >                a.getAndIncrement();
3382 >                throw ex2;
3383 >            });
3384 >        if (createIncomplete) f.completeExceptionally(ex1);
3385 >
3386 >        checkCompletedWithWrappedCFException(f, ex1);
3387 >        checkCompletedWithWrappedCFException(g, ex1);
3388 >        assertEquals(1, a.get());
3389 >    }}
3390  
3391   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines