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.63 by jsr166, Fri Jun 6 16:54:16 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);
287 <        CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
290 <        CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
286 >        assertEquals(0, f.getNumberOfDependents());
287 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
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 282 | Line 320 | public class CompletableFutureTest exten
320          checkCompletedNormally(f, "test");
321      }
322  
323 <    // Choose non-commutative actions for better coverage
323 >    abstract class CheckedAction {
324 >        int invocationCount = 0;
325 >        final ExecutionMode m;
326 >        CheckedAction(ExecutionMode m) { this.m = m; }
327 >        void invoked() {
328 >            m.checkExecutionMode();
329 >            assertEquals(0, invocationCount++);
330 >        }
331 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
332 >        void assertInvoked() { assertEquals(1, invocationCount); }
333 >    }
334 >
335 >    abstract class CheckedIntegerAction extends CheckedAction {
336 >        Integer value;
337 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
338 >        void assertValue(Integer expected) {
339 >            assertInvoked();
340 >            assertEquals(expected, value);
341 >        }
342 >    }
343 >
344 >    class IntegerSupplier extends CheckedAction
345 >        implements Supplier<Integer>
346 >    {
347 >        final Integer value;
348 >        IntegerSupplier(ExecutionMode m, Integer value) {
349 >            super(m);
350 >            this.value = value;
351 >        }
352 >        public Integer get() {
353 >            invoked();
354 >            return value;
355 >        }
356 >    }
357 >
358 >    // A function that handles and produces null values as well.
359 >    static Integer inc(Integer x) {
360 >        return (x == null) ? null : x + 1;
361 >    }
362 >
363 >    class IncAction extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        IncAction(ExecutionMode m) { super(m); }
367 >        public void accept(Integer x) {
368 >            invoked();
369 >            value = inc(x);
370 >        }
371 >    }
372 >
373 >    class IncFunction extends CheckedIntegerAction
374 >        implements Function<Integer,Integer>
375 >    {
376 >        IncFunction(ExecutionMode m) { super(m); }
377 >        public Integer apply(Integer x) {
378 >            invoked();
379 >            return value = inc(x);
380 >        }
381 >    }
382  
383 <    static final Supplier<Integer> supplyOne =
384 <        () -> Integer.valueOf(1);
385 <    static final Function<Integer, Integer> inc =
386 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
387 <    static final BiFunction<Integer, Integer, Integer> subtract =
388 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
293 <    static final class IncAction implements Consumer<Integer> {
294 <        int value;
295 <        public void accept(Integer x) { value = x.intValue() + 1; }
383 >    // Choose non-commutative actions for better coverage
384 >    // A non-commutative function that handles and produces null values as well.
385 >    static Integer subtract(Integer x, Integer y) {
386 >        return (x == null && y == null) ? null :
387 >            ((x == null) ? 42 : x.intValue())
388 >            - ((y == null) ? 99 : y.intValue());
389      }
390 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
391 <        int value;
390 >
391 >    class SubtractAction extends CheckedIntegerAction
392 >        implements BiConsumer<Integer, Integer>
393 >    {
394 >        SubtractAction(ExecutionMode m) { super(m); }
395          public void accept(Integer x, Integer y) {
396 <            value = x.intValue() - y.intValue();
396 >            invoked();
397 >            value = subtract(x, y);
398          }
399      }
400 <    static final class Noop implements Runnable {
401 <        boolean ran;
402 <        public void run() { ran = true; }
400 >
401 >    class SubtractFunction extends CheckedIntegerAction
402 >        implements BiFunction<Integer, Integer, Integer>
403 >    {
404 >        SubtractFunction(ExecutionMode m) { super(m); }
405 >        public Integer apply(Integer x, Integer y) {
406 >            invoked();
407 >            return value = subtract(x, y);
408 >        }
409      }
410  
411 <    static final class FailingSupplier implements Supplier<Integer> {
412 <        boolean ran;
413 <        public Integer get() { ran = true; throw new CFException(); }
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413 >        public void run() {
414 >            invoked();
415 >        }
416      }
417 <    static final class FailingConsumer implements Consumer<Integer> {
418 <        boolean ran;
419 <        public void accept(Integer x) { ran = true; throw new CFException(); }
417 >
418 >    class FailingSupplier extends CheckedAction
419 >        implements Supplier<Integer>
420 >    {
421 >        FailingSupplier(ExecutionMode m) { super(m); }
422 >        public Integer get() {
423 >            invoked();
424 >            throw new CFException();
425 >        }
426 >    }
427 >
428 >    class FailingConsumer extends CheckedIntegerAction
429 >        implements Consumer<Integer>
430 >    {
431 >        FailingConsumer(ExecutionMode m) { super(m); }
432 >        public void accept(Integer x) {
433 >            invoked();
434 >            value = x;
435 >            throw new CFException();
436 >        }
437      }
438 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
439 <        boolean ran;
440 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
438 >
439 >    class FailingBiConsumer extends CheckedIntegerAction
440 >        implements BiConsumer<Integer, Integer>
441 >    {
442 >        FailingBiConsumer(ExecutionMode m) { super(m); }
443 >        public void accept(Integer x, Integer y) {
444 >            invoked();
445 >            value = subtract(x, y);
446 >            throw new CFException();
447 >        }
448      }
449 <    static final class FailingFunction implements Function<Integer, Integer> {
450 <        boolean ran;
451 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
449 >
450 >    class FailingFunction extends CheckedIntegerAction
451 >        implements Function<Integer, Integer>
452 >    {
453 >        FailingFunction(ExecutionMode m) { super(m); }
454 >        public Integer apply(Integer x) {
455 >            invoked();
456 >            value = x;
457 >            throw new CFException();
458 >        }
459      }
460 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
461 <        boolean ran;
462 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
460 >
461 >    class FailingBiFunction extends CheckedIntegerAction
462 >        implements BiFunction<Integer, Integer, Integer>
463 >    {
464 >        FailingBiFunction(ExecutionMode m) { super(m); }
465 >        public Integer apply(Integer x, Integer y) {
466 >            invoked();
467 >            value = subtract(x, y);
468 >            throw new CFException();
469 >        }
470      }
471 <    static final class FailingNoop implements Runnable {
472 <        boolean ran;
473 <        public void run() { ran = true; throw new CFException(); }
471 >
472 >    class FailingRunnable extends CheckedAction implements Runnable {
473 >        FailingRunnable(ExecutionMode m) { super(m); }
474 >        public void run() {
475 >            invoked();
476 >            throw new CFException();
477 >        }
478      }
479  
480 <    static final class CompletableFutureInc
481 <        implements Function<Integer, CompletableFuture<Integer>> {
482 <        boolean ran;
480 >
481 >    class CompletableFutureInc extends CheckedIntegerAction
482 >        implements Function<Integer, CompletableFuture<Integer>>
483 >    {
484 >        CompletableFutureInc(ExecutionMode m) { super(m); }
485          public CompletableFuture<Integer> apply(Integer x) {
486 <            ran = true;
486 >            invoked();
487 >            value = x;
488              CompletableFuture<Integer> f = new CompletableFuture<>();
489 <            f.complete(Integer.valueOf(x.intValue() + 1));
489 >            f.complete(inc(x));
490              return f;
491          }
492      }
493  
494 <    static final class FailingCompletableFutureFunction
495 <        implements Function<Integer, CompletableFuture<Integer>> {
496 <        boolean ran;
494 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
495 >        implements Function<Integer, CompletableFuture<Integer>>
496 >    {
497 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
498          public CompletableFuture<Integer> apply(Integer x) {
499 <            ran = true; throw new CFException();
499 >            invoked();
500 >            value = x;
501 >            throw new CFException();
502          }
503      }
504  
505      // Used for explicit executor tests
506      static final class ThreadExecutor implements Executor {
507 <        AtomicInteger count = new AtomicInteger(0);
507 >        final AtomicInteger count = new AtomicInteger(0);
508 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
509 >        static boolean startedCurrentThread() {
510 >            return Thread.currentThread().getThreadGroup() == tg;
511 >        }
512  
513          public void execute(Runnable r) {
514              count.getAndIncrement();
515 <            new Thread(r).start();
515 >            new Thread(tg, r).start();
516          }
517      }
518  
519 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
520 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
521 <    }
519 >    /**
520 >     * Permits the testing of parallel code for the 3 different
521 >     * execution modes without copy/pasting all the test methods.
522 >     */
523 >    enum ExecutionMode {
524 >        DEFAULT {
525 >            public void checkExecutionMode() {
526 >                assertFalse(ThreadExecutor.startedCurrentThread());
527 >                assertNull(ForkJoinTask.getPool());
528 >            }
529 >            public CompletableFuture<Void> runAsync(Runnable a) {
530 >                throw new UnsupportedOperationException();
531 >            }
532 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
533 >                throw new UnsupportedOperationException();
534 >            }
535 >            public <T> CompletableFuture<Void> thenRun
536 >                (CompletableFuture<T> f, Runnable a) {
537 >                return f.thenRun(a);
538 >            }
539 >            public <T> CompletableFuture<Void> thenAccept
540 >                (CompletableFuture<T> f, Consumer<? super T> a) {
541 >                return f.thenAccept(a);
542 >            }
543 >            public <T,U> CompletableFuture<U> thenApply
544 >                (CompletableFuture<T> f, Function<? super T,U> a) {
545 >                return f.thenApply(a);
546 >            }
547 >            public <T,U> CompletableFuture<U> thenCompose
548 >                (CompletableFuture<T> f,
549 >                 Function<? super T,? extends CompletionStage<U>> a) {
550 >                return f.thenCompose(a);
551 >            }
552 >            public <T,U> CompletableFuture<U> handle
553 >                (CompletableFuture<T> f,
554 >                 BiFunction<? super T,Throwable,? extends U> a) {
555 >                return f.handle(a);
556 >            }
557 >            public <T> CompletableFuture<T> whenComplete
558 >                (CompletableFuture<T> f,
559 >                 BiConsumer<? super T,? super Throwable> a) {
560 >                return f.whenComplete(a);
561 >            }
562 >            public <T,U> CompletableFuture<Void> runAfterBoth
563 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
564 >                return f.runAfterBoth(g, a);
565 >            }
566 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
567 >                (CompletableFuture<T> f,
568 >                 CompletionStage<? extends U> g,
569 >                 BiConsumer<? super T,? super U> a) {
570 >                return f.thenAcceptBoth(g, a);
571 >            }
572 >            public <T,U,V> CompletableFuture<V> thenCombine
573 >                (CompletableFuture<T> f,
574 >                 CompletionStage<? extends U> g,
575 >                 BiFunction<? super T,? super U,? extends V> a) {
576 >                return f.thenCombine(g, a);
577 >            }
578 >            public <T> CompletableFuture<Void> runAfterEither
579 >                (CompletableFuture<T> f,
580 >                 CompletionStage<?> g,
581 >                 java.lang.Runnable a) {
582 >                return f.runAfterEither(g, a);
583 >            }
584 >            public <T> CompletableFuture<Void> acceptEither
585 >                (CompletableFuture<T> f,
586 >                 CompletionStage<? extends T> g,
587 >                 Consumer<? super T> a) {
588 >                return f.acceptEither(g, a);
589 >            }
590 >            public <T,U> CompletableFuture<U> applyToEither
591 >                (CompletableFuture<T> f,
592 >                 CompletionStage<? extends T> g,
593 >                 Function<? super T,U> a) {
594 >                return f.applyToEither(g, a);
595 >            }
596 >        },
597  
598 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
599 <        boolean ran;
600 <        public Integer apply(Integer x, Throwable t) {
601 <            ran = true;
602 <            return (t == null) ? two : three;
603 <        }
604 <    }
598 >        ASYNC {
599 >            public void checkExecutionMode() {
600 >                assertSame(ForkJoinPool.commonPool(),
601 >                           ForkJoinTask.getPool());
602 >            }
603 >            public CompletableFuture<Void> runAsync(Runnable a) {
604 >                return CompletableFuture.runAsync(a);
605 >            }
606 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
607 >                return CompletableFuture.supplyAsync(a);
608 >            }
609 >            public <T> CompletableFuture<Void> thenRun
610 >                (CompletableFuture<T> f, Runnable a) {
611 >                return f.thenRunAsync(a);
612 >            }
613 >            public <T> CompletableFuture<Void> thenAccept
614 >                (CompletableFuture<T> f, Consumer<? super T> a) {
615 >                return f.thenAcceptAsync(a);
616 >            }
617 >            public <T,U> CompletableFuture<U> thenApply
618 >                (CompletableFuture<T> f, Function<? super T,U> a) {
619 >                return f.thenApplyAsync(a);
620 >            }
621 >            public <T,U> CompletableFuture<U> thenCompose
622 >                (CompletableFuture<T> f,
623 >                 Function<? super T,? extends CompletionStage<U>> a) {
624 >                return f.thenComposeAsync(a);
625 >            }
626 >            public <T,U> CompletableFuture<U> handle
627 >                (CompletableFuture<T> f,
628 >                 BiFunction<? super T,Throwable,? extends U> a) {
629 >                return f.handleAsync(a);
630 >            }
631 >            public <T> CompletableFuture<T> whenComplete
632 >                (CompletableFuture<T> f,
633 >                 BiConsumer<? super T,? super Throwable> a) {
634 >                return f.whenCompleteAsync(a);
635 >            }
636 >            public <T,U> CompletableFuture<Void> runAfterBoth
637 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
638 >                return f.runAfterBothAsync(g, a);
639 >            }
640 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
641 >                (CompletableFuture<T> f,
642 >                 CompletionStage<? extends U> g,
643 >                 BiConsumer<? super T,? super U> a) {
644 >                return f.thenAcceptBothAsync(g, a);
645 >            }
646 >            public <T,U,V> CompletableFuture<V> thenCombine
647 >                (CompletableFuture<T> f,
648 >                 CompletionStage<? extends U> g,
649 >                 BiFunction<? super T,? super U,? extends V> a) {
650 >                return f.thenCombineAsync(g, a);
651 >            }
652 >            public <T> CompletableFuture<Void> runAfterEither
653 >                (CompletableFuture<T> f,
654 >                 CompletionStage<?> g,
655 >                 java.lang.Runnable a) {
656 >                return f.runAfterEitherAsync(g, a);
657 >            }
658 >            public <T> CompletableFuture<Void> acceptEither
659 >                (CompletableFuture<T> f,
660 >                 CompletionStage<? extends T> g,
661 >                 Consumer<? super T> a) {
662 >                return f.acceptEitherAsync(g, a);
663 >            }
664 >            public <T,U> CompletableFuture<U> applyToEither
665 >                (CompletableFuture<T> f,
666 >                 CompletionStage<? extends T> g,
667 >                 Function<? super T,U> a) {
668 >                return f.applyToEitherAsync(g, a);
669 >            }
670 >        },
671 >
672 >        EXECUTOR {
673 >            public void checkExecutionMode() {
674 >                assertTrue(ThreadExecutor.startedCurrentThread());
675 >            }
676 >            public CompletableFuture<Void> runAsync(Runnable a) {
677 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
678 >            }
679 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
680 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
681 >            }
682 >            public <T> CompletableFuture<Void> thenRun
683 >                (CompletableFuture<T> f, Runnable a) {
684 >                return f.thenRunAsync(a, new ThreadExecutor());
685 >            }
686 >            public <T> CompletableFuture<Void> thenAccept
687 >                (CompletableFuture<T> f, Consumer<? super T> a) {
688 >                return f.thenAcceptAsync(a, new ThreadExecutor());
689 >            }
690 >            public <T,U> CompletableFuture<U> thenApply
691 >                (CompletableFuture<T> f, Function<? super T,U> a) {
692 >                return f.thenApplyAsync(a, new ThreadExecutor());
693 >            }
694 >            public <T,U> CompletableFuture<U> thenCompose
695 >                (CompletableFuture<T> f,
696 >                 Function<? super T,? extends CompletionStage<U>> a) {
697 >                return f.thenComposeAsync(a, new ThreadExecutor());
698 >            }
699 >            public <T,U> CompletableFuture<U> handle
700 >                (CompletableFuture<T> f,
701 >                 BiFunction<? super T,Throwable,? extends U> a) {
702 >                return f.handleAsync(a, new ThreadExecutor());
703 >            }
704 >            public <T> CompletableFuture<T> whenComplete
705 >                (CompletableFuture<T> f,
706 >                 BiConsumer<? super T,? super Throwable> a) {
707 >                return f.whenCompleteAsync(a, new ThreadExecutor());
708 >            }
709 >            public <T,U> CompletableFuture<Void> runAfterBoth
710 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
711 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
712 >            }
713 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
714 >                (CompletableFuture<T> f,
715 >                 CompletionStage<? extends U> g,
716 >                 BiConsumer<? super T,? super U> a) {
717 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
718 >            }
719 >            public <T,U,V> CompletableFuture<V> thenCombine
720 >                (CompletableFuture<T> f,
721 >                 CompletionStage<? extends U> g,
722 >                 BiFunction<? super T,? super U,? extends V> a) {
723 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
724 >            }
725 >            public <T> CompletableFuture<Void> runAfterEither
726 >                (CompletableFuture<T> f,
727 >                 CompletionStage<?> g,
728 >                 java.lang.Runnable a) {
729 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
730 >            }
731 >            public <T> CompletableFuture<Void> acceptEither
732 >                (CompletableFuture<T> f,
733 >                 CompletionStage<? extends T> g,
734 >                 Consumer<? super T> a) {
735 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
736 >            }
737 >            public <T,U> CompletableFuture<U> applyToEither
738 >                (CompletableFuture<T> f,
739 >                 CompletionStage<? extends T> g,
740 >                 Function<? super T,U> a) {
741 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
742 >            }
743 >        };
744 >
745 >        public abstract void checkExecutionMode();
746 >        public abstract CompletableFuture<Void> runAsync(Runnable a);
747 >        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
748 >        public abstract <T> CompletableFuture<Void> thenRun
749 >            (CompletableFuture<T> f, Runnable a);
750 >        public abstract <T> CompletableFuture<Void> thenAccept
751 >            (CompletableFuture<T> f, Consumer<? super T> a);
752 >        public abstract <T,U> CompletableFuture<U> thenApply
753 >            (CompletableFuture<T> f, Function<? super T,U> a);
754 >        public abstract <T,U> CompletableFuture<U> thenCompose
755 >            (CompletableFuture<T> f,
756 >             Function<? super T,? extends CompletionStage<U>> a);
757 >        public abstract <T,U> CompletableFuture<U> handle
758 >            (CompletableFuture<T> f,
759 >             BiFunction<? super T,Throwable,? extends U> a);
760 >        public abstract <T> CompletableFuture<T> whenComplete
761 >            (CompletableFuture<T> f,
762 >             BiConsumer<? super T,? super Throwable> a);
763 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
764 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
765 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
766 >            (CompletableFuture<T> f,
767 >             CompletionStage<? extends U> g,
768 >             BiConsumer<? super T,? super U> a);
769 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
770 >            (CompletableFuture<T> f,
771 >             CompletionStage<? extends U> g,
772 >             BiFunction<? super T,? super U,? extends V> a);
773 >        public abstract <T> CompletableFuture<Void> runAfterEither
774 >            (CompletableFuture<T> f,
775 >             CompletionStage<?> g,
776 >             java.lang.Runnable a);
777 >        public abstract <T> CompletableFuture<Void> acceptEither
778 >            (CompletableFuture<T> f,
779 >             CompletionStage<? extends T> g,
780 >             Consumer<? super T> a);
781 >        public abstract <T,U> CompletableFuture<U> applyToEither
782 >            (CompletableFuture<T> f,
783 >             CompletionStage<? extends T> g,
784 >             Function<? super T,U> a);
785 >    }
786 >
787 >    /**
788 >     * exceptionally action is not invoked when source completes
789 >     * normally, and source result is propagated
790 >     */
791 >    public void testExceptionally_normalCompletion() {
792 >        for (boolean createIncomplete : new boolean[] { true, false })
793 >        for (Integer v1 : new Integer[] { 1, null })
794 >    {
795 >        final AtomicInteger a = new AtomicInteger(0);
796 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
797 >        if (!createIncomplete) f.complete(v1);
798 >        final CompletableFuture<Integer> g = f.exceptionally
799 >            ((Throwable t) -> {
800 >                // Should not be called
801 >                a.getAndIncrement();
802 >                throw new AssertionError();
803 >            });
804 >        if (createIncomplete) f.complete(v1);
805 >
806 >        checkCompletedNormally(g, v1);
807 >        checkCompletedNormally(f, v1);
808 >        assertEquals(0, a.get());
809 >    }}
810  
811  
812      /**
813       * exceptionally action completes with function value on source
814 <     * exception;  otherwise with source value
814 >     * exception
815       */
816 <    public void testExceptionally() {
817 <        CompletableFuture<Integer> f = new CompletableFuture<>();
818 <        ExceptionToInteger r = new ExceptionToInteger();
819 <        CompletableFuture<Integer> g = f.exceptionally(r);
820 <        f.completeExceptionally(new CFException());
821 <        checkCompletedNormally(g, three);
822 <
823 <        f = new CompletableFuture<>();
824 <        r = new ExceptionToInteger();
825 <        g = f.exceptionally(r);
826 <        f.complete(one);
827 <        checkCompletedNormally(g, one);
828 <    }
816 >    public void testExceptionally_exceptionalCompletion() {
817 >        for (boolean createIncomplete : new boolean[] { true, false })
818 >        for (Integer v1 : new Integer[] { 1, null })
819 >    {
820 >        final AtomicInteger a = new AtomicInteger(0);
821 >        final CFException ex = new CFException();
822 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
823 >        if (!createIncomplete) f.completeExceptionally(ex);
824 >        final CompletableFuture<Integer> g = f.exceptionally
825 >            ((Throwable t) -> {
826 >                ExecutionMode.DEFAULT.checkExecutionMode();
827 >                threadAssertSame(t, ex);
828 >                a.getAndIncrement();
829 >                return v1;
830 >            });
831 >        if (createIncomplete) f.completeExceptionally(ex);
832 >
833 >        checkCompletedNormally(g, v1);
834 >        assertEquals(1, a.get());
835 >    }}
836 >
837 >    public void testExceptionally_exceptionalCompletionActionFailed() {
838 >        for (boolean createIncomplete : new boolean[] { true, false })
839 >        for (Integer v1 : new Integer[] { 1, null })
840 >    {
841 >        final AtomicInteger a = new AtomicInteger(0);
842 >        final CFException ex1 = new CFException();
843 >        final CFException ex2 = new CFException();
844 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
845 >        if (!createIncomplete) f.completeExceptionally(ex1);
846 >        final CompletableFuture<Integer> g = f.exceptionally
847 >            ((Throwable t) -> {
848 >                ExecutionMode.DEFAULT.checkExecutionMode();
849 >                threadAssertSame(t, ex1);
850 >                a.getAndIncrement();
851 >                throw ex2;
852 >            });
853 >        if (createIncomplete) f.completeExceptionally(ex1);
854 >
855 >        checkCompletedWithWrappedCFException(g, ex2);
856 >        assertEquals(1, a.get());
857 >    }}
858 >
859 >    /**
860 >     * handle action completes normally with function value on normal
861 >     * completion of source
862 >     */
863 >    public void testHandle_normalCompletion() {
864 >        for (ExecutionMode m : ExecutionMode.values())
865 >        for (boolean createIncomplete : new boolean[] { true, false })
866 >        for (Integer v1 : new Integer[] { 1, null })
867 >    {
868 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
869 >        final AtomicInteger a = new AtomicInteger(0);
870 >        if (!createIncomplete) f.complete(v1);
871 >        final CompletableFuture<Integer> g = m.handle
872 >            (f,
873 >             (Integer x, Throwable t) -> {
874 >                m.checkExecutionMode();
875 >                threadAssertSame(x, v1);
876 >                threadAssertNull(t);
877 >                a.getAndIncrement();
878 >                return inc(v1);
879 >            });
880 >        if (createIncomplete) f.complete(v1);
881 >
882 >        checkCompletedNormally(g, inc(v1));
883 >        checkCompletedNormally(f, v1);
884 >        assertEquals(1, a.get());
885 >    }}
886  
887      /**
888 <     * handle action completes normally with function value on either
889 <     * normal or exceptional completion of source
888 >     * handle action completes normally with function value on
889 >     * exceptional completion of source
890       */
891 <    public void testHandle() {
892 <        CompletableFuture<Integer> f, g;
893 <        IntegerHandler r;
894 <
895 <        f = new CompletableFuture<>();
896 <        f.completeExceptionally(new CFException());
897 <        g = f.handle(r = new IntegerHandler());
898 <        assertTrue(r.ran);
899 <        checkCompletedNormally(g, three);
891 >    public void testHandle_exceptionalCompletion() {
892 >        for (ExecutionMode m : ExecutionMode.values())
893 >        for (boolean createIncomplete : new boolean[] { true, false })
894 >        for (Integer v1 : new Integer[] { 1, null })
895 >    {
896 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
897 >        final AtomicInteger a = new AtomicInteger(0);
898 >        final CFException ex = new CFException();
899 >        if (!createIncomplete) f.completeExceptionally(ex);
900 >        final CompletableFuture<Integer> g = m.handle
901 >            (f,
902 >             (Integer x, Throwable t) -> {
903 >                m.checkExecutionMode();
904 >                threadAssertNull(x);
905 >                threadAssertSame(t, ex);
906 >                a.getAndIncrement();
907 >                return v1;
908 >            });
909 >        if (createIncomplete) f.completeExceptionally(ex);
910 >
911 >        checkCompletedNormally(g, v1);
912 >        checkCompletedWithWrappedCFException(f, ex);
913 >        assertEquals(1, a.get());
914 >    }}
915 >
916 >    /**
917 >     * handle action completes normally with function value on
918 >     * cancelled source
919 >     */
920 >    public void testHandle_sourceCancelled() {
921 >        for (ExecutionMode m : ExecutionMode.values())
922 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
923 >        for (boolean createIncomplete : new boolean[] { true, false })
924 >        for (Integer v1 : new Integer[] { 1, null })
925 >    {
926 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
927 >        final AtomicInteger a = new AtomicInteger(0);
928 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
929 >        final CompletableFuture<Integer> g = m.handle
930 >            (f,
931 >             (Integer x, Throwable t) -> {
932 >                m.checkExecutionMode();
933 >                threadAssertNull(x);
934 >                threadAssertTrue(t instanceof CancellationException);
935 >                a.getAndIncrement();
936 >                return v1;
937 >            });
938 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
939  
940 <        f = new CompletableFuture<>();
941 <        g = f.handle(r = new IntegerHandler());
942 <        assertFalse(r.ran);
943 <        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);
419 <
420 <        f = new CompletableFuture<>();
421 <        g = f.handle(r = new IntegerHandler());
422 <        assertFalse(r.ran);
423 <        f.complete(one);
424 <        assertTrue(r.ran);
425 <        checkCompletedNormally(g, two);
426 <    }
940 >        checkCompletedNormally(g, v1);
941 >        checkCancelled(f);
942 >        assertEquals(1, a.get());
943 >    }}
944  
945      /**
946 <     * runAsync completes after running Runnable
946 >     * handle result completes exceptionally if action does
947       */
948 <    public void testRunAsync() {
949 <        Noop r = new Noop();
950 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
951 <        assertNull(f.join());
952 <        assertTrue(r.ran);
953 <        checkCompletedNormally(f, null);
954 <    }
948 >    public void testHandle_sourceFailedActionFailed() {
949 >        for (ExecutionMode m : ExecutionMode.values())
950 >        for (boolean createIncomplete : new boolean[] { true, false })
951 >    {
952 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
953 >        final AtomicInteger a = new AtomicInteger(0);
954 >        final CFException ex1 = new CFException();
955 >        final CFException ex2 = new CFException();
956 >        if (!createIncomplete) f.completeExceptionally(ex1);
957 >        final CompletableFuture<Integer> g = m.handle
958 >            (f,
959 >             (Integer x, Throwable t) -> {
960 >                m.checkExecutionMode();
961 >                threadAssertNull(x);
962 >                threadAssertSame(ex1, t);
963 >                a.getAndIncrement();
964 >                throw ex2;
965 >            });
966 >        if (createIncomplete) f.completeExceptionally(ex1);
967 >
968 >        checkCompletedWithWrappedCFException(g, ex2);
969 >        checkCompletedWithWrappedCFException(f, ex1);
970 >        assertEquals(1, a.get());
971 >    }}
972 >
973 >    public void testHandle_sourceCompletedNormallyActionFailed() {
974 >        for (ExecutionMode m : ExecutionMode.values())
975 >        for (boolean createIncomplete : new boolean[] { true, false })
976 >        for (Integer v1 : new Integer[] { 1, null })
977 >    {
978 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
979 >        final AtomicInteger a = new AtomicInteger(0);
980 >        final CFException ex = new CFException();
981 >        if (!createIncomplete) f.complete(v1);
982 >        final CompletableFuture<Integer> g = m.handle
983 >            (f,
984 >             (Integer x, Throwable t) -> {
985 >                m.checkExecutionMode();
986 >                threadAssertSame(x, v1);
987 >                threadAssertNull(t);
988 >                a.getAndIncrement();
989 >                throw ex;
990 >            });
991 >        if (createIncomplete) f.complete(v1);
992 >
993 >        checkCompletedWithWrappedCFException(g, ex);
994 >        checkCompletedNormally(f, v1);
995 >        assertEquals(1, a.get());
996 >    }}
997  
998      /**
999 <     * runAsync with executor completes after running Runnable
999 >     * runAsync completes after running Runnable
1000       */
1001 <    public void testRunAsync2() {
1002 <        Noop r = new Noop();
1003 <        ThreadExecutor exec = new ThreadExecutor();
1004 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1001 >    public void testRunAsync_normalCompletion() {
1002 >        ExecutionMode[] executionModes = {
1003 >            ExecutionMode.ASYNC,
1004 >            ExecutionMode.EXECUTOR,
1005 >        };
1006 >        for (ExecutionMode m : executionModes)
1007 >    {
1008 >        final Noop r = new Noop(m);
1009 >        final CompletableFuture<Void> f = m.runAsync(r);
1010          assertNull(f.join());
447        assertTrue(r.ran);
1011          checkCompletedNormally(f, null);
1012 <        assertEquals(1, exec.count.get());
1013 <    }
1012 >        r.assertInvoked();
1013 >    }}
1014  
1015      /**
1016       * failing runAsync completes exceptionally after running Runnable
1017       */
1018 <    public void testRunAsync3() {
1019 <        FailingNoop r = new FailingNoop();
1020 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1018 >    public void testRunAsync_exceptionalCompletion() {
1019 >        ExecutionMode[] executionModes = {
1020 >            ExecutionMode.ASYNC,
1021 >            ExecutionMode.EXECUTOR,
1022 >        };
1023 >        for (ExecutionMode m : executionModes)
1024 >    {
1025 >        final FailingRunnable r = new FailingRunnable(m);
1026 >        final CompletableFuture<Void> f = m.runAsync(r);
1027          checkCompletedWithWrappedCFException(f);
1028 <        assertTrue(r.ran);
1029 <    }
1028 >        r.assertInvoked();
1029 >    }}
1030  
1031      /**
1032       * supplyAsync completes with result of supplier
1033       */
1034 <    public void testSupplyAsync() {
1035 <        CompletableFuture<Integer> f;
1036 <        f = CompletableFuture.supplyAsync(supplyOne);
1037 <        assertEquals(f.join(), one);
1038 <        checkCompletedNormally(f, one);
1039 <    }
1040 <
1041 <    /**
1042 <     * supplyAsync with executor completes with result of supplier
1043 <     */
1044 <    public void testSupplyAsync2() {
1045 <        CompletableFuture<Integer> f;
1046 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1047 <        assertEquals(f.join(), one);
479 <        checkCompletedNormally(f, one);
480 <    }
1034 >    public void testSupplyAsync_normalCompletion() {
1035 >        ExecutionMode[] executionModes = {
1036 >            ExecutionMode.ASYNC,
1037 >            ExecutionMode.EXECUTOR,
1038 >        };
1039 >        for (ExecutionMode m : executionModes)
1040 >        for (Integer v1 : new Integer[] { 1, null })
1041 >    {
1042 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1043 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1044 >        assertSame(v1, f.join());
1045 >        checkCompletedNormally(f, v1);
1046 >        r.assertInvoked();
1047 >    }}
1048  
1049      /**
1050       * Failing supplyAsync completes exceptionally
1051       */
1052 <    public void testSupplyAsync3() {
1053 <        FailingSupplier r = new FailingSupplier();
1054 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1052 >    public void testSupplyAsync_exceptionalCompletion() {
1053 >        ExecutionMode[] executionModes = {
1054 >            ExecutionMode.ASYNC,
1055 >            ExecutionMode.EXECUTOR,
1056 >        };
1057 >        for (ExecutionMode m : executionModes)
1058 >    {
1059 >        FailingSupplier r = new FailingSupplier(m);
1060 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1061          checkCompletedWithWrappedCFException(f);
1062 <        assertTrue(r.ran);
1063 <    }
1062 >        r.assertInvoked();
1063 >    }}
1064  
1065      // seq completion methods
1066  
1067      /**
1068       * thenRun result completes normally after normal completion of source
1069       */
1070 <    public void testThenRun() {
1071 <        CompletableFuture<Integer> f;
1072 <        CompletableFuture<Void> g;
1073 <        Noop r;
1074 <
1075 <        f = new CompletableFuture<>();
1076 <        g = f.thenRun(r = new Noop());
1077 <        f.complete(null);
1078 <        checkCompletedNormally(g, null);
1079 <        assertTrue(r.ran);
1070 >    public void testThenRun_normalCompletion() {
1071 >        for (ExecutionMode m : ExecutionMode.values())
1072 >        for (boolean createIncomplete : new boolean[] { true, false })
1073 >        for (Integer v1 : new Integer[] { 1, null })
1074 >    {
1075 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1076 >        final Noop r = new Noop(m);
1077 >        if (!createIncomplete) f.complete(v1);
1078 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1079 >        if (createIncomplete) {
1080 >            checkIncomplete(g);
1081 >            f.complete(v1);
1082 >        }
1083  
508        f = new CompletableFuture<>();
509        f.complete(null);
510        g = f.thenRun(r = new Noop());
1084          checkCompletedNormally(g, null);
1085 <        assertTrue(r.ran);
1086 <    }
1085 >        checkCompletedNormally(f, v1);
1086 >        r.assertInvoked();
1087 >    }}
1088  
1089      /**
1090       * thenRun result completes exceptionally after exceptional
1091       * completion of source
1092       */
1093 <    public void testThenRun2() {
1094 <        CompletableFuture<Integer> f;
1095 <        CompletableFuture<Void> g;
1096 <        Noop r;
1093 >    public void testThenRun_exceptionalCompletion() {
1094 >        for (ExecutionMode m : ExecutionMode.values())
1095 >        for (boolean createIncomplete : new boolean[] { true, false })
1096 >    {
1097 >        final CFException ex = new CFException();
1098 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1099 >        final Noop r = new Noop(m);
1100 >        if (!createIncomplete) f.completeExceptionally(ex);
1101 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1102 >        if (createIncomplete) {
1103 >            checkIncomplete(g);
1104 >            f.completeExceptionally(ex);
1105 >        }
1106  
1107 <        f = new CompletableFuture<>();
1108 <        g = f.thenRun(r = new Noop());
1109 <        f.completeExceptionally(new CFException());
1110 <        checkCompletedWithWrappedCFException(g);
528 <        assertFalse(r.ran);
529 <
530 <        f = new CompletableFuture<>();
531 <        f.completeExceptionally(new CFException());
532 <        g = f.thenRun(r = new Noop());
533 <        checkCompletedWithWrappedCFException(g);
534 <        assertFalse(r.ran);
535 <    }
1107 >        checkCompletedWithWrappedCFException(g, ex);
1108 >        checkCompletedWithWrappedCFException(f, ex);
1109 >        r.assertNotInvoked();
1110 >    }}
1111  
1112      /**
1113 <     * thenRun result completes exceptionally if action does
1113 >     * thenRun result completes exceptionally if source cancelled
1114       */
1115 <    public void testThenRun3() {
1116 <        CompletableFuture<Integer> f;
1117 <        CompletableFuture<Void> g;
1118 <        FailingNoop r;
1119 <
1120 <        f = new CompletableFuture<>();
1121 <        g = f.thenRun(r = new FailingNoop());
1122 <        f.complete(null);
1123 <        checkCompletedWithWrappedCFException(g);
1115 >    public void testThenRun_sourceCancelled() {
1116 >        for (ExecutionMode m : ExecutionMode.values())
1117 >        for (boolean createIncomplete : new boolean[] { true, false })
1118 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1119 >    {
1120 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1121 >        final Noop r = new Noop(m);
1122 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1124 >        if (createIncomplete) {
1125 >            checkIncomplete(g);
1126 >            assertTrue(f.cancel(mayInterruptIfRunning));
1127 >        }
1128  
1129 <        f = new CompletableFuture<>();
1130 <        f.complete(null);
1131 <        g = f.thenRun(r = new FailingNoop());
1132 <        checkCompletedWithWrappedCFException(g);
554 <    }
1129 >        checkCompletedWithWrappedCancellationException(g);
1130 >        checkCancelled(f);
1131 >        r.assertNotInvoked();
1132 >    }}
1133  
1134      /**
1135 <     * thenRun result completes exceptionally if source cancelled
1135 >     * thenRun result completes exceptionally if action does
1136       */
1137 <    public void testThenRun4() {
1138 <        CompletableFuture<Integer> f;
1139 <        CompletableFuture<Void> g;
1140 <        Noop r;
1141 <
1142 <        f = new CompletableFuture<>();
1143 <        g = f.thenRun(r = new Noop());
1144 <        assertTrue(f.cancel(true));
1145 <        checkCompletedWithWrappedCancellationException(g);
1137 >    public void testThenRun_actionFailed() {
1138 >        for (ExecutionMode m : ExecutionMode.values())
1139 >        for (boolean createIncomplete : new boolean[] { true, false })
1140 >        for (Integer v1 : new Integer[] { 1, null })
1141 >    {
1142 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1143 >        final FailingRunnable r = new FailingRunnable(m);
1144 >        if (!createIncomplete) f.complete(v1);
1145 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1146 >        if (createIncomplete) {
1147 >            checkIncomplete(g);
1148 >            f.complete(v1);
1149 >        }
1150  
1151 <        f = new CompletableFuture<>();
1152 <        assertTrue(f.cancel(true));
1153 <        g = f.thenRun(r = new Noop());
572 <        checkCompletedWithWrappedCancellationException(g);
573 <    }
1151 >        checkCompletedWithWrappedCFException(g);
1152 >        checkCompletedNormally(f, v1);
1153 >    }}
1154  
1155      /**
1156       * thenApply result completes normally after normal completion of source
1157       */
1158 <    public void testThenApply() {
1159 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1160 <        CompletableFuture<Integer> g = f.thenApply(inc);
1161 <        f.complete(one);
1162 <        checkCompletedNormally(g, two);
1163 <    }
1158 >    public void testThenApply_normalCompletion() {
1159 >        for (ExecutionMode m : ExecutionMode.values())
1160 >        for (boolean createIncomplete : new boolean[] { true, false })
1161 >        for (Integer v1 : new Integer[] { 1, null })
1162 >    {
1163 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 >        final IncFunction r = new IncFunction(m);
1165 >        if (!createIncomplete) f.complete(v1);
1166 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1167 >        if (createIncomplete) {
1168 >            checkIncomplete(g);
1169 >            f.complete(v1);
1170 >        }
1171 >
1172 >        checkCompletedNormally(g, inc(v1));
1173 >        checkCompletedNormally(f, v1);
1174 >        r.assertInvoked();
1175 >    }}
1176  
1177      /**
1178       * thenApply result completes exceptionally after exceptional
1179       * completion of source
1180       */
1181 <    public void testThenApply2() {
1182 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1183 <        CompletableFuture<Integer> g = f.thenApply(inc);
1184 <        f.completeExceptionally(new CFException());
1185 <        checkCompletedWithWrappedCFException(g);
1186 <    }
1181 >    public void testThenApply_exceptionalCompletion() {
1182 >        for (ExecutionMode m : ExecutionMode.values())
1183 >        for (boolean createIncomplete : new boolean[] { true, false })
1184 >    {
1185 >        final CFException ex = new CFException();
1186 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1187 >        final IncFunction r = new IncFunction(m);
1188 >        if (!createIncomplete) f.completeExceptionally(ex);
1189 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1190 >        if (createIncomplete) {
1191 >            checkIncomplete(g);
1192 >            f.completeExceptionally(ex);
1193 >        }
1194  
1195 <    /**
1196 <     * thenApply result completes exceptionally if action does
1197 <     */
1198 <    public void testThenApply3() {
600 <        CompletableFuture<Integer> f = new CompletableFuture<>();
601 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
602 <        f.complete(one);
603 <        checkCompletedWithWrappedCFException(g);
604 <    }
1195 >        checkCompletedWithWrappedCFException(g, ex);
1196 >        checkCompletedWithWrappedCFException(f, ex);
1197 >        r.assertNotInvoked();
1198 >    }}
1199  
1200      /**
1201       * thenApply result completes exceptionally if source cancelled
1202       */
1203 <    public void testThenApply4() {
1204 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1205 <        CompletableFuture<Integer> g = f.thenApply(inc);
1206 <        assertTrue(f.cancel(true));
1203 >    public void testThenApply_sourceCancelled() {
1204 >        for (ExecutionMode m : ExecutionMode.values())
1205 >        for (boolean createIncomplete : new boolean[] { true, false })
1206 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1207 >    {
1208 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1209 >        final IncFunction r = new IncFunction(m);
1210 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212 >        if (createIncomplete) {
1213 >            checkIncomplete(g);
1214 >            assertTrue(f.cancel(mayInterruptIfRunning));
1215 >        }
1216 >
1217          checkCompletedWithWrappedCancellationException(g);
1218 <    }
1218 >        checkCancelled(f);
1219 >        r.assertNotInvoked();
1220 >    }}
1221 >
1222 >    /**
1223 >     * thenApply result completes exceptionally if action does
1224 >     */
1225 >    public void testThenApply_actionFailed() {
1226 >        for (ExecutionMode m : ExecutionMode.values())
1227 >        for (boolean createIncomplete : new boolean[] { true, false })
1228 >        for (Integer v1 : new Integer[] { 1, null })
1229 >    {
1230 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1231 >        final FailingFunction r = new FailingFunction(m);
1232 >        if (!createIncomplete) f.complete(v1);
1233 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234 >        if (createIncomplete) {
1235 >            checkIncomplete(g);
1236 >            f.complete(v1);
1237 >        }
1238 >
1239 >        checkCompletedWithWrappedCFException(g);
1240 >        checkCompletedNormally(f, v1);
1241 >    }}
1242  
1243      /**
1244       * thenAccept result completes normally after normal completion of source
1245       */
1246 <    public void testThenAccept() {
1247 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1248 <        IncAction r = new IncAction();
1249 <        CompletableFuture<Void> g = f.thenAccept(r);
1250 <        f.complete(one);
1246 >    public void testThenAccept_normalCompletion() {
1247 >        for (ExecutionMode m : ExecutionMode.values())
1248 >        for (boolean createIncomplete : new boolean[] { true, false })
1249 >        for (Integer v1 : new Integer[] { 1, null })
1250 >    {
1251 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 >        final IncAction r = new IncAction(m);
1253 >        if (!createIncomplete) f.complete(v1);
1254 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 >        if (createIncomplete) {
1256 >            checkIncomplete(g);
1257 >            f.complete(v1);
1258 >        }
1259 >
1260          checkCompletedNormally(g, null);
1261 <        assertEquals(r.value, 2);
1262 <    }
1261 >        checkCompletedNormally(f, v1);
1262 >        r.assertInvoked();
1263 >        r.assertValue(inc(v1));
1264 >    }}
1265  
1266      /**
1267       * thenAccept result completes exceptionally after exceptional
1268       * completion of source
1269       */
1270 <    public void testThenAccept2() {
1271 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1272 <        IncAction r = new IncAction();
1273 <        CompletableFuture<Void> g = f.thenAccept(r);
1274 <        f.completeExceptionally(new CFException());
1275 <        checkCompletedWithWrappedCFException(g);
1276 <    }
1270 >    public void testThenAccept_exceptionalCompletion() {
1271 >        for (ExecutionMode m : ExecutionMode.values())
1272 >        for (boolean createIncomplete : new boolean[] { true, false })
1273 >    {
1274 >        final CFException ex = new CFException();
1275 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1276 >        final IncAction r = new IncAction(m);
1277 >        if (!createIncomplete) f.completeExceptionally(ex);
1278 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1279 >        if (createIncomplete) {
1280 >            checkIncomplete(g);
1281 >            f.completeExceptionally(ex);
1282 >        }
1283  
1284 <    /**
1285 <     * thenAccept result completes exceptionally if action does
1286 <     */
1287 <    public void testThenAccept3() {
644 <        CompletableFuture<Integer> f = new CompletableFuture<>();
645 <        FailingConsumer r = new FailingConsumer();
646 <        CompletableFuture<Void> g = f.thenAccept(r);
647 <        f.complete(one);
648 <        checkCompletedWithWrappedCFException(g);
649 <        assertTrue(r.ran);
650 <    }
1284 >        checkCompletedWithWrappedCFException(g, ex);
1285 >        checkCompletedWithWrappedCFException(f, ex);
1286 >        r.assertNotInvoked();
1287 >    }}
1288  
1289      /**
1290       * thenAccept result completes exceptionally if source cancelled
1291       */
1292 <    public void testThenAccept4() {
1293 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1294 <        IncAction r = new IncAction();
1295 <        CompletableFuture<Void> g = f.thenAccept(r);
1296 <        assertTrue(f.cancel(true));
1292 >    public void testThenAccept_sourceCancelled() {
1293 >        for (ExecutionMode m : ExecutionMode.values())
1294 >        for (boolean createIncomplete : new boolean[] { true, false })
1295 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1296 >    {
1297 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1298 >        final IncAction r = new IncAction(m);
1299 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1300 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1301 >        if (createIncomplete) {
1302 >            checkIncomplete(g);
1303 >            assertTrue(f.cancel(mayInterruptIfRunning));
1304 >        }
1305 >
1306          checkCompletedWithWrappedCancellationException(g);
1307 <    }
1307 >        checkCancelled(f);
1308 >        r.assertNotInvoked();
1309 >    }}
1310 >
1311 >    /**
1312 >     * thenAccept result completes exceptionally if action does
1313 >     */
1314 >    public void testThenAccept_actionFailed() {
1315 >        for (ExecutionMode m : ExecutionMode.values())
1316 >        for (boolean createIncomplete : new boolean[] { true, false })
1317 >        for (Integer v1 : new Integer[] { 1, null })
1318 >    {
1319 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1320 >        final FailingConsumer r = new FailingConsumer(m);
1321 >        if (!createIncomplete) f.complete(v1);
1322 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1323 >        if (createIncomplete) {
1324 >            checkIncomplete(g);
1325 >            f.complete(v1);
1326 >        }
1327  
1328 +        checkCompletedWithWrappedCFException(g);
1329 +        checkCompletedNormally(f, v1);
1330 +    }}
1331  
1332      /**
1333       * thenCombine result completes normally after normal completion
1334       * of sources
1335       */
1336 <    public void testThenCombine() {
1337 <        CompletableFuture<Integer> f, g, h;
1338 <
1339 <        f = new CompletableFuture<>();
1340 <        g = new CompletableFuture<>();
1341 <        h = f.thenCombine(g, subtract);
1342 <        f.complete(3);
1343 <        checkIncomplete(h);
1344 <        g.complete(1);
1345 <        checkCompletedNormally(h, 2);
1346 <
1347 <        f = new CompletableFuture<>();
1348 <        g = new CompletableFuture<>();
1349 <        h = f.thenCombine(g, subtract);
1350 <        g.complete(1);
1351 <        checkIncomplete(h);
1352 <        f.complete(3);
1353 <        checkCompletedNormally(h, 2);
1336 >    public void testThenCombine_normalCompletion() {
1337 >        for (ExecutionMode m : ExecutionMode.values())
1338 >        for (boolean createIncomplete : new boolean[] { true, false })
1339 >        for (boolean fFirst : new boolean[] { true, false })
1340 >        for (Integer v1 : new Integer[] { 1, null })
1341 >        for (Integer v2 : new Integer[] { 2, null })
1342 >    {
1343 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1344 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1345 >        final SubtractFunction r = new SubtractFunction(m);
1346 >
1347 >        if (fFirst) f.complete(v1); else g.complete(v2);
1348 >        if (!createIncomplete)
1349 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1350 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1351 >        if (createIncomplete) {
1352 >            checkIncomplete(h);
1353 >            r.assertNotInvoked();
1354 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1355 >        }
1356  
1357 <        f = new CompletableFuture<>();
1358 <        g = new CompletableFuture<>();
1359 <        g.complete(1);
1360 <        f.complete(3);
1361 <        h = f.thenCombine(g, subtract);
692 <        checkCompletedNormally(h, 2);
693 <    }
1357 >        checkCompletedNormally(h, subtract(v1, v2));
1358 >        checkCompletedNormally(f, v1);
1359 >        checkCompletedNormally(g, v2);
1360 >        r.assertInvoked();
1361 >    }}
1362  
1363      /**
1364       * thenCombine result completes exceptionally after exceptional
1365       * completion of either source
1366       */
1367 <    public void testThenCombine2() {
1368 <        CompletableFuture<Integer> f, g, h;
1369 <
1370 <        f = new CompletableFuture<>();
1371 <        g = new CompletableFuture<>();
1372 <        h = f.thenCombine(g, subtract);
1373 <        f.completeExceptionally(new CFException());
1374 <        checkIncomplete(h);
1375 <        g.complete(1);
1376 <        checkCompletedWithWrappedCFException(h);
1377 <
1378 <        f = new CompletableFuture<>();
1379 <        g = new CompletableFuture<>();
1380 <        h = f.thenCombine(g, subtract);
1381 <        g.completeExceptionally(new CFException());
1382 <        checkIncomplete(h);
1383 <        f.complete(3);
1384 <        checkCompletedWithWrappedCFException(h);
1367 >    public void testThenCombine_exceptionalCompletion() {
1368 >        for (ExecutionMode m : ExecutionMode.values())
1369 >        for (boolean createIncomplete : new boolean[] { true, false })
1370 >        for (boolean fFirst : new boolean[] { true, false })
1371 >        for (Integer v1 : new Integer[] { 1, null })
1372 >    {
1373 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1374 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1375 >        final CFException ex = new CFException();
1376 >        final SubtractFunction r = new SubtractFunction(m);
1377 >
1378 >        (fFirst ? f : g).complete(v1);
1379 >        if (!createIncomplete)
1380 >            (!fFirst ? f : g).completeExceptionally(ex);
1381 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1382 >        if (createIncomplete) {
1383 >            checkIncomplete(h);
1384 >            (!fFirst ? f : g).completeExceptionally(ex);
1385 >        }
1386  
1387 <        f = new CompletableFuture<>();
1388 <        g = new CompletableFuture<>();
1389 <        f.complete(3);
1390 <        g.completeExceptionally(new CFException());
1391 <        h = f.thenCombine(g, subtract);
723 <        checkCompletedWithWrappedCFException(h);
724 <
725 <        f = new CompletableFuture<>();
726 <        g = new CompletableFuture<>();
727 <        f.completeExceptionally(new CFException());
728 <        g.complete(3);
729 <        h = f.thenCombine(g, subtract);
730 <        checkCompletedWithWrappedCFException(h);
731 <    }
732 <
733 <    /**
734 <     * thenCombine result completes exceptionally if action does
735 <     */
736 <    public void testThenCombine3() {
737 <        CompletableFuture<Integer> f = new CompletableFuture<>();
738 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
739 <        FailingBiFunction r = new FailingBiFunction();
740 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
741 <        f.complete(one);
742 <        checkIncomplete(g);
743 <        assertFalse(r.ran);
744 <        f2.complete(two);
745 <        checkCompletedWithWrappedCFException(g);
746 <        assertTrue(r.ran);
747 <    }
1387 >        checkCompletedWithWrappedCFException(h, ex);
1388 >        r.assertNotInvoked();
1389 >        checkCompletedNormally(fFirst ? f : g, v1);
1390 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1391 >    }}
1392  
1393      /**
1394       * thenCombine result completes exceptionally if either source cancelled
1395       */
1396 <    public void testThenCombine4() {
1397 <        CompletableFuture<Integer> f, g, h;
1396 >    public void testThenCombine_sourceCancelled() {
1397 >        for (ExecutionMode m : ExecutionMode.values())
1398 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399 >        for (boolean createIncomplete : new boolean[] { true, false })
1400 >        for (boolean fFirst : new boolean[] { true, false })
1401 >        for (Integer v1 : new Integer[] { 1, null })
1402 >    {
1403 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1404 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1405 >        final SubtractFunction r = new SubtractFunction(m);
1406 >
1407 >        (fFirst ? f : g).complete(v1);
1408 >        if (!createIncomplete)
1409 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1410 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1411 >        if (createIncomplete) {
1412 >            checkIncomplete(h);
1413 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1414 >        }
1415  
755        f = new CompletableFuture<>();
756        g = new CompletableFuture<>();
757        h = f.thenCombine(g, subtract);
758        assertTrue(f.cancel(true));
759        checkIncomplete(h);
760        g.complete(1);
1416          checkCompletedWithWrappedCancellationException(h);
1417 +        checkCancelled(!fFirst ? f : g);
1418 +        r.assertNotInvoked();
1419 +        checkCompletedNormally(fFirst ? f : g, v1);
1420 +    }}
1421  
1422 <        f = new CompletableFuture<>();
1423 <        g = new CompletableFuture<>();
1424 <        h = f.thenCombine(g, subtract);
1425 <        assertTrue(g.cancel(true));
1426 <        checkIncomplete(h);
1427 <        f.complete(3);
1428 <        checkCompletedWithWrappedCancellationException(h);
1422 >    /**
1423 >     * thenCombine result completes exceptionally if action does
1424 >     */
1425 >    public void testThenCombine_actionFailed() {
1426 >        for (ExecutionMode m : ExecutionMode.values())
1427 >        for (boolean fFirst : new boolean[] { true, false })
1428 >        for (Integer v1 : new Integer[] { 1, null })
1429 >        for (Integer v2 : new Integer[] { 2, null })
1430 >    {
1431 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1432 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1433 >        final FailingBiFunction r = new FailingBiFunction(m);
1434 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1435 >
1436 >        if (fFirst) {
1437 >            f.complete(v1);
1438 >            g.complete(v2);
1439 >        } else {
1440 >            g.complete(v2);
1441 >            f.complete(v1);
1442 >        }
1443  
1444 <        f = new CompletableFuture<>();
1445 <        g = new CompletableFuture<>();
1446 <        assertTrue(f.cancel(true));
1447 <        assertTrue(g.cancel(true));
775 <        h = f.thenCombine(g, subtract);
776 <        checkCompletedWithWrappedCancellationException(h);
777 <    }
1444 >        checkCompletedWithWrappedCFException(h);
1445 >        checkCompletedNormally(f, v1);
1446 >        checkCompletedNormally(g, v2);
1447 >    }}
1448  
1449      /**
1450       * thenAcceptBoth result completes normally after normal
1451       * completion of sources
1452       */
1453 <    public void testThenAcceptBoth() {
1454 <        CompletableFuture<Integer> f, g;
1455 <        CompletableFuture<Void> h;
1456 <        SubtractAction r;
1457 <
1458 <        f = new CompletableFuture<>();
1459 <        g = new CompletableFuture<>();
1460 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1461 <        f.complete(3);
1462 <        checkIncomplete(h);
1463 <        g.complete(1);
1464 <        checkCompletedNormally(h, null);
1465 <        assertEquals(r.value, 2);
1453 >    public void testThenAcceptBoth_normalCompletion() {
1454 >        for (ExecutionMode m : ExecutionMode.values())
1455 >        for (boolean createIncomplete : new boolean[] { true, false })
1456 >        for (boolean fFirst : new boolean[] { true, false })
1457 >        for (Integer v1 : new Integer[] { 1, null })
1458 >        for (Integer v2 : new Integer[] { 2, null })
1459 >    {
1460 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1461 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1462 >        final SubtractAction r = new SubtractAction(m);
1463 >
1464 >        if (fFirst) f.complete(v1); else g.complete(v2);
1465 >        if (!createIncomplete)
1466 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1467 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1468 >        if (createIncomplete) {
1469 >            checkIncomplete(h);
1470 >            r.assertNotInvoked();
1471 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1472 >        }
1473  
797        f = new CompletableFuture<>();
798        g = new CompletableFuture<>();
799        h = f.thenAcceptBoth(g, r = new SubtractAction());
800        g.complete(1);
801        checkIncomplete(h);
802        f.complete(3);
1474          checkCompletedNormally(h, null);
1475 <        assertEquals(r.value, 2);
1476 <
1477 <        f = new CompletableFuture<>();
1478 <        g = new CompletableFuture<>();
808 <        g.complete(1);
809 <        f.complete(3);
810 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
811 <        checkCompletedNormally(h, null);
812 <        assertEquals(r.value, 2);
813 <    }
1475 >        r.assertValue(subtract(v1, v2));
1476 >        checkCompletedNormally(f, v1);
1477 >        checkCompletedNormally(g, v2);
1478 >    }}
1479  
1480      /**
1481       * thenAcceptBoth result completes exceptionally after exceptional
1482       * completion of either source
1483       */
1484 <    public void testThenAcceptBoth2() {
1485 <        CompletableFuture<Integer> f, g;
1486 <        CompletableFuture<Void> h;
1487 <        SubtractAction r;
1488 <
1489 <        f = new CompletableFuture<>();
1490 <        g = new CompletableFuture<>();
1491 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1492 <        f.completeExceptionally(new CFException());
1493 <        checkIncomplete(h);
1494 <        g.complete(1);
1495 <        checkCompletedWithWrappedCFException(h);
1496 <
1497 <        f = new CompletableFuture<>();
1498 <        g = new CompletableFuture<>();
1499 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1500 <        g.completeExceptionally(new CFException());
1501 <        checkIncomplete(h);
1502 <        f.complete(3);
838 <        checkCompletedWithWrappedCFException(h);
839 <
840 <        f = new CompletableFuture<>();
841 <        g = new CompletableFuture<>();
842 <        f.complete(3);
843 <        g.completeExceptionally(new CFException());
844 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
845 <        checkCompletedWithWrappedCFException(h);
846 <
847 <        f = new CompletableFuture<>();
848 <        g = new CompletableFuture<>();
849 <        f.completeExceptionally(new CFException());
850 <        g.complete(3);
851 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
852 <        checkCompletedWithWrappedCFException(h);
853 <    }
854 <
855 <    /**
856 <     * thenAcceptBoth result completes exceptionally if action does
857 <     */
858 <    public void testThenAcceptBoth3() {
859 <        CompletableFuture<Integer> f, g;
860 <        CompletableFuture<Void> h;
861 <        FailingBiConsumer r;
1484 >    public void testThenAcceptBoth_exceptionalCompletion() {
1485 >        for (ExecutionMode m : ExecutionMode.values())
1486 >        for (boolean createIncomplete : new boolean[] { true, false })
1487 >        for (boolean fFirst : new boolean[] { true, false })
1488 >        for (Integer v1 : new Integer[] { 1, null })
1489 >    {
1490 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1491 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1492 >        final CFException ex = new CFException();
1493 >        final SubtractAction r = new SubtractAction(m);
1494 >
1495 >        (fFirst ? f : g).complete(v1);
1496 >        if (!createIncomplete)
1497 >            (!fFirst ? f : g).completeExceptionally(ex);
1498 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1499 >        if (createIncomplete) {
1500 >            checkIncomplete(h);
1501 >            (!fFirst ? f : g).completeExceptionally(ex);
1502 >        }
1503  
1504 <        f = new CompletableFuture<>();
1505 <        g = new CompletableFuture<>();
1506 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1507 <        f.complete(3);
1508 <        checkIncomplete(h);
868 <        g.complete(1);
869 <        checkCompletedWithWrappedCFException(h);
870 <
871 <        f = new CompletableFuture<>();
872 <        g = new CompletableFuture<>();
873 <        f.complete(3);
874 <        g.complete(1);
875 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
876 <        checkCompletedWithWrappedCFException(h);
877 <    }
1504 >        checkCompletedWithWrappedCFException(h, ex);
1505 >        r.assertNotInvoked();
1506 >        checkCompletedNormally(fFirst ? f : g, v1);
1507 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1508 >    }}
1509  
1510      /**
1511       * thenAcceptBoth result completes exceptionally if either source cancelled
1512       */
1513 <    public void testThenAcceptBoth4() {
1514 <        CompletableFuture<Integer> f, g;
1515 <        CompletableFuture<Void> h;
1516 <        SubtractAction r;
1517 <
1518 <        f = new CompletableFuture<>();
1519 <        g = new CompletableFuture<>();
1520 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1521 <        assertTrue(f.cancel(true));
1522 <        checkIncomplete(h);
1523 <        g.complete(1);
1524 <        checkCompletedWithWrappedCancellationException(h);
1513 >    public void testThenAcceptBoth_sourceCancelled() {
1514 >        for (ExecutionMode m : ExecutionMode.values())
1515 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1516 >        for (boolean createIncomplete : new boolean[] { true, false })
1517 >        for (boolean fFirst : new boolean[] { true, false })
1518 >        for (Integer v1 : new Integer[] { 1, null })
1519 >    {
1520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1521 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1522 >        final SubtractAction r = new SubtractAction(m);
1523 >
1524 >        (fFirst ? f : g).complete(v1);
1525 >        if (!createIncomplete)
1526 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1527 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1528 >        if (createIncomplete) {
1529 >            checkIncomplete(h);
1530 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1531 >        }
1532  
895        f = new CompletableFuture<>();
896        g = new CompletableFuture<>();
897        h = f.thenAcceptBoth(g, r = new SubtractAction());
898        assertTrue(g.cancel(true));
899        checkIncomplete(h);
900        f.complete(3);
1533          checkCompletedWithWrappedCancellationException(h);
1534 +        checkCancelled(!fFirst ? f : g);
1535 +        r.assertNotInvoked();
1536 +        checkCompletedNormally(fFirst ? f : g, v1);
1537 +    }}
1538  
1539 <        f = new CompletableFuture<>();
1540 <        g = new CompletableFuture<>();
1541 <        f.complete(3);
1542 <        assertTrue(g.cancel(true));
1543 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1544 <        checkCompletedWithWrappedCancellationException(h);
1539 >    /**
1540 >     * thenAcceptBoth result completes exceptionally if action does
1541 >     */
1542 >    public void testThenAcceptBoth_actionFailed() {
1543 >        for (ExecutionMode m : ExecutionMode.values())
1544 >        for (boolean fFirst : new boolean[] { true, false })
1545 >        for (Integer v1 : new Integer[] { 1, null })
1546 >        for (Integer v2 : new Integer[] { 2, null })
1547 >    {
1548 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1549 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1550 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1551 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1552 >
1553 >        if (fFirst) {
1554 >            f.complete(v1);
1555 >            g.complete(v2);
1556 >        } else {
1557 >            g.complete(v2);
1558 >            f.complete(v1);
1559 >        }
1560  
1561 <        f = new CompletableFuture<>();
1562 <        g = new CompletableFuture<>();
1563 <        assertTrue(f.cancel(true));
1564 <        g.complete(3);
914 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
915 <        checkCompletedWithWrappedCancellationException(h);
916 <    }
1561 >        checkCompletedWithWrappedCFException(h);
1562 >        checkCompletedNormally(f, v1);
1563 >        checkCompletedNormally(g, v2);
1564 >    }}
1565  
1566      /**
1567       * runAfterBoth result completes normally after normal
1568       * completion of sources
1569       */
1570 <    public void testRunAfterBoth() {
1571 <        CompletableFuture<Integer> f, g;
1572 <        CompletableFuture<Void> h;
1573 <        Noop r;
1574 <
1575 <        f = new CompletableFuture<>();
1576 <        g = new CompletableFuture<>();
1577 <        h = f.runAfterBoth(g, r = new Noop());
1578 <        f.complete(3);
1579 <        checkIncomplete(h);
1580 <        g.complete(1);
1581 <        checkCompletedNormally(h, null);
1582 <        assertTrue(r.ran);
1570 >    public void testRunAfterBoth_normalCompletion() {
1571 >        for (ExecutionMode m : ExecutionMode.values())
1572 >        for (boolean createIncomplete : new boolean[] { true, false })
1573 >        for (boolean fFirst : new boolean[] { true, false })
1574 >        for (Integer v1 : new Integer[] { 1, null })
1575 >        for (Integer v2 : new Integer[] { 2, null })
1576 >    {
1577 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1578 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1579 >        final Noop r = new Noop(m);
1580 >
1581 >        if (fFirst) f.complete(v1); else g.complete(v2);
1582 >        if (!createIncomplete)
1583 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1584 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1585 >        if (createIncomplete) {
1586 >            checkIncomplete(h);
1587 >            r.assertNotInvoked();
1588 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1589 >        }
1590  
936        f = new CompletableFuture<>();
937        g = new CompletableFuture<>();
938        h = f.runAfterBoth(g, r = new Noop());
939        g.complete(1);
940        checkIncomplete(h);
941        f.complete(3);
1591          checkCompletedNormally(h, null);
1592 <        assertTrue(r.ran);
1593 <
1594 <        f = new CompletableFuture<>();
1595 <        g = new CompletableFuture<>();
947 <        g.complete(1);
948 <        f.complete(3);
949 <        h = f.runAfterBoth(g, r = new Noop());
950 <        checkCompletedNormally(h, null);
951 <        assertTrue(r.ran);
952 <    }
1592 >        r.assertInvoked();
1593 >        checkCompletedNormally(f, v1);
1594 >        checkCompletedNormally(g, v2);
1595 >    }}
1596  
1597      /**
1598       * runAfterBoth result completes exceptionally after exceptional
1599       * completion of either source
1600       */
1601 <    public void testRunAfterBoth2() {
1602 <        CompletableFuture<Integer> f, g;
1603 <        CompletableFuture<Void> h;
1604 <        Noop r;
1605 <
1606 <        f = new CompletableFuture<>();
1607 <        g = new CompletableFuture<>();
1608 <        h = f.runAfterBoth(g, r = new Noop());
1609 <        f.completeExceptionally(new CFException());
1610 <        checkIncomplete(h);
1611 <        g.complete(1);
1612 <        checkCompletedWithWrappedCFException(h);
1613 <        assertFalse(r.ran);
1601 >    public void testRunAfterBoth_exceptionalCompletion() {
1602 >        for (ExecutionMode m : ExecutionMode.values())
1603 >        for (boolean createIncomplete : new boolean[] { true, false })
1604 >        for (boolean fFirst : new boolean[] { true, false })
1605 >        for (Integer v1 : new Integer[] { 1, null })
1606 >    {
1607 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1608 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1609 >        final CFException ex = new CFException();
1610 >        final Noop r = new Noop(m);
1611 >
1612 >        (fFirst ? f : g).complete(v1);
1613 >        if (!createIncomplete)
1614 >            (!fFirst ? f : g).completeExceptionally(ex);
1615 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1616 >        if (createIncomplete) {
1617 >            checkIncomplete(h);
1618 >            (!fFirst ? f : g).completeExceptionally(ex);
1619 >        }
1620  
1621 <        f = new CompletableFuture<>();
1622 <        g = new CompletableFuture<>();
1623 <        h = f.runAfterBoth(g, r = new Noop());
1624 <        g.completeExceptionally(new CFException());
1625 <        checkIncomplete(h);
977 <        f.complete(3);
978 <        checkCompletedWithWrappedCFException(h);
979 <        assertFalse(r.ran);
1621 >        checkCompletedWithWrappedCFException(h, ex);
1622 >        r.assertNotInvoked();
1623 >        checkCompletedNormally(fFirst ? f : g, v1);
1624 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1625 >    }}
1626  
1627 <        f = new CompletableFuture<>();
1628 <        g = new CompletableFuture<>();
1629 <        g.completeExceptionally(new CFException());
1630 <        f.complete(3);
1631 <        h = f.runAfterBoth(g, r = new Noop());
1632 <        checkCompletedWithWrappedCFException(h);
1633 <        assertFalse(r.ran);
1627 >    /**
1628 >     * runAfterBoth result completes exceptionally if either source cancelled
1629 >     */
1630 >    public void testRunAfterBoth_sourceCancelled() {
1631 >        for (ExecutionMode m : ExecutionMode.values())
1632 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1633 >        for (boolean createIncomplete : new boolean[] { true, false })
1634 >        for (boolean fFirst : new boolean[] { true, false })
1635 >        for (Integer v1 : new Integer[] { 1, null })
1636 >    {
1637 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1638 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1639 >        final Noop r = new Noop(m);
1640 >
1641 >
1642 >        (fFirst ? f : g).complete(v1);
1643 >        if (!createIncomplete)
1644 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1645 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1646 >        if (createIncomplete) {
1647 >            checkIncomplete(h);
1648 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1649 >        }
1650  
1651 <        f = new CompletableFuture<>();
1652 <        g = new CompletableFuture<>();
1653 <        f.completeExceptionally(new CFException());
1654 <        g.complete(1);
1655 <        h = f.runAfterBoth(g, r = new Noop());
994 <        checkCompletedWithWrappedCFException(h);
995 <        assertFalse(r.ran);
996 <    }
1651 >        checkCompletedWithWrappedCancellationException(h);
1652 >        checkCancelled(!fFirst ? f : g);
1653 >        r.assertNotInvoked();
1654 >        checkCompletedNormally(fFirst ? f : g, v1);
1655 >    }}
1656  
1657      /**
1658       * runAfterBoth result completes exceptionally if action does
1659       */
1660 <    public void testRunAfterBoth3() {
1661 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1662 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1663 <        FailingNoop r = new FailingNoop();
1664 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1665 <        f.complete(one);
1666 <        checkIncomplete(g);
1667 <        f2.complete(two);
1668 <        checkCompletedWithWrappedCFException(g);
1669 <    }
1660 >    public void testRunAfterBoth_actionFailed() {
1661 >        for (ExecutionMode m : ExecutionMode.values())
1662 >        for (boolean fFirst : new boolean[] { true, false })
1663 >        for (Integer v1 : new Integer[] { 1, null })
1664 >        for (Integer v2 : new Integer[] { 2, null })
1665 >    {
1666 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 >        final FailingRunnable r1 = new FailingRunnable(m);
1669 >        final FailingRunnable r2 = new FailingRunnable(m);
1670 >
1671 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1672 >        if (fFirst) {
1673 >            f.complete(v1);
1674 >            g.complete(v2);
1675 >        } else {
1676 >            g.complete(v2);
1677 >            f.complete(v1);
1678 >        }
1679 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1680  
1681 <    /**
1682 <     * runAfterBoth result completes exceptionally if either source cancelled
1683 <     */
1684 <    public void testRunAfterBoth4() {
1685 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1017 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1018 <        Noop r = new Noop();
1019 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1020 <        assertTrue(f.cancel(true));
1021 <        f2.complete(two);
1022 <        checkCompletedWithWrappedCancellationException(g);
1023 <        f = new CompletableFuture<>();
1024 <        f2 = new CompletableFuture<>();
1025 <        r = new Noop();
1026 <        g = f.runAfterBoth(f2, r);
1027 <        f.complete(one);
1028 <        assertTrue(f2.cancel(true));
1029 <        checkCompletedWithWrappedCancellationException(g);
1030 <    }
1681 >        checkCompletedWithWrappedCFException(h1);
1682 >        checkCompletedWithWrappedCFException(h2);
1683 >        checkCompletedNormally(f, v1);
1684 >        checkCompletedNormally(g, v2);
1685 >    }}
1686  
1687      /**
1688       * applyToEither result completes normally after normal completion
1689       * of either source
1690       */
1691 <    public void testApplyToEither() {
1692 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1693 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1694 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1695 <        f.complete(one);
1696 <        checkCompletedNormally(g, two);
1697 <        f2.complete(one);
1698 <        checkCompletedNormally(g, two);
1699 <
1700 <        f = new CompletableFuture<>();
1701 <        f.complete(one);
1702 <        f2 = new CompletableFuture<>();
1703 <        g = f.applyToEither(f2, inc);
1704 <        checkCompletedNormally(g, two);
1705 <    }
1691 >    public void testApplyToEither_normalCompletion() {
1692 >        for (ExecutionMode m : ExecutionMode.values())
1693 >        for (Integer v1 : new Integer[] { 1, null })
1694 >        for (Integer v2 : new Integer[] { 2, null })
1695 >    {
1696 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1697 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1698 >        final IncFunction[] rs = new IncFunction[6];
1699 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1700 >
1701 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1702 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1703 >        checkIncomplete(h0);
1704 >        checkIncomplete(h1);
1705 >        rs[0].assertNotInvoked();
1706 >        rs[1].assertNotInvoked();
1707 >        f.complete(v1);
1708 >        checkCompletedNormally(h0, inc(v1));
1709 >        checkCompletedNormally(h1, inc(v1));
1710 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1711 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1712 >        checkCompletedNormally(h2, inc(v1));
1713 >        checkCompletedNormally(h3, inc(v1));
1714 >        g.complete(v2);
1715 >
1716 >        // unspecified behavior - both source completions available
1717 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1718 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1719 >        rs[4].assertValue(h4.join());
1720 >        rs[5].assertValue(h5.join());
1721 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1722 >                   Objects.equals(inc(v2), h4.join()));
1723 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1724 >                   Objects.equals(inc(v2), h5.join()));
1725 >
1726 >        checkCompletedNormally(f, v1);
1727 >        checkCompletedNormally(g, v2);
1728 >        checkCompletedNormally(h0, inc(v1));
1729 >        checkCompletedNormally(h1, inc(v1));
1730 >        checkCompletedNormally(h2, inc(v1));
1731 >        checkCompletedNormally(h3, inc(v1));
1732 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1733 >    }}
1734  
1735      /**
1736       * applyToEither result completes exceptionally after exceptional
1737       * completion of either source
1738       */
1739 <    public void testApplyToEither2() {
1740 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1741 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1742 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1743 <        f.completeExceptionally(new CFException());
1744 <        f2.complete(one);
1745 <        checkCompletedWithWrappedCFException(g);
1739 >    public void testApplyToEither_exceptionalCompletion() {
1740 >        for (ExecutionMode m : ExecutionMode.values())
1741 >        for (Integer v1 : new Integer[] { 1, null })
1742 >    {
1743 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1744 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1745 >        final CFException ex = new CFException();
1746 >        final IncFunction[] rs = new IncFunction[6];
1747 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1748 >
1749 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1750 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1751 >        checkIncomplete(h0);
1752 >        checkIncomplete(h1);
1753 >        rs[0].assertNotInvoked();
1754 >        rs[1].assertNotInvoked();
1755 >        f.completeExceptionally(ex);
1756 >        checkCompletedWithWrappedCFException(h0, ex);
1757 >        checkCompletedWithWrappedCFException(h1, ex);
1758 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1759 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1760 >        checkCompletedWithWrappedCFException(h2, ex);
1761 >        checkCompletedWithWrappedCFException(h3, ex);
1762 >        g.complete(v1);
1763 >
1764 >        // unspecified behavior - both source completions available
1765 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1766 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1767 >        try {
1768 >            assertEquals(inc(v1), h4.join());
1769 >            rs[4].assertInvoked();
1770 >        } catch (CompletionException ok) {
1771 >            checkCompletedWithWrappedCFException(h4, ex);
1772 >            rs[4].assertNotInvoked();
1773 >        }
1774 >        try {
1775 >            assertEquals(inc(v1), h5.join());
1776 >            rs[5].assertInvoked();
1777 >        } catch (CompletionException ok) {
1778 >            checkCompletedWithWrappedCFException(h5, ex);
1779 >            rs[5].assertNotInvoked();
1780 >        }
1781  
1782 <        f = new CompletableFuture<>();
1783 <        f2 = new CompletableFuture<>();
1784 <        f2.completeExceptionally(new CFException());
1785 <        g = f.applyToEither(f2, inc);
1786 <        checkCompletedWithWrappedCFException(g);
1787 <    }
1782 >        checkCompletedWithWrappedCFException(f, ex);
1783 >        checkCompletedNormally(g, v1);
1784 >        checkCompletedWithWrappedCFException(h0, ex);
1785 >        checkCompletedWithWrappedCFException(h1, ex);
1786 >        checkCompletedWithWrappedCFException(h2, ex);
1787 >        checkCompletedWithWrappedCFException(h3, ex);
1788 >        checkCompletedWithWrappedCFException(h4, ex);
1789 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1790 >    }}
1791  
1792      /**
1793 <     * applyToEither result completes exceptionally if action does
1793 >     * applyToEither result completes exceptionally if either source cancelled
1794       */
1795 <    public void testApplyToEither3() {
1796 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1797 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1798 <        FailingFunction r = new FailingFunction();
1799 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1800 <        f2.complete(two);
1801 <        checkCompletedWithWrappedCFException(g);
1802 <    }
1795 >    public void testApplyToEither_sourceCancelled() {
1796 >        for (ExecutionMode m : ExecutionMode.values())
1797 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1798 >        for (Integer v1 : new Integer[] { 1, null })
1799 >    {
1800 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1801 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1802 >        final IncFunction[] rs = new IncFunction[6];
1803 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1804 >
1805 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1806 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1807 >        checkIncomplete(h0);
1808 >        checkIncomplete(h1);
1809 >        rs[0].assertNotInvoked();
1810 >        rs[1].assertNotInvoked();
1811 >        f.cancel(mayInterruptIfRunning);
1812 >        checkCompletedWithWrappedCancellationException(h0);
1813 >        checkCompletedWithWrappedCancellationException(h1);
1814 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1815 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1816 >        checkCompletedWithWrappedCancellationException(h2);
1817 >        checkCompletedWithWrappedCancellationException(h3);
1818 >        g.complete(v1);
1819 >
1820 >        // unspecified behavior - both source completions available
1821 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1822 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1823 >        try {
1824 >            assertEquals(inc(v1), h4.join());
1825 >            rs[4].assertInvoked();
1826 >        } catch (CompletionException ok) {
1827 >            checkCompletedWithWrappedCancellationException(h4);
1828 >            rs[4].assertNotInvoked();
1829 >        }
1830 >        try {
1831 >            assertEquals(inc(v1), h5.join());
1832 >            rs[5].assertInvoked();
1833 >        } catch (CompletionException ok) {
1834 >            checkCompletedWithWrappedCancellationException(h5);
1835 >            rs[5].assertNotInvoked();
1836 >        }
1837 >
1838 >        checkCancelled(f);
1839 >        checkCompletedNormally(g, v1);
1840 >        checkCompletedWithWrappedCancellationException(h0);
1841 >        checkCompletedWithWrappedCancellationException(h1);
1842 >        checkCompletedWithWrappedCancellationException(h2);
1843 >        checkCompletedWithWrappedCancellationException(h3);
1844 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1845 >    }}
1846  
1847      /**
1848 <     * applyToEither result completes exceptionally if either source cancelled
1848 >     * applyToEither result completes exceptionally if action does
1849       */
1850 <    public void testApplyToEither4() {
1851 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1852 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1853 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1854 <        assertTrue(f.cancel(true));
1855 <        checkCompletedWithWrappedCancellationException(g);
1856 <        f = new CompletableFuture<>();
1857 <        f2 = new CompletableFuture<>();
1858 <        assertTrue(f2.cancel(true));
1859 <        checkCompletedWithWrappedCancellationException(g);
1860 <    }
1850 >    public void testApplyToEither_actionFailed() {
1851 >        for (ExecutionMode m : ExecutionMode.values())
1852 >        for (Integer v1 : new Integer[] { 1, null })
1853 >        for (Integer v2 : new Integer[] { 2, null })
1854 >    {
1855 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1856 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1857 >        final FailingFunction[] rs = new FailingFunction[6];
1858 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1859 >
1860 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1861 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1862 >        f.complete(v1);
1863 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1864 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1865 >        checkCompletedWithWrappedCFException(h0);
1866 >        checkCompletedWithWrappedCFException(h1);
1867 >        checkCompletedWithWrappedCFException(h2);
1868 >        checkCompletedWithWrappedCFException(h3);
1869 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1870 >
1871 >        g.complete(v2);
1872 >
1873 >        // unspecified behavior - both source completions available
1874 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1875 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1876 >
1877 >        checkCompletedWithWrappedCFException(h4);
1878 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1879 >                   Objects.equals(v2, rs[4].value));
1880 >        checkCompletedWithWrappedCFException(h5);
1881 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1882 >                   Objects.equals(v2, rs[5].value));
1883 >
1884 >        checkCompletedNormally(f, v1);
1885 >        checkCompletedNormally(g, v2);
1886 >    }}
1887  
1888      /**
1889       * acceptEither result completes normally after normal completion
1890       * of either source
1891       */
1892 <    public void testAcceptEither() {
1893 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1894 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1895 <        IncAction r = new IncAction();
1896 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1897 <        f.complete(one);
1898 <        checkCompletedNormally(g, null);
1899 <        f2.complete(one);
1900 <        checkCompletedNormally(g, null);
1901 <        assertEquals(r.value, 2);
1902 <
1903 <        r = new IncAction();
1904 <        f = new CompletableFuture<>();
1905 <        f.complete(one);
1906 <        f2 = new CompletableFuture<>();
1907 <        g = f.acceptEither(f2, r);
1908 <        checkCompletedNormally(g, null);
1909 <        assertEquals(r.value, 2);
1910 <    }
1892 >    public void testAcceptEither_normalCompletion() {
1893 >        for (ExecutionMode m : ExecutionMode.values())
1894 >        for (Integer v1 : new Integer[] { 1, null })
1895 >        for (Integer v2 : new Integer[] { 2, null })
1896 >    {
1897 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1898 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1899 >        final IncAction[] rs = new IncAction[6];
1900 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1901 >
1902 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1903 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1904 >        checkIncomplete(h0);
1905 >        checkIncomplete(h1);
1906 >        rs[0].assertNotInvoked();
1907 >        rs[1].assertNotInvoked();
1908 >        f.complete(v1);
1909 >        checkCompletedNormally(h0, null);
1910 >        checkCompletedNormally(h1, null);
1911 >        rs[0].assertValue(inc(v1));
1912 >        rs[1].assertValue(inc(v1));
1913 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1914 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1915 >        checkCompletedNormally(h2, null);
1916 >        checkCompletedNormally(h3, null);
1917 >        rs[2].assertValue(inc(v1));
1918 >        rs[3].assertValue(inc(v1));
1919 >        g.complete(v2);
1920 >
1921 >        // unspecified behavior - both source completions available
1922 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1923 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1924 >        checkCompletedNormally(h4, null);
1925 >        checkCompletedNormally(h5, null);
1926 >        assertTrue(Objects.equals(inc(v1), rs[4].value) ||
1927 >                   Objects.equals(inc(v2), rs[4].value));
1928 >        assertTrue(Objects.equals(inc(v1), rs[5].value) ||
1929 >                   Objects.equals(inc(v2), rs[5].value));
1930 >
1931 >        checkCompletedNormally(f, v1);
1932 >        checkCompletedNormally(g, v2);
1933 >        checkCompletedNormally(h0, null);
1934 >        checkCompletedNormally(h1, null);
1935 >        checkCompletedNormally(h2, null);
1936 >        checkCompletedNormally(h3, null);
1937 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1938 >    }}
1939  
1940      /**
1941       * acceptEither result completes exceptionally after exceptional
1942       * completion of either source
1943       */
1944 <    public void testAcceptEither2() {
1945 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1946 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1947 <        IncAction r = new IncAction();
1948 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1949 <        f.completeExceptionally(new CFException());
1950 <        f2.complete(one);
1951 <        checkCompletedWithWrappedCFException(g);
1944 >    public void testAcceptEither_exceptionalCompletion() {
1945 >        for (ExecutionMode m : ExecutionMode.values())
1946 >        for (Integer v1 : new Integer[] { 1, null })
1947 >    {
1948 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1949 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1950 >        final CFException ex = new CFException();
1951 >        final IncAction[] rs = new IncAction[6];
1952 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1953 >
1954 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1955 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1956 >        checkIncomplete(h0);
1957 >        checkIncomplete(h1);
1958 >        rs[0].assertNotInvoked();
1959 >        rs[1].assertNotInvoked();
1960 >        f.completeExceptionally(ex);
1961 >        checkCompletedWithWrappedCFException(h0, ex);
1962 >        checkCompletedWithWrappedCFException(h1, ex);
1963 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1964 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1965 >        checkCompletedWithWrappedCFException(h2, ex);
1966 >        checkCompletedWithWrappedCFException(h3, ex);
1967 >
1968 >        g.complete(v1);
1969 >
1970 >        // unspecified behavior - both source completions available
1971 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1972 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1973 >        try {
1974 >            assertNull(h4.join());
1975 >            rs[4].assertValue(inc(v1));
1976 >        } catch (CompletionException ok) {
1977 >            checkCompletedWithWrappedCFException(h4, ex);
1978 >            rs[4].assertNotInvoked();
1979 >        }
1980 >        try {
1981 >            assertNull(h5.join());
1982 >            rs[5].assertValue(inc(v1));
1983 >        } catch (CompletionException ok) {
1984 >            checkCompletedWithWrappedCFException(h5, ex);
1985 >            rs[5].assertNotInvoked();
1986 >        }
1987  
1988 <        r = new IncAction();
1989 <        f = new CompletableFuture<>();
1990 <        f2 = new CompletableFuture<>();
1991 <        f2.completeExceptionally(new CFException());
1992 <        g = f.acceptEither(f2, r);
1993 <        checkCompletedWithWrappedCFException(g);
1994 <    }
1995 <
1996 <    /**
1144 <     * acceptEither result completes exceptionally if action does
1145 <     */
1146 <    public void testAcceptEither3() {
1147 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1148 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1149 <        FailingConsumer r = new FailingConsumer();
1150 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1151 <        f2.complete(two);
1152 <        checkCompletedWithWrappedCFException(g);
1153 <    }
1988 >        checkCompletedWithWrappedCFException(f, ex);
1989 >        checkCompletedNormally(g, v1);
1990 >        checkCompletedWithWrappedCFException(h0, ex);
1991 >        checkCompletedWithWrappedCFException(h1, ex);
1992 >        checkCompletedWithWrappedCFException(h2, ex);
1993 >        checkCompletedWithWrappedCFException(h3, ex);
1994 >        checkCompletedWithWrappedCFException(h4, ex);
1995 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1996 >    }}
1997  
1998      /**
1999       * acceptEither result completes exceptionally if either source cancelled
2000       */
2001 <    public void testAcceptEither4() {
2002 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2003 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2004 <        IncAction r = new IncAction();
2005 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2006 <        assertTrue(f.cancel(true));
2007 <        checkCompletedWithWrappedCancellationException(g);
2008 <        f = new CompletableFuture<>();
2009 <        f2 = new CompletableFuture<>();
2010 <        assertTrue(f2.cancel(true));
2011 <        checkCompletedWithWrappedCancellationException(g);
2012 <    }
2013 <
2014 <
2015 <    /**
2016 <     * runAfterEither result completes normally after normal completion
2017 <     * of either source
2018 <     */
2019 <    public void testRunAfterEither() {
2020 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2021 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2022 <        Noop r = new Noop();
2023 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2024 <        f.complete(one);
2025 <        checkCompletedNormally(g, null);
2026 <        f2.complete(one);
2027 <        checkCompletedNormally(g, null);
2028 <        assertTrue(r.ran);
2029 <
1187 <        r = new Noop();
1188 <        f = new CompletableFuture<>();
1189 <        f.complete(one);
1190 <        f2 = new CompletableFuture<>();
1191 <        g = f.runAfterEither(f2, r);
1192 <        checkCompletedNormally(g, null);
1193 <        assertTrue(r.ran);
1194 <    }
1195 <
1196 <    /**
1197 <     * runAfterEither result completes exceptionally after exceptional
1198 <     * completion of either source
1199 <     */
1200 <    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);
1208 <
1209 <        r = new Noop();
1210 <        f = new CompletableFuture<>();
1211 <        f2 = new CompletableFuture<>();
1212 <        f2.completeExceptionally(new CFException());
1213 <        g = f.runAfterEither(f2, r);
1214 <        checkCompletedWithWrappedCFException(g);
1215 <    }
1216 <
1217 <    /**
1218 <     * runAfterEither result completes exceptionally if action does
1219 <     */
1220 <    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 <    }
1228 <
1229 <    /**
1230 <     * runAfterEither result completes exceptionally if either source cancelled
1231 <     */
1232 <    public void testRunAfterEither4() {
1233 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1234 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1235 <        Noop r = new Noop();
1236 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1237 <        assertTrue(f.cancel(true));
1238 <        checkCompletedWithWrappedCancellationException(g);
1239 <        f = new CompletableFuture<>();
1240 <        f2 = new CompletableFuture<>();
1241 <        assertTrue(f2.cancel(true));
1242 <        checkCompletedWithWrappedCancellationException(g);
1243 <    }
1244 <
1245 <    /**
1246 <     * thenCompose result completes normally after normal completion of source
1247 <     */
1248 <    public void testThenCompose() {
1249 <        CompletableFuture<Integer> f, g;
1250 <        CompletableFutureInc r;
1251 <
1252 <        f = new CompletableFuture<>();
1253 <        g = f.thenCompose(r = new CompletableFutureInc());
1254 <        f.complete(one);
1255 <        checkCompletedNormally(g, two);
1256 <        assertTrue(r.ran);
1257 <
1258 <        f = new CompletableFuture<>();
1259 <        f.complete(one);
1260 <        g = f.thenCompose(r = new CompletableFutureInc());
1261 <        checkCompletedNormally(g, two);
1262 <        assertTrue(r.ran);
1263 <    }
1264 <
1265 <    /**
1266 <     * thenCompose result completes exceptionally after exceptional
1267 <     * completion of source
1268 <     */
1269 <    public void testThenCompose2() {
1270 <        CompletableFuture<Integer> f, g;
1271 <        CompletableFutureInc r;
1272 <
1273 <        f = new CompletableFuture<>();
1274 <        g = f.thenCompose(r = new CompletableFutureInc());
1275 <        f.completeExceptionally(new CFException());
1276 <        checkCompletedWithWrappedCFException(g);
1277 <
1278 <        f = new CompletableFuture<>();
1279 <        f.completeExceptionally(new CFException());
1280 <        g = f.thenCompose(r = new CompletableFutureInc());
1281 <        checkCompletedWithWrappedCFException(g);
1282 <    }
1283 <
1284 <    /**
1285 <     * thenCompose result completes exceptionally if action does
1286 <     */
1287 <    public void testThenCompose3() {
1288 <        CompletableFuture<Integer> f, g;
1289 <        FailingCompletableFutureFunction r;
1290 <
1291 <        f = new CompletableFuture<>();
1292 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1293 <        f.complete(one);
1294 <        checkCompletedWithWrappedCFException(g);
1295 <
1296 <        f = new CompletableFuture<>();
1297 <        f.complete(one);
1298 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1299 <        checkCompletedWithWrappedCFException(g);
1300 <    }
1301 <
1302 <    /**
1303 <     * thenCompose result completes exceptionally if source cancelled
1304 <     */
1305 <    public void testThenCompose4() {
1306 <        CompletableFuture<Integer> f, g;
1307 <        CompletableFutureInc r;
1308 <
1309 <        f = new CompletableFuture<>();
1310 <        g = f.thenCompose(r = new CompletableFutureInc());
1311 <        assertTrue(f.cancel(true));
1312 <        checkCompletedWithWrappedCancellationException(g);
1313 <
1314 <        f = new CompletableFuture<>();
1315 <        assertTrue(f.cancel(true));
1316 <        g = f.thenCompose(r = new CompletableFutureInc());
1317 <        checkCompletedWithWrappedCancellationException(g);
1318 <    }
1319 <
1320 <
1321 <    // asyncs
1322 <
1323 <    /**
1324 <     * thenRunAsync result completes normally after normal completion of source
1325 <     */
1326 <    public void testThenRunAsync() {
1327 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1328 <        Noop r = new Noop();
1329 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1330 <        f.complete(null);
1331 <        checkCompletedNormally(g, null);
1332 <
1333 <        // reordered version
1334 <        f = new CompletableFuture<>();
1335 <        f.complete(null);
1336 <        r = new Noop();
1337 <        g = f.thenRunAsync(r);
1338 <        checkCompletedNormally(g, null);
1339 <    }
1340 <
1341 <    /**
1342 <     * thenRunAsync result completes exceptionally after exceptional
1343 <     * completion of source
1344 <     */
1345 <    public void testThenRunAsync2() {
1346 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1347 <        Noop r = new Noop();
1348 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1349 <        f.completeExceptionally(new CFException());
2001 >    public void testAcceptEither_sourceCancelled() {
2002 >        for (ExecutionMode m : ExecutionMode.values())
2003 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2004 >        for (Integer v1 : new Integer[] { 1, null })
2005 >    {
2006 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2007 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2008 >        final IncAction[] rs = new IncAction[6];
2009 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
2010 >
2011 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2012 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2013 >        checkIncomplete(h0);
2014 >        checkIncomplete(h1);
2015 >        rs[0].assertNotInvoked();
2016 >        rs[1].assertNotInvoked();
2017 >        f.cancel(mayInterruptIfRunning);
2018 >        checkCompletedWithWrappedCancellationException(h0);
2019 >        checkCompletedWithWrappedCancellationException(h1);
2020 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2021 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2022 >        checkCompletedWithWrappedCancellationException(h2);
2023 >        checkCompletedWithWrappedCancellationException(h3);
2024 >
2025 >        g.complete(v1);
2026 >
2027 >        // unspecified behavior - both source completions available
2028 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2029 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2030          try {
2031 <            g.join();
2032 <            shouldThrow();
2033 <        } catch (Exception ok) {
2031 >            assertNull(h4.join());
2032 >            rs[4].assertValue(inc(v1));
2033 >        } catch (CompletionException ok) {
2034 >            checkCompletedWithWrappedCancellationException(h4);
2035 >            rs[4].assertNotInvoked();
2036          }
1355        checkCompletedWithWrappedCFException(g);
1356    }
1357
1358    /**
1359     * thenRunAsync result completes exceptionally if action does
1360     */
1361    public void testThenRunAsync3() {
1362        CompletableFuture<Integer> f = new CompletableFuture<>();
1363        FailingNoop r = new FailingNoop();
1364        CompletableFuture<Void> g = f.thenRunAsync(r);
1365        f.complete(null);
1366        checkCompletedWithWrappedCFException(g);
1367    }
1368
1369    /**
1370     * thenRunAsync result completes exceptionally if source cancelled
1371     */
1372    public void testThenRunAsync4() {
1373        CompletableFuture<Integer> f = new CompletableFuture<>();
1374        Noop r = new Noop();
1375        CompletableFuture<Void> g = f.thenRunAsync(r);
1376        assertTrue(f.cancel(true));
1377        checkCompletedWithWrappedCancellationException(g);
1378    }
1379
1380    /**
1381     * thenApplyAsync result completes normally after normal completion of source
1382     */
1383    public void testThenApplyAsync() {
1384        CompletableFuture<Integer> f = new CompletableFuture<>();
1385        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1386        f.complete(one);
1387        checkCompletedNormally(g, two);
1388    }
1389
1390    /**
1391     * thenApplyAsync result completes exceptionally after exceptional
1392     * completion of source
1393     */
1394    public void testThenApplyAsync2() {
1395        CompletableFuture<Integer> f = new CompletableFuture<>();
1396        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1397        f.completeExceptionally(new CFException());
1398        checkCompletedWithWrappedCFException(g);
1399    }
1400
1401    /**
1402     * thenApplyAsync result completes exceptionally if action does
1403     */
1404    public void testThenApplyAsync3() {
1405        CompletableFuture<Integer> f = new CompletableFuture<>();
1406        FailingFunction r = new FailingFunction();
1407        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1408        f.complete(null);
1409        checkCompletedWithWrappedCFException(g);
1410    }
1411
1412    /**
1413     * thenApplyAsync result completes exceptionally if source cancelled
1414     */
1415    public void testThenApplyAsync4() {
1416        CompletableFuture<Integer> f = new CompletableFuture<>();
1417        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1418        assertTrue(f.cancel(true));
1419        checkCompletedWithWrappedCancellationException(g);
1420    }
1421
1422    /**
1423     * thenAcceptAsync result completes normally after normal
1424     * completion of source
1425     */
1426    public void testThenAcceptAsync() {
1427        CompletableFuture<Integer> f = new CompletableFuture<>();
1428        IncAction r = new IncAction();
1429        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1430        f.complete(one);
1431        checkCompletedNormally(g, null);
1432        assertEquals(r.value, 2);
1433    }
1434
1435    /**
1436     * thenAcceptAsync result completes exceptionally after exceptional
1437     * completion of source
1438     */
1439    public void testThenAcceptAsync2() {
1440        CompletableFuture<Integer> f = new CompletableFuture<>();
1441        IncAction r = new IncAction();
1442        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1443        f.completeExceptionally(new CFException());
1444        checkCompletedWithWrappedCFException(g);
1445    }
1446
1447    /**
1448     * thenAcceptAsync result completes exceptionally if action does
1449     */
1450    public void testThenAcceptAsync3() {
1451        CompletableFuture<Integer> f = new CompletableFuture<>();
1452        FailingConsumer r = new FailingConsumer();
1453        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1454        f.complete(null);
1455        checkCompletedWithWrappedCFException(g);
1456    }
1457
1458    /**
1459     * thenAcceptAsync result completes exceptionally if source cancelled
1460     */
1461    public void testThenAcceptAsync4() {
1462        CompletableFuture<Integer> f = new CompletableFuture<>();
1463        IncAction r = new IncAction();
1464        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1465        assertTrue(f.cancel(true));
1466        checkCompletedWithWrappedCancellationException(g);
1467    }
1468
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
2089    // async with explicit executors
2090
2091    /**
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());
2037          try {
2038 <            g.join();
2039 <            shouldThrow();
2040 <        } catch (Exception ok) {
2038 >            assertNull(h5.join());
2039 >            rs[5].assertValue(inc(v1));
2040 >        } catch (CompletionException ok) {
2041 >            checkCompletedWithWrappedCancellationException(h5);
2042 >            rs[5].assertNotInvoked();
2043          }
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    /**
2149     * thenApplyAsync result completes normally after normal completion of source
2150     */
2151    public void testThenApplyAsyncE() {
2152        CompletableFuture<Integer> f = new CompletableFuture<>();
2153        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2154        f.complete(one);
2155        checkCompletedNormally(g, two);
2156    }
2157
2158    /**
2159     * thenApplyAsync result completes exceptionally after exceptional
2160     * completion of source
2161     */
2162    public void testThenApplyAsync2E() {
2163        CompletableFuture<Integer> f = new CompletableFuture<>();
2164        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2165        f.completeExceptionally(new CFException());
2166        checkCompletedWithWrappedCFException(g);
2167    }
2168
2169    /**
2170     * thenApplyAsync result completes exceptionally if action does
2171     */
2172    public void testThenApplyAsync3E() {
2173        CompletableFuture<Integer> f = new CompletableFuture<>();
2174        FailingFunction r = new FailingFunction();
2175        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2176        f.complete(null);
2177        checkCompletedWithWrappedCFException(g);
2178    }
2179
2180    /**
2181     * thenApplyAsync result completes exceptionally if source cancelled
2182     */
2183    public void testThenApplyAsync4E() {
2184        CompletableFuture<Integer> f = new CompletableFuture<>();
2185        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2186        assertTrue(f.cancel(true));
2187        checkCompletedWithWrappedCancellationException(g);
2188    }
2189
2190    /**
2191     * thenAcceptAsync result completes normally after normal
2192     * completion of source
2193     */
2194    public void testThenAcceptAsyncE() {
2195        CompletableFuture<Integer> f = new CompletableFuture<>();
2196        IncAction r = new IncAction();
2197        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2198        f.complete(one);
2199        checkCompletedNormally(g, null);
2200        assertEquals(r.value, 2);
2201    }
2202
2203    /**
2204     * thenAcceptAsync result completes exceptionally after exceptional
2205     * completion of source
2206     */
2207    public void testThenAcceptAsync2E() {
2208        CompletableFuture<Integer> f = new CompletableFuture<>();
2209        IncAction r = new IncAction();
2210        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2211        f.completeExceptionally(new CFException());
2212        checkCompletedWithWrappedCFException(g);
2213    }
2214
2215    /**
2216     * thenAcceptAsync result completes exceptionally if action does
2217     */
2218    public void testThenAcceptAsync3E() {
2219        CompletableFuture<Integer> f = new CompletableFuture<>();
2220        FailingConsumer r = new FailingConsumer();
2221        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2222        f.complete(null);
2223        checkCompletedWithWrappedCFException(g);
2224    }
2225
2226    /**
2227     * thenAcceptAsync result completes exceptionally if source cancelled
2228     */
2229    public void testThenAcceptAsync4E() {
2230        CompletableFuture<Integer> f = new CompletableFuture<>();
2231        IncAction r = new IncAction();
2232        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2233        assertTrue(f.cancel(true));
2234        checkCompletedWithWrappedCancellationException(g);
2235    }
2236
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);
2044  
2045 <        f = new CompletableFuture<>();
2046 <        g = new CompletableFuture<>();
2047 <        g.completeExceptionally(new CFException());
2048 <        h = f.thenCombineAsync(g, subtract, e);
2049 <        checkIncomplete(h);
2050 <        f.complete(3);
2051 <        checkCompletedWithWrappedCFException(h);
2052 <
2306 <        assertEquals(0, e.count.get());
2307 <    }
2045 >        checkCancelled(f);
2046 >        checkCompletedNormally(g, v1);
2047 >        checkCompletedWithWrappedCancellationException(h0);
2048 >        checkCompletedWithWrappedCancellationException(h1);
2049 >        checkCompletedWithWrappedCancellationException(h2);
2050 >        checkCompletedWithWrappedCancellationException(h3);
2051 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2052 >    }}
2053  
2054      /**
2055 <     * thenCombineAsync result completes exceptionally if action does
2055 >     * acceptEither result completes exceptionally if action does
2056       */
2057 <    public void testThenCombineAsync3E() {
2058 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2059 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2060 <        FailingBiFunction r = new FailingBiFunction();
2061 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2062 <        f.complete(one);
2063 <        checkIncomplete(g);
2064 <        assertFalse(r.ran);
2065 <        f2.complete(two);
2066 <        checkCompletedWithWrappedCFException(g);
2067 <        assertTrue(r.ran);
2068 <    }
2057 >    public void testAcceptEither_actionFailed() {
2058 >        for (ExecutionMode m : ExecutionMode.values())
2059 >        for (Integer v1 : new Integer[] { 1, null })
2060 >        for (Integer v2 : new Integer[] { 2, null })
2061 >    {
2062 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2063 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 >        final FailingConsumer[] rs = new FailingConsumer[6];
2065 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2066 >
2067 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2068 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2069 >        f.complete(v1);
2070 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2071 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2072 >        checkCompletedWithWrappedCFException(h0);
2073 >        checkCompletedWithWrappedCFException(h1);
2074 >        checkCompletedWithWrappedCFException(h2);
2075 >        checkCompletedWithWrappedCFException(h3);
2076 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2077 >
2078 >        g.complete(v2);
2079 >
2080 >        // unspecified behavior - both source completions available
2081 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2082 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2083 >
2084 >        checkCompletedWithWrappedCFException(h4);
2085 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2086 >                   Objects.equals(v2, rs[4].value));
2087 >        checkCompletedWithWrappedCFException(h5);
2088 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2089 >                   Objects.equals(v2, rs[5].value));
2090 >
2091 >        checkCompletedNormally(f, v1);
2092 >        checkCompletedNormally(g, v2);
2093 >    }}
2094  
2095      /**
2096 <     * thenCombineAsync result completes exceptionally if either source cancelled
2096 >     * runAfterEither result completes normally after normal completion
2097 >     * of either source
2098       */
2099 <    public void testThenCombineAsync4E() {
2100 <        CompletableFuture<Integer> f, g, h;
2101 <        ThreadExecutor e = new ThreadExecutor();
2099 >    public void testRunAfterEither_normalCompletion1() {
2100 >        for (ExecutionMode m : ExecutionMode.values())
2101 >        for (Integer v1 : new Integer[] { 1, null })
2102 >        for (Integer v2 : new Integer[] { 2, null })
2103 >    {
2104 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2105 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2106 >        final Noop r = new Noop(m);
2107 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2108  
2109 <        f = new CompletableFuture<>();
2110 <        g = new CompletableFuture<>();
2111 <        h = f.thenCombineAsync(g, subtract, e);
2112 <        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);
2109 >        f.complete(v1);
2110 >        checkCompletedNormally(h, null);
2111 >        r.assertInvoked();
2112 >        g.complete(v2);
2113  
2114 <        f = new CompletableFuture<>();
2115 <        g = new CompletableFuture<>();
2116 <        assertTrue(f.cancel(true));
2117 <        assertTrue(g.cancel(true));
2118 <        h = f.thenCombineAsync(g, subtract, e);
2361 <        checkCompletedWithWrappedCancellationException(h);
2114 >        checkCompletedNormally(f, v1);
2115 >        checkCompletedNormally(g, v2);
2116 >        checkCompletedNormally(h, null);
2117 >        r.assertInvoked();
2118 >    }}
2119  
2120 <        assertEquals(0, e.count.get());
2121 <    }
2120 >    public void testRunAfterEither_normalCompletion2() {
2121 >        for (ExecutionMode m : ExecutionMode.values())
2122 >        for (Integer v1 : new Integer[] { 1, null })
2123 >        for (Integer v2 : new Integer[] { 2, null })
2124 >    {
2125 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2126 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2127 >        final Noop r = new Noop(m);
2128 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2129  
2130 <    /**
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);
2130 >        g.complete(v2);
2131          checkCompletedNormally(h, null);
2132 <        assertEquals(r.value, 2);
2132 >        r.assertInvoked();
2133 >        f.complete(v1);
2134  
2135 <        f = new CompletableFuture<>();
2136 <        g = new CompletableFuture<>();
2387 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2388 <        g.complete(1);
2389 <        checkIncomplete(h);
2390 <        f.complete(3);
2135 >        checkCompletedNormally(f, v1);
2136 >        checkCompletedNormally(g, v2);
2137          checkCompletedNormally(h, null);
2138 <        assertEquals(r.value, 2);
2138 >        r.assertInvoked();
2139 >        }}
2140  
2141 <        f = new CompletableFuture<>();
2142 <        g = new CompletableFuture<>();
2143 <        g.complete(1);
2144 <        f.complete(3);
2145 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2146 <        checkCompletedNormally(h, null);
2147 <        assertEquals(r.value, 2);
2141 >    public void testRunAfterEither_normalCompletion3() {
2142 >        for (ExecutionMode m : ExecutionMode.values())
2143 >        for (Integer v1 : new Integer[] { 1, null })
2144 >        for (Integer v2 : new Integer[] { 2, null })
2145 >    {
2146 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2147 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2148 >        final Noop r = new Noop(m);
2149 >
2150 >        f.complete(v1);
2151 >        g.complete(v2);
2152 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2153  
2154 <        assertEquals(3, e.count.get());
2155 <    }
2154 >        checkCompletedNormally(h, null);
2155 >        checkCompletedNormally(f, v1);
2156 >        checkCompletedNormally(g, v2);
2157 >        r.assertInvoked();
2158 >    }}
2159  
2160      /**
2161 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2162 <     * completion of source
2161 >     * runAfterEither result completes exceptionally after exceptional
2162 >     * completion of either source
2163       */
2164 <    public void testThenAcceptBothAsync2E() {
2165 <        CompletableFuture<Integer> f, g;
2166 <        CompletableFuture<Void> h;
2167 <        SubtractAction r;
2168 <        ThreadExecutor e = new ThreadExecutor();
2169 <
2170 <        f = new CompletableFuture<>();
2171 <        g = new CompletableFuture<>();
2172 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2173 <        f.completeExceptionally(new CFException());
2174 <        checkIncomplete(h);
2175 <        g.complete(1);
2176 <        checkCompletedWithWrappedCFException(h);
2164 >    public void testRunAfterEither_exceptionalCompletion1() {
2165 >        for (ExecutionMode m : ExecutionMode.values())
2166 >        for (Integer v1 : new Integer[] { 1, null })
2167 >    {
2168 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2169 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2170 >        final Noop r = new Noop(m);
2171 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2172 >        final CFException ex = new CFException();
2173 >
2174 >        f.completeExceptionally(ex);
2175 >        checkCompletedWithWrappedCFException(h, ex);
2176 >        g.complete(v1);
2177 >
2178 >        r.assertNotInvoked();
2179 >        checkCompletedNormally(g, v1);
2180 >        checkCompletedWithWrappedCFException(f, ex);
2181 >        checkCompletedWithWrappedCFException(h, ex);
2182 >    }}
2183 >
2184 >    public void testRunAfterEither_exceptionalCompletion2() {
2185 >        for (ExecutionMode m : ExecutionMode.values())
2186 >        for (Integer v1 : new Integer[] { 1, null })
2187 >    {
2188 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2189 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2190 >        final Noop r = new Noop(m);
2191 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2192 >        final CFException ex = new CFException();
2193 >
2194 >        g.completeExceptionally(ex);
2195 >        checkCompletedWithWrappedCFException(h, ex);
2196 >        f.complete(v1);
2197 >
2198 >        r.assertNotInvoked();
2199 >        checkCompletedNormally(f, v1);
2200 >        checkCompletedWithWrappedCFException(g, ex);
2201 >        checkCompletedWithWrappedCFException(h, ex);
2202 >    }}
2203 >
2204 >    public void testRunAfterEither_exceptionalCompletion3() {
2205 >        for (ExecutionMode m : ExecutionMode.values())
2206 >        for (Integer v1 : new Integer[] { 1, null })
2207 >    {
2208 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2209 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2210 >        final Noop r = new Noop(m);
2211 >        final CFException ex = new CFException();
2212 >
2213 >        g.completeExceptionally(ex);
2214 >        f.complete(v1);
2215 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2216  
2217 <        f = new CompletableFuture<>();
2218 <        g = new CompletableFuture<>();
2219 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2220 <        g.completeExceptionally(new CFException());
2221 <        checkIncomplete(h);
2222 <        f.complete(3);
2223 <        checkCompletedWithWrappedCFException(h);
2217 >        // unspecified behavior
2218 >        Integer v;
2219 >        try {
2220 >            assertNull(h.join());
2221 >            r.assertInvoked();
2222 >        } catch (CompletionException ok) {
2223 >            checkCompletedWithWrappedCFException(h, ex);
2224 >            r.assertNotInvoked();
2225 >        }
2226  
2227 <        f = new CompletableFuture<>();
2228 <        g = new CompletableFuture<>();
2229 <        f.complete(3);
2230 <        g.completeExceptionally(new CFException());
2231 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2232 <        checkCompletedWithWrappedCFException(h);
2227 >        checkCompletedWithWrappedCFException(g, ex);
2228 >        checkCompletedNormally(f, v1);
2229 >    }}
2230 >
2231 >    public void testRunAfterEither_exceptionalCompletion4() {
2232 >        for (ExecutionMode m : ExecutionMode.values())
2233 >        for (Integer v1 : new Integer[] { 1, null })
2234 >    {
2235 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2236 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2237 >        final Noop r = new Noop(m);
2238 >        final CFException ex = new CFException();
2239 >
2240 >        f.completeExceptionally(ex);
2241 >        g.complete(v1);
2242 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2243  
2244 <        f = new CompletableFuture<>();
2245 <        g = new CompletableFuture<>();
2246 <        f.completeExceptionally(new CFException());
2247 <        g.complete(3);
2248 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2249 <        checkCompletedWithWrappedCFException(h);
2244 >        // unspecified behavior
2245 >        Integer v;
2246 >        try {
2247 >            assertNull(h.join());
2248 >            r.assertInvoked();
2249 >        } catch (CompletionException ok) {
2250 >            checkCompletedWithWrappedCFException(h, ex);
2251 >            r.assertNotInvoked();
2252 >        }
2253  
2254 <        assertEquals(0, e.count.get());
2255 <    }
2254 >        checkCompletedWithWrappedCFException(f, ex);
2255 >        checkCompletedNormally(g, v1);
2256 >    }}
2257  
2258      /**
2259 <     * thenAcceptBothAsync result completes exceptionally if action does
2259 >     * runAfterEither result completes exceptionally if action does
2260       */
2261 <    public void testThenAcceptBothAsync3E() {
2262 <        CompletableFuture<Integer> f, g;
2263 <        CompletableFuture<Void> h;
2264 <        FailingBiConsumer r;
2265 <        ThreadExecutor e = new ThreadExecutor();
2266 <
2267 <        f = new CompletableFuture<>();
2268 <        g = new CompletableFuture<>();
2269 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2270 <        f.complete(3);
2271 <        checkIncomplete(h);
2272 <        g.complete(1);
2273 <        checkCompletedWithWrappedCFException(h);
2274 <
2275 <        f = new CompletableFuture<>();
2276 <        g = new CompletableFuture<>();
2277 <        f.complete(3);
2278 <        g.complete(1);
2279 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2280 <        checkCompletedWithWrappedCFException(h);
2281 <
2282 <        assertEquals(2, e.count.get());
2283 <    }
2261 >    public void testRunAfterEither_actionFailed1() {
2262 >        for (ExecutionMode m : ExecutionMode.values())
2263 >        for (Integer v1 : new Integer[] { 1, null })
2264 >        for (Integer v2 : new Integer[] { 2, null })
2265 >    {
2266 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2267 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2268 >        final FailingRunnable r = new FailingRunnable(m);
2269 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2270 >
2271 >        f.complete(v1);
2272 >        checkCompletedWithWrappedCFException(h);
2273 >        g.complete(v2);
2274 >        checkCompletedNormally(f, v1);
2275 >        checkCompletedNormally(g, v2);
2276 >    }}
2277 >
2278 >    public void testRunAfterEither_actionFailed2() {
2279 >        for (ExecutionMode m : ExecutionMode.values())
2280 >        for (Integer v1 : new Integer[] { 1, null })
2281 >        for (Integer v2 : new Integer[] { 2, null })
2282 >    {
2283 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2284 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2285 >        final FailingRunnable r = new FailingRunnable(m);
2286 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2287 >
2288 >        g.complete(v2);
2289 >        checkCompletedWithWrappedCFException(h);
2290 >        f.complete(v1);
2291 >        checkCompletedNormally(f, v1);
2292 >        checkCompletedNormally(g, v2);
2293 >    }}
2294  
2295      /**
2296 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2296 >     * runAfterEither result completes exceptionally if either source cancelled
2297       */
2298 <    public void testThenAcceptBothAsync4E() {
2299 <        CompletableFuture<Integer> f, g;
2300 <        CompletableFuture<Void> h;
2301 <        SubtractAction r;
2302 <        ThreadExecutor e = new ThreadExecutor();
2298 >    public void testRunAfterEither_sourceCancelled1() {
2299 >        for (ExecutionMode m : ExecutionMode.values())
2300 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2301 >        for (Integer v1 : new Integer[] { 1, null })
2302 >    {
2303 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2304 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2305 >        final Noop r = new Noop(m);
2306 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2307  
2308 <        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);
2308 >        assertTrue(f.cancel(mayInterruptIfRunning));
2309          checkCompletedWithWrappedCancellationException(h);
2310 +        g.complete(v1);
2311  
2312 <        f = new CompletableFuture<>();
2313 <        g = new CompletableFuture<>();
2314 <        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);
2312 >        checkCancelled(f);
2313 >        r.assertNotInvoked();
2314 >        checkCompletedNormally(g, v1);
2315          checkCompletedWithWrappedCancellationException(h);
2316 +    }}
2317  
2318 <        assertEquals(0, e.count.get());
2319 <    }
2320 <
2321 <    /**
2322 <     * runAfterBothAsync result completes normally after normal
2323 <     * completion of sources
2324 <     */
2325 <    public void testRunAfterBothAsyncE() {
2326 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2327 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2328 <        Noop r = new Noop();
2329 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2330 <        f.complete(one);
2331 <        checkIncomplete(g);
2332 <        f2.complete(two);
2333 <        checkCompletedNormally(g, null);
2334 <        assertTrue(r.ran);
2335 <    }
2336 <
2337 <    /**
2338 <     * runAfterBothAsync result completes exceptionally after exceptional
2339 <     * completion of source
2340 <     */
2341 <    public void testRunAfterBothAsync2E() {
2342 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2343 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2344 <        Noop r = new Noop();
2345 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2346 <        f.completeExceptionally(new CFException());
2347 <        f2.complete(two);
2348 <        checkCompletedWithWrappedCFException(g);
2349 <
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 <    }
2318 >    public void testRunAfterEither_sourceCancelled2() {
2319 >        for (ExecutionMode m : ExecutionMode.values())
2320 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 Noop r = new Noop(m);
2326 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2327 >
2328 >        assertTrue(g.cancel(mayInterruptIfRunning));
2329 >        checkCompletedWithWrappedCancellationException(h);
2330 >        f.complete(v1);
2331 >
2332 >        checkCancelled(g);
2333 >        r.assertNotInvoked();
2334 >        checkCompletedNormally(f, v1);
2335 >        checkCompletedWithWrappedCancellationException(h);
2336 >    }}
2337 >
2338 >    public void testRunAfterEither_sourceCancelled3() {
2339 >        for (ExecutionMode m : ExecutionMode.values())
2340 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 Noop r = new Noop(m);
2346 >
2347 >        assertTrue(g.cancel(mayInterruptIfRunning));
2348 >        f.complete(v1);
2349 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2350  
2351 <    /**
2352 <     * applyToEitherAsync result completes exceptionally after exceptional
2353 <     * completion of source
2354 <     */
2355 <    public void testApplyToEitherAsync2E() {
2356 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2357 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2358 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2359 <        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 <    }
2351 >        // unspecified behavior
2352 >        Integer v;
2353 >        try {
2354 >            assertNull(h.join());
2355 >            r.assertInvoked();
2356 >        } catch (CompletionException ok) {
2357 >            checkCompletedWithWrappedCancellationException(h);
2358 >            r.assertNotInvoked();
2359 >        }
2360  
2361 <    /**
2362 <     * applyToEitherAsync result completes exceptionally if action does
2363 <     */
2364 <    public void testApplyToEitherAsync3E() {
2365 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2366 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2367 <        FailingFunction r = new FailingFunction();
2368 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2369 <        f.complete(one);
2370 <        checkCompletedWithWrappedCFException(g);
2371 <    }
2361 >        checkCancelled(g);
2362 >        checkCompletedNormally(f, v1);
2363 >    }}
2364 >
2365 >    public void testRunAfterEither_sourceCancelled4() {
2366 >        for (ExecutionMode m : ExecutionMode.values())
2367 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2368 >        for (Integer v1 : new Integer[] { 1, null })
2369 >    {
2370 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2371 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2372 >        final Noop r = new Noop(m);
2373 >
2374 >        assertTrue(f.cancel(mayInterruptIfRunning));
2375 >        g.complete(v1);
2376 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2377  
2378 <    /**
2379 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2380 <     */
2381 <    public void testApplyToEitherAsync4E() {
2382 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2383 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2384 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2385 <        assertTrue(f.cancel(true));
2386 <        checkCompletedWithWrappedCancellationException(g);
2378 >        // unspecified behavior
2379 >        Integer v;
2380 >        try {
2381 >            assertNull(h.join());
2382 >            r.assertInvoked();
2383 >        } catch (CompletionException ok) {
2384 >            checkCompletedWithWrappedCancellationException(h);
2385 >            r.assertNotInvoked();
2386 >        }
2387  
2388 <        f = new CompletableFuture<>();
2389 <        f2 = new CompletableFuture<>();
2390 <        assertTrue(f2.cancel(true));
2652 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2653 <        checkCompletedWithWrappedCancellationException(g);
2654 <    }
2388 >        checkCancelled(f);
2389 >        checkCompletedNormally(g, v1);
2390 >    }}
2391  
2392      /**
2393 <     * acceptEitherAsync result completes normally after normal
2658 <     * completion of sources
2393 >     * thenCompose result completes normally after normal completion of source
2394       */
2395 <    public void testAcceptEitherAsyncE() {
2396 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2397 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2398 <        IncAction r = new IncAction();
2399 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2400 <        f.complete(one);
2401 <        checkCompletedNormally(g, null);
2402 <        assertEquals(r.value, 2);
2403 <
2404 <        r = new IncAction();
2405 <        f = new CompletableFuture<>();
2406 <        f.complete(one);
2407 <        f2 = new CompletableFuture<>();
2408 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2409 <        checkCompletedNormally(g, null);
2675 <        assertEquals(r.value, 2);
2676 <    }
2395 >    public void testThenCompose_normalCompletion() {
2396 >        for (ExecutionMode m : ExecutionMode.values())
2397 >        for (boolean createIncomplete : new boolean[] { true, false })
2398 >        for (Integer v1 : new Integer[] { 1, null })
2399 >    {
2400 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2401 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2402 >        if (!createIncomplete) f.complete(v1);
2403 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2404 >        if (createIncomplete) f.complete(v1);
2405 >
2406 >        checkCompletedNormally(g, inc(v1));
2407 >        checkCompletedNormally(f, v1);
2408 >        r.assertInvoked();
2409 >    }}
2410  
2411      /**
2412 <     * acceptEitherAsync result completes exceptionally after exceptional
2412 >     * thenCompose result completes exceptionally after exceptional
2413       * completion of source
2414       */
2415 <    public void testAcceptEitherAsync2E() {
2416 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2417 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2418 <        IncAction r = new IncAction();
2419 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2420 <        f.completeExceptionally(new CFException());
2421 <        checkCompletedWithWrappedCFException(g);
2422 <
2423 <        r = new IncAction();
2424 <        f = new CompletableFuture<>();
2425 <        f2 = new CompletableFuture<>();
2426 <        f2.completeExceptionally(new CFException());
2427 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2428 <        f.complete(one);
2429 <        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 <    }
2415 >    public void testThenCompose_exceptionalCompletion() {
2416 >        for (ExecutionMode m : ExecutionMode.values())
2417 >        for (boolean createIncomplete : new boolean[] { true, false })
2418 >    {
2419 >        final CFException ex = new CFException();
2420 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2422 >        if (!createIncomplete) f.completeExceptionally(ex);
2423 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2424 >        if (createIncomplete) f.completeExceptionally(ex);
2425 >
2426 >        checkCompletedWithWrappedCFException(g, ex);
2427 >        checkCompletedWithWrappedCFException(f, ex);
2428 >        r.assertNotInvoked();
2429 >    }}
2430  
2431      /**
2432 <     * 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
2432 >     * thenCompose result completes exceptionally if action does
2433       */
2434 <    public void testThenComposeAsyncE() {
2435 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2436 <        CompletableFutureInc r = new CompletableFutureInc();
2437 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2438 <        f.complete(one);
2439 <        checkCompletedNormally(g, two);
2440 <    }
2434 >    public void testThenCompose_actionFailed() {
2435 >        for (ExecutionMode m : ExecutionMode.values())
2436 >        for (boolean createIncomplete : new boolean[] { true, false })
2437 >        for (Integer v1 : new Integer[] { 1, null })
2438 >    {
2439 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2440 >        final FailingCompletableFutureFunction r
2441 >            = new FailingCompletableFutureFunction(m);
2442 >        if (!createIncomplete) f.complete(v1);
2443 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2444 >        if (createIncomplete) f.complete(v1);
2445  
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());
2446          checkCompletedWithWrappedCFException(g);
2447 <    }
2447 >        checkCompletedNormally(f, v1);
2448 >    }}
2449  
2450      /**
2451 <     * thenComposeAsync result completes exceptionally if action does
2451 >     * thenCompose result completes exceptionally if source cancelled
2452       */
2453 <    public void testThenComposeAsync3E() {
2454 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2455 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2456 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2457 <        f.complete(one);
2458 <        checkCompletedWithWrappedCFException(g);
2459 <    }
2453 >    public void testThenCompose_sourceCancelled() {
2454 >        for (ExecutionMode m : ExecutionMode.values())
2455 >        for (boolean createIncomplete : new boolean[] { true, false })
2456 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2457 >    {
2458 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2459 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2460 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2461 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2462 >        if (createIncomplete) {
2463 >            checkIncomplete(g);
2464 >            assertTrue(f.cancel(mayInterruptIfRunning));
2465 >        }
2466  
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));
2467          checkCompletedWithWrappedCancellationException(g);
2468 <    }
2468 >        checkCancelled(f);
2469 >    }}
2470  
2471      // other static methods
2472  
# Line 2856 | Line 2475 | public class CompletableFutureTest exten
2475       * with the value null
2476       */
2477      public void testAllOf_empty() throws Exception {
2478 <        CompletableFuture<?> f = CompletableFuture.allOf();
2478 >        CompletableFuture<Void> f = CompletableFuture.allOf();
2479          checkCompletedNormally(f, null);
2480      }
2481  
2482      /**
2483 <     * allOf returns a future completed when all components complete
2483 >     * allOf returns a future completed normally with the value null
2484 >     * when all components complete normally
2485       */
2486 <    public void testAllOf() throws Exception {
2486 >    public void testAllOf_normal() throws Exception {
2487          for (int k = 1; k < 20; ++k) {
2488 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2488 >            CompletableFuture<Integer>[] fs
2489 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2490              for (int i = 0; i < k; ++i)
2491                  fs[i] = new CompletableFuture<>();
2492              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2493              for (int i = 0; i < k; ++i) {
2494                  checkIncomplete(f);
2495 +                checkIncomplete(CompletableFuture.allOf(fs));
2496                  fs[i].complete(one);
2497              }
2498              checkCompletedNormally(f, null);
2499 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2500 +        }
2501 +    }
2502 +
2503 +    public void testAllOf_backwards() throws Exception {
2504 +        for (int k = 1; k < 20; ++k) {
2505 +            CompletableFuture<Integer>[] fs
2506 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2507 +            for (int i = 0; i < k; ++i)
2508 +                fs[i] = new CompletableFuture<>();
2509 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2510 +            for (int i = k - 1; i >= 0; i--) {
2511 +                checkIncomplete(f);
2512 +                checkIncomplete(CompletableFuture.allOf(fs));
2513 +                fs[i].complete(one);
2514 +            }
2515 +            checkCompletedNormally(f, null);
2516 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2517          }
2518      }
2519  
# Line 2881 | Line 2521 | public class CompletableFutureTest exten
2521       * anyOf(no component futures) returns an incomplete future
2522       */
2523      public void testAnyOf_empty() throws Exception {
2524 <        CompletableFuture<?> f = CompletableFuture.anyOf();
2524 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
2525          checkIncomplete(f);
2526      }
2527  
2528      /**
2529 <     * anyOf returns a future completed when any components complete
2529 >     * anyOf returns a future completed normally with a value when
2530 >     * a component future does
2531       */
2532 <    public void testAnyOf() throws Exception {
2533 <        for (int k = 1; k < 20; ++k) {
2532 >    public void testAnyOf_normal() throws Exception {
2533 >        for (int k = 0; k < 10; ++k) {
2534              CompletableFuture[] fs = new CompletableFuture[k];
2535              for (int i = 0; i < k; ++i)
2536                  fs[i] = new CompletableFuture<>();
# Line 2898 | Line 2539 | public class CompletableFutureTest exten
2539              for (int i = 0; i < k; ++i) {
2540                  fs[i].complete(one);
2541                  checkCompletedNormally(f, one);
2542 +                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2543 +            }
2544 +        }
2545 +    }
2546 +
2547 +    /**
2548 +     * anyOf result completes exceptionally when any component does.
2549 +     */
2550 +    public void testAnyOf_exceptional() throws Exception {
2551 +        for (int k = 0; k < 10; ++k) {
2552 +            CompletableFuture[] fs = new CompletableFuture[k];
2553 +            for (int i = 0; i < k; ++i)
2554 +                fs[i] = new CompletableFuture<>();
2555 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2556 +            checkIncomplete(f);
2557 +            for (int i = 0; i < k; ++i) {
2558 +                fs[i].completeExceptionally(new CFException());
2559 +                checkCompletedWithWrappedCFException(f);
2560 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
2561              }
2562          }
2563      }
# Line 2913 | Line 2573 | public class CompletableFutureTest exten
2573          ThreadExecutor exec = new ThreadExecutor();
2574  
2575          Runnable[] throwingActions = {
2576 <            () -> { CompletableFuture.supplyAsync(null); },
2577 <            () -> { CompletableFuture.supplyAsync(null, exec); },
2578 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
2579 <
2580 <            () -> { CompletableFuture.runAsync(null); },
2581 <            () -> { CompletableFuture.runAsync(null, exec); },
2582 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
2583 <
2584 <            () -> { f.completeExceptionally(null); },
2585 <
2586 <            () -> { f.thenApply(null); },
2587 <            () -> { f.thenApplyAsync(null); },
2588 <            () -> { f.thenApplyAsync((x) -> x, null); },
2589 <            () -> { f.thenApplyAsync(null, exec); },
2590 <
2591 <            () -> { f.thenAccept(null); },
2592 <            () -> { f.thenAcceptAsync(null); },
2593 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2594 <            () -> { f.thenAcceptAsync(null, exec); },
2595 <
2596 <            () -> { f.thenRun(null); },
2597 <            () -> { f.thenRunAsync(null); },
2598 <            () -> { f.thenRunAsync(() -> { ; }, null); },
2599 <            () -> { f.thenRunAsync(null, exec); },
2600 <
2601 <            () -> { f.thenCombine(g, null); },
2602 <            () -> { f.thenCombineAsync(g, null); },
2603 <            () -> { f.thenCombineAsync(g, null, exec); },
2604 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2605 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2606 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2607 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2608 <
2609 <            () -> { f.thenAcceptBoth(g, null); },
2610 <            () -> { f.thenAcceptBothAsync(g, null); },
2611 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
2612 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
2613 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
2614 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
2615 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
2616 <
2617 <            () -> { f.runAfterBoth(g, null); },
2618 <            () -> { f.runAfterBothAsync(g, null); },
2619 <            () -> { f.runAfterBothAsync(g, null, exec); },
2620 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
2621 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
2622 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
2623 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
2624 <
2625 <            () -> { f.applyToEither(g, null); },
2626 <            () -> { f.applyToEitherAsync(g, null); },
2627 <            () -> { f.applyToEitherAsync(g, null, exec); },
2628 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
2629 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
2630 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
2631 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
2632 <
2633 <            () -> { f.acceptEither(g, null); },
2634 <            () -> { f.acceptEitherAsync(g, null); },
2635 <            () -> { f.acceptEitherAsync(g, null, exec); },
2636 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
2637 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
2638 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
2639 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
2640 <
2641 <            () -> { f.runAfterEither(g, null); },
2642 <            () -> { f.runAfterEitherAsync(g, null); },
2643 <            () -> { f.runAfterEitherAsync(g, null, exec); },
2644 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
2645 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
2646 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
2647 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
2648 <
2649 <            () -> { f.thenCompose(null); },
2650 <            () -> { f.thenComposeAsync(null); },
2651 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
2652 <            () -> { f.thenComposeAsync(null, exec); },
2653 <
2654 <            () -> { f.exceptionally(null); },
2655 <
2656 <            () -> { f.handle(null); },
2657 <
2658 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
2659 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
2660 <            () -> { CompletableFuture.allOf(f, null); },
2661 <            () -> { CompletableFuture.allOf(null, f); },
2662 <
2663 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
2664 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
2665 <            () -> { CompletableFuture.anyOf(f, null); },
2666 <            () -> { CompletableFuture.anyOf(null, f); },
2576 >            () -> CompletableFuture.supplyAsync(null),
2577 >            () -> CompletableFuture.supplyAsync(null, exec),
2578 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2579 >
2580 >            () -> CompletableFuture.runAsync(null),
2581 >            () -> CompletableFuture.runAsync(null, exec),
2582 >            () -> CompletableFuture.runAsync(() -> {}, null),
2583 >
2584 >            () -> f.completeExceptionally(null),
2585 >
2586 >            () -> f.thenApply(null),
2587 >            () -> f.thenApplyAsync(null),
2588 >            () -> f.thenApplyAsync((x) -> x, null),
2589 >            () -> f.thenApplyAsync(null, exec),
2590 >
2591 >            () -> f.thenAccept(null),
2592 >            () -> f.thenAcceptAsync(null),
2593 >            () -> f.thenAcceptAsync((x) -> {} , null),
2594 >            () -> f.thenAcceptAsync(null, exec),
2595 >
2596 >            () -> f.thenRun(null),
2597 >            () -> f.thenRunAsync(null),
2598 >            () -> f.thenRunAsync(() -> {} , null),
2599 >            () -> f.thenRunAsync(null, exec),
2600 >
2601 >            () -> f.thenCombine(g, null),
2602 >            () -> f.thenCombineAsync(g, null),
2603 >            () -> f.thenCombineAsync(g, null, exec),
2604 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
2605 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
2606 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
2607 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
2608 >
2609 >            () -> f.thenAcceptBoth(g, null),
2610 >            () -> f.thenAcceptBothAsync(g, null),
2611 >            () -> f.thenAcceptBothAsync(g, null, exec),
2612 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
2613 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
2614 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
2615 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
2616 >
2617 >            () -> f.runAfterBoth(g, null),
2618 >            () -> f.runAfterBothAsync(g, null),
2619 >            () -> f.runAfterBothAsync(g, null, exec),
2620 >            () -> f.runAfterBoth(nullFuture, () -> {}),
2621 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
2622 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
2623 >            () -> f.runAfterBothAsync(g, () -> {}, null),
2624 >
2625 >            () -> f.applyToEither(g, null),
2626 >            () -> f.applyToEitherAsync(g, null),
2627 >            () -> f.applyToEitherAsync(g, null, exec),
2628 >            () -> f.applyToEither(nullFuture, (x) -> x),
2629 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
2630 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
2631 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
2632 >
2633 >            () -> f.acceptEither(g, null),
2634 >            () -> f.acceptEitherAsync(g, null),
2635 >            () -> f.acceptEitherAsync(g, null, exec),
2636 >            () -> f.acceptEither(nullFuture, (x) -> {}),
2637 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
2638 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
2639 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
2640 >
2641 >            () -> f.runAfterEither(g, null),
2642 >            () -> f.runAfterEitherAsync(g, null),
2643 >            () -> f.runAfterEitherAsync(g, null, exec),
2644 >            () -> f.runAfterEither(nullFuture, () -> {}),
2645 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
2646 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
2647 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
2648 >
2649 >            () -> f.thenCompose(null),
2650 >            () -> f.thenComposeAsync(null),
2651 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2652 >            () -> f.thenComposeAsync(null, exec),
2653 >
2654 >            () -> f.exceptionally(null),
2655 >
2656 >            () -> f.handle(null),
2657 >
2658 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
2659 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
2660 >            () -> CompletableFuture.allOf(f, null),
2661 >            () -> CompletableFuture.allOf(null, f),
2662 >
2663 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
2664 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
2665 >            () -> CompletableFuture.anyOf(f, null),
2666 >            () -> CompletableFuture.anyOf(null, f),
2667 >
2668 >            () -> f.obtrudeException(null),
2669          };
2670  
2671          assertThrows(NullPointerException.class, throwingActions);
2672          assertEquals(0, exec.count.get());
2673      }
2674  
2675 +    /**
2676 +     * toCompletableFuture returns this CompletableFuture.
2677 +     */
2678 +    public void testToCompletableFuture() {
2679 +        CompletableFuture<Integer> f = new CompletableFuture<>();
2680 +        assertSame(f, f.toCompletableFuture());
2681 +    }
2682 +
2683 +    /**
2684 +     * whenComplete action executes on normal completion, propagating
2685 +     * source result.
2686 +     */
2687 +    public void testWhenComplete_normalCompletion1() {
2688 +        for (ExecutionMode m : ExecutionMode.values())
2689 +        for (boolean createIncomplete : new boolean[] { true, false })
2690 +        for (Integer v1 : new Integer[] { 1, null })
2691 +    {
2692 +        final AtomicInteger a = new AtomicInteger(0);
2693 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2694 +        if (!createIncomplete) f.complete(v1);
2695 +        final CompletableFuture<Integer> g = m.whenComplete
2696 +            (f,
2697 +             (Integer x, Throwable t) -> {
2698 +                threadAssertSame(x, v1);
2699 +                threadAssertNull(t);
2700 +                a.getAndIncrement();
2701 +            });
2702 +        if (createIncomplete) f.complete(v1);
2703 +
2704 +        checkCompletedNormally(g, v1);
2705 +        checkCompletedNormally(f, v1);
2706 +        assertEquals(1, a.get());
2707 +    }}
2708 +
2709 +    /**
2710 +     * whenComplete action executes on exceptional completion, propagating
2711 +     * source result.
2712 +     */
2713 +    public void testWhenComplete_exceptionalCompletion() {
2714 +        for (ExecutionMode m : ExecutionMode.values())
2715 +        for (boolean createIncomplete : new boolean[] { true, false })
2716 +        for (Integer v1 : new Integer[] { 1, null })
2717 +    {
2718 +        final AtomicInteger a = new AtomicInteger(0);
2719 +        final CFException ex = new CFException();
2720 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2721 +        if (!createIncomplete) f.completeExceptionally(ex);
2722 +        final CompletableFuture<Integer> g = m.whenComplete
2723 +            (f,
2724 +             (Integer x, Throwable t) -> {
2725 +                threadAssertNull(x);
2726 +                threadAssertSame(t, ex);
2727 +                a.getAndIncrement();
2728 +            });
2729 +        if (createIncomplete) f.completeExceptionally(ex);
2730 +        checkCompletedWithWrappedCFException(f, ex);
2731 +        checkCompletedWithWrappedCFException(g, ex);
2732 +        assertEquals(1, a.get());
2733 +    }}
2734 +
2735 +    /**
2736 +     * whenComplete action executes on cancelled source, propagating
2737 +     * CancellationException.
2738 +     */
2739 +    public void testWhenComplete_sourceCancelled() {
2740 +        for (ExecutionMode m : ExecutionMode.values())
2741 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2742 +        for (boolean createIncomplete : new boolean[] { true, false })
2743 +    {
2744 +        final AtomicInteger a = new AtomicInteger(0);
2745 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2746 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2747 +        final CompletableFuture<Integer> g = m.whenComplete
2748 +            (f,
2749 +             (Integer x, Throwable t) -> {
2750 +                threadAssertNull(x);
2751 +                threadAssertTrue(t instanceof CancellationException);
2752 +                a.getAndIncrement();
2753 +            });
2754 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2755 +
2756 +        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2757 +        checkCompletedWithWrappedCancellationException(g);
2758 +        checkCancelled(f);
2759 +        assertEquals(1, a.get());
2760 +    }}
2761 +
2762 +    /**
2763 +     * If a whenComplete action throws an exception when triggered by
2764 +     * a normal completion, it completes exceptionally
2765 +     */
2766 +    public void testWhenComplete_actionFailed() {
2767 +        for (boolean createIncomplete : new boolean[] { true, false })
2768 +        for (ExecutionMode m : ExecutionMode.values())
2769 +        for (Integer v1 : new Integer[] { 1, null })
2770 +    {
2771 +        final AtomicInteger a = new AtomicInteger(0);
2772 +        final CFException ex = new CFException();
2773 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2774 +        if (!createIncomplete) f.complete(v1);
2775 +        final CompletableFuture<Integer> g = m.whenComplete
2776 +            (f,
2777 +             (Integer x, Throwable t) -> {
2778 +                threadAssertSame(x, v1);
2779 +                threadAssertNull(t);
2780 +                a.getAndIncrement();
2781 +                throw ex;
2782 +            });
2783 +        if (createIncomplete) f.complete(v1);
2784 +        checkCompletedNormally(f, v1);
2785 +        checkCompletedWithWrappedCFException(g, ex);
2786 +        assertEquals(1, a.get());
2787 +    }}
2788 +
2789 +    /**
2790 +     * If a whenComplete action throws an exception when triggered by
2791 +     * a source completion that also throws an exception, the source
2792 +     * exception takes precedence.
2793 +     */
2794 +    public void testWhenComplete_actionFailedSourceFailed() {
2795 +        for (boolean createIncomplete : new boolean[] { true, false })
2796 +        for (ExecutionMode m : ExecutionMode.values())
2797 +        for (Integer v1 : new Integer[] { 1, null })
2798 +    {
2799 +        final AtomicInteger a = new AtomicInteger(0);
2800 +        final CFException ex1 = new CFException();
2801 +        final CFException ex2 = new CFException();
2802 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2803 +
2804 +        if (!createIncomplete) f.completeExceptionally(ex1);
2805 +        final CompletableFuture<Integer> g = m.whenComplete
2806 +            (f,
2807 +             (Integer x, Throwable t) -> {
2808 +                threadAssertSame(t, ex1);
2809 +                threadAssertNull(x);
2810 +                a.getAndIncrement();
2811 +                throw ex2;
2812 +            });
2813 +        if (createIncomplete) f.completeExceptionally(ex1);
2814 +
2815 +        checkCompletedWithWrappedCFException(f, ex1);
2816 +        checkCompletedWithWrappedCFException(g, ex1);
2817 +        assertEquals(1, a.get());
2818 +    }}
2819 +
2820   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines