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.28 by jsr166, Sun Jul 14 16:34:49 2013 UTC vs.
Revision 1.52 by jsr166, Mon Jun 2 20:10:04 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  
298      /**
# Line 286 | 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(); }
419 >    static final class FailingRunnable implements Runnable {
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 361 | 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 completes with function value on source
706 <     * exception;  otherwise with source value
707 <     */
708 <    public void testExceptionally() {
709 <        CompletableFuture<Integer> f = new CompletableFuture<>();
710 <        ExceptionToInteger r = new ExceptionToInteger();
711 <        CompletableFuture<Integer> g = f.exceptionally(r);
712 <        f.completeExceptionally(new CFException());
713 <        checkCompletedNormally(g, three);
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  
387        f = new CompletableFuture<>();
388        r = new ExceptionToInteger();
389        g = f.exceptionally(r);
390        f.complete(one);
391        checkCompletedNormally(g, one);
392    }
728  
729      /**
730 <     * handle action completes normally with function value on either
731 <     * normal or exceptional completion of source
730 >     * exceptionally action completes with function value on source
731 >     * exception
732       */
733 <    public void testHandle() {
734 <        CompletableFuture<Integer> f, g;
735 <        IntegerHandler r;
736 <
737 <        f = new CompletableFuture<>();
738 <        f.completeExceptionally(new CFException());
739 <        g = f.handle(r = new IntegerHandler());
740 <        assertTrue(r.ran);
741 <        checkCompletedNormally(g, three);
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 <        f = new CompletableFuture<>();
802 <        g = f.handle(r = new IntegerHandler());
803 <        assertFalse(r.ran);
804 <        f.completeExceptionally(new CFException());
805 <        checkCompletedNormally(g, three);
806 <        assertTrue(r.ran);
801 >    /**
802 >     * handle action completes normally with function value on
803 >     * exceptional completion of source
804 >     */
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.complete(one);
854 <        g = f.handle(r = new IntegerHandler());
855 <        assertTrue(r.ran);
419 <        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 433 | 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 445 | 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 454 | Line 933 | public class CompletableFutureTest exten
933       * failing runAsync completes exceptionally after running Runnable
934       */
935      public void testRunAsync3() {
936 <        FailingNoop r = new FailingNoop();
936 >        FailingRunnable r = new FailingRunnable();
937          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
938          checkCompletedWithWrappedCFException(f);
939 <        assertTrue(r.ran);
939 >        assertEquals(1, r.invocationCount);
940      }
941  
942      /**
# Line 487 | 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 495 | 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;
981 <
982 <        f = new CompletableFuture<>();
983 <        g = f.thenRun(r = new Noop());
984 <        f.complete(null);
985 <        checkCompletedNormally(g, null);
986 <        assertTrue(r.ran);
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) {
987 >            checkIncomplete(g);
988 >            f.complete(v1);
989 >        }
990  
509        f = new CompletableFuture<>();
510        f.complete(null);
511        g = f.thenRun(r = new Noop());
991          checkCompletedNormally(g, null);
992 <        assertTrue(r.ran);
993 <    }
992 >        checkCompletedNormally(f, v1);
993 >        assertEquals(1, r.invocationCount);
994 >    }}
995  
996      /**
997       * thenRun result completes exceptionally after exceptional
998       * completion of source
999       */
1000 <    public void testThenRun2() {
1001 <        CompletableFuture<Integer> f;
1002 <        CompletableFuture<Void> g;
1003 <        Noop r;
1004 <
1005 <        f = new CompletableFuture<>();
1006 <        g = f.thenRun(r = new Noop());
1007 <        f.completeExceptionally(new CFException());
1008 <        checkCompletedWithWrappedCFException(g);
1009 <        assertFalse(r.ran);
1000 >    public void testThenRun_exceptionalCompletion() {
1001 >        for (ExecutionMode m : ExecutionMode.values())
1002 >        for (boolean createIncomplete : new boolean[] { true, false })
1003 >    {
1004 >        final CFException ex = new CFException();
1005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 >        final Noop r = new Noop();
1007 >        if (!createIncomplete) f.completeExceptionally(ex);
1008 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1009 >        if (createIncomplete) {
1010 >            checkIncomplete(g);
1011 >            f.completeExceptionally(ex);
1012 >        }
1013  
1014 <        f = new CompletableFuture<>();
1015 <        f.completeExceptionally(new CFException());
1016 <        g = f.thenRun(r = new Noop());
1017 <        checkCompletedWithWrappedCFException(g);
535 <        assertFalse(r.ran);
536 <    }
1014 >        checkCompletedWithWrappedCFException(g, ex);
1015 >        checkCompletedWithWrappedCFException(f, ex);
1016 >        assertEquals(0, r.invocationCount);
1017 >    }}
1018  
1019      /**
1020 <     * thenRun result completes exceptionally if action does
1020 >     * thenRun result completes exceptionally if source cancelled
1021       */
1022 <    public void testThenRun3() {
1023 <        CompletableFuture<Integer> f;
1024 <        CompletableFuture<Void> g;
1025 <        FailingNoop r;
1026 <
1027 <        f = new CompletableFuture<>();
1028 <        g = f.thenRun(r = new FailingNoop());
1029 <        f.complete(null);
1030 <        checkCompletedWithWrappedCFException(g);
1022 >    public void testThenRun_sourceCancelled() {
1023 >        for (ExecutionMode m : ExecutionMode.values())
1024 >        for (boolean createIncomplete : new boolean[] { true, false })
1025 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1026 >    {
1027 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1028 >        final Noop r = new Noop();
1029 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1030 >        final CompletableFuture<Void> g = f.thenRun(r);
1031 >        if (createIncomplete) {
1032 >            checkIncomplete(g);
1033 >            assertTrue(f.cancel(mayInterruptIfRunning));
1034 >        }
1035  
1036 <        f = new CompletableFuture<>();
1037 <        f.complete(null);
1038 <        g = f.thenRun(r = new FailingNoop());
1039 <        checkCompletedWithWrappedCFException(g);
555 <    }
1036 >        checkCompletedWithWrappedCancellationException(g);
1037 >        checkCancelled(f);
1038 >        assertEquals(0, r.invocationCount);
1039 >    }}
1040  
1041      /**
1042 <     * thenRun result completes exceptionally if source cancelled
1042 >     * thenRun result completes exceptionally if action does
1043       */
1044 <    public void testThenRun4() {
1045 <        CompletableFuture<Integer> f;
1046 <        CompletableFuture<Void> g;
1047 <        Noop r;
1048 <
1049 <        f = new CompletableFuture<>();
1050 <        g = f.thenRun(r = new Noop());
1051 <        assertTrue(f.cancel(true));
1052 <        checkCompletedWithWrappedCancellationException(g);
1044 >    public void testThenRun_actionFailed() {
1045 >        for (ExecutionMode m : ExecutionMode.values())
1046 >        for (boolean createIncomplete : new boolean[] { true, false })
1047 >        for (Integer v1 : new Integer[] { 1, null })
1048 >    {
1049 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1050 >        final FailingRunnable r = new FailingRunnable();
1051 >        if (!createIncomplete) f.complete(v1);
1052 >        final CompletableFuture<Void> g = f.thenRun(r);
1053 >        if (createIncomplete) {
1054 >            checkIncomplete(g);
1055 >            f.complete(v1);
1056 >        }
1057  
1058 <        f = new CompletableFuture<>();
1059 <        assertTrue(f.cancel(true));
1060 <        g = f.thenRun(r = new Noop());
573 <        checkCompletedWithWrappedCancellationException(g);
574 <    }
1058 >        checkCompletedWithWrappedCFException(g);
1059 >        checkCompletedNormally(f, v1);
1060 >    }}
1061  
1062      /**
1063       * thenApply result completes normally after normal completion of source
1064       */
1065 <    public void testThenApply() {
1066 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1067 <        CompletableFuture<Integer> g = f.thenApply(inc);
1068 <        f.complete(one);
1069 <        checkCompletedNormally(g, two);
1070 <    }
1065 >    public void testThenApply_normalCompletion() {
1066 >        for (ExecutionMode m : ExecutionMode.values())
1067 >        for (boolean createIncomplete : new boolean[] { true, false })
1068 >        for (Integer v1 : new Integer[] { 1, null })
1069 >    {
1070 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1071 >        final IncFunction r = new IncFunction();
1072 >        if (!createIncomplete) f.complete(v1);
1073 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1074 >        if (createIncomplete) {
1075 >            checkIncomplete(g);
1076 >            f.complete(v1);
1077 >        }
1078 >
1079 >        checkCompletedNormally(g, inc(v1));
1080 >        checkCompletedNormally(f, v1);
1081 >        assertEquals(1, r.invocationCount);
1082 >    }}
1083  
1084      /**
1085       * thenApply result completes exceptionally after exceptional
1086       * completion of source
1087       */
1088 <    public void testThenApply2() {
1089 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1090 <        CompletableFuture<Integer> g = f.thenApply(inc);
1091 <        f.completeExceptionally(new CFException());
1092 <        checkCompletedWithWrappedCFException(g);
1093 <    }
1088 >    public void testThenApply_exceptionalCompletion() {
1089 >        for (ExecutionMode m : ExecutionMode.values())
1090 >        for (boolean createIncomplete : new boolean[] { true, false })
1091 >    {
1092 >        final CFException ex = new CFException();
1093 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1094 >        final IncFunction r = new IncFunction();
1095 >        if (!createIncomplete) f.completeExceptionally(ex);
1096 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1097 >        if (createIncomplete) {
1098 >            checkIncomplete(g);
1099 >            f.completeExceptionally(ex);
1100 >        }
1101  
1102 <    /**
1103 <     * thenApply result completes exceptionally if action does
1104 <     */
1105 <    public void testThenApply3() {
601 <        CompletableFuture<Integer> f = new CompletableFuture<>();
602 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
603 <        f.complete(one);
604 <        checkCompletedWithWrappedCFException(g);
605 <    }
1102 >        checkCompletedWithWrappedCFException(g, ex);
1103 >        checkCompletedWithWrappedCFException(f, ex);
1104 >        assertEquals(0, r.invocationCount);
1105 >    }}
1106  
1107      /**
1108       * thenApply result completes exceptionally if source cancelled
1109       */
1110 <    public void testThenApply4() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1112 <        CompletableFuture<Integer> g = f.thenApply(inc);
1113 <        assertTrue(f.cancel(true));
1110 >    public void testThenApply_sourceCancelled() {
1111 >        for (ExecutionMode m : ExecutionMode.values())
1112 >        for (boolean createIncomplete : new boolean[] { true, false })
1113 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1114 >    {
1115 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1116 >        final IncFunction r = new IncFunction();
1117 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1118 >        final CompletableFuture<Integer> g = f.thenApply(r);
1119 >        if (createIncomplete) {
1120 >            checkIncomplete(g);
1121 >            assertTrue(f.cancel(mayInterruptIfRunning));
1122 >        }
1123 >
1124          checkCompletedWithWrappedCancellationException(g);
1125 <    }
1125 >        checkCancelled(f);
1126 >        assertEquals(0, r.invocationCount);
1127 >    }}
1128 >
1129 >    /**
1130 >     * thenApply result completes exceptionally if action does
1131 >     */
1132 >    public void testThenApply_actionFailed() {
1133 >        for (ExecutionMode m : ExecutionMode.values())
1134 >        for (boolean createIncomplete : new boolean[] { true, false })
1135 >        for (Integer v1 : new Integer[] { 1, null })
1136 >    {
1137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1138 >        final FailingFunction r = new FailingFunction();
1139 >        if (!createIncomplete) f.complete(v1);
1140 >        final CompletableFuture<Integer> g = f.thenApply(r);
1141 >        if (createIncomplete) {
1142 >            checkIncomplete(g);
1143 >            f.complete(v1);
1144 >        }
1145 >
1146 >        checkCompletedWithWrappedCFException(g);
1147 >        checkCompletedNormally(f, v1);
1148 >    }}
1149  
1150      /**
1151       * thenAccept result completes normally after normal completion of source
1152       */
1153 <    public void testThenAccept() {
1154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1155 <        IncAction r = new IncAction();
1156 <        CompletableFuture<Void> g = f.thenAccept(r);
1157 <        f.complete(one);
1153 >    public void testThenAccept_normalCompletion() {
1154 >        for (ExecutionMode m : ExecutionMode.values())
1155 >        for (boolean createIncomplete : new boolean[] { true, false })
1156 >        for (Integer v1 : new Integer[] { 1, null })
1157 >    {
1158 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1159 >        final IncAction r = new IncAction();
1160 >        if (!createIncomplete) f.complete(v1);
1161 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1162 >        if (createIncomplete) {
1163 >            checkIncomplete(g);
1164 >            f.complete(v1);
1165 >        }
1166 >
1167          checkCompletedNormally(g, null);
1168 <        assertEquals(r.value, 2);
1169 <    }
1168 >        checkCompletedNormally(f, v1);
1169 >        assertEquals(1, r.invocationCount);
1170 >        assertEquals(inc(v1), r.value);
1171 >    }}
1172  
1173      /**
1174       * thenAccept result completes exceptionally after exceptional
1175       * completion of source
1176       */
1177 <    public void testThenAccept2() {
1178 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1179 <        IncAction r = new IncAction();
1180 <        CompletableFuture<Void> g = f.thenAccept(r);
1181 <        f.completeExceptionally(new CFException());
1182 <        checkCompletedWithWrappedCFException(g);
1183 <    }
1177 >    public void testThenAccept_exceptionalCompletion() {
1178 >        for (ExecutionMode m : ExecutionMode.values())
1179 >        for (boolean createIncomplete : new boolean[] { true, false })
1180 >    {
1181 >        final CFException ex = new CFException();
1182 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1183 >        final IncAction r = new IncAction();
1184 >        if (!createIncomplete) f.completeExceptionally(ex);
1185 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1186 >        if (createIncomplete) {
1187 >            checkIncomplete(g);
1188 >            f.completeExceptionally(ex);
1189 >        }
1190 >
1191 >        checkCompletedWithWrappedCFException(g, ex);
1192 >        checkCompletedWithWrappedCFException(f, ex);
1193 >        assertEquals(0, r.invocationCount);
1194 >    }}
1195  
1196      /**
1197       * thenAccept result completes exceptionally if action does
1198       */
1199 <    public void testThenAccept3() {
1200 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1201 <        FailingConsumer r = new FailingConsumer();
1202 <        CompletableFuture<Void> g = f.thenAccept(r);
1203 <        f.complete(one);
1199 >    public void testThenAccept_actionFailed() {
1200 >        for (ExecutionMode m : ExecutionMode.values())
1201 >        for (boolean createIncomplete : new boolean[] { true, false })
1202 >        for (Integer v1 : new Integer[] { 1, null })
1203 >    {
1204 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1205 >        final FailingConsumer r = new FailingConsumer();
1206 >        if (!createIncomplete) f.complete(v1);
1207 >        final CompletableFuture<Void> g = f.thenAccept(r);
1208 >        if (createIncomplete) {
1209 >            checkIncomplete(g);
1210 >            f.complete(v1);
1211 >        }
1212 >
1213          checkCompletedWithWrappedCFException(g);
1214 <        assertTrue(r.ran);
1215 <    }
1214 >        checkCompletedNormally(f, v1);
1215 >    }}
1216  
1217      /**
1218       * thenAccept result completes exceptionally if source cancelled
1219       */
1220 <    public void testThenAccept4() {
1221 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        IncAction r = new IncAction();
1223 <        CompletableFuture<Void> g = f.thenAccept(r);
1224 <        assertTrue(f.cancel(true));
1220 >    public void testThenAccept_sourceCancelled() {
1221 >        for (ExecutionMode m : ExecutionMode.values())
1222 >        for (boolean createIncomplete : new boolean[] { true, false })
1223 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1224 >    {
1225 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1226 >        final IncAction r = new IncAction();
1227 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1228 >        final CompletableFuture<Void> g = f.thenAccept(r);
1229 >        if (createIncomplete) {
1230 >            checkIncomplete(g);
1231 >            assertTrue(f.cancel(mayInterruptIfRunning));
1232 >        }
1233 >
1234          checkCompletedWithWrappedCancellationException(g);
1235 <    }
1235 >        checkCancelled(f);
1236 >        assertEquals(0, r.invocationCount);
1237 >    }}
1238  
1239      /**
1240       * thenCombine result completes normally after normal completion
1241       * of sources
1242       */
1243 <    public void testThenCombine() {
1244 <        CompletableFuture<Integer> f, g, h;
1245 <
1246 <        f = new CompletableFuture<>();
1247 <        g = new CompletableFuture<>();
1248 <        h = f.thenCombine(g, subtract);
1249 <        f.complete(3);
1250 <        checkIncomplete(h);
1251 <        g.complete(1);
1252 <        checkCompletedNormally(h, 2);
1253 <
1254 <        f = new CompletableFuture<>();
1255 <        g = new CompletableFuture<>();
1256 <        h = f.thenCombine(g, subtract);
1257 <        g.complete(1);
1258 <        checkIncomplete(h);
1259 <        f.complete(3);
1260 <        checkCompletedNormally(h, 2);
1243 >    public void testThenCombine_normalCompletion() {
1244 >        for (ExecutionMode m : ExecutionMode.values())
1245 >        for (boolean createIncomplete : new boolean[] { true, false })
1246 >        for (boolean fFirst : new boolean[] { true, false })
1247 >        for (Integer v1 : new Integer[] { 1, null })
1248 >        for (Integer v2 : new Integer[] { 2, null })
1249 >    {
1250 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1251 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1252 >        final SubtractFunction r = new SubtractFunction();
1253 >
1254 >        if (fFirst) f.complete(v1); else g.complete(v2);
1255 >        if (!createIncomplete)
1256 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1257 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1258 >        if (createIncomplete) {
1259 >            checkIncomplete(h);
1260 >            assertEquals(0, r.invocationCount);
1261 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1262 >        }
1263  
1264 <        f = new CompletableFuture<>();
1265 <        g = new CompletableFuture<>();
1266 <        g.complete(1);
1267 <        f.complete(3);
1268 <        h = f.thenCombine(g, subtract);
692 <        checkCompletedNormally(h, 2);
693 <    }
1264 >        checkCompletedNormally(h, subtract(v1, v2));
1265 >        checkCompletedNormally(f, v1);
1266 >        checkCompletedNormally(g, v2);
1267 >        assertEquals(1, r.invocationCount);
1268 >    }}
1269  
1270      /**
1271       * thenCombine result completes exceptionally after exceptional
1272       * completion of either source
1273       */
1274 <    public void testThenCombine2() {
1275 <        CompletableFuture<Integer> f, g, h;
1276 <
1277 <        f = new CompletableFuture<>();
1278 <        g = new CompletableFuture<>();
1279 <        h = f.thenCombine(g, subtract);
1280 <        f.completeExceptionally(new CFException());
1281 <        checkIncomplete(h);
1282 <        g.complete(1);
1283 <        checkCompletedWithWrappedCFException(h);
1284 <
1285 <        f = new CompletableFuture<>();
1286 <        g = new CompletableFuture<>();
1287 <        h = f.thenCombine(g, subtract);
1288 <        g.completeExceptionally(new CFException());
1289 <        checkIncomplete(h);
1290 <        f.complete(3);
1291 <        checkCompletedWithWrappedCFException(h);
1292 <
718 <        f = new CompletableFuture<>();
719 <        g = new CompletableFuture<>();
720 <        f.complete(3);
721 <        g.completeExceptionally(new CFException());
722 <        h = f.thenCombine(g, subtract);
723 <        checkCompletedWithWrappedCFException(h);
1274 >    public void testThenCombine_exceptionalCompletion() {
1275 >        for (ExecutionMode m : ExecutionMode.values())
1276 >        for (boolean createIncomplete : new boolean[] { true, false })
1277 >        for (boolean fFirst : new boolean[] { true, false })
1278 >        for (Integer v1 : new Integer[] { 1, null })
1279 >    {
1280 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1281 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1282 >        final CFException ex = new CFException();
1283 >        final SubtractFunction r = new SubtractFunction();
1284 >
1285 >        (fFirst ? f : g).complete(v1);
1286 >        if (!createIncomplete)
1287 >            (!fFirst ? f : g).completeExceptionally(ex);
1288 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1289 >        if (createIncomplete) {
1290 >            checkIncomplete(h);
1291 >            (!fFirst ? f : g).completeExceptionally(ex);
1292 >        }
1293  
1294 <        f = new CompletableFuture<>();
1295 <        g = new CompletableFuture<>();
1296 <        f.completeExceptionally(new CFException());
1297 <        g.complete(3);
1298 <        h = f.thenCombine(g, subtract);
730 <        checkCompletedWithWrappedCFException(h);
731 <    }
1294 >        checkCompletedWithWrappedCFException(h, ex);
1295 >        assertEquals(0, r.invocationCount);
1296 >        checkCompletedNormally(fFirst ? f : g, v1);
1297 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1298 >    }}
1299  
1300      /**
1301       * thenCombine result completes exceptionally if action does
1302       */
1303 <    public void testThenCombine3() {
1304 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1305 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1306 <        FailingBiFunction r = new FailingBiFunction();
1307 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1308 <        f.complete(one);
1309 <        checkIncomplete(g);
1310 <        assertFalse(r.ran);
1311 <        f2.complete(two);
1312 <        checkCompletedWithWrappedCFException(g);
1313 <        assertTrue(r.ran);
1314 <    }
1303 >    public void testThenCombine_actionFailed() {
1304 >        for (ExecutionMode m : ExecutionMode.values())
1305 >        for (boolean fFirst : new boolean[] { true, false })
1306 >        for (Integer v1 : new Integer[] { 1, null })
1307 >        for (Integer v2 : new Integer[] { 2, null })
1308 >    {
1309 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1310 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1311 >        final FailingBiFunction r = new FailingBiFunction();
1312 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1313 >
1314 >        if (fFirst) {
1315 >            f.complete(v1);
1316 >            g.complete(v2);
1317 >        } else {
1318 >            g.complete(v2);
1319 >            f.complete(v1);
1320 >        }
1321 >
1322 >        checkCompletedWithWrappedCFException(h);
1323 >        checkCompletedNormally(f, v1);
1324 >        checkCompletedNormally(g, v2);
1325 >    }}
1326  
1327      /**
1328       * thenCombine result completes exceptionally if either source cancelled
1329       */
1330 <    public void testThenCombine4() {
1331 <        CompletableFuture<Integer> f, g, h;
1332 <
1333 <        f = new CompletableFuture<>();
1334 <        g = new CompletableFuture<>();
1335 <        h = f.thenCombine(g, subtract);
1336 <        assertTrue(f.cancel(true));
1337 <        checkIncomplete(h);
1338 <        g.complete(1);
1339 <        checkCompletedWithWrappedCancellationException(h);
1330 >    public void testThenCombine_sourceCancelled() {
1331 >        for (ExecutionMode m : ExecutionMode.values())
1332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 >        for (boolean createIncomplete : new boolean[] { true, false })
1334 >        for (boolean fFirst : new boolean[] { true, false })
1335 >        for (Integer v1 : new Integer[] { 1, null })
1336 >    {
1337 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1338 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1339 >        final SubtractFunction r = new SubtractFunction();
1340 >
1341 >        (fFirst ? f : g).complete(v1);
1342 >        if (!createIncomplete)
1343 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1344 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1345 >        if (createIncomplete) {
1346 >            checkIncomplete(h);
1347 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1348 >        }
1349  
763        f = new CompletableFuture<>();
764        g = new CompletableFuture<>();
765        h = f.thenCombine(g, subtract);
766        assertTrue(g.cancel(true));
767        checkIncomplete(h);
768        f.complete(3);
1350          checkCompletedWithWrappedCancellationException(h);
1351 <
1352 <        f = new CompletableFuture<>();
1353 <        g = new CompletableFuture<>();
1354 <        assertTrue(f.cancel(true));
774 <        assertTrue(g.cancel(true));
775 <        h = f.thenCombine(g, subtract);
776 <        checkCompletedWithWrappedCancellationException(h);
777 <    }
1351 >        checkCancelled(!fFirst ? f : g);
1352 >        assertEquals(0, r.invocationCount);
1353 >        checkCompletedNormally(fFirst ? f : g, v1);
1354 >    }}
1355  
1356      /**
1357       * thenAcceptBoth result completes normally after normal
1358       * completion of sources
1359       */
1360 <    public void testThenAcceptBoth() {
1361 <        CompletableFuture<Integer> f, g;
1362 <        CompletableFuture<Void> h;
1363 <        SubtractAction r;
1360 >    public void testThenAcceptBoth_normalCompletion1() {
1361 >        for (ExecutionMode m : ExecutionMode.values())
1362 >        for (Integer v1 : new Integer[] { 1, null })
1363 >        for (Integer v2 : new Integer[] { 2, null })
1364 >    {
1365 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1366 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1367 >        final SubtractAction r = new SubtractAction();
1368 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1369  
1370 <        f = new CompletableFuture<>();
789 <        g = new CompletableFuture<>();
790 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
791 <        f.complete(3);
1370 >        f.complete(v1);
1371          checkIncomplete(h);
1372 <        g.complete(1);
1372 >        assertEquals(0, r.invocationCount);
1373 >        g.complete(v2);
1374 >
1375          checkCompletedNormally(h, null);
1376 <        assertEquals(r.value, 2);
1376 >        assertEquals(subtract(v1, v2), r.value);
1377 >        checkCompletedNormally(f, v1);
1378 >        checkCompletedNormally(g, v2);
1379 >    }}
1380 >
1381 >    public void testThenAcceptBoth_normalCompletion2() {
1382 >        for (ExecutionMode m : ExecutionMode.values())
1383 >        for (Integer v1 : new Integer[] { 1, null })
1384 >        for (Integer v2 : new Integer[] { 2, null })
1385 >    {
1386 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1387 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1388 >        final SubtractAction r = new SubtractAction();
1389 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1390  
1391 <        f = new CompletableFuture<>();
798 <        g = new CompletableFuture<>();
799 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
800 <        g.complete(1);
1391 >        g.complete(v2);
1392          checkIncomplete(h);
1393 <        f.complete(3);
1393 >        assertEquals(0, r.invocationCount);
1394 >        f.complete(v1);
1395 >
1396          checkCompletedNormally(h, null);
1397 <        assertEquals(r.value, 2);
1397 >        assertEquals(subtract(v1, v2), r.value);
1398 >        checkCompletedNormally(f, v1);
1399 >        checkCompletedNormally(g, v2);
1400 >    }}
1401 >
1402 >    public void testThenAcceptBoth_normalCompletion3() {
1403 >        for (ExecutionMode m : ExecutionMode.values())
1404 >        for (Integer v1 : new Integer[] { 1, null })
1405 >        for (Integer v2 : new Integer[] { 2, null })
1406 >    {
1407 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 >        final SubtractAction r = new SubtractAction();
1410 >
1411 >        g.complete(v2);
1412 >        f.complete(v1);
1413 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1414  
806        f = new CompletableFuture<>();
807        g = new CompletableFuture<>();
808        g.complete(1);
809        f.complete(3);
810        h = f.thenAcceptBoth(g, r = new SubtractAction());
1415          checkCompletedNormally(h, null);
1416 <        assertEquals(r.value, 2);
1417 <    }
1416 >        assertEquals(subtract(v1, v2), r.value);
1417 >        checkCompletedNormally(f, v1);
1418 >        checkCompletedNormally(g, v2);
1419 >    }}
1420 >
1421 >    public void testThenAcceptBoth_normalCompletion4() {
1422 >        for (ExecutionMode m : ExecutionMode.values())
1423 >        for (Integer v1 : new Integer[] { 1, null })
1424 >        for (Integer v2 : new Integer[] { 2, null })
1425 >    {
1426 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1427 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1428 >        final SubtractAction r = new SubtractAction();
1429 >
1430 >        f.complete(v1);
1431 >        g.complete(v2);
1432 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1433 >
1434 >        checkCompletedNormally(h, null);
1435 >        assertEquals(subtract(v1, v2), r.value);
1436 >        checkCompletedNormally(f, v1);
1437 >        checkCompletedNormally(g, v2);
1438 >    }}
1439  
1440      /**
1441       * thenAcceptBoth result completes exceptionally after exceptional
1442       * completion of either source
1443       */
1444 <    public void testThenAcceptBoth2() {
1445 <        CompletableFuture<Integer> f, g;
1446 <        CompletableFuture<Void> h;
1447 <        SubtractAction r;
1448 <
1449 <        f = new CompletableFuture<>();
1450 <        g = new CompletableFuture<>();
1451 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1452 <        f.completeExceptionally(new CFException());
1453 <        checkIncomplete(h);
1454 <        g.complete(1);
1455 <        checkCompletedWithWrappedCFException(h);
1456 <
1457 <        f = new CompletableFuture<>();
1458 <        g = new CompletableFuture<>();
1459 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1460 <        g.completeExceptionally(new CFException());
1461 <        checkIncomplete(h);
1462 <        f.complete(3);
1463 <        checkCompletedWithWrappedCFException(h);
1464 <
1465 <        f = new CompletableFuture<>();
1466 <        g = new CompletableFuture<>();
1467 <        f.complete(3);
1468 <        g.completeExceptionally(new CFException());
1469 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1470 <        checkCompletedWithWrappedCFException(h);
1471 <
1472 <        f = new CompletableFuture<>();
1473 <        g = new CompletableFuture<>();
1474 <        f.completeExceptionally(new CFException());
1475 <        g.complete(3);
1476 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1477 <        checkCompletedWithWrappedCFException(h);
1478 <    }
1444 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1445 >        for (ExecutionMode m : ExecutionMode.values())
1446 >        for (Integer v1 : new Integer[] { 1, null })
1447 >    {
1448 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1449 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1450 >        final SubtractAction r = new SubtractAction();
1451 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1452 >        final CFException ex = new CFException();
1453 >
1454 >        f.completeExceptionally(ex);
1455 >        checkIncomplete(h);
1456 >        g.complete(v1);
1457 >
1458 >        checkCompletedWithWrappedCFException(h, ex);
1459 >        checkCompletedWithWrappedCFException(f, ex);
1460 >        assertEquals(0, r.invocationCount);
1461 >        checkCompletedNormally(g, v1);
1462 >    }}
1463 >
1464 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1465 >        for (ExecutionMode m : ExecutionMode.values())
1466 >        for (Integer v1 : new Integer[] { 1, null })
1467 >    {
1468 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1469 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1470 >        final SubtractAction r = new SubtractAction();
1471 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1472 >        final CFException ex = new CFException();
1473 >
1474 >        g.completeExceptionally(ex);
1475 >        checkIncomplete(h);
1476 >        f.complete(v1);
1477 >
1478 >        checkCompletedWithWrappedCFException(h, ex);
1479 >        checkCompletedWithWrappedCFException(g, ex);
1480 >        assertEquals(0, r.invocationCount);
1481 >        checkCompletedNormally(f, v1);
1482 >    }}
1483 >
1484 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1485 >        for (ExecutionMode m : ExecutionMode.values())
1486 >        for (Integer v1 : new Integer[] { 1, null })
1487 >    {
1488 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1489 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1490 >        final SubtractAction r = new SubtractAction();
1491 >        final CFException ex = new CFException();
1492 >
1493 >        g.completeExceptionally(ex);
1494 >        f.complete(v1);
1495 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1496 >
1497 >        checkCompletedWithWrappedCFException(h, ex);
1498 >        checkCompletedWithWrappedCFException(g, ex);
1499 >        assertEquals(0, r.invocationCount);
1500 >        checkCompletedNormally(f, v1);
1501 >    }}
1502 >
1503 >    public void testThenAcceptBoth_exceptionalCompletion4() {
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 CFException ex = new CFException();
1511 >
1512 >        f.completeExceptionally(ex);
1513 >        g.complete(v1);
1514 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1515 >
1516 >        checkCompletedWithWrappedCFException(h, ex);
1517 >        checkCompletedWithWrappedCFException(f, ex);
1518 >        assertEquals(0, r.invocationCount);
1519 >        checkCompletedNormally(g, v1);
1520 >    }}
1521  
1522      /**
1523       * thenAcceptBoth result completes exceptionally if action does
1524       */
1525 <    public void testThenAcceptBoth3() {
1526 <        CompletableFuture<Integer> f, g;
1527 <        CompletableFuture<Void> h;
1528 <        FailingBiConsumer r;
1529 <
1530 <        f = new CompletableFuture<>();
1531 <        g = new CompletableFuture<>();
1532 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1533 <        f.complete(3);
1534 <        checkIncomplete(h);
1535 <        g.complete(1);
1536 <        checkCompletedWithWrappedCFException(h);
1537 <
1538 <        f = new CompletableFuture<>();
1539 <        g = new CompletableFuture<>();
1540 <        f.complete(3);
1541 <        g.complete(1);
1542 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1543 <        checkCompletedWithWrappedCFException(h);
1544 <    }
1525 >    public void testThenAcceptBoth_actionFailed1() {
1526 >        for (ExecutionMode m : ExecutionMode.values())
1527 >        for (Integer v1 : new Integer[] { 1, null })
1528 >        for (Integer v2 : new Integer[] { 2, null })
1529 >    {
1530 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1531 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1532 >        final FailingBiConsumer r = new FailingBiConsumer();
1533 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1534 >
1535 >        f.complete(v1);
1536 >        checkIncomplete(h);
1537 >        g.complete(v2);
1538 >
1539 >        checkCompletedWithWrappedCFException(h);
1540 >        checkCompletedNormally(f, v1);
1541 >        checkCompletedNormally(g, v2);
1542 >    }}
1543 >
1544 >    public void testThenAcceptBoth_actionFailed2() {
1545 >        for (ExecutionMode m : ExecutionMode.values())
1546 >        for (Integer v1 : new Integer[] { 1, null })
1547 >        for (Integer v2 : new Integer[] { 2, null })
1548 >    {
1549 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1550 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1551 >        final FailingBiConsumer r = new FailingBiConsumer();
1552 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1553 >
1554 >        g.complete(v2);
1555 >        checkIncomplete(h);
1556 >        f.complete(v1);
1557 >
1558 >        checkCompletedWithWrappedCFException(h);
1559 >        checkCompletedNormally(f, v1);
1560 >        checkCompletedNormally(g, v2);
1561 >    }}
1562  
1563      /**
1564       * thenAcceptBoth result completes exceptionally if either source cancelled
1565       */
1566 <    public void testThenAcceptBoth4() {
1567 <        CompletableFuture<Integer> f, g;
1568 <        CompletableFuture<Void> h;
1569 <        SubtractAction r;
1570 <
1571 <        f = new CompletableFuture<>();
1572 <        g = new CompletableFuture<>();
1573 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1574 <        assertTrue(f.cancel(true));
891 <        checkIncomplete(h);
892 <        g.complete(1);
893 <        checkCompletedWithWrappedCancellationException(h);
1566 >    public void testThenAcceptBoth_sourceCancelled1() {
1567 >        for (ExecutionMode m : ExecutionMode.values())
1568 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1569 >        for (Integer v1 : new Integer[] { 1, null })
1570 >    {
1571 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1572 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1573 >        final SubtractAction r = new SubtractAction();
1574 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1575  
1576 <        f = new CompletableFuture<>();
896 <        g = new CompletableFuture<>();
897 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
898 <        assertTrue(g.cancel(true));
1576 >        assertTrue(f.cancel(mayInterruptIfRunning));
1577          checkIncomplete(h);
1578 <        f.complete(3);
901 <        checkCompletedWithWrappedCancellationException(h);
1578 >        g.complete(v1);
1579  
903        f = new CompletableFuture<>();
904        g = new CompletableFuture<>();
905        f.complete(3);
906        assertTrue(g.cancel(true));
907        h = f.thenAcceptBoth(g, r = new SubtractAction());
1580          checkCompletedWithWrappedCancellationException(h);
1581 +        checkCancelled(f);
1582 +        assertEquals(0, r.invocationCount);
1583 +        checkCompletedNormally(g, v1);
1584 +    }}
1585 +
1586 +    public void testThenAcceptBoth_sourceCancelled2() {
1587 +        for (ExecutionMode m : ExecutionMode.values())
1588 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1589 +        for (Integer v1 : new Integer[] { 1, null })
1590 +    {
1591 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1592 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1593 +        final SubtractAction r = new SubtractAction();
1594 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1595 +
1596 +        assertTrue(g.cancel(mayInterruptIfRunning));
1597 +        checkIncomplete(h);
1598 +        f.complete(v1);
1599 +
1600 +        checkCompletedWithWrappedCancellationException(h);
1601 +        checkCancelled(g);
1602 +        assertEquals(0, r.invocationCount);
1603 +        checkCompletedNormally(f, v1);
1604 +    }}
1605 +
1606 +    public void testThenAcceptBoth_sourceCancelled3() {
1607 +        for (ExecutionMode m : ExecutionMode.values())
1608 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1609 +        for (Integer v1 : new Integer[] { 1, null })
1610 +    {
1611 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1612 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1613 +        final SubtractAction r = new SubtractAction();
1614 +
1615 +        assertTrue(g.cancel(mayInterruptIfRunning));
1616 +        f.complete(v1);
1617 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1618 +
1619 +        checkCompletedWithWrappedCancellationException(h);
1620 +        checkCancelled(g);
1621 +        assertEquals(0, r.invocationCount);
1622 +        checkCompletedNormally(f, v1);
1623 +    }}
1624 +
1625 +    public void testThenAcceptBoth_sourceCancelled4() {
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 +
1634 +        assertTrue(f.cancel(mayInterruptIfRunning));
1635 +        g.complete(v1);
1636 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1637  
910        f = new CompletableFuture<>();
911        g = new CompletableFuture<>();
912        assertTrue(f.cancel(true));
913        g.complete(3);
914        h = f.thenAcceptBoth(g, r = new SubtractAction());
1638          checkCompletedWithWrappedCancellationException(h);
1639 <    }
1639 >        checkCancelled(f);
1640 >        assertEquals(0, r.invocationCount);
1641 >        checkCompletedNormally(g, v1);
1642 >    }}
1643  
1644      /**
1645       * runAfterBoth result completes normally after normal
1646       * completion of sources
1647       */
1648 <    public void testRunAfterBoth() {
1649 <        CompletableFuture<Integer> f, g;
1650 <        CompletableFuture<Void> h;
1651 <        Noop r;
1648 >    public void testRunAfterBoth_normalCompletion1() {
1649 >        for (ExecutionMode m : ExecutionMode.values())
1650 >        for (Integer v1 : new Integer[] { 1, null })
1651 >        for (Integer v2 : new Integer[] { 2, null })
1652 >    {
1653 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1654 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1655 >        final Noop r = new Noop();
1656 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1657  
1658 <        f = new CompletableFuture<>();
928 <        g = new CompletableFuture<>();
929 <        h = f.runAfterBoth(g, r = new Noop());
930 <        f.complete(3);
1658 >        f.complete(v1);
1659          checkIncomplete(h);
1660 <        g.complete(1);
1660 >        assertEquals(0, r.invocationCount);
1661 >        g.complete(v2);
1662 >
1663          checkCompletedNormally(h, null);
1664 <        assertTrue(r.ran);
1664 >        assertEquals(1, r.invocationCount);
1665 >        checkCompletedNormally(f, v1);
1666 >        checkCompletedNormally(g, v2);
1667 >    }}
1668 >
1669 >    public void testRunAfterBoth_normalCompletion2() {
1670 >        for (ExecutionMode m : ExecutionMode.values())
1671 >        for (Integer v1 : new Integer[] { 1, null })
1672 >        for (Integer v2 : new Integer[] { 2, null })
1673 >    {
1674 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1675 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1676 >        final Noop r = new Noop();
1677 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1678  
1679 <        f = new CompletableFuture<>();
937 <        g = new CompletableFuture<>();
938 <        h = f.runAfterBoth(g, r = new Noop());
939 <        g.complete(1);
1679 >        g.complete(v2);
1680          checkIncomplete(h);
1681 <        f.complete(3);
1681 >        assertEquals(0, r.invocationCount);
1682 >        f.complete(v1);
1683 >
1684          checkCompletedNormally(h, null);
1685 <        assertTrue(r.ran);
1685 >        assertEquals(1, r.invocationCount);
1686 >        checkCompletedNormally(f, v1);
1687 >        checkCompletedNormally(g, v2);
1688 >    }}
1689 >
1690 >    public void testRunAfterBoth_normalCompletion3() {
1691 >        for (ExecutionMode m : ExecutionMode.values())
1692 >        for (Integer v1 : new Integer[] { 1, null })
1693 >        for (Integer v2 : new Integer[] { 2, null })
1694 >    {
1695 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1696 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 >        final Noop r = new Noop();
1698 >
1699 >        g.complete(v2);
1700 >        f.complete(v1);
1701 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1702  
945        f = new CompletableFuture<>();
946        g = new CompletableFuture<>();
947        g.complete(1);
948        f.complete(3);
949        h = f.runAfterBoth(g, r = new Noop());
1703          checkCompletedNormally(h, null);
1704 <        assertTrue(r.ran);
1705 <    }
1704 >        assertEquals(1, r.invocationCount);
1705 >        checkCompletedNormally(f, v1);
1706 >        checkCompletedNormally(g, v2);
1707 >    }}
1708 >
1709 >    public void testRunAfterBoth_normalCompletion4() {
1710 >        for (ExecutionMode m : ExecutionMode.values())
1711 >        for (Integer v1 : new Integer[] { 1, null })
1712 >        for (Integer v2 : new Integer[] { 2, null })
1713 >    {
1714 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1715 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1716 >        final Noop r = new Noop();
1717 >
1718 >        f.complete(v1);
1719 >        g.complete(v2);
1720 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1721 >
1722 >        checkCompletedNormally(h, null);
1723 >        assertEquals(1, r.invocationCount);
1724 >        checkCompletedNormally(f, v1);
1725 >        checkCompletedNormally(g, v2);
1726 >    }}
1727  
1728      /**
1729       * runAfterBoth result completes exceptionally after exceptional
1730       * completion of either source
1731       */
1732 <    public void testRunAfterBoth2() {
1733 <        CompletableFuture<Integer> f, g;
1734 <        CompletableFuture<Void> h;
1735 <        Noop r;
1736 <
1737 <        f = new CompletableFuture<>();
1738 <        g = new CompletableFuture<>();
1739 <        h = f.runAfterBoth(g, r = new Noop());
1740 <        f.completeExceptionally(new CFException());
1741 <        checkIncomplete(h);
1742 <        g.complete(1);
1743 <        checkCompletedWithWrappedCFException(h);
1744 <        assertFalse(r.ran);
1745 <
1746 <        f = new CompletableFuture<>();
1747 <        g = new CompletableFuture<>();
1748 <        h = f.runAfterBoth(g, r = new Noop());
1749 <        g.completeExceptionally(new CFException());
1750 <        checkIncomplete(h);
1751 <        f.complete(3);
1752 <        checkCompletedWithWrappedCFException(h);
1753 <        assertFalse(r.ran);
1754 <
1755 <        f = new CompletableFuture<>();
1756 <        g = new CompletableFuture<>();
1757 <        g.completeExceptionally(new CFException());
1758 <        f.complete(3);
1759 <        h = f.runAfterBoth(g, r = new Noop());
1760 <        checkCompletedWithWrappedCFException(h);
1761 <        assertFalse(r.ran);
1762 <
1763 <        f = new CompletableFuture<>();
1764 <        g = new CompletableFuture<>();
1765 <        f.completeExceptionally(new CFException());
1766 <        g.complete(1);
1767 <        h = f.runAfterBoth(g, r = new Noop());
1768 <        checkCompletedWithWrappedCFException(h);
1769 <        assertFalse(r.ran);
1770 <    }
1732 >    public void testRunAfterBoth_exceptionalCompletion1() {
1733 >        for (ExecutionMode m : ExecutionMode.values())
1734 >        for (Integer v1 : new Integer[] { 1, null })
1735 >    {
1736 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1737 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1738 >        final Noop r = new Noop();
1739 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1740 >        final CFException ex = new CFException();
1741 >
1742 >        f.completeExceptionally(ex);
1743 >        checkIncomplete(h);
1744 >        g.complete(v1);
1745 >
1746 >        checkCompletedWithWrappedCFException(h, ex);
1747 >        checkCompletedWithWrappedCFException(f, ex);
1748 >        assertEquals(0, r.invocationCount);
1749 >        checkCompletedNormally(g, v1);
1750 >    }}
1751 >
1752 >    public void testRunAfterBoth_exceptionalCompletion2() {
1753 >        for (ExecutionMode m : ExecutionMode.values())
1754 >        for (Integer v1 : new Integer[] { 1, null })
1755 >    {
1756 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1757 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1758 >        final Noop r = new Noop();
1759 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1760 >        final CFException ex = new CFException();
1761 >
1762 >        g.completeExceptionally(ex);
1763 >        checkIncomplete(h);
1764 >        f.complete(v1);
1765 >
1766 >        checkCompletedWithWrappedCFException(h, ex);
1767 >        checkCompletedWithWrappedCFException(g, ex);
1768 >        assertEquals(0, r.invocationCount);
1769 >        checkCompletedNormally(f, v1);
1770 >    }}
1771 >
1772 >    public void testRunAfterBoth_exceptionalCompletion3() {
1773 >        for (ExecutionMode m : ExecutionMode.values())
1774 >        for (Integer v1 : new Integer[] { 1, null })
1775 >    {
1776 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1777 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1778 >        final Noop r = new Noop();
1779 >        final CFException ex = new CFException();
1780 >
1781 >        g.completeExceptionally(ex);
1782 >        f.complete(v1);
1783 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1784 >
1785 >        checkCompletedWithWrappedCFException(h, ex);
1786 >        checkCompletedWithWrappedCFException(g, ex);
1787 >        assertEquals(0, r.invocationCount);
1788 >        checkCompletedNormally(f, v1);
1789 >    }}
1790 >
1791 >    public void testRunAfterBoth_exceptionalCompletion4() {
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 CFException ex = new CFException();
1799 >
1800 >        f.completeExceptionally(ex);
1801 >        g.complete(v1);
1802 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1803 >
1804 >        checkCompletedWithWrappedCFException(h, ex);
1805 >        checkCompletedWithWrappedCFException(f, ex);
1806 >        assertEquals(0, r.invocationCount);
1807 >        checkCompletedNormally(g, v1);
1808 >    }}
1809  
1810      /**
1811       * runAfterBoth result completes exceptionally if action does
1812       */
1813 <    public void testRunAfterBoth3() {
1814 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1815 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1816 <        FailingNoop r = new FailingNoop();
1817 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1818 <        f.complete(one);
1819 <        checkIncomplete(g);
1820 <        f2.complete(two);
1821 <        checkCompletedWithWrappedCFException(g);
1822 <    }
1813 >    public void testRunAfterBoth_actionFailed1() {
1814 >        for (ExecutionMode m : ExecutionMode.values())
1815 >        for (Integer v1 : new Integer[] { 1, null })
1816 >        for (Integer v2 : new Integer[] { 2, null })
1817 >    {
1818 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1819 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1820 >        final FailingRunnable r = new FailingRunnable();
1821 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1822 >
1823 >        f.complete(v1);
1824 >        checkIncomplete(h);
1825 >        g.complete(v2);
1826 >
1827 >        checkCompletedWithWrappedCFException(h);
1828 >        checkCompletedNormally(f, v1);
1829 >        checkCompletedNormally(g, v2);
1830 >    }}
1831 >
1832 >    public void testRunAfterBoth_actionFailed2() {
1833 >        for (ExecutionMode m : ExecutionMode.values())
1834 >        for (Integer v1 : new Integer[] { 1, null })
1835 >        for (Integer v2 : new Integer[] { 2, null })
1836 >    {
1837 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1838 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1839 >        final FailingRunnable r = new FailingRunnable();
1840 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1841 >
1842 >        g.complete(v2);
1843 >        checkIncomplete(h);
1844 >        f.complete(v1);
1845 >
1846 >        checkCompletedWithWrappedCFException(h);
1847 >        checkCompletedNormally(f, v1);
1848 >        checkCompletedNormally(g, v2);
1849 >    }}
1850  
1851      /**
1852       * runAfterBoth result completes exceptionally if either source cancelled
1853       */
1854 <    public void testRunAfterBoth4() {
1855 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1856 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1857 <        Noop r = new Noop();
1858 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1859 <        assertTrue(f.cancel(true));
1860 <        f2.complete(two);
1861 <        checkCompletedWithWrappedCancellationException(g);
1862 <        f = new CompletableFuture<>();
1024 <        f2 = new CompletableFuture<>();
1025 <        r = new Noop();
1026 <        g = f.runAfterBoth(f2, r);
1027 <        f.complete(one);
1028 <        assertTrue(f2.cancel(true));
1029 <        checkCompletedWithWrappedCancellationException(g);
1030 <    }
1031 <
1032 <    /**
1033 <     * applyToEither result completes normally after normal completion
1034 <     * of either source
1035 <     */
1036 <    public void testApplyToEither() {
1037 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1038 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1039 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1040 <        f.complete(one);
1041 <        checkCompletedNormally(g, two);
1042 <        f2.complete(one);
1043 <        checkCompletedNormally(g, two);
1044 <
1045 <        f = new CompletableFuture<>();
1046 <        f.complete(one);
1047 <        f2 = new CompletableFuture<>();
1048 <        g = f.applyToEither(f2, inc);
1049 <        checkCompletedNormally(g, two);
1050 <    }
1051 <
1052 <    /**
1053 <     * applyToEither result completes exceptionally after exceptional
1054 <     * completion of either source
1055 <     */
1056 <    public void testApplyToEither2() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1059 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1060 <        f.completeExceptionally(new CFException());
1061 <        f2.complete(one);
1062 <        checkCompletedWithWrappedCFException(g);
1063 <
1064 <        f = new CompletableFuture<>();
1065 <        f2 = new CompletableFuture<>();
1066 <        f2.completeExceptionally(new CFException());
1067 <        g = f.applyToEither(f2, inc);
1068 <        checkCompletedWithWrappedCFException(g);
1069 <    }
1070 <
1071 <    /**
1072 <     * applyToEither result completes exceptionally if action does
1073 <     */
1074 <    public void testApplyToEither3() {
1075 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1077 <        FailingFunction r = new FailingFunction();
1078 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1079 <        f2.complete(two);
1080 <        checkCompletedWithWrappedCFException(g);
1081 <    }
1854 >    public void testRunAfterBoth_sourceCancelled1() {
1855 >        for (ExecutionMode m : ExecutionMode.values())
1856 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1857 >        for (Integer v1 : new Integer[] { 1, null })
1858 >    {
1859 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1860 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1861 >        final Noop r = new Noop();
1862 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1863  
1864 <    /**
1865 <     * applyToEither result completes exceptionally if either source cancelled
1866 <     */
1086 <    public void testApplyToEither4() {
1087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1088 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1089 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1090 <        assertTrue(f.cancel(true));
1091 <        checkCompletedWithWrappedCancellationException(g);
1092 <        f = new CompletableFuture<>();
1093 <        f2 = new CompletableFuture<>();
1094 <        assertTrue(f2.cancel(true));
1095 <        checkCompletedWithWrappedCancellationException(g);
1096 <    }
1097 <
1098 <    /**
1099 <     * acceptEither result completes normally after normal completion
1100 <     * of either source
1101 <     */
1102 <    public void testAcceptEither() {
1103 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1104 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1105 <        IncAction r = new IncAction();
1106 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1107 <        f.complete(one);
1108 <        checkCompletedNormally(g, null);
1109 <        f2.complete(one);
1110 <        checkCompletedNormally(g, null);
1111 <        assertEquals(r.value, 2);
1112 <
1113 <        r = new IncAction();
1114 <        f = new CompletableFuture<>();
1115 <        f.complete(one);
1116 <        f2 = new CompletableFuture<>();
1117 <        g = f.acceptEither(f2, r);
1118 <        checkCompletedNormally(g, null);
1119 <        assertEquals(r.value, 2);
1120 <    }
1121 <
1122 <    /**
1123 <     * acceptEither result completes exceptionally after exceptional
1124 <     * completion of either source
1125 <     */
1126 <    public void testAcceptEither2() {
1127 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1128 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1129 <        IncAction r = new IncAction();
1130 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1131 <        f.completeExceptionally(new CFException());
1132 <        f2.complete(one);
1133 <        checkCompletedWithWrappedCFException(g);
1134 <
1135 <        r = new IncAction();
1136 <        f = new CompletableFuture<>();
1137 <        f2 = new CompletableFuture<>();
1138 <        f2.completeExceptionally(new CFException());
1139 <        g = f.acceptEither(f2, r);
1140 <        checkCompletedWithWrappedCFException(g);
1141 <    }
1864 >        assertTrue(f.cancel(mayInterruptIfRunning));
1865 >        checkIncomplete(h);
1866 >        g.complete(v1);
1867  
1868 <    /**
1869 <     * acceptEither result completes exceptionally if action does
1870 <     */
1871 <    public void testAcceptEither3() {
1872 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1873 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1874 <        FailingConsumer r = new FailingConsumer();
1875 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1876 <        f2.complete(two);
1877 <        checkCompletedWithWrappedCFException(g);
1878 <    }
1868 >        checkCompletedWithWrappedCancellationException(h);
1869 >        checkCancelled(f);
1870 >        assertEquals(0, r.invocationCount);
1871 >        checkCompletedNormally(g, v1);
1872 >    }}
1873 >
1874 >    public void testRunAfterBoth_sourceCancelled2() {
1875 >        for (ExecutionMode m : ExecutionMode.values())
1876 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1877 >        for (Integer v1 : new Integer[] { 1, null })
1878 >    {
1879 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1880 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1881 >        final Noop r = new Noop();
1882 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1883 >
1884 >        assertTrue(g.cancel(mayInterruptIfRunning));
1885 >        checkIncomplete(h);
1886 >        f.complete(v1);
1887 >
1888 >        checkCompletedWithWrappedCancellationException(h);
1889 >        checkCancelled(g);
1890 >        assertEquals(0, r.invocationCount);
1891 >        checkCompletedNormally(f, v1);
1892 >    }}
1893 >
1894 >    public void testRunAfterBoth_sourceCancelled3() {
1895 >        for (ExecutionMode m : ExecutionMode.values())
1896 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1897 >        for (Integer v1 : new Integer[] { 1, null })
1898 >    {
1899 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1900 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1901 >        final Noop r = new Noop();
1902 >
1903 >        assertTrue(g.cancel(mayInterruptIfRunning));
1904 >        f.complete(v1);
1905 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1906 >
1907 >        checkCompletedWithWrappedCancellationException(h);
1908 >        checkCancelled(g);
1909 >        assertEquals(0, r.invocationCount);
1910 >        checkCompletedNormally(f, v1);
1911 >    }}
1912 >
1913 >    public void testRunAfterBoth_sourceCancelled4() {
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 >
1922 >        assertTrue(f.cancel(mayInterruptIfRunning));
1923 >        g.complete(v1);
1924 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1925  
1926 <    /**
1927 <     * acceptEither result completes exceptionally if either source cancelled
1928 <     */
1929 <    public void testAcceptEither4() {
1930 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1160 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1161 <        IncAction r = new IncAction();
1162 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1163 <        assertTrue(f.cancel(true));
1164 <        checkCompletedWithWrappedCancellationException(g);
1165 <        f = new CompletableFuture<>();
1166 <        f2 = new CompletableFuture<>();
1167 <        assertTrue(f2.cancel(true));
1168 <        checkCompletedWithWrappedCancellationException(g);
1169 <    }
1926 >        checkCompletedWithWrappedCancellationException(h);
1927 >        checkCancelled(f);
1928 >        assertEquals(0, r.invocationCount);
1929 >        checkCompletedNormally(g, v1);
1930 >    }}
1931  
1932      /**
1933 <     * runAfterEither result completes normally after normal completion
1933 >     * applyToEither result completes normally after normal completion
1934       * of either source
1935       */
1936 <    public void testRunAfterEither() {
1937 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1938 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1939 <        Noop r = new Noop();
1940 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1941 <        f.complete(one);
1942 <        checkCompletedNormally(g, null);
1943 <        f2.complete(one);
1944 <        checkCompletedNormally(g, null);
1945 <        assertTrue(r.ran);
1946 <
1947 <        r = new Noop();
1948 <        f = new CompletableFuture<>();
1949 <        f.complete(one);
1950 <        f2 = new CompletableFuture<>();
1951 <        g = f.runAfterEither(f2, r);
1952 <        checkCompletedNormally(g, null);
1953 <        assertTrue(r.ran);
1954 <    }
1936 >    public void testApplyToEither_normalCompletion1() {
1937 >        for (ExecutionMode m : ExecutionMode.values())
1938 >        for (Integer v1 : new Integer[] { 1, null })
1939 >        for (Integer v2 : new Integer[] { 2, null })
1940 >    {
1941 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1942 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1943 >        final IncFunction r = new IncFunction();
1944 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1945 >
1946 >        f.complete(v1);
1947 >        checkCompletedNormally(h, inc(v1));
1948 >        g.complete(v2);
1949 >
1950 >        checkCompletedNormally(f, v1);
1951 >        checkCompletedNormally(g, v2);
1952 >        checkCompletedNormally(h, inc(v1));
1953 >    }}
1954 >
1955 >    public void testApplyToEither_normalCompletion2() {
1956 >        for (ExecutionMode m : ExecutionMode.values())
1957 >        for (Integer v1 : new Integer[] { 1, null })
1958 >        for (Integer v2 : new Integer[] { 2, null })
1959 >    {
1960 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1961 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1962 >        final IncFunction r = new IncFunction();
1963 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1964 >
1965 >        g.complete(v2);
1966 >        checkCompletedNormally(h, inc(v2));
1967 >        f.complete(v1);
1968 >
1969 >        checkCompletedNormally(f, v1);
1970 >        checkCompletedNormally(g, v2);
1971 >        checkCompletedNormally(h, inc(v2));
1972 >        }}
1973 >
1974 >    public void testApplyToEither_normalCompletion3() {
1975 >        for (ExecutionMode m : ExecutionMode.values())
1976 >        for (Integer v1 : new Integer[] { 1, null })
1977 >        for (Integer v2 : new Integer[] { 2, null })
1978 >    {
1979 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1980 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1981 >        final IncFunction r = new IncFunction();
1982 >
1983 >        f.complete(v1);
1984 >        g.complete(v2);
1985 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1986 >
1987 >        checkCompletedNormally(f, v1);
1988 >        checkCompletedNormally(g, v2);
1989 >
1990 >        // unspecified behavior
1991 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1992 >                   Objects.equals(h.join(), inc(v2)));
1993 >        assertEquals(1, r.invocationCount);
1994 >    }}
1995  
1996      /**
1997 <     * runAfterEither result completes exceptionally after exceptional
1997 >     * applyToEither result completes exceptionally after exceptional
1998       * completion of either source
1999       */
2000 <    public void testRunAfterEither2() {
2001 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2002 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2003 <        Noop r = new Noop();
2004 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2005 <        f.completeExceptionally(new CFException());
2006 <        f2.complete(one);
2007 <        checkCompletedWithWrappedCFException(g);
2008 <
2009 <        r = new Noop();
2010 <        f = new CompletableFuture<>();
2011 <        f2 = new CompletableFuture<>();
2012 <        f2.completeExceptionally(new CFException());
2013 <        g = f.runAfterEither(f2, r);
2014 <        checkCompletedWithWrappedCFException(g);
2015 <    }
2000 >    public void testApplyToEither_exceptionalCompletion1() {
2001 >        for (ExecutionMode m : ExecutionMode.values())
2002 >        for (Integer v1 : new Integer[] { 1, null })
2003 >    {
2004 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2005 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2006 >        final IncFunction r = new IncFunction();
2007 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2008 >        final CFException ex = new CFException();
2009 >
2010 >        f.completeExceptionally(ex);
2011 >        checkCompletedWithWrappedCFException(h, ex);
2012 >        g.complete(v1);
2013 >
2014 >        assertEquals(0, r.invocationCount);
2015 >        checkCompletedNormally(g, v1);
2016 >        checkCompletedWithWrappedCFException(f, ex);
2017 >        checkCompletedWithWrappedCFException(h, ex);
2018 >    }}
2019 >
2020 >    public void testApplyToEither_exceptionalCompletion2() {
2021 >        for (ExecutionMode m : ExecutionMode.values())
2022 >        for (Integer v1 : new Integer[] { 1, null })
2023 >    {
2024 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2025 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2026 >        final IncFunction r = new IncFunction();
2027 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2028 >        final CFException ex = new CFException();
2029 >
2030 >        g.completeExceptionally(ex);
2031 >        checkCompletedWithWrappedCFException(h, ex);
2032 >        f.complete(v1);
2033 >
2034 >        assertEquals(0, r.invocationCount);
2035 >        checkCompletedNormally(f, v1);
2036 >        checkCompletedWithWrappedCFException(g, ex);
2037 >        checkCompletedWithWrappedCFException(h, ex);
2038 >    }}
2039 >
2040 >    public void testApplyToEither_exceptionalCompletion3() {
2041 >        for (ExecutionMode m : ExecutionMode.values())
2042 >        for (Integer v1 : new Integer[] { 1, null })
2043 >    {
2044 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2045 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2046 >        final IncFunction r = new IncFunction();
2047 >        final CFException ex = new CFException();
2048 >
2049 >        g.completeExceptionally(ex);
2050 >        f.complete(v1);
2051 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2052  
2053 <    /**
2054 <     * runAfterEither result completes exceptionally if action does
1218 <     */
1219 <    public void testRunAfterEither3() {
1220 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1221 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1222 <        FailingNoop r = new FailingNoop();
1223 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1224 <        f2.complete(two);
1225 <        checkCompletedWithWrappedCFException(g);
1226 <    }
1227 <
1228 <    /**
1229 <     * runAfterEither result completes exceptionally if either source cancelled
1230 <     */
1231 <    public void testRunAfterEither4() {
1232 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1233 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1234 <        Noop r = new Noop();
1235 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1236 <        assertTrue(f.cancel(true));
1237 <        checkCompletedWithWrappedCancellationException(g);
1238 <        f = new CompletableFuture<>();
1239 <        f2 = new CompletableFuture<>();
1240 <        assertTrue(f2.cancel(true));
1241 <        checkCompletedWithWrappedCancellationException(g);
1242 <    }
1243 <
1244 <    /**
1245 <     * thenCompose result completes normally after normal completion of source
1246 <     */
1247 <    public void testThenCompose() {
1248 <        CompletableFuture<Integer> f, g;
1249 <        CompletableFutureInc r;
1250 <
1251 <        f = new CompletableFuture<>();
1252 <        g = f.thenCompose(r = new CompletableFutureInc());
1253 <        f.complete(one);
1254 <        checkCompletedNormally(g, two);
1255 <        assertTrue(r.ran);
1256 <
1257 <        f = new CompletableFuture<>();
1258 <        f.complete(one);
1259 <        g = f.thenCompose(r = new CompletableFutureInc());
1260 <        checkCompletedNormally(g, two);
1261 <        assertTrue(r.ran);
1262 <    }
1263 <
1264 <    /**
1265 <     * thenCompose result completes exceptionally after exceptional
1266 <     * completion of source
1267 <     */
1268 <    public void testThenCompose2() {
1269 <        CompletableFuture<Integer> f, g;
1270 <        CompletableFutureInc r;
1271 <
1272 <        f = new CompletableFuture<>();
1273 <        g = f.thenCompose(r = new CompletableFutureInc());
1274 <        f.completeExceptionally(new CFException());
1275 <        checkCompletedWithWrappedCFException(g);
1276 <
1277 <        f = new CompletableFuture<>();
1278 <        f.completeExceptionally(new CFException());
1279 <        g = f.thenCompose(r = new CompletableFutureInc());
1280 <        checkCompletedWithWrappedCFException(g);
1281 <    }
1282 <
1283 <    /**
1284 <     * thenCompose result completes exceptionally if action does
1285 <     */
1286 <    public void testThenCompose3() {
1287 <        CompletableFuture<Integer> f, g;
1288 <        FailingCompletableFutureFunction r;
1289 <
1290 <        f = new CompletableFuture<>();
1291 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1292 <        f.complete(one);
1293 <        checkCompletedWithWrappedCFException(g);
1294 <
1295 <        f = new CompletableFuture<>();
1296 <        f.complete(one);
1297 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1298 <        checkCompletedWithWrappedCFException(g);
1299 <    }
1300 <
1301 <    /**
1302 <     * thenCompose result completes exceptionally if source cancelled
1303 <     */
1304 <    public void testThenCompose4() {
1305 <        CompletableFuture<Integer> f, g;
1306 <        CompletableFutureInc r;
1307 <
1308 <        f = new CompletableFuture<>();
1309 <        g = f.thenCompose(r = new CompletableFutureInc());
1310 <        assertTrue(f.cancel(true));
1311 <        checkCompletedWithWrappedCancellationException(g);
1312 <
1313 <        f = new CompletableFuture<>();
1314 <        assertTrue(f.cancel(true));
1315 <        g = f.thenCompose(r = new CompletableFutureInc());
1316 <        checkCompletedWithWrappedCancellationException(g);
1317 <    }
1318 <
1319 <    // asyncs
1320 <
1321 <    /**
1322 <     * thenRunAsync result completes normally after normal completion of source
1323 <     */
1324 <    public void testThenRunAsync() {
1325 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1326 <        Noop r = new Noop();
1327 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1328 <        f.complete(null);
1329 <        checkCompletedNormally(g, null);
1330 <
1331 <        // reordered version
1332 <        f = new CompletableFuture<>();
1333 <        f.complete(null);
1334 <        r = new Noop();
1335 <        g = f.thenRunAsync(r);
1336 <        checkCompletedNormally(g, null);
1337 <    }
1338 <
1339 <    /**
1340 <     * thenRunAsync result completes exceptionally after exceptional
1341 <     * completion of source
1342 <     */
1343 <    public void testThenRunAsync2() {
1344 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1345 <        Noop r = new Noop();
1346 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1347 <        f.completeExceptionally(new CFException());
2053 >        // unspecified behavior
2054 >        Integer v;
2055          try {
2056 <            g.join();
2057 <            shouldThrow();
2058 <        } catch (Exception ok) {
2056 >            assertEquals(inc(v1), h.join());
2057 >            assertEquals(1, r.invocationCount);
2058 >        } catch (CompletionException ok) {
2059 >            checkCompletedWithWrappedCFException(h, ex);
2060 >            assertEquals(0, r.invocationCount);
2061          }
1353        checkCompletedWithWrappedCFException(g);
1354    }
2062  
2063 <    /**
2064 <     * thenRunAsync result completes exceptionally if action does
2065 <     */
2066 <    public void testThenRunAsync3() {
2067 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2068 <        FailingNoop r = new FailingNoop();
2069 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2070 <        f.complete(null);
2071 <        checkCompletedWithWrappedCFException(g);
2072 <    }
2063 >        checkCompletedWithWrappedCFException(g, ex);
2064 >        checkCompletedNormally(f, v1);
2065 >    }}
2066 >
2067 >    public void testApplyToEither_exceptionalCompletion4() {
2068 >        for (ExecutionMode m : ExecutionMode.values())
2069 >        for (Integer v1 : new Integer[] { 1, null })
2070 >    {
2071 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2072 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2073 >        final IncFunction r = new IncFunction();
2074 >        final CFException ex = new CFException();
2075 >
2076 >        f.completeExceptionally(ex);
2077 >        g.complete(v1);
2078 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2079  
2080 <    /**
2081 <     * thenRunAsync result completes exceptionally if source cancelled
2082 <     */
2083 <    public void testThenRunAsync4() {
2084 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2085 <        Noop r = new Noop();
2086 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2087 <        assertTrue(f.cancel(true));
2088 <        checkCompletedWithWrappedCancellationException(g);
1376 <    }
1377 <
1378 <    /**
1379 <     * thenApplyAsync result completes normally after normal completion of source
1380 <     */
1381 <    public void testThenApplyAsync() {
1382 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1383 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1384 <        f.complete(one);
1385 <        checkCompletedNormally(g, two);
1386 <    }
1387 <
1388 <    /**
1389 <     * thenApplyAsync result completes exceptionally after exceptional
1390 <     * completion of source
1391 <     */
1392 <    public void testThenApplyAsync2() {
1393 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1394 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1395 <        f.completeExceptionally(new CFException());
1396 <        checkCompletedWithWrappedCFException(g);
1397 <    }
1398 <
1399 <    /**
1400 <     * thenApplyAsync result completes exceptionally if action does
1401 <     */
1402 <    public void testThenApplyAsync3() {
1403 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1404 <        FailingFunction r = new FailingFunction();
1405 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1406 <        f.complete(null);
1407 <        checkCompletedWithWrappedCFException(g);
1408 <    }
1409 <
1410 <    /**
1411 <     * thenApplyAsync result completes exceptionally if source cancelled
1412 <     */
1413 <    public void testThenApplyAsync4() {
1414 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1415 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1416 <        assertTrue(f.cancel(true));
1417 <        checkCompletedWithWrappedCancellationException(g);
1418 <    }
1419 <
1420 <    /**
1421 <     * thenAcceptAsync result completes normally after normal
1422 <     * completion of source
1423 <     */
1424 <    public void testThenAcceptAsync() {
1425 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1426 <        IncAction r = new IncAction();
1427 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1428 <        f.complete(one);
1429 <        checkCompletedNormally(g, null);
1430 <        assertEquals(r.value, 2);
1431 <    }
1432 <
1433 <    /**
1434 <     * thenAcceptAsync result completes exceptionally after exceptional
1435 <     * completion of source
1436 <     */
1437 <    public void testThenAcceptAsync2() {
1438 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1439 <        IncAction r = new IncAction();
1440 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1441 <        f.completeExceptionally(new CFException());
1442 <        checkCompletedWithWrappedCFException(g);
1443 <    }
2080 >        // unspecified behavior
2081 >        Integer v;
2082 >        try {
2083 >            assertEquals(inc(v1), h.join());
2084 >            assertEquals(1, r.invocationCount);
2085 >        } catch (CompletionException ok) {
2086 >            checkCompletedWithWrappedCFException(h, ex);
2087 >            assertEquals(0, r.invocationCount);
2088 >        }
2089  
2090 <    /**
2091 <     * thenAcceptAsync result completes exceptionally if action does
2092 <     */
1448 <    public void testThenAcceptAsync3() {
1449 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1450 <        FailingConsumer r = new FailingConsumer();
1451 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1452 <        f.complete(null);
1453 <        checkCompletedWithWrappedCFException(g);
1454 <    }
2090 >        checkCompletedWithWrappedCFException(f, ex);
2091 >        checkCompletedNormally(g, v1);
2092 >    }}
2093  
2094      /**
2095 <     * thenAcceptAsync result completes exceptionally if source cancelled
2095 >     * applyToEither result completes exceptionally if action does
2096       */
2097 <    public void testThenAcceptAsync4() {
2098 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2099 <        IncAction r = new IncAction();
2100 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2101 <        assertTrue(f.cancel(true));
2102 <        checkCompletedWithWrappedCancellationException(g);
2103 <    }
2097 >    public void testApplyToEither_actionFailed1() {
2098 >        for (ExecutionMode m : ExecutionMode.values())
2099 >        for (Integer v1 : new Integer[] { 1, null })
2100 >        for (Integer v2 : new Integer[] { 2, null })
2101 >    {
2102 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2103 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2104 >        final FailingFunction r = new FailingFunction();
2105 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2106 >
2107 >        f.complete(v1);
2108 >        checkCompletedWithWrappedCFException(h);
2109 >        g.complete(v2);
2110 >        checkCompletedNormally(f, v1);
2111 >        checkCompletedNormally(g, v2);
2112 >    }}
2113 >
2114 >    public void testApplyToEither_actionFailed2() {
2115 >        for (ExecutionMode m : ExecutionMode.values())
2116 >        for (Integer v1 : new Integer[] { 1, null })
2117 >        for (Integer v2 : new Integer[] { 2, null })
2118 >    {
2119 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2120 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2121 >        final FailingFunction r = new FailingFunction();
2122 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2123 >
2124 >        g.complete(v2);
2125 >        checkCompletedWithWrappedCFException(h);
2126 >        f.complete(v1);
2127 >        checkCompletedNormally(f, v1);
2128 >        checkCompletedNormally(g, v2);
2129 >    }}
2130  
2131      /**
2132 <     * thenCombineAsync result completes normally after normal
1469 <     * completion of sources
2132 >     * applyToEither result completes exceptionally if either source cancelled
2133       */
2134 <    public void testThenCombineAsync() {
2135 <        CompletableFuture<Integer> f, g, h;
2134 >    public void testApplyToEither_sourceCancelled1() {
2135 >        for (ExecutionMode m : ExecutionMode.values())
2136 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2137 >        for (Integer v1 : new Integer[] { 1, null })
2138 >    {
2139 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2140 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2141 >        final IncFunction r = new IncFunction();
2142 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2143  
2144 <        f = new CompletableFuture<>();
2145 <        g = new CompletableFuture<>();
2146 <        h = f.thenCombineAsync(g, subtract);
1477 <        f.complete(3);
1478 <        checkIncomplete(h);
1479 <        g.complete(1);
1480 <        checkCompletedNormally(h, 2);
2144 >        assertTrue(f.cancel(mayInterruptIfRunning));
2145 >        checkCompletedWithWrappedCancellationException(h);
2146 >        g.complete(v1);
2147  
2148 <        f = new CompletableFuture<>();
2149 <        g = new CompletableFuture<>();
2150 <        h = f.thenCombineAsync(g, subtract);
2151 <        g.complete(1);
2152 <        checkIncomplete(h);
1487 <        f.complete(3);
1488 <        checkCompletedNormally(h, 2);
2148 >        checkCancelled(f);
2149 >        assertEquals(0, r.invocationCount);
2150 >        checkCompletedNormally(g, v1);
2151 >        checkCompletedWithWrappedCancellationException(h);
2152 >    }}
2153  
2154 <        f = new CompletableFuture<>();
2155 <        g = new CompletableFuture<>();
2156 <        g.complete(1);
2157 <        f.complete(3);
2158 <        h = f.thenCombineAsync(g, subtract);
2159 <        checkCompletedNormally(h, 2);
2160 <    }
2154 >    public void testApplyToEither_sourceCancelled2() {
2155 >        for (ExecutionMode m : ExecutionMode.values())
2156 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2157 >        for (Integer v1 : new Integer[] { 1, null })
2158 >    {
2159 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2160 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2161 >        final IncFunction r = new IncFunction();
2162 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2163 >
2164 >        assertTrue(g.cancel(mayInterruptIfRunning));
2165 >        checkCompletedWithWrappedCancellationException(h);
2166 >        f.complete(v1);
2167 >
2168 >        checkCancelled(g);
2169 >        assertEquals(0, r.invocationCount);
2170 >        checkCompletedNormally(f, v1);
2171 >        checkCompletedWithWrappedCancellationException(h);
2172 >    }}
2173 >
2174 >    public void testApplyToEither_sourceCancelled3() {
2175 >        for (ExecutionMode m : ExecutionMode.values())
2176 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2177 >        for (Integer v1 : new Integer[] { 1, null })
2178 >    {
2179 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2180 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2181 >        final IncFunction r = new IncFunction();
2182 >
2183 >        assertTrue(g.cancel(mayInterruptIfRunning));
2184 >        f.complete(v1);
2185 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2186  
2187 <    /**
2188 <     * thenCombineAsync result completes exceptionally after exceptional
2189 <     * completion of either source
2190 <     */
2191 <    public void testThenCombineAsync2() {
2192 <        CompletableFuture<Integer> f, g, h;
2187 >        // unspecified behavior
2188 >        Integer v;
2189 >        try {
2190 >            assertEquals(inc(v1), h.join());
2191 >            assertEquals(1, r.invocationCount);
2192 >        } catch (CompletionException ok) {
2193 >            checkCompletedWithWrappedCancellationException(h);
2194 >            assertEquals(0, r.invocationCount);
2195 >        }
2196  
2197 <        f = new CompletableFuture<>();
2198 <        g = new CompletableFuture<>();
2199 <        h = f.thenCombineAsync(g, subtract);
2200 <        f.completeExceptionally(new CFException());
2201 <        checkIncomplete(h);
2202 <        g.complete(1);
2203 <        checkCompletedWithWrappedCFException(h);
2197 >        checkCancelled(g);
2198 >        checkCompletedNormally(f, v1);
2199 >    }}
2200 >
2201 >    public void testApplyToEither_sourceCancelled4() {
2202 >        for (ExecutionMode m : ExecutionMode.values())
2203 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2204 >        for (Integer v1 : new Integer[] { 1, null })
2205 >    {
2206 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2207 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2208 >        final IncFunction r = new IncFunction();
2209 >
2210 >        assertTrue(f.cancel(mayInterruptIfRunning));
2211 >        g.complete(v1);
2212 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2213  
2214 <        f = new CompletableFuture<>();
2215 <        g = new CompletableFuture<>();
2216 <        h = f.thenCombineAsync(g, subtract);
2217 <        g.completeExceptionally(new CFException());
2218 <        checkIncomplete(h);
2219 <        f.complete(3);
2220 <        checkCompletedWithWrappedCFException(h);
2221 <
2222 <        f = new CompletableFuture<>();
1522 <        g = new CompletableFuture<>();
1523 <        g.completeExceptionally(new CFException());
1524 <        f.complete(3);
1525 <        h = f.thenCombineAsync(g, subtract);
1526 <        checkCompletedWithWrappedCFException(h);
1527 <    }
2214 >        // unspecified behavior
2215 >        Integer v;
2216 >        try {
2217 >            assertEquals(inc(v1), h.join());
2218 >            assertEquals(1, r.invocationCount);
2219 >        } catch (CompletionException ok) {
2220 >            checkCompletedWithWrappedCancellationException(h);
2221 >            assertEquals(0, r.invocationCount);
2222 >        }
2223  
2224 <    /**
2225 <     * thenCombineAsync result completes exceptionally if action does
2226 <     */
1532 <    public void testThenCombineAsync3() {
1533 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1534 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1535 <        FailingBiFunction r = new FailingBiFunction();
1536 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1537 <        f.complete(one);
1538 <        checkIncomplete(g);
1539 <        assertFalse(r.ran);
1540 <        f2.complete(two);
1541 <        checkCompletedWithWrappedCFException(g);
1542 <        assertTrue(r.ran);
1543 <    }
2224 >        checkCancelled(f);
2225 >        checkCompletedNormally(g, v1);
2226 >    }}
2227  
2228      /**
2229 <     * thenCombineAsync result completes exceptionally if either source cancelled
2229 >     * acceptEither result completes normally after normal completion
2230 >     * of either source
2231       */
2232 <    public void testThenCombineAsync4() {
2233 <        CompletableFuture<Integer> f, g, h;
2234 <
2235 <        f = new CompletableFuture<>();
2236 <        g = new CompletableFuture<>();
2237 <        h = f.thenCombineAsync(g, subtract);
2238 <        assertTrue(f.cancel(true));
2239 <        checkIncomplete(h);
2240 <        g.complete(1);
1557 <        checkCompletedWithWrappedCancellationException(h);
2232 >    public void testAcceptEither_normalCompletion1() {
2233 >        for (ExecutionMode m : ExecutionMode.values())
2234 >        for (Integer v1 : new Integer[] { 1, null })
2235 >        for (Integer v2 : new Integer[] { 2, null })
2236 >    {
2237 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2238 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2239 >        final IncAction r = new IncAction();
2240 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2241  
2242 <        f = new CompletableFuture<>();
2243 <        g = new CompletableFuture<>();
2244 <        h = f.thenCombineAsync(g, subtract);
2245 <        assertTrue(g.cancel(true));
1563 <        checkIncomplete(h);
1564 <        f.complete(3);
1565 <        checkCompletedWithWrappedCancellationException(h);
1566 <
1567 <        f = new CompletableFuture<>();
1568 <        g = new CompletableFuture<>();
1569 <        g.complete(3);
1570 <        assertTrue(f.cancel(true));
1571 <        h = f.thenCombineAsync(g, subtract);
1572 <        checkCompletedWithWrappedCancellationException(h);
2242 >        f.complete(v1);
2243 >        checkCompletedNormally(h, null);
2244 >        assertEquals(inc(v1), r.value);
2245 >        g.complete(v2);
2246  
2247 <        f = new CompletableFuture<>();
2248 <        g = new CompletableFuture<>();
2249 <        f.complete(3);
2250 <        assertTrue(g.cancel(true));
1578 <        h = f.thenCombineAsync(g, subtract);
1579 <        checkCompletedWithWrappedCancellationException(h);
1580 <    }
2247 >        checkCompletedNormally(f, v1);
2248 >        checkCompletedNormally(g, v2);
2249 >        checkCompletedNormally(h, null);
2250 >    }}
2251  
2252 <    /**
2253 <     * thenAcceptBothAsync result completes normally after normal
2254 <     * completion of sources
2255 <     */
2256 <    public void testThenAcceptBothAsync() {
2257 <        CompletableFuture<Integer> f, g;
2258 <        CompletableFuture<Void> h;
2259 <        SubtractAction r;
2252 >    public void testAcceptEither_normalCompletion2() {
2253 >        for (ExecutionMode m : ExecutionMode.values())
2254 >        for (Integer v1 : new Integer[] { 1, null })
2255 >        for (Integer v2 : new Integer[] { 2, null })
2256 >    {
2257 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2258 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2259 >        final IncAction r = new IncAction();
2260 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2261  
2262 <        f = new CompletableFuture<>();
1592 <        g = new CompletableFuture<>();
1593 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1594 <        f.complete(3);
1595 <        checkIncomplete(h);
1596 <        g.complete(1);
2262 >        g.complete(v2);
2263          checkCompletedNormally(h, null);
2264 <        assertEquals(r.value, 2);
2264 >        assertEquals(inc(v2), r.value);
2265 >        f.complete(v1);
2266  
2267 <        f = new CompletableFuture<>();
2268 <        g = new CompletableFuture<>();
1602 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1603 <        g.complete(1);
1604 <        checkIncomplete(h);
1605 <        f.complete(3);
2267 >        checkCompletedNormally(f, v1);
2268 >        checkCompletedNormally(g, v2);
2269          checkCompletedNormally(h, null);
2270 <        assertEquals(r.value, 2);
2270 >    }}
2271 >
2272 >    public void testAcceptEither_normalCompletion3() {
2273 >        for (ExecutionMode m : ExecutionMode.values())
2274 >        for (Integer v1 : new Integer[] { 1, null })
2275 >        for (Integer v2 : new Integer[] { 2, null })
2276 >    {
2277 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279 >        final IncAction r = new IncAction();
2280 >
2281 >        f.complete(v1);
2282 >        g.complete(v2);
2283 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2284  
1609        f = new CompletableFuture<>();
1610        g = new CompletableFuture<>();
1611        g.complete(1);
1612        f.complete(3);
1613        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2285          checkCompletedNormally(h, null);
2286 <        assertEquals(r.value, 2);
2287 <    }
2286 >        checkCompletedNormally(f, v1);
2287 >        checkCompletedNormally(g, v2);
2288 >
2289 >        // unspecified behavior
2290 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2291 >                   Objects.equals(r.value, inc(v2)));
2292 >    }}
2293  
2294      /**
2295 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2296 <     * completion of source
2295 >     * acceptEither result completes exceptionally after exceptional
2296 >     * completion of either source
2297       */
2298 <    public void testThenAcceptBothAsync2() {
2299 <        CompletableFuture<Integer> f, g;
2300 <        CompletableFuture<Void> h;
2301 <        SubtractAction r;
2298 >    public void testAcceptEither_exceptionalCompletion1() {
2299 >        for (ExecutionMode m : ExecutionMode.values())
2300 >        for (Integer v1 : new Integer[] { 1, null })
2301 >    {
2302 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2303 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2304 >        final IncAction r = new IncAction();
2305 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2306 >        final CFException ex = new CFException();
2307 >
2308 >        f.completeExceptionally(ex);
2309 >        checkCompletedWithWrappedCFException(h, ex);
2310 >        g.complete(v1);
2311 >
2312 >        assertEquals(0, r.invocationCount);
2313 >        checkCompletedNormally(g, v1);
2314 >        checkCompletedWithWrappedCFException(f, ex);
2315 >        checkCompletedWithWrappedCFException(h, ex);
2316 >    }}
2317 >
2318 >    public void testAcceptEither_exceptionalCompletion2() {
2319 >        for (ExecutionMode m : ExecutionMode.values())
2320 >        for (Integer v1 : new Integer[] { 1, null })
2321 >    {
2322 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2323 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 >        final IncAction r = new IncAction();
2325 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2326 >        final CFException ex = new CFException();
2327 >
2328 >        g.completeExceptionally(ex);
2329 >        checkCompletedWithWrappedCFException(h, ex);
2330 >        f.complete(v1);
2331 >
2332 >        assertEquals(0, r.invocationCount);
2333 >        checkCompletedNormally(f, v1);
2334 >        checkCompletedWithWrappedCFException(g, ex);
2335 >        checkCompletedWithWrappedCFException(h, ex);
2336 >    }}
2337 >
2338 >    public void testAcceptEither_exceptionalCompletion3() {
2339 >        for (ExecutionMode m : ExecutionMode.values())
2340 >        for (Integer v1 : new Integer[] { 1, null })
2341 >    {
2342 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2343 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2344 >        final IncAction r = new IncAction();
2345 >        final CFException ex = new CFException();
2346 >
2347 >        g.completeExceptionally(ex);
2348 >        f.complete(v1);
2349 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2350  
2351 <        f = new CompletableFuture<>();
2352 <        g = new CompletableFuture<>();
2353 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2354 <        f.completeExceptionally(new CFException());
2355 <        checkIncomplete(h);
2356 <        g.complete(1);
2357 <        checkCompletedWithWrappedCFException(h);
2351 >        // unspecified behavior
2352 >        Integer v;
2353 >        try {
2354 >            assertNull(h.join());
2355 >            assertEquals(1, r.invocationCount);
2356 >            assertEquals(inc(v1), r.value);
2357 >        } catch (CompletionException ok) {
2358 >            checkCompletedWithWrappedCFException(h, ex);
2359 >            assertEquals(0, r.invocationCount);
2360 >        }
2361  
2362 <        f = new CompletableFuture<>();
2363 <        g = new CompletableFuture<>();
2364 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2365 <        g.completeExceptionally(new CFException());
2366 <        checkIncomplete(h);
2367 <        f.complete(3);
2368 <        checkCompletedWithWrappedCFException(h);
2362 >        checkCompletedWithWrappedCFException(g, ex);
2363 >        checkCompletedNormally(f, v1);
2364 >    }}
2365 >
2366 >    public void testAcceptEither_exceptionalCompletion4() {
2367 >        for (ExecutionMode m : ExecutionMode.values())
2368 >        for (Integer v1 : new Integer[] { 1, null })
2369 >    {
2370 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2371 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2372 >        final IncAction r = new IncAction();
2373 >        final CFException ex = new CFException();
2374 >
2375 >        f.completeExceptionally(ex);
2376 >        g.complete(v1);
2377 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2378  
2379 <        f = new CompletableFuture<>();
2380 <        g = new CompletableFuture<>();
2381 <        f.complete(3);
2382 <        g.completeExceptionally(new CFException());
2383 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2384 <        checkCompletedWithWrappedCFException(h);
2379 >        // unspecified behavior
2380 >        Integer v;
2381 >        try {
2382 >            assertNull(h.join());
2383 >            assertEquals(1, r.invocationCount);
2384 >            assertEquals(inc(v1), r.value);
2385 >        } catch (CompletionException ok) {
2386 >            checkCompletedWithWrappedCFException(h, ex);
2387 >            assertEquals(0, r.invocationCount);
2388 >        }
2389  
2390 <        f = new CompletableFuture<>();
2391 <        g = new CompletableFuture<>();
2392 <        f.completeExceptionally(new CFException());
1653 <        g.complete(3);
1654 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1655 <        checkCompletedWithWrappedCFException(h);
1656 <    }
2390 >        checkCompletedWithWrappedCFException(f, ex);
2391 >        checkCompletedNormally(g, v1);
2392 >    }}
2393  
2394      /**
2395 <     * thenAcceptBothAsync result completes exceptionally if action does
2395 >     * acceptEither result completes exceptionally if action does
2396       */
2397 <    public void testThenAcceptBothAsync3() {
2398 <        CompletableFuture<Integer> f, g;
2399 <        CompletableFuture<Void> h;
2400 <        FailingBiConsumer r;
2401 <
2402 <        f = new CompletableFuture<>();
2403 <        g = new CompletableFuture<>();
2404 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
2405 <        f.complete(3);
2406 <        checkIncomplete(h);
2407 <        g.complete(1);
2408 <        checkCompletedWithWrappedCFException(h);
2409 <
2410 <        f = new CompletableFuture<>();
2411 <        g = new CompletableFuture<>();
2412 <        f.complete(3);
2413 <        g.complete(1);
2414 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
2415 <        checkCompletedWithWrappedCFException(h);
2416 <    }
2397 >    public void testAcceptEither_actionFailed1() {
2398 >        for (ExecutionMode m : ExecutionMode.values())
2399 >        for (Integer v1 : new Integer[] { 1, null })
2400 >        for (Integer v2 : new Integer[] { 2, null })
2401 >    {
2402 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2403 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2404 >        final FailingConsumer r = new FailingConsumer();
2405 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2406 >
2407 >        f.complete(v1);
2408 >        checkCompletedWithWrappedCFException(h);
2409 >        g.complete(v2);
2410 >        checkCompletedNormally(f, v1);
2411 >        checkCompletedNormally(g, v2);
2412 >    }}
2413 >
2414 >    public void testAcceptEither_actionFailed2() {
2415 >        for (ExecutionMode m : ExecutionMode.values())
2416 >        for (Integer v1 : new Integer[] { 1, null })
2417 >        for (Integer v2 : new Integer[] { 2, null })
2418 >    {
2419 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2420 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2421 >        final FailingConsumer r = new FailingConsumer();
2422 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2423 >
2424 >        g.complete(v2);
2425 >        checkCompletedWithWrappedCFException(h);
2426 >        f.complete(v1);
2427 >        checkCompletedNormally(f, v1);
2428 >        checkCompletedNormally(g, v2);
2429 >    }}
2430  
2431      /**
2432 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2432 >     * acceptEither result completes exceptionally if either source cancelled
2433       */
2434 <    public void testThenAcceptBothAsync4() {
2435 <        CompletableFuture<Integer> f, g;
2436 <        CompletableFuture<Void> h;
2437 <        SubtractAction r;
2438 <
2439 <        f = new CompletableFuture<>();
2440 <        g = new CompletableFuture<>();
2441 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2442 <        assertTrue(f.cancel(true));
1694 <        checkIncomplete(h);
1695 <        g.complete(1);
1696 <        checkCompletedWithWrappedCancellationException(h);
2434 >    public void testAcceptEither_sourceCancelled1() {
2435 >        for (ExecutionMode m : ExecutionMode.values())
2436 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2437 >        for (Integer v1 : new Integer[] { 1, null })
2438 >    {
2439 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2440 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2441 >        final IncAction r = new IncAction();
2442 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2443  
2444 <        f = new CompletableFuture<>();
1699 <        g = new CompletableFuture<>();
1700 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1701 <        assertTrue(g.cancel(true));
1702 <        checkIncomplete(h);
1703 <        f.complete(3);
2444 >        assertTrue(f.cancel(mayInterruptIfRunning));
2445          checkCompletedWithWrappedCancellationException(h);
2446 +        g.complete(v1);
2447  
2448 <        f = new CompletableFuture<>();
2449 <        g = new CompletableFuture<>();
2450 <        f.complete(3);
1709 <        assertTrue(g.cancel(true));
1710 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2448 >        checkCancelled(f);
2449 >        assertEquals(0, r.invocationCount);
2450 >        checkCompletedNormally(g, v1);
2451          checkCompletedWithWrappedCancellationException(h);
2452 +    }}
2453  
2454 <        f = new CompletableFuture<>();
2455 <        g = new CompletableFuture<>();
2456 <        assertTrue(f.cancel(true));
2457 <        g.complete(3);
2458 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
2459 <        checkCompletedWithWrappedCancellationException(h);
2460 <    }
2454 >    public void testAcceptEither_sourceCancelled2() {
2455 >        for (ExecutionMode m : ExecutionMode.values())
2456 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2457 >        for (Integer v1 : new Integer[] { 1, null })
2458 >    {
2459 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2460 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2461 >        final IncAction r = new IncAction();
2462 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2463 >
2464 >        assertTrue(g.cancel(mayInterruptIfRunning));
2465 >        checkCompletedWithWrappedCancellationException(h);
2466 >        f.complete(v1);
2467 >
2468 >        checkCancelled(g);
2469 >        assertEquals(0, r.invocationCount);
2470 >        checkCompletedNormally(f, v1);
2471 >        checkCompletedWithWrappedCancellationException(h);
2472 >    }}
2473 >
2474 >    public void testAcceptEither_sourceCancelled3() {
2475 >        for (ExecutionMode m : ExecutionMode.values())
2476 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2477 >        for (Integer v1 : new Integer[] { 1, null })
2478 >    {
2479 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2480 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2481 >        final IncAction r = new IncAction();
2482 >
2483 >        assertTrue(g.cancel(mayInterruptIfRunning));
2484 >        f.complete(v1);
2485 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2486  
2487 <    /**
2488 <     * runAfterBothAsync result completes normally after normal
1723 <     * completion of sources
1724 <     */
1725 <    public void testRunAfterBothAsync() {
1726 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1727 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1728 <        Noop r = new Noop();
1729 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1730 <        f.complete(one);
1731 <        checkIncomplete(g);
1732 <        f2.complete(two);
1733 <        checkCompletedNormally(g, null);
1734 <        assertTrue(r.ran);
1735 <    }
1736 <
1737 <    /**
1738 <     * runAfterBothAsync result completes exceptionally after exceptional
1739 <     * completion of source
1740 <     */
1741 <    public void testRunAfterBothAsync2() {
1742 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1743 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1744 <        Noop r = new Noop();
1745 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1746 <        f.completeExceptionally(new CFException());
1747 <        f2.complete(two);
1748 <        checkCompletedWithWrappedCFException(g);
1749 <
1750 <        r = new Noop();
1751 <        f = new CompletableFuture<>();
1752 <        f2 = new CompletableFuture<>();
1753 <        g = f.runAfterBothAsync(f2, r);
1754 <        f.complete(one);
1755 <        f2.completeExceptionally(new CFException());
1756 <        checkCompletedWithWrappedCFException(g);
1757 <    }
1758 <
1759 <    /**
1760 <     * runAfterBothAsync result completes exceptionally if action does
1761 <     */
1762 <    public void testRunAfterBothAsync3() {
1763 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1764 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1765 <        FailingNoop r = new FailingNoop();
1766 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1767 <        f.complete(one);
1768 <        checkIncomplete(g);
1769 <        f2.complete(two);
1770 <        checkCompletedWithWrappedCFException(g);
1771 <    }
1772 <
1773 <    /**
1774 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1775 <     */
1776 <    public void testRunAfterBothAsync4() {
1777 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1778 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1779 <        Noop r = new Noop();
1780 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1781 <        assertTrue(f.cancel(true));
1782 <        f2.complete(two);
1783 <        checkCompletedWithWrappedCancellationException(g);
1784 <
1785 <        r = new Noop();
1786 <        f = new CompletableFuture<>();
1787 <        f2 = new CompletableFuture<>();
1788 <        g = f.runAfterBothAsync(f2, r);
1789 <        f.complete(one);
1790 <        assertTrue(f2.cancel(true));
1791 <        checkCompletedWithWrappedCancellationException(g);
1792 <    }
1793 <
1794 <    /**
1795 <     * applyToEitherAsync result completes normally after normal
1796 <     * completion of sources
1797 <     */
1798 <    public void testApplyToEitherAsync() {
1799 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1800 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1801 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1802 <        f.complete(one);
1803 <        checkCompletedNormally(g, two);
1804 <
1805 <        f = new CompletableFuture<>();
1806 <        f.complete(one);
1807 <        f2 = new CompletableFuture<>();
1808 <        g = f.applyToEitherAsync(f2, inc);
1809 <        checkCompletedNormally(g, two);
1810 <    }
1811 <
1812 <    /**
1813 <     * applyToEitherAsync result completes exceptionally after exceptional
1814 <     * completion of source
1815 <     */
1816 <    public void testApplyToEitherAsync2() {
1817 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1818 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1819 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1820 <        f.completeExceptionally(new CFException());
1821 <        checkCompletedWithWrappedCFException(g);
1822 <
1823 <        f = new CompletableFuture<>();
1824 <        f2 = new CompletableFuture<>();
1825 <        f2.completeExceptionally(new CFException());
1826 <        g = f.applyToEitherAsync(f2, inc);
1827 <        f.complete(one);
1828 <        checkCompletedWithWrappedCFException(g);
1829 <    }
1830 <
1831 <    /**
1832 <     * applyToEitherAsync result completes exceptionally if action does
1833 <     */
1834 <    public void testApplyToEitherAsync3() {
1835 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1836 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1837 <        FailingFunction r = new FailingFunction();
1838 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1839 <        f.complete(one);
1840 <        checkCompletedWithWrappedCFException(g);
1841 <    }
1842 <
1843 <    /**
1844 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1845 <     */
1846 <    public void testApplyToEitherAsync4() {
1847 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1848 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1849 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1850 <        assertTrue(f.cancel(true));
1851 <        checkCompletedWithWrappedCancellationException(g);
1852 <
1853 <        f = new CompletableFuture<>();
1854 <        f2 = new CompletableFuture<>();
1855 <        assertTrue(f2.cancel(true));
1856 <        g = f.applyToEitherAsync(f2, inc);
1857 <        checkCompletedWithWrappedCancellationException(g);
1858 <    }
1859 <
1860 <    /**
1861 <     * acceptEitherAsync result completes normally after normal
1862 <     * completion of sources
1863 <     */
1864 <    public void testAcceptEitherAsync() {
1865 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1866 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1867 <        IncAction r = new IncAction();
1868 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1869 <        f.complete(one);
1870 <        checkCompletedNormally(g, null);
1871 <        assertEquals(r.value, 2);
1872 <
1873 <        r = new IncAction();
1874 <        f = new CompletableFuture<>();
1875 <        f.complete(one);
1876 <        f2 = new CompletableFuture<>();
1877 <        g = f.acceptEitherAsync(f2, r);
1878 <        checkCompletedNormally(g, null);
1879 <        assertEquals(r.value, 2);
1880 <    }
1881 <
1882 <    /**
1883 <     * acceptEitherAsync result completes exceptionally after exceptional
1884 <     * completion of source
1885 <     */
1886 <    public void testAcceptEitherAsync2() {
1887 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1888 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1889 <        IncAction r = new IncAction();
1890 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1891 <        f.completeExceptionally(new CFException());
1892 <        checkCompletedWithWrappedCFException(g);
1893 <
1894 <        r = new IncAction();
1895 <        f = new CompletableFuture<>();
1896 <        f2 = new CompletableFuture<>();
1897 <        f2.completeExceptionally(new CFException());
1898 <        g = f.acceptEitherAsync(f2, r);
1899 <        f.complete(one);
1900 <        checkCompletedWithWrappedCFException(g);
1901 <    }
1902 <
1903 <    /**
1904 <     * acceptEitherAsync result completes exceptionally if action does
1905 <     */
1906 <    public void testAcceptEitherAsync3() {
1907 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1908 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1909 <        FailingConsumer r = new FailingConsumer();
1910 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1911 <        f.complete(one);
1912 <        checkCompletedWithWrappedCFException(g);
1913 <    }
1914 <
1915 <    /**
1916 <     * acceptEitherAsync result completes exceptionally if either
1917 <     * source cancelled
1918 <     */
1919 <    public void testAcceptEitherAsync4() {
1920 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1921 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1922 <        IncAction r = new IncAction();
1923 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1924 <        assertTrue(f.cancel(true));
1925 <        checkCompletedWithWrappedCancellationException(g);
1926 <
1927 <        r = new IncAction();
1928 <        f = new CompletableFuture<>();
1929 <        f2 = new CompletableFuture<>();
1930 <        assertTrue(f2.cancel(true));
1931 <        g = f.acceptEitherAsync(f2, r);
1932 <        checkCompletedWithWrappedCancellationException(g);
1933 <    }
1934 <
1935 <    /**
1936 <     * runAfterEitherAsync result completes normally after normal
1937 <     * completion of sources
1938 <     */
1939 <    public void testRunAfterEitherAsync() {
1940 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1941 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1942 <        Noop r = new Noop();
1943 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1944 <        f.complete(one);
1945 <        checkCompletedNormally(g, null);
1946 <        assertTrue(r.ran);
1947 <
1948 <        r = new Noop();
1949 <        f = new CompletableFuture<>();
1950 <        f.complete(one);
1951 <        f2 = new CompletableFuture<>();
1952 <        g = f.runAfterEitherAsync(f2, r);
1953 <        checkCompletedNormally(g, null);
1954 <        assertTrue(r.ran);
1955 <    }
1956 <
1957 <    /**
1958 <     * runAfterEitherAsync result completes exceptionally after exceptional
1959 <     * completion of source
1960 <     */
1961 <    public void testRunAfterEitherAsync2() {
1962 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1963 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1964 <        Noop r = new Noop();
1965 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1966 <        f.completeExceptionally(new CFException());
1967 <        checkCompletedWithWrappedCFException(g);
1968 <
1969 <        r = new Noop();
1970 <        f = new CompletableFuture<>();
1971 <        f2 = new CompletableFuture<>();
1972 <        f2.completeExceptionally(new CFException());
1973 <        g = f.runAfterEitherAsync(f2, r);
1974 <        f.complete(one);
1975 <        checkCompletedWithWrappedCFException(g);
1976 <    }
1977 <
1978 <    /**
1979 <     * runAfterEitherAsync result completes exceptionally if action does
1980 <     */
1981 <    public void testRunAfterEitherAsync3() {
1982 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1983 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1984 <        FailingNoop r = new FailingNoop();
1985 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1986 <        f.complete(one);
1987 <        checkCompletedWithWrappedCFException(g);
1988 <    }
1989 <
1990 <    /**
1991 <     * runAfterEitherAsync result completes exceptionally if either
1992 <     * source cancelled
1993 <     */
1994 <    public void testRunAfterEitherAsync4() {
1995 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1996 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1997 <        Noop r = new Noop();
1998 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1999 <        assertTrue(f.cancel(true));
2000 <        checkCompletedWithWrappedCancellationException(g);
2001 <
2002 <        r = new Noop();
2003 <        f = new CompletableFuture<>();
2004 <        f2 = new CompletableFuture<>();
2005 <        assertTrue(f2.cancel(true));
2006 <        g = f.runAfterEitherAsync(f2, r);
2007 <        checkCompletedWithWrappedCancellationException(g);
2008 <    }
2009 <
2010 <    /**
2011 <     * thenComposeAsync result completes normally after normal
2012 <     * completion of source
2013 <     */
2014 <    public void testThenComposeAsync() {
2015 <        CompletableFuture<Integer> f, g;
2016 <        CompletableFutureInc r;
2017 <
2018 <        f = new CompletableFuture<>();
2019 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2020 <        f.complete(one);
2021 <        checkCompletedNormally(g, two);
2022 <
2023 <        f = new CompletableFuture<>();
2024 <        f.complete(one);
2025 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2026 <        checkCompletedNormally(g, two);
2027 <    }
2028 <
2029 <    /**
2030 <     * thenComposeAsync result completes exceptionally after
2031 <     * exceptional completion of source
2032 <     */
2033 <    public void testThenComposeAsync2() {
2034 <        CompletableFuture<Integer> f, g;
2035 <        CompletableFutureInc r;
2036 <
2037 <        f = new CompletableFuture<>();
2038 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2039 <        f.completeExceptionally(new CFException());
2040 <        checkCompletedWithWrappedCFException(g);
2041 <        assertFalse(r.ran);
2042 <
2043 <        f = new CompletableFuture<>();
2044 <        f.completeExceptionally(new CFException());
2045 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2046 <        checkCompletedWithWrappedCFException(g);
2047 <        assertFalse(r.ran);
2048 <    }
2049 <
2050 <    /**
2051 <     * thenComposeAsync result completes exceptionally if action does
2052 <     */
2053 <    public void testThenComposeAsync3() {
2054 <        CompletableFuture<Integer> f, g;
2055 <        FailingCompletableFutureFunction r;
2056 <
2057 <        f = new CompletableFuture<>();
2058 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2059 <        f.complete(one);
2060 <        checkCompletedWithWrappedCFException(g);
2061 <
2062 <        f = new CompletableFuture<>();
2063 <        f.complete(one);
2064 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2065 <        checkCompletedWithWrappedCFException(g);
2066 <    }
2067 <
2068 <    /**
2069 <     * thenComposeAsync result completes exceptionally if source cancelled
2070 <     */
2071 <    public void testThenComposeAsync4() {
2072 <        CompletableFuture<Integer> f, g;
2073 <        CompletableFutureInc r;
2074 <
2075 <        f = new CompletableFuture<>();
2076 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2077 <        assertTrue(f.cancel(true));
2078 <        checkCompletedWithWrappedCancellationException(g);
2079 <
2080 <        f = new CompletableFuture<>();
2081 <        assertTrue(f.cancel(true));
2082 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2083 <        checkCompletedWithWrappedCancellationException(g);
2084 <    }
2085 <
2086 <    // async with explicit executors
2087 <
2088 <    /**
2089 <     * thenRunAsync result completes normally after normal completion of source
2090 <     */
2091 <    public void testThenRunAsyncE() {
2092 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2093 <        Noop r = new Noop();
2094 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2095 <        f.complete(null);
2096 <        checkCompletedNormally(g, null);
2097 <
2098 <        // reordered version
2099 <        f = new CompletableFuture<>();
2100 <        f.complete(null);
2101 <        r = new Noop();
2102 <        g = f.thenRunAsync(r, new ThreadExecutor());
2103 <        checkCompletedNormally(g, null);
2104 <    }
2105 <
2106 <    /**
2107 <     * thenRunAsync result completes exceptionally after exceptional
2108 <     * completion of source
2109 <     */
2110 <    public void testThenRunAsync2E() {
2111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2112 <        Noop r = new Noop();
2113 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2114 <        f.completeExceptionally(new CFException());
2487 >        // unspecified behavior
2488 >        Integer v;
2489          try {
2490 <            g.join();
2491 <            shouldThrow();
2492 <        } catch (Exception ok) {
2490 >            assertNull(h.join());
2491 >            assertEquals(1, r.invocationCount);
2492 >            assertEquals(inc(v1), r.value);
2493 >        } catch (CompletionException ok) {
2494 >            checkCompletedWithWrappedCancellationException(h);
2495 >            assertEquals(0, r.invocationCount);
2496          }
2120        checkCompletedWithWrappedCFException(g);
2121    }
2122
2123    /**
2124     * thenRunAsync result completes exceptionally if action does
2125     */
2126    public void testThenRunAsync3E() {
2127        CompletableFuture<Integer> f = new CompletableFuture<>();
2128        FailingNoop r = new FailingNoop();
2129        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2130        f.complete(null);
2131        checkCompletedWithWrappedCFException(g);
2132    }
2133
2134    /**
2135     * thenRunAsync result completes exceptionally if source cancelled
2136     */
2137    public void testThenRunAsync4E() {
2138        CompletableFuture<Integer> f = new CompletableFuture<>();
2139        Noop r = new Noop();
2140        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2141        assertTrue(f.cancel(true));
2142        checkCompletedWithWrappedCancellationException(g);
2143    }
2144
2145    /**
2146     * thenApplyAsync result completes normally after normal completion of source
2147     */
2148    public void testThenApplyAsyncE() {
2149        CompletableFuture<Integer> f = new CompletableFuture<>();
2150        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2151        f.complete(one);
2152        checkCompletedNormally(g, two);
2153    }
2154
2155    /**
2156     * thenApplyAsync result completes exceptionally after exceptional
2157     * completion of source
2158     */
2159    public void testThenApplyAsync2E() {
2160        CompletableFuture<Integer> f = new CompletableFuture<>();
2161        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2162        f.completeExceptionally(new CFException());
2163        checkCompletedWithWrappedCFException(g);
2164    }
2497  
2498 <    /**
2499 <     * thenApplyAsync result completes exceptionally if action does
2500 <     */
2501 <    public void testThenApplyAsync3E() {
2502 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2503 <        FailingFunction r = new FailingFunction();
2504 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2505 <        f.complete(null);
2506 <        checkCompletedWithWrappedCFException(g);
2507 <    }
2498 >        checkCancelled(g);
2499 >        checkCompletedNormally(f, v1);
2500 >    }}
2501 >
2502 >    public void testAcceptEither_sourceCancelled4() {
2503 >        for (ExecutionMode m : ExecutionMode.values())
2504 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2505 >        for (Integer v1 : new Integer[] { 1, null })
2506 >    {
2507 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2508 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2509 >        final IncAction r = new IncAction();
2510 >
2511 >        assertTrue(f.cancel(mayInterruptIfRunning));
2512 >        g.complete(v1);
2513 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2514  
2515 <    /**
2516 <     * thenApplyAsync result completes exceptionally if source cancelled
2517 <     */
2518 <    public void testThenApplyAsync4E() {
2519 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2520 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2521 <        assertTrue(f.cancel(true));
2522 <        checkCompletedWithWrappedCancellationException(g);
2523 <    }
2524 <
2187 <    /**
2188 <     * thenAcceptAsync result completes normally after normal
2189 <     * completion of source
2190 <     */
2191 <    public void testThenAcceptAsyncE() {
2192 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2193 <        IncAction r = new IncAction();
2194 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2195 <        f.complete(one);
2196 <        checkCompletedNormally(g, null);
2197 <        assertEquals(r.value, 2);
2198 <    }
2199 <
2200 <    /**
2201 <     * thenAcceptAsync result completes exceptionally after exceptional
2202 <     * completion of source
2203 <     */
2204 <    public void testThenAcceptAsync2E() {
2205 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2206 <        IncAction r = new IncAction();
2207 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2208 <        f.completeExceptionally(new CFException());
2209 <        checkCompletedWithWrappedCFException(g);
2210 <    }
2211 <
2212 <    /**
2213 <     * thenAcceptAsync result completes exceptionally if action does
2214 <     */
2215 <    public void testThenAcceptAsync3E() {
2216 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2217 <        FailingConsumer r = new FailingConsumer();
2218 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2219 <        f.complete(null);
2220 <        checkCompletedWithWrappedCFException(g);
2221 <    }
2222 <
2223 <    /**
2224 <     * thenAcceptAsync result completes exceptionally if source cancelled
2225 <     */
2226 <    public void testThenAcceptAsync4E() {
2227 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2228 <        IncAction r = new IncAction();
2229 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2230 <        assertTrue(f.cancel(true));
2231 <        checkCompletedWithWrappedCancellationException(g);
2232 <    }
2233 <
2234 <    /**
2235 <     * thenCombineAsync result completes normally after normal
2236 <     * completion of sources
2237 <     */
2238 <    public void testThenCombineAsyncE() {
2239 <        CompletableFuture<Integer> f, g, h;
2240 <        ThreadExecutor e = new ThreadExecutor();
2241 <        int count = 0;
2242 <
2243 <        f = new CompletableFuture<>();
2244 <        g = new CompletableFuture<>();
2245 <        h = f.thenCombineAsync(g, subtract, e);
2246 <        f.complete(3);
2247 <        checkIncomplete(h);
2248 <        g.complete(1);
2249 <        checkCompletedNormally(h, 2);
2250 <        assertEquals(++count, e.count.get());
2251 <
2252 <        f = new CompletableFuture<>();
2253 <        g = new CompletableFuture<>();
2254 <        h = f.thenCombineAsync(g, subtract, e);
2255 <        g.complete(1);
2256 <        checkIncomplete(h);
2257 <        f.complete(3);
2258 <        checkCompletedNormally(h, 2);
2259 <        assertEquals(++count, e.count.get());
2260 <
2261 <        f = new CompletableFuture<>();
2262 <        g = new CompletableFuture<>();
2263 <        g.complete(1);
2264 <        f.complete(3);
2265 <        h = f.thenCombineAsync(g, subtract, e);
2266 <        checkCompletedNormally(h, 2);
2267 <        assertEquals(++count, e.count.get());
2268 <    }
2269 <
2270 <    /**
2271 <     * thenCombineAsync result completes exceptionally after exceptional
2272 <     * completion of either source
2273 <     */
2274 <    public void testThenCombineAsync2E() {
2275 <        CompletableFuture<Integer> f, g, h;
2276 <        ThreadExecutor e = new ThreadExecutor();
2277 <        int count = 0;
2278 <
2279 <        f = new CompletableFuture<>();
2280 <        g = new CompletableFuture<>();
2281 <        h = f.thenCombineAsync(g, subtract, e);
2282 <        f.completeExceptionally(new CFException());
2283 <        checkIncomplete(h);
2284 <        g.complete(1);
2285 <        checkCompletedWithWrappedCFException(h);
2286 <
2287 <        f = new CompletableFuture<>();
2288 <        g = new CompletableFuture<>();
2289 <        h = f.thenCombineAsync(g, subtract, e);
2290 <        g.completeExceptionally(new CFException());
2291 <        checkIncomplete(h);
2292 <        f.complete(3);
2293 <        checkCompletedWithWrappedCFException(h);
2294 <
2295 <        f = new CompletableFuture<>();
2296 <        g = new CompletableFuture<>();
2297 <        g.completeExceptionally(new CFException());
2298 <        h = f.thenCombineAsync(g, subtract, e);
2299 <        checkIncomplete(h);
2300 <        f.complete(3);
2301 <        checkCompletedWithWrappedCFException(h);
2302 <
2303 <        assertEquals(0, e.count.get());
2304 <    }
2515 >        // unspecified behavior
2516 >        Integer v;
2517 >        try {
2518 >            assertNull(h.join());
2519 >            assertEquals(1, r.invocationCount);
2520 >            assertEquals(inc(v1), r.value);
2521 >        } catch (CompletionException ok) {
2522 >            checkCompletedWithWrappedCancellationException(h);
2523 >            assertEquals(0, r.invocationCount);
2524 >        }
2525  
2526 <    /**
2527 <     * thenCombineAsync result completes exceptionally if action does
2528 <     */
2309 <    public void testThenCombineAsync3E() {
2310 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2311 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2312 <        FailingBiFunction r = new FailingBiFunction();
2313 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2314 <        f.complete(one);
2315 <        checkIncomplete(g);
2316 <        assertFalse(r.ran);
2317 <        f2.complete(two);
2318 <        checkCompletedWithWrappedCFException(g);
2319 <        assertTrue(r.ran);
2320 <    }
2526 >        checkCancelled(f);
2527 >        checkCompletedNormally(g, v1);
2528 >    }}
2529  
2530      /**
2531 <     * thenCombineAsync result completes exceptionally if either source cancelled
2531 >     * runAfterEither result completes normally after normal completion
2532 >     * of either source
2533       */
2534 <    public void testThenCombineAsync4E() {
2535 <        CompletableFuture<Integer> f, g, h;
2536 <        ThreadExecutor e = new ThreadExecutor();
2537 <
2538 <        f = new CompletableFuture<>();
2539 <        g = new CompletableFuture<>();
2540 <        h = f.thenCombineAsync(g, subtract, e);
2541 <        assertTrue(f.cancel(true));
2542 <        checkIncomplete(h);
2334 <        g.complete(1);
2335 <        checkCompletedWithWrappedCancellationException(h);
2534 >    public void testRunAfterEither_normalCompletion1() {
2535 >        for (ExecutionMode m : ExecutionMode.values())
2536 >        for (Integer v1 : new Integer[] { 1, null })
2537 >        for (Integer v2 : new Integer[] { 2, null })
2538 >    {
2539 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2540 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2541 >        final Noop r = new Noop();
2542 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2543  
2544 <        f = new CompletableFuture<>();
2545 <        g = new CompletableFuture<>();
2546 <        h = f.thenCombineAsync(g, subtract, e);
2547 <        assertTrue(g.cancel(true));
2341 <        checkIncomplete(h);
2342 <        f.complete(3);
2343 <        checkCompletedWithWrappedCancellationException(h);
2344 <
2345 <        f = new CompletableFuture<>();
2346 <        g = new CompletableFuture<>();
2347 <        assertTrue(g.cancel(true));
2348 <        h = f.thenCombineAsync(g, subtract, e);
2349 <        checkIncomplete(h);
2350 <        f.complete(3);
2351 <        checkCompletedWithWrappedCancellationException(h);
2352 <
2353 <        f = new CompletableFuture<>();
2354 <        g = new CompletableFuture<>();
2355 <        assertTrue(f.cancel(true));
2356 <        assertTrue(g.cancel(true));
2357 <        h = f.thenCombineAsync(g, subtract, e);
2358 <        checkCompletedWithWrappedCancellationException(h);
2544 >        f.complete(v1);
2545 >        checkCompletedNormally(h, null);
2546 >        assertEquals(1, r.invocationCount);
2547 >        g.complete(v2);
2548  
2549 <        assertEquals(0, e.count.get());
2550 <    }
2549 >        checkCompletedNormally(f, v1);
2550 >        checkCompletedNormally(g, v2);
2551 >        checkCompletedNormally(h, null);
2552 >        assertEquals(1, r.invocationCount);
2553 >    }}
2554  
2555 <    /**
2556 <     * thenAcceptBothAsync result completes normally after normal
2557 <     * completion of sources
2558 <     */
2559 <    public void testThenAcceptBothAsyncE() {
2560 <        CompletableFuture<Integer> f, g;
2561 <        CompletableFuture<Void> h;
2562 <        SubtractAction r;
2563 <        ThreadExecutor e = new ThreadExecutor();
2555 >    public void testRunAfterEither_normalCompletion2() {
2556 >        for (ExecutionMode m : ExecutionMode.values())
2557 >        for (Integer v1 : new Integer[] { 1, null })
2558 >        for (Integer v2 : new Integer[] { 2, null })
2559 >    {
2560 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2561 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2562 >        final Noop r = new Noop();
2563 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2564  
2565 <        f = new CompletableFuture<>();
2374 <        g = new CompletableFuture<>();
2375 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2376 <        f.complete(3);
2377 <        checkIncomplete(h);
2378 <        g.complete(1);
2565 >        g.complete(v2);
2566          checkCompletedNormally(h, null);
2567 <        assertEquals(r.value, 2);
2567 >        assertEquals(1, r.invocationCount);
2568 >        f.complete(v1);
2569  
2570 <        f = new CompletableFuture<>();
2571 <        g = new CompletableFuture<>();
2384 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2385 <        g.complete(1);
2386 <        checkIncomplete(h);
2387 <        f.complete(3);
2570 >        checkCompletedNormally(f, v1);
2571 >        checkCompletedNormally(g, v2);
2572          checkCompletedNormally(h, null);
2573 <        assertEquals(r.value, 2);
2573 >        assertEquals(1, r.invocationCount);
2574 >        }}
2575  
2576 <        f = new CompletableFuture<>();
2577 <        g = new CompletableFuture<>();
2578 <        g.complete(1);
2579 <        f.complete(3);
2580 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2581 <        checkCompletedNormally(h, null);
2582 <        assertEquals(r.value, 2);
2576 >    public void testRunAfterEither_normalCompletion3() {
2577 >        for (ExecutionMode m : ExecutionMode.values())
2578 >        for (Integer v1 : new Integer[] { 1, null })
2579 >        for (Integer v2 : new Integer[] { 2, null })
2580 >    {
2581 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2582 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2583 >        final Noop r = new Noop();
2584 >
2585 >        f.complete(v1);
2586 >        g.complete(v2);
2587 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2588  
2589 <        assertEquals(3, e.count.get());
2590 <    }
2589 >        checkCompletedNormally(h, null);
2590 >        checkCompletedNormally(f, v1);
2591 >        checkCompletedNormally(g, v2);
2592 >        assertEquals(1, r.invocationCount);
2593 >    }}
2594  
2595      /**
2596 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2597 <     * completion of source
2596 >     * runAfterEither result completes exceptionally after exceptional
2597 >     * completion of either source
2598       */
2599 <    public void testThenAcceptBothAsync2E() {
2600 <        CompletableFuture<Integer> f, g;
2601 <        CompletableFuture<Void> h;
2602 <        SubtractAction r;
2603 <        ThreadExecutor e = new ThreadExecutor();
2599 >    public void testRunAfterEither_exceptionalCompletion1() {
2600 >        for (ExecutionMode m : ExecutionMode.values())
2601 >        for (Integer v1 : new Integer[] { 1, null })
2602 >    {
2603 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2604 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2605 >        final Noop r = new Noop();
2606 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2607 >        final CFException ex = new CFException();
2608 >
2609 >        f.completeExceptionally(ex);
2610 >        checkCompletedWithWrappedCFException(h, ex);
2611 >        g.complete(v1);
2612 >
2613 >        assertEquals(0, r.invocationCount);
2614 >        checkCompletedNormally(g, v1);
2615 >        checkCompletedWithWrappedCFException(f, ex);
2616 >        checkCompletedWithWrappedCFException(h, ex);
2617 >    }}
2618 >
2619 >    public void testRunAfterEither_exceptionalCompletion2() {
2620 >        for (ExecutionMode m : ExecutionMode.values())
2621 >        for (Integer v1 : new Integer[] { 1, null })
2622 >    {
2623 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2624 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2625 >        final Noop r = new Noop();
2626 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2627 >        final CFException ex = new CFException();
2628 >
2629 >        g.completeExceptionally(ex);
2630 >        checkCompletedWithWrappedCFException(h, ex);
2631 >        f.complete(v1);
2632 >
2633 >        assertEquals(0, r.invocationCount);
2634 >        checkCompletedNormally(f, v1);
2635 >        checkCompletedWithWrappedCFException(g, ex);
2636 >        checkCompletedWithWrappedCFException(h, ex);
2637 >    }}
2638 >
2639 >    public void testRunAfterEither_exceptionalCompletion3() {
2640 >        for (ExecutionMode m : ExecutionMode.values())
2641 >        for (Integer v1 : new Integer[] { 1, null })
2642 >    {
2643 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2644 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2645 >        final Noop r = new Noop();
2646 >        final CFException ex = new CFException();
2647 >
2648 >        g.completeExceptionally(ex);
2649 >        f.complete(v1);
2650 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2651  
2652 <        f = new CompletableFuture<>();
2653 <        g = new CompletableFuture<>();
2654 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2655 <        f.completeExceptionally(new CFException());
2656 <        checkIncomplete(h);
2657 <        g.complete(1);
2658 <        checkCompletedWithWrappedCFException(h);
2659 <
2660 <        f = new CompletableFuture<>();
2421 <        g = new CompletableFuture<>();
2422 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2423 <        g.completeExceptionally(new CFException());
2424 <        checkIncomplete(h);
2425 <        f.complete(3);
2426 <        checkCompletedWithWrappedCFException(h);
2652 >        // unspecified behavior
2653 >        Integer v;
2654 >        try {
2655 >            assertNull(h.join());
2656 >            assertEquals(1, r.invocationCount);
2657 >        } catch (CompletionException ok) {
2658 >            checkCompletedWithWrappedCFException(h, ex);
2659 >            assertEquals(0, r.invocationCount);
2660 >        }
2661  
2662 <        f = new CompletableFuture<>();
2663 <        g = new CompletableFuture<>();
2664 <        f.complete(3);
2665 <        g.completeExceptionally(new CFException());
2666 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2667 <        checkCompletedWithWrappedCFException(h);
2662 >        checkCompletedWithWrappedCFException(g, ex);
2663 >        checkCompletedNormally(f, v1);
2664 >    }}
2665 >
2666 >    public void testRunAfterEither_exceptionalCompletion4() {
2667 >        for (ExecutionMode m : ExecutionMode.values())
2668 >        for (Integer v1 : new Integer[] { 1, null })
2669 >    {
2670 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2671 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2672 >        final Noop r = new Noop();
2673 >        final CFException ex = new CFException();
2674 >
2675 >        f.completeExceptionally(ex);
2676 >        g.complete(v1);
2677 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2678  
2679 <        f = new CompletableFuture<>();
2680 <        g = new CompletableFuture<>();
2681 <        f.completeExceptionally(new CFException());
2682 <        g.complete(3);
2683 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2684 <        checkCompletedWithWrappedCFException(h);
2679 >        // unspecified behavior
2680 >        Integer v;
2681 >        try {
2682 >            assertNull(h.join());
2683 >            assertEquals(1, r.invocationCount);
2684 >        } catch (CompletionException ok) {
2685 >            checkCompletedWithWrappedCFException(h, ex);
2686 >            assertEquals(0, r.invocationCount);
2687 >        }
2688  
2689 <        assertEquals(0, e.count.get());
2690 <    }
2689 >        checkCompletedWithWrappedCFException(f, ex);
2690 >        checkCompletedNormally(g, v1);
2691 >    }}
2692  
2693      /**
2694 <     * thenAcceptBothAsync result completes exceptionally if action does
2694 >     * runAfterEither result completes exceptionally if action does
2695       */
2696 <    public void testThenAcceptBothAsync3E() {
2697 <        CompletableFuture<Integer> f, g;
2698 <        CompletableFuture<Void> h;
2699 <        FailingBiConsumer r;
2700 <        ThreadExecutor e = new ThreadExecutor();
2701 <
2702 <        f = new CompletableFuture<>();
2703 <        g = new CompletableFuture<>();
2704 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2705 <        f.complete(3);
2706 <        checkIncomplete(h);
2707 <        g.complete(1);
2708 <        checkCompletedWithWrappedCFException(h);
2709 <
2710 <        f = new CompletableFuture<>();
2711 <        g = new CompletableFuture<>();
2712 <        f.complete(3);
2713 <        g.complete(1);
2714 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2715 <        checkCompletedWithWrappedCFException(h);
2716 <
2717 <        assertEquals(2, e.count.get());
2718 <    }
2696 >    public void testRunAfterEither_actionFailed1() {
2697 >        for (ExecutionMode m : ExecutionMode.values())
2698 >        for (Integer v1 : new Integer[] { 1, null })
2699 >        for (Integer v2 : new Integer[] { 2, null })
2700 >    {
2701 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2702 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2703 >        final FailingRunnable r = new FailingRunnable();
2704 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2705 >
2706 >        f.complete(v1);
2707 >        checkCompletedWithWrappedCFException(h);
2708 >        g.complete(v2);
2709 >        checkCompletedNormally(f, v1);
2710 >        checkCompletedNormally(g, v2);
2711 >    }}
2712 >
2713 >    public void testRunAfterEither_actionFailed2() {
2714 >        for (ExecutionMode m : ExecutionMode.values())
2715 >        for (Integer v1 : new Integer[] { 1, null })
2716 >        for (Integer v2 : new Integer[] { 2, null })
2717 >    {
2718 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2719 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2720 >        final FailingRunnable r = new FailingRunnable();
2721 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2722 >
2723 >        g.complete(v2);
2724 >        checkCompletedWithWrappedCFException(h);
2725 >        f.complete(v1);
2726 >        checkCompletedNormally(f, v1);
2727 >        checkCompletedNormally(g, v2);
2728 >    }}
2729  
2730      /**
2731 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2731 >     * runAfterEither result completes exceptionally if either source cancelled
2732       */
2733 <    public void testThenAcceptBothAsync4E() {
2734 <        CompletableFuture<Integer> f, g;
2735 <        CompletableFuture<Void> h;
2736 <        SubtractAction r;
2737 <        ThreadExecutor e = new ThreadExecutor();
2738 <
2739 <        f = new CompletableFuture<>();
2740 <        g = new CompletableFuture<>();
2741 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2484 <        assertTrue(f.cancel(true));
2485 <        checkIncomplete(h);
2486 <        g.complete(1);
2487 <        checkCompletedWithWrappedCancellationException(h);
2488 <
2489 <        f = new CompletableFuture<>();
2490 <        g = new CompletableFuture<>();
2491 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2492 <        assertTrue(g.cancel(true));
2493 <        checkIncomplete(h);
2494 <        f.complete(3);
2495 <        checkCompletedWithWrappedCancellationException(h);
2733 >    public void testRunAfterEither_sourceCancelled1() {
2734 >        for (ExecutionMode m : ExecutionMode.values())
2735 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2736 >        for (Integer v1 : new Integer[] { 1, null })
2737 >    {
2738 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2739 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2740 >        final Noop r = new Noop();
2741 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2742  
2743 <        f = new CompletableFuture<>();
2498 <        g = new CompletableFuture<>();
2499 <        f.complete(3);
2500 <        assertTrue(g.cancel(true));
2501 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2743 >        assertTrue(f.cancel(mayInterruptIfRunning));
2744          checkCompletedWithWrappedCancellationException(h);
2745 +        g.complete(v1);
2746  
2747 <        f = new CompletableFuture<>();
2748 <        g = new CompletableFuture<>();
2749 <        assertTrue(f.cancel(true));
2507 <        g.complete(3);
2508 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2747 >        checkCancelled(f);
2748 >        assertEquals(0, r.invocationCount);
2749 >        checkCompletedNormally(g, v1);
2750          checkCompletedWithWrappedCancellationException(h);
2751 +    }}
2752  
2753 <        assertEquals(0, e.count.get());
2754 <    }
2755 <
2756 <    /**
2757 <     * runAfterBothAsync result completes normally after normal
2758 <     * completion of sources
2759 <     */
2760 <    public void testRunAfterBothAsyncE() {
2761 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2762 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2763 <        Noop r = new Noop();
2764 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2765 <        f.complete(one);
2766 <        checkIncomplete(g);
2767 <        f2.complete(two);
2768 <        checkCompletedNormally(g, null);
2769 <        assertTrue(r.ran);
2770 <    }
2771 <
2772 <    /**
2773 <     * runAfterBothAsync result completes exceptionally after exceptional
2774 <     * completion of source
2775 <     */
2776 <    public void testRunAfterBothAsync2E() {
2777 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2778 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2779 <        Noop r = new Noop();
2780 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2781 <        f.completeExceptionally(new CFException());
2782 <        f2.complete(two);
2783 <        checkCompletedWithWrappedCFException(g);
2753 >    public void testRunAfterEither_sourceCancelled2() {
2754 >        for (ExecutionMode m : ExecutionMode.values())
2755 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2756 >        for (Integer v1 : new Integer[] { 1, null })
2757 >    {
2758 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2759 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2760 >        final Noop r = new Noop();
2761 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2762 >
2763 >        assertTrue(g.cancel(mayInterruptIfRunning));
2764 >        checkCompletedWithWrappedCancellationException(h);
2765 >        f.complete(v1);
2766 >
2767 >        checkCancelled(g);
2768 >        assertEquals(0, r.invocationCount);
2769 >        checkCompletedNormally(f, v1);
2770 >        checkCompletedWithWrappedCancellationException(h);
2771 >    }}
2772 >
2773 >    public void testRunAfterEither_sourceCancelled3() {
2774 >        for (ExecutionMode m : ExecutionMode.values())
2775 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2776 >        for (Integer v1 : new Integer[] { 1, null })
2777 >    {
2778 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2779 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2780 >        final Noop r = new Noop();
2781 >
2782 >        assertTrue(g.cancel(mayInterruptIfRunning));
2783 >        f.complete(v1);
2784 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2785  
2786 <        r = new Noop();
2787 <        f = new CompletableFuture<>();
2788 <        f2 = new CompletableFuture<>();
2789 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2790 <        f.complete(one);
2791 <        f2.completeExceptionally(new CFException());
2792 <        checkCompletedWithWrappedCFException(g);
2793 <    }
2794 <
2552 <    /**
2553 <     * runAfterBothAsync result completes exceptionally if action does
2554 <     */
2555 <    public void testRunAfterBothAsync3E() {
2556 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2557 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2558 <        FailingNoop r = new FailingNoop();
2559 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2560 <        f.complete(one);
2561 <        checkIncomplete(g);
2562 <        f2.complete(two);
2563 <        checkCompletedWithWrappedCFException(g);
2564 <    }
2565 <
2566 <    /**
2567 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2568 <     */
2569 <    public void testRunAfterBothAsync4E() {
2570 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2571 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2572 <        Noop r = new Noop();
2573 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2574 <        assertTrue(f.cancel(true));
2575 <        f2.complete(two);
2576 <        checkCompletedWithWrappedCancellationException(g);
2577 <
2578 <        r = new Noop();
2579 <        f = new CompletableFuture<>();
2580 <        f2 = new CompletableFuture<>();
2581 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2582 <        f.complete(one);
2583 <        assertTrue(f2.cancel(true));
2584 <        checkCompletedWithWrappedCancellationException(g);
2585 <    }
2586 <
2587 <    /**
2588 <     * applyToEitherAsync result completes normally after normal
2589 <     * completion of sources
2590 <     */
2591 <    public void testApplyToEitherAsyncE() {
2592 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2593 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2594 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2595 <        f.complete(one);
2596 <        checkCompletedNormally(g, two);
2597 <
2598 <        f = new CompletableFuture<>();
2599 <        f.complete(one);
2600 <        f2 = new CompletableFuture<>();
2601 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2602 <        checkCompletedNormally(g, two);
2603 <    }
2604 <
2605 <    /**
2606 <     * applyToEitherAsync result completes exceptionally after exceptional
2607 <     * completion of source
2608 <     */
2609 <    public void testApplyToEitherAsync2E() {
2610 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2611 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2612 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2613 <        f.completeExceptionally(new CFException());
2614 <        checkCompletedWithWrappedCFException(g);
2615 <
2616 <        f = new CompletableFuture<>();
2617 <        f2 = new CompletableFuture<>();
2618 <        f2.completeExceptionally(new CFException());
2619 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2620 <        f.complete(one);
2621 <        checkCompletedWithWrappedCFException(g);
2622 <    }
2623 <
2624 <    /**
2625 <     * applyToEitherAsync result completes exceptionally if action does
2626 <     */
2627 <    public void testApplyToEitherAsync3E() {
2628 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2629 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2630 <        FailingFunction r = new FailingFunction();
2631 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2632 <        f.complete(one);
2633 <        checkCompletedWithWrappedCFException(g);
2634 <    }
2635 <
2636 <    /**
2637 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2638 <     */
2639 <    public void testApplyToEitherAsync4E() {
2640 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2641 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2642 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2643 <        assertTrue(f.cancel(true));
2644 <        checkCompletedWithWrappedCancellationException(g);
2645 <
2646 <        f = new CompletableFuture<>();
2647 <        f2 = new CompletableFuture<>();
2648 <        assertTrue(f2.cancel(true));
2649 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2650 <        checkCompletedWithWrappedCancellationException(g);
2651 <    }
2652 <
2653 <    /**
2654 <     * acceptEitherAsync result completes normally after normal
2655 <     * completion of sources
2656 <     */
2657 <    public void testAcceptEitherAsyncE() {
2658 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2659 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2660 <        IncAction r = new IncAction();
2661 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2662 <        f.complete(one);
2663 <        checkCompletedNormally(g, null);
2664 <        assertEquals(r.value, 2);
2665 <
2666 <        r = new IncAction();
2667 <        f = new CompletableFuture<>();
2668 <        f.complete(one);
2669 <        f2 = new CompletableFuture<>();
2670 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2671 <        checkCompletedNormally(g, null);
2672 <        assertEquals(r.value, 2);
2673 <    }
2674 <
2675 <    /**
2676 <     * acceptEitherAsync result completes exceptionally after exceptional
2677 <     * completion of source
2678 <     */
2679 <    public void testAcceptEitherAsync2E() {
2680 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2681 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2682 <        IncAction r = new IncAction();
2683 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2684 <        f.completeExceptionally(new CFException());
2685 <        checkCompletedWithWrappedCFException(g);
2686 <
2687 <        r = new IncAction();
2688 <        f = new CompletableFuture<>();
2689 <        f2 = new CompletableFuture<>();
2690 <        f2.completeExceptionally(new CFException());
2691 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2692 <        f.complete(one);
2693 <        checkCompletedWithWrappedCFException(g);
2694 <    }
2786 >        // unspecified behavior
2787 >        Integer v;
2788 >        try {
2789 >            assertNull(h.join());
2790 >            assertEquals(1, r.invocationCount);
2791 >        } catch (CompletionException ok) {
2792 >            checkCompletedWithWrappedCancellationException(h);
2793 >            assertEquals(0, r.invocationCount);
2794 >        }
2795  
2796 <    /**
2797 <     * acceptEitherAsync result completes exceptionally if action does
2798 <     */
2799 <    public void testAcceptEitherAsync3E() {
2800 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2801 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2802 <        FailingConsumer r = new FailingConsumer();
2803 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2804 <        f.complete(one);
2805 <        checkCompletedWithWrappedCFException(g);
2806 <    }
2796 >        checkCancelled(g);
2797 >        checkCompletedNormally(f, v1);
2798 >    }}
2799 >
2800 >    public void testRunAfterEither_sourceCancelled4() {
2801 >        for (ExecutionMode m : ExecutionMode.values())
2802 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2803 >        for (Integer v1 : new Integer[] { 1, null })
2804 >    {
2805 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2806 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2807 >        final Noop r = new Noop();
2808 >
2809 >        assertTrue(f.cancel(mayInterruptIfRunning));
2810 >        g.complete(v1);
2811 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2812  
2813 <    /**
2814 <     * acceptEitherAsync result completes exceptionally if either
2815 <     * source cancelled
2816 <     */
2817 <    public void testAcceptEitherAsync4E() {
2818 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2819 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2820 <        IncAction r = new IncAction();
2821 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2717 <        assertTrue(f.cancel(true));
2718 <        checkCompletedWithWrappedCancellationException(g);
2813 >        // unspecified behavior
2814 >        Integer v;
2815 >        try {
2816 >            assertNull(h.join());
2817 >            assertEquals(1, r.invocationCount);
2818 >        } catch (CompletionException ok) {
2819 >            checkCompletedWithWrappedCancellationException(h);
2820 >            assertEquals(0, r.invocationCount);
2821 >        }
2822  
2823 <        r = new IncAction();
2824 <        f = new CompletableFuture<>();
2825 <        f2 = new CompletableFuture<>();
2723 <        assertTrue(f2.cancel(true));
2724 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2725 <        checkCompletedWithWrappedCancellationException(g);
2726 <    }
2823 >        checkCancelled(f);
2824 >        checkCompletedNormally(g, v1);
2825 >    }}
2826  
2827      /**
2828 <     * runAfterEitherAsync result completes normally after normal
2730 <     * completion of sources
2828 >     * thenCompose result completes normally after normal completion of source
2829       */
2830 <    public void testRunAfterEitherAsyncE() {
2831 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2832 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2833 <        Noop r = new Noop();
2834 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2835 <        f.complete(one);
2836 <        checkCompletedNormally(g, null);
2837 <        assertTrue(r.ran);
2838 <
2839 <        r = new Noop();
2840 <        f = new CompletableFuture<>();
2841 <        f.complete(one);
2842 <        f2 = new CompletableFuture<>();
2843 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2844 <        checkCompletedNormally(g, null);
2747 <        assertTrue(r.ran);
2748 <    }
2830 >    public void testThenCompose_normalCompletion() {
2831 >        for (ExecutionMode m : ExecutionMode.values())
2832 >        for (boolean createIncomplete : new boolean[] { true, false })
2833 >        for (Integer v1 : new Integer[] { 1, null })
2834 >    {
2835 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2836 >        final CompletableFutureInc r = new CompletableFutureInc();
2837 >        if (!createIncomplete) f.complete(v1);
2838 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2839 >        if (createIncomplete) f.complete(v1);
2840 >
2841 >        checkCompletedNormally(g, inc(v1));
2842 >        checkCompletedNormally(f, v1);
2843 >        assertEquals(1, r.invocationCount);
2844 >    }}
2845  
2846      /**
2847 <     * runAfterEitherAsync result completes exceptionally after exceptional
2847 >     * thenCompose result completes exceptionally after exceptional
2848       * completion of source
2849       */
2850 <    public void testRunAfterEitherAsync2E() {
2851 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2852 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2853 <        Noop r = new Noop();
2854 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2855 <        f.completeExceptionally(new CFException());
2856 <        checkCompletedWithWrappedCFException(g);
2857 <
2858 <        r = new Noop();
2859 <        f = new CompletableFuture<>();
2860 <        f2 = new CompletableFuture<>();
2861 <        f2.completeExceptionally(new CFException());
2862 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2863 <        f.complete(one);
2864 <        checkCompletedWithWrappedCFException(g);
2769 <    }
2770 <
2771 <    /**
2772 <     * runAfterEitherAsync result completes exceptionally if action does
2773 <     */
2774 <    public void testRunAfterEitherAsync3E() {
2775 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2776 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2777 <        FailingNoop r = new FailingNoop();
2778 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2779 <        f.complete(one);
2780 <        checkCompletedWithWrappedCFException(g);
2781 <    }
2782 <
2783 <    /**
2784 <     * runAfterEitherAsync result completes exceptionally if either
2785 <     * source cancelled
2786 <     */
2787 <    public void testRunAfterEitherAsync4E() {
2788 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2789 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2790 <        Noop r = new Noop();
2791 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2792 <        assertTrue(f.cancel(true));
2793 <        checkCompletedWithWrappedCancellationException(g);
2794 <
2795 <        r = new Noop();
2796 <        f = new CompletableFuture<>();
2797 <        f2 = new CompletableFuture<>();
2798 <        assertTrue(f2.cancel(true));
2799 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2800 <        checkCompletedWithWrappedCancellationException(g);
2801 <    }
2850 >    public void testThenCompose_exceptionalCompletion() {
2851 >        for (ExecutionMode m : ExecutionMode.values())
2852 >        for (boolean createIncomplete : new boolean[] { true, false })
2853 >    {
2854 >        final CFException ex = new CFException();
2855 >        final CompletableFutureInc r = new CompletableFutureInc();
2856 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 >        if (!createIncomplete) f.completeExceptionally(ex);
2858 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2859 >        if (createIncomplete) f.completeExceptionally(ex);
2860 >
2861 >        checkCompletedWithWrappedCFException(g, ex);
2862 >        checkCompletedWithWrappedCFException(f, ex);
2863 >        assertEquals(0, r.invocationCount);
2864 >    }}
2865  
2866      /**
2867 <     * thenComposeAsync result completes normally after normal
2805 <     * completion of source
2867 >     * thenCompose result completes exceptionally if action does
2868       */
2869 <    public void testThenComposeAsyncE() {
2870 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2871 <        CompletableFutureInc r = new CompletableFutureInc();
2872 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2873 <        f.complete(one);
2874 <        checkCompletedNormally(g, two);
2875 <    }
2869 >    public void testThenCompose_actionFailed() {
2870 >        for (ExecutionMode m : ExecutionMode.values())
2871 >        for (boolean createIncomplete : new boolean[] { true, false })
2872 >        for (Integer v1 : new Integer[] { 1, null })
2873 >    {
2874 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2875 >        final FailingCompletableFutureFunction r
2876 >            = new FailingCompletableFutureFunction();
2877 >        if (!createIncomplete) f.complete(v1);
2878 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2879 >        if (createIncomplete) f.complete(v1);
2880  
2815    /**
2816     * thenComposeAsync result completes exceptionally after
2817     * exceptional completion of source
2818     */
2819    public void testThenComposeAsync2E() {
2820        CompletableFuture<Integer> f = new CompletableFuture<>();
2821        CompletableFutureInc r = new CompletableFutureInc();
2822        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2823        f.completeExceptionally(new CFException());
2881          checkCompletedWithWrappedCFException(g);
2882 <    }
2882 >        checkCompletedNormally(f, v1);
2883 >    }}
2884  
2885      /**
2886 <     * thenComposeAsync result completes exceptionally if action does
2886 >     * thenCompose result completes exceptionally if source cancelled
2887       */
2888 <    public void testThenComposeAsync3E() {
2889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2890 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2891 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2892 <        f.complete(one);
2893 <        checkCompletedWithWrappedCFException(g);
2894 <    }
2888 >    public void testThenCompose_sourceCancelled() {
2889 >        for (ExecutionMode m : ExecutionMode.values())
2890 >        for (boolean createIncomplete : new boolean[] { true, false })
2891 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2892 >    {
2893 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2894 >        final CompletableFutureInc r = new CompletableFutureInc();
2895 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2896 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2897 >        if (createIncomplete) {
2898 >            checkIncomplete(g);
2899 >            assertTrue(f.cancel(mayInterruptIfRunning));
2900 >        }
2901  
2838    /**
2839     * thenComposeAsync result completes exceptionally if source cancelled
2840     */
2841    public void testThenComposeAsync4E() {
2842        CompletableFuture<Integer> f = new CompletableFuture<>();
2843        CompletableFutureInc r = new CompletableFutureInc();
2844        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2845        assertTrue(f.cancel(true));
2902          checkCompletedWithWrappedCancellationException(g);
2903 <    }
2903 >        checkCancelled(f);
2904 >    }}
2905  
2906      // other static methods
2907  
# Line 2933 | Line 2990 | public class CompletableFutureTest exten
2990          ThreadExecutor exec = new ThreadExecutor();
2991  
2992          Runnable[] throwingActions = {
2993 <            () -> { CompletableFuture.supplyAsync(null); },
2994 <            () -> { CompletableFuture.supplyAsync(null, exec); },
2995 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
2996 <
2997 <            () -> { CompletableFuture.runAsync(null); },
2998 <            () -> { CompletableFuture.runAsync(null, exec); },
2999 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
3000 <
3001 <            () -> { f.completeExceptionally(null); },
3002 <
3003 <            () -> { f.thenApply(null); },
3004 <            () -> { f.thenApplyAsync(null); },
3005 <            () -> { f.thenApplyAsync((x) -> x, null); },
3006 <            () -> { f.thenApplyAsync(null, exec); },
3007 <
3008 <            () -> { f.thenAccept(null); },
3009 <            () -> { f.thenAcceptAsync(null); },
3010 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
3011 <            () -> { f.thenAcceptAsync(null, exec); },
3012 <
3013 <            () -> { f.thenRun(null); },
3014 <            () -> { f.thenRunAsync(null); },
3015 <            () -> { f.thenRunAsync(() -> { ; }, null); },
3016 <            () -> { f.thenRunAsync(null, exec); },
3017 <
3018 <            () -> { f.thenCombine(g, null); },
3019 <            () -> { f.thenCombineAsync(g, null); },
3020 <            () -> { f.thenCombineAsync(g, null, exec); },
3021 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
3022 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
3023 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
3024 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
3025 <
3026 <            () -> { f.thenAcceptBoth(g, null); },
3027 <            () -> { f.thenAcceptBothAsync(g, null); },
3028 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
3029 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
3030 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
3031 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
3032 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
3033 <
3034 <            () -> { f.runAfterBoth(g, null); },
3035 <            () -> { f.runAfterBothAsync(g, null); },
3036 <            () -> { f.runAfterBothAsync(g, null, exec); },
3037 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
3038 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
3039 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
3040 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
3041 <
3042 <            () -> { f.applyToEither(g, null); },
3043 <            () -> { f.applyToEitherAsync(g, null); },
3044 <            () -> { f.applyToEitherAsync(g, null, exec); },
3045 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
3046 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
3047 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
3048 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
3049 <
3050 <            () -> { f.acceptEither(g, null); },
3051 <            () -> { f.acceptEitherAsync(g, null); },
3052 <            () -> { f.acceptEitherAsync(g, null, exec); },
3053 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
3054 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
3055 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
3056 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
3057 <
3058 <            () -> { f.runAfterEither(g, null); },
3059 <            () -> { f.runAfterEitherAsync(g, null); },
3060 <            () -> { f.runAfterEitherAsync(g, null, exec); },
3061 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
3062 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
3063 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
3064 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
3065 <
3066 <            () -> { f.thenCompose(null); },
3067 <            () -> { f.thenComposeAsync(null); },
3068 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
3069 <            () -> { f.thenComposeAsync(null, exec); },
3070 <
3071 <            () -> { f.exceptionally(null); },
3072 <
3073 <            () -> { f.handle(null); },
3074 <
3075 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
3076 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3077 <            () -> { CompletableFuture.allOf(f, null); },
3078 <            () -> { CompletableFuture.allOf(null, f); },
3079 <
3080 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3081 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3082 <            () -> { CompletableFuture.anyOf(f, null); },
3083 <            () -> { CompletableFuture.anyOf(null, f); },
2993 >            () -> CompletableFuture.supplyAsync(null),
2994 >            () -> CompletableFuture.supplyAsync(null, exec),
2995 >            () -> CompletableFuture.supplyAsync(supplyOne, null),
2996 >
2997 >            () -> CompletableFuture.runAsync(null),
2998 >            () -> CompletableFuture.runAsync(null, exec),
2999 >            () -> CompletableFuture.runAsync(() -> {}, null),
3000 >
3001 >            () -> f.completeExceptionally(null),
3002 >
3003 >            () -> f.thenApply(null),
3004 >            () -> f.thenApplyAsync(null),
3005 >            () -> f.thenApplyAsync((x) -> x, null),
3006 >            () -> f.thenApplyAsync(null, exec),
3007 >
3008 >            () -> f.thenAccept(null),
3009 >            () -> f.thenAcceptAsync(null),
3010 >            () -> f.thenAcceptAsync((x) -> {} , null),
3011 >            () -> f.thenAcceptAsync(null, exec),
3012 >
3013 >            () -> f.thenRun(null),
3014 >            () -> f.thenRunAsync(null),
3015 >            () -> f.thenRunAsync(() -> {} , null),
3016 >            () -> f.thenRunAsync(null, exec),
3017 >
3018 >            () -> f.thenCombine(g, null),
3019 >            () -> f.thenCombineAsync(g, null),
3020 >            () -> f.thenCombineAsync(g, null, exec),
3021 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3022 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3023 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3024 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3025 >
3026 >            () -> f.thenAcceptBoth(g, null),
3027 >            () -> f.thenAcceptBothAsync(g, null),
3028 >            () -> f.thenAcceptBothAsync(g, null, exec),
3029 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3030 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3031 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3032 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3033 >
3034 >            () -> f.runAfterBoth(g, null),
3035 >            () -> f.runAfterBothAsync(g, null),
3036 >            () -> f.runAfterBothAsync(g, null, exec),
3037 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3038 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3039 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3040 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3041 >
3042 >            () -> f.applyToEither(g, null),
3043 >            () -> f.applyToEitherAsync(g, null),
3044 >            () -> f.applyToEitherAsync(g, null, exec),
3045 >            () -> f.applyToEither(nullFuture, (x) -> x),
3046 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3047 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3048 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3049 >
3050 >            () -> f.acceptEither(g, null),
3051 >            () -> f.acceptEitherAsync(g, null),
3052 >            () -> f.acceptEitherAsync(g, null, exec),
3053 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3054 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3055 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3056 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3057 >
3058 >            () -> f.runAfterEither(g, null),
3059 >            () -> f.runAfterEitherAsync(g, null),
3060 >            () -> f.runAfterEitherAsync(g, null, exec),
3061 >            () -> f.runAfterEither(nullFuture, () -> {}),
3062 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3063 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3064 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3065 >
3066 >            () -> f.thenCompose(null),
3067 >            () -> f.thenComposeAsync(null),
3068 >            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3069 >            () -> f.thenComposeAsync(null, exec),
3070 >
3071 >            () -> f.exceptionally(null),
3072 >
3073 >            () -> f.handle(null),
3074 >
3075 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3076 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3077 >            () -> CompletableFuture.allOf(f, null),
3078 >            () -> CompletableFuture.allOf(null, f),
3079 >
3080 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3081 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3082 >            () -> CompletableFuture.anyOf(f, null),
3083 >            () -> CompletableFuture.anyOf(null, f),
3084 >
3085 >            () -> f.obtrudeException(null),
3086          };
3087  
3088          assertThrows(NullPointerException.class, throwingActions);
# Line 3042 | Line 3101 | public class CompletableFutureTest exten
3101       * whenComplete action executes on normal completion, propagating
3102       * source result.
3103       */
3104 <    public void testWhenComplete1() {
3105 <        final AtomicInteger a = new AtomicInteger();
3106 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3107 <        CompletableFuture<Integer> g =
3108 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3109 <        f.complete(three);
3110 <        checkCompletedNormally(f, three);
3111 <        checkCompletedNormally(g, three);
3112 <        assertEquals(a.get(), 1);
3113 <    }
3104 >    public void testWhenComplete_normalCompletion1() {
3105 >        for (ExecutionMode m : ExecutionMode.values())
3106 >        for (boolean createIncomplete : new boolean[] { true, false })
3107 >        for (Integer v1 : new Integer[] { 1, null })
3108 >    {
3109 >        final AtomicInteger a = new AtomicInteger(0);
3110 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3111 >        if (!createIncomplete) f.complete(v1);
3112 >        final CompletableFuture<Integer> g = m.whenComplete
3113 >            (f,
3114 >             (Integer x, Throwable t) -> {
3115 >                threadAssertSame(x, v1);
3116 >                threadAssertNull(t);
3117 >                a.getAndIncrement();
3118 >            });
3119 >        if (createIncomplete) f.complete(v1);
3120 >
3121 >        checkCompletedNormally(g, v1);
3122 >        checkCompletedNormally(f, v1);
3123 >        assertEquals(1, a.get());
3124 >    }}
3125  
3126      /**
3127       * whenComplete action executes on exceptional completion, propagating
3128       * source result.
3129       */
3130 <    public void testWhenComplete2() {
3131 <        final AtomicInteger a = new AtomicInteger();
3132 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3133 <        CompletableFuture<Integer> g =
3134 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3135 <        f.completeExceptionally(new CFException());
3136 <        assertTrue(f.isCompletedExceptionally());
3137 <        assertTrue(g.isCompletedExceptionally());
3138 <        assertEquals(a.get(), 1);
3139 <    }
3130 >    public void testWhenComplete_exceptionalCompletion() {
3131 >        for (ExecutionMode m : ExecutionMode.values())
3132 >        for (boolean createIncomplete : new boolean[] { true, false })
3133 >        for (Integer v1 : new Integer[] { 1, null })
3134 >    {
3135 >        final AtomicInteger a = new AtomicInteger(0);
3136 >        final CFException ex = new CFException();
3137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3138 >        if (!createIncomplete) f.completeExceptionally(ex);
3139 >        final CompletableFuture<Integer> g = m.whenComplete
3140 >            (f,
3141 >             (Integer x, Throwable t) -> {
3142 >                threadAssertNull(x);
3143 >                threadAssertSame(t, ex);
3144 >                a.getAndIncrement();
3145 >            });
3146 >        if (createIncomplete) f.completeExceptionally(ex);
3147 >        checkCompletedWithWrappedCFException(f, ex);
3148 >        checkCompletedWithWrappedCFException(g, ex);
3149 >        assertEquals(1, a.get());
3150 >    }}
3151 >
3152 >    /**
3153 >     * whenComplete action executes on cancelled source, propagating
3154 >     * CancellationException.
3155 >     */
3156 >    public void testWhenComplete_sourceCancelled() {
3157 >        for (ExecutionMode m : ExecutionMode.values())
3158 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3159 >        for (boolean createIncomplete : new boolean[] { true, false })
3160 >    {
3161 >        final AtomicInteger a = new AtomicInteger(0);
3162 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3163 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3164 >        final CompletableFuture<Integer> g = m.whenComplete
3165 >            (f,
3166 >             (Integer x, Throwable t) -> {
3167 >                threadAssertNull(x);
3168 >                threadAssertTrue(t instanceof CancellationException);
3169 >                a.getAndIncrement();
3170 >            });
3171 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3172 >
3173 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3174 >        checkCompletedWithWrappedCancellationException(g);
3175 >        checkCancelled(f);
3176 >        assertEquals(1, a.get());
3177 >    }}
3178  
3179      /**
3180       * If a whenComplete action throws an exception when triggered by
3181       * a normal completion, it completes exceptionally
3182       */
3183 <    public void testWhenComplete3() {
3184 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3185 <        CompletableFuture<Integer> g =
3186 <            f.whenComplete((Integer x, Throwable t) ->
3187 <                           { throw new CFException(); } );
3188 <        f.complete(three);
3189 <        checkCompletedNormally(f, three);
3190 <        assertTrue(g.isCompletedExceptionally());
3191 <        checkCompletedWithWrappedCFException(g);
3192 <    }
3193 <
3194 <    /**
3195 <     * whenCompleteAsync action executes on normal completion, propagating
3196 <     * source result.
3197 <     */
3198 <    public void testWhenCompleteAsync1() {
3199 <        final AtomicInteger a = new AtomicInteger();
3200 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3201 <        CompletableFuture<Integer> g =
3202 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3203 <        f.complete(three);
3204 <        checkCompletedNormally(f, three);
3097 <        checkCompletedNormally(g, three);
3098 <        assertEquals(a.get(), 1);
3099 <    }
3100 <
3101 <    /**
3102 <     * whenCompleteAsync action executes on exceptional completion, propagating
3103 <     * source result.
3104 <     */
3105 <    public void testWhenCompleteAsync2() {
3106 <        final AtomicInteger a = new AtomicInteger();
3107 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3108 <        CompletableFuture<Integer> g =
3109 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3110 <        f.completeExceptionally(new CFException());
3111 <        checkCompletedWithWrappedCFException(f);
3112 <        checkCompletedWithWrappedCFException(g);
3113 <    }
3114 <
3115 <    /**
3116 <     * If a whenCompleteAsync action throws an exception when
3117 <     * triggered by a normal completion, it completes exceptionally
3118 <     */
3119 <    public void testWhenCompleteAsync3() {
3120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3121 <        CompletableFuture<Integer> g =
3122 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3123 <                           { throw new CFException(); } );
3124 <        f.complete(three);
3125 <        checkCompletedNormally(f, three);
3126 <        checkCompletedWithWrappedCFException(g);
3127 <    }
3128 <
3129 <    /**
3130 <     * whenCompleteAsync action executes on normal completion, propagating
3131 <     * source result.
3132 <     */
3133 <    public void testWhenCompleteAsync1e() {
3134 <        final AtomicInteger a = new AtomicInteger();
3135 <        ThreadExecutor exec = new ThreadExecutor();
3136 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3137 <        CompletableFuture<Integer> g =
3138 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3139 <                                exec);
3140 <        f.complete(three);
3141 <        checkCompletedNormally(f, three);
3142 <        checkCompletedNormally(g, three);
3143 <        assertEquals(a.get(), 1);
3144 <    }
3145 <
3146 <    /**
3147 <     * whenCompleteAsync action executes on exceptional completion, propagating
3148 <     * source result.
3149 <     */
3150 <    public void testWhenCompleteAsync2e() {
3151 <        final AtomicInteger a = new AtomicInteger();
3152 <        ThreadExecutor exec = new ThreadExecutor();
3153 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3154 <        CompletableFuture<Integer> g =
3155 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3156 <                                exec);
3157 <        f.completeExceptionally(new CFException());
3158 <        checkCompletedWithWrappedCFException(f);
3159 <        checkCompletedWithWrappedCFException(g);
3160 <    }
3161 <
3162 <    /**
3163 <     * If a whenCompleteAsync action throws an exception when triggered
3164 <     * by a normal completion, it completes exceptionally
3165 <     */
3166 <    public void testWhenCompleteAsync3e() {
3167 <        ThreadExecutor exec = new ThreadExecutor();
3168 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3169 <        CompletableFuture<Integer> g =
3170 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3171 <                                { throw new CFException(); },
3172 <                                exec);
3173 <        f.complete(three);
3174 <        checkCompletedNormally(f, three);
3175 <        checkCompletedWithWrappedCFException(g);
3176 <    }
3177 <
3178 <    /**
3179 <     * handleAsync action completes normally with function value on
3180 <     * either normal or exceptional completion of source
3181 <     */
3182 <    public void testHandleAsync() {
3183 <        CompletableFuture<Integer> f, g;
3184 <        IntegerHandler r;
3185 <
3186 <        f = new CompletableFuture<>();
3187 <        g = f.handleAsync(r = new IntegerHandler());
3188 <        assertFalse(r.ran);
3189 <        f.completeExceptionally(new CFException());
3190 <        checkCompletedWithWrappedCFException(f);
3191 <        checkCompletedNormally(g, three);
3192 <        assertTrue(r.ran);
3193 <
3194 <        f = new CompletableFuture<>();
3195 <        g = f.handleAsync(r = new IntegerHandler());
3196 <        assertFalse(r.ran);
3197 <        f.completeExceptionally(new CFException());
3198 <        checkCompletedWithWrappedCFException(f);
3199 <        checkCompletedNormally(g, three);
3200 <        assertTrue(r.ran);
3201 <
3202 <        f = new CompletableFuture<>();
3203 <        g = f.handleAsync(r = new IntegerHandler());
3204 <        assertFalse(r.ran);
3205 <        f.complete(one);
3206 <        checkCompletedNormally(f, one);
3207 <        checkCompletedNormally(g, two);
3208 <        assertTrue(r.ran);
3209 <
3210 <        f = new CompletableFuture<>();
3211 <        g = f.handleAsync(r = new IntegerHandler());
3212 <        assertFalse(r.ran);
3213 <        f.complete(one);
3214 <        checkCompletedNormally(f, one);
3215 <        checkCompletedNormally(g, two);
3216 <        assertTrue(r.ran);
3217 <    }
3183 >    public void testWhenComplete_actionFailed() {
3184 >        for (boolean createIncomplete : new boolean[] { true, false })
3185 >        for (ExecutionMode m : ExecutionMode.values())
3186 >        for (Integer v1 : new Integer[] { 1, null })
3187 >    {
3188 >        final AtomicInteger a = new AtomicInteger(0);
3189 >        final CFException ex = new CFException();
3190 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3191 >        if (!createIncomplete) f.complete(v1);
3192 >        final CompletableFuture<Integer> g = m.whenComplete
3193 >            (f,
3194 >             (Integer x, Throwable t) -> {
3195 >                threadAssertSame(x, v1);
3196 >                threadAssertNull(t);
3197 >                a.getAndIncrement();
3198 >                throw ex;
3199 >            });
3200 >        if (createIncomplete) f.complete(v1);
3201 >        checkCompletedNormally(f, v1);
3202 >        checkCompletedWithWrappedCFException(g, ex);
3203 >        assertEquals(1, a.get());
3204 >    }}
3205  
3206      /**
3207 <     * handleAsync action with Executor completes normally with
3208 <     * function value on either normal or exceptional completion of
3209 <     * source
3207 >     * If a whenComplete action throws an exception when triggered by
3208 >     * a source completion that also throws an exception, the source
3209 >     * exception takes precedence.
3210       */
3211 <    public void testHandleAsync2() {
3212 <        CompletableFuture<Integer> f, g;
3213 <        ThreadExecutor exec = new ThreadExecutor();
3214 <        IntegerHandler r;
3215 <
3216 <        f = new CompletableFuture<>();
3217 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3218 <        assertFalse(r.ran);
3219 <        f.completeExceptionally(new CFException());
3220 <        checkCompletedWithWrappedCFException(f);
3221 <        checkCompletedNormally(g, three);
3222 <        assertTrue(r.ran);
3223 <
3224 <        f = new CompletableFuture<>();
3225 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3226 <        assertFalse(r.ran);
3227 <        f.completeExceptionally(new CFException());
3228 <        checkCompletedWithWrappedCFException(f);
3229 <        checkCompletedNormally(g, three);
3230 <        assertTrue(r.ran);
3231 <
3232 <        f = new CompletableFuture<>();
3233 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3234 <        assertFalse(r.ran);
3235 <        f.complete(one);
3249 <        checkCompletedNormally(f, one);
3250 <        checkCompletedNormally(g, two);
3251 <        assertTrue(r.ran);
3252 <
3253 <        f = new CompletableFuture<>();
3254 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3255 <        assertFalse(r.ran);
3256 <        f.complete(one);
3257 <        checkCompletedNormally(f, one);
3258 <        checkCompletedNormally(g, two);
3259 <        assertTrue(r.ran);
3260 <    }
3211 >    public void testWhenComplete_actionFailedSourceFailed() {
3212 >        for (boolean createIncomplete : new boolean[] { true, false })
3213 >        for (ExecutionMode m : ExecutionMode.values())
3214 >        for (Integer v1 : new Integer[] { 1, null })
3215 >    {
3216 >        final AtomicInteger a = new AtomicInteger(0);
3217 >        final CFException ex1 = new CFException();
3218 >        final CFException ex2 = new CFException();
3219 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3220 >
3221 >        if (!createIncomplete) f.completeExceptionally(ex1);
3222 >        final CompletableFuture<Integer> g = m.whenComplete
3223 >            (f,
3224 >             (Integer x, Throwable t) -> {
3225 >                threadAssertSame(t, ex1);
3226 >                threadAssertNull(x);
3227 >                a.getAndIncrement();
3228 >                throw ex2;
3229 >            });
3230 >        if (createIncomplete) f.completeExceptionally(ex1);
3231 >
3232 >        checkCompletedWithWrappedCFException(f, ex1);
3233 >        checkCompletedWithWrappedCFException(g, ex1);
3234 >        assertEquals(1, a.get());
3235 >    }}
3236  
3237   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines