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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines