ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.28 by jsr166, Sun Jul 14 16:34:49 2013 UTC vs.
Revision 1.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;
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 <        f.completeExceptionally(new CFException());
803 <        g = f.handle(r = new IntegerHandler());
804 <        assertTrue(r.ran);
805 <        checkCompletedNormally(g, three);
806 <
807 <        f = new CompletableFuture<>();
808 <        g = f.handle(r = new IntegerHandler());
809 <        assertFalse(r.ran);
810 <        f.completeExceptionally(new CFException());
811 <        checkCompletedNormally(g, three);
812 <        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;
1020 <
1021 <        f = new CompletableFuture<>();
1022 <        g = f.thenRun(r = new FailingNoop());
1023 <        f.complete(null);
1024 <        checkCompletedWithWrappedCFException(g);
1016 >    public void testThenRun_sourceCancelled() {
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1020 >    {
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        final Noop r = new Noop();
1023 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 >        final CompletableFuture<Void> g = f.thenRun(r);
1025 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1026  
1027 <        f = new CompletableFuture<>();
1028 <        f.complete(null);
1029 <        g = f.thenRun(r = new FailingNoop());
1030 <        checkCompletedWithWrappedCFException(g);
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;
1039 <
1040 <        f = new CompletableFuture<>();
1041 <        g = f.thenRun(r = new Noop());
1042 <        assertTrue(f.cancel(true));
1043 <        checkCompletedWithWrappedCancellationException(g);
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 <        assertTrue(f.cancel(true));
1048 <        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 (Exception ok) {
1352        }
1353        checkCompletedWithWrappedCFException(g);
1354    }
1355
1356    /**
1357     * thenRunAsync result completes exceptionally if action does
1358     */
1359    public void testThenRunAsync3() {
1360        CompletableFuture<Integer> f = new CompletableFuture<>();
1361        FailingNoop r = new FailingNoop();
1362        CompletableFuture<Void> g = f.thenRunAsync(r);
1363        f.complete(null);
1364        checkCompletedWithWrappedCFException(g);
1365    }
1366
1367    /**
1368     * thenRunAsync result completes exceptionally if source cancelled
1369     */
1370    public void testThenRunAsync4() {
1371        CompletableFuture<Integer> f = new CompletableFuture<>();
1372        Noop r = new Noop();
1373        CompletableFuture<Void> g = f.thenRunAsync(r);
1374        assertTrue(f.cancel(true));
1375        checkCompletedWithWrappedCancellationException(g);
1376    }
1377
1378    /**
2927       * thenApplyAsync result completes normally after normal completion of source
2928       */
2929      public void testThenApplyAsync() {
# Line 1427 | 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 1464 | Line 3012 | public class CompletableFutureTest exten
3012          checkCompletedWithWrappedCancellationException(g);
3013      }
3014  
1467    /**
1468     * thenCombineAsync result completes normally after normal
1469     * completion of sources
1470     */
1471    public void testThenCombineAsync() {
1472        CompletableFuture<Integer> f, g, h;
1473
1474        f = new CompletableFuture<>();
1475        g = new CompletableFuture<>();
1476        h = f.thenCombineAsync(g, subtract);
1477        f.complete(3);
1478        checkIncomplete(h);
1479        g.complete(1);
1480        checkCompletedNormally(h, 2);
1481
1482        f = new CompletableFuture<>();
1483        g = new CompletableFuture<>();
1484        h = f.thenCombineAsync(g, subtract);
1485        g.complete(1);
1486        checkIncomplete(h);
1487        f.complete(3);
1488        checkCompletedNormally(h, 2);
1489
1490        f = new CompletableFuture<>();
1491        g = new CompletableFuture<>();
1492        g.complete(1);
1493        f.complete(3);
1494        h = f.thenCombineAsync(g, subtract);
1495        checkCompletedNormally(h, 2);
1496    }
1497
1498    /**
1499     * thenCombineAsync result completes exceptionally after exceptional
1500     * completion of either source
1501     */
1502    public void testThenCombineAsync2() {
1503        CompletableFuture<Integer> f, g, h;
1504
1505        f = new CompletableFuture<>();
1506        g = new CompletableFuture<>();
1507        h = f.thenCombineAsync(g, subtract);
1508        f.completeExceptionally(new CFException());
1509        checkIncomplete(h);
1510        g.complete(1);
1511        checkCompletedWithWrappedCFException(h);
1512
1513        f = new CompletableFuture<>();
1514        g = new CompletableFuture<>();
1515        h = f.thenCombineAsync(g, subtract);
1516        g.completeExceptionally(new CFException());
1517        checkIncomplete(h);
1518        f.complete(3);
1519        checkCompletedWithWrappedCFException(h);
1520
1521        f = new CompletableFuture<>();
1522        g = new CompletableFuture<>();
1523        g.completeExceptionally(new CFException());
1524        f.complete(3);
1525        h = f.thenCombineAsync(g, subtract);
1526        checkCompletedWithWrappedCFException(h);
1527    }
1528
1529    /**
1530     * thenCombineAsync result completes exceptionally if action does
1531     */
1532    public void testThenCombineAsync3() {
1533        CompletableFuture<Integer> f = new CompletableFuture<>();
1534        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1535        FailingBiFunction r = new FailingBiFunction();
1536        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1537        f.complete(one);
1538        checkIncomplete(g);
1539        assertFalse(r.ran);
1540        f2.complete(two);
1541        checkCompletedWithWrappedCFException(g);
1542        assertTrue(r.ran);
1543    }
1544
1545    /**
1546     * thenCombineAsync result completes exceptionally if either source cancelled
1547     */
1548    public void testThenCombineAsync4() {
1549        CompletableFuture<Integer> f, g, h;
1550
1551        f = new CompletableFuture<>();
1552        g = new CompletableFuture<>();
1553        h = f.thenCombineAsync(g, subtract);
1554        assertTrue(f.cancel(true));
1555        checkIncomplete(h);
1556        g.complete(1);
1557        checkCompletedWithWrappedCancellationException(h);
1558
1559        f = new CompletableFuture<>();
1560        g = new CompletableFuture<>();
1561        h = f.thenCombineAsync(g, subtract);
1562        assertTrue(g.cancel(true));
1563        checkIncomplete(h);
1564        f.complete(3);
1565        checkCompletedWithWrappedCancellationException(h);
1566
1567        f = new CompletableFuture<>();
1568        g = new CompletableFuture<>();
1569        g.complete(3);
1570        assertTrue(f.cancel(true));
1571        h = f.thenCombineAsync(g, subtract);
1572        checkCompletedWithWrappedCancellationException(h);
1573
1574        f = new CompletableFuture<>();
1575        g = new CompletableFuture<>();
1576        f.complete(3);
1577        assertTrue(g.cancel(true));
1578        h = f.thenCombineAsync(g, subtract);
1579        checkCompletedWithWrappedCancellationException(h);
1580    }
1581
1582    /**
1583     * thenAcceptBothAsync result completes normally after normal
1584     * completion of sources
1585     */
1586    public void testThenAcceptBothAsync() {
1587        CompletableFuture<Integer> f, g;
1588        CompletableFuture<Void> h;
1589        SubtractAction r;
1590
1591        f = new CompletableFuture<>();
1592        g = new CompletableFuture<>();
1593        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1594        f.complete(3);
1595        checkIncomplete(h);
1596        g.complete(1);
1597        checkCompletedNormally(h, null);
1598        assertEquals(r.value, 2);
1599
1600        f = new CompletableFuture<>();
1601        g = new CompletableFuture<>();
1602        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1603        g.complete(1);
1604        checkIncomplete(h);
1605        f.complete(3);
1606        checkCompletedNormally(h, null);
1607        assertEquals(r.value, 2);
1608
1609        f = new CompletableFuture<>();
1610        g = new CompletableFuture<>();
1611        g.complete(1);
1612        f.complete(3);
1613        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1614        checkCompletedNormally(h, null);
1615        assertEquals(r.value, 2);
1616    }
1617
1618    /**
1619     * thenAcceptBothAsync result completes exceptionally after exceptional
1620     * completion of source
1621     */
1622    public void testThenAcceptBothAsync2() {
1623        CompletableFuture<Integer> f, g;
1624        CompletableFuture<Void> h;
1625        SubtractAction r;
1626
1627        f = new CompletableFuture<>();
1628        g = new CompletableFuture<>();
1629        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1630        f.completeExceptionally(new CFException());
1631        checkIncomplete(h);
1632        g.complete(1);
1633        checkCompletedWithWrappedCFException(h);
1634
1635        f = new CompletableFuture<>();
1636        g = new CompletableFuture<>();
1637        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1638        g.completeExceptionally(new CFException());
1639        checkIncomplete(h);
1640        f.complete(3);
1641        checkCompletedWithWrappedCFException(h);
1642
1643        f = new CompletableFuture<>();
1644        g = new CompletableFuture<>();
1645        f.complete(3);
1646        g.completeExceptionally(new CFException());
1647        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1648        checkCompletedWithWrappedCFException(h);
1649
1650        f = new CompletableFuture<>();
1651        g = new CompletableFuture<>();
1652        f.completeExceptionally(new CFException());
1653        g.complete(3);
1654        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1655        checkCompletedWithWrappedCFException(h);
1656    }
1657
1658    /**
1659     * thenAcceptBothAsync result completes exceptionally if action does
1660     */
1661    public void testThenAcceptBothAsync3() {
1662        CompletableFuture<Integer> f, g;
1663        CompletableFuture<Void> h;
1664        FailingBiConsumer r;
1665
1666        f = new CompletableFuture<>();
1667        g = new CompletableFuture<>();
1668        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1669        f.complete(3);
1670        checkIncomplete(h);
1671        g.complete(1);
1672        checkCompletedWithWrappedCFException(h);
1673
1674        f = new CompletableFuture<>();
1675        g = new CompletableFuture<>();
1676        f.complete(3);
1677        g.complete(1);
1678        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1679        checkCompletedWithWrappedCFException(h);
1680    }
1681
1682    /**
1683     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1684     */
1685    public void testThenAcceptBothAsync4() {
1686        CompletableFuture<Integer> f, g;
1687        CompletableFuture<Void> h;
1688        SubtractAction r;
1689
1690        f = new CompletableFuture<>();
1691        g = new CompletableFuture<>();
1692        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1693        assertTrue(f.cancel(true));
1694        checkIncomplete(h);
1695        g.complete(1);
1696        checkCompletedWithWrappedCancellationException(h);
1697
1698        f = new CompletableFuture<>();
1699        g = new CompletableFuture<>();
1700        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1701        assertTrue(g.cancel(true));
1702        checkIncomplete(h);
1703        f.complete(3);
1704        checkCompletedWithWrappedCancellationException(h);
1705
1706        f = new CompletableFuture<>();
1707        g = new CompletableFuture<>();
1708        f.complete(3);
1709        assertTrue(g.cancel(true));
1710        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1711        checkCompletedWithWrappedCancellationException(h);
1712
1713        f = new CompletableFuture<>();
1714        g = new CompletableFuture<>();
1715        assertTrue(f.cancel(true));
1716        g.complete(3);
1717        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1718        checkCompletedWithWrappedCancellationException(h);
1719    }
1720
1721    /**
1722     * runAfterBothAsync result completes normally after normal
1723     * completion of sources
1724     */
1725    public void testRunAfterBothAsync() {
1726        CompletableFuture<Integer> f = new CompletableFuture<>();
1727        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1728        Noop r = new Noop();
1729        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1730        f.complete(one);
1731        checkIncomplete(g);
1732        f2.complete(two);
1733        checkCompletedNormally(g, null);
1734        assertTrue(r.ran);
1735    }
1736
1737    /**
1738     * runAfterBothAsync result completes exceptionally after exceptional
1739     * completion of source
1740     */
1741    public void testRunAfterBothAsync2() {
1742        CompletableFuture<Integer> f = new CompletableFuture<>();
1743        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1744        Noop r = new Noop();
1745        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1746        f.completeExceptionally(new CFException());
1747        f2.complete(two);
1748        checkCompletedWithWrappedCFException(g);
1749
1750        r = new Noop();
1751        f = new CompletableFuture<>();
1752        f2 = new CompletableFuture<>();
1753        g = f.runAfterBothAsync(f2, r);
1754        f.complete(one);
1755        f2.completeExceptionally(new CFException());
1756        checkCompletedWithWrappedCFException(g);
1757    }
1758
1759    /**
1760     * runAfterBothAsync result completes exceptionally if action does
1761     */
1762    public void testRunAfterBothAsync3() {
1763        CompletableFuture<Integer> f = new CompletableFuture<>();
1764        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1765        FailingNoop r = new FailingNoop();
1766        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1767        f.complete(one);
1768        checkIncomplete(g);
1769        f2.complete(two);
1770        checkCompletedWithWrappedCFException(g);
1771    }
1772
1773    /**
1774     * runAfterBothAsync result completes exceptionally if either source cancelled
1775     */
1776    public void testRunAfterBothAsync4() {
1777        CompletableFuture<Integer> f = new CompletableFuture<>();
1778        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1779        Noop r = new Noop();
1780        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1781        assertTrue(f.cancel(true));
1782        f2.complete(two);
1783        checkCompletedWithWrappedCancellationException(g);
1784
1785        r = new Noop();
1786        f = new CompletableFuture<>();
1787        f2 = new CompletableFuture<>();
1788        g = f.runAfterBothAsync(f2, r);
1789        f.complete(one);
1790        assertTrue(f2.cancel(true));
1791        checkCompletedWithWrappedCancellationException(g);
1792    }
1793
1794    /**
1795     * applyToEitherAsync result completes normally after normal
1796     * completion of sources
1797     */
1798    public void testApplyToEitherAsync() {
1799        CompletableFuture<Integer> f = new CompletableFuture<>();
1800        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1801        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1802        f.complete(one);
1803        checkCompletedNormally(g, two);
1804
1805        f = new CompletableFuture<>();
1806        f.complete(one);
1807        f2 = new CompletableFuture<>();
1808        g = f.applyToEitherAsync(f2, inc);
1809        checkCompletedNormally(g, two);
1810    }
1811
1812    /**
1813     * applyToEitherAsync result completes exceptionally after exceptional
1814     * completion of source
1815     */
1816    public void testApplyToEitherAsync2() {
1817        CompletableFuture<Integer> f = new CompletableFuture<>();
1818        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1819        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1820        f.completeExceptionally(new CFException());
1821        checkCompletedWithWrappedCFException(g);
1822
1823        f = new CompletableFuture<>();
1824        f2 = new CompletableFuture<>();
1825        f2.completeExceptionally(new CFException());
1826        g = f.applyToEitherAsync(f2, inc);
1827        f.complete(one);
1828        checkCompletedWithWrappedCFException(g);
1829    }
1830
1831    /**
1832     * applyToEitherAsync result completes exceptionally if action does
1833     */
1834    public void testApplyToEitherAsync3() {
1835        CompletableFuture<Integer> f = new CompletableFuture<>();
1836        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1837        FailingFunction r = new FailingFunction();
1838        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1839        f.complete(one);
1840        checkCompletedWithWrappedCFException(g);
1841    }
1842
1843    /**
1844     * applyToEitherAsync result completes exceptionally if either source cancelled
1845     */
1846    public void testApplyToEitherAsync4() {
1847        CompletableFuture<Integer> f = new CompletableFuture<>();
1848        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1849        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1850        assertTrue(f.cancel(true));
1851        checkCompletedWithWrappedCancellationException(g);
1852
1853        f = new CompletableFuture<>();
1854        f2 = new CompletableFuture<>();
1855        assertTrue(f2.cancel(true));
1856        g = f.applyToEitherAsync(f2, inc);
1857        checkCompletedWithWrappedCancellationException(g);
1858    }
1859
1860    /**
1861     * acceptEitherAsync result completes normally after normal
1862     * completion of sources
1863     */
1864    public void testAcceptEitherAsync() {
1865        CompletableFuture<Integer> f = new CompletableFuture<>();
1866        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1867        IncAction r = new IncAction();
1868        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1869        f.complete(one);
1870        checkCompletedNormally(g, null);
1871        assertEquals(r.value, 2);
1872
1873        r = new IncAction();
1874        f = new CompletableFuture<>();
1875        f.complete(one);
1876        f2 = new CompletableFuture<>();
1877        g = f.acceptEitherAsync(f2, r);
1878        checkCompletedNormally(g, null);
1879        assertEquals(r.value, 2);
1880    }
1881
1882    /**
1883     * acceptEitherAsync result completes exceptionally after exceptional
1884     * completion of source
1885     */
1886    public void testAcceptEitherAsync2() {
1887        CompletableFuture<Integer> f = new CompletableFuture<>();
1888        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1889        IncAction r = new IncAction();
1890        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1891        f.completeExceptionally(new CFException());
1892        checkCompletedWithWrappedCFException(g);
1893
1894        r = new IncAction();
1895        f = new CompletableFuture<>();
1896        f2 = new CompletableFuture<>();
1897        f2.completeExceptionally(new CFException());
1898        g = f.acceptEitherAsync(f2, r);
1899        f.complete(one);
1900        checkCompletedWithWrappedCFException(g);
1901    }
1902
1903    /**
1904     * acceptEitherAsync result completes exceptionally if action does
1905     */
1906    public void testAcceptEitherAsync3() {
1907        CompletableFuture<Integer> f = new CompletableFuture<>();
1908        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1909        FailingConsumer r = new FailingConsumer();
1910        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1911        f.complete(one);
1912        checkCompletedWithWrappedCFException(g);
1913    }
1914
1915    /**
1916     * acceptEitherAsync result completes exceptionally if either
1917     * source cancelled
1918     */
1919    public void testAcceptEitherAsync4() {
1920        CompletableFuture<Integer> f = new CompletableFuture<>();
1921        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1922        IncAction r = new IncAction();
1923        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1924        assertTrue(f.cancel(true));
1925        checkCompletedWithWrappedCancellationException(g);
1926
1927        r = new IncAction();
1928        f = new CompletableFuture<>();
1929        f2 = new CompletableFuture<>();
1930        assertTrue(f2.cancel(true));
1931        g = f.acceptEitherAsync(f2, r);
1932        checkCompletedWithWrappedCancellationException(g);
1933    }
1934
1935    /**
1936     * runAfterEitherAsync result completes normally after normal
1937     * completion of sources
1938     */
1939    public void testRunAfterEitherAsync() {
1940        CompletableFuture<Integer> f = new CompletableFuture<>();
1941        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1942        Noop r = new Noop();
1943        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1944        f.complete(one);
1945        checkCompletedNormally(g, null);
1946        assertTrue(r.ran);
1947
1948        r = new Noop();
1949        f = new CompletableFuture<>();
1950        f.complete(one);
1951        f2 = new CompletableFuture<>();
1952        g = f.runAfterEitherAsync(f2, r);
1953        checkCompletedNormally(g, null);
1954        assertTrue(r.ran);
1955    }
1956
1957    /**
1958     * runAfterEitherAsync result completes exceptionally after exceptional
1959     * completion of source
1960     */
1961    public void testRunAfterEitherAsync2() {
1962        CompletableFuture<Integer> f = new CompletableFuture<>();
1963        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1964        Noop r = new Noop();
1965        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1966        f.completeExceptionally(new CFException());
1967        checkCompletedWithWrappedCFException(g);
1968
1969        r = new Noop();
1970        f = new CompletableFuture<>();
1971        f2 = new CompletableFuture<>();
1972        f2.completeExceptionally(new CFException());
1973        g = f.runAfterEitherAsync(f2, r);
1974        f.complete(one);
1975        checkCompletedWithWrappedCFException(g);
1976    }
1977
1978    /**
1979     * runAfterEitherAsync result completes exceptionally if action does
1980     */
1981    public void testRunAfterEitherAsync3() {
1982        CompletableFuture<Integer> f = new CompletableFuture<>();
1983        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1984        FailingNoop r = new FailingNoop();
1985        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1986        f.complete(one);
1987        checkCompletedWithWrappedCFException(g);
1988    }
1989
1990    /**
1991     * runAfterEitherAsync result completes exceptionally if either
1992     * source cancelled
1993     */
1994    public void testRunAfterEitherAsync4() {
1995        CompletableFuture<Integer> f = new CompletableFuture<>();
1996        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1997        Noop r = new Noop();
1998        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1999        assertTrue(f.cancel(true));
2000        checkCompletedWithWrappedCancellationException(g);
2001
2002        r = new Noop();
2003        f = new CompletableFuture<>();
2004        f2 = new CompletableFuture<>();
2005        assertTrue(f2.cancel(true));
2006        g = f.runAfterEitherAsync(f2, r);
2007        checkCompletedWithWrappedCancellationException(g);
2008    }
2009
2010    /**
2011     * thenComposeAsync result completes normally after normal
2012     * completion of source
2013     */
2014    public void testThenComposeAsync() {
2015        CompletableFuture<Integer> f, g;
2016        CompletableFutureInc r;
2017
2018        f = new CompletableFuture<>();
2019        g = f.thenComposeAsync(r = new CompletableFutureInc());
2020        f.complete(one);
2021        checkCompletedNormally(g, two);
2022
2023        f = new CompletableFuture<>();
2024        f.complete(one);
2025        g = f.thenComposeAsync(r = new CompletableFutureInc());
2026        checkCompletedNormally(g, two);
2027    }
2028
2029    /**
2030     * thenComposeAsync result completes exceptionally after
2031     * exceptional completion of source
2032     */
2033    public void testThenComposeAsync2() {
2034        CompletableFuture<Integer> f, g;
2035        CompletableFutureInc r;
2036
2037        f = new CompletableFuture<>();
2038        g = f.thenComposeAsync(r = new CompletableFutureInc());
2039        f.completeExceptionally(new CFException());
2040        checkCompletedWithWrappedCFException(g);
2041        assertFalse(r.ran);
2042
2043        f = new CompletableFuture<>();
2044        f.completeExceptionally(new CFException());
2045        g = f.thenComposeAsync(r = new CompletableFutureInc());
2046        checkCompletedWithWrappedCFException(g);
2047        assertFalse(r.ran);
2048    }
2049
2050    /**
2051     * thenComposeAsync result completes exceptionally if action does
2052     */
2053    public void testThenComposeAsync3() {
2054        CompletableFuture<Integer> f, g;
2055        FailingCompletableFutureFunction r;
2056
2057        f = new CompletableFuture<>();
2058        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2059        f.complete(one);
2060        checkCompletedWithWrappedCFException(g);
2061
2062        f = new CompletableFuture<>();
2063        f.complete(one);
2064        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2065        checkCompletedWithWrappedCFException(g);
2066    }
2067
2068    /**
2069     * thenComposeAsync result completes exceptionally if source cancelled
2070     */
2071    public void testThenComposeAsync4() {
2072        CompletableFuture<Integer> f, g;
2073        CompletableFutureInc r;
2074
2075        f = new CompletableFuture<>();
2076        g = f.thenComposeAsync(r = new CompletableFutureInc());
2077        assertTrue(f.cancel(true));
2078        checkCompletedWithWrappedCancellationException(g);
2079
2080        f = new CompletableFuture<>();
2081        assertTrue(f.cancel(true));
2082        g = f.thenComposeAsync(r = new CompletableFutureInc());
2083        checkCompletedWithWrappedCancellationException(g);
2084    }
2085
3015      // async with explicit executors
3016  
3017      /**
2089     * thenRunAsync result completes normally after normal completion of source
2090     */
2091    public void testThenRunAsyncE() {
2092        CompletableFuture<Integer> f = new CompletableFuture<>();
2093        Noop r = new Noop();
2094        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2095        f.complete(null);
2096        checkCompletedNormally(g, null);
2097
2098        // reordered version
2099        f = new CompletableFuture<>();
2100        f.complete(null);
2101        r = new Noop();
2102        g = f.thenRunAsync(r, new ThreadExecutor());
2103        checkCompletedNormally(g, null);
2104    }
2105
2106    /**
2107     * thenRunAsync result completes exceptionally after exceptional
2108     * completion of source
2109     */
2110    public void testThenRunAsync2E() {
2111        CompletableFuture<Integer> f = new CompletableFuture<>();
2112        Noop r = new Noop();
2113        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2114        f.completeExceptionally(new CFException());
2115        try {
2116            g.join();
2117            shouldThrow();
2118        } catch (Exception ok) {
2119        }
2120        checkCompletedWithWrappedCFException(g);
2121    }
2122
2123    /**
2124     * thenRunAsync result completes exceptionally if action does
2125     */
2126    public void testThenRunAsync3E() {
2127        CompletableFuture<Integer> f = new CompletableFuture<>();
2128        FailingNoop r = new FailingNoop();
2129        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2130        f.complete(null);
2131        checkCompletedWithWrappedCFException(g);
2132    }
2133
2134    /**
2135     * thenRunAsync result completes exceptionally if source cancelled
2136     */
2137    public void testThenRunAsync4E() {
2138        CompletableFuture<Integer> f = new CompletableFuture<>();
2139        Noop r = new Noop();
2140        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2141        assertTrue(f.cancel(true));
2142        checkCompletedWithWrappedCancellationException(g);
2143    }
2144
2145    /**
3018       * thenApplyAsync result completes normally after normal completion of source
3019       */
3020      public void testThenApplyAsyncE() {
# Line 2194 | 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 2231 | Line 3103 | public class CompletableFutureTest exten
3103          checkCompletedWithWrappedCancellationException(g);
3104      }
3105  
2234    /**
2235     * thenCombineAsync result completes normally after normal
2236     * completion of sources
2237     */
2238    public void testThenCombineAsyncE() {
2239        CompletableFuture<Integer> f, g, h;
2240        ThreadExecutor e = new ThreadExecutor();
2241        int count = 0;
2242
2243        f = new CompletableFuture<>();
2244        g = new CompletableFuture<>();
2245        h = f.thenCombineAsync(g, subtract, e);
2246        f.complete(3);
2247        checkIncomplete(h);
2248        g.complete(1);
2249        checkCompletedNormally(h, 2);
2250        assertEquals(++count, e.count.get());
2251
2252        f = new CompletableFuture<>();
2253        g = new CompletableFuture<>();
2254        h = f.thenCombineAsync(g, subtract, e);
2255        g.complete(1);
2256        checkIncomplete(h);
2257        f.complete(3);
2258        checkCompletedNormally(h, 2);
2259        assertEquals(++count, e.count.get());
2260
2261        f = new CompletableFuture<>();
2262        g = new CompletableFuture<>();
2263        g.complete(1);
2264        f.complete(3);
2265        h = f.thenCombineAsync(g, subtract, e);
2266        checkCompletedNormally(h, 2);
2267        assertEquals(++count, e.count.get());
2268    }
2269
2270    /**
2271     * thenCombineAsync result completes exceptionally after exceptional
2272     * completion of either source
2273     */
2274    public void testThenCombineAsync2E() {
2275        CompletableFuture<Integer> f, g, h;
2276        ThreadExecutor e = new ThreadExecutor();
2277        int count = 0;
2278
2279        f = new CompletableFuture<>();
2280        g = new CompletableFuture<>();
2281        h = f.thenCombineAsync(g, subtract, e);
2282        f.completeExceptionally(new CFException());
2283        checkIncomplete(h);
2284        g.complete(1);
2285        checkCompletedWithWrappedCFException(h);
2286
2287        f = new CompletableFuture<>();
2288        g = new CompletableFuture<>();
2289        h = f.thenCombineAsync(g, subtract, e);
2290        g.completeExceptionally(new CFException());
2291        checkIncomplete(h);
2292        f.complete(3);
2293        checkCompletedWithWrappedCFException(h);
2294
2295        f = new CompletableFuture<>();
2296        g = new CompletableFuture<>();
2297        g.completeExceptionally(new CFException());
2298        h = f.thenCombineAsync(g, subtract, e);
2299        checkIncomplete(h);
2300        f.complete(3);
2301        checkCompletedWithWrappedCFException(h);
2302
2303        assertEquals(0, e.count.get());
2304    }
2305
2306    /**
2307     * thenCombineAsync result completes exceptionally if action does
2308     */
2309    public void testThenCombineAsync3E() {
2310        CompletableFuture<Integer> f = new CompletableFuture<>();
2311        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2312        FailingBiFunction r = new FailingBiFunction();
2313        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2314        f.complete(one);
2315        checkIncomplete(g);
2316        assertFalse(r.ran);
2317        f2.complete(two);
2318        checkCompletedWithWrappedCFException(g);
2319        assertTrue(r.ran);
2320    }
2321
2322    /**
2323     * thenCombineAsync result completes exceptionally if either source cancelled
2324     */
2325    public void testThenCombineAsync4E() {
2326        CompletableFuture<Integer> f, g, h;
2327        ThreadExecutor e = new ThreadExecutor();
2328
2329        f = new CompletableFuture<>();
2330        g = new CompletableFuture<>();
2331        h = f.thenCombineAsync(g, subtract, e);
2332        assertTrue(f.cancel(true));
2333        checkIncomplete(h);
2334        g.complete(1);
2335        checkCompletedWithWrappedCancellationException(h);
2336
2337        f = new CompletableFuture<>();
2338        g = new CompletableFuture<>();
2339        h = f.thenCombineAsync(g, subtract, e);
2340        assertTrue(g.cancel(true));
2341        checkIncomplete(h);
2342        f.complete(3);
2343        checkCompletedWithWrappedCancellationException(h);
2344
2345        f = new CompletableFuture<>();
2346        g = new CompletableFuture<>();
2347        assertTrue(g.cancel(true));
2348        h = f.thenCombineAsync(g, subtract, e);
2349        checkIncomplete(h);
2350        f.complete(3);
2351        checkCompletedWithWrappedCancellationException(h);
2352
2353        f = new CompletableFuture<>();
2354        g = new CompletableFuture<>();
2355        assertTrue(f.cancel(true));
2356        assertTrue(g.cancel(true));
2357        h = f.thenCombineAsync(g, subtract, e);
2358        checkCompletedWithWrappedCancellationException(h);
2359
2360        assertEquals(0, e.count.get());
2361    }
2362
2363    /**
2364     * thenAcceptBothAsync result completes normally after normal
2365     * completion of sources
2366     */
2367    public void testThenAcceptBothAsyncE() {
2368        CompletableFuture<Integer> f, g;
2369        CompletableFuture<Void> h;
2370        SubtractAction r;
2371        ThreadExecutor e = new ThreadExecutor();
2372
2373        f = new CompletableFuture<>();
2374        g = new CompletableFuture<>();
2375        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2376        f.complete(3);
2377        checkIncomplete(h);
2378        g.complete(1);
2379        checkCompletedNormally(h, null);
2380        assertEquals(r.value, 2);
2381
2382        f = new CompletableFuture<>();
2383        g = new CompletableFuture<>();
2384        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2385        g.complete(1);
2386        checkIncomplete(h);
2387        f.complete(3);
2388        checkCompletedNormally(h, null);
2389        assertEquals(r.value, 2);
2390
2391        f = new CompletableFuture<>();
2392        g = new CompletableFuture<>();
2393        g.complete(1);
2394        f.complete(3);
2395        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2396        checkCompletedNormally(h, null);
2397        assertEquals(r.value, 2);
2398
2399        assertEquals(3, e.count.get());
2400    }
2401
2402    /**
2403     * thenAcceptBothAsync result completes exceptionally after exceptional
2404     * completion of source
2405     */
2406    public void testThenAcceptBothAsync2E() {
2407        CompletableFuture<Integer> f, g;
2408        CompletableFuture<Void> h;
2409        SubtractAction r;
2410        ThreadExecutor e = new ThreadExecutor();
2411
2412        f = new CompletableFuture<>();
2413        g = new CompletableFuture<>();
2414        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2415        f.completeExceptionally(new CFException());
2416        checkIncomplete(h);
2417        g.complete(1);
2418        checkCompletedWithWrappedCFException(h);
2419
2420        f = new CompletableFuture<>();
2421        g = new CompletableFuture<>();
2422        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2423        g.completeExceptionally(new CFException());
2424        checkIncomplete(h);
2425        f.complete(3);
2426        checkCompletedWithWrappedCFException(h);
2427
2428        f = new CompletableFuture<>();
2429        g = new CompletableFuture<>();
2430        f.complete(3);
2431        g.completeExceptionally(new CFException());
2432        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2433        checkCompletedWithWrappedCFException(h);
2434
2435        f = new CompletableFuture<>();
2436        g = new CompletableFuture<>();
2437        f.completeExceptionally(new CFException());
2438        g.complete(3);
2439        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2440        checkCompletedWithWrappedCFException(h);
2441
2442        assertEquals(0, e.count.get());
2443    }
2444
2445    /**
2446     * thenAcceptBothAsync result completes exceptionally if action does
2447     */
2448    public void testThenAcceptBothAsync3E() {
2449        CompletableFuture<Integer> f, g;
2450        CompletableFuture<Void> h;
2451        FailingBiConsumer r;
2452        ThreadExecutor e = new ThreadExecutor();
2453
2454        f = new CompletableFuture<>();
2455        g = new CompletableFuture<>();
2456        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2457        f.complete(3);
2458        checkIncomplete(h);
2459        g.complete(1);
2460        checkCompletedWithWrappedCFException(h);
2461
2462        f = new CompletableFuture<>();
2463        g = new CompletableFuture<>();
2464        f.complete(3);
2465        g.complete(1);
2466        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2467        checkCompletedWithWrappedCFException(h);
2468
2469        assertEquals(2, e.count.get());
2470    }
2471
2472    /**
2473     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2474     */
2475    public void testThenAcceptBothAsync4E() {
2476        CompletableFuture<Integer> f, g;
2477        CompletableFuture<Void> h;
2478        SubtractAction r;
2479        ThreadExecutor e = new ThreadExecutor();
2480
2481        f = new CompletableFuture<>();
2482        g = new CompletableFuture<>();
2483        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2484        assertTrue(f.cancel(true));
2485        checkIncomplete(h);
2486        g.complete(1);
2487        checkCompletedWithWrappedCancellationException(h);
2488
2489        f = new CompletableFuture<>();
2490        g = new CompletableFuture<>();
2491        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2492        assertTrue(g.cancel(true));
2493        checkIncomplete(h);
2494        f.complete(3);
2495        checkCompletedWithWrappedCancellationException(h);
2496
2497        f = new CompletableFuture<>();
2498        g = new CompletableFuture<>();
2499        f.complete(3);
2500        assertTrue(g.cancel(true));
2501        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2502        checkCompletedWithWrappedCancellationException(h);
2503
2504        f = new CompletableFuture<>();
2505        g = new CompletableFuture<>();
2506        assertTrue(f.cancel(true));
2507        g.complete(3);
2508        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2509        checkCompletedWithWrappedCancellationException(h);
2510
2511        assertEquals(0, e.count.get());
2512    }
2513
2514    /**
2515     * runAfterBothAsync result completes normally after normal
2516     * completion of sources
2517     */
2518    public void testRunAfterBothAsyncE() {
2519        CompletableFuture<Integer> f = new CompletableFuture<>();
2520        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2521        Noop r = new Noop();
2522        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2523        f.complete(one);
2524        checkIncomplete(g);
2525        f2.complete(two);
2526        checkCompletedNormally(g, null);
2527        assertTrue(r.ran);
2528    }
2529
2530    /**
2531     * runAfterBothAsync result completes exceptionally after exceptional
2532     * completion of source
2533     */
2534    public void testRunAfterBothAsync2E() {
2535        CompletableFuture<Integer> f = new CompletableFuture<>();
2536        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2537        Noop r = new Noop();
2538        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2539        f.completeExceptionally(new CFException());
2540        f2.complete(two);
2541        checkCompletedWithWrappedCFException(g);
2542
2543        r = new Noop();
2544        f = new CompletableFuture<>();
2545        f2 = new CompletableFuture<>();
2546        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2547        f.complete(one);
2548        f2.completeExceptionally(new CFException());
2549        checkCompletedWithWrappedCFException(g);
2550    }
2551
2552    /**
2553     * runAfterBothAsync result completes exceptionally if action does
2554     */
2555    public void testRunAfterBothAsync3E() {
2556        CompletableFuture<Integer> f = new CompletableFuture<>();
2557        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2558        FailingNoop r = new FailingNoop();
2559        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2560        f.complete(one);
2561        checkIncomplete(g);
2562        f2.complete(two);
2563        checkCompletedWithWrappedCFException(g);
2564    }
2565
2566    /**
2567     * runAfterBothAsync result completes exceptionally if either source cancelled
2568     */
2569    public void testRunAfterBothAsync4E() {
2570        CompletableFuture<Integer> f = new CompletableFuture<>();
2571        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2572        Noop r = new Noop();
2573        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2574        assertTrue(f.cancel(true));
2575        f2.complete(two);
2576        checkCompletedWithWrappedCancellationException(g);
2577
2578        r = new Noop();
2579        f = new CompletableFuture<>();
2580        f2 = new CompletableFuture<>();
2581        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2582        f.complete(one);
2583        assertTrue(f2.cancel(true));
2584        checkCompletedWithWrappedCancellationException(g);
2585    }
2586
2587    /**
2588     * applyToEitherAsync result completes normally after normal
2589     * completion of sources
2590     */
2591    public void testApplyToEitherAsyncE() {
2592        CompletableFuture<Integer> f = new CompletableFuture<>();
2593        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2594        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2595        f.complete(one);
2596        checkCompletedNormally(g, two);
2597
2598        f = new CompletableFuture<>();
2599        f.complete(one);
2600        f2 = new CompletableFuture<>();
2601        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2602        checkCompletedNormally(g, two);
2603    }
2604
2605    /**
2606     * applyToEitherAsync result completes exceptionally after exceptional
2607     * completion of source
2608     */
2609    public void testApplyToEitherAsync2E() {
2610        CompletableFuture<Integer> f = new CompletableFuture<>();
2611        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2612        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2613        f.completeExceptionally(new CFException());
2614        checkCompletedWithWrappedCFException(g);
2615
2616        f = new CompletableFuture<>();
2617        f2 = new CompletableFuture<>();
2618        f2.completeExceptionally(new CFException());
2619        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2620        f.complete(one);
2621        checkCompletedWithWrappedCFException(g);
2622    }
2623
2624    /**
2625     * applyToEitherAsync result completes exceptionally if action does
2626     */
2627    public void testApplyToEitherAsync3E() {
2628        CompletableFuture<Integer> f = new CompletableFuture<>();
2629        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2630        FailingFunction r = new FailingFunction();
2631        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2632        f.complete(one);
2633        checkCompletedWithWrappedCFException(g);
2634    }
2635
2636    /**
2637     * applyToEitherAsync result completes exceptionally if either source cancelled
2638     */
2639    public void testApplyToEitherAsync4E() {
2640        CompletableFuture<Integer> f = new CompletableFuture<>();
2641        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2642        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2643        assertTrue(f.cancel(true));
2644        checkCompletedWithWrappedCancellationException(g);
2645
2646        f = new CompletableFuture<>();
2647        f2 = new CompletableFuture<>();
2648        assertTrue(f2.cancel(true));
2649        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2650        checkCompletedWithWrappedCancellationException(g);
2651    }
2652
2653    /**
2654     * acceptEitherAsync result completes normally after normal
2655     * completion of sources
2656     */
2657    public void testAcceptEitherAsyncE() {
2658        CompletableFuture<Integer> f = new CompletableFuture<>();
2659        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2660        IncAction r = new IncAction();
2661        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2662        f.complete(one);
2663        checkCompletedNormally(g, null);
2664        assertEquals(r.value, 2);
2665
2666        r = new IncAction();
2667        f = new CompletableFuture<>();
2668        f.complete(one);
2669        f2 = new CompletableFuture<>();
2670        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2671        checkCompletedNormally(g, null);
2672        assertEquals(r.value, 2);
2673    }
2674
2675    /**
2676     * acceptEitherAsync result completes exceptionally after exceptional
2677     * completion of source
2678     */
2679    public void testAcceptEitherAsync2E() {
2680        CompletableFuture<Integer> f = new CompletableFuture<>();
2681        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2682        IncAction r = new IncAction();
2683        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2684        f.completeExceptionally(new CFException());
2685        checkCompletedWithWrappedCFException(g);
2686
2687        r = new IncAction();
2688        f = new CompletableFuture<>();
2689        f2 = new CompletableFuture<>();
2690        f2.completeExceptionally(new CFException());
2691        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2692        f.complete(one);
2693        checkCompletedWithWrappedCFException(g);
2694    }
2695
2696    /**
2697     * acceptEitherAsync result completes exceptionally if action does
2698     */
2699    public void testAcceptEitherAsync3E() {
2700        CompletableFuture<Integer> f = new CompletableFuture<>();
2701        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2702        FailingConsumer r = new FailingConsumer();
2703        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2704        f.complete(one);
2705        checkCompletedWithWrappedCFException(g);
2706    }
2707
2708    /**
2709     * acceptEitherAsync result completes exceptionally if either
2710     * source cancelled
2711     */
2712    public void testAcceptEitherAsync4E() {
2713        CompletableFuture<Integer> f = new CompletableFuture<>();
2714        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2715        IncAction r = new IncAction();
2716        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2717        assertTrue(f.cancel(true));
2718        checkCompletedWithWrappedCancellationException(g);
2719
2720        r = new IncAction();
2721        f = new CompletableFuture<>();
2722        f2 = new CompletableFuture<>();
2723        assertTrue(f2.cancel(true));
2724        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2725        checkCompletedWithWrappedCancellationException(g);
2726    }
2727
2728    /**
2729     * runAfterEitherAsync result completes normally after normal
2730     * completion of sources
2731     */
2732    public void testRunAfterEitherAsyncE() {
2733        CompletableFuture<Integer> f = new CompletableFuture<>();
2734        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2735        Noop r = new Noop();
2736        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2737        f.complete(one);
2738        checkCompletedNormally(g, null);
2739        assertTrue(r.ran);
2740
2741        r = new Noop();
2742        f = new CompletableFuture<>();
2743        f.complete(one);
2744        f2 = new CompletableFuture<>();
2745        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2746        checkCompletedNormally(g, null);
2747        assertTrue(r.ran);
2748    }
2749
2750    /**
2751     * runAfterEitherAsync result completes exceptionally after exceptional
2752     * completion of source
2753     */
2754    public void testRunAfterEitherAsync2E() {
2755        CompletableFuture<Integer> f = new CompletableFuture<>();
2756        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2757        Noop r = new Noop();
2758        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2759        f.completeExceptionally(new CFException());
2760        checkCompletedWithWrappedCFException(g);
2761
2762        r = new Noop();
2763        f = new CompletableFuture<>();
2764        f2 = new CompletableFuture<>();
2765        f2.completeExceptionally(new CFException());
2766        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2767        f.complete(one);
2768        checkCompletedWithWrappedCFException(g);
2769    }
2770
2771    /**
2772     * runAfterEitherAsync result completes exceptionally if action does
2773     */
2774    public void testRunAfterEitherAsync3E() {
2775        CompletableFuture<Integer> f = new CompletableFuture<>();
2776        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2777        FailingNoop r = new FailingNoop();
2778        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2779        f.complete(one);
2780        checkCompletedWithWrappedCFException(g);
2781    }
2782
2783    /**
2784     * runAfterEitherAsync result completes exceptionally if either
2785     * source cancelled
2786     */
2787    public void testRunAfterEitherAsync4E() {
2788        CompletableFuture<Integer> f = new CompletableFuture<>();
2789        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2790        Noop r = new Noop();
2791        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2792        assertTrue(f.cancel(true));
2793        checkCompletedWithWrappedCancellationException(g);
2794
2795        r = new Noop();
2796        f = new CompletableFuture<>();
2797        f2 = new CompletableFuture<>();
2798        assertTrue(f2.cancel(true));
2799        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2800        checkCompletedWithWrappedCancellationException(g);
2801    }
2802
2803    /**
2804     * thenComposeAsync result completes normally after normal
2805     * completion of source
2806     */
2807    public void testThenComposeAsyncE() {
2808        CompletableFuture<Integer> f = new CompletableFuture<>();
2809        CompletableFutureInc r = new CompletableFutureInc();
2810        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2811        f.complete(one);
2812        checkCompletedNormally(g, two);
2813    }
2814
2815    /**
2816     * thenComposeAsync result completes exceptionally after
2817     * exceptional completion of source
2818     */
2819    public void testThenComposeAsync2E() {
2820        CompletableFuture<Integer> f = new CompletableFuture<>();
2821        CompletableFutureInc r = new CompletableFutureInc();
2822        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2823        f.completeExceptionally(new CFException());
2824        checkCompletedWithWrappedCFException(g);
2825    }
2826
2827    /**
2828     * thenComposeAsync result completes exceptionally if action does
2829     */
2830    public void testThenComposeAsync3E() {
2831        CompletableFuture<Integer> f = new CompletableFuture<>();
2832        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2833        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2834        f.complete(one);
2835        checkCompletedWithWrappedCFException(g);
2836    }
2837
2838    /**
2839     * thenComposeAsync result completes exceptionally if source cancelled
2840     */
2841    public void testThenComposeAsync4E() {
2842        CompletableFuture<Integer> f = new CompletableFuture<>();
2843        CompletableFutureInc r = new CompletableFutureInc();
2844        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2845        assertTrue(f.cancel(true));
2846        checkCompletedWithWrappedCancellationException(g);
2847    }
2848
3106      // other static methods
3107  
3108      /**
# Line 2933 | 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 3042 | 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);
3097 <        checkCompletedNormally(g, three);
3098 <        assertEquals(a.get(), 1);
3099 <    }
3100 <
3101 <    /**
3102 <     * whenCompleteAsync action executes on exceptional completion, propagating
3103 <     * source result.
3104 <     */
3105 <    public void testWhenCompleteAsync2() {
3106 <        final AtomicInteger a = new AtomicInteger();
3107 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3108 <        CompletableFuture<Integer> g =
3109 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3110 <        f.completeExceptionally(new CFException());
3111 <        checkCompletedWithWrappedCFException(f);
3112 <        checkCompletedWithWrappedCFException(g);
3113 <    }
3114 <
3115 <    /**
3116 <     * If a whenCompleteAsync action throws an exception when
3117 <     * triggered by a normal completion, it completes exceptionally
3118 <     */
3119 <    public void testWhenCompleteAsync3() {
3120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3121 <        CompletableFuture<Integer> g =
3122 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3123 <                           { throw new CFException(); } );
3124 <        f.complete(three);
3125 <        checkCompletedNormally(f, three);
3126 <        checkCompletedWithWrappedCFException(g);
3127 <    }
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 <     */
3133 <    public void testWhenCompleteAsync1e() {
3134 <        final AtomicInteger a = new AtomicInteger();
3135 <        ThreadExecutor exec = new ThreadExecutor();
3136 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3137 <        CompletableFuture<Integer> g =
3138 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3139 <                                exec);
3140 <        f.complete(three);
3141 <        checkCompletedNormally(f, three);
3142 <        checkCompletedNormally(g, three);
3143 <        assertEquals(a.get(), 1);
3144 <    }
3145 <
3146 <    /**
3147 <     * whenCompleteAsync action executes on exceptional completion, propagating
3148 <     * source result.
3149 <     */
3150 <    public void testWhenCompleteAsync2e() {
3151 <        final AtomicInteger a = new AtomicInteger();
3152 <        ThreadExecutor exec = new ThreadExecutor();
3153 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3154 <        CompletableFuture<Integer> g =
3155 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3156 <                                exec);
3157 <        f.completeExceptionally(new CFException());
3158 <        checkCompletedWithWrappedCFException(f);
3159 <        checkCompletedWithWrappedCFException(g);
3160 <    }
3161 <
3162 <    /**
3163 <     * If a whenCompleteAsync action throws an exception when triggered
3164 <     * by a normal completion, it completes exceptionally
3165 <     */
3166 <    public void testWhenCompleteAsync3e() {
3167 <        ThreadExecutor exec = new ThreadExecutor();
3168 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3169 <        CompletableFuture<Integer> g =
3170 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3171 <                                { throw new CFException(); },
3172 <                                exec);
3173 <        f.complete(three);
3174 <        checkCompletedNormally(f, three);
3175 <        checkCompletedWithWrappedCFException(g);
3176 <    }
3177 <
3178 <    /**
3179 <     * handleAsync action completes normally with function value on
3180 <     * either normal or exceptional completion of source
3181 <     */
3182 <    public void testHandleAsync() {
3183 <        CompletableFuture<Integer> f, g;
3184 <        IntegerHandler r;
3185 <
3186 <        f = new CompletableFuture<>();
3187 <        g = f.handleAsync(r = new IntegerHandler());
3188 <        assertFalse(r.ran);
3189 <        f.completeExceptionally(new CFException());
3190 <        checkCompletedWithWrappedCFException(f);
3191 <        checkCompletedNormally(g, three);
3192 <        assertTrue(r.ran);
3193 <
3194 <        f = new CompletableFuture<>();
3195 <        g = f.handleAsync(r = new IntegerHandler());
3196 <        assertFalse(r.ran);
3197 <        f.completeExceptionally(new CFException());
3198 <        checkCompletedWithWrappedCFException(f);
3199 <        checkCompletedNormally(g, three);
3200 <        assertTrue(r.ran);
3201 <
3202 <        f = new CompletableFuture<>();
3203 <        g = f.handleAsync(r = new IntegerHandler());
3204 <        assertFalse(r.ran);
3205 <        f.complete(one);
3206 <        checkCompletedNormally(f, one);
3207 <        checkCompletedNormally(g, two);
3208 <        assertTrue(r.ran);
3209 <
3210 <        f = new CompletableFuture<>();
3211 <        g = f.handleAsync(r = new IntegerHandler());
3212 <        assertFalse(r.ran);
3213 <        f.complete(one);
3214 <        checkCompletedNormally(f, one);
3215 <        checkCompletedNormally(g, two);
3216 <        assertTrue(r.ran);
3217 <    }
3218 <
3219 <    /**
3220 <     * handleAsync action with Executor completes normally with
3221 <     * function value on either normal or exceptional completion of
3222 <     * 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);
3249 <        checkCompletedNormally(f, one);
3250 <        checkCompletedNormally(g, two);
3251 <        assertTrue(r.ran);
3252 <
3253 <        f = new CompletableFuture<>();
3254 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3255 <        assertFalse(r.ran);
3256 <        f.complete(one);
3257 <        checkCompletedNormally(f, one);
3258 <        checkCompletedNormally(g, two);
3259 <        assertTrue(r.ran);
3260 <    }
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