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.23 by jsr166, Tue Apr 9 07:50:55 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 68 | Line 71 | public class CompletableFutureTest exten
71          } catch (Throwable fail) { threadUnexpectedException(fail); }
72          assertTrue(f.isDone());
73          assertFalse(f.isCancelled());
74 +        assertFalse(f.isCompletedExceptionally());
75          assertTrue(f.toString().contains("[Completed normally]"));
76      }
77  
# Line 101 | 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 121 | Line 156 | public class CompletableFutureTest exten
156          } catch (CancellationException success) {
157          } catch (Throwable fail) { threadUnexpectedException(fail); }
158          assertTrue(f.isDone());
159 +        assertTrue(f.isCompletedExceptionally());
160          assertTrue(f.isCancelled());
161          assertTrue(f.toString().contains("[Completed exceptionally]"));
162      }
# Line 152 | Line 188 | public class CompletableFutureTest exten
188          } catch (Throwable fail) { threadUnexpectedException(fail); }
189          assertTrue(f.isDone());
190          assertFalse(f.isCancelled());
191 +        assertTrue(f.isCompletedExceptionally());
192          assertTrue(f.toString().contains("[Completed exceptionally]"));
193      }
194  
# Line 212 | 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 244 | 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  
259
298      /**
299       * toString indicates current completion state
300       */
# Line 284 | 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 359 | Line 454 | public class CompletableFutureTest exten
454          }
455      }
456  
457 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
458 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
459 <    }
457 >    /**
458 >     * Permits the testing of parallel code for the 3 different
459 >     * execution modes without repeating all the testing code.
460 >     */
461 >    enum ExecutionMode {
462 >        DEFAULT {
463 >            public void checkExecutionMode() {
464 >                assertNull(ForkJoinTask.getPool());
465 >            }
466 >            public <T> CompletableFuture<Void> thenRun
467 >                (CompletableFuture<T> f, Runnable a) {
468 >                return f.thenRun(a);
469 >            }
470 >            public <T> CompletableFuture<Void> thenAccept
471 >                (CompletableFuture<T> f, Consumer<? super T> a) {
472 >                return f.thenAccept(a);
473 >            }
474 >            public <T,U> CompletableFuture<U> thenApply
475 >                (CompletableFuture<T> f, Function<? super T,U> a) {
476 >                return f.thenApply(a);
477 >            }
478 >            public <T,U> CompletableFuture<U> thenCompose
479 >                (CompletableFuture<T> f,
480 >                 Function<? super T,? extends CompletionStage<U>> a) {
481 >                return f.thenCompose(a);
482 >            }
483 >            public <T,U> CompletableFuture<U> handle
484 >                (CompletableFuture<T> f,
485 >                 BiFunction<? super T,Throwable,? extends U> a) {
486 >                return f.handle(a);
487 >            }
488 >            public <T> CompletableFuture<T> whenComplete
489 >                (CompletableFuture<T> f,
490 >                 BiConsumer<? super T,? super Throwable> a) {
491 >                return f.whenComplete(a);
492 >            }
493 >            public <T,U> CompletableFuture<Void> runAfterBoth
494 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
495 >                return f.runAfterBoth(g, a);
496 >            }
497 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
498 >                (CompletableFuture<T> f,
499 >                 CompletionStage<? extends U> g,
500 >                 BiConsumer<? super T,? super U> a) {
501 >                return f.thenAcceptBoth(g, a);
502 >            }
503 >            public <T,U,V> CompletableFuture<V> thenCombine
504 >                (CompletableFuture<T> f,
505 >                 CompletionStage<? extends U> g,
506 >                 BiFunction<? super T,? super U,? extends V> a) {
507 >                return f.thenCombine(g, a);
508 >            }
509 >            public <T> CompletableFuture<Void> runAfterEither
510 >                (CompletableFuture<T> f,
511 >                 CompletionStage<?> g,
512 >                 java.lang.Runnable a) {
513 >                return f.runAfterEither(g, a);
514 >            }
515 >            public <T> CompletableFuture<Void> acceptEither
516 >                (CompletableFuture<T> f,
517 >                 CompletionStage<? extends T> g,
518 >                 Consumer<? super T> a) {
519 >                return f.acceptEither(g, a);
520 >            }
521 >            public <T,U> CompletableFuture<U> applyToEither
522 >                (CompletableFuture<T> f,
523 >                 CompletionStage<? extends T> g,
524 >                 Function<? super T,U> a) {
525 >                return f.applyToEither(g, a);
526 >            }
527 >        },
528  
529 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
530 <        boolean ran;
531 <        public Integer apply(Integer x, Throwable t) {
532 <            ran = true;
533 <            return (t == null) ? two : three;
534 <        }
529 >        ASYNC {
530 >            public void checkExecutionMode() {
531 >                assertSame(ForkJoinPool.commonPool(),
532 >                           ForkJoinTask.getPool());
533 >            }
534 >            public <T> CompletableFuture<Void> thenRun
535 >                (CompletableFuture<T> f, Runnable a) {
536 >                return f.thenRunAsync(a);
537 >            }
538 >            public <T> CompletableFuture<Void> thenAccept
539 >                (CompletableFuture<T> f, Consumer<? super T> a) {
540 >                return f.thenAcceptAsync(a);
541 >            }
542 >            public <T,U> CompletableFuture<U> thenApply
543 >                (CompletableFuture<T> f, Function<? super T,U> a) {
544 >                return f.thenApplyAsync(a);
545 >            }
546 >            public <T,U> CompletableFuture<U> thenCompose
547 >                (CompletableFuture<T> f,
548 >                 Function<? super T,? extends CompletionStage<U>> a) {
549 >                return f.thenComposeAsync(a);
550 >            }
551 >            public <T,U> CompletableFuture<U> handle
552 >                (CompletableFuture<T> f,
553 >                 BiFunction<? super T,Throwable,? extends U> a) {
554 >                return f.handleAsync(a);
555 >            }
556 >            public <T> CompletableFuture<T> whenComplete
557 >                (CompletableFuture<T> f,
558 >                 BiConsumer<? super T,? super Throwable> a) {
559 >                return f.whenCompleteAsync(a);
560 >            }
561 >            public <T,U> CompletableFuture<Void> runAfterBoth
562 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
563 >                return f.runAfterBothAsync(g, a);
564 >            }
565 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
566 >                (CompletableFuture<T> f,
567 >                 CompletionStage<? extends U> g,
568 >                 BiConsumer<? super T,? super U> a) {
569 >                return f.thenAcceptBothAsync(g, a);
570 >            }
571 >            public <T,U,V> CompletableFuture<V> thenCombine
572 >                (CompletableFuture<T> f,
573 >                 CompletionStage<? extends U> g,
574 >                 BiFunction<? super T,? super U,? extends V> a) {
575 >                return f.thenCombineAsync(g, a);
576 >            }
577 >            public <T> CompletableFuture<Void> runAfterEither
578 >                (CompletableFuture<T> f,
579 >                 CompletionStage<?> g,
580 >                 java.lang.Runnable a) {
581 >                return f.runAfterEitherAsync(g, a);
582 >            }
583 >            public <T> CompletableFuture<Void> acceptEither
584 >                (CompletableFuture<T> f,
585 >                 CompletionStage<? extends T> g,
586 >                 Consumer<? super T> a) {
587 >                return f.acceptEitherAsync(g, a);
588 >            }
589 >            public <T,U> CompletableFuture<U> applyToEither
590 >                (CompletableFuture<T> f,
591 >                 CompletionStage<? extends T> g,
592 >                 Function<? super T,U> a) {
593 >                return f.applyToEitherAsync(g, a);
594 >            }
595 >        },
596 >
597 >        EXECUTOR {
598 >            public void checkExecutionMode() {
599 >                //TODO
600 >            }
601 >            public <T> CompletableFuture<Void> thenRun
602 >                (CompletableFuture<T> f, Runnable a) {
603 >                return f.thenRunAsync(a, new ThreadExecutor());
604 >            }
605 >            public <T> CompletableFuture<Void> thenAccept
606 >                (CompletableFuture<T> f, Consumer<? super T> a) {
607 >                return f.thenAcceptAsync(a, new ThreadExecutor());
608 >            }
609 >            public <T,U> CompletableFuture<U> thenApply
610 >                (CompletableFuture<T> f, Function<? super T,U> a) {
611 >                return f.thenApplyAsync(a, new ThreadExecutor());
612 >            }
613 >            public <T,U> CompletableFuture<U> thenCompose
614 >                (CompletableFuture<T> f,
615 >                 Function<? super T,? extends CompletionStage<U>> a) {
616 >                return f.thenComposeAsync(a, new ThreadExecutor());
617 >            }
618 >            public <T,U> CompletableFuture<U> handle
619 >                (CompletableFuture<T> f,
620 >                 BiFunction<? super T,Throwable,? extends U> a) {
621 >                return f.handleAsync(a, new ThreadExecutor());
622 >            }
623 >            public <T> CompletableFuture<T> whenComplete
624 >                (CompletableFuture<T> f,
625 >                 BiConsumer<? super T,? super Throwable> a) {
626 >                return f.whenCompleteAsync(a, new ThreadExecutor());
627 >            }
628 >            public <T,U> CompletableFuture<Void> runAfterBoth
629 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
630 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
631 >            }
632 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
633 >                (CompletableFuture<T> f,
634 >                 CompletionStage<? extends U> g,
635 >                 BiConsumer<? super T,? super U> a) {
636 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
637 >            }
638 >            public <T,U,V> CompletableFuture<V> thenCombine
639 >                (CompletableFuture<T> f,
640 >                 CompletionStage<? extends U> g,
641 >                 BiFunction<? super T,? super U,? extends V> a) {
642 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
643 >            }
644 >            public <T> CompletableFuture<Void> runAfterEither
645 >                (CompletableFuture<T> f,
646 >                 CompletionStage<?> g,
647 >                 java.lang.Runnable a) {
648 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
649 >            }
650 >            public <T> CompletableFuture<Void> acceptEither
651 >                (CompletableFuture<T> f,
652 >                 CompletionStage<? extends T> g,
653 >                 Consumer<? super T> a) {
654 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
655 >            }
656 >            public <T,U> CompletableFuture<U> applyToEither
657 >                (CompletableFuture<T> f,
658 >                 CompletionStage<? extends T> g,
659 >                 Function<? super T,U> a) {
660 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
661 >            }
662 >        };
663 >
664 >        public abstract void checkExecutionMode();
665 >        public abstract <T> CompletableFuture<Void> thenRun
666 >            (CompletableFuture<T> f, Runnable a);
667 >        public abstract <T> CompletableFuture<Void> thenAccept
668 >            (CompletableFuture<T> f, Consumer<? super T> a);
669 >        public abstract <T,U> CompletableFuture<U> thenApply
670 >            (CompletableFuture<T> f, Function<? super T,U> a);
671 >        public abstract <T,U> CompletableFuture<U> thenCompose
672 >            (CompletableFuture<T> f,
673 >             Function<? super T,? extends CompletionStage<U>> a);
674 >        public abstract <T,U> CompletableFuture<U> handle
675 >            (CompletableFuture<T> f,
676 >             BiFunction<? super T,Throwable,? extends U> a);
677 >        public abstract <T> CompletableFuture<T> whenComplete
678 >            (CompletableFuture<T> f,
679 >             BiConsumer<? super T,? super Throwable> a);
680 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
681 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
682 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
683 >            (CompletableFuture<T> f,
684 >             CompletionStage<? extends U> g,
685 >             BiConsumer<? super T,? super U> a);
686 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
687 >            (CompletableFuture<T> f,
688 >             CompletionStage<? extends U> g,
689 >             BiFunction<? super T,? super U,? extends V> a);
690 >        public abstract <T> CompletableFuture<Void> runAfterEither
691 >            (CompletableFuture<T> f,
692 >             CompletionStage<?> g,
693 >             java.lang.Runnable a);
694 >        public abstract <T> CompletableFuture<Void> acceptEither
695 >            (CompletableFuture<T> f,
696 >             CompletionStage<? extends T> g,
697 >             Consumer<? super T> a);
698 >        public abstract <T,U> CompletableFuture<U> applyToEither
699 >            (CompletableFuture<T> f,
700 >             CompletionStage<? extends T> g,
701 >             Function<? super T,U> a);
702      }
703  
704 +    /**
705 +     * exceptionally action is not invoked when source completes
706 +     * normally, and source result is propagated
707 +     */
708 +    public void testExceptionally_normalCompletion() {
709 +        for (boolean createIncomplete : new boolean[] { true, false })
710 +        for (Integer v1 : new Integer[] { 1, null })
711 +    {
712 +        final AtomicInteger a = new AtomicInteger(0);
713 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
714 +        if (!createIncomplete) f.complete(v1);
715 +        final CompletableFuture<Integer> g = f.exceptionally
716 +            ((Throwable t) -> {
717 +                // Should not be called
718 +                a.getAndIncrement();
719 +                throw new AssertionError();
720 +            });
721 +        if (createIncomplete) f.complete(v1);
722 +
723 +        checkCompletedNormally(g, v1);
724 +        checkCompletedNormally(f, v1);
725 +        assertEquals(0, a.get());
726 +    }}
727 +
728  
729      /**
730       * exceptionally action completes with function value on source
731 <     * exception;  otherwise with source value
731 >     * exception
732       */
733 <    public void testExceptionally() {
734 <        CompletableFuture<Integer> f = new CompletableFuture<>();
735 <        ExceptionToInteger r = new ExceptionToInteger();
736 <        CompletableFuture<Integer> g = f.exceptionally(r);
737 <        f.completeExceptionally(new CFException());
738 <        checkCompletedNormally(g, three);
739 <
740 <        f = new CompletableFuture<>();
741 <        r = new ExceptionToInteger();
742 <        g = f.exceptionally(r);
743 <        f.complete(one);
744 <        checkCompletedNormally(g, one);
745 <    }
733 >    public void testExceptionally_exceptionalCompletion() {
734 >        for (boolean createIncomplete : new boolean[] { true, false })
735 >        for (Integer v1 : new Integer[] { 1, null })
736 >    {
737 >        final AtomicInteger a = new AtomicInteger(0);
738 >        final CFException ex = new CFException();
739 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
740 >        if (!createIncomplete) f.completeExceptionally(ex);
741 >        final CompletableFuture<Integer> g = f.exceptionally
742 >            ((Throwable t) -> {
743 >                threadAssertSame(t, ex);
744 >                a.getAndIncrement();
745 >                return v1;
746 >            });
747 >        if (createIncomplete) f.completeExceptionally(ex);
748 >
749 >        checkCompletedNormally(g, v1);
750 >        assertEquals(1, a.get());
751 >    }}
752 >
753 >    public void testExceptionally_exceptionalCompletionActionFailed() {
754 >        for (boolean createIncomplete : new boolean[] { true, false })
755 >        for (Integer v1 : new Integer[] { 1, null })
756 >    {
757 >        final AtomicInteger a = new AtomicInteger(0);
758 >        final CFException ex1 = new CFException();
759 >        final CFException ex2 = new CFException();
760 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
761 >        if (!createIncomplete) f.completeExceptionally(ex1);
762 >        final CompletableFuture<Integer> g = f.exceptionally
763 >            ((Throwable t) -> {
764 >                threadAssertSame(t, ex1);
765 >                a.getAndIncrement();
766 >                throw ex2;
767 >            });
768 >        if (createIncomplete) f.completeExceptionally(ex1);
769 >
770 >        checkCompletedWithWrappedCFException(g, ex2);
771 >        assertEquals(1, a.get());
772 >    }}
773 >
774 >    /**
775 >     * handle action completes normally with function value on normal
776 >     * completion of source
777 >     */
778 >    public void testHandle_normalCompletion() {
779 >        for (ExecutionMode m : ExecutionMode.values())
780 >        for (boolean createIncomplete : new boolean[] { true, false })
781 >        for (Integer v1 : new Integer[] { 1, null })
782 >    {
783 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
784 >        final AtomicInteger a = new AtomicInteger(0);
785 >        if (!createIncomplete) f.complete(v1);
786 >        final CompletableFuture<Integer> g = m.handle
787 >            (f,
788 >             (Integer x, Throwable t) -> {
789 >                threadAssertSame(x, v1);
790 >                threadAssertNull(t);
791 >                a.getAndIncrement();
792 >                return inc(v1);
793 >            });
794 >        if (createIncomplete) f.complete(v1);
795 >
796 >        checkCompletedNormally(g, inc(v1));
797 >        checkCompletedNormally(f, v1);
798 >        assertEquals(1, a.get());
799 >    }}
800  
801      /**
802 <     * handle action completes normally with function value on either
803 <     * normal or exceptional completion of source
802 >     * handle action completes normally with function value on
803 >     * exceptional completion of source
804       */
805 <    public void testHandle() {
806 <        CompletableFuture<Integer> f, g;
807 <        IntegerHandler r;
808 <
809 <        f = new CompletableFuture<>();
810 <        f.completeExceptionally(new CFException());
811 <        g = f.handle(r = new IntegerHandler());
812 <        assertTrue(r.ran);
813 <        checkCompletedNormally(g, three);
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 <        g = f.handle(r = new IntegerHandler());
854 <        assertFalse(r.ran);
855 <        f.completeExceptionally(new CFException());
411 <        checkCompletedNormally(g, three);
412 <        assertTrue(r.ran);
413 <
414 <        f = new CompletableFuture<>();
415 <        f.complete(one);
416 <        g = f.handle(r = new IntegerHandler());
417 <        assertTrue(r.ran);
418 <        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 432 | 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 444 | 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 456 | 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 486 | 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 494 | 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  
502        f = new CompletableFuture<>();
503        g = f.thenRun(r = new Noop());
504        f.complete(null);
505        checkCompletedNormally(g, null);
506        assertTrue(r.ran);
507
508        f = new CompletableFuture<>();
509        f.complete(null);
510        g = f.thenRun(r = new Noop());
988          checkCompletedNormally(g, null);
989 <        assertTrue(r.ran);
990 <    }
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);
534 <        assertFalse(r.ran);
535 <    }
997 >    public void testThenRun_exceptionalCompletion() {
998 >        for (ExecutionMode m : ExecutionMode.values())
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >    {
1001 >        final CFException ex = new CFException();
1002 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1003 >        final Noop r = new Noop();
1004 >        if (!createIncomplete) f.completeExceptionally(ex);
1005 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 >        if (createIncomplete) f.completeExceptionally(ex);
1007 >
1008 >        checkCompletedWithWrappedCFException(g, ex);
1009 >        checkCompletedWithWrappedCFException(f, ex);
1010 >        assertEquals(0, r.invocationCount);
1011 >    }}
1012  
1013      /**
1014 <     * thenRun result completes exceptionally if action does
1014 >     * thenRun result completes exceptionally if source cancelled
1015       */
1016 <    public void testThenRun3() {
1017 <        CompletableFuture<Integer> f;
1018 <        CompletableFuture<Void> g;
1019 <        FailingNoop r;
1016 >    public void testThenRun_sourceCancelled() {
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1020 >    {
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        final Noop r = new Noop();
1023 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 >        final CompletableFuture<Void> g = f.thenRun(r);
1025 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1026  
1027 <        f = new CompletableFuture<>();
1028 <        g = f.thenRun(r = new FailingNoop());
1029 <        f.complete(null);
1030 <        checkCompletedWithWrappedCFException(g);
549 <
550 <        f = new CompletableFuture<>();
551 <        f.complete(null);
552 <        g = f.thenRun(r = new FailingNoop());
553 <        checkCompletedWithWrappedCFException(g);
554 <    }
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());
572 <        checkCompletedWithWrappedCancellationException(g);
573 <    }
1046 >        checkCompletedWithWrappedCFException(g);
1047 >        checkCompletedNormally(f, v1);
1048 >    }}
1049  
1050      /**
1051       * thenApply result completes normally after normal completion of source
# Line 622 | 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 646 | 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 660 | Line 1135 | public class CompletableFutureTest exten
1135          checkCompletedWithWrappedCancellationException(g);
1136      }
1137  
663
1138      /**
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);
1185 <        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<>();
1191 <        g = f.runAfterEither(f2, r);
1192 <        checkCompletedNormally(g, null);
1193 <        assertTrue(r.ran);
1194 <    }
2565 >        f.complete(v1);
2566 >        checkCompletedNormally(h, null);
2567 >        assertEquals(1, r.invocationCount);
2568 >        g.complete(v2);
2569  
2570 <    /**
2571 <     * runAfterEither result completes exceptionally after exceptional
2572 <     * completion of either source
2573 <     */
2574 <    public void testRunAfterEither2() {
1201 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1202 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1203 <        Noop r = new Noop();
1204 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1205 <        f.completeExceptionally(new CFException());
1206 <        f2.complete(one);
1207 <        checkCompletedWithWrappedCFException(g);
2570 >        checkCompletedNormally(f, v1);
2571 >        checkCompletedNormally(g, v2);
2572 >        checkCompletedNormally(h, null);
2573 >        assertEquals(1, r.invocationCount);
2574 >    }}
2575  
2576 <        r = new Noop();
2577 <        f = new CompletableFuture<>();
2578 <        f2 = new CompletableFuture<>();
2579 <        f2.completeExceptionally(new CFException());
2580 <        g = f.runAfterEither(f2, r);
2581 <        checkCompletedWithWrappedCFException(g);
2582 <    }
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 <    /**
2587 <     * runAfterEither result completes exceptionally if action does
2588 <     */
2589 <    public void testRunAfterEither3() {
1221 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1223 <        FailingNoop r = new FailingNoop();
1224 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1225 <        f2.complete(two);
1226 <        checkCompletedWithWrappedCFException(g);
1227 <    }
2586 >        g.complete(v2);
2587 >        checkCompletedNormally(h, null);
2588 >        assertEquals(1, r.invocationCount);
2589 >        f.complete(v1);
2590  
2591 <    /**
2592 <     * runAfterEither result completes exceptionally if either source cancelled
2593 <     */
2594 <    public void testRunAfterEither4() {
2595 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2596 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2597 <        Noop r = new Noop();
2598 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2599 <        assertTrue(f.cancel(true));
2600 <        checkCompletedWithWrappedCancellationException(g);
2601 <        f = new CompletableFuture<>();
2602 <        f2 = new CompletableFuture<>();
2603 <        assertTrue(f2.cancel(true));
2604 <        checkCompletedWithWrappedCancellationException(g);
2605 <    }
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 <     * thenCompose result completes normally after normal completion of source
2617 >     * runAfterEither result completes exceptionally after exceptional
2618 >     * completion of either source
2619       */
2620 <    public void testThenCompose() {
2621 <        CompletableFuture<Integer> f, g;
2622 <        CompletableFutureInc r;
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 <        f = new CompletableFuture<>();
2674 <        g = f.thenCompose(r = new CompletableFutureInc());
2675 <        f.complete(one);
2676 <        checkCompletedNormally(g, two);
2677 <        assertTrue(r.ran);
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 <        f = new CompletableFuture<>();
2684 <        f.complete(one);
2685 <        g = f.thenCompose(r = new CompletableFutureInc());
2686 <        checkCompletedNormally(g, two);
2687 <        assertTrue(r.ran);
2688 <    }
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 <    /**
2701 <     * thenCompose result completes exceptionally after exceptional
2702 <     * completion of source
2703 <     */
2704 <    public void testThenCompose2() {
2705 <        CompletableFuture<Integer> f, g;
2706 <        CompletableFutureInc r;
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 <        f = new CompletableFuture<>();
2711 <        g = f.thenCompose(r = new CompletableFutureInc());
2712 <        f.completeExceptionally(new CFException());
1276 <        checkCompletedWithWrappedCFException(g);
2710 >        checkCompletedWithWrappedCFException(f, ex);
2711 >        checkCompletedNormally(g, v1);
2712 >    }}
2713  
2714 <        f = new CompletableFuture<>();
2715 <        f.completeExceptionally(new CFException());
2716 <        g = f.thenCompose(r = new CompletableFutureInc());
2717 <        checkCompletedWithWrappedCFException(g);
2718 <    }
2714 >    /**
2715 >     * runAfterEither result completes exceptionally if action does
2716 >     */
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 <     * thenCompose result completes exceptionally if action does
2752 >     * runAfterEither result completes exceptionally if either source cancelled
2753       */
2754 <    public void testThenCompose3() {
2755 <        CompletableFuture<Integer> f, g;
2756 <        FailingCompletableFutureFunction r;
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 <        f = new CompletableFuture<>();
2765 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2766 <        f.complete(one);
1294 <        checkCompletedWithWrappedCFException(g);
2764 >        assertTrue(f.cancel(mayInterruptIfRunning));
2765 >        checkCompletedWithWrappedCancellationException(h);
2766 >        g.complete(v1);
2767  
2768 <        f = new CompletableFuture<>();
2769 <        f.complete(one);
2770 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2771 <        checkCompletedWithWrappedCFException(g);
2772 <    }
2768 >        checkCancelled(f);
2769 >        assertEquals(0, r.invocationCount);
2770 >        checkCompletedNormally(g, v1);
2771 >        checkCompletedWithWrappedCancellationException(h);
2772 >    }}
2773  
2774 <    /**
2775 <     * thenCompose result completes exceptionally if source cancelled
2776 <     */
2777 <    public void testThenCompose4() {
2778 <        CompletableFuture<Integer> f, g;
2779 <        CompletableFutureInc r;
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 <        f = new CompletableFuture<>();
2808 <        g = f.thenCompose(r = new CompletableFutureInc());
2809 <        assertTrue(f.cancel(true));
2810 <        checkCompletedWithWrappedCancellationException(g);
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 <        f = new CompletableFuture<>();
2818 <        assertTrue(f.cancel(true));
2819 <        g = f.thenCompose(r = new CompletableFutureInc());
2820 <        checkCompletedWithWrappedCancellationException(g);
2821 <    }
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 <    // asyncs
2844 >        checkCancelled(f);
2845 >        checkCompletedNormally(g, v1);
2846 >    }}
2847  
2848      /**
2849 <     * thenRunAsync result completes normally after normal completion of source
2849 >     * thenCompose result completes normally after normal completion of source
2850       */
2851 <    public void testThenRunAsync() {
2852 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2853 <        Noop r = new Noop();
2854 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2855 <        f.complete(null);
2856 <        checkCompletedNormally(g, null);
2857 <
2858 <        // reordered version
2859 <        f = new CompletableFuture<>();
2860 <        f.complete(null);
2861 <        r = new Noop();
2862 <        g = f.thenRunAsync(r);
2863 <        checkCompletedNormally(g, null);
2864 <    }
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 <     * thenRunAsync result completes exceptionally after exceptional
2868 >     * thenCompose result completes exceptionally after exceptional
2869       * completion of source
2870       */
2871 <    public void testThenRunAsync2() {
2872 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2873 <        Noop r = new Noop();
2874 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2875 <        f.completeExceptionally(new CFException());
2876 <        try {
2877 <            g.join();
2878 <            shouldThrow();
2879 <        } catch (Exception ok) {
2880 <        }
2881 <        checkCompletedWithWrappedCFException(g);
2882 <    }
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 <     * thenRunAsync result completes exceptionally if action does
2888 >     * thenCompose result completes exceptionally if action does
2889       */
2890 <    public void testThenRunAsync3() {
2891 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2892 <        FailingNoop r = new FailingNoop();
2893 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2894 <        f.complete(null);
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 >
2902          checkCompletedWithWrappedCFException(g);
2903 <    }
2903 >        checkCompletedNormally(f, v1);
2904 >    }}
2905  
2906      /**
2907 <     * thenRunAsync result completes exceptionally if source cancelled
2907 >     * thenCompose result completes exceptionally if source cancelled
2908       */
2909 <    public void testThenRunAsync4() {
2910 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2911 <        Noop r = new Noop();
2912 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2913 <        assertTrue(f.cancel(true));
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 >
2920          checkCompletedWithWrappedCancellationException(g);
2921 <    }
2921 >        checkCancelled(f);
2922 >    }}
2923 >
2924 >    // asyncs
2925  
2926      /**
2927       * thenApplyAsync result completes normally after normal completion of source
# Line 1429 | 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 1466 | Line 3012 | public class CompletableFutureTest exten
3012          checkCompletedWithWrappedCancellationException(g);
3013      }
3014  
1469    /**
1470     * thenCombineAsync result completes normally after normal
1471     * completion of sources
1472     */
1473    public void testThenCombineAsync() {
1474        CompletableFuture<Integer> f, g, h;
1475
1476        f = new CompletableFuture<>();
1477        g = new CompletableFuture<>();
1478        h = f.thenCombineAsync(g, subtract);
1479        f.complete(3);
1480        checkIncomplete(h);
1481        g.complete(1);
1482        checkCompletedNormally(h, 2);
1483
1484        f = new CompletableFuture<>();
1485        g = new CompletableFuture<>();
1486        h = f.thenCombineAsync(g, subtract);
1487        g.complete(1);
1488        checkIncomplete(h);
1489        f.complete(3);
1490        checkCompletedNormally(h, 2);
1491
1492        f = new CompletableFuture<>();
1493        g = new CompletableFuture<>();
1494        g.complete(1);
1495        f.complete(3);
1496        h = f.thenCombineAsync(g, subtract);
1497        checkCompletedNormally(h, 2);
1498    }
1499
1500    /**
1501     * thenCombineAsync result completes exceptionally after exceptional
1502     * completion of either source
1503     */
1504    public void testThenCombineAsync2() {
1505        CompletableFuture<Integer> f, g, h;
1506
1507        f = new CompletableFuture<>();
1508        g = new CompletableFuture<>();
1509        h = f.thenCombineAsync(g, subtract);
1510        f.completeExceptionally(new CFException());
1511        checkIncomplete(h);
1512        g.complete(1);
1513        checkCompletedWithWrappedCFException(h);
1514
1515        f = new CompletableFuture<>();
1516        g = new CompletableFuture<>();
1517        h = f.thenCombineAsync(g, subtract);
1518        g.completeExceptionally(new CFException());
1519        checkIncomplete(h);
1520        f.complete(3);
1521        checkCompletedWithWrappedCFException(h);
1522
1523        f = new CompletableFuture<>();
1524        g = new CompletableFuture<>();
1525        g.completeExceptionally(new CFException());
1526        f.complete(3);
1527        h = f.thenCombineAsync(g, subtract);
1528        checkCompletedWithWrappedCFException(h);
1529    }
1530
1531    /**
1532     * thenCombineAsync result completes exceptionally if action does
1533     */
1534    public void testThenCombineAsync3() {
1535        CompletableFuture<Integer> f = new CompletableFuture<>();
1536        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1537        FailingBiFunction r = new FailingBiFunction();
1538        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1539        f.complete(one);
1540        checkIncomplete(g);
1541        assertFalse(r.ran);
1542        f2.complete(two);
1543        checkCompletedWithWrappedCFException(g);
1544        assertTrue(r.ran);
1545    }
1546
1547    /**
1548     * thenCombineAsync result completes exceptionally if either source cancelled
1549     */
1550    public void testThenCombineAsync4() {
1551        CompletableFuture<Integer> f, g, h;
1552
1553        f = new CompletableFuture<>();
1554        g = new CompletableFuture<>();
1555        h = f.thenCombineAsync(g, subtract);
1556        assertTrue(f.cancel(true));
1557        checkIncomplete(h);
1558        g.complete(1);
1559        checkCompletedWithWrappedCancellationException(h);
1560
1561        f = new CompletableFuture<>();
1562        g = new CompletableFuture<>();
1563        h = f.thenCombineAsync(g, subtract);
1564        assertTrue(g.cancel(true));
1565        checkIncomplete(h);
1566        f.complete(3);
1567        checkCompletedWithWrappedCancellationException(h);
1568
1569        f = new CompletableFuture<>();
1570        g = new CompletableFuture<>();
1571        g.complete(3);
1572        assertTrue(f.cancel(true));
1573        h = f.thenCombineAsync(g, subtract);
1574        checkCompletedWithWrappedCancellationException(h);
1575
1576        f = new CompletableFuture<>();
1577        g = new CompletableFuture<>();
1578        f.complete(3);
1579        assertTrue(g.cancel(true));
1580        h = f.thenCombineAsync(g, subtract);
1581        checkCompletedWithWrappedCancellationException(h);
1582    }
1583
1584    /**
1585     * thenAcceptBothAsync result completes normally after normal
1586     * completion of sources
1587     */
1588    public void testThenAcceptBothAsync() {
1589        CompletableFuture<Integer> f, g;
1590        CompletableFuture<Void> h;
1591        SubtractAction r;
1592
1593        f = new CompletableFuture<>();
1594        g = new CompletableFuture<>();
1595        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1596        f.complete(3);
1597        checkIncomplete(h);
1598        g.complete(1);
1599        checkCompletedNormally(h, null);
1600        assertEquals(r.value, 2);
1601
1602        f = new CompletableFuture<>();
1603        g = new CompletableFuture<>();
1604        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1605        g.complete(1);
1606        checkIncomplete(h);
1607        f.complete(3);
1608        checkCompletedNormally(h, null);
1609        assertEquals(r.value, 2);
1610
1611        f = new CompletableFuture<>();
1612        g = new CompletableFuture<>();
1613        g.complete(1);
1614        f.complete(3);
1615        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1616        checkCompletedNormally(h, null);
1617        assertEquals(r.value, 2);
1618    }
1619
1620    /**
1621     * thenAcceptBothAsync result completes exceptionally after exceptional
1622     * completion of source
1623     */
1624    public void testThenAcceptBothAsync2() {
1625        CompletableFuture<Integer> f, g;
1626        CompletableFuture<Void> h;
1627        SubtractAction r;
1628
1629        f = new CompletableFuture<>();
1630        g = new CompletableFuture<>();
1631        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1632        f.completeExceptionally(new CFException());
1633        checkIncomplete(h);
1634        g.complete(1);
1635        checkCompletedWithWrappedCFException(h);
1636
1637        f = new CompletableFuture<>();
1638        g = new CompletableFuture<>();
1639        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1640        g.completeExceptionally(new CFException());
1641        checkIncomplete(h);
1642        f.complete(3);
1643        checkCompletedWithWrappedCFException(h);
1644
1645        f = new CompletableFuture<>();
1646        g = new CompletableFuture<>();
1647        f.complete(3);
1648        g.completeExceptionally(new CFException());
1649        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1650        checkCompletedWithWrappedCFException(h);
1651
1652        f = new CompletableFuture<>();
1653        g = new CompletableFuture<>();
1654        f.completeExceptionally(new CFException());
1655        g.complete(3);
1656        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1657        checkCompletedWithWrappedCFException(h);
1658    }
1659
1660    /**
1661     * thenAcceptBothAsync result completes exceptionally if action does
1662     */
1663    public void testThenAcceptBothAsync3() {
1664        CompletableFuture<Integer> f, g;
1665        CompletableFuture<Void> h;
1666        FailingBiConsumer r;
1667
1668        f = new CompletableFuture<>();
1669        g = new CompletableFuture<>();
1670        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1671        f.complete(3);
1672        checkIncomplete(h);
1673        g.complete(1);
1674        checkCompletedWithWrappedCFException(h);
1675
1676        f = new CompletableFuture<>();
1677        g = new CompletableFuture<>();
1678        f.complete(3);
1679        g.complete(1);
1680        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1681        checkCompletedWithWrappedCFException(h);
1682    }
1683
1684    /**
1685     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1686     */
1687    public void testThenAcceptBothAsync4() {
1688        CompletableFuture<Integer> f, g;
1689        CompletableFuture<Void> h;
1690        SubtractAction r;
1691
1692        f = new CompletableFuture<>();
1693        g = new CompletableFuture<>();
1694        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1695        assertTrue(f.cancel(true));
1696        checkIncomplete(h);
1697        g.complete(1);
1698        checkCompletedWithWrappedCancellationException(h);
1699
1700        f = new CompletableFuture<>();
1701        g = new CompletableFuture<>();
1702        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1703        assertTrue(g.cancel(true));
1704        checkIncomplete(h);
1705        f.complete(3);
1706        checkCompletedWithWrappedCancellationException(h);
1707
1708        f = new CompletableFuture<>();
1709        g = new CompletableFuture<>();
1710        f.complete(3);
1711        assertTrue(g.cancel(true));
1712        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1713        checkCompletedWithWrappedCancellationException(h);
1714
1715        f = new CompletableFuture<>();
1716        g = new CompletableFuture<>();
1717        assertTrue(f.cancel(true));
1718        g.complete(3);
1719        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1720        checkCompletedWithWrappedCancellationException(h);
1721    }
1722
1723    /**
1724     * runAfterBothAsync result completes normally after normal
1725     * completion of sources
1726     */
1727    public void testRunAfterBothAsync() {
1728        CompletableFuture<Integer> f = new CompletableFuture<>();
1729        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1730        Noop r = new Noop();
1731        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1732        f.complete(one);
1733        checkIncomplete(g);
1734        f2.complete(two);
1735        checkCompletedNormally(g, null);
1736        assertTrue(r.ran);
1737    }
1738
1739    /**
1740     * runAfterBothAsync result completes exceptionally after exceptional
1741     * completion of source
1742     */
1743    public void testRunAfterBothAsync2() {
1744        CompletableFuture<Integer> f = new CompletableFuture<>();
1745        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1746        Noop r = new Noop();
1747        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1748        f.completeExceptionally(new CFException());
1749        f2.complete(two);
1750        checkCompletedWithWrappedCFException(g);
1751
1752        r = new Noop();
1753        f = new CompletableFuture<>();
1754        f2 = new CompletableFuture<>();
1755        g = f.runAfterBothAsync(f2, r);
1756        f.complete(one);
1757        f2.completeExceptionally(new CFException());
1758        checkCompletedWithWrappedCFException(g);
1759    }
1760
1761    /**
1762     * runAfterBothAsync result completes exceptionally if action does
1763     */
1764    public void testRunAfterBothAsync3() {
1765        CompletableFuture<Integer> f = new CompletableFuture<>();
1766        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1767        FailingNoop r = new FailingNoop();
1768        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1769        f.complete(one);
1770        checkIncomplete(g);
1771        f2.complete(two);
1772        checkCompletedWithWrappedCFException(g);
1773    }
1774
1775    /**
1776     * runAfterBothAsync result completes exceptionally if either source cancelled
1777     */
1778    public void testRunAfterBothAsync4() {
1779        CompletableFuture<Integer> f = new CompletableFuture<>();
1780        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1781        Noop r = new Noop();
1782        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1783        assertTrue(f.cancel(true));
1784        f2.complete(two);
1785        checkCompletedWithWrappedCancellationException(g);
1786
1787        r = new Noop();
1788        f = new CompletableFuture<>();
1789        f2 = new CompletableFuture<>();
1790        g = f.runAfterBothAsync(f2, r);
1791        f.complete(one);
1792        assertTrue(f2.cancel(true));
1793        checkCompletedWithWrappedCancellationException(g);
1794    }
1795
1796    /**
1797     * applyToEitherAsync result completes normally after normal
1798     * completion of sources
1799     */
1800    public void testApplyToEitherAsync() {
1801        CompletableFuture<Integer> f = new CompletableFuture<>();
1802        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1803        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1804        f.complete(one);
1805        checkCompletedNormally(g, two);
1806
1807        f = new CompletableFuture<>();
1808        f.complete(one);
1809        f2 = new CompletableFuture<>();
1810        g = f.applyToEitherAsync(f2, inc);
1811        checkCompletedNormally(g, two);
1812    }
1813
1814    /**
1815     * applyToEitherAsync result completes exceptionally after exceptional
1816     * completion of source
1817     */
1818    public void testApplyToEitherAsync2() {
1819        CompletableFuture<Integer> f = new CompletableFuture<>();
1820        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1821        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1822        f.completeExceptionally(new CFException());
1823        checkCompletedWithWrappedCFException(g);
1824
1825        f = new CompletableFuture<>();
1826        f2 = new CompletableFuture<>();
1827        f2.completeExceptionally(new CFException());
1828        g = f.applyToEitherAsync(f2, inc);
1829        f.complete(one);
1830        checkCompletedWithWrappedCFException(g);
1831    }
1832
1833    /**
1834     * applyToEitherAsync result completes exceptionally if action does
1835     */
1836    public void testApplyToEitherAsync3() {
1837        CompletableFuture<Integer> f = new CompletableFuture<>();
1838        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1839        FailingFunction r = new FailingFunction();
1840        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1841        f.complete(one);
1842        checkCompletedWithWrappedCFException(g);
1843    }
1844
1845    /**
1846     * applyToEitherAsync result completes exceptionally if either source cancelled
1847     */
1848    public void testApplyToEitherAsync4() {
1849        CompletableFuture<Integer> f = new CompletableFuture<>();
1850        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1851        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1852        assertTrue(f.cancel(true));
1853        checkCompletedWithWrappedCancellationException(g);
1854
1855        f = new CompletableFuture<>();
1856        f2 = new CompletableFuture<>();
1857        assertTrue(f2.cancel(true));
1858        g = f.applyToEitherAsync(f2, inc);
1859        checkCompletedWithWrappedCancellationException(g);
1860    }
1861
1862    /**
1863     * acceptEitherAsync result completes normally after normal
1864     * completion of sources
1865     */
1866    public void testAcceptEitherAsync() {
1867        CompletableFuture<Integer> f = new CompletableFuture<>();
1868        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1869        IncAction r = new IncAction();
1870        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1871        f.complete(one);
1872        checkCompletedNormally(g, null);
1873        assertEquals(r.value, 2);
1874
1875        r = new IncAction();
1876        f = new CompletableFuture<>();
1877        f.complete(one);
1878        f2 = new CompletableFuture<>();
1879        g = f.acceptEitherAsync(f2, r);
1880        checkCompletedNormally(g, null);
1881        assertEquals(r.value, 2);
1882    }
1883
1884    /**
1885     * acceptEitherAsync result completes exceptionally after exceptional
1886     * completion of source
1887     */
1888    public void testAcceptEitherAsync2() {
1889        CompletableFuture<Integer> f = new CompletableFuture<>();
1890        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1891        IncAction r = new IncAction();
1892        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1893        f.completeExceptionally(new CFException());
1894        checkCompletedWithWrappedCFException(g);
1895
1896        r = new IncAction();
1897        f = new CompletableFuture<>();
1898        f2 = new CompletableFuture<>();
1899        f2.completeExceptionally(new CFException());
1900        g = f.acceptEitherAsync(f2, r);
1901        f.complete(one);
1902        checkCompletedWithWrappedCFException(g);
1903    }
1904
1905    /**
1906     * acceptEitherAsync result completes exceptionally if action does
1907     */
1908    public void testAcceptEitherAsync3() {
1909        CompletableFuture<Integer> f = new CompletableFuture<>();
1910        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1911        FailingConsumer r = new FailingConsumer();
1912        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1913        f.complete(one);
1914        checkCompletedWithWrappedCFException(g);
1915    }
1916
1917    /**
1918     * acceptEitherAsync result completes exceptionally if either
1919     * source cancelled
1920     */
1921    public void testAcceptEitherAsync4() {
1922        CompletableFuture<Integer> f = new CompletableFuture<>();
1923        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1924        IncAction r = new IncAction();
1925        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1926        assertTrue(f.cancel(true));
1927        checkCompletedWithWrappedCancellationException(g);
1928
1929        r = new IncAction();
1930        f = new CompletableFuture<>();
1931        f2 = new CompletableFuture<>();
1932        assertTrue(f2.cancel(true));
1933        g = f.acceptEitherAsync(f2, r);
1934        checkCompletedWithWrappedCancellationException(g);
1935    }
1936
1937    /**
1938     * runAfterEitherAsync result completes normally after normal
1939     * completion of sources
1940     */
1941    public void testRunAfterEitherAsync() {
1942        CompletableFuture<Integer> f = new CompletableFuture<>();
1943        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1944        Noop r = new Noop();
1945        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1946        f.complete(one);
1947        checkCompletedNormally(g, null);
1948        assertTrue(r.ran);
1949
1950        r = new Noop();
1951        f = new CompletableFuture<>();
1952        f.complete(one);
1953        f2 = new CompletableFuture<>();
1954        g = f.runAfterEitherAsync(f2, r);
1955        checkCompletedNormally(g, null);
1956        assertTrue(r.ran);
1957    }
1958
1959    /**
1960     * runAfterEitherAsync result completes exceptionally after exceptional
1961     * completion of source
1962     */
1963    public void testRunAfterEitherAsync2() {
1964        CompletableFuture<Integer> f = new CompletableFuture<>();
1965        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1966        Noop r = new Noop();
1967        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1968        f.completeExceptionally(new CFException());
1969        checkCompletedWithWrappedCFException(g);
1970
1971        r = new Noop();
1972        f = new CompletableFuture<>();
1973        f2 = new CompletableFuture<>();
1974        f2.completeExceptionally(new CFException());
1975        g = f.runAfterEitherAsync(f2, r);
1976        f.complete(one);
1977        checkCompletedWithWrappedCFException(g);
1978    }
1979
1980    /**
1981     * runAfterEitherAsync result completes exceptionally if action does
1982     */
1983    public void testRunAfterEitherAsync3() {
1984        CompletableFuture<Integer> f = new CompletableFuture<>();
1985        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1986        FailingNoop r = new FailingNoop();
1987        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1988        f.complete(one);
1989        checkCompletedWithWrappedCFException(g);
1990    }
1991
1992    /**
1993     * runAfterEitherAsync result completes exceptionally if either
1994     * source cancelled
1995     */
1996    public void testRunAfterEitherAsync4() {
1997        CompletableFuture<Integer> f = new CompletableFuture<>();
1998        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1999        Noop r = new Noop();
2000        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2001        assertTrue(f.cancel(true));
2002        checkCompletedWithWrappedCancellationException(g);
2003
2004        r = new Noop();
2005        f = new CompletableFuture<>();
2006        f2 = new CompletableFuture<>();
2007        assertTrue(f2.cancel(true));
2008        g = f.runAfterEitherAsync(f2, r);
2009        checkCompletedWithWrappedCancellationException(g);
2010    }
2011
2012    /**
2013     * thenComposeAsync result completes normally after normal
2014     * completion of source
2015     */
2016    public void testThenComposeAsync() {
2017        CompletableFuture<Integer> f, g;
2018        CompletableFutureInc r;
2019
2020        f = new CompletableFuture<>();
2021        g = f.thenComposeAsync(r = new CompletableFutureInc());
2022        f.complete(one);
2023        checkCompletedNormally(g, two);
2024
2025        f = new CompletableFuture<>();
2026        f.complete(one);
2027        g = f.thenComposeAsync(r = new CompletableFutureInc());
2028        checkCompletedNormally(g, two);
2029    }
2030
2031    /**
2032     * thenComposeAsync result completes exceptionally after
2033     * exceptional completion of source
2034     */
2035    public void testThenComposeAsync2() {
2036        CompletableFuture<Integer> f, g;
2037        CompletableFutureInc r;
2038
2039        f = new CompletableFuture<>();
2040        g = f.thenComposeAsync(r = new CompletableFutureInc());
2041        f.completeExceptionally(new CFException());
2042        checkCompletedWithWrappedCFException(g);
2043        assertFalse(r.ran);
2044
2045        f = new CompletableFuture<>();
2046        f.completeExceptionally(new CFException());
2047        g = f.thenComposeAsync(r = new CompletableFutureInc());
2048        checkCompletedWithWrappedCFException(g);
2049        assertFalse(r.ran);
2050    }
2051
2052    /**
2053     * thenComposeAsync result completes exceptionally if action does
2054     */
2055    public void testThenComposeAsync3() {
2056        CompletableFuture<Integer> f, g;
2057        FailingCompletableFutureFunction r;
2058
2059        f = new CompletableFuture<>();
2060        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2061        f.complete(one);
2062        checkCompletedWithWrappedCFException(g);
2063
2064        f = new CompletableFuture<>();
2065        f.complete(one);
2066        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2067        checkCompletedWithWrappedCFException(g);
2068    }
2069
2070    /**
2071     * thenComposeAsync result completes exceptionally if source cancelled
2072     */
2073    public void testThenComposeAsync4() {
2074        CompletableFuture<Integer> f, g;
2075        CompletableFutureInc r;
2076
2077        f = new CompletableFuture<>();
2078        g = f.thenComposeAsync(r = new CompletableFutureInc());
2079        assertTrue(f.cancel(true));
2080        checkCompletedWithWrappedCancellationException(g);
2081
2082        f = new CompletableFuture<>();
2083        assertTrue(f.cancel(true));
2084        g = f.thenComposeAsync(r = new CompletableFutureInc());
2085        checkCompletedWithWrappedCancellationException(g);
2086    }
2087
2088
3015      // async with explicit executors
3016  
3017      /**
2092     * thenRunAsync result completes normally after normal completion of source
2093     */
2094    public void testThenRunAsyncE() {
2095        CompletableFuture<Integer> f = new CompletableFuture<>();
2096        Noop r = new Noop();
2097        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2098        f.complete(null);
2099        checkCompletedNormally(g, null);
2100
2101        // reordered version
2102        f = new CompletableFuture<>();
2103        f.complete(null);
2104        r = new Noop();
2105        g = f.thenRunAsync(r, new ThreadExecutor());
2106        checkCompletedNormally(g, null);
2107    }
2108
2109    /**
2110     * thenRunAsync result completes exceptionally after exceptional
2111     * completion of source
2112     */
2113    public void testThenRunAsync2E() {
2114        CompletableFuture<Integer> f = new CompletableFuture<>();
2115        Noop r = new Noop();
2116        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2117        f.completeExceptionally(new CFException());
2118        try {
2119            g.join();
2120            shouldThrow();
2121        } catch (Exception ok) {
2122        }
2123        checkCompletedWithWrappedCFException(g);
2124    }
2125
2126    /**
2127     * thenRunAsync result completes exceptionally if action does
2128     */
2129    public void testThenRunAsync3E() {
2130        CompletableFuture<Integer> f = new CompletableFuture<>();
2131        FailingNoop r = new FailingNoop();
2132        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2133        f.complete(null);
2134        checkCompletedWithWrappedCFException(g);
2135    }
2136
2137    /**
2138     * thenRunAsync result completes exceptionally if source cancelled
2139     */
2140    public void testThenRunAsync4E() {
2141        CompletableFuture<Integer> f = new CompletableFuture<>();
2142        Noop r = new Noop();
2143        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2144        assertTrue(f.cancel(true));
2145        checkCompletedWithWrappedCancellationException(g);
2146    }
2147
2148    /**
3018       * thenApplyAsync result completes normally after normal completion of source
3019       */
3020      public void testThenApplyAsyncE() {
# Line 2197 | 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 2234 | Line 3103 | public class CompletableFutureTest exten
3103          checkCompletedWithWrappedCancellationException(g);
3104      }
3105  
2237    /**
2238     * thenCombineAsync result completes normally after normal
2239     * completion of sources
2240     */
2241    public void testThenCombineAsyncE() {
2242        CompletableFuture<Integer> f, g, h;
2243        ThreadExecutor e = new ThreadExecutor();
2244        int count = 0;
2245
2246        f = new CompletableFuture<>();
2247        g = new CompletableFuture<>();
2248        h = f.thenCombineAsync(g, subtract, e);
2249        f.complete(3);
2250        checkIncomplete(h);
2251        g.complete(1);
2252        checkCompletedNormally(h, 2);
2253        assertEquals(++count, e.count.get());
2254
2255        f = new CompletableFuture<>();
2256        g = new CompletableFuture<>();
2257        h = f.thenCombineAsync(g, subtract, e);
2258        g.complete(1);
2259        checkIncomplete(h);
2260        f.complete(3);
2261        checkCompletedNormally(h, 2);
2262        assertEquals(++count, e.count.get());
2263
2264        f = new CompletableFuture<>();
2265        g = new CompletableFuture<>();
2266        g.complete(1);
2267        f.complete(3);
2268        h = f.thenCombineAsync(g, subtract, e);
2269        checkCompletedNormally(h, 2);
2270        assertEquals(++count, e.count.get());
2271    }
2272
2273    /**
2274     * thenCombineAsync result completes exceptionally after exceptional
2275     * completion of either source
2276     */
2277    public void testThenCombineAsync2E() {
2278        CompletableFuture<Integer> f, g, h;
2279        ThreadExecutor e = new ThreadExecutor();
2280        int count = 0;
2281
2282        f = new CompletableFuture<>();
2283        g = new CompletableFuture<>();
2284        h = f.thenCombineAsync(g, subtract, e);
2285        f.completeExceptionally(new CFException());
2286        checkIncomplete(h);
2287        g.complete(1);
2288        checkCompletedWithWrappedCFException(h);
2289
2290        f = new CompletableFuture<>();
2291        g = new CompletableFuture<>();
2292        h = f.thenCombineAsync(g, subtract, e);
2293        g.completeExceptionally(new CFException());
2294        checkIncomplete(h);
2295        f.complete(3);
2296        checkCompletedWithWrappedCFException(h);
2297
2298        f = new CompletableFuture<>();
2299        g = new CompletableFuture<>();
2300        g.completeExceptionally(new CFException());
2301        h = f.thenCombineAsync(g, subtract, e);
2302        checkIncomplete(h);
2303        f.complete(3);
2304        checkCompletedWithWrappedCFException(h);
2305
2306        assertEquals(0, e.count.get());
2307    }
2308
2309    /**
2310     * thenCombineAsync result completes exceptionally if action does
2311     */
2312    public void testThenCombineAsync3E() {
2313        CompletableFuture<Integer> f = new CompletableFuture<>();
2314        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2315        FailingBiFunction r = new FailingBiFunction();
2316        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2317        f.complete(one);
2318        checkIncomplete(g);
2319        assertFalse(r.ran);
2320        f2.complete(two);
2321        checkCompletedWithWrappedCFException(g);
2322        assertTrue(r.ran);
2323    }
2324
2325    /**
2326     * thenCombineAsync result completes exceptionally if either source cancelled
2327     */
2328    public void testThenCombineAsync4E() {
2329        CompletableFuture<Integer> f, g, h;
2330        ThreadExecutor e = new ThreadExecutor();
2331
2332        f = new CompletableFuture<>();
2333        g = new CompletableFuture<>();
2334        h = f.thenCombineAsync(g, subtract, e);
2335        assertTrue(f.cancel(true));
2336        checkIncomplete(h);
2337        g.complete(1);
2338        checkCompletedWithWrappedCancellationException(h);
2339
2340        f = new CompletableFuture<>();
2341        g = new CompletableFuture<>();
2342        h = f.thenCombineAsync(g, subtract, e);
2343        assertTrue(g.cancel(true));
2344        checkIncomplete(h);
2345        f.complete(3);
2346        checkCompletedWithWrappedCancellationException(h);
2347
2348        f = new CompletableFuture<>();
2349        g = new CompletableFuture<>();
2350        assertTrue(g.cancel(true));
2351        h = f.thenCombineAsync(g, subtract, e);
2352        checkIncomplete(h);
2353        f.complete(3);
2354        checkCompletedWithWrappedCancellationException(h);
2355
2356        f = new CompletableFuture<>();
2357        g = new CompletableFuture<>();
2358        assertTrue(f.cancel(true));
2359        assertTrue(g.cancel(true));
2360        h = f.thenCombineAsync(g, subtract, e);
2361        checkCompletedWithWrappedCancellationException(h);
2362
2363        assertEquals(0, e.count.get());
2364    }
2365
2366    /**
2367     * thenAcceptBothAsync result completes normally after normal
2368     * completion of sources
2369     */
2370    public void testThenAcceptBothAsyncE() {
2371        CompletableFuture<Integer> f, g;
2372        CompletableFuture<Void> h;
2373        SubtractAction r;
2374        ThreadExecutor e = new ThreadExecutor();
2375
2376        f = new CompletableFuture<>();
2377        g = new CompletableFuture<>();
2378        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2379        f.complete(3);
2380        checkIncomplete(h);
2381        g.complete(1);
2382        checkCompletedNormally(h, null);
2383        assertEquals(r.value, 2);
2384
2385        f = new CompletableFuture<>();
2386        g = new CompletableFuture<>();
2387        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2388        g.complete(1);
2389        checkIncomplete(h);
2390        f.complete(3);
2391        checkCompletedNormally(h, null);
2392        assertEquals(r.value, 2);
2393
2394        f = new CompletableFuture<>();
2395        g = new CompletableFuture<>();
2396        g.complete(1);
2397        f.complete(3);
2398        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2399        checkCompletedNormally(h, null);
2400        assertEquals(r.value, 2);
2401
2402        assertEquals(3, e.count.get());
2403    }
2404
2405    /**
2406     * thenAcceptBothAsync result completes exceptionally after exceptional
2407     * completion of source
2408     */
2409    public void testThenAcceptBothAsync2E() {
2410        CompletableFuture<Integer> f, g;
2411        CompletableFuture<Void> h;
2412        SubtractAction r;
2413        ThreadExecutor e = new ThreadExecutor();
2414
2415        f = new CompletableFuture<>();
2416        g = new CompletableFuture<>();
2417        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2418        f.completeExceptionally(new CFException());
2419        checkIncomplete(h);
2420        g.complete(1);
2421        checkCompletedWithWrappedCFException(h);
2422
2423        f = new CompletableFuture<>();
2424        g = new CompletableFuture<>();
2425        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2426        g.completeExceptionally(new CFException());
2427        checkIncomplete(h);
2428        f.complete(3);
2429        checkCompletedWithWrappedCFException(h);
2430
2431        f = new CompletableFuture<>();
2432        g = new CompletableFuture<>();
2433        f.complete(3);
2434        g.completeExceptionally(new CFException());
2435        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2436        checkCompletedWithWrappedCFException(h);
2437
2438        f = new CompletableFuture<>();
2439        g = new CompletableFuture<>();
2440        f.completeExceptionally(new CFException());
2441        g.complete(3);
2442        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2443        checkCompletedWithWrappedCFException(h);
2444
2445        assertEquals(0, e.count.get());
2446    }
2447
2448    /**
2449     * thenAcceptBothAsync result completes exceptionally if action does
2450     */
2451    public void testThenAcceptBothAsync3E() {
2452        CompletableFuture<Integer> f, g;
2453        CompletableFuture<Void> h;
2454        FailingBiConsumer r;
2455        ThreadExecutor e = new ThreadExecutor();
2456
2457        f = new CompletableFuture<>();
2458        g = new CompletableFuture<>();
2459        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2460        f.complete(3);
2461        checkIncomplete(h);
2462        g.complete(1);
2463        checkCompletedWithWrappedCFException(h);
2464
2465        f = new CompletableFuture<>();
2466        g = new CompletableFuture<>();
2467        f.complete(3);
2468        g.complete(1);
2469        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2470        checkCompletedWithWrappedCFException(h);
2471
2472        assertEquals(2, e.count.get());
2473    }
2474
2475    /**
2476     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2477     */
2478    public void testThenAcceptBothAsync4E() {
2479        CompletableFuture<Integer> f, g;
2480        CompletableFuture<Void> h;
2481        SubtractAction r;
2482        ThreadExecutor e = new ThreadExecutor();
2483
2484        f = new CompletableFuture<>();
2485        g = new CompletableFuture<>();
2486        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2487        assertTrue(f.cancel(true));
2488        checkIncomplete(h);
2489        g.complete(1);
2490        checkCompletedWithWrappedCancellationException(h);
2491
2492        f = new CompletableFuture<>();
2493        g = new CompletableFuture<>();
2494        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2495        assertTrue(g.cancel(true));
2496        checkIncomplete(h);
2497        f.complete(3);
2498        checkCompletedWithWrappedCancellationException(h);
2499
2500        f = new CompletableFuture<>();
2501        g = new CompletableFuture<>();
2502        f.complete(3);
2503        assertTrue(g.cancel(true));
2504        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2505        checkCompletedWithWrappedCancellationException(h);
2506
2507        f = new CompletableFuture<>();
2508        g = new CompletableFuture<>();
2509        assertTrue(f.cancel(true));
2510        g.complete(3);
2511        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2512        checkCompletedWithWrappedCancellationException(h);
2513
2514        assertEquals(0, e.count.get());
2515    }
2516
2517    /**
2518     * runAfterBothAsync result completes normally after normal
2519     * completion of sources
2520     */
2521    public void testRunAfterBothAsyncE() {
2522        CompletableFuture<Integer> f = new CompletableFuture<>();
2523        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2524        Noop r = new Noop();
2525        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2526        f.complete(one);
2527        checkIncomplete(g);
2528        f2.complete(two);
2529        checkCompletedNormally(g, null);
2530        assertTrue(r.ran);
2531    }
2532
2533    /**
2534     * runAfterBothAsync result completes exceptionally after exceptional
2535     * completion of source
2536     */
2537    public void testRunAfterBothAsync2E() {
2538        CompletableFuture<Integer> f = new CompletableFuture<>();
2539        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2540        Noop r = new Noop();
2541        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2542        f.completeExceptionally(new CFException());
2543        f2.complete(two);
2544        checkCompletedWithWrappedCFException(g);
2545
2546        r = new Noop();
2547        f = new CompletableFuture<>();
2548        f2 = new CompletableFuture<>();
2549        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2550        f.complete(one);
2551        f2.completeExceptionally(new CFException());
2552        checkCompletedWithWrappedCFException(g);
2553    }
2554
2555    /**
2556     * runAfterBothAsync result completes exceptionally if action does
2557     */
2558    public void testRunAfterBothAsync3E() {
2559        CompletableFuture<Integer> f = new CompletableFuture<>();
2560        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2561        FailingNoop r = new FailingNoop();
2562        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2563        f.complete(one);
2564        checkIncomplete(g);
2565        f2.complete(two);
2566        checkCompletedWithWrappedCFException(g);
2567    }
2568
2569    /**
2570     * runAfterBothAsync result completes exceptionally if either source cancelled
2571     */
2572    public void testRunAfterBothAsync4E() {
2573        CompletableFuture<Integer> f = new CompletableFuture<>();
2574        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2575        Noop r = new Noop();
2576        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2577        assertTrue(f.cancel(true));
2578        f2.complete(two);
2579        checkCompletedWithWrappedCancellationException(g);
2580
2581        r = new Noop();
2582        f = new CompletableFuture<>();
2583        f2 = new CompletableFuture<>();
2584        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2585        f.complete(one);
2586        assertTrue(f2.cancel(true));
2587        checkCompletedWithWrappedCancellationException(g);
2588    }
2589
2590    /**
2591     * applyToEitherAsync result completes normally after normal
2592     * completion of sources
2593     */
2594    public void testApplyToEitherAsyncE() {
2595        CompletableFuture<Integer> f = new CompletableFuture<>();
2596        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2597        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2598        f.complete(one);
2599        checkCompletedNormally(g, two);
2600
2601        f = new CompletableFuture<>();
2602        f.complete(one);
2603        f2 = new CompletableFuture<>();
2604        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2605        checkCompletedNormally(g, two);
2606    }
2607
2608    /**
2609     * applyToEitherAsync result completes exceptionally after exceptional
2610     * completion of source
2611     */
2612    public void testApplyToEitherAsync2E() {
2613        CompletableFuture<Integer> f = new CompletableFuture<>();
2614        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2615        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2616        f.completeExceptionally(new CFException());
2617        checkCompletedWithWrappedCFException(g);
2618
2619        f = new CompletableFuture<>();
2620        f2 = new CompletableFuture<>();
2621        f2.completeExceptionally(new CFException());
2622        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2623        f.complete(one);
2624        checkCompletedWithWrappedCFException(g);
2625    }
2626
2627    /**
2628     * applyToEitherAsync result completes exceptionally if action does
2629     */
2630    public void testApplyToEitherAsync3E() {
2631        CompletableFuture<Integer> f = new CompletableFuture<>();
2632        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2633        FailingFunction r = new FailingFunction();
2634        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2635        f.complete(one);
2636        checkCompletedWithWrappedCFException(g);
2637    }
2638
2639    /**
2640     * applyToEitherAsync result completes exceptionally if either source cancelled
2641     */
2642    public void testApplyToEitherAsync4E() {
2643        CompletableFuture<Integer> f = new CompletableFuture<>();
2644        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2645        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2646        assertTrue(f.cancel(true));
2647        checkCompletedWithWrappedCancellationException(g);
2648
2649        f = new CompletableFuture<>();
2650        f2 = new CompletableFuture<>();
2651        assertTrue(f2.cancel(true));
2652        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2653        checkCompletedWithWrappedCancellationException(g);
2654    }
2655
2656    /**
2657     * acceptEitherAsync result completes normally after normal
2658     * completion of sources
2659     */
2660    public void testAcceptEitherAsyncE() {
2661        CompletableFuture<Integer> f = new CompletableFuture<>();
2662        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2663        IncAction r = new IncAction();
2664        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2665        f.complete(one);
2666        checkCompletedNormally(g, null);
2667        assertEquals(r.value, 2);
2668
2669        r = new IncAction();
2670        f = new CompletableFuture<>();
2671        f.complete(one);
2672        f2 = new CompletableFuture<>();
2673        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2674        checkCompletedNormally(g, null);
2675        assertEquals(r.value, 2);
2676    }
2677
2678    /**
2679     * acceptEitherAsync result completes exceptionally after exceptional
2680     * completion of source
2681     */
2682    public void testAcceptEitherAsync2E() {
2683        CompletableFuture<Integer> f = new CompletableFuture<>();
2684        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2685        IncAction r = new IncAction();
2686        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2687        f.completeExceptionally(new CFException());
2688        checkCompletedWithWrappedCFException(g);
2689
2690        r = new IncAction();
2691        f = new CompletableFuture<>();
2692        f2 = new CompletableFuture<>();
2693        f2.completeExceptionally(new CFException());
2694        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2695        f.complete(one);
2696        checkCompletedWithWrappedCFException(g);
2697    }
2698
2699    /**
2700     * acceptEitherAsync result completes exceptionally if action does
2701     */
2702    public void testAcceptEitherAsync3E() {
2703        CompletableFuture<Integer> f = new CompletableFuture<>();
2704        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2705        FailingConsumer r = new FailingConsumer();
2706        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2707        f.complete(one);
2708        checkCompletedWithWrappedCFException(g);
2709    }
2710
2711    /**
2712     * acceptEitherAsync result completes exceptionally if either
2713     * source cancelled
2714     */
2715    public void testAcceptEitherAsync4E() {
2716        CompletableFuture<Integer> f = new CompletableFuture<>();
2717        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2718        IncAction r = new IncAction();
2719        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2720        assertTrue(f.cancel(true));
2721        checkCompletedWithWrappedCancellationException(g);
2722
2723        r = new IncAction();
2724        f = new CompletableFuture<>();
2725        f2 = new CompletableFuture<>();
2726        assertTrue(f2.cancel(true));
2727        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2728        checkCompletedWithWrappedCancellationException(g);
2729    }
2730
2731    /**
2732     * runAfterEitherAsync result completes normally after normal
2733     * completion of sources
2734     */
2735    public void testRunAfterEitherAsyncE() {
2736        CompletableFuture<Integer> f = new CompletableFuture<>();
2737        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2738        Noop r = new Noop();
2739        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2740        f.complete(one);
2741        checkCompletedNormally(g, null);
2742        assertTrue(r.ran);
2743
2744        r = new Noop();
2745        f = new CompletableFuture<>();
2746        f.complete(one);
2747        f2 = new CompletableFuture<>();
2748        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2749        checkCompletedNormally(g, null);
2750        assertTrue(r.ran);
2751    }
2752
2753    /**
2754     * runAfterEitherAsync result completes exceptionally after exceptional
2755     * completion of source
2756     */
2757    public void testRunAfterEitherAsync2E() {
2758        CompletableFuture<Integer> f = new CompletableFuture<>();
2759        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2760        Noop r = new Noop();
2761        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2762        f.completeExceptionally(new CFException());
2763        checkCompletedWithWrappedCFException(g);
2764
2765        r = new Noop();
2766        f = new CompletableFuture<>();
2767        f2 = new CompletableFuture<>();
2768        f2.completeExceptionally(new CFException());
2769        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2770        f.complete(one);
2771        checkCompletedWithWrappedCFException(g);
2772    }
2773
2774    /**
2775     * runAfterEitherAsync result completes exceptionally if action does
2776     */
2777    public void testRunAfterEitherAsync3E() {
2778        CompletableFuture<Integer> f = new CompletableFuture<>();
2779        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2780        FailingNoop r = new FailingNoop();
2781        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2782        f.complete(one);
2783        checkCompletedWithWrappedCFException(g);
2784    }
2785
2786    /**
2787     * runAfterEitherAsync result completes exceptionally if either
2788     * source cancelled
2789     */
2790    public void testRunAfterEitherAsync4E() {
2791        CompletableFuture<Integer> f = new CompletableFuture<>();
2792        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2793        Noop r = new Noop();
2794        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2795        assertTrue(f.cancel(true));
2796        checkCompletedWithWrappedCancellationException(g);
2797
2798        r = new Noop();
2799        f = new CompletableFuture<>();
2800        f2 = new CompletableFuture<>();
2801        assertTrue(f2.cancel(true));
2802        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2803        checkCompletedWithWrappedCancellationException(g);
2804    }
2805
2806    /**
2807     * thenComposeAsync result completes normally after normal
2808     * completion of source
2809     */
2810    public void testThenComposeAsyncE() {
2811        CompletableFuture<Integer> f = new CompletableFuture<>();
2812        CompletableFutureInc r = new CompletableFutureInc();
2813        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2814        f.complete(one);
2815        checkCompletedNormally(g, two);
2816    }
2817
2818    /**
2819     * thenComposeAsync result completes exceptionally after
2820     * exceptional completion of source
2821     */
2822    public void testThenComposeAsync2E() {
2823        CompletableFuture<Integer> f = new CompletableFuture<>();
2824        CompletableFutureInc r = new CompletableFutureInc();
2825        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2826        f.completeExceptionally(new CFException());
2827        checkCompletedWithWrappedCFException(g);
2828    }
2829
2830    /**
2831     * thenComposeAsync result completes exceptionally if action does
2832     */
2833    public void testThenComposeAsync3E() {
2834        CompletableFuture<Integer> f = new CompletableFuture<>();
2835        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2836        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2837        f.complete(one);
2838        checkCompletedWithWrappedCFException(g);
2839    }
2840
2841    /**
2842     * thenComposeAsync result completes exceptionally if source cancelled
2843     */
2844    public void testThenComposeAsync4E() {
2845        CompletableFuture<Integer> f = new CompletableFuture<>();
2846        CompletableFutureInc r = new CompletableFutureInc();
2847        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2848        assertTrue(f.cancel(true));
2849        checkCompletedWithWrappedCancellationException(g);
2850    }
2851
3106      // other static methods
3107  
3108      /**
# Line 2856 | Line 3110 | public class CompletableFutureTest exten
3110       * with the value null
3111       */
3112      public void testAllOf_empty() throws Exception {
3113 <        CompletableFuture<?> f = CompletableFuture.allOf();
3113 >        CompletableFuture<Void> f = CompletableFuture.allOf();
3114          checkCompletedNormally(f, null);
3115      }
3116  
3117      /**
3118 <     * allOf returns a future completed when all components complete
3118 >     * allOf returns a future completed normally with the value null
3119 >     * when all components complete normally
3120       */
3121 <    public void testAllOf() throws Exception {
3121 >    public void testAllOf_normal() throws Exception {
3122          for (int k = 1; k < 20; ++k) {
3123              CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3124              for (int i = 0; i < k; ++i)
# Line 2871 | Line 3126 | public class CompletableFutureTest exten
3126              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3127              for (int i = 0; i < k; ++i) {
3128                  checkIncomplete(f);
3129 +                checkIncomplete(CompletableFuture.allOf(fs));
3130                  fs[i].complete(one);
3131              }
3132              checkCompletedNormally(f, null);
3133 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3134          }
3135      }
3136  
# Line 2881 | Line 3138 | public class CompletableFutureTest exten
3138       * anyOf(no component futures) returns an incomplete future
3139       */
3140      public void testAnyOf_empty() throws Exception {
3141 <        CompletableFuture<?> f = CompletableFuture.anyOf();
3141 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3142          checkIncomplete(f);
3143      }
3144  
3145      /**
3146 <     * anyOf returns a future completed when any components complete
3146 >     * anyOf returns a future completed normally with a value when
3147 >     * a component future does
3148       */
3149 <    public void testAnyOf() throws Exception {
3150 <        for (int k = 1; k < 20; ++k) {
3149 >    public void testAnyOf_normal() throws Exception {
3150 >        for (int k = 0; k < 10; ++k) {
3151              CompletableFuture[] fs = new CompletableFuture[k];
3152              for (int i = 0; i < k; ++i)
3153                  fs[i] = new CompletableFuture<>();
# Line 2898 | Line 3156 | public class CompletableFutureTest exten
3156              for (int i = 0; i < k; ++i) {
3157                  fs[i].complete(one);
3158                  checkCompletedNormally(f, one);
3159 +                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3160 +            }
3161 +        }
3162 +    }
3163 +
3164 +    /**
3165 +     * anyOf result completes exceptionally when any component does.
3166 +     */
3167 +    public void testAnyOf_exceptional() throws Exception {
3168 +        for (int k = 0; k < 10; ++k) {
3169 +            CompletableFuture[] fs = new CompletableFuture[k];
3170 +            for (int i = 0; i < k; ++i)
3171 +                fs[i] = new CompletableFuture<>();
3172 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3173 +            checkIncomplete(f);
3174 +            for (int i = 0; i < k; ++i) {
3175 +                fs[i].completeExceptionally(new CFException());
3176 +                checkCompletedWithWrappedCFException(f);
3177 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3178              }
3179          }
3180      }
# Line 2913 | 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);
3289          assertEquals(0, exec.count.get());
3290      }
3291  
3292 +    /**
3293 +     * toCompletableFuture returns this CompletableFuture.
3294 +     */
3295 +    public void testToCompletableFuture() {
3296 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3297 +        assertSame(f, f.toCompletableFuture());
3298 +    }
3299 +
3300 +    /**
3301 +     * whenComplete action executes on normal completion, propagating
3302 +     * source result.
3303 +     */
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 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 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 +     * 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 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