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.35 by jsr166, Sun Jun 1 22:22:49 2014 UTC vs.
Revision 1.63 by jsr166, Fri Jun 6 16:54:16 2014 UTC

# Line 17 | Line 17 | 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 247 | 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 279 | 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  
298      /**
# Line 316 | 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 <    static final Supplier<Integer> supplyOne =
345 <        () -> Integer.valueOf(1);
346 <    static final Function<Integer, Integer> inc =
347 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
348 <    static final BiFunction<Integer, Integer, Integer> subtract =
349 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
350 <    static final class IncAction implements Consumer<Integer> {
328 <        int value;
329 <        public void accept(Integer x) { value = x.intValue() + 1; }
330 <    }
331 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
332 <        // Handle null values as well
333 <        public int subtract(Integer x, Integer y) {
334 <            return ((x == null) ? 42 : x.intValue())
335 <                - ((y == null) ? 99 : y.intValue());
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 <        int value;
353 <        public boolean ran() { return value != 0; }
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 >    // 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 >
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 +            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 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
428 <        boolean ran;
429 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
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 FailingFunction implements Function<Integer, Integer> {
439 <        boolean ran;
440 <        public Integer apply(Integer x) { 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 FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
450 <        boolean ran;
451 <        public Integer apply(Integer x, Integer y) { 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 FailingNoop implements Runnable {
461 <        boolean ran;
462 <        public void run() { 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 >
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();
399 <        }
400 <    }
401 <
402 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
403 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
404 <    }
405 <
406 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
407 <        boolean ran;
408 <        public Integer apply(Integer x, Throwable t) {
409 <            ran = true;
410 <            return (t == null) ? two : three;
515 >            new Thread(tg, r).start();
516          }
517      }
518  
519      /**
520       * Permits the testing of parallel code for the 3 different
521 <     * execution modes without repeating all the testing code.
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);
# Line 427 | Line 569 | public class CompletableFutureTest exten
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 < //             /** Experimental way to do more testing */
599 < //         REVERSE_DEFAULT {
600 < //             public <T,U> CompletableFuture<Void> runAfterBoth
601 < //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
602 < //                 return g.runAfterBoth(f, a);
603 < //             }
604 < //             public <T,U> CompletableFuture<Void> thenAcceptBoth
605 < //                 (CompletableFuture<T> f,
606 < //                  CompletionStage<? extends U> g,
607 < //                  BiConsumer<? super T,? super U> a) {
608 < //                 return DEFAULT.thenAcceptBoth(f, g, a);
609 < //             }
610 < //         },
611 <
612 <        DEFAULT_ASYNC {
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);
# Line 454 | Line 643 | public class CompletableFutureTest exten
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  
459 //         REVERSE_DEFAULT_ASYNC {
460 //             public <T,U> CompletableFuture<Void> runAfterBoth
461 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
462 //                 return f.runAfterBothAsync(g, a);
463 //             }
464 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
465 //                 (CompletableFuture<T> f,
466 //                  CompletionStage<? extends U> g,
467 //                  BiConsumer<? super T,? super U> a) {
468 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
469 //             }
470 //         },
471
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());
# Line 480 | Line 716 | public class CompletableFutureTest exten
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);
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 <        f = new CompletableFuture<>();
834 <        r = new ExceptionToInteger();
835 <        g = f.exceptionally(r);
836 <        f.complete(one);
837 <        checkCompletedNormally(g, one);
838 <    }
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 either
861 <     * normal or exceptional completion of source
860 >     * handle action completes normally with function value on normal
861 >     * completion of source
862       */
863 <    public void testHandle() {
864 <        CompletableFuture<Integer> f, g;
865 <        IntegerHandler r;
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 <        f = new CompletableFuture<>();
883 <        f.completeExceptionally(new CFException());
884 <        g = f.handle(r = new IntegerHandler());
885 <        assertTrue(r.ran);
523 <        checkCompletedNormally(g, three);
882 >        checkCompletedNormally(g, inc(v1));
883 >        checkCompletedNormally(f, v1);
884 >        assertEquals(1, a.get());
885 >    }}
886  
887 <        f = new CompletableFuture<>();
888 <        g = f.handle(r = new IntegerHandler());
889 <        assertFalse(r.ran);
890 <        f.completeExceptionally(new CFException());
891 <        checkCompletedNormally(g, three);
892 <        assertTrue(r.ran);
887 >    /**
888 >     * handle action completes normally with function value on
889 >     * exceptional completion of source
890 >     */
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 <        f = new CompletableFuture<>();
912 <        f.complete(one);
913 <        g = f.handle(r = new IntegerHandler());
914 <        assertTrue(r.ran);
536 <        checkCompletedNormally(g, two);
911 >        checkCompletedNormally(g, v1);
912 >        checkCompletedWithWrappedCFException(f, ex);
913 >        assertEquals(1, a.get());
914 >    }}
915  
916 <        f = new CompletableFuture<>();
917 <        g = f.handle(r = new IntegerHandler());
918 <        assertFalse(r.ran);
919 <        f.complete(one);
920 <        assertTrue(r.ran);
921 <        checkCompletedNormally(g, two);
922 <    }
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 >        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());
565        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);
597 <        checkCompletedNormally(f, one);
598 <    }
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  
626        f = new CompletableFuture<>();
627        f.complete(null);
628        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;
1097 <
1098 <        f = new CompletableFuture<>();
1099 <        g = f.thenRun(r = new Noop());
1100 <        f.completeExceptionally(new CFException());
1101 <        checkCompletedWithWrappedCFException(g);
1102 <        assertFalse(r.ran);
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 <        f.completeExceptionally(new CFException());
1109 <        g = f.thenRun(r = new Noop());
1110 <        checkCompletedWithWrappedCFException(g);
652 <        assertFalse(r.ran);
653 <    }
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);
672 <    }
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());
690 <        checkCompletedWithWrappedCancellationException(g);
691 <    }
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() {
718 <        CompletableFuture<Integer> f = new CompletableFuture<>();
719 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
720 <        f.complete(one);
721 <        checkCompletedWithWrappedCFException(g);
722 <    }
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() {
762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
763 <        FailingConsumer r = new FailingConsumer();
764 <        CompletableFuture<Void> g = f.thenAccept(r);
765 <        f.complete(one);
766 <        checkCompletedWithWrappedCFException(g);
767 <        assertTrue(r.ran);
768 <    }
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);
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 <        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);
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);
809 <        checkCompletedNormally(h, 2);
810 <    }
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);
826 <
827 <        f = new CompletableFuture<>();
828 <        g = new CompletableFuture<>();
829 <        h = f.thenCombine(g, subtract);
830 <        g.completeExceptionally(new CFException());
831 <        checkIncomplete(h);
832 <        f.complete(3);
833 <        checkCompletedWithWrappedCFException(h);
834 <
835 <        f = new CompletableFuture<>();
836 <        g = new CompletableFuture<>();
837 <        f.complete(3);
838 <        g.completeExceptionally(new CFException());
839 <        h = f.thenCombine(g, subtract);
840 <        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 <        f = new CompletableFuture<>();
1379 <        g = new CompletableFuture<>();
1380 <        f.completeExceptionally(new CFException());
1381 <        g.complete(3);
1382 <        h = f.thenCombine(g, subtract);
1383 <        checkCompletedWithWrappedCFException(h);
1384 <    }
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 <    /**
1388 <     * thenCombine result completes exceptionally if action does
1389 <     */
1390 <    public void testThenCombine3() {
1391 <        CompletableFuture<Integer> f = new CompletableFuture<>();
855 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
856 <        FailingBiFunction r = new FailingBiFunction();
857 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
858 <        f.complete(one);
859 <        checkIncomplete(g);
860 <        assertFalse(r.ran);
861 <        f2.complete(two);
862 <        checkCompletedWithWrappedCFException(g);
863 <        assertTrue(r.ran);
864 <    }
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;
1398 <
1399 <        f = new CompletableFuture<>();
1400 <        g = new CompletableFuture<>();
1401 <        h = f.thenCombine(g, subtract);
1402 <        assertTrue(f.cancel(true));
1403 <        checkIncomplete(h);
1404 <        g.complete(1);
1405 <        checkCompletedWithWrappedCancellationException(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 <        f = new CompletableFuture<>();
1408 <        g = new CompletableFuture<>();
1409 <        h = f.thenCombine(g, subtract);
1410 <        assertTrue(g.cancel(true));
1411 <        checkIncomplete(h);
1412 <        f.complete(3);
1413 <        checkCompletedWithWrappedCancellationException(h);
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  
888        f = new CompletableFuture<>();
889        g = new CompletableFuture<>();
890        assertTrue(f.cancel(true));
891        assertTrue(g.cancel(true));
892        h = f.thenCombine(g, subtract);
1416          checkCompletedWithWrappedCancellationException(h);
1417 <    }
1417 >        checkCancelled(!fFirst ? f : g);
1418 >        r.assertNotInvoked();
1419 >        checkCompletedNormally(fFirst ? f : g, v1);
1420 >    }}
1421  
1422      /**
1423 <     * thenAcceptBoth result completes normally after normal
898 <     * completion of sources
1423 >     * thenCombine result completes exceptionally if action does
1424       */
1425 <    public void testThenAcceptBoth_normalCompletion1() {
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 <
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 SubtractAction r = new SubtractAction();
1434 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1433 >        final FailingBiFunction r = new FailingBiFunction(m);
1434 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1435  
1436 <        f.complete(v1);
1437 <        checkIncomplete(h);
1438 <        assertEquals(r.value, 0);
1439 <        g.complete(v2);
1436 >        if (fFirst) {
1437 >            f.complete(v1);
1438 >            g.complete(v2);
1439 >        } else {
1440 >            g.complete(v2);
1441 >            f.complete(v1);
1442 >        }
1443  
1444 <        checkCompletedNormally(h, null);
916 <        assertEquals(r.value, r.subtract(v1, v2));
1444 >        checkCompletedWithWrappedCFException(h);
1445          checkCompletedNormally(f, v1);
1446          checkCompletedNormally(g, v2);
1447 <        }
920 <    }
1447 >    }}
1448  
1449 <    public void testThenAcceptBoth_normalCompletion2() {
1449 >    /**
1450 >     * thenAcceptBoth result completes normally after normal
1451 >     * completion of sources
1452 >     */
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 <
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();
930 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1462 >        final SubtractAction r = new SubtractAction(m);
1463  
1464 <        g.complete(v2);
1465 <        checkIncomplete(h);
1466 <        assertEquals(r.value, 0);
1467 <        f.complete(v1);
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  
1474          checkCompletedNormally(h, null);
1475 <        assertEquals(r.value, r.subtract(v1, v2));
1475 >        r.assertValue(subtract(v1, v2));
1476          checkCompletedNormally(f, v1);
1477          checkCompletedNormally(g, v2);
1478 <        }
942 <    }
1478 >    }}
1479  
1480 <    public void testThenAcceptBoth_normalCompletion3() {
1480 >    /**
1481 >     * thenAcceptBoth result completes exceptionally after exceptional
1482 >     * completion of either source
1483 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
948 <
1489 >    {
1490          final CompletableFuture<Integer> f = new CompletableFuture<>();
1491          final CompletableFuture<Integer> g = new CompletableFuture<>();
1492 <        final SubtractAction r = new SubtractAction();
1492 >        final CFException ex = new CFException();
1493 >        final SubtractAction r = new SubtractAction(m);
1494  
1495 <        g.complete(v2);
1496 <        f.complete(v1);
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 <
1500 <        checkCompletedNormally(h, null);
1501 <        assertEquals(r.value, r.subtract(v1, v2));
959 <        checkCompletedNormally(f, v1);
960 <        checkCompletedNormally(g, v2);
1499 >        if (createIncomplete) {
1500 >            checkIncomplete(h);
1501 >            (!fFirst ? f : g).completeExceptionally(ex);
1502          }
962    }
1503  
1504 <    public void testThenAcceptBoth_normalCompletion4() {
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 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 <        for (Integer v2 : new Integer[] { 2, null }) {
968 <
1519 >    {
1520          final CompletableFuture<Integer> f = new CompletableFuture<>();
1521          final CompletableFuture<Integer> g = new CompletableFuture<>();
1522 <        final SubtractAction r = new SubtractAction();
1522 >        final SubtractAction r = new SubtractAction(m);
1523  
1524 <        f.complete(v1);
1525 <        g.complete(v2);
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 <
1529 <        checkCompletedNormally(h, null);
1530 <        assertEquals(r.value, r.subtract(v1, v2));
979 <        checkCompletedNormally(f, v1);
980 <        checkCompletedNormally(g, v2);
1528 >        if (createIncomplete) {
1529 >            checkIncomplete(h);
1530 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1531          }
1532 <    }
1532 >
1533 >        checkCompletedWithWrappedCancellationException(h);
1534 >        checkCancelled(!fFirst ? f : g);
1535 >        r.assertNotInvoked();
1536 >        checkCompletedNormally(fFirst ? f : g, v1);
1537 >    }}
1538  
1539      /**
1540 <     * thenAcceptBoth result completes exceptionally after exceptional
986 <     * completion of either source
1540 >     * thenAcceptBoth result completes exceptionally if action does
1541       */
1542 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1542 >    public void testThenAcceptBoth_actionFailed() {
1543          for (ExecutionMode m : ExecutionMode.values())
1544 <        for (Integer v1 : new Integer[] { 1, null }) {
1545 <
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 SubtractAction r = new SubtractAction();
1550 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1551          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
996        final CFException ex = new CFException();
1552  
1553 <        f.completeExceptionally(ex);
1554 <        checkIncomplete(h);
1555 <        g.complete(v1);
1556 <
1557 <        checkCompletedWithWrappedCFException(h, ex);
1558 <        checkCompletedWithWrappedCFException(f, ex);
1004 <        assertFalse(r.ran());
1005 <        checkCompletedNormally(g, v1);
1553 >        if (fFirst) {
1554 >            f.complete(v1);
1555 >            g.complete(v2);
1556 >        } else {
1557 >            g.complete(v2);
1558 >            f.complete(v1);
1559          }
1007    }
1560  
1561 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1562 <        for (ExecutionMode m : ExecutionMode.values())
1563 <        for (Integer v1 : new Integer[] { 1, null }) {
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_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 SubtractAction r = new SubtractAction();
1016 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1017 <        final CFException ex = new CFException();
1579 >        final Noop r = new Noop(m);
1580  
1581 <        g.completeExceptionally(ex);
1582 <        checkIncomplete(h);
1583 <        f.complete(v1);
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  
1591 <        checkCompletedWithWrappedCFException(h, ex);
1592 <        checkCompletedWithWrappedCFException(g, ex);
1025 <        assertFalse(r.ran());
1591 >        checkCompletedNormally(h, null);
1592 >        r.assertInvoked();
1593          checkCompletedNormally(f, v1);
1594 <        }
1595 <    }
1594 >        checkCompletedNormally(g, v2);
1595 >    }}
1596  
1597 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1597 >    /**
1598 >     * runAfterBoth result completes exceptionally after exceptional
1599 >     * completion of either source
1600 >     */
1601 >    public void testRunAfterBoth_exceptionalCompletion() {
1602          for (ExecutionMode m : ExecutionMode.values())
1603 <        for (Integer v1 : new Integer[] { 1, null }) {
1604 <
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<>();
1036        final SubtractAction r = new SubtractAction();
1609          final CFException ex = new CFException();
1610 +        final Noop r = new Noop(m);
1611  
1612 <        g.completeExceptionally(ex);
1613 <        f.complete(v1);
1614 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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          checkCompletedWithWrappedCFException(h, ex);
1622 <        checkCompletedWithWrappedCFException(g, ex);
1623 <        assertFalse(r.ran());
1624 <        checkCompletedNormally(f, v1);
1625 <        }
1048 <    }
1622 >        r.assertNotInvoked();
1623 >        checkCompletedNormally(fFirst ? f : g, v1);
1624 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1625 >    }}
1626  
1627 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1627 >    /**
1628 >     * runAfterBoth result completes exceptionally if either source cancelled
1629 >     */
1630 >    public void testRunAfterBoth_sourceCancelled() {
1631          for (ExecutionMode m : ExecutionMode.values())
1632 <        for (Integer v1 : new Integer[] { 1, null }) {
1633 <
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 SubtractAction r = new SubtractAction();
1057 <        final CFException ex = new CFException();
1639 >        final Noop r = new Noop(m);
1640  
1059        f.completeExceptionally(ex);
1060        g.complete(v1);
1061        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1641  
1642 <        checkCompletedWithWrappedCFException(h, ex);
1643 <        checkCompletedWithWrappedCFException(f, ex);
1644 <        assertFalse(r.ran());
1645 <        checkCompletedNormally(g, v1);
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 <    }
1650 >
1651 >        checkCompletedWithWrappedCancellationException(h);
1652 >        checkCancelled(!fFirst ? f : g);
1653 >        r.assertNotInvoked();
1654 >        checkCompletedNormally(fFirst ? f : g, v1);
1655 >    }}
1656  
1657      /**
1658 <     * thenAcceptBoth result completes exceptionally if action does
1658 >     * runAfterBoth result completes exceptionally if action does
1659       */
1660 <    public void testThenAcceptBoth_actionFailed1() {
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 <
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 FailingBiConsumer r = new FailingBiConsumer();
1669 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1668 >        final FailingRunnable r1 = new FailingRunnable(m);
1669 >        final FailingRunnable r2 = new FailingRunnable(m);
1670  
1671 <        f.complete(v1);
1672 <        checkIncomplete(h);
1673 <        g.complete(v2);
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 <        checkCompletedWithWrappedCFException(h);
1681 >        checkCompletedWithWrappedCFException(h1);
1682 >        checkCompletedWithWrappedCFException(h2);
1683          checkCompletedNormally(f, v1);
1684          checkCompletedNormally(g, v2);
1685 <        }
1091 <    }
1685 >    }}
1686  
1687 <    public void testThenAcceptBoth_actionFailed2() {
1687 >    /**
1688 >     * applyToEither result completes normally after normal completion
1689 >     * of either source
1690 >     */
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 <
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 FailingBiConsumer r = new FailingBiConsumer();
1699 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1698 >        final IncFunction[] rs = new IncFunction[6];
1699 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1700  
1701 <        g.complete(v2);
1702 <        checkIncomplete(h);
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  
1107        checkCompletedWithWrappedCFException(h);
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 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 <    }
1781 >
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 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1793 >     * applyToEither result completes exceptionally if either source cancelled
1794       */
1795 <    public void testThenAcceptBoth_sourceCancelled1() {
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 <
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 SubtractAction r = new SubtractAction();
1803 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1802 >        final IncFunction[] rs = new IncFunction[6];
1803 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1804  
1805 <        assertTrue(f.cancel(mayInterruptIfRunning));
1806 <        checkIncomplete(h);
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 <        checkCompletedWithWrappedCancellationException(h);
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);
1132        assertFalse(r.ran());
1839          checkCompletedNormally(g, v1);
1840 <        }
1841 <    }
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 <    public void testThenAcceptBoth_sourceCancelled2() {
1847 >    /**
1848 >     * applyToEither result completes exceptionally if action does
1849 >     */
1850 >    public void testApplyToEither_actionFailed() {
1851          for (ExecutionMode m : ExecutionMode.values())
1852 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1853 <        for (Integer v1 : new Integer[] { 1, null }) {
1854 <
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 SubtractAction r = new SubtractAction();
1858 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1857 >        final FailingFunction[] rs = new FailingFunction[6];
1858 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1859  
1860 <        assertTrue(g.cancel(mayInterruptIfRunning));
1861 <        checkIncomplete(h);
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  
1151        checkCompletedWithWrappedCancellationException(h);
1152        checkCancelled(g);
1153        assertFalse(r.ran());
1884          checkCompletedNormally(f, v1);
1885 <        }
1886 <    }
1885 >        checkCompletedNormally(g, v2);
1886 >    }}
1887  
1888 <    public void testThenAcceptBoth_sourceCancelled3() {
1888 >    /**
1889 >     * acceptEither result completes normally after normal completion
1890 >     * of either source
1891 >     */
1892 >    public void testAcceptEither_normalCompletion() {
1893          for (ExecutionMode m : ExecutionMode.values())
1894 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1895 <        for (Integer v1 : new Integer[] { 1, null }) {
1896 <
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 SubtractAction r = new SubtractAction();
1899 >        final IncAction[] rs = new IncAction[6];
1900 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1901  
1902 <        assertTrue(g.cancel(mayInterruptIfRunning));
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 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
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  
1171        checkCompletedWithWrappedCancellationException(h);
1172        checkCancelled(g);
1173        assertFalse(r.ran());
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 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          }
1176    }
1987  
1988 <    public void testThenAcceptBoth_sourceCancelled4() {
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 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 <
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 SubtractAction r = new SubtractAction();
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  
1187        assertTrue(f.cancel(mayInterruptIfRunning));
2025          g.complete(v1);
1189        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2026  
2027 <        checkCompletedWithWrappedCancellationException(h);
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 >            assertNull(h4.join());
2032 >            rs[4].assertValue(inc(v1));
2033 >        } catch (CompletionException ok) {
2034 >            checkCompletedWithWrappedCancellationException(h4);
2035 >            rs[4].assertNotInvoked();
2036 >        }
2037 >        try {
2038 >            assertNull(h5.join());
2039 >            rs[5].assertValue(inc(v1));
2040 >        } catch (CompletionException ok) {
2041 >            checkCompletedWithWrappedCancellationException(h5);
2042 >            rs[5].assertNotInvoked();
2043 >        }
2044 >
2045          checkCancelled(f);
1193        assertFalse(r.ran());
2046          checkCompletedNormally(g, v1);
2047 <        }
2048 <    }
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 <     * runAfterBoth result completes normally after normal
1200 <     * completion of sources
2055 >     * acceptEither result completes exceptionally if action does
2056       */
2057 <    public void testRunAfterBoth_normalCompletion1() {
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 <
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 Noop r = new Noop();
2065 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        checkIncomplete(h);
2071 <        assertFalse(r.ran);
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 <        checkCompletedNormally(h, null);
2081 <        assertTrue(r.ran);
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 <        }
1222 <    }
2093 >    }}
2094  
2095 <    public void testRunAfterBoth_normalCompletion2() {
2095 >    /**
2096 >     * runAfterEither result completes normally after normal completion
2097 >     * of either source
2098 >     */
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 <
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();
2107 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2106 >        final Noop r = new Noop(m);
2107 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2108  
1234        g.complete(v2);
1235        checkIncomplete(h);
1236        assertFalse(r.ran);
2109          f.complete(v1);
1238
2110          checkCompletedNormally(h, null);
2111 <        assertTrue(r.ran);
2111 >        r.assertInvoked();
2112 >        g.complete(v2);
2113 >
2114          checkCompletedNormally(f, v1);
2115          checkCompletedNormally(g, v2);
2116 <        }
2117 <    }
2116 >        checkCompletedNormally(h, null);
2117 >        r.assertInvoked();
2118 >    }}
2119  
2120 <    public void testRunAfterBoth_normalCompletion3() {
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 <
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();
2127 >        final Noop r = new Noop(m);
2128 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2129  
2130          g.complete(v2);
2131 +        checkCompletedNormally(h, null);
2132 +        r.assertInvoked();
2133          f.complete(v1);
1257        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2134  
1259        checkCompletedNormally(h, null);
1260        assertTrue(r.ran);
2135          checkCompletedNormally(f, v1);
2136          checkCompletedNormally(g, v2);
2137 <        }
2138 <    }
2137 >        checkCompletedNormally(h, null);
2138 >        r.assertInvoked();
2139 >        }}
2140  
2141 <    public void testRunAfterBoth_normalCompletion4() {
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 <
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();
2148 >        final Noop r = new Noop(m);
2149  
2150          f.complete(v1);
2151          g.complete(v2);
2152 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2152 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2153  
2154          checkCompletedNormally(h, null);
1280        assertTrue(r.ran);
2155          checkCompletedNormally(f, v1);
2156          checkCompletedNormally(g, v2);
2157 <        }
2158 <    }
2157 >        r.assertInvoked();
2158 >    }}
2159  
2160      /**
2161 <     * runAfterBoth result completes exceptionally after exceptional
2161 >     * runAfterEither result completes exceptionally after exceptional
2162       * completion of either source
2163       */
2164 <    public void testRunAfterBoth_exceptionalCompletion1() {
2164 >    public void testRunAfterEither_exceptionalCompletion1() {
2165          for (ExecutionMode m : ExecutionMode.values())
2166 <        for (Integer v1 : new Integer[] { 1, null }) {
2167 <
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();
2171 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        checkIncomplete(h);
2175 >        checkCompletedWithWrappedCFException(h, ex);
2176          g.complete(v1);
2177  
2178 <        checkCompletedWithWrappedCFException(h, ex);
1305 <        checkCompletedWithWrappedCFException(f, ex);
1306 <        assertFalse(r.ran);
2178 >        r.assertNotInvoked();
2179          checkCompletedNormally(g, v1);
2180 <        }
2181 <    }
2180 >        checkCompletedWithWrappedCFException(f, ex);
2181 >        checkCompletedWithWrappedCFException(h, ex);
2182 >    }}
2183  
2184 <    public void testRunAfterBoth_exceptionalCompletion2() {
2184 >    public void testRunAfterEither_exceptionalCompletion2() {
2185          for (ExecutionMode m : ExecutionMode.values())
2186 <        for (Integer v1 : new Integer[] { 1, null }) {
2187 <
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();
2191 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        checkIncomplete(h);
2195 >        checkCompletedWithWrappedCFException(h, ex);
2196          f.complete(v1);
2197  
2198 <        checkCompletedWithWrappedCFException(h, ex);
1326 <        checkCompletedWithWrappedCFException(g, ex);
1327 <        assertFalse(r.ran);
2198 >        r.assertNotInvoked();
2199          checkCompletedNormally(f, v1);
2200 <        }
2201 <    }
2200 >        checkCompletedWithWrappedCFException(g, ex);
2201 >        checkCompletedWithWrappedCFException(h, ex);
2202 >    }}
2203  
2204 <    public void testRunAfterBoth_exceptionalCompletion3() {
2204 >    public void testRunAfterEither_exceptionalCompletion3() {
2205          for (ExecutionMode m : ExecutionMode.values())
2206 <        for (Integer v1 : new Integer[] { 1, null }) {
2207 <
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();
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.runAfterBoth(f, g, r);
2215 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2216 >
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  
1345        checkCompletedWithWrappedCFException(h, ex);
2227          checkCompletedWithWrappedCFException(g, ex);
1347        assertFalse(r.ran);
2228          checkCompletedNormally(f, v1);
2229 <        }
1350 <    }
2229 >    }}
2230  
2231 <    public void testRunAfterBoth_exceptionalCompletion4() {
2231 >    public void testRunAfterEither_exceptionalCompletion4() {
2232          for (ExecutionMode m : ExecutionMode.values())
2233 <        for (Integer v1 : new Integer[] { 1, null }) {
2234 <
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();
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.runAfterBoth(f, g, r);
2242 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2243 >
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  
1365        checkCompletedWithWrappedCFException(h, ex);
2254          checkCompletedWithWrappedCFException(f, ex);
1367        assertFalse(r.ran);
2255          checkCompletedNormally(g, v1);
2256 <        }
1370 <    }
2256 >    }}
2257  
2258      /**
2259 <     * runAfterBoth result completes exceptionally if action does
2259 >     * runAfterEither result completes exceptionally if action does
2260       */
2261 <    public void testRunAfterBoth_actionFailed1() {
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 <
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 FailingNoop r = new FailingNoop();
2269 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2268 >        final FailingRunnable r = new FailingRunnable(m);
2269 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2270  
2271          f.complete(v1);
1386        checkIncomplete(h);
1387        g.complete(v2);
1388
2272          checkCompletedWithWrappedCFException(h);
2273 +        g.complete(v2);
2274          checkCompletedNormally(f, v1);
2275          checkCompletedNormally(g, v2);
2276 <        }
1393 <    }
2276 >    }}
2277  
2278 <    public void testRunAfterBoth_actionFailed2() {
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 <
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 FailingNoop r = new FailingNoop();
2286 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2285 >        final FailingRunnable r = new FailingRunnable(m);
2286 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2287  
2288          g.complete(v2);
1406        checkIncomplete(h);
1407        f.complete(v1);
1408
2289          checkCompletedWithWrappedCFException(h);
2290 +        f.complete(v1);
2291          checkCompletedNormally(f, v1);
2292          checkCompletedNormally(g, v2);
2293 <        }
1413 <    }
2293 >    }}
2294  
2295      /**
2296 <     * runAfterBoth result completes exceptionally if either source cancelled
2296 >     * runAfterEither result completes exceptionally if either source cancelled
2297       */
2298 <    public void testRunAfterBoth_sourceCancelled1() {
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 <
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();
2306 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2305 >        final Noop r = new Noop(m);
2306 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2307  
2308          assertTrue(f.cancel(mayInterruptIfRunning));
2309 <        checkIncomplete(h);
2309 >        checkCompletedWithWrappedCancellationException(h);
2310          g.complete(v1);
2311  
1432        checkCompletedWithWrappedCancellationException(h);
2312          checkCancelled(f);
2313 <        assertFalse(r.ran);
2313 >        r.assertNotInvoked();
2314          checkCompletedNormally(g, v1);
2315 <        }
2316 <    }
2315 >        checkCompletedWithWrappedCancellationException(h);
2316 >    }}
2317  
2318 <    public void testRunAfterBoth_sourceCancelled2() {
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 <
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();
2326 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2325 >        final Noop r = new Noop(m);
2326 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2327  
2328          assertTrue(g.cancel(mayInterruptIfRunning));
2329 <        checkIncomplete(h);
2329 >        checkCompletedWithWrappedCancellationException(h);
2330          f.complete(v1);
2331  
1453        checkCompletedWithWrappedCancellationException(h);
2332          checkCancelled(g);
2333 <        assertFalse(r.ran);
2333 >        r.assertNotInvoked();
2334          checkCompletedNormally(f, v1);
2335 <        }
2336 <    }
2335 >        checkCompletedWithWrappedCancellationException(h);
2336 >    }}
2337  
2338 <    public void testRunAfterBoth_sourceCancelled3() {
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 <
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();
2345 >        final Noop r = new Noop(m);
2346  
2347          assertTrue(g.cancel(mayInterruptIfRunning));
2348          f.complete(v1);
2349 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2349 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2350 >
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  
1473        checkCompletedWithWrappedCancellationException(h);
2361          checkCancelled(g);
1475        assertFalse(r.ran);
2362          checkCompletedNormally(f, v1);
2363 <        }
1478 <    }
2363 >    }}
2364  
2365 <    public void testRunAfterBoth_sourceCancelled4() {
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 <
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();
2372 >        final Noop r = new Noop(m);
2373  
2374          assertTrue(f.cancel(mayInterruptIfRunning));
2375          g.complete(v1);
2376 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2376 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2377  
2378 <        checkCompletedWithWrappedCancellationException(h);
2379 <        checkCancelled(f);
2380 <        assertFalse(r.ran);
2381 <        checkCompletedNormally(g, v1);
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          }
1498    }
1499
1500    /**
1501     * applyToEither result completes normally after normal completion
1502     * of either source
1503     */
1504    public void testApplyToEither() {
1505        CompletableFuture<Integer> f = new CompletableFuture<>();
1506        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1507        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1508        f.complete(one);
1509        checkCompletedNormally(g, two);
1510        f2.complete(one);
1511        checkCompletedNormally(g, two);
1512
1513        f = new CompletableFuture<>();
1514        f.complete(one);
1515        f2 = new CompletableFuture<>();
1516        g = f.applyToEither(f2, inc);
1517        checkCompletedNormally(g, two);
1518    }
1519
1520    /**
1521     * applyToEither result completes exceptionally after exceptional
1522     * completion of either source
1523     */
1524    public void testApplyToEither2() {
1525        CompletableFuture<Integer> f = new CompletableFuture<>();
1526        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1527        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1528        f.completeExceptionally(new CFException());
1529        f2.complete(one);
1530        checkCompletedWithWrappedCFException(g);
1531
1532        f = new CompletableFuture<>();
1533        f2 = new CompletableFuture<>();
1534        f2.completeExceptionally(new CFException());
1535        g = f.applyToEither(f2, inc);
1536        checkCompletedWithWrappedCFException(g);
1537    }
1538
1539    /**
1540     * applyToEither result completes exceptionally if action does
1541     */
1542    public void testApplyToEither3() {
1543        CompletableFuture<Integer> f = new CompletableFuture<>();
1544        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1545        FailingFunction r = new FailingFunction();
1546        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1547        f2.complete(two);
1548        checkCompletedWithWrappedCFException(g);
1549    }
1550
1551    /**
1552     * applyToEither result completes exceptionally if either source cancelled
1553     */
1554    public void testApplyToEither4() {
1555        CompletableFuture<Integer> f = new CompletableFuture<>();
1556        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1557        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1558        assertTrue(f.cancel(true));
1559        checkCompletedWithWrappedCancellationException(g);
1560        f = new CompletableFuture<>();
1561        f2 = new CompletableFuture<>();
1562        assertTrue(f2.cancel(true));
1563        checkCompletedWithWrappedCancellationException(g);
1564    }
1565
1566    /**
1567     * acceptEither result completes normally after normal completion
1568     * of either source
1569     */
1570    public void testAcceptEither() {
1571        CompletableFuture<Integer> f = new CompletableFuture<>();
1572        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1573        IncAction r = new IncAction();
1574        CompletableFuture<Void> g = f.acceptEither(f2, r);
1575        f.complete(one);
1576        checkCompletedNormally(g, null);
1577        f2.complete(one);
1578        checkCompletedNormally(g, null);
1579        assertEquals(r.value, 2);
1580
1581        r = new IncAction();
1582        f = new CompletableFuture<>();
1583        f.complete(one);
1584        f2 = new CompletableFuture<>();
1585        g = f.acceptEither(f2, r);
1586        checkCompletedNormally(g, null);
1587        assertEquals(r.value, 2);
1588    }
1589
1590    /**
1591     * acceptEither result completes exceptionally after exceptional
1592     * completion of either source
1593     */
1594    public void testAcceptEither2() {
1595        CompletableFuture<Integer> f = new CompletableFuture<>();
1596        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1597        IncAction r = new IncAction();
1598        CompletableFuture<Void> g = f.acceptEither(f2, r);
1599        f.completeExceptionally(new CFException());
1600        f2.complete(one);
1601        checkCompletedWithWrappedCFException(g);
1602
1603        r = new IncAction();
1604        f = new CompletableFuture<>();
1605        f2 = new CompletableFuture<>();
1606        f2.completeExceptionally(new CFException());
1607        g = f.acceptEither(f2, r);
1608        checkCompletedWithWrappedCFException(g);
1609    }
1610
1611    /**
1612     * acceptEither result completes exceptionally if action does
1613     */
1614    public void testAcceptEither3() {
1615        CompletableFuture<Integer> f = new CompletableFuture<>();
1616        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1617        FailingConsumer r = new FailingConsumer();
1618        CompletableFuture<Void> g = f.acceptEither(f2, r);
1619        f2.complete(two);
1620        checkCompletedWithWrappedCFException(g);
1621    }
1622
1623    /**
1624     * acceptEither result completes exceptionally if either source cancelled
1625     */
1626    public void testAcceptEither4() {
1627        CompletableFuture<Integer> f = new CompletableFuture<>();
1628        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1629        IncAction r = new IncAction();
1630        CompletableFuture<Void> g = f.acceptEither(f2, r);
1631        assertTrue(f.cancel(true));
1632        checkCompletedWithWrappedCancellationException(g);
1633        f = new CompletableFuture<>();
1634        f2 = new CompletableFuture<>();
1635        assertTrue(f2.cancel(true));
1636        checkCompletedWithWrappedCancellationException(g);
1637    }
2387  
2388 <    /**
2389 <     * runAfterEither result completes normally after normal completion
2390 <     * of either source
1642 <     */
1643 <    public void testRunAfterEither() {
1644 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1645 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1646 <        Noop r = new Noop();
1647 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1648 <        f.complete(one);
1649 <        checkCompletedNormally(g, null);
1650 <        f2.complete(one);
1651 <        checkCompletedNormally(g, null);
1652 <        assertTrue(r.ran);
1653 <
1654 <        r = new Noop();
1655 <        f = new CompletableFuture<>();
1656 <        f.complete(one);
1657 <        f2 = new CompletableFuture<>();
1658 <        g = f.runAfterEither(f2, r);
1659 <        checkCompletedNormally(g, null);
1660 <        assertTrue(r.ran);
1661 <    }
1662 <
1663 <    /**
1664 <     * runAfterEither result completes exceptionally after exceptional
1665 <     * completion of either source
1666 <     */
1667 <    public void testRunAfterEither2() {
1668 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1669 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1670 <        Noop r = new Noop();
1671 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1672 <        f.completeExceptionally(new CFException());
1673 <        f2.complete(one);
1674 <        checkCompletedWithWrappedCFException(g);
1675 <
1676 <        r = new Noop();
1677 <        f = new CompletableFuture<>();
1678 <        f2 = new CompletableFuture<>();
1679 <        f2.completeExceptionally(new CFException());
1680 <        g = f.runAfterEither(f2, r);
1681 <        checkCompletedWithWrappedCFException(g);
1682 <    }
1683 <
1684 <    /**
1685 <     * runAfterEither result completes exceptionally if action does
1686 <     */
1687 <    public void testRunAfterEither3() {
1688 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1689 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1690 <        FailingNoop r = new FailingNoop();
1691 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1692 <        f2.complete(two);
1693 <        checkCompletedWithWrappedCFException(g);
1694 <    }
1695 <
1696 <    /**
1697 <     * runAfterEither result completes exceptionally if either source cancelled
1698 <     */
1699 <    public void testRunAfterEither4() {
1700 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1701 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1702 <        Noop r = new Noop();
1703 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1704 <        assertTrue(f.cancel(true));
1705 <        checkCompletedWithWrappedCancellationException(g);
1706 <        f = new CompletableFuture<>();
1707 <        f2 = new CompletableFuture<>();
1708 <        assertTrue(f2.cancel(true));
1709 <        checkCompletedWithWrappedCancellationException(g);
1710 <    }
2388 >        checkCancelled(f);
2389 >        checkCompletedNormally(g, v1);
2390 >    }}
2391  
2392      /**
2393       * thenCompose result completes normally after normal completion of source
2394       */
2395 <    public void testThenCompose() {
2396 <        CompletableFuture<Integer> f, g;
2397 <        CompletableFutureInc r;
2398 <
2399 <        f = new CompletableFuture<>();
2400 <        g = f.thenCompose(r = new CompletableFutureInc());
2401 <        f.complete(one);
2402 <        checkCompletedNormally(g, two);
2403 <        assertTrue(r.ran);
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 <        f = new CompletableFuture<>();
2407 <        f.complete(one);
2408 <        g = f.thenCompose(r = new CompletableFutureInc());
2409 <        checkCompletedNormally(g, two);
1729 <        assertTrue(r.ran);
1730 <    }
2406 >        checkCompletedNormally(g, inc(v1));
2407 >        checkCompletedNormally(f, v1);
2408 >        r.assertInvoked();
2409 >    }}
2410  
2411      /**
2412       * thenCompose result completes exceptionally after exceptional
2413       * completion of source
2414       */
2415 <    public void testThenCompose2() {
2416 <        CompletableFuture<Integer> f, g;
2417 <        CompletableFutureInc r;
2418 <
2419 <        f = new CompletableFuture<>();
2420 <        g = f.thenCompose(r = new CompletableFutureInc());
2421 <        f.completeExceptionally(new CFException());
2422 <        checkCompletedWithWrappedCFException(g);
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 <        f = new CompletableFuture<>();
2427 <        f.completeExceptionally(new CFException());
2428 <        g = f.thenCompose(r = new CompletableFutureInc());
2429 <        checkCompletedWithWrappedCFException(g);
1749 <    }
2426 >        checkCompletedWithWrappedCFException(g, ex);
2427 >        checkCompletedWithWrappedCFException(f, ex);
2428 >        r.assertNotInvoked();
2429 >    }}
2430  
2431      /**
2432       * thenCompose result completes exceptionally if action does
2433       */
2434 <    public void testThenCompose3() {
2435 <        CompletableFuture<Integer> f, g;
2436 <        FailingCompletableFutureFunction r;
2437 <
2438 <        f = new CompletableFuture<>();
2439 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2440 <        f.complete(one);
2441 <        checkCompletedWithWrappedCFException(g);
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  
1763        f = new CompletableFuture<>();
1764        f.complete(one);
1765        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2446          checkCompletedWithWrappedCFException(g);
2447 <    }
2447 >        checkCompletedNormally(f, v1);
2448 >    }}
2449  
2450      /**
2451       * thenCompose result completes exceptionally if source cancelled
2452       */
2453 <    public void testThenCompose4() {
2454 <        CompletableFuture<Integer> f, g;
2455 <        CompletableFutureInc r;
2456 <
2457 <        f = new CompletableFuture<>();
2458 <        g = f.thenCompose(r = new CompletableFutureInc());
2459 <        assertTrue(f.cancel(true));
2460 <        checkCompletedWithWrappedCancellationException(g);
2461 <
2462 <        f = new CompletableFuture<>();
2463 <        assertTrue(f.cancel(true));
2464 <        g = f.thenCompose(r = new CompletableFutureInc());
2465 <        checkCompletedWithWrappedCancellationException(g);
1785 <    }
1786 <
1787 <    // asyncs
1788 <
1789 <    /**
1790 <     * thenRunAsync result completes normally after normal completion of source
1791 <     */
1792 <    public void testThenRunAsync() {
1793 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1794 <        Noop r = new Noop();
1795 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1796 <        f.complete(null);
1797 <        checkCompletedNormally(g, null);
1798 <
1799 <        // reordered version
1800 <        f = new CompletableFuture<>();
1801 <        f.complete(null);
1802 <        r = new Noop();
1803 <        g = f.thenRunAsync(r);
1804 <        checkCompletedNormally(g, null);
1805 <    }
1806 <
1807 <    /**
1808 <     * thenRunAsync result completes exceptionally after exceptional
1809 <     * completion of source
1810 <     */
1811 <    public void testThenRunAsync2() {
1812 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1813 <        Noop r = new Noop();
1814 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1815 <        f.completeExceptionally(new CFException());
1816 <        try {
1817 <            g.join();
1818 <            shouldThrow();
1819 <        } catch (CompletionException success) {}
1820 <        checkCompletedWithWrappedCFException(g);
1821 <    }
1822 <
1823 <    /**
1824 <     * thenRunAsync result completes exceptionally if action does
1825 <     */
1826 <    public void testThenRunAsync3() {
1827 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1828 <        FailingNoop r = new FailingNoop();
1829 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1830 <        f.complete(null);
1831 <        checkCompletedWithWrappedCFException(g);
1832 <    }
1833 <
1834 <    /**
1835 <     * thenRunAsync result completes exceptionally if source cancelled
1836 <     */
1837 <    public void testThenRunAsync4() {
1838 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1839 <        Noop r = new Noop();
1840 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1841 <        assertTrue(f.cancel(true));
1842 <        checkCompletedWithWrappedCancellationException(g);
1843 <    }
1844 <
1845 <    /**
1846 <     * thenApplyAsync result completes normally after normal completion of source
1847 <     */
1848 <    public void testThenApplyAsync() {
1849 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1850 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1851 <        f.complete(one);
1852 <        checkCompletedNormally(g, two);
1853 <    }
1854 <
1855 <    /**
1856 <     * thenApplyAsync result completes exceptionally after exceptional
1857 <     * completion of source
1858 <     */
1859 <    public void testThenApplyAsync2() {
1860 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1861 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1862 <        f.completeExceptionally(new CFException());
1863 <        checkCompletedWithWrappedCFException(g);
1864 <    }
1865 <
1866 <    /**
1867 <     * thenApplyAsync result completes exceptionally if action does
1868 <     */
1869 <    public void testThenApplyAsync3() {
1870 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1871 <        FailingFunction r = new FailingFunction();
1872 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1873 <        f.complete(null);
1874 <        checkCompletedWithWrappedCFException(g);
1875 <    }
1876 <
1877 <    /**
1878 <     * thenApplyAsync result completes exceptionally if source cancelled
1879 <     */
1880 <    public void testThenApplyAsync4() {
1881 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1882 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1883 <        assertTrue(f.cancel(true));
1884 <        checkCompletedWithWrappedCancellationException(g);
1885 <    }
1886 <
1887 <    /**
1888 <     * thenAcceptAsync result completes normally after normal
1889 <     * completion of source
1890 <     */
1891 <    public void testThenAcceptAsync() {
1892 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1893 <        IncAction r = new IncAction();
1894 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1895 <        f.complete(one);
1896 <        checkCompletedNormally(g, null);
1897 <        assertEquals(r.value, 2);
1898 <    }
1899 <
1900 <    /**
1901 <     * thenAcceptAsync result completes exceptionally after exceptional
1902 <     * completion of source
1903 <     */
1904 <    public void testThenAcceptAsync2() {
1905 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1906 <        IncAction r = new IncAction();
1907 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1908 <        f.completeExceptionally(new CFException());
1909 <        checkCompletedWithWrappedCFException(g);
1910 <    }
1911 <
1912 <    /**
1913 <     * thenAcceptAsync result completes exceptionally if action does
1914 <     */
1915 <    public void testThenAcceptAsync3() {
1916 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1917 <        FailingConsumer r = new FailingConsumer();
1918 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1919 <        f.complete(null);
1920 <        checkCompletedWithWrappedCFException(g);
1921 <    }
1922 <
1923 <    /**
1924 <     * thenAcceptAsync result completes exceptionally if source cancelled
1925 <     */
1926 <    public void testThenAcceptAsync4() {
1927 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1928 <        IncAction r = new IncAction();
1929 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1930 <        assertTrue(f.cancel(true));
1931 <        checkCompletedWithWrappedCancellationException(g);
1932 <    }
1933 <
1934 <    /**
1935 <     * thenCombineAsync result completes normally after normal
1936 <     * completion of sources
1937 <     */
1938 <    public void testThenCombineAsync() {
1939 <        CompletableFuture<Integer> f, g, h;
1940 <
1941 <        f = new CompletableFuture<>();
1942 <        g = new CompletableFuture<>();
1943 <        h = f.thenCombineAsync(g, subtract);
1944 <        f.complete(3);
1945 <        checkIncomplete(h);
1946 <        g.complete(1);
1947 <        checkCompletedNormally(h, 2);
1948 <
1949 <        f = new CompletableFuture<>();
1950 <        g = new CompletableFuture<>();
1951 <        h = f.thenCombineAsync(g, subtract);
1952 <        g.complete(1);
1953 <        checkIncomplete(h);
1954 <        f.complete(3);
1955 <        checkCompletedNormally(h, 2);
1956 <
1957 <        f = new CompletableFuture<>();
1958 <        g = new CompletableFuture<>();
1959 <        g.complete(1);
1960 <        f.complete(3);
1961 <        h = f.thenCombineAsync(g, subtract);
1962 <        checkCompletedNormally(h, 2);
1963 <    }
1964 <
1965 <    /**
1966 <     * thenCombineAsync result completes exceptionally after exceptional
1967 <     * completion of either source
1968 <     */
1969 <    public void testThenCombineAsync2() {
1970 <        CompletableFuture<Integer> f, g, h;
1971 <
1972 <        f = new CompletableFuture<>();
1973 <        g = new CompletableFuture<>();
1974 <        h = f.thenCombineAsync(g, subtract);
1975 <        f.completeExceptionally(new CFException());
1976 <        checkIncomplete(h);
1977 <        g.complete(1);
1978 <        checkCompletedWithWrappedCFException(h);
1979 <
1980 <        f = new CompletableFuture<>();
1981 <        g = new CompletableFuture<>();
1982 <        h = f.thenCombineAsync(g, subtract);
1983 <        g.completeExceptionally(new CFException());
1984 <        checkIncomplete(h);
1985 <        f.complete(3);
1986 <        checkCompletedWithWrappedCFException(h);
1987 <
1988 <        f = new CompletableFuture<>();
1989 <        g = new CompletableFuture<>();
1990 <        g.completeExceptionally(new CFException());
1991 <        f.complete(3);
1992 <        h = f.thenCombineAsync(g, subtract);
1993 <        checkCompletedWithWrappedCFException(h);
1994 <    }
1995 <
1996 <    /**
1997 <     * thenCombineAsync result completes exceptionally if action does
1998 <     */
1999 <    public void testThenCombineAsync3() {
2000 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2001 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2002 <        FailingBiFunction r = new FailingBiFunction();
2003 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
2004 <        f.complete(one);
2005 <        checkIncomplete(g);
2006 <        assertFalse(r.ran);
2007 <        f2.complete(two);
2008 <        checkCompletedWithWrappedCFException(g);
2009 <        assertTrue(r.ran);
2010 <    }
2011 <
2012 <    /**
2013 <     * thenCombineAsync result completes exceptionally if either source cancelled
2014 <     */
2015 <    public void testThenCombineAsync4() {
2016 <        CompletableFuture<Integer> f, g, h;
2017 <
2018 <        f = new CompletableFuture<>();
2019 <        g = new CompletableFuture<>();
2020 <        h = f.thenCombineAsync(g, subtract);
2021 <        assertTrue(f.cancel(true));
2022 <        checkIncomplete(h);
2023 <        g.complete(1);
2024 <        checkCompletedWithWrappedCancellationException(h);
2025 <
2026 <        f = new CompletableFuture<>();
2027 <        g = new CompletableFuture<>();
2028 <        h = f.thenCombineAsync(g, subtract);
2029 <        assertTrue(g.cancel(true));
2030 <        checkIncomplete(h);
2031 <        f.complete(3);
2032 <        checkCompletedWithWrappedCancellationException(h);
2033 <
2034 <        f = new CompletableFuture<>();
2035 <        g = new CompletableFuture<>();
2036 <        g.complete(3);
2037 <        assertTrue(f.cancel(true));
2038 <        h = f.thenCombineAsync(g, subtract);
2039 <        checkCompletedWithWrappedCancellationException(h);
2040 <
2041 <        f = new CompletableFuture<>();
2042 <        g = new CompletableFuture<>();
2043 <        f.complete(3);
2044 <        assertTrue(g.cancel(true));
2045 <        h = f.thenCombineAsync(g, subtract);
2046 <        checkCompletedWithWrappedCancellationException(h);
2047 <    }
2048 <
2049 <    /**
2050 <     * applyToEitherAsync result completes normally after normal
2051 <     * completion of sources
2052 <     */
2053 <    public void testApplyToEitherAsync() {
2054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2055 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2056 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2057 <        f.complete(one);
2058 <        checkCompletedNormally(g, two);
2059 <
2060 <        f = new CompletableFuture<>();
2061 <        f.complete(one);
2062 <        f2 = new CompletableFuture<>();
2063 <        g = f.applyToEitherAsync(f2, inc);
2064 <        checkCompletedNormally(g, two);
2065 <    }
2066 <
2067 <    /**
2068 <     * applyToEitherAsync result completes exceptionally after exceptional
2069 <     * completion of source
2070 <     */
2071 <    public void testApplyToEitherAsync2() {
2072 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2073 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2074 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2075 <        f.completeExceptionally(new CFException());
2076 <        checkCompletedWithWrappedCFException(g);
2077 <
2078 <        f = new CompletableFuture<>();
2079 <        f2 = new CompletableFuture<>();
2080 <        f2.completeExceptionally(new CFException());
2081 <        g = f.applyToEitherAsync(f2, inc);
2082 <        f.complete(one);
2083 <        checkCompletedWithWrappedCFException(g);
2084 <    }
2085 <
2086 <    /**
2087 <     * applyToEitherAsync result completes exceptionally if action does
2088 <     */
2089 <    public void testApplyToEitherAsync3() {
2090 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2091 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2092 <        FailingFunction r = new FailingFunction();
2093 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2094 <        f.complete(one);
2095 <        checkCompletedWithWrappedCFException(g);
2096 <    }
2097 <
2098 <    /**
2099 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2100 <     */
2101 <    public void testApplyToEitherAsync4() {
2102 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2103 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2104 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2105 <        assertTrue(f.cancel(true));
2106 <        checkCompletedWithWrappedCancellationException(g);
2107 <
2108 <        f = new CompletableFuture<>();
2109 <        f2 = new CompletableFuture<>();
2110 <        assertTrue(f2.cancel(true));
2111 <        g = f.applyToEitherAsync(f2, inc);
2112 <        checkCompletedWithWrappedCancellationException(g);
2113 <    }
2114 <
2115 <    /**
2116 <     * acceptEitherAsync result completes normally after normal
2117 <     * completion of sources
2118 <     */
2119 <    public void testAcceptEitherAsync() {
2120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2121 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2122 <        IncAction r = new IncAction();
2123 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2124 <        f.complete(one);
2125 <        checkCompletedNormally(g, null);
2126 <        assertEquals(r.value, 2);
2127 <
2128 <        r = new IncAction();
2129 <        f = new CompletableFuture<>();
2130 <        f.complete(one);
2131 <        f2 = new CompletableFuture<>();
2132 <        g = f.acceptEitherAsync(f2, r);
2133 <        checkCompletedNormally(g, null);
2134 <        assertEquals(r.value, 2);
2135 <    }
2136 <
2137 <    /**
2138 <     * acceptEitherAsync result completes exceptionally after exceptional
2139 <     * completion of source
2140 <     */
2141 <    public void testAcceptEitherAsync2() {
2142 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2143 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2144 <        IncAction r = new IncAction();
2145 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2146 <        f.completeExceptionally(new CFException());
2147 <        checkCompletedWithWrappedCFException(g);
2148 <
2149 <        r = new IncAction();
2150 <        f = new CompletableFuture<>();
2151 <        f2 = new CompletableFuture<>();
2152 <        f2.completeExceptionally(new CFException());
2153 <        g = f.acceptEitherAsync(f2, r);
2154 <        f.complete(one);
2155 <        checkCompletedWithWrappedCFException(g);
2156 <    }
2157 <
2158 <    /**
2159 <     * acceptEitherAsync result completes exceptionally if action does
2160 <     */
2161 <    public void testAcceptEitherAsync3() {
2162 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2163 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2164 <        FailingConsumer r = new FailingConsumer();
2165 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2166 <        f.complete(one);
2167 <        checkCompletedWithWrappedCFException(g);
2168 <    }
2169 <
2170 <    /**
2171 <     * acceptEitherAsync result completes exceptionally if either
2172 <     * source cancelled
2173 <     */
2174 <    public void testAcceptEitherAsync4() {
2175 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2176 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2177 <        IncAction r = new IncAction();
2178 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2179 <        assertTrue(f.cancel(true));
2180 <        checkCompletedWithWrappedCancellationException(g);
2181 <
2182 <        r = new IncAction();
2183 <        f = new CompletableFuture<>();
2184 <        f2 = new CompletableFuture<>();
2185 <        assertTrue(f2.cancel(true));
2186 <        g = f.acceptEitherAsync(f2, r);
2187 <        checkCompletedWithWrappedCancellationException(g);
2188 <    }
2189 <
2190 <    /**
2191 <     * runAfterEitherAsync result completes normally after normal
2192 <     * completion of sources
2193 <     */
2194 <    public void testRunAfterEitherAsync() {
2195 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2196 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2197 <        Noop r = new Noop();
2198 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2199 <        f.complete(one);
2200 <        checkCompletedNormally(g, null);
2201 <        assertTrue(r.ran);
2202 <
2203 <        r = new Noop();
2204 <        f = new CompletableFuture<>();
2205 <        f.complete(one);
2206 <        f2 = new CompletableFuture<>();
2207 <        g = f.runAfterEitherAsync(f2, r);
2208 <        checkCompletedNormally(g, null);
2209 <        assertTrue(r.ran);
2210 <    }
2211 <
2212 <    /**
2213 <     * runAfterEitherAsync result completes exceptionally after exceptional
2214 <     * completion of source
2215 <     */
2216 <    public void testRunAfterEitherAsync2() {
2217 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2218 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2219 <        Noop r = new Noop();
2220 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2221 <        f.completeExceptionally(new CFException());
2222 <        checkCompletedWithWrappedCFException(g);
2223 <
2224 <        r = new Noop();
2225 <        f = new CompletableFuture<>();
2226 <        f2 = new CompletableFuture<>();
2227 <        f2.completeExceptionally(new CFException());
2228 <        g = f.runAfterEitherAsync(f2, r);
2229 <        f.complete(one);
2230 <        checkCompletedWithWrappedCFException(g);
2231 <    }
2232 <
2233 <    /**
2234 <     * runAfterEitherAsync result completes exceptionally if action does
2235 <     */
2236 <    public void testRunAfterEitherAsync3() {
2237 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2238 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2239 <        FailingNoop r = new FailingNoop();
2240 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2241 <        f.complete(one);
2242 <        checkCompletedWithWrappedCFException(g);
2243 <    }
2244 <
2245 <    /**
2246 <     * runAfterEitherAsync result completes exceptionally if either
2247 <     * source cancelled
2248 <     */
2249 <    public void testRunAfterEitherAsync4() {
2250 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2251 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2252 <        Noop r = new Noop();
2253 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2254 <        assertTrue(f.cancel(true));
2255 <        checkCompletedWithWrappedCancellationException(g);
2256 <
2257 <        r = new Noop();
2258 <        f = new CompletableFuture<>();
2259 <        f2 = new CompletableFuture<>();
2260 <        assertTrue(f2.cancel(true));
2261 <        g = f.runAfterEitherAsync(f2, r);
2262 <        checkCompletedWithWrappedCancellationException(g);
2263 <    }
2264 <
2265 <    /**
2266 <     * thenComposeAsync result completes normally after normal
2267 <     * completion of source
2268 <     */
2269 <    public void testThenComposeAsync() {
2270 <        CompletableFuture<Integer> f, g;
2271 <        CompletableFutureInc r;
2272 <
2273 <        f = new CompletableFuture<>();
2274 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2275 <        f.complete(one);
2276 <        checkCompletedNormally(g, two);
2277 <
2278 <        f = new CompletableFuture<>();
2279 <        f.complete(one);
2280 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2281 <        checkCompletedNormally(g, two);
2282 <    }
2283 <
2284 <    /**
2285 <     * thenComposeAsync result completes exceptionally after
2286 <     * exceptional completion of source
2287 <     */
2288 <    public void testThenComposeAsync2() {
2289 <        CompletableFuture<Integer> f, g;
2290 <        CompletableFutureInc r;
2291 <
2292 <        f = new CompletableFuture<>();
2293 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2294 <        f.completeExceptionally(new CFException());
2295 <        checkCompletedWithWrappedCFException(g);
2296 <        assertFalse(r.ran);
2297 <
2298 <        f = new CompletableFuture<>();
2299 <        f.completeExceptionally(new CFException());
2300 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2301 <        checkCompletedWithWrappedCFException(g);
2302 <        assertFalse(r.ran);
2303 <    }
2304 <
2305 <    /**
2306 <     * thenComposeAsync result completes exceptionally if action does
2307 <     */
2308 <    public void testThenComposeAsync3() {
2309 <        CompletableFuture<Integer> f, g;
2310 <        FailingCompletableFutureFunction r;
2311 <
2312 <        f = new CompletableFuture<>();
2313 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2314 <        f.complete(one);
2315 <        checkCompletedWithWrappedCFException(g);
2316 <
2317 <        f = new CompletableFuture<>();
2318 <        f.complete(one);
2319 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2320 <        checkCompletedWithWrappedCFException(g);
2321 <    }
2322 <
2323 <    /**
2324 <     * thenComposeAsync result completes exceptionally if source cancelled
2325 <     */
2326 <    public void testThenComposeAsync4() {
2327 <        CompletableFuture<Integer> f, g;
2328 <        CompletableFutureInc r;
2329 <
2330 <        f = new CompletableFuture<>();
2331 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2332 <        assertTrue(f.cancel(true));
2333 <        checkCompletedWithWrappedCancellationException(g);
2334 <
2335 <        f = new CompletableFuture<>();
2336 <        assertTrue(f.cancel(true));
2337 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2338 <        checkCompletedWithWrappedCancellationException(g);
2339 <    }
2340 <
2341 <    // async with explicit executors
2342 <
2343 <    /**
2344 <     * thenRunAsync result completes normally after normal completion of source
2345 <     */
2346 <    public void testThenRunAsyncE() {
2347 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2348 <        Noop r = new Noop();
2349 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2350 <        f.complete(null);
2351 <        checkCompletedNormally(g, null);
2352 <
2353 <        // reordered version
2354 <        f = new CompletableFuture<>();
2355 <        f.complete(null);
2356 <        r = new Noop();
2357 <        g = f.thenRunAsync(r, new ThreadExecutor());
2358 <        checkCompletedNormally(g, null);
2359 <    }
2360 <
2361 <    /**
2362 <     * thenRunAsync result completes exceptionally after exceptional
2363 <     * completion of source
2364 <     */
2365 <    public void testThenRunAsync2E() {
2366 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2367 <        Noop r = new Noop();
2368 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2369 <        f.completeExceptionally(new CFException());
2370 <        try {
2371 <            g.join();
2372 <            shouldThrow();
2373 <        } catch (CompletionException success) {}
2374 <        checkCompletedWithWrappedCFException(g);
2375 <    }
2376 <
2377 <    /**
2378 <     * thenRunAsync result completes exceptionally if action does
2379 <     */
2380 <    public void testThenRunAsync3E() {
2381 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2382 <        FailingNoop r = new FailingNoop();
2383 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2384 <        f.complete(null);
2385 <        checkCompletedWithWrappedCFException(g);
2386 <    }
2387 <
2388 <    /**
2389 <     * thenRunAsync result completes exceptionally if source cancelled
2390 <     */
2391 <    public void testThenRunAsync4E() {
2392 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2393 <        Noop r = new Noop();
2394 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2395 <        assertTrue(f.cancel(true));
2396 <        checkCompletedWithWrappedCancellationException(g);
2397 <    }
2398 <
2399 <    /**
2400 <     * thenApplyAsync result completes normally after normal completion of source
2401 <     */
2402 <    public void testThenApplyAsyncE() {
2403 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2404 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2405 <        f.complete(one);
2406 <        checkCompletedNormally(g, two);
2407 <    }
2408 <
2409 <    /**
2410 <     * thenApplyAsync result completes exceptionally after exceptional
2411 <     * completion of source
2412 <     */
2413 <    public void testThenApplyAsync2E() {
2414 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2415 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2416 <        f.completeExceptionally(new CFException());
2417 <        checkCompletedWithWrappedCFException(g);
2418 <    }
2419 <
2420 <    /**
2421 <     * thenApplyAsync result completes exceptionally if action does
2422 <     */
2423 <    public void testThenApplyAsync3E() {
2424 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2425 <        FailingFunction r = new FailingFunction();
2426 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2427 <        f.complete(null);
2428 <        checkCompletedWithWrappedCFException(g);
2429 <    }
2430 <
2431 <    /**
2432 <     * thenApplyAsync result completes exceptionally if source cancelled
2433 <     */
2434 <    public void testThenApplyAsync4E() {
2435 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2436 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2437 <        assertTrue(f.cancel(true));
2438 <        checkCompletedWithWrappedCancellationException(g);
2439 <    }
2440 <
2441 <    /**
2442 <     * thenAcceptAsync result completes normally after normal
2443 <     * completion of source
2444 <     */
2445 <    public void testThenAcceptAsyncE() {
2446 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2447 <        IncAction r = new IncAction();
2448 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2449 <        f.complete(one);
2450 <        checkCompletedNormally(g, null);
2451 <        assertEquals(r.value, 2);
2452 <    }
2453 <
2454 <    /**
2455 <     * thenAcceptAsync result completes exceptionally after exceptional
2456 <     * completion of source
2457 <     */
2458 <    public void testThenAcceptAsync2E() {
2459 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2460 <        IncAction r = new IncAction();
2461 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2462 <        f.completeExceptionally(new CFException());
2463 <        checkCompletedWithWrappedCFException(g);
2464 <    }
2465 <
2466 <    /**
2467 <     * thenAcceptAsync result completes exceptionally if action does
2468 <     */
2469 <    public void testThenAcceptAsync3E() {
2470 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2471 <        FailingConsumer r = new FailingConsumer();
2472 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2473 <        f.complete(null);
2474 <        checkCompletedWithWrappedCFException(g);
2475 <    }
2476 <
2477 <    /**
2478 <     * thenAcceptAsync result completes exceptionally if source cancelled
2479 <     */
2480 <    public void testThenAcceptAsync4E() {
2481 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2482 <        IncAction r = new IncAction();
2483 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2484 <        assertTrue(f.cancel(true));
2485 <        checkCompletedWithWrappedCancellationException(g);
2486 <    }
2487 <
2488 <    /**
2489 <     * thenCombineAsync result completes normally after normal
2490 <     * completion of sources
2491 <     */
2492 <    public void testThenCombineAsyncE() {
2493 <        CompletableFuture<Integer> f, g, h;
2494 <        ThreadExecutor e = new ThreadExecutor();
2495 <        int count = 0;
2496 <
2497 <        f = new CompletableFuture<>();
2498 <        g = new CompletableFuture<>();
2499 <        h = f.thenCombineAsync(g, subtract, e);
2500 <        f.complete(3);
2501 <        checkIncomplete(h);
2502 <        g.complete(1);
2503 <        checkCompletedNormally(h, 2);
2504 <        assertEquals(++count, e.count.get());
2505 <
2506 <        f = new CompletableFuture<>();
2507 <        g = new CompletableFuture<>();
2508 <        h = f.thenCombineAsync(g, subtract, e);
2509 <        g.complete(1);
2510 <        checkIncomplete(h);
2511 <        f.complete(3);
2512 <        checkCompletedNormally(h, 2);
2513 <        assertEquals(++count, e.count.get());
2514 <
2515 <        f = new CompletableFuture<>();
2516 <        g = new CompletableFuture<>();
2517 <        g.complete(1);
2518 <        f.complete(3);
2519 <        h = f.thenCombineAsync(g, subtract, e);
2520 <        checkCompletedNormally(h, 2);
2521 <        assertEquals(++count, e.count.get());
2522 <    }
2523 <
2524 <    /**
2525 <     * thenCombineAsync result completes exceptionally after exceptional
2526 <     * completion of either source
2527 <     */
2528 <    public void testThenCombineAsync2E() {
2529 <        CompletableFuture<Integer> f, g, h;
2530 <        ThreadExecutor e = new ThreadExecutor();
2531 <        int count = 0;
2532 <
2533 <        f = new CompletableFuture<>();
2534 <        g = new CompletableFuture<>();
2535 <        h = f.thenCombineAsync(g, subtract, e);
2536 <        f.completeExceptionally(new CFException());
2537 <        checkIncomplete(h);
2538 <        g.complete(1);
2539 <        checkCompletedWithWrappedCFException(h);
2540 <
2541 <        f = new CompletableFuture<>();
2542 <        g = new CompletableFuture<>();
2543 <        h = f.thenCombineAsync(g, subtract, e);
2544 <        g.completeExceptionally(new CFException());
2545 <        checkIncomplete(h);
2546 <        f.complete(3);
2547 <        checkCompletedWithWrappedCFException(h);
2548 <
2549 <        f = new CompletableFuture<>();
2550 <        g = new CompletableFuture<>();
2551 <        g.completeExceptionally(new CFException());
2552 <        h = f.thenCombineAsync(g, subtract, e);
2553 <        checkIncomplete(h);
2554 <        f.complete(3);
2555 <        checkCompletedWithWrappedCFException(h);
2556 <
2557 <        assertEquals(0, e.count.get());
2558 <    }
2559 <
2560 <    /**
2561 <     * thenCombineAsync result completes exceptionally if action does
2562 <     */
2563 <    public void testThenCombineAsync3E() {
2564 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2565 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2566 <        FailingBiFunction r = new FailingBiFunction();
2567 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2568 <        f.complete(one);
2569 <        checkIncomplete(g);
2570 <        assertFalse(r.ran);
2571 <        f2.complete(two);
2572 <        checkCompletedWithWrappedCFException(g);
2573 <        assertTrue(r.ran);
2574 <    }
2575 <
2576 <    /**
2577 <     * thenCombineAsync result completes exceptionally if either source cancelled
2578 <     */
2579 <    public void testThenCombineAsync4E() {
2580 <        CompletableFuture<Integer> f, g, h;
2581 <        ThreadExecutor e = new ThreadExecutor();
2582 <
2583 <        f = new CompletableFuture<>();
2584 <        g = new CompletableFuture<>();
2585 <        h = f.thenCombineAsync(g, subtract, e);
2586 <        assertTrue(f.cancel(true));
2587 <        checkIncomplete(h);
2588 <        g.complete(1);
2589 <        checkCompletedWithWrappedCancellationException(h);
2590 <
2591 <        f = new CompletableFuture<>();
2592 <        g = new CompletableFuture<>();
2593 <        h = f.thenCombineAsync(g, subtract, e);
2594 <        assertTrue(g.cancel(true));
2595 <        checkIncomplete(h);
2596 <        f.complete(3);
2597 <        checkCompletedWithWrappedCancellationException(h);
2598 <
2599 <        f = new CompletableFuture<>();
2600 <        g = new CompletableFuture<>();
2601 <        assertTrue(g.cancel(true));
2602 <        h = f.thenCombineAsync(g, subtract, e);
2603 <        checkIncomplete(h);
2604 <        f.complete(3);
2605 <        checkCompletedWithWrappedCancellationException(h);
2606 <
2607 <        f = new CompletableFuture<>();
2608 <        g = new CompletableFuture<>();
2609 <        assertTrue(f.cancel(true));
2610 <        assertTrue(g.cancel(true));
2611 <        h = f.thenCombineAsync(g, subtract, e);
2612 <        checkCompletedWithWrappedCancellationException(h);
2613 <
2614 <        assertEquals(0, e.count.get());
2615 <    }
2616 <
2617 <    /**
2618 <     * applyToEitherAsync result completes normally after normal
2619 <     * completion of sources
2620 <     */
2621 <    public void testApplyToEitherAsyncE() {
2622 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2623 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2624 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2625 <        f.complete(one);
2626 <        checkCompletedNormally(g, two);
2627 <
2628 <        f = new CompletableFuture<>();
2629 <        f.complete(one);
2630 <        f2 = new CompletableFuture<>();
2631 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2632 <        checkCompletedNormally(g, two);
2633 <    }
2634 <
2635 <    /**
2636 <     * applyToEitherAsync result completes exceptionally after exceptional
2637 <     * completion of source
2638 <     */
2639 <    public void testApplyToEitherAsync2E() {
2640 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2641 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2642 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2643 <        f.completeExceptionally(new CFException());
2644 <        checkCompletedWithWrappedCFException(g);
2645 <
2646 <        f = new CompletableFuture<>();
2647 <        f2 = new CompletableFuture<>();
2648 <        f2.completeExceptionally(new CFException());
2649 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2650 <        f.complete(one);
2651 <        checkCompletedWithWrappedCFException(g);
2652 <    }
2653 <
2654 <    /**
2655 <     * applyToEitherAsync result completes exceptionally if action does
2656 <     */
2657 <    public void testApplyToEitherAsync3E() {
2658 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2659 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2660 <        FailingFunction r = new FailingFunction();
2661 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2662 <        f.complete(one);
2663 <        checkCompletedWithWrappedCFException(g);
2664 <    }
2665 <
2666 <    /**
2667 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2668 <     */
2669 <    public void testApplyToEitherAsync4E() {
2670 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2671 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2672 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2673 <        assertTrue(f.cancel(true));
2674 <        checkCompletedWithWrappedCancellationException(g);
2675 <
2676 <        f = new CompletableFuture<>();
2677 <        f2 = new CompletableFuture<>();
2678 <        assertTrue(f2.cancel(true));
2679 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2680 <        checkCompletedWithWrappedCancellationException(g);
2681 <    }
2682 <
2683 <    /**
2684 <     * acceptEitherAsync result completes normally after normal
2685 <     * completion of sources
2686 <     */
2687 <    public void testAcceptEitherAsyncE() {
2688 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2689 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2690 <        IncAction r = new IncAction();
2691 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2692 <        f.complete(one);
2693 <        checkCompletedNormally(g, null);
2694 <        assertEquals(r.value, 2);
2695 <
2696 <        r = new IncAction();
2697 <        f = new CompletableFuture<>();
2698 <        f.complete(one);
2699 <        f2 = new CompletableFuture<>();
2700 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2701 <        checkCompletedNormally(g, null);
2702 <        assertEquals(r.value, 2);
2703 <    }
2704 <
2705 <    /**
2706 <     * acceptEitherAsync result completes exceptionally after exceptional
2707 <     * completion of source
2708 <     */
2709 <    public void testAcceptEitherAsync2E() {
2710 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2711 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2712 <        IncAction r = new IncAction();
2713 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2714 <        f.completeExceptionally(new CFException());
2715 <        checkCompletedWithWrappedCFException(g);
2716 <
2717 <        r = new IncAction();
2718 <        f = new CompletableFuture<>();
2719 <        f2 = new CompletableFuture<>();
2720 <        f2.completeExceptionally(new CFException());
2721 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2722 <        f.complete(one);
2723 <        checkCompletedWithWrappedCFException(g);
2724 <    }
2725 <
2726 <    /**
2727 <     * acceptEitherAsync result completes exceptionally if action does
2728 <     */
2729 <    public void testAcceptEitherAsync3E() {
2730 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2731 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2732 <        FailingConsumer r = new FailingConsumer();
2733 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2734 <        f.complete(one);
2735 <        checkCompletedWithWrappedCFException(g);
2736 <    }
2737 <
2738 <    /**
2739 <     * acceptEitherAsync result completes exceptionally if either
2740 <     * source cancelled
2741 <     */
2742 <    public void testAcceptEitherAsync4E() {
2743 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2744 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2745 <        IncAction r = new IncAction();
2746 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2747 <        assertTrue(f.cancel(true));
2748 <        checkCompletedWithWrappedCancellationException(g);
2749 <
2750 <        r = new IncAction();
2751 <        f = new CompletableFuture<>();
2752 <        f2 = new CompletableFuture<>();
2753 <        assertTrue(f2.cancel(true));
2754 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2755 <        checkCompletedWithWrappedCancellationException(g);
2756 <    }
2757 <
2758 <    /**
2759 <     * runAfterEitherAsync result completes normally after normal
2760 <     * completion of sources
2761 <     */
2762 <    public void testRunAfterEitherAsyncE() {
2763 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2764 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2765 <        Noop r = new Noop();
2766 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2767 <        f.complete(one);
2768 <        checkCompletedNormally(g, null);
2769 <        assertTrue(r.ran);
2770 <
2771 <        r = new Noop();
2772 <        f = new CompletableFuture<>();
2773 <        f.complete(one);
2774 <        f2 = new CompletableFuture<>();
2775 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2776 <        checkCompletedNormally(g, null);
2777 <        assertTrue(r.ran);
2778 <    }
2779 <
2780 <    /**
2781 <     * runAfterEitherAsync result completes exceptionally after exceptional
2782 <     * completion of source
2783 <     */
2784 <    public void testRunAfterEitherAsync2E() {
2785 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2786 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2787 <        Noop r = new Noop();
2788 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2789 <        f.completeExceptionally(new CFException());
2790 <        checkCompletedWithWrappedCFException(g);
2791 <
2792 <        r = new Noop();
2793 <        f = new CompletableFuture<>();
2794 <        f2 = new CompletableFuture<>();
2795 <        f2.completeExceptionally(new CFException());
2796 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2797 <        f.complete(one);
2798 <        checkCompletedWithWrappedCFException(g);
2799 <    }
2800 <
2801 <    /**
2802 <     * runAfterEitherAsync result completes exceptionally if action does
2803 <     */
2804 <    public void testRunAfterEitherAsync3E() {
2805 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2806 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2807 <        FailingNoop r = new FailingNoop();
2808 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2809 <        f.complete(one);
2810 <        checkCompletedWithWrappedCFException(g);
2811 <    }
2812 <
2813 <    /**
2814 <     * runAfterEitherAsync result completes exceptionally if either
2815 <     * source cancelled
2816 <     */
2817 <    public void testRunAfterEitherAsync4E() {
2818 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2819 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2820 <        Noop r = new Noop();
2821 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2822 <        assertTrue(f.cancel(true));
2823 <        checkCompletedWithWrappedCancellationException(g);
2824 <
2825 <        r = new Noop();
2826 <        f = new CompletableFuture<>();
2827 <        f2 = new CompletableFuture<>();
2828 <        assertTrue(f2.cancel(true));
2829 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2830 <        checkCompletedWithWrappedCancellationException(g);
2831 <    }
2832 <
2833 <    /**
2834 <     * thenComposeAsync result completes normally after normal
2835 <     * completion of source
2836 <     */
2837 <    public void testThenComposeAsyncE() {
2838 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2839 <        CompletableFutureInc r = new CompletableFutureInc();
2840 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2841 <        f.complete(one);
2842 <        checkCompletedNormally(g, two);
2843 <    }
2844 <
2845 <    /**
2846 <     * thenComposeAsync result completes exceptionally after
2847 <     * exceptional completion of source
2848 <     */
2849 <    public void testThenComposeAsync2E() {
2850 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2851 <        CompletableFutureInc r = new CompletableFutureInc();
2852 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2853 <        f.completeExceptionally(new CFException());
2854 <        checkCompletedWithWrappedCFException(g);
2855 <    }
2856 <
2857 <    /**
2858 <     * thenComposeAsync result completes exceptionally if action does
2859 <     */
2860 <    public void testThenComposeAsync3E() {
2861 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2862 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2863 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2864 <        f.complete(one);
2865 <        checkCompletedWithWrappedCFException(g);
2866 <    }
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  
2868    /**
2869     * thenComposeAsync result completes exceptionally if source cancelled
2870     */
2871    public void testThenComposeAsync4E() {
2872        CompletableFuture<Integer> f = new CompletableFuture<>();
2873        CompletableFutureInc r = new CompletableFutureInc();
2874        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2875        assertTrue(f.cancel(true));
2467          checkCompletedWithWrappedCancellationException(g);
2468 <    }
2468 >        checkCancelled(f);
2469 >    }}
2470  
2471      // other static methods
2472  
# Line 2893 | Line 2485 | public class CompletableFutureTest exten
2485       */
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);
# Line 2907 | Line 2500 | public class CompletableFutureTest exten
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 +
2520      /**
2521       * anyOf(no component futures) returns an incomplete future
2522       */
# Line 2965 | Line 2575 | public class CompletableFutureTest exten
2575          Runnable[] throwingActions = {
2576              () -> CompletableFuture.supplyAsync(null),
2577              () -> CompletableFuture.supplyAsync(null, exec),
2578 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2578 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2579  
2580              () -> CompletableFuture.runAsync(null),
2581              () -> CompletableFuture.runAsync(null, exec),
# Line 3038 | Line 2648 | public class CompletableFutureTest exten
2648  
2649              () -> f.thenCompose(null),
2650              () -> f.thenComposeAsync(null),
2651 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2651 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2652              () -> f.thenComposeAsync(null, exec),
2653  
2654              () -> f.exceptionally(null),
# Line 3074 | Line 2684 | public class CompletableFutureTest exten
2684       * whenComplete action executes on normal completion, propagating
2685       * source result.
2686       */
2687 <    public void testWhenComplete1() {
2688 <        final AtomicInteger a = new AtomicInteger();
2689 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2690 <        CompletableFuture<Integer> g =
2691 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
2692 <        f.complete(three);
2693 <        checkCompletedNormally(f, three);
2694 <        checkCompletedNormally(g, three);
2695 <        assertEquals(a.get(), 1);
2696 <    }
2697 <
2698 <    /**
2699 <     * whenComplete action executes on exceptional completion, propagating
2700 <     * source result.
2701 <     */
2702 <    public void testWhenComplete2() {
3093 <        final AtomicInteger a = new AtomicInteger();
3094 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3095 <        CompletableFuture<Integer> g =
3096 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3097 <        f.completeExceptionally(new CFException());
3098 <        assertTrue(f.isCompletedExceptionally());
3099 <        assertTrue(g.isCompletedExceptionally());
3100 <        assertEquals(a.get(), 1);
3101 <    }
3102 <
3103 <    /**
3104 <     * If a whenComplete action throws an exception when triggered by
3105 <     * a normal completion, it completes exceptionally
3106 <     */
3107 <    public void testWhenComplete3() {
3108 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3109 <        CompletableFuture<Integer> g =
3110 <            f.whenComplete((Integer x, Throwable t) ->
3111 <                           { throw new CFException(); } );
3112 <        f.complete(three);
3113 <        checkCompletedNormally(f, three);
3114 <        assertTrue(g.isCompletedExceptionally());
3115 <        checkCompletedWithWrappedCFException(g);
3116 <    }
3117 <
3118 <    /**
3119 <     * whenCompleteAsync action executes on normal completion, propagating
3120 <     * source result.
3121 <     */
3122 <    public void testWhenCompleteAsync1() {
3123 <        final AtomicInteger a = new AtomicInteger();
3124 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3125 <        CompletableFuture<Integer> g =
3126 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3127 <        f.complete(three);
3128 <        checkCompletedNormally(f, three);
3129 <        checkCompletedNormally(g, three);
3130 <        assertEquals(a.get(), 1);
3131 <    }
3132 <
3133 <    /**
3134 <     * whenCompleteAsync action executes on exceptional completion, propagating
3135 <     * source result.
3136 <     */
3137 <    public void testWhenCompleteAsync2() {
3138 <        final AtomicInteger a = new AtomicInteger();
3139 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3140 <        CompletableFuture<Integer> g =
3141 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3142 <        f.completeExceptionally(new CFException());
3143 <        checkCompletedWithWrappedCFException(f);
3144 <        checkCompletedWithWrappedCFException(g);
3145 <    }
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 <    /**
2705 <     * If a whenCompleteAsync action throws an exception when
2706 <     * triggered by a normal completion, it completes exceptionally
2707 <     */
3151 <    public void testWhenCompleteAsync3() {
3152 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3153 <        CompletableFuture<Integer> g =
3154 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3155 <                           { throw new CFException(); } );
3156 <        f.complete(three);
3157 <        checkCompletedNormally(f, three);
3158 <        checkCompletedWithWrappedCFException(g);
3159 <    }
2704 >        checkCompletedNormally(g, v1);
2705 >        checkCompletedNormally(f, v1);
2706 >        assertEquals(1, a.get());
2707 >    }}
2708  
2709      /**
2710 <     * whenCompleteAsync action executes on normal completion, propagating
2710 >     * whenComplete action executes on exceptional completion, propagating
2711       * source result.
2712       */
2713 <    public void testWhenCompleteAsync1e() {
2714 <        final AtomicInteger a = new AtomicInteger();
2715 <        ThreadExecutor exec = new ThreadExecutor();
2716 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2717 <        CompletableFuture<Integer> g =
2718 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2719 <                                exec);
2720 <        f.complete(three);
2721 <        checkCompletedNormally(f, three);
2722 <        checkCompletedNormally(g, three);
2723 <        assertEquals(a.get(), 1);
2724 <    }
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 <     * whenCompleteAsync action executes on exceptional completion, propagating
2737 <     * source result.
2736 >     * whenComplete action executes on cancelled source, propagating
2737 >     * CancellationException.
2738       */
2739 <    public void testWhenCompleteAsync2e() {
2740 <        final AtomicInteger a = new AtomicInteger();
2741 <        ThreadExecutor exec = new ThreadExecutor();
2742 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2743 <        CompletableFuture<Integer> g =
2744 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2745 <                                exec);
2746 <        f.completeExceptionally(new CFException());
2747 <        checkCompletedWithWrappedCFException(f);
2748 <        checkCompletedWithWrappedCFException(g);
2749 <    }
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 <    /**
2757 <     * If a whenCompleteAsync action throws an exception when triggered
2758 <     * by a normal completion, it completes exceptionally
2759 <     */
2760 <    public void testWhenCompleteAsync3e() {
3199 <        ThreadExecutor exec = new ThreadExecutor();
3200 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3201 <        CompletableFuture<Integer> g =
3202 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3203 <                                { throw new CFException(); },
3204 <                                exec);
3205 <        f.complete(three);
3206 <        checkCompletedNormally(f, three);
3207 <        checkCompletedWithWrappedCFException(g);
3208 <    }
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 <     * handleAsync action completes normally with function value on
2764 <     * either normal or exceptional completion of source
2763 >     * If a whenComplete action throws an exception when triggered by
2764 >     * a normal completion, it completes exceptionally
2765       */
2766 <    public void testHandleAsync() {
2767 <        CompletableFuture<Integer> f, g;
2768 <        IntegerHandler r;
2769 <
2770 <        f = new CompletableFuture<>();
2771 <        g = f.handleAsync(r = new IntegerHandler());
2772 <        assertFalse(r.ran);
2773 <        f.completeExceptionally(new CFException());
2774 <        checkCompletedWithWrappedCFException(f);
2775 <        checkCompletedNormally(g, three);
2776 <        assertTrue(r.ran);
2777 <
2778 <        f = new CompletableFuture<>();
2779 <        g = f.handleAsync(r = new IntegerHandler());
2780 <        assertFalse(r.ran);
2781 <        f.completeExceptionally(new CFException());
2782 <        checkCompletedWithWrappedCFException(f);
2783 <        checkCompletedNormally(g, three);
2784 <        assertTrue(r.ran);
2785 <
2786 <        f = new CompletableFuture<>();
2787 <        g = f.handleAsync(r = new IntegerHandler());
3236 <        assertFalse(r.ran);
3237 <        f.complete(one);
3238 <        checkCompletedNormally(f, one);
3239 <        checkCompletedNormally(g, two);
3240 <        assertTrue(r.ran);
3241 <
3242 <        f = new CompletableFuture<>();
3243 <        g = f.handleAsync(r = new IntegerHandler());
3244 <        assertFalse(r.ran);
3245 <        f.complete(one);
3246 <        checkCompletedNormally(f, one);
3247 <        checkCompletedNormally(g, two);
3248 <        assertTrue(r.ran);
3249 <    }
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 <     * handleAsync action with Executor completes normally with
2791 <     * function value on either normal or exceptional completion of
2792 <     * source
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 testHandleAsync2() {
2795 <        CompletableFuture<Integer> f, g;
2796 <        ThreadExecutor exec = new ThreadExecutor();
2797 <        IntegerHandler r;
2798 <
2799 <        f = new CompletableFuture<>();
2800 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2801 <        assertFalse(r.ran);
2802 <        f.completeExceptionally(new CFException());
2803 <        checkCompletedWithWrappedCFException(f);
2804 <        checkCompletedNormally(g, three);
2805 <        assertTrue(r.ran);
2806 <
2807 <        f = new CompletableFuture<>();
2808 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2809 <        assertFalse(r.ran);
2810 <        f.completeExceptionally(new CFException());
2811 <        checkCompletedWithWrappedCFException(f);
2812 <        checkCompletedNormally(g, three);
2813 <        assertTrue(r.ran);
2814 <
2815 <        f = new CompletableFuture<>();
2816 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2817 <        assertFalse(r.ran);
2818 <        f.complete(one);
3281 <        checkCompletedNormally(f, one);
3282 <        checkCompletedNormally(g, two);
3283 <        assertTrue(r.ran);
3284 <
3285 <        f = new CompletableFuture<>();
3286 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3287 <        assertFalse(r.ran);
3288 <        f.complete(one);
3289 <        checkCompletedNormally(f, one);
3290 <        checkCompletedNormally(g, two);
3291 <        assertTrue(r.ran);
3292 <    }
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