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.37 by jsr166, Sun Jun 1 23:20:19 2014 UTC vs.
Revision 1.68 by jsr166, Fri Jun 6 19:35:54 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 <    // A non-commutative function that handles null values as well,
345 <    // and produces null values occasionally.
346 <    public static Integer subtract(Integer x, Integer y) {
344 >    class IntegerSupplier extends CheckedAction
345 >        implements Supplier<Integer>
346 >    {
347 >        final Integer value;
348 >        IntegerSupplier(ExecutionMode m, Integer value) {
349 >            super(m);
350 >            this.value = value;
351 >        }
352 >        public Integer get() {
353 >            invoked();
354 >            return value;
355 >        }
356 >    }
357 >
358 >    // A function that handles and produces null values as well.
359 >    static Integer inc(Integer x) {
360 >        return (x == null) ? null : x + 1;
361 >    }
362 >
363 >    class NoopConsumer extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        NoopConsumer(ExecutionMode m) { super(m); }
367 >        public void accept(Integer x) {
368 >            invoked();
369 >            value = 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 <    static final Supplier<Integer> supplyOne =
392 <        () -> Integer.valueOf(1);
393 <    static final Function<Integer, Integer> inc =
394 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
333 <    static final BiFunction<Integer, Integer, Integer> subtract =
334 <        (Integer x, Integer y) -> subtract(x, y);
335 <    static final class IncAction implements Consumer<Integer> {
336 <        int value;
337 <        public void accept(Integer x) { value = x.intValue() + 1; }
338 <    }
339 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
340 <        int invocationCount = 0;
341 <        Integer value;
342 <        // Check this action was invoked exactly once when result is computed.
343 <        public boolean ran() { return invocationCount == 1; }
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 <            invocationCount++;
396 >            invoked();
397              value = subtract(x, y);
398          }
399      }
400 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
401 <        int invocationCount = 0;
402 <        Integer value;
403 <        // Check this action was invoked exactly once when result is computed.
404 <        public boolean ran() { return invocationCount == 1; }
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 <            invocationCount++;
406 >            invoked();
407              return value = subtract(x, y);
408          }
409      }
410 <    static final class Noop implements Runnable {
411 <        boolean ran;
412 <        public void run() { ran = true; }
410 >
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413 >        public void run() {
414 >            invoked();
415 >        }
416      }
417  
418 <    static final class FailingSupplier implements Supplier<Integer> {
419 <        boolean ran;
420 <        public Integer get() { ran = true; throw new CFException(); }
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 FailingConsumer implements Consumer<Integer> {
428 <        boolean ran;
429 <        public void accept(Integer x) { 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 FailingBiConsumer implements BiConsumer<Integer, Integer> {
439 <        boolean ran;
440 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
438 >
439 >    class FailingBiConsumer extends CheckedIntegerAction
440 >        implements BiConsumer<Integer, Integer>
441 >    {
442 >        FailingBiConsumer(ExecutionMode m) { super(m); }
443 >        public void accept(Integer x, Integer y) {
444 >            invoked();
445 >            value = subtract(x, y);
446 >            throw new CFException();
447 >        }
448      }
449 <    static final class FailingFunction implements Function<Integer, Integer> {
450 <        boolean ran;
451 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
449 >
450 >    class FailingFunction extends CheckedIntegerAction
451 >        implements Function<Integer, Integer>
452 >    {
453 >        FailingFunction(ExecutionMode m) { super(m); }
454 >        public Integer apply(Integer x) {
455 >            invoked();
456 >            value = x;
457 >            throw new CFException();
458 >        }
459      }
460 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
461 <        boolean ran;
462 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
460 >
461 >    class FailingBiFunction extends CheckedIntegerAction
462 >        implements BiFunction<Integer, Integer, Integer>
463 >    {
464 >        FailingBiFunction(ExecutionMode m) { super(m); }
465 >        public Integer apply(Integer x, Integer y) {
466 >            invoked();
467 >            value = subtract(x, y);
468 >            throw new CFException();
469 >        }
470      }
471 <    static final class FailingNoop implements Runnable {
472 <        boolean ran;
473 <        public void run() { ran = true; throw new CFException(); }
471 >
472 >    class FailingRunnable extends CheckedAction implements Runnable {
473 >        FailingRunnable(ExecutionMode m) { super(m); }
474 >        public void run() {
475 >            invoked();
476 >            throw new CFException();
477 >        }
478      }
479  
480 <    static final class CompletableFutureInc
481 <        implements Function<Integer, CompletableFuture<Integer>> {
482 <        boolean ran;
480 >
481 >    class CompletableFutureInc extends CheckedIntegerAction
482 >        implements Function<Integer, CompletableFuture<Integer>>
483 >    {
484 >        CompletableFutureInc(ExecutionMode m) { super(m); }
485          public CompletableFuture<Integer> apply(Integer x) {
486 <            ran = true;
486 >            invoked();
487 >            value = x;
488              CompletableFuture<Integer> f = new CompletableFuture<>();
489 <            f.complete(Integer.valueOf(x.intValue() + 1));
489 >            f.complete(inc(x));
490              return f;
491          }
492      }
493  
494 <    static final class FailingCompletableFutureFunction
495 <        implements Function<Integer, CompletableFuture<Integer>> {
496 <        boolean ran;
494 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
495 >        implements Function<Integer, CompletableFuture<Integer>>
496 >    {
497 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
498          public CompletableFuture<Integer> apply(Integer x) {
499 <            ran = true; throw new CFException();
499 >            invoked();
500 >            value = x;
501 >            throw new CFException();
502          }
503      }
504  
505      // Used for explicit executor tests
506      static final class ThreadExecutor implements Executor {
507 <        AtomicInteger count = new AtomicInteger(0);
507 >        final AtomicInteger count = new AtomicInteger(0);
508 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
509 >        static boolean startedCurrentThread() {
510 >            return Thread.currentThread().getThreadGroup() == tg;
511 >        }
512  
513          public void execute(Runnable r) {
514              count.getAndIncrement();
515 <            new Thread(r).start();
415 <        }
416 <    }
417 <
418 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
419 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
420 <    }
421 <
422 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
423 <        boolean ran;
424 <        public Integer apply(Integer x, Throwable t) {
425 <            ran = true;
426 <            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 449 | Line 575 | public class CompletableFutureTest exten
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 482 | Line 649 | public class CompletableFutureTest exten
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  
487 //         REVERSE_DEFAULT_ASYNC {
488 //             public <T,U> CompletableFuture<Void> runAfterBoth
489 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
490 //                 return f.runAfterBothAsync(g, a);
491 //             }
492 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
493 //                 (CompletableFuture<T> f,
494 //                  CompletionStage<? extends U> g,
495 //                  BiConsumer<? super T,? super U> a) {
496 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
497 //             }
498 //         },
499
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 514 | Line 722 | public class CompletableFutureTest exten
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
# Line 526 | Line 770 | public class CompletableFutureTest exten
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);
561 <        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);
574 <        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());
603        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);
635 <        checkCompletedNormally(f, one);
636 <    }
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  
664        f = new CompletableFuture<>();
665        f.complete(null);
666        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);
690 <        assertFalse(r.ran);
691 <    }
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);
710 <    }
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());
728 <        checkCompletedWithWrappedCancellationException(g);
729 <    }
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() {
756 <        CompletableFuture<Integer> f = new CompletableFuture<>();
757 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
758 <        f.complete(one);
759 <        checkCompletedWithWrappedCFException(g);
760 <    }
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 NoopConsumer r = new NoopConsumer(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 >        r.assertValue(v1);
1262 >        checkCompletedNormally(f, v1);
1263 >    }}
1264  
1265      /**
1266       * thenAccept result completes exceptionally after exceptional
1267       * completion of source
1268       */
1269 <    public void testThenAccept2() {
1270 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1271 <        IncAction r = new IncAction();
1272 <        CompletableFuture<Void> g = f.thenAccept(r);
1273 <        f.completeExceptionally(new CFException());
1274 <        checkCompletedWithWrappedCFException(g);
1275 <    }
1269 >    public void testThenAccept_exceptionalCompletion() {
1270 >        for (ExecutionMode m : ExecutionMode.values())
1271 >        for (boolean createIncomplete : new boolean[] { true, false })
1272 >    {
1273 >        final CFException ex = new CFException();
1274 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 >        final NoopConsumer r = new NoopConsumer(m);
1276 >        if (!createIncomplete) f.completeExceptionally(ex);
1277 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1278 >        if (createIncomplete) {
1279 >            checkIncomplete(g);
1280 >            f.completeExceptionally(ex);
1281 >        }
1282  
1283 <    /**
1284 <     * thenAccept result completes exceptionally if action does
1285 <     */
1286 <    public void testThenAccept3() {
800 <        CompletableFuture<Integer> f = new CompletableFuture<>();
801 <        FailingConsumer r = new FailingConsumer();
802 <        CompletableFuture<Void> g = f.thenAccept(r);
803 <        f.complete(one);
804 <        checkCompletedWithWrappedCFException(g);
805 <        assertTrue(r.ran);
806 <    }
1283 >        checkCompletedWithWrappedCFException(g, ex);
1284 >        checkCompletedWithWrappedCFException(f, ex);
1285 >        r.assertNotInvoked();
1286 >    }}
1287  
1288      /**
1289       * thenAccept result completes exceptionally if source cancelled
1290       */
1291 <    public void testThenAccept4() {
1292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1293 <        IncAction r = new IncAction();
1294 <        CompletableFuture<Void> g = f.thenAccept(r);
1295 <        assertTrue(f.cancel(true));
1291 >    public void testThenAccept_sourceCancelled() {
1292 >        for (ExecutionMode m : ExecutionMode.values())
1293 >        for (boolean createIncomplete : new boolean[] { true, false })
1294 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1295 >    {
1296 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 >        final NoopConsumer r = new NoopConsumer(m);
1298 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1300 >        if (createIncomplete) {
1301 >            checkIncomplete(g);
1302 >            assertTrue(f.cancel(mayInterruptIfRunning));
1303 >        }
1304 >
1305          checkCompletedWithWrappedCancellationException(g);
1306 <    }
1306 >        checkCancelled(f);
1307 >        r.assertNotInvoked();
1308 >    }}
1309  
1310      /**
1311 <     * thenCombine result completes normally after normal completion
821 <     * of sources
1311 >     * thenAccept result completes exceptionally if action does
1312       */
1313 <    public void testThenCombine_normalCompletion1() {
1313 >    public void testThenAccept_actionFailed() {
1314          for (ExecutionMode m : ExecutionMode.values())
1315 +        for (boolean createIncomplete : new boolean[] { true, false })
1316          for (Integer v1 : new Integer[] { 1, null })
1317 <        for (Integer v2 : new Integer[] { 2, null }) {
827 <
1317 >    {
1318          final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1320 <        final SubtractFunction r = new SubtractFunction();
1321 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1322 <
1323 <        f.complete(v1);
1324 <        checkIncomplete(h);
835 <        assertFalse(r.ran());
836 <        g.complete(v2);
837 <
838 <        checkCompletedNormally(h, subtract(v1, v2));
839 <        checkCompletedNormally(f, v1);
840 <        checkCompletedNormally(g, v2);
1319 >        final FailingConsumer r = new FailingConsumer(m);
1320 >        if (!createIncomplete) f.complete(v1);
1321 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1322 >        if (createIncomplete) {
1323 >            checkIncomplete(g);
1324 >            f.complete(v1);
1325          }
842    }
1326  
1327 <    public void testThenCombine_normalCompletion2() {
845 <        for (ExecutionMode m : ExecutionMode.values())
846 <        for (Integer v1 : new Integer[] { 1, null })
847 <        for (Integer v2 : new Integer[] { 2, null }) {
848 <
849 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
850 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
851 <        final SubtractFunction r = new SubtractFunction();
852 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
853 <
854 <        g.complete(v2);
855 <        checkIncomplete(h);
856 <        assertFalse(r.ran());
857 <        f.complete(v1);
858 <
859 <        checkCompletedNormally(h, subtract(v1, v2));
1327 >        checkCompletedWithWrappedCFException(g);
1328          checkCompletedNormally(f, v1);
1329 <        checkCompletedNormally(g, v2);
862 <        }
863 <    }
1329 >    }}
1330  
1331 <    public void testThenCombine_normalCompletion3() {
1331 >    /**
1332 >     * thenCombine result completes normally after normal completion
1333 >     * of sources
1334 >     */
1335 >    public void testThenCombine_normalCompletion() {
1336          for (ExecutionMode m : ExecutionMode.values())
1337 +        for (boolean createIncomplete : new boolean[] { true, false })
1338 +        for (boolean fFirst : new boolean[] { true, false })
1339          for (Integer v1 : new Integer[] { 1, null })
1340 <        for (Integer v2 : new Integer[] { 2, null }) {
1341 <
1340 >        for (Integer v2 : new Integer[] { 2, null })
1341 >    {
1342          final CompletableFuture<Integer> f = new CompletableFuture<>();
1343          final CompletableFuture<Integer> g = new CompletableFuture<>();
1344 <        final SubtractFunction r = new SubtractFunction();
1344 >        final SubtractFunction r = new SubtractFunction(m);
1345  
1346 <        g.complete(v2);
1347 <        f.complete(v1);
1346 >        if (fFirst) f.complete(v1); else g.complete(v2);
1347 >        if (!createIncomplete)
1348 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1349          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1350 <
1351 <        checkCompletedNormally(h, subtract(v1, v2));
1352 <        checkCompletedNormally(f, v1);
1353 <        checkCompletedNormally(g, v2);
1350 >        if (createIncomplete) {
1351 >            checkIncomplete(h);
1352 >            r.assertNotInvoked();
1353 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1354          }
882    }
883
884    public void testThenCombine_normalCompletion4() {
885        for (ExecutionMode m : ExecutionMode.values())
886        for (Integer v1 : new Integer[] { 1, null })
887        for (Integer v2 : new Integer[] { 2, null }) {
888
889        final CompletableFuture<Integer> f = new CompletableFuture<>();
890        final CompletableFuture<Integer> g = new CompletableFuture<>();
891        final SubtractFunction r = new SubtractFunction();
892
893        f.complete(v1);
894        g.complete(v2);
895        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1355  
1356          checkCompletedNormally(h, subtract(v1, v2));
1357          checkCompletedNormally(f, v1);
1358          checkCompletedNormally(g, v2);
1359 <        }
1360 <    }
1359 >        r.assertInvoked();
1360 >    }}
1361  
1362      /**
1363       * thenCombine result completes exceptionally after exceptional
1364       * completion of either source
1365       */
1366 <    public void testThenCombine_exceptionalCompletion1() {
1366 >    public void testThenCombine_exceptionalCompletion() {
1367          for (ExecutionMode m : ExecutionMode.values())
1368 <        for (Integer v1 : new Integer[] { 1, null }) {
1369 <
1368 >        for (boolean createIncomplete : new boolean[] { true, false })
1369 >        for (boolean fFirst : new boolean[] { true, false })
1370 >        for (Integer v1 : new Integer[] { 1, null })
1371 >    {
1372          final CompletableFuture<Integer> f = new CompletableFuture<>();
1373          final CompletableFuture<Integer> g = new CompletableFuture<>();
913        final SubtractFunction r = new SubtractFunction();
914        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1374          final CFException ex = new CFException();
1375 +        final SubtractFunction r = new SubtractFunction(m);
1376  
1377 <        f.completeExceptionally(ex);
1378 <        checkIncomplete(h);
1379 <        g.complete(v1);
920 <
921 <        checkCompletedWithWrappedCFException(h, ex);
922 <        checkCompletedWithWrappedCFException(f, ex);
923 <        assertFalse(r.ran());
924 <        checkCompletedNormally(g, v1);
925 <        }
926 <    }
927 <
928 <    public void testThenCombine_exceptionalCompletion2() {
929 <        for (ExecutionMode m : ExecutionMode.values())
930 <        for (Integer v1 : new Integer[] { 1, null }) {
931 <
932 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
933 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
934 <        final SubtractFunction r = new SubtractFunction();
1377 >        (fFirst ? f : g).complete(v1);
1378 >        if (!createIncomplete)
1379 >            (!fFirst ? f : g).completeExceptionally(ex);
1380          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1381 <        final CFException ex = new CFException();
1382 <
1383 <        g.completeExceptionally(ex);
939 <        checkIncomplete(h);
940 <        f.complete(v1);
941 <
942 <        checkCompletedWithWrappedCFException(h, ex);
943 <        checkCompletedWithWrappedCFException(g, ex);
944 <        assertFalse(r.ran());
945 <        checkCompletedNormally(f, v1);
1381 >        if (createIncomplete) {
1382 >            checkIncomplete(h);
1383 >            (!fFirst ? f : g).completeExceptionally(ex);
1384          }
947    }
948
949    public void testThenCombine_exceptionalCompletion3() {
950        for (ExecutionMode m : ExecutionMode.values())
951        for (Integer v1 : new Integer[] { 1, null }) {
952
953        final CompletableFuture<Integer> f = new CompletableFuture<>();
954        final CompletableFuture<Integer> g = new CompletableFuture<>();
955        final SubtractFunction r = new SubtractFunction();
956        final CFException ex = new CFException();
957
958        g.completeExceptionally(ex);
959        f.complete(v1);
960        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1385  
1386          checkCompletedWithWrappedCFException(h, ex);
1387 <        checkCompletedWithWrappedCFException(g, ex);
1388 <        assertFalse(r.ran());
1389 <        checkCompletedNormally(f, v1);
1390 <        }
967 <    }
1387 >        r.assertNotInvoked();
1388 >        checkCompletedNormally(fFirst ? f : g, v1);
1389 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1390 >    }}
1391  
1392 <    public void testThenCombine_exceptionalCompletion4() {
1392 >    /**
1393 >     * thenCombine result completes exceptionally if either source cancelled
1394 >     */
1395 >    public void testThenCombine_sourceCancelled() {
1396          for (ExecutionMode m : ExecutionMode.values())
1397 <        for (Integer v1 : new Integer[] { 1, null }) {
1398 <
1397 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398 >        for (boolean createIncomplete : new boolean[] { true, false })
1399 >        for (boolean fFirst : new boolean[] { true, false })
1400 >        for (Integer v1 : new Integer[] { 1, null })
1401 >    {
1402          final CompletableFuture<Integer> f = new CompletableFuture<>();
1403          final CompletableFuture<Integer> g = new CompletableFuture<>();
1404 <        final SubtractFunction r = new SubtractFunction();
976 <        final CFException ex = new CFException();
1404 >        final SubtractFunction r = new SubtractFunction(m);
1405  
1406 <        f.completeExceptionally(ex);
1407 <        g.complete(v1);
1406 >        (fFirst ? f : g).complete(v1);
1407 >        if (!createIncomplete)
1408 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1409          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1410 <
1411 <        checkCompletedWithWrappedCFException(h, ex);
1412 <        checkCompletedWithWrappedCFException(f, ex);
984 <        assertFalse(r.ran());
985 <        checkCompletedNormally(g, v1);
1410 >        if (createIncomplete) {
1411 >            checkIncomplete(h);
1412 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1413          }
1414 <    }
1414 >
1415 >        checkCompletedWithWrappedCancellationException(h);
1416 >        checkCancelled(!fFirst ? f : g);
1417 >        r.assertNotInvoked();
1418 >        checkCompletedNormally(fFirst ? f : g, v1);
1419 >    }}
1420  
1421      /**
1422       * thenCombine result completes exceptionally if action does
1423       */
1424 <    public void testThenCombine_actionFailed1() {
1424 >    public void testThenCombine_actionFailed() {
1425          for (ExecutionMode m : ExecutionMode.values())
1426 +        for (boolean fFirst : new boolean[] { true, false })
1427          for (Integer v1 : new Integer[] { 1, null })
1428 <        for (Integer v2 : new Integer[] { 2, null }) {
1429 <
1428 >        for (Integer v2 : new Integer[] { 2, null })
1429 >    {
1430          final CompletableFuture<Integer> f = new CompletableFuture<>();
1431          final CompletableFuture<Integer> g = new CompletableFuture<>();
1432 <        final FailingBiFunction r = new FailingBiFunction();
1432 >        final FailingBiFunction r = new FailingBiFunction(m);
1433          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1434  
1435 <        f.complete(v1);
1436 <        checkIncomplete(h);
1437 <        g.complete(v2);
1435 >        if (fFirst) {
1436 >            f.complete(v1);
1437 >            g.complete(v2);
1438 >        } else {
1439 >            g.complete(v2);
1440 >            f.complete(v1);
1441 >        }
1442  
1443          checkCompletedWithWrappedCFException(h);
1444          checkCompletedNormally(f, v1);
1445          checkCompletedNormally(g, v2);
1446 <        }
1010 <    }
1446 >    }}
1447  
1448 <    public void testThenCombine_actionFailed2() {
1448 >    /**
1449 >     * thenAcceptBoth result completes normally after normal
1450 >     * completion of sources
1451 >     */
1452 >    public void testThenAcceptBoth_normalCompletion() {
1453          for (ExecutionMode m : ExecutionMode.values())
1454 +        for (boolean createIncomplete : new boolean[] { true, false })
1455 +        for (boolean fFirst : new boolean[] { true, false })
1456          for (Integer v1 : new Integer[] { 1, null })
1457 <        for (Integer v2 : new Integer[] { 2, null }) {
1458 <
1457 >        for (Integer v2 : new Integer[] { 2, null })
1458 >    {
1459          final CompletableFuture<Integer> f = new CompletableFuture<>();
1460          final CompletableFuture<Integer> g = new CompletableFuture<>();
1461 <        final FailingBiFunction r = new FailingBiFunction();
1020 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1461 >        final SubtractAction r = new SubtractAction(m);
1462  
1463 <        g.complete(v2);
1464 <        checkIncomplete(h);
1465 <        f.complete(v1);
1463 >        if (fFirst) f.complete(v1); else g.complete(v2);
1464 >        if (!createIncomplete)
1465 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1466 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1467 >        if (createIncomplete) {
1468 >            checkIncomplete(h);
1469 >            r.assertNotInvoked();
1470 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1471 >        }
1472  
1473 <        checkCompletedWithWrappedCFException(h);
1473 >        checkCompletedNormally(h, null);
1474 >        r.assertValue(subtract(v1, v2));
1475          checkCompletedNormally(f, v1);
1476          checkCompletedNormally(g, v2);
1477 <        }
1030 <    }
1477 >    }}
1478  
1479      /**
1480 <     * thenCombine result completes exceptionally if either source cancelled
1480 >     * thenAcceptBoth result completes exceptionally after exceptional
1481 >     * completion of either source
1482       */
1483 <    public void testThenCombine_sourceCancelled1() {
1483 >    public void testThenAcceptBoth_exceptionalCompletion() {
1484          for (ExecutionMode m : ExecutionMode.values())
1485 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1486 <        for (Integer v1 : new Integer[] { 1, null }) {
1487 <
1485 >        for (boolean createIncomplete : new boolean[] { true, false })
1486 >        for (boolean fFirst : new boolean[] { true, false })
1487 >        for (Integer v1 : new Integer[] { 1, null })
1488 >    {
1489          final CompletableFuture<Integer> f = new CompletableFuture<>();
1490          final CompletableFuture<Integer> g = new CompletableFuture<>();
1491 <        final SubtractFunction r = new SubtractFunction();
1492 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1044 <
1045 <        assertTrue(f.cancel(mayInterruptIfRunning));
1046 <        checkIncomplete(h);
1047 <        g.complete(v1);
1491 >        final CFException ex = new CFException();
1492 >        final SubtractAction r = new SubtractAction(m);
1493  
1494 <        checkCompletedWithWrappedCancellationException(h);
1495 <        checkCancelled(f);
1496 <        assertFalse(r.ran());
1497 <        checkCompletedNormally(g, v1);
1494 >        (fFirst ? f : g).complete(v1);
1495 >        if (!createIncomplete)
1496 >            (!fFirst ? f : g).completeExceptionally(ex);
1497 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1498 >        if (createIncomplete) {
1499 >            checkIncomplete(h);
1500 >            (!fFirst ? f : g).completeExceptionally(ex);
1501          }
1054    }
1055
1056    public void testThenCombine_sourceCancelled2() {
1057        for (ExecutionMode m : ExecutionMode.values())
1058        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1059        for (Integer v1 : new Integer[] { 1, null }) {
1060
1061        final CompletableFuture<Integer> f = new CompletableFuture<>();
1062        final CompletableFuture<Integer> g = new CompletableFuture<>();
1063        final SubtractFunction r = new SubtractFunction();
1064        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1065
1066        assertTrue(g.cancel(mayInterruptIfRunning));
1067        checkIncomplete(h);
1068        f.complete(v1);
1502  
1503 <        checkCompletedWithWrappedCancellationException(h);
1504 <        checkCancelled(g);
1505 <        assertFalse(r.ran());
1506 <        checkCompletedNormally(f, v1);
1507 <        }
1075 <    }
1503 >        checkCompletedWithWrappedCFException(h, ex);
1504 >        r.assertNotInvoked();
1505 >        checkCompletedNormally(fFirst ? f : g, v1);
1506 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1507 >    }}
1508  
1509 <    public void testThenCombine_sourceCancelled3() {
1509 >    /**
1510 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1511 >     */
1512 >    public void testThenAcceptBoth_sourceCancelled() {
1513          for (ExecutionMode m : ExecutionMode.values())
1514          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515 <        for (Integer v1 : new Integer[] { 1, null }) {
1516 <
1515 >        for (boolean createIncomplete : new boolean[] { true, false })
1516 >        for (boolean fFirst : new boolean[] { true, false })
1517 >        for (Integer v1 : new Integer[] { 1, null })
1518 >    {
1519          final CompletableFuture<Integer> f = new CompletableFuture<>();
1520          final CompletableFuture<Integer> g = new CompletableFuture<>();
1521 <        final SubtractFunction r = new SubtractFunction();
1085 <
1086 <        assertTrue(g.cancel(mayInterruptIfRunning));
1087 <        f.complete(v1);
1088 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1521 >        final SubtractAction r = new SubtractAction(m);
1522  
1523 <        checkCompletedWithWrappedCancellationException(h);
1524 <        checkCancelled(g);
1525 <        assertFalse(r.ran());
1526 <        checkCompletedNormally(f, v1);
1523 >        (fFirst ? f : g).complete(v1);
1524 >        if (!createIncomplete)
1525 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1526 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1527 >        if (createIncomplete) {
1528 >            checkIncomplete(h);
1529 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1530          }
1095    }
1096
1097    public void testThenCombine_sourceCancelled4() {
1098        for (ExecutionMode m : ExecutionMode.values())
1099        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1100        for (Integer v1 : new Integer[] { 1, null }) {
1101
1102        final CompletableFuture<Integer> f = new CompletableFuture<>();
1103        final CompletableFuture<Integer> g = new CompletableFuture<>();
1104        final SubtractFunction r = new SubtractFunction();
1105
1106        assertTrue(f.cancel(mayInterruptIfRunning));
1107        g.complete(v1);
1108        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1531  
1532          checkCompletedWithWrappedCancellationException(h);
1533 <        checkCancelled(f);
1534 <        assertFalse(r.ran());
1535 <        checkCompletedNormally(g, v1);
1536 <        }
1115 <    }
1533 >        checkCancelled(!fFirst ? f : g);
1534 >        r.assertNotInvoked();
1535 >        checkCompletedNormally(fFirst ? f : g, v1);
1536 >    }}
1537  
1538      /**
1539 <     * thenAcceptBoth result completes normally after normal
1119 <     * completion of sources
1539 >     * thenAcceptBoth result completes exceptionally if action does
1540       */
1541 <    public void testThenAcceptBoth_normalCompletion1() {
1541 >    public void testThenAcceptBoth_actionFailed() {
1542          for (ExecutionMode m : ExecutionMode.values())
1543 +        for (boolean fFirst : new boolean[] { true, false })
1544          for (Integer v1 : new Integer[] { 1, null })
1545 <        for (Integer v2 : new Integer[] { 2, null }) {
1546 <
1545 >        for (Integer v2 : new Integer[] { 2, null })
1546 >    {
1547          final CompletableFuture<Integer> f = new CompletableFuture<>();
1548          final CompletableFuture<Integer> g = new CompletableFuture<>();
1549 <        final SubtractAction r = new SubtractAction();
1549 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1550          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551  
1552 <        f.complete(v1);
1553 <        checkIncomplete(h);
1554 <        assertFalse(r.ran());
1555 <        g.complete(v2);
1556 <
1557 <        checkCompletedNormally(h, null);
1137 <        assertEquals(r.value, subtract(v1, v2));
1138 <        checkCompletedNormally(f, v1);
1139 <        checkCompletedNormally(g, v2);
1552 >        if (fFirst) {
1553 >            f.complete(v1);
1554 >            g.complete(v2);
1555 >        } else {
1556 >            g.complete(v2);
1557 >            f.complete(v1);
1558          }
1141    }
1142
1143    public void testThenAcceptBoth_normalCompletion2() {
1144        for (ExecutionMode m : ExecutionMode.values())
1145        for (Integer v1 : new Integer[] { 1, null })
1146        for (Integer v2 : new Integer[] { 2, null }) {
1559  
1560 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1149 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1150 <        final SubtractAction r = new SubtractAction();
1151 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1152 <
1153 <        g.complete(v2);
1154 <        checkIncomplete(h);
1155 <        assertFalse(r.ran());
1156 <        f.complete(v1);
1157 <
1158 <        checkCompletedNormally(h, null);
1159 <        assertEquals(r.value, subtract(v1, v2));
1560 >        checkCompletedWithWrappedCFException(h);
1561          checkCompletedNormally(f, v1);
1562          checkCompletedNormally(g, v2);
1563 <        }
1163 <    }
1563 >    }}
1564  
1565 <    public void testThenAcceptBoth_normalCompletion3() {
1565 >    /**
1566 >     * runAfterBoth result completes normally after normal
1567 >     * completion of sources
1568 >     */
1569 >    public void testRunAfterBoth_normalCompletion() {
1570          for (ExecutionMode m : ExecutionMode.values())
1571 +        for (boolean createIncomplete : new boolean[] { true, false })
1572 +        for (boolean fFirst : new boolean[] { true, false })
1573          for (Integer v1 : new Integer[] { 1, null })
1574 <        for (Integer v2 : new Integer[] { 2, null }) {
1575 <
1574 >        for (Integer v2 : new Integer[] { 2, null })
1575 >    {
1576          final CompletableFuture<Integer> f = new CompletableFuture<>();
1577          final CompletableFuture<Integer> g = new CompletableFuture<>();
1578 <        final SubtractAction r = new SubtractAction();
1578 >        final Noop r = new Noop(m);
1579  
1580 <        g.complete(v2);
1581 <        f.complete(v1);
1582 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1583 <
1584 <        checkCompletedNormally(h, null);
1585 <        assertEquals(r.value, subtract(v1, v2));
1586 <        checkCompletedNormally(f, v1);
1587 <        checkCompletedNormally(g, v2);
1580 >        if (fFirst) f.complete(v1); else g.complete(v2);
1581 >        if (!createIncomplete)
1582 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1583 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 >        if (createIncomplete) {
1585 >            checkIncomplete(h);
1586 >            r.assertNotInvoked();
1587 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1588          }
1183    }
1184
1185    public void testThenAcceptBoth_normalCompletion4() {
1186        for (ExecutionMode m : ExecutionMode.values())
1187        for (Integer v1 : new Integer[] { 1, null })
1188        for (Integer v2 : new Integer[] { 2, null }) {
1189
1190        final CompletableFuture<Integer> f = new CompletableFuture<>();
1191        final CompletableFuture<Integer> g = new CompletableFuture<>();
1192        final SubtractAction r = new SubtractAction();
1193
1194        f.complete(v1);
1195        g.complete(v2);
1196        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1589  
1590          checkCompletedNormally(h, null);
1591 <        assertEquals(r.value, subtract(v1, v2));
1591 >        r.assertInvoked();
1592          checkCompletedNormally(f, v1);
1593          checkCompletedNormally(g, v2);
1594 <        }
1203 <    }
1594 >    }}
1595  
1596      /**
1597 <     * thenAcceptBoth result completes exceptionally after exceptional
1597 >     * runAfterBoth result completes exceptionally after exceptional
1598       * completion of either source
1599       */
1600 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1600 >    public void testRunAfterBoth_exceptionalCompletion() {
1601          for (ExecutionMode m : ExecutionMode.values())
1602 <        for (Integer v1 : new Integer[] { 1, null }) {
1603 <
1602 >        for (boolean createIncomplete : new boolean[] { true, false })
1603 >        for (boolean fFirst : new boolean[] { true, false })
1604 >        for (Integer v1 : new Integer[] { 1, null })
1605 >    {
1606          final CompletableFuture<Integer> f = new CompletableFuture<>();
1607          final CompletableFuture<Integer> g = new CompletableFuture<>();
1215        final SubtractAction r = new SubtractAction();
1216        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1608          final CFException ex = new CFException();
1609 +        final Noop r = new Noop(m);
1610  
1611 <        f.completeExceptionally(ex);
1612 <        checkIncomplete(h);
1613 <        g.complete(v1);
1614 <
1615 <        checkCompletedWithWrappedCFException(h, ex);
1616 <        checkCompletedWithWrappedCFException(f, ex);
1617 <        assertFalse(r.ran());
1226 <        checkCompletedNormally(g, v1);
1611 >        (fFirst ? f : g).complete(v1);
1612 >        if (!createIncomplete)
1613 >            (!fFirst ? f : g).completeExceptionally(ex);
1614 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1615 >        if (createIncomplete) {
1616 >            checkIncomplete(h);
1617 >            (!fFirst ? f : g).completeExceptionally(ex);
1618          }
1228    }
1229
1230    public void testThenAcceptBoth_exceptionalCompletion2() {
1231        for (ExecutionMode m : ExecutionMode.values())
1232        for (Integer v1 : new Integer[] { 1, null }) {
1233
1234        final CompletableFuture<Integer> f = new CompletableFuture<>();
1235        final CompletableFuture<Integer> g = new CompletableFuture<>();
1236        final SubtractAction r = new SubtractAction();
1237        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1238        final CFException ex = new CFException();
1239
1240        g.completeExceptionally(ex);
1241        checkIncomplete(h);
1242        f.complete(v1);
1619  
1620          checkCompletedWithWrappedCFException(h, ex);
1621 <        checkCompletedWithWrappedCFException(g, ex);
1622 <        assertFalse(r.ran());
1623 <        checkCompletedNormally(f, v1);
1624 <        }
1249 <    }
1621 >        r.assertNotInvoked();
1622 >        checkCompletedNormally(fFirst ? f : g, v1);
1623 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1624 >    }}
1625  
1626 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1626 >    /**
1627 >     * runAfterBoth result completes exceptionally if either source cancelled
1628 >     */
1629 >    public void testRunAfterBoth_sourceCancelled() {
1630          for (ExecutionMode m : ExecutionMode.values())
1631 <        for (Integer v1 : new Integer[] { 1, null }) {
1632 <
1631 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632 >        for (boolean createIncomplete : new boolean[] { true, false })
1633 >        for (boolean fFirst : new boolean[] { true, false })
1634 >        for (Integer v1 : new Integer[] { 1, null })
1635 >    {
1636          final CompletableFuture<Integer> f = new CompletableFuture<>();
1637          final CompletableFuture<Integer> g = new CompletableFuture<>();
1638 <        final SubtractAction r = new SubtractAction();
1258 <        final CFException ex = new CFException();
1638 >        final Noop r = new Noop(m);
1639  
1260        g.completeExceptionally(ex);
1261        f.complete(v1);
1262        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1640  
1641 <        checkCompletedWithWrappedCFException(h, ex);
1642 <        checkCompletedWithWrappedCFException(g, ex);
1643 <        assertFalse(r.ran());
1644 <        checkCompletedNormally(f, v1);
1641 >        (fFirst ? f : g).complete(v1);
1642 >        if (!createIncomplete)
1643 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1644 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1645 >        if (createIncomplete) {
1646 >            checkIncomplete(h);
1647 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1648          }
1269    }
1270
1271    public void testThenAcceptBoth_exceptionalCompletion4() {
1272        for (ExecutionMode m : ExecutionMode.values())
1273        for (Integer v1 : new Integer[] { 1, null }) {
1649  
1650 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1651 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1652 <        final SubtractAction r = new SubtractAction();
1653 <        final CFException ex = new CFException();
1654 <
1280 <        f.completeExceptionally(ex);
1281 <        g.complete(v1);
1282 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1283 <
1284 <        checkCompletedWithWrappedCFException(h, ex);
1285 <        checkCompletedWithWrappedCFException(f, ex);
1286 <        assertFalse(r.ran());
1287 <        checkCompletedNormally(g, v1);
1288 <        }
1289 <    }
1650 >        checkCompletedWithWrappedCancellationException(h);
1651 >        checkCancelled(!fFirst ? f : g);
1652 >        r.assertNotInvoked();
1653 >        checkCompletedNormally(fFirst ? f : g, v1);
1654 >    }}
1655  
1656      /**
1657 <     * thenAcceptBoth result completes exceptionally if action does
1657 >     * runAfterBoth result completes exceptionally if action does
1658       */
1659 <    public void testThenAcceptBoth_actionFailed1() {
1659 >    public void testRunAfterBoth_actionFailed() {
1660          for (ExecutionMode m : ExecutionMode.values())
1661 +        for (boolean fFirst : new boolean[] { true, false })
1662          for (Integer v1 : new Integer[] { 1, null })
1663 <        for (Integer v2 : new Integer[] { 2, null }) {
1664 <
1663 >        for (Integer v2 : new Integer[] { 2, null })
1664 >    {
1665          final CompletableFuture<Integer> f = new CompletableFuture<>();
1666          final CompletableFuture<Integer> g = new CompletableFuture<>();
1667 <        final FailingBiConsumer r = new FailingBiConsumer();
1668 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1667 >        final FailingRunnable r1 = new FailingRunnable(m);
1668 >        final FailingRunnable r2 = new FailingRunnable(m);
1669  
1670 <        f.complete(v1);
1671 <        checkIncomplete(h);
1672 <        g.complete(v2);
1670 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1671 >        if (fFirst) {
1672 >            f.complete(v1);
1673 >            g.complete(v2);
1674 >        } else {
1675 >            g.complete(v2);
1676 >            f.complete(v1);
1677 >        }
1678 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1679  
1680 <        checkCompletedWithWrappedCFException(h);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682          checkCompletedNormally(f, v1);
1683          checkCompletedNormally(g, v2);
1684 <        }
1312 <    }
1684 >    }}
1685  
1686 <    public void testThenAcceptBoth_actionFailed2() {
1686 >    /**
1687 >     * applyToEither result completes normally after normal completion
1688 >     * of either source
1689 >     */
1690 >    public void testApplyToEither_normalCompletion() {
1691          for (ExecutionMode m : ExecutionMode.values())
1692          for (Integer v1 : new Integer[] { 1, null })
1693 <        for (Integer v2 : new Integer[] { 2, null }) {
1694 <
1693 >        for (Integer v2 : new Integer[] { 2, null })
1694 >    {
1695          final CompletableFuture<Integer> f = new CompletableFuture<>();
1696          final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final FailingBiConsumer r = new FailingBiConsumer();
1698 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1697 >        final IncFunction[] rs = new IncFunction[6];
1698 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1699  
1700 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1701 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1702 +        checkIncomplete(h0);
1703 +        checkIncomplete(h1);
1704 +        rs[0].assertNotInvoked();
1705 +        rs[1].assertNotInvoked();
1706 +        f.complete(v1);
1707 +        checkCompletedNormally(h0, inc(v1));
1708 +        checkCompletedNormally(h1, inc(v1));
1709 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1710 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1711 +        checkCompletedNormally(h2, inc(v1));
1712 +        checkCompletedNormally(h3, inc(v1));
1713          g.complete(v2);
1325        checkIncomplete(h);
1326        f.complete(v1);
1714  
1715 <        checkCompletedWithWrappedCFException(h);
1715 >        // unspecified behavior - both source completions available
1716 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1717 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1718 >        rs[4].assertValue(h4.join());
1719 >        rs[5].assertValue(h5.join());
1720 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1721 >                   Objects.equals(inc(v2), h4.join()));
1722 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1723 >                   Objects.equals(inc(v2), h5.join()));
1724 >
1725          checkCompletedNormally(f, v1);
1726          checkCompletedNormally(g, v2);
1727 <        }
1728 <    }
1727 >        checkCompletedNormally(h0, inc(v1));
1728 >        checkCompletedNormally(h1, inc(v1));
1729 >        checkCompletedNormally(h2, inc(v1));
1730 >        checkCompletedNormally(h3, inc(v1));
1731 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1732 >    }}
1733  
1734      /**
1735 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1735 >     * applyToEither result completes exceptionally after exceptional
1736 >     * completion of either source
1737       */
1738 <    public void testThenAcceptBoth_sourceCancelled1() {
1738 >    public void testApplyToEither_exceptionalCompletion() {
1739          for (ExecutionMode m : ExecutionMode.values())
1740 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1741 <        for (Integer v1 : new Integer[] { 1, null }) {
1341 <
1740 >        for (Integer v1 : new Integer[] { 1, null })
1741 >    {
1742          final CompletableFuture<Integer> f = new CompletableFuture<>();
1743          final CompletableFuture<Integer> g = new CompletableFuture<>();
1744 <        final SubtractAction r = new SubtractAction();
1745 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1744 >        final CFException ex = new CFException();
1745 >        final IncFunction[] rs = new IncFunction[6];
1746 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1747  
1748 <        assertTrue(f.cancel(mayInterruptIfRunning));
1749 <        checkIncomplete(h);
1748 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1749 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1750 >        checkIncomplete(h0);
1751 >        checkIncomplete(h1);
1752 >        rs[0].assertNotInvoked();
1753 >        rs[1].assertNotInvoked();
1754 >        f.completeExceptionally(ex);
1755 >        checkCompletedWithWrappedCFException(h0, ex);
1756 >        checkCompletedWithWrappedCFException(h1, ex);
1757 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1758 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1759 >        checkCompletedWithWrappedCFException(h2, ex);
1760 >        checkCompletedWithWrappedCFException(h3, ex);
1761          g.complete(v1);
1762  
1763 <        checkCompletedWithWrappedCancellationException(h);
1764 <        checkCancelled(f);
1765 <        assertFalse(r.ran());
1766 <        checkCompletedNormally(g, v1);
1763 >        // unspecified behavior - both source completions available
1764 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1765 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1766 >        try {
1767 >            assertEquals(inc(v1), h4.join());
1768 >            rs[4].assertValue(inc(v1));
1769 >        } catch (CompletionException ok) {
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772 >        }
1773 >        try {
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertValue(inc(v1));
1776 >        } catch (CompletionException ok) {
1777 >            checkCompletedWithWrappedCFException(h5, ex);
1778 >            rs[5].assertNotInvoked();
1779          }
1356    }
1357
1358    public void testThenAcceptBoth_sourceCancelled2() {
1359        for (ExecutionMode m : ExecutionMode.values())
1360        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1361        for (Integer v1 : new Integer[] { 1, null }) {
1780  
1781 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1782 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1783 <        final SubtractAction r = new SubtractAction();
1784 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1785 <
1786 <        assertTrue(g.cancel(mayInterruptIfRunning));
1787 <        checkIncomplete(h);
1788 <        f.complete(v1);
1789 <
1372 <        checkCompletedWithWrappedCancellationException(h);
1373 <        checkCancelled(g);
1374 <        assertFalse(r.ran());
1375 <        checkCompletedNormally(f, v1);
1376 <        }
1377 <    }
1781 >        checkCompletedWithWrappedCFException(f, ex);
1782 >        checkCompletedNormally(g, v1);
1783 >        checkCompletedWithWrappedCFException(h0, ex);
1784 >        checkCompletedWithWrappedCFException(h1, ex);
1785 >        checkCompletedWithWrappedCFException(h2, ex);
1786 >        checkCompletedWithWrappedCFException(h3, ex);
1787 >        checkCompletedWithWrappedCFException(h4, ex);
1788 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1789 >    }}
1790  
1791 <    public void testThenAcceptBoth_sourceCancelled3() {
1791 >    public void testApplyToEither_exceptionalCompletion2() {
1792          for (ExecutionMode m : ExecutionMode.values())
1793 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1794 <        for (Integer v1 : new Integer[] { 1, null }) {
1795 <
1793 >        for (boolean fFirst : new boolean[] { true, false })
1794 >        for (Integer v1 : new Integer[] { 1, null })
1795 >    {
1796          final CompletableFuture<Integer> f = new CompletableFuture<>();
1797          final CompletableFuture<Integer> g = new CompletableFuture<>();
1798 <        final SubtractAction r = new SubtractAction();
1798 >        final CFException ex = new CFException();
1799 >        final IncFunction[] rs = new IncFunction[6];
1800 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1801  
1802 <        assertTrue(g.cancel(mayInterruptIfRunning));
1803 <        f.complete(v1);
1804 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1802 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1803 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1804 >        if (fFirst) {
1805 >            f.complete(v1);
1806 >            g.completeExceptionally(ex);
1807 >        } else {
1808 >            g.completeExceptionally(ex);
1809 >            f.complete(v1);
1810 >        }
1811 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1812 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1813 >
1814 >        // unspecified behavior - both source completions available
1815 >        try {
1816 >            assertEquals(inc(v1), h0.join());
1817 >            rs[0].assertValue(inc(v1));
1818 >        } catch (CompletionException ok) {
1819 >            checkCompletedWithWrappedCFException(h0, ex);
1820 >            rs[0].assertNotInvoked();
1821 >        }
1822 >        try {
1823 >            assertEquals(inc(v1), h1.join());
1824 >            rs[1].assertValue(inc(v1));
1825 >        } catch (CompletionException ok) {
1826 >            checkCompletedWithWrappedCFException(h1, ex);
1827 >            rs[1].assertNotInvoked();
1828 >        }
1829 >        try {
1830 >            assertEquals(inc(v1), h2.join());
1831 >            rs[2].assertValue(inc(v1));
1832 >        } catch (CompletionException ok) {
1833 >            checkCompletedWithWrappedCFException(h2, ex);
1834 >            rs[2].assertNotInvoked();
1835 >        }
1836 >        try {
1837 >            assertEquals(inc(v1), h3.join());
1838 >            rs[3].assertValue(inc(v1));
1839 >        } catch (CompletionException ok) {
1840 >            checkCompletedWithWrappedCFException(h3, ex);
1841 >            rs[3].assertNotInvoked();
1842 >        }
1843  
1392        checkCompletedWithWrappedCancellationException(h);
1393        checkCancelled(g);
1394        assertFalse(r.ran());
1844          checkCompletedNormally(f, v1);
1845 <        }
1846 <    }
1845 >        checkCompletedWithWrappedCFException(g, ex);
1846 >    }}
1847  
1848 <    public void testThenAcceptBoth_sourceCancelled4() {
1848 >    /**
1849 >     * applyToEither result completes exceptionally if either source cancelled
1850 >     */
1851 >    public void testApplyToEither_sourceCancelled() {
1852          for (ExecutionMode m : ExecutionMode.values())
1853          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1854 <        for (Integer v1 : new Integer[] { 1, null }) {
1855 <
1854 >        for (Integer v1 : new Integer[] { 1, null })
1855 >    {
1856          final CompletableFuture<Integer> f = new CompletableFuture<>();
1857          final CompletableFuture<Integer> g = new CompletableFuture<>();
1858 <        final SubtractAction r = new SubtractAction();
1858 >        final IncFunction[] rs = new IncFunction[6];
1859 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1860  
1861 <        assertTrue(f.cancel(mayInterruptIfRunning));
1861 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1862 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1863 >        checkIncomplete(h0);
1864 >        checkIncomplete(h1);
1865 >        rs[0].assertNotInvoked();
1866 >        rs[1].assertNotInvoked();
1867 >        f.cancel(mayInterruptIfRunning);
1868 >        checkCompletedWithWrappedCancellationException(h0);
1869 >        checkCompletedWithWrappedCancellationException(h1);
1870 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1871 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1872 >        checkCompletedWithWrappedCancellationException(h2);
1873 >        checkCompletedWithWrappedCancellationException(h3);
1874          g.complete(v1);
1410        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1875  
1876 <        checkCompletedWithWrappedCancellationException(h);
1876 >        // unspecified behavior - both source completions available
1877 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1878 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1879 >        try {
1880 >            assertEquals(inc(v1), h4.join());
1881 >            rs[4].assertValue(inc(v1));
1882 >        } catch (CompletionException ok) {
1883 >            checkCompletedWithWrappedCancellationException(h4);
1884 >            rs[4].assertNotInvoked();
1885 >        }
1886 >        try {
1887 >            assertEquals(inc(v1), h5.join());
1888 >            rs[5].assertValue(inc(v1));
1889 >        } catch (CompletionException ok) {
1890 >            checkCompletedWithWrappedCancellationException(h5);
1891 >            rs[5].assertNotInvoked();
1892 >        }
1893 >
1894          checkCancelled(f);
1414        assertFalse(r.ran());
1895          checkCompletedNormally(g, v1);
1896 <        }
1897 <    }
1896 >        checkCompletedWithWrappedCancellationException(h0);
1897 >        checkCompletedWithWrappedCancellationException(h1);
1898 >        checkCompletedWithWrappedCancellationException(h2);
1899 >        checkCompletedWithWrappedCancellationException(h3);
1900 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1901 >    }}
1902  
1903 <    /**
1420 <     * runAfterBoth result completes normally after normal
1421 <     * completion of sources
1422 <     */
1423 <    public void testRunAfterBoth_normalCompletion1() {
1903 >    public void testApplyToEither_sourceCancelled2() {
1904          for (ExecutionMode m : ExecutionMode.values())
1905 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1906 +        for (boolean fFirst : new boolean[] { true, false })
1907          for (Integer v1 : new Integer[] { 1, null })
1908 <        for (Integer v2 : new Integer[] { 2, null }) {
1427 <
1908 >    {
1909          final CompletableFuture<Integer> f = new CompletableFuture<>();
1910          final CompletableFuture<Integer> g = new CompletableFuture<>();
1911 <        final Noop r = new Noop();
1912 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1432 <
1433 <        f.complete(v1);
1434 <        checkIncomplete(h);
1435 <        assertFalse(r.ran);
1436 <        g.complete(v2);
1911 >        final IncFunction[] rs = new IncFunction[6];
1912 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1913  
1914 <        checkCompletedNormally(h, null);
1915 <        assertTrue(r.ran);
1916 <        checkCompletedNormally(f, v1);
1917 <        checkCompletedNormally(g, v2);
1914 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1915 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1916 >        if (fFirst) {
1917 >            f.complete(v1);
1918 >            g.cancel(mayInterruptIfRunning);
1919 >        } else {
1920 >            g.cancel(mayInterruptIfRunning);
1921 >            f.complete(v1);
1922          }
1923 <    }
1924 <
1445 <    public void testRunAfterBoth_normalCompletion2() {
1446 <        for (ExecutionMode m : ExecutionMode.values())
1447 <        for (Integer v1 : new Integer[] { 1, null })
1448 <        for (Integer v2 : new Integer[] { 2, null }) {
1923 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1924 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1925  
1926 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1927 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1928 <        final Noop r = new Noop();
1929 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1930 <
1931 <        g.complete(v2);
1932 <        checkIncomplete(h);
1933 <        assertFalse(r.ran);
1934 <        f.complete(v1);
1926 >        // unspecified behavior - both source completions available
1927 >        try {
1928 >            assertEquals(inc(v1), h0.join());
1929 >            rs[0].assertValue(inc(v1));
1930 >        } catch (CompletionException ok) {
1931 >            checkCompletedWithWrappedCancellationException(h0);
1932 >            rs[0].assertNotInvoked();
1933 >        }
1934 >        try {
1935 >            assertEquals(inc(v1), h1.join());
1936 >            rs[1].assertValue(inc(v1));
1937 >        } catch (CompletionException ok) {
1938 >            checkCompletedWithWrappedCancellationException(h1);
1939 >            rs[1].assertNotInvoked();
1940 >        }
1941 >        try {
1942 >            assertEquals(inc(v1), h2.join());
1943 >            rs[2].assertValue(inc(v1));
1944 >        } catch (CompletionException ok) {
1945 >            checkCompletedWithWrappedCancellationException(h2);
1946 >            rs[2].assertNotInvoked();
1947 >        }
1948 >        try {
1949 >            assertEquals(inc(v1), h3.join());
1950 >            rs[3].assertValue(inc(v1));
1951 >        } catch (CompletionException ok) {
1952 >            checkCompletedWithWrappedCancellationException(h3);
1953 >            rs[3].assertNotInvoked();
1954 >        }
1955  
1460        checkCompletedNormally(h, null);
1461        assertTrue(r.ran);
1956          checkCompletedNormally(f, v1);
1957 <        checkCompletedNormally(g, v2);
1958 <        }
1465 <    }
1957 >        checkCancelled(g);
1958 >    }}
1959  
1960 <    public void testRunAfterBoth_normalCompletion3() {
1960 >    /**
1961 >     * applyToEither result completes exceptionally if action does
1962 >     */
1963 >    public void testApplyToEither_actionFailed() {
1964          for (ExecutionMode m : ExecutionMode.values())
1965          for (Integer v1 : new Integer[] { 1, null })
1966 <        for (Integer v2 : new Integer[] { 2, null }) {
1967 <
1966 >        for (Integer v2 : new Integer[] { 2, null })
1967 >    {
1968          final CompletableFuture<Integer> f = new CompletableFuture<>();
1969          final CompletableFuture<Integer> g = new CompletableFuture<>();
1970 <        final Noop r = new Noop();
1970 >        final FailingFunction[] rs = new FailingFunction[6];
1971 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1972 >
1973 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1974 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1975 >        f.complete(v1);
1976 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1977 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1978 >        checkCompletedWithWrappedCFException(h0);
1979 >        checkCompletedWithWrappedCFException(h1);
1980 >        checkCompletedWithWrappedCFException(h2);
1981 >        checkCompletedWithWrappedCFException(h3);
1982 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1983  
1984          g.complete(v2);
1477        f.complete(v1);
1478        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1985  
1986 <        checkCompletedNormally(h, null);
1987 <        assertTrue(r.ran);
1986 >        // unspecified behavior - both source completions available
1987 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1988 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1989 >
1990 >        checkCompletedWithWrappedCFException(h4);
1991 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1992 >                   Objects.equals(v2, rs[4].value));
1993 >        checkCompletedWithWrappedCFException(h5);
1994 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1995 >                   Objects.equals(v2, rs[5].value));
1996 >
1997          checkCompletedNormally(f, v1);
1998          checkCompletedNormally(g, v2);
1999 <        }
1485 <    }
1999 >    }}
2000  
2001 <    public void testRunAfterBoth_normalCompletion4() {
2001 >    /**
2002 >     * acceptEither result completes normally after normal completion
2003 >     * of either source
2004 >     */
2005 >    public void testAcceptEither_normalCompletion() {
2006          for (ExecutionMode m : ExecutionMode.values())
2007          for (Integer v1 : new Integer[] { 1, null })
2008 <        for (Integer v2 : new Integer[] { 2, null }) {
2009 <
2008 >        for (Integer v2 : new Integer[] { 2, null })
2009 >    {
2010          final CompletableFuture<Integer> f = new CompletableFuture<>();
2011          final CompletableFuture<Integer> g = new CompletableFuture<>();
2012 <        final Noop r = new Noop();
2012 >        final NoopConsumer[] rs = new NoopConsumer[6];
2013 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2014  
2015 <        f.complete(v1);
2015 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2016 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2017 >        checkIncomplete(h0);
2018 >        checkIncomplete(h1);
2019 >        rs[0].assertNotInvoked();
2020 >        rs[1].assertNotInvoked();
2021 >        f.complete(v1);
2022 >        checkCompletedNormally(h0, null);
2023 >        checkCompletedNormally(h1, null);
2024 >        rs[0].assertValue(v1);
2025 >        rs[1].assertValue(v1);
2026 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2027 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2028 >        checkCompletedNormally(h2, null);
2029 >        checkCompletedNormally(h3, null);
2030 >        rs[2].assertValue(v1);
2031 >        rs[3].assertValue(v1);
2032          g.complete(v2);
1498        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2033  
2034 <        checkCompletedNormally(h, null);
2035 <        assertTrue(r.ran);
2034 >        // unspecified behavior - both source completions available
2035 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2036 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2037 >        checkCompletedNormally(h4, null);
2038 >        checkCompletedNormally(h5, null);
2039 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2040 >                   Objects.equals(v2, rs[4].value));
2041 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2042 >                   Objects.equals(v2, rs[5].value));
2043 >
2044          checkCompletedNormally(f, v1);
2045          checkCompletedNormally(g, v2);
2046 <        }
2047 <    }
2046 >        checkCompletedNormally(h0, null);
2047 >        checkCompletedNormally(h1, null);
2048 >        checkCompletedNormally(h2, null);
2049 >        checkCompletedNormally(h3, null);
2050 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2051 >    }}
2052  
2053      /**
2054 <     * runAfterBoth result completes exceptionally after exceptional
2054 >     * acceptEither result completes exceptionally after exceptional
2055       * completion of either source
2056       */
2057 <    public void testRunAfterBoth_exceptionalCompletion1() {
2057 >    public void testAcceptEither_exceptionalCompletion() {
2058          for (ExecutionMode m : ExecutionMode.values())
2059 <        for (Integer v1 : new Integer[] { 1, null }) {
2060 <
2059 >        for (Integer v1 : new Integer[] { 1, null })
2060 >    {
2061          final CompletableFuture<Integer> f = new CompletableFuture<>();
2062          final CompletableFuture<Integer> g = new CompletableFuture<>();
1517        final Noop r = new Noop();
1518        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2063          final CFException ex = new CFException();
2064 +        final NoopConsumer[] rs = new NoopConsumer[6];
2065 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(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 +        checkIncomplete(h0);
2070 +        checkIncomplete(h1);
2071 +        rs[0].assertNotInvoked();
2072 +        rs[1].assertNotInvoked();
2073          f.completeExceptionally(ex);
2074 <        checkIncomplete(h);
2074 >        checkCompletedWithWrappedCFException(h0, ex);
2075 >        checkCompletedWithWrappedCFException(h1, ex);
2076 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2077 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2078 >        checkCompletedWithWrappedCFException(h2, ex);
2079 >        checkCompletedWithWrappedCFException(h3, ex);
2080 >
2081          g.complete(v1);
2082  
2083 <        checkCompletedWithWrappedCFException(h, ex);
2083 >        // unspecified behavior - both source completions available
2084 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2085 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2086 >        try {
2087 >            assertNull(h4.join());
2088 >            rs[4].assertValue(v1);
2089 >        } catch (CompletionException ok) {
2090 >            checkCompletedWithWrappedCFException(h4, ex);
2091 >            rs[4].assertNotInvoked();
2092 >        }
2093 >        try {
2094 >            assertNull(h5.join());
2095 >            rs[5].assertValue(v1);
2096 >        } catch (CompletionException ok) {
2097 >            checkCompletedWithWrappedCFException(h5, ex);
2098 >            rs[5].assertNotInvoked();
2099 >        }
2100 >
2101          checkCompletedWithWrappedCFException(f, ex);
1527        assertFalse(r.ran);
2102          checkCompletedNormally(g, v1);
2103 <        }
2104 <    }
2103 >        checkCompletedWithWrappedCFException(h0, ex);
2104 >        checkCompletedWithWrappedCFException(h1, ex);
2105 >        checkCompletedWithWrappedCFException(h2, ex);
2106 >        checkCompletedWithWrappedCFException(h3, ex);
2107 >        checkCompletedWithWrappedCFException(h4, ex);
2108 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2109 >    }}
2110  
2111 <    public void testRunAfterBoth_exceptionalCompletion2() {
2111 >    public void testAcceptEither_exceptionalCompletion2() {
2112          for (ExecutionMode m : ExecutionMode.values())
2113 <        for (Integer v1 : new Integer[] { 1, null }) {
2114 <
2113 >        for (boolean fFirst : new boolean[] { true, false })
2114 >        for (Integer v1 : new Integer[] { 1, null })
2115 >    {
2116          final CompletableFuture<Integer> f = new CompletableFuture<>();
2117          final CompletableFuture<Integer> g = new CompletableFuture<>();
1538        final Noop r = new Noop();
1539        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2118          final CFException ex = new CFException();
2119 +        final NoopConsumer[] rs = new NoopConsumer[6];
2120 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2121  
2122 <        g.completeExceptionally(ex);
2123 <        checkIncomplete(h);
2124 <        f.complete(v1);
2125 <
2126 <        checkCompletedWithWrappedCFException(h, ex);
2127 <        checkCompletedWithWrappedCFException(g, ex);
2128 <        assertFalse(r.ran);
2129 <        checkCompletedNormally(f, v1);
2122 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2123 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2124 >        if (fFirst) {
2125 >            f.complete(v1);
2126 >            g.completeExceptionally(ex);
2127 >        } else {
2128 >            g.completeExceptionally(ex);
2129 >            f.complete(v1);
2130 >        }
2131 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2132 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2133 >
2134 >        // unspecified behavior - both source completions available
2135 >        try {
2136 >            assertEquals(null, h0.join());
2137 >            rs[0].assertValue(v1);
2138 >        } catch (CompletionException ok) {
2139 >            checkCompletedWithWrappedCFException(h0, ex);
2140 >            rs[0].assertNotInvoked();
2141 >        }
2142 >        try {
2143 >            assertEquals(null, h1.join());
2144 >            rs[1].assertValue(v1);
2145 >        } catch (CompletionException ok) {
2146 >            checkCompletedWithWrappedCFException(h1, ex);
2147 >            rs[1].assertNotInvoked();
2148 >        }
2149 >        try {
2150 >            assertEquals(null, h2.join());
2151 >            rs[2].assertValue(v1);
2152 >        } catch (CompletionException ok) {
2153 >            checkCompletedWithWrappedCFException(h2, ex);
2154 >            rs[2].assertNotInvoked();
2155 >        }
2156 >        try {
2157 >            assertEquals(null, h3.join());
2158 >            rs[3].assertValue(v1);
2159 >        } catch (CompletionException ok) {
2160 >            checkCompletedWithWrappedCFException(h3, ex);
2161 >            rs[3].assertNotInvoked();
2162          }
1551    }
1552
1553    public void testRunAfterBoth_exceptionalCompletion3() {
1554        for (ExecutionMode m : ExecutionMode.values())
1555        for (Integer v1 : new Integer[] { 1, null }) {
1556
1557        final CompletableFuture<Integer> f = new CompletableFuture<>();
1558        final CompletableFuture<Integer> g = new CompletableFuture<>();
1559        final Noop r = new Noop();
1560        final CFException ex = new CFException();
1561
1562        g.completeExceptionally(ex);
1563        f.complete(v1);
1564        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2163  
1566        checkCompletedWithWrappedCFException(h, ex);
1567        checkCompletedWithWrappedCFException(g, ex);
1568        assertFalse(r.ran);
2164          checkCompletedNormally(f, v1);
2165 <        }
2166 <    }
2165 >        checkCompletedWithWrappedCFException(g, ex);
2166 >    }}
2167  
2168 <    public void testRunAfterBoth_exceptionalCompletion4() {
2168 >    /**
2169 >     * acceptEither result completes exceptionally if either source cancelled
2170 >     */
2171 >    public void testAcceptEither_sourceCancelled() {
2172          for (ExecutionMode m : ExecutionMode.values())
2173 <        for (Integer v1 : new Integer[] { 1, null }) {
2174 <
2173 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2174 >        for (Integer v1 : new Integer[] { 1, null })
2175 >    {
2176          final CompletableFuture<Integer> f = new CompletableFuture<>();
2177          final CompletableFuture<Integer> g = new CompletableFuture<>();
2178 <        final Noop r = new Noop();
2179 <        final CFException ex = new CFException();
2178 >        final NoopConsumer[] rs = new NoopConsumer[6];
2179 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2180 >
2181 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2182 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2183 >        checkIncomplete(h0);
2184 >        checkIncomplete(h1);
2185 >        rs[0].assertNotInvoked();
2186 >        rs[1].assertNotInvoked();
2187 >        f.cancel(mayInterruptIfRunning);
2188 >        checkCompletedWithWrappedCancellationException(h0);
2189 >        checkCompletedWithWrappedCancellationException(h1);
2190 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2191 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2192 >        checkCompletedWithWrappedCancellationException(h2);
2193 >        checkCompletedWithWrappedCancellationException(h3);
2194  
1582        f.completeExceptionally(ex);
2195          g.complete(v1);
1584        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2196  
2197 <        checkCompletedWithWrappedCFException(h, ex);
2198 <        checkCompletedWithWrappedCFException(f, ex);
2199 <        assertFalse(r.ran);
2200 <        checkCompletedNormally(g, v1);
2197 >        // unspecified behavior - both source completions available
2198 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2199 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2200 >        try {
2201 >            assertNull(h4.join());
2202 >            rs[4].assertValue(v1);
2203 >        } catch (CompletionException ok) {
2204 >            checkCompletedWithWrappedCancellationException(h4);
2205 >            rs[4].assertNotInvoked();
2206 >        }
2207 >        try {
2208 >            assertNull(h5.join());
2209 >            rs[5].assertValue(v1);
2210 >        } catch (CompletionException ok) {
2211 >            checkCompletedWithWrappedCancellationException(h5);
2212 >            rs[5].assertNotInvoked();
2213          }
2214 <    }
2214 >
2215 >        checkCancelled(f);
2216 >        checkCompletedNormally(g, v1);
2217 >        checkCompletedWithWrappedCancellationException(h0);
2218 >        checkCompletedWithWrappedCancellationException(h1);
2219 >        checkCompletedWithWrappedCancellationException(h2);
2220 >        checkCompletedWithWrappedCancellationException(h3);
2221 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2222 >    }}
2223  
2224      /**
2225 <     * runAfterBoth result completes exceptionally if action does
2225 >     * acceptEither result completes exceptionally if action does
2226       */
2227 <    public void testRunAfterBoth_actionFailed1() {
2227 >    public void testAcceptEither_actionFailed() {
2228          for (ExecutionMode m : ExecutionMode.values())
2229          for (Integer v1 : new Integer[] { 1, null })
2230 <        for (Integer v2 : new Integer[] { 2, null }) {
2231 <
2230 >        for (Integer v2 : new Integer[] { 2, null })
2231 >    {
2232          final CompletableFuture<Integer> f = new CompletableFuture<>();
2233          final CompletableFuture<Integer> g = new CompletableFuture<>();
2234 <        final FailingNoop r = new FailingNoop();
2235 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2234 >        final FailingConsumer[] rs = new FailingConsumer[6];
2235 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2236 >
2237 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2238 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2239 >        f.complete(v1);
2240 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2241 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2242 >        checkCompletedWithWrappedCFException(h0);
2243 >        checkCompletedWithWrappedCFException(h1);
2244 >        checkCompletedWithWrappedCFException(h2);
2245 >        checkCompletedWithWrappedCFException(h3);
2246 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2247  
1606        f.complete(v1);
1607        checkIncomplete(h);
2248          g.complete(v2);
2249  
2250 <        checkCompletedWithWrappedCFException(h);
2250 >        // unspecified behavior - both source completions available
2251 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2252 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2253 >
2254 >        checkCompletedWithWrappedCFException(h4);
2255 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2256 >                   Objects.equals(v2, rs[4].value));
2257 >        checkCompletedWithWrappedCFException(h5);
2258 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2259 >                   Objects.equals(v2, rs[5].value));
2260 >
2261          checkCompletedNormally(f, v1);
2262          checkCompletedNormally(g, v2);
2263 <        }
1614 <    }
2263 >    }}
2264  
2265 <    public void testRunAfterBoth_actionFailed2() {
2265 >    /**
2266 >     * runAfterEither result completes normally after normal completion
2267 >     * of either source
2268 >     */
2269 >    public void testRunAfterEither_normalCompletion() {
2270          for (ExecutionMode m : ExecutionMode.values())
2271          for (Integer v1 : new Integer[] { 1, null })
2272 <        for (Integer v2 : new Integer[] { 2, null }) {
2273 <
2272 >        for (Integer v2 : new Integer[] { 2, null })
2273 >    {
2274          final CompletableFuture<Integer> f = new CompletableFuture<>();
2275          final CompletableFuture<Integer> g = new CompletableFuture<>();
2276 <        final FailingNoop r = new FailingNoop();
2277 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2276 >        final Noop[] rs = new Noop[6];
2277 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2278 >
2279 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2280 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2281 >        checkIncomplete(h0);
2282 >        checkIncomplete(h1);
2283 >        rs[0].assertNotInvoked();
2284 >        rs[1].assertNotInvoked();
2285 >        f.complete(v1);
2286 >        checkCompletedNormally(h0, null);
2287 >        checkCompletedNormally(h1, null);
2288 >        rs[0].assertInvoked();
2289 >        rs[1].assertInvoked();
2290 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2291 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2292 >        checkCompletedNormally(h2, null);
2293 >        checkCompletedNormally(h3, null);
2294 >        rs[2].assertInvoked();
2295 >        rs[3].assertInvoked();
2296  
2297          g.complete(v2);
1627        checkIncomplete(h);
1628        f.complete(v1);
2298  
2299 <        checkCompletedWithWrappedCFException(h);
2299 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2300 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2301 >
2302          checkCompletedNormally(f, v1);
2303          checkCompletedNormally(g, v2);
2304 <        }
2305 <    }
2304 >        checkCompletedNormally(h0, null);
2305 >        checkCompletedNormally(h1, null);
2306 >        checkCompletedNormally(h2, null);
2307 >        checkCompletedNormally(h3, null);
2308 >        checkCompletedNormally(h4, null);
2309 >        checkCompletedNormally(h5, null);
2310 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2311 >    }}
2312  
2313      /**
2314 <     * runAfterBoth result completes exceptionally if either source cancelled
2314 >     * runAfterEither result completes exceptionally after exceptional
2315 >     * completion of either source
2316       */
2317 <    public void testRunAfterBoth_sourceCancelled1() {
2317 >    public void testRunAfterEither_exceptionalCompletion() {
2318          for (ExecutionMode m : ExecutionMode.values())
2319 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2320 <        for (Integer v1 : new Integer[] { 1, null }) {
1643 <
2319 >        for (Integer v1 : new Integer[] { 1, null })
2320 >    {
2321          final CompletableFuture<Integer> f = new CompletableFuture<>();
2322          final CompletableFuture<Integer> g = new CompletableFuture<>();
2323 <        final Noop r = new Noop();
2324 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2323 >        final CFException ex = new CFException();
2324 >        final Noop[] rs = new Noop[6];
2325 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2326 >
2327 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2328 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2329 >        checkIncomplete(h0);
2330 >        checkIncomplete(h1);
2331 >        rs[0].assertNotInvoked();
2332 >        rs[1].assertNotInvoked();
2333 >        f.completeExceptionally(ex);
2334 >        checkCompletedWithWrappedCFException(h0, ex);
2335 >        checkCompletedWithWrappedCFException(h1, ex);
2336 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2337 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2338 >        checkCompletedWithWrappedCFException(h2, ex);
2339 >        checkCompletedWithWrappedCFException(h3, ex);
2340  
1649        assertTrue(f.cancel(mayInterruptIfRunning));
1650        checkIncomplete(h);
2341          g.complete(v1);
2342  
2343 <        checkCompletedWithWrappedCancellationException(h);
2344 <        checkCancelled(f);
2345 <        assertFalse(r.ran);
2346 <        checkCompletedNormally(g, v1);
2343 >        // unspecified behavior - both source completions available
2344 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2345 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2346 >        try {
2347 >            assertNull(h4.join());
2348 >            rs[4].assertInvoked();
2349 >        } catch (CompletionException ok) {
2350 >            checkCompletedWithWrappedCFException(h4, ex);
2351 >            rs[4].assertNotInvoked();
2352 >        }
2353 >        try {
2354 >            assertNull(h5.join());
2355 >            rs[5].assertInvoked();
2356 >        } catch (CompletionException ok) {
2357 >            checkCompletedWithWrappedCFException(h5, ex);
2358 >            rs[5].assertNotInvoked();
2359          }
1658    }
1659
1660    public void testRunAfterBoth_sourceCancelled2() {
1661        for (ExecutionMode m : ExecutionMode.values())
1662        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1663        for (Integer v1 : new Integer[] { 1, null }) {
1664
1665        final CompletableFuture<Integer> f = new CompletableFuture<>();
1666        final CompletableFuture<Integer> g = new CompletableFuture<>();
1667        final Noop r = new Noop();
1668        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1669
1670        assertTrue(g.cancel(mayInterruptIfRunning));
1671        checkIncomplete(h);
1672        f.complete(v1);
2360  
2361 <        checkCompletedWithWrappedCancellationException(h);
2362 <        checkCancelled(g);
2363 <        assertFalse(r.ran);
2364 <        checkCompletedNormally(f, v1);
2365 <        }
2366 <    }
2361 >        checkCompletedWithWrappedCFException(f, ex);
2362 >        checkCompletedNormally(g, v1);
2363 >        checkCompletedWithWrappedCFException(h0, ex);
2364 >        checkCompletedWithWrappedCFException(h1, ex);
2365 >        checkCompletedWithWrappedCFException(h2, ex);
2366 >        checkCompletedWithWrappedCFException(h3, ex);
2367 >        checkCompletedWithWrappedCFException(h4, ex);
2368 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2369 >    }}
2370  
2371 <    public void testRunAfterBoth_sourceCancelled3() {
2371 >    /**
2372 >     * runAfterEither result completes exceptionally if either source cancelled
2373 >     */
2374 >    public void testRunAfterEither_sourceCancelled() {
2375          for (ExecutionMode m : ExecutionMode.values())
2376          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2377 <        for (Integer v1 : new Integer[] { 1, null }) {
2378 <
2377 >        for (Integer v1 : new Integer[] { 1, null })
2378 >    {
2379          final CompletableFuture<Integer> f = new CompletableFuture<>();
2380          final CompletableFuture<Integer> g = new CompletableFuture<>();
2381 <        final Noop r = new Noop();
2381 >        final Noop[] rs = new Noop[6];
2382 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2383  
2384 <        assertTrue(g.cancel(mayInterruptIfRunning));
2385 <        f.complete(v1);
2386 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2387 <
2388 <        checkCompletedWithWrappedCancellationException(h);
2389 <        checkCancelled(g);
2390 <        assertFalse(r.ran);
2391 <        checkCompletedNormally(f, v1);
2392 <        }
2393 <    }
2394 <
2395 <    public void testRunAfterBoth_sourceCancelled4() {
2396 <        for (ExecutionMode m : ExecutionMode.values())
1703 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1704 <        for (Integer v1 : new Integer[] { 1, null }) {
2384 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2385 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2386 >        checkIncomplete(h0);
2387 >        checkIncomplete(h1);
2388 >        rs[0].assertNotInvoked();
2389 >        rs[1].assertNotInvoked();
2390 >        f.cancel(mayInterruptIfRunning);
2391 >        checkCompletedWithWrappedCancellationException(h0);
2392 >        checkCompletedWithWrappedCancellationException(h1);
2393 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2394 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2395 >        checkCompletedWithWrappedCancellationException(h2);
2396 >        checkCompletedWithWrappedCancellationException(h3);
2397  
1706        final CompletableFuture<Integer> f = new CompletableFuture<>();
1707        final CompletableFuture<Integer> g = new CompletableFuture<>();
1708        final Noop r = new Noop();
1709
1710        assertTrue(f.cancel(mayInterruptIfRunning));
2398          g.complete(v1);
1712        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2399  
2400 <        checkCompletedWithWrappedCancellationException(h);
2401 <        checkCancelled(f);
2402 <        assertFalse(r.ran);
2403 <        checkCompletedNormally(g, v1);
2400 >        // unspecified behavior - both source completions available
2401 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2402 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2403 >        try {
2404 >            assertNull(h4.join());
2405 >            rs[4].assertInvoked();
2406 >        } catch (CompletionException ok) {
2407 >            checkCompletedWithWrappedCancellationException(h4);
2408 >            rs[4].assertNotInvoked();
2409 >        }
2410 >        try {
2411 >            assertNull(h5.join());
2412 >            rs[5].assertInvoked();
2413 >        } catch (CompletionException ok) {
2414 >            checkCompletedWithWrappedCancellationException(h5);
2415 >            rs[5].assertNotInvoked();
2416          }
1719    }
1720
1721    /**
1722     * applyToEither result completes normally after normal completion
1723     * of either source
1724     */
1725    public void testApplyToEither() {
1726        CompletableFuture<Integer> f = new CompletableFuture<>();
1727        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1728        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1729        f.complete(one);
1730        checkCompletedNormally(g, two);
1731        f2.complete(one);
1732        checkCompletedNormally(g, two);
1733
1734        f = new CompletableFuture<>();
1735        f.complete(one);
1736        f2 = new CompletableFuture<>();
1737        g = f.applyToEither(f2, inc);
1738        checkCompletedNormally(g, two);
1739    }
1740
1741    /**
1742     * applyToEither result completes exceptionally after exceptional
1743     * completion of either source
1744     */
1745    public void testApplyToEither2() {
1746        CompletableFuture<Integer> f = new CompletableFuture<>();
1747        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1748        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1749        f.completeExceptionally(new CFException());
1750        f2.complete(one);
1751        checkCompletedWithWrappedCFException(g);
1752
1753        f = new CompletableFuture<>();
1754        f2 = new CompletableFuture<>();
1755        f2.completeExceptionally(new CFException());
1756        g = f.applyToEither(f2, inc);
1757        checkCompletedWithWrappedCFException(g);
1758    }
1759
1760    /**
1761     * applyToEither result completes exceptionally if action does
1762     */
1763    public void testApplyToEither3() {
1764        CompletableFuture<Integer> f = new CompletableFuture<>();
1765        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1766        FailingFunction r = new FailingFunction();
1767        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1768        f2.complete(two);
1769        checkCompletedWithWrappedCFException(g);
1770    }
2417  
2418 <    /**
2419 <     * applyToEither result completes exceptionally if either source cancelled
2420 <     */
2421 <    public void testApplyToEither4() {
2422 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2423 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2424 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2425 <        assertTrue(f.cancel(true));
1780 <        checkCompletedWithWrappedCancellationException(g);
1781 <        f = new CompletableFuture<>();
1782 <        f2 = new CompletableFuture<>();
1783 <        assertTrue(f2.cancel(true));
1784 <        checkCompletedWithWrappedCancellationException(g);
1785 <    }
1786 <
1787 <    /**
1788 <     * acceptEither result completes normally after normal completion
1789 <     * of either source
1790 <     */
1791 <    public void testAcceptEither() {
1792 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1793 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1794 <        IncAction r = new IncAction();
1795 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1796 <        f.complete(one);
1797 <        checkCompletedNormally(g, null);
1798 <        f2.complete(one);
1799 <        checkCompletedNormally(g, null);
1800 <        assertEquals(r.value, 2);
1801 <
1802 <        r = new IncAction();
1803 <        f = new CompletableFuture<>();
1804 <        f.complete(one);
1805 <        f2 = new CompletableFuture<>();
1806 <        g = f.acceptEither(f2, r);
1807 <        checkCompletedNormally(g, null);
1808 <        assertEquals(r.value, 2);
1809 <    }
1810 <
1811 <    /**
1812 <     * acceptEither result completes exceptionally after exceptional
1813 <     * completion of either source
1814 <     */
1815 <    public void testAcceptEither2() {
1816 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1817 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1818 <        IncAction r = new IncAction();
1819 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1820 <        f.completeExceptionally(new CFException());
1821 <        f2.complete(one);
1822 <        checkCompletedWithWrappedCFException(g);
1823 <
1824 <        r = new IncAction();
1825 <        f = new CompletableFuture<>();
1826 <        f2 = new CompletableFuture<>();
1827 <        f2.completeExceptionally(new CFException());
1828 <        g = f.acceptEither(f2, r);
1829 <        checkCompletedWithWrappedCFException(g);
1830 <    }
1831 <
1832 <    /**
1833 <     * acceptEither result completes exceptionally if action does
1834 <     */
1835 <    public void testAcceptEither3() {
1836 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1837 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1838 <        FailingConsumer r = new FailingConsumer();
1839 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1840 <        f2.complete(two);
1841 <        checkCompletedWithWrappedCFException(g);
1842 <    }
1843 <
1844 <    /**
1845 <     * acceptEither result completes exceptionally if either source cancelled
1846 <     */
1847 <    public void testAcceptEither4() {
1848 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1849 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1850 <        IncAction r = new IncAction();
1851 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1852 <        assertTrue(f.cancel(true));
1853 <        checkCompletedWithWrappedCancellationException(g);
1854 <        f = new CompletableFuture<>();
1855 <        f2 = new CompletableFuture<>();
1856 <        assertTrue(f2.cancel(true));
1857 <        checkCompletedWithWrappedCancellationException(g);
1858 <    }
1859 <
1860 <    /**
1861 <     * runAfterEither result completes normally after normal completion
1862 <     * of either source
1863 <     */
1864 <    public void testRunAfterEither() {
1865 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1866 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1867 <        Noop r = new Noop();
1868 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1869 <        f.complete(one);
1870 <        checkCompletedNormally(g, null);
1871 <        f2.complete(one);
1872 <        checkCompletedNormally(g, null);
1873 <        assertTrue(r.ran);
1874 <
1875 <        r = new Noop();
1876 <        f = new CompletableFuture<>();
1877 <        f.complete(one);
1878 <        f2 = new CompletableFuture<>();
1879 <        g = f.runAfterEither(f2, r);
1880 <        checkCompletedNormally(g, null);
1881 <        assertTrue(r.ran);
1882 <    }
1883 <
1884 <    /**
1885 <     * runAfterEither result completes exceptionally after exceptional
1886 <     * completion of either source
1887 <     */
1888 <    public void testRunAfterEither2() {
1889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1890 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1891 <        Noop r = new Noop();
1892 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1893 <        f.completeExceptionally(new CFException());
1894 <        f2.complete(one);
1895 <        checkCompletedWithWrappedCFException(g);
1896 <
1897 <        r = new Noop();
1898 <        f = new CompletableFuture<>();
1899 <        f2 = new CompletableFuture<>();
1900 <        f2.completeExceptionally(new CFException());
1901 <        g = f.runAfterEither(f2, r);
1902 <        checkCompletedWithWrappedCFException(g);
1903 <    }
2418 >        checkCancelled(f);
2419 >        checkCompletedNormally(g, v1);
2420 >        checkCompletedWithWrappedCancellationException(h0);
2421 >        checkCompletedWithWrappedCancellationException(h1);
2422 >        checkCompletedWithWrappedCancellationException(h2);
2423 >        checkCompletedWithWrappedCancellationException(h3);
2424 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2425 >    }}
2426  
2427      /**
2428       * runAfterEither result completes exceptionally if action does
2429       */
2430 <    public void testRunAfterEither3() {
2431 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2432 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2433 <        FailingNoop r = new FailingNoop();
2434 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2435 <        f2.complete(two);
2436 <        checkCompletedWithWrappedCFException(g);
2437 <    }
2430 >    public void testRunAfterEither_actionFailed() {
2431 >        for (ExecutionMode m : ExecutionMode.values())
2432 >        for (Integer v1 : new Integer[] { 1, null })
2433 >        for (Integer v2 : new Integer[] { 2, null })
2434 >    {
2435 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2436 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2437 >        final FailingRunnable[] rs = new FailingRunnable[6];
2438 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2439  
2440 <    /**
2441 <     * runAfterEither result completes exceptionally if either source cancelled
2442 <     */
2443 <    public void testRunAfterEither4() {
2444 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2445 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2446 <        Noop r = new Noop();
2447 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2448 <        assertTrue(f.cancel(true));
2449 <        checkCompletedWithWrappedCancellationException(g);
2450 <        f = new CompletableFuture<>();
2451 <        f2 = new CompletableFuture<>();
2452 <        assertTrue(f2.cancel(true));
2453 <        checkCompletedWithWrappedCancellationException(g);
2454 <    }
2440 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2441 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2442 >        f.complete(v1);
2443 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2444 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2445 >        checkCompletedWithWrappedCFException(h0);
2446 >        checkCompletedWithWrappedCFException(h1);
2447 >        checkCompletedWithWrappedCFException(h2);
2448 >        checkCompletedWithWrappedCFException(h3);
2449 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2450 >        g.complete(v2);
2451 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2452 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2453 >        checkCompletedWithWrappedCFException(h4);
2454 >        checkCompletedWithWrappedCFException(h5);
2455 >
2456 >        checkCompletedNormally(f, v1);
2457 >        checkCompletedNormally(g, v2);
2458 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2459 >    }}
2460  
2461      /**
2462       * thenCompose result completes normally after normal completion of source
2463       */
2464 <    public void testThenCompose() {
2465 <        CompletableFuture<Integer> f, g;
2466 <        CompletableFutureInc r;
2467 <
2468 <        f = new CompletableFuture<>();
2469 <        g = f.thenCompose(r = new CompletableFutureInc());
2470 <        f.complete(one);
2471 <        checkCompletedNormally(g, two);
2472 <        assertTrue(r.ran);
2464 >    public void testThenCompose_normalCompletion() {
2465 >        for (ExecutionMode m : ExecutionMode.values())
2466 >        for (boolean createIncomplete : new boolean[] { true, false })
2467 >        for (Integer v1 : new Integer[] { 1, null })
2468 >    {
2469 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2470 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2471 >        if (!createIncomplete) f.complete(v1);
2472 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2473 >        if (createIncomplete) f.complete(v1);
2474  
2475 <        f = new CompletableFuture<>();
2476 <        f.complete(one);
2477 <        g = f.thenCompose(r = new CompletableFutureInc());
2478 <        checkCompletedNormally(g, two);
1950 <        assertTrue(r.ran);
1951 <    }
2475 >        checkCompletedNormally(g, inc(v1));
2476 >        checkCompletedNormally(f, v1);
2477 >        r.assertInvoked();
2478 >    }}
2479  
2480      /**
2481       * thenCompose result completes exceptionally after exceptional
2482       * completion of source
2483       */
2484 <    public void testThenCompose2() {
2485 <        CompletableFuture<Integer> f, g;
2486 <        CompletableFutureInc r;
2487 <
2488 <        f = new CompletableFuture<>();
2489 <        g = f.thenCompose(r = new CompletableFutureInc());
2490 <        f.completeExceptionally(new CFException());
2491 <        checkCompletedWithWrappedCFException(g);
2484 >    public void testThenCompose_exceptionalCompletion() {
2485 >        for (ExecutionMode m : ExecutionMode.values())
2486 >        for (boolean createIncomplete : new boolean[] { true, false })
2487 >    {
2488 >        final CFException ex = new CFException();
2489 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2490 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2491 >        if (!createIncomplete) f.completeExceptionally(ex);
2492 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2493 >        if (createIncomplete) f.completeExceptionally(ex);
2494  
2495 <        f = new CompletableFuture<>();
2496 <        f.completeExceptionally(new CFException());
2497 <        g = f.thenCompose(r = new CompletableFutureInc());
2498 <        checkCompletedWithWrappedCFException(g);
1970 <    }
2495 >        checkCompletedWithWrappedCFException(g, ex);
2496 >        checkCompletedWithWrappedCFException(f, ex);
2497 >        r.assertNotInvoked();
2498 >    }}
2499  
2500      /**
2501       * thenCompose result completes exceptionally if action does
2502       */
2503 <    public void testThenCompose3() {
2504 <        CompletableFuture<Integer> f, g;
2505 <        FailingCompletableFutureFunction r;
2506 <
2507 <        f = new CompletableFuture<>();
2508 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2509 <        f.complete(one);
2510 <        checkCompletedWithWrappedCFException(g);
2503 >    public void testThenCompose_actionFailed() {
2504 >        for (ExecutionMode m : ExecutionMode.values())
2505 >        for (boolean createIncomplete : new boolean[] { true, false })
2506 >        for (Integer v1 : new Integer[] { 1, null })
2507 >    {
2508 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2509 >        final FailingCompletableFutureFunction r
2510 >            = new FailingCompletableFutureFunction(m);
2511 >        if (!createIncomplete) f.complete(v1);
2512 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2513 >        if (createIncomplete) f.complete(v1);
2514  
1984        f = new CompletableFuture<>();
1985        f.complete(one);
1986        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2515          checkCompletedWithWrappedCFException(g);
2516 <    }
2516 >        checkCompletedNormally(f, v1);
2517 >    }}
2518  
2519      /**
2520       * thenCompose result completes exceptionally if source cancelled
2521       */
2522 <    public void testThenCompose4() {
2523 <        CompletableFuture<Integer> f, g;
2524 <        CompletableFutureInc r;
2525 <
2526 <        f = new CompletableFuture<>();
2527 <        g = f.thenCompose(r = new CompletableFutureInc());
2528 <        assertTrue(f.cancel(true));
2529 <        checkCompletedWithWrappedCancellationException(g);
2530 <
2531 <        f = new CompletableFuture<>();
2532 <        assertTrue(f.cancel(true));
2533 <        g = f.thenCompose(r = new CompletableFutureInc());
2534 <        checkCompletedWithWrappedCancellationException(g);
2006 <    }
2007 <
2008 <    // asyncs
2009 <
2010 <    /**
2011 <     * thenRunAsync result completes normally after normal completion of source
2012 <     */
2013 <    public void testThenRunAsync() {
2014 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2015 <        Noop r = new Noop();
2016 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2017 <        f.complete(null);
2018 <        checkCompletedNormally(g, null);
2019 <
2020 <        // reordered version
2021 <        f = new CompletableFuture<>();
2022 <        f.complete(null);
2023 <        r = new Noop();
2024 <        g = f.thenRunAsync(r);
2025 <        checkCompletedNormally(g, null);
2026 <    }
2027 <
2028 <    /**
2029 <     * thenRunAsync result completes exceptionally after exceptional
2030 <     * completion of source
2031 <     */
2032 <    public void testThenRunAsync2() {
2033 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2034 <        Noop r = new Noop();
2035 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2036 <        f.completeExceptionally(new CFException());
2037 <        try {
2038 <            g.join();
2039 <            shouldThrow();
2040 <        } catch (CompletionException success) {}
2041 <        checkCompletedWithWrappedCFException(g);
2042 <    }
2043 <
2044 <    /**
2045 <     * thenRunAsync result completes exceptionally if action does
2046 <     */
2047 <    public void testThenRunAsync3() {
2048 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2049 <        FailingNoop r = new FailingNoop();
2050 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2051 <        f.complete(null);
2052 <        checkCompletedWithWrappedCFException(g);
2053 <    }
2054 <
2055 <    /**
2056 <     * thenRunAsync result completes exceptionally if source cancelled
2057 <     */
2058 <    public void testThenRunAsync4() {
2059 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2060 <        Noop r = new Noop();
2061 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2062 <        assertTrue(f.cancel(true));
2063 <        checkCompletedWithWrappedCancellationException(g);
2064 <    }
2065 <
2066 <    /**
2067 <     * thenApplyAsync result completes normally after normal completion of source
2068 <     */
2069 <    public void testThenApplyAsync() {
2070 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2071 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2072 <        f.complete(one);
2073 <        checkCompletedNormally(g, two);
2074 <    }
2075 <
2076 <    /**
2077 <     * thenApplyAsync result completes exceptionally after exceptional
2078 <     * completion of source
2079 <     */
2080 <    public void testThenApplyAsync2() {
2081 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2082 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2083 <        f.completeExceptionally(new CFException());
2084 <        checkCompletedWithWrappedCFException(g);
2085 <    }
2086 <
2087 <    /**
2088 <     * thenApplyAsync result completes exceptionally if action does
2089 <     */
2090 <    public void testThenApplyAsync3() {
2091 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2092 <        FailingFunction r = new FailingFunction();
2093 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2094 <        f.complete(null);
2095 <        checkCompletedWithWrappedCFException(g);
2096 <    }
2097 <
2098 <    /**
2099 <     * thenApplyAsync result completes exceptionally if source cancelled
2100 <     */
2101 <    public void testThenApplyAsync4() {
2102 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2103 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2104 <        assertTrue(f.cancel(true));
2105 <        checkCompletedWithWrappedCancellationException(g);
2106 <    }
2107 <
2108 <    /**
2109 <     * thenAcceptAsync result completes normally after normal
2110 <     * completion of source
2111 <     */
2112 <    public void testThenAcceptAsync() {
2113 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2114 <        IncAction r = new IncAction();
2115 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2116 <        f.complete(one);
2117 <        checkCompletedNormally(g, null);
2118 <        assertEquals(r.value, 2);
2119 <    }
2120 <
2121 <    /**
2122 <     * thenAcceptAsync result completes exceptionally after exceptional
2123 <     * completion of source
2124 <     */
2125 <    public void testThenAcceptAsync2() {
2126 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2127 <        IncAction r = new IncAction();
2128 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2129 <        f.completeExceptionally(new CFException());
2130 <        checkCompletedWithWrappedCFException(g);
2131 <    }
2132 <
2133 <    /**
2134 <     * thenAcceptAsync result completes exceptionally if action does
2135 <     */
2136 <    public void testThenAcceptAsync3() {
2137 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2138 <        FailingConsumer r = new FailingConsumer();
2139 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2140 <        f.complete(null);
2141 <        checkCompletedWithWrappedCFException(g);
2142 <    }
2143 <
2144 <    /**
2145 <     * thenAcceptAsync result completes exceptionally if source cancelled
2146 <     */
2147 <    public void testThenAcceptAsync4() {
2148 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2149 <        IncAction r = new IncAction();
2150 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2151 <        assertTrue(f.cancel(true));
2152 <        checkCompletedWithWrappedCancellationException(g);
2153 <    }
2154 <
2155 <    /**
2156 <     * applyToEitherAsync result completes normally after normal
2157 <     * completion of sources
2158 <     */
2159 <    public void testApplyToEitherAsync() {
2160 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2161 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2162 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2163 <        f.complete(one);
2164 <        checkCompletedNormally(g, two);
2165 <
2166 <        f = new CompletableFuture<>();
2167 <        f.complete(one);
2168 <        f2 = new CompletableFuture<>();
2169 <        g = f.applyToEitherAsync(f2, inc);
2170 <        checkCompletedNormally(g, two);
2171 <    }
2172 <
2173 <    /**
2174 <     * applyToEitherAsync result completes exceptionally after exceptional
2175 <     * completion of source
2176 <     */
2177 <    public void testApplyToEitherAsync2() {
2178 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2179 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2180 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2181 <        f.completeExceptionally(new CFException());
2182 <        checkCompletedWithWrappedCFException(g);
2183 <
2184 <        f = new CompletableFuture<>();
2185 <        f2 = new CompletableFuture<>();
2186 <        f2.completeExceptionally(new CFException());
2187 <        g = f.applyToEitherAsync(f2, inc);
2188 <        f.complete(one);
2189 <        checkCompletedWithWrappedCFException(g);
2190 <    }
2191 <
2192 <    /**
2193 <     * applyToEitherAsync result completes exceptionally if action does
2194 <     */
2195 <    public void testApplyToEitherAsync3() {
2196 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2197 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2198 <        FailingFunction r = new FailingFunction();
2199 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2200 <        f.complete(one);
2201 <        checkCompletedWithWrappedCFException(g);
2202 <    }
2203 <
2204 <    /**
2205 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2206 <     */
2207 <    public void testApplyToEitherAsync4() {
2208 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2209 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2210 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2211 <        assertTrue(f.cancel(true));
2212 <        checkCompletedWithWrappedCancellationException(g);
2213 <
2214 <        f = new CompletableFuture<>();
2215 <        f2 = new CompletableFuture<>();
2216 <        assertTrue(f2.cancel(true));
2217 <        g = f.applyToEitherAsync(f2, inc);
2218 <        checkCompletedWithWrappedCancellationException(g);
2219 <    }
2220 <
2221 <    /**
2222 <     * acceptEitherAsync result completes normally after normal
2223 <     * completion of sources
2224 <     */
2225 <    public void testAcceptEitherAsync() {
2226 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2227 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2228 <        IncAction r = new IncAction();
2229 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2230 <        f.complete(one);
2231 <        checkCompletedNormally(g, null);
2232 <        assertEquals(r.value, 2);
2233 <
2234 <        r = new IncAction();
2235 <        f = new CompletableFuture<>();
2236 <        f.complete(one);
2237 <        f2 = new CompletableFuture<>();
2238 <        g = f.acceptEitherAsync(f2, r);
2239 <        checkCompletedNormally(g, null);
2240 <        assertEquals(r.value, 2);
2241 <    }
2242 <
2243 <    /**
2244 <     * acceptEitherAsync result completes exceptionally after exceptional
2245 <     * completion of source
2246 <     */
2247 <    public void testAcceptEitherAsync2() {
2248 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2249 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2250 <        IncAction r = new IncAction();
2251 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2252 <        f.completeExceptionally(new CFException());
2253 <        checkCompletedWithWrappedCFException(g);
2254 <
2255 <        r = new IncAction();
2256 <        f = new CompletableFuture<>();
2257 <        f2 = new CompletableFuture<>();
2258 <        f2.completeExceptionally(new CFException());
2259 <        g = f.acceptEitherAsync(f2, r);
2260 <        f.complete(one);
2261 <        checkCompletedWithWrappedCFException(g);
2262 <    }
2263 <
2264 <    /**
2265 <     * acceptEitherAsync result completes exceptionally if action does
2266 <     */
2267 <    public void testAcceptEitherAsync3() {
2268 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2269 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2270 <        FailingConsumer r = new FailingConsumer();
2271 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2272 <        f.complete(one);
2273 <        checkCompletedWithWrappedCFException(g);
2274 <    }
2275 <
2276 <    /**
2277 <     * acceptEitherAsync result completes exceptionally if either
2278 <     * source cancelled
2279 <     */
2280 <    public void testAcceptEitherAsync4() {
2281 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2282 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2283 <        IncAction r = new IncAction();
2284 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2285 <        assertTrue(f.cancel(true));
2286 <        checkCompletedWithWrappedCancellationException(g);
2287 <
2288 <        r = new IncAction();
2289 <        f = new CompletableFuture<>();
2290 <        f2 = new CompletableFuture<>();
2291 <        assertTrue(f2.cancel(true));
2292 <        g = f.acceptEitherAsync(f2, r);
2293 <        checkCompletedWithWrappedCancellationException(g);
2294 <    }
2295 <
2296 <    /**
2297 <     * runAfterEitherAsync result completes normally after normal
2298 <     * completion of sources
2299 <     */
2300 <    public void testRunAfterEitherAsync() {
2301 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2302 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2303 <        Noop r = new Noop();
2304 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2305 <        f.complete(one);
2306 <        checkCompletedNormally(g, null);
2307 <        assertTrue(r.ran);
2308 <
2309 <        r = new Noop();
2310 <        f = new CompletableFuture<>();
2311 <        f.complete(one);
2312 <        f2 = new CompletableFuture<>();
2313 <        g = f.runAfterEitherAsync(f2, r);
2314 <        checkCompletedNormally(g, null);
2315 <        assertTrue(r.ran);
2316 <    }
2317 <
2318 <    /**
2319 <     * runAfterEitherAsync result completes exceptionally after exceptional
2320 <     * completion of source
2321 <     */
2322 <    public void testRunAfterEitherAsync2() {
2323 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2324 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2325 <        Noop r = new Noop();
2326 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2327 <        f.completeExceptionally(new CFException());
2328 <        checkCompletedWithWrappedCFException(g);
2329 <
2330 <        r = new Noop();
2331 <        f = new CompletableFuture<>();
2332 <        f2 = new CompletableFuture<>();
2333 <        f2.completeExceptionally(new CFException());
2334 <        g = f.runAfterEitherAsync(f2, r);
2335 <        f.complete(one);
2336 <        checkCompletedWithWrappedCFException(g);
2337 <    }
2338 <
2339 <    /**
2340 <     * runAfterEitherAsync result completes exceptionally if action does
2341 <     */
2342 <    public void testRunAfterEitherAsync3() {
2343 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2344 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2345 <        FailingNoop r = new FailingNoop();
2346 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2347 <        f.complete(one);
2348 <        checkCompletedWithWrappedCFException(g);
2349 <    }
2350 <
2351 <    /**
2352 <     * runAfterEitherAsync result completes exceptionally if either
2353 <     * source cancelled
2354 <     */
2355 <    public void testRunAfterEitherAsync4() {
2356 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2357 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2358 <        Noop r = new Noop();
2359 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2360 <        assertTrue(f.cancel(true));
2361 <        checkCompletedWithWrappedCancellationException(g);
2362 <
2363 <        r = new Noop();
2364 <        f = new CompletableFuture<>();
2365 <        f2 = new CompletableFuture<>();
2366 <        assertTrue(f2.cancel(true));
2367 <        g = f.runAfterEitherAsync(f2, r);
2368 <        checkCompletedWithWrappedCancellationException(g);
2369 <    }
2370 <
2371 <    /**
2372 <     * thenComposeAsync result completes normally after normal
2373 <     * completion of source
2374 <     */
2375 <    public void testThenComposeAsync() {
2376 <        CompletableFuture<Integer> f, g;
2377 <        CompletableFutureInc r;
2378 <
2379 <        f = new CompletableFuture<>();
2380 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2381 <        f.complete(one);
2382 <        checkCompletedNormally(g, two);
2383 <
2384 <        f = new CompletableFuture<>();
2385 <        f.complete(one);
2386 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2387 <        checkCompletedNormally(g, two);
2388 <    }
2389 <
2390 <    /**
2391 <     * thenComposeAsync result completes exceptionally after
2392 <     * exceptional completion of source
2393 <     */
2394 <    public void testThenComposeAsync2() {
2395 <        CompletableFuture<Integer> f, g;
2396 <        CompletableFutureInc r;
2397 <
2398 <        f = new CompletableFuture<>();
2399 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2400 <        f.completeExceptionally(new CFException());
2401 <        checkCompletedWithWrappedCFException(g);
2402 <        assertFalse(r.ran);
2403 <
2404 <        f = new CompletableFuture<>();
2405 <        f.completeExceptionally(new CFException());
2406 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2407 <        checkCompletedWithWrappedCFException(g);
2408 <        assertFalse(r.ran);
2409 <    }
2410 <
2411 <    /**
2412 <     * thenComposeAsync result completes exceptionally if action does
2413 <     */
2414 <    public void testThenComposeAsync3() {
2415 <        CompletableFuture<Integer> f, g;
2416 <        FailingCompletableFutureFunction r;
2417 <
2418 <        f = new CompletableFuture<>();
2419 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2420 <        f.complete(one);
2421 <        checkCompletedWithWrappedCFException(g);
2422 <
2423 <        f = new CompletableFuture<>();
2424 <        f.complete(one);
2425 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2426 <        checkCompletedWithWrappedCFException(g);
2427 <    }
2428 <
2429 <    /**
2430 <     * thenComposeAsync result completes exceptionally if source cancelled
2431 <     */
2432 <    public void testThenComposeAsync4() {
2433 <        CompletableFuture<Integer> f, g;
2434 <        CompletableFutureInc r;
2435 <
2436 <        f = new CompletableFuture<>();
2437 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2438 <        assertTrue(f.cancel(true));
2439 <        checkCompletedWithWrappedCancellationException(g);
2440 <
2441 <        f = new CompletableFuture<>();
2442 <        assertTrue(f.cancel(true));
2443 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2444 <        checkCompletedWithWrappedCancellationException(g);
2445 <    }
2446 <
2447 <    // async with explicit executors
2448 <
2449 <    /**
2450 <     * thenRunAsync result completes normally after normal completion of source
2451 <     */
2452 <    public void testThenRunAsyncE() {
2453 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2454 <        Noop r = new Noop();
2455 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2456 <        f.complete(null);
2457 <        checkCompletedNormally(g, null);
2458 <
2459 <        // reordered version
2460 <        f = new CompletableFuture<>();
2461 <        f.complete(null);
2462 <        r = new Noop();
2463 <        g = f.thenRunAsync(r, new ThreadExecutor());
2464 <        checkCompletedNormally(g, null);
2465 <    }
2466 <
2467 <    /**
2468 <     * thenRunAsync result completes exceptionally after exceptional
2469 <     * completion of source
2470 <     */
2471 <    public void testThenRunAsync2E() {
2472 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2473 <        Noop r = new Noop();
2474 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2475 <        f.completeExceptionally(new CFException());
2476 <        try {
2477 <            g.join();
2478 <            shouldThrow();
2479 <        } catch (CompletionException success) {}
2480 <        checkCompletedWithWrappedCFException(g);
2481 <    }
2482 <
2483 <    /**
2484 <     * thenRunAsync result completes exceptionally if action does
2485 <     */
2486 <    public void testThenRunAsync3E() {
2487 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2488 <        FailingNoop r = new FailingNoop();
2489 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2490 <        f.complete(null);
2491 <        checkCompletedWithWrappedCFException(g);
2492 <    }
2493 <
2494 <    /**
2495 <     * thenRunAsync result completes exceptionally if source cancelled
2496 <     */
2497 <    public void testThenRunAsync4E() {
2498 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2499 <        Noop r = new Noop();
2500 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2501 <        assertTrue(f.cancel(true));
2502 <        checkCompletedWithWrappedCancellationException(g);
2503 <    }
2504 <
2505 <    /**
2506 <     * thenApplyAsync result completes normally after normal completion of source
2507 <     */
2508 <    public void testThenApplyAsyncE() {
2509 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2510 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2511 <        f.complete(one);
2512 <        checkCompletedNormally(g, two);
2513 <    }
2514 <
2515 <    /**
2516 <     * thenApplyAsync result completes exceptionally after exceptional
2517 <     * completion of source
2518 <     */
2519 <    public void testThenApplyAsync2E() {
2520 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2521 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2522 <        f.completeExceptionally(new CFException());
2523 <        checkCompletedWithWrappedCFException(g);
2524 <    }
2525 <
2526 <    /**
2527 <     * thenApplyAsync result completes exceptionally if action does
2528 <     */
2529 <    public void testThenApplyAsync3E() {
2530 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2531 <        FailingFunction r = new FailingFunction();
2532 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2533 <        f.complete(null);
2534 <        checkCompletedWithWrappedCFException(g);
2535 <    }
2536 <
2537 <    /**
2538 <     * thenApplyAsync result completes exceptionally if source cancelled
2539 <     */
2540 <    public void testThenApplyAsync4E() {
2541 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2542 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2543 <        assertTrue(f.cancel(true));
2544 <        checkCompletedWithWrappedCancellationException(g);
2545 <    }
2546 <
2547 <    /**
2548 <     * thenAcceptAsync result completes normally after normal
2549 <     * completion of source
2550 <     */
2551 <    public void testThenAcceptAsyncE() {
2552 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2553 <        IncAction r = new IncAction();
2554 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2555 <        f.complete(one);
2556 <        checkCompletedNormally(g, null);
2557 <        assertEquals(r.value, 2);
2558 <    }
2559 <
2560 <    /**
2561 <     * thenAcceptAsync result completes exceptionally after exceptional
2562 <     * completion of source
2563 <     */
2564 <    public void testThenAcceptAsync2E() {
2565 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2566 <        IncAction r = new IncAction();
2567 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2568 <        f.completeExceptionally(new CFException());
2569 <        checkCompletedWithWrappedCFException(g);
2570 <    }
2571 <
2572 <    /**
2573 <     * thenAcceptAsync result completes exceptionally if action does
2574 <     */
2575 <    public void testThenAcceptAsync3E() {
2576 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2577 <        FailingConsumer r = new FailingConsumer();
2578 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2579 <        f.complete(null);
2580 <        checkCompletedWithWrappedCFException(g);
2581 <    }
2582 <
2583 <    /**
2584 <     * thenAcceptAsync result completes exceptionally if source cancelled
2585 <     */
2586 <    public void testThenAcceptAsync4E() {
2587 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2588 <        IncAction r = new IncAction();
2589 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2590 <        assertTrue(f.cancel(true));
2591 <        checkCompletedWithWrappedCancellationException(g);
2592 <    }
2593 <
2594 <    /**
2595 <     * applyToEitherAsync result completes normally after normal
2596 <     * completion of sources
2597 <     */
2598 <    public void testApplyToEitherAsyncE() {
2599 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2600 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2601 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2602 <        f.complete(one);
2603 <        checkCompletedNormally(g, two);
2604 <
2605 <        f = new CompletableFuture<>();
2606 <        f.complete(one);
2607 <        f2 = new CompletableFuture<>();
2608 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2609 <        checkCompletedNormally(g, two);
2610 <    }
2611 <
2612 <    /**
2613 <     * applyToEitherAsync result completes exceptionally after exceptional
2614 <     * completion of source
2615 <     */
2616 <    public void testApplyToEitherAsync2E() {
2617 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2618 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2619 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2620 <        f.completeExceptionally(new CFException());
2621 <        checkCompletedWithWrappedCFException(g);
2622 <
2623 <        f = new CompletableFuture<>();
2624 <        f2 = new CompletableFuture<>();
2625 <        f2.completeExceptionally(new CFException());
2626 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2627 <        f.complete(one);
2628 <        checkCompletedWithWrappedCFException(g);
2629 <    }
2630 <
2631 <    /**
2632 <     * applyToEitherAsync result completes exceptionally if action does
2633 <     */
2634 <    public void testApplyToEitherAsync3E() {
2635 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2636 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2637 <        FailingFunction r = new FailingFunction();
2638 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2639 <        f.complete(one);
2640 <        checkCompletedWithWrappedCFException(g);
2641 <    }
2642 <
2643 <    /**
2644 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2645 <     */
2646 <    public void testApplyToEitherAsync4E() {
2647 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2648 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2649 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2650 <        assertTrue(f.cancel(true));
2651 <        checkCompletedWithWrappedCancellationException(g);
2652 <
2653 <        f = new CompletableFuture<>();
2654 <        f2 = new CompletableFuture<>();
2655 <        assertTrue(f2.cancel(true));
2656 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2657 <        checkCompletedWithWrappedCancellationException(g);
2658 <    }
2659 <
2660 <    /**
2661 <     * acceptEitherAsync result completes normally after normal
2662 <     * completion of sources
2663 <     */
2664 <    public void testAcceptEitherAsyncE() {
2665 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2666 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2667 <        IncAction r = new IncAction();
2668 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2669 <        f.complete(one);
2670 <        checkCompletedNormally(g, null);
2671 <        assertEquals(r.value, 2);
2672 <
2673 <        r = new IncAction();
2674 <        f = new CompletableFuture<>();
2675 <        f.complete(one);
2676 <        f2 = new CompletableFuture<>();
2677 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2678 <        checkCompletedNormally(g, null);
2679 <        assertEquals(r.value, 2);
2680 <    }
2681 <
2682 <    /**
2683 <     * acceptEitherAsync result completes exceptionally after exceptional
2684 <     * completion of source
2685 <     */
2686 <    public void testAcceptEitherAsync2E() {
2687 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2688 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2689 <        IncAction r = new IncAction();
2690 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2691 <        f.completeExceptionally(new CFException());
2692 <        checkCompletedWithWrappedCFException(g);
2693 <
2694 <        r = new IncAction();
2695 <        f = new CompletableFuture<>();
2696 <        f2 = new CompletableFuture<>();
2697 <        f2.completeExceptionally(new CFException());
2698 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2699 <        f.complete(one);
2700 <        checkCompletedWithWrappedCFException(g);
2701 <    }
2702 <
2703 <    /**
2704 <     * acceptEitherAsync result completes exceptionally if action does
2705 <     */
2706 <    public void testAcceptEitherAsync3E() {
2707 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2708 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2709 <        FailingConsumer r = new FailingConsumer();
2710 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2711 <        f.complete(one);
2712 <        checkCompletedWithWrappedCFException(g);
2713 <    }
2714 <
2715 <    /**
2716 <     * acceptEitherAsync result completes exceptionally if either
2717 <     * source cancelled
2718 <     */
2719 <    public void testAcceptEitherAsync4E() {
2720 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2721 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2722 <        IncAction r = new IncAction();
2723 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2724 <        assertTrue(f.cancel(true));
2725 <        checkCompletedWithWrappedCancellationException(g);
2726 <
2727 <        r = new IncAction();
2728 <        f = new CompletableFuture<>();
2729 <        f2 = new CompletableFuture<>();
2730 <        assertTrue(f2.cancel(true));
2731 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2732 <        checkCompletedWithWrappedCancellationException(g);
2733 <    }
2734 <
2735 <    /**
2736 <     * runAfterEitherAsync result completes normally after normal
2737 <     * completion of sources
2738 <     */
2739 <    public void testRunAfterEitherAsyncE() {
2740 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2741 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2742 <        Noop r = new Noop();
2743 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2744 <        f.complete(one);
2745 <        checkCompletedNormally(g, null);
2746 <        assertTrue(r.ran);
2747 <
2748 <        r = new Noop();
2749 <        f = new CompletableFuture<>();
2750 <        f.complete(one);
2751 <        f2 = new CompletableFuture<>();
2752 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2753 <        checkCompletedNormally(g, null);
2754 <        assertTrue(r.ran);
2755 <    }
2756 <
2757 <    /**
2758 <     * runAfterEitherAsync result completes exceptionally after exceptional
2759 <     * completion of source
2760 <     */
2761 <    public void testRunAfterEitherAsync2E() {
2762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2763 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2764 <        Noop r = new Noop();
2765 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2766 <        f.completeExceptionally(new CFException());
2767 <        checkCompletedWithWrappedCFException(g);
2768 <
2769 <        r = new Noop();
2770 <        f = new CompletableFuture<>();
2771 <        f2 = new CompletableFuture<>();
2772 <        f2.completeExceptionally(new CFException());
2773 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2774 <        f.complete(one);
2775 <        checkCompletedWithWrappedCFException(g);
2776 <    }
2777 <
2778 <    /**
2779 <     * runAfterEitherAsync result completes exceptionally if action does
2780 <     */
2781 <    public void testRunAfterEitherAsync3E() {
2782 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2783 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2784 <        FailingNoop r = new FailingNoop();
2785 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2786 <        f.complete(one);
2787 <        checkCompletedWithWrappedCFException(g);
2788 <    }
2789 <
2790 <    /**
2791 <     * runAfterEitherAsync result completes exceptionally if either
2792 <     * source cancelled
2793 <     */
2794 <    public void testRunAfterEitherAsync4E() {
2795 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2796 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2797 <        Noop r = new Noop();
2798 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2799 <        assertTrue(f.cancel(true));
2800 <        checkCompletedWithWrappedCancellationException(g);
2801 <
2802 <        r = new Noop();
2803 <        f = new CompletableFuture<>();
2804 <        f2 = new CompletableFuture<>();
2805 <        assertTrue(f2.cancel(true));
2806 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2807 <        checkCompletedWithWrappedCancellationException(g);
2808 <    }
2809 <
2810 <    /**
2811 <     * thenComposeAsync result completes normally after normal
2812 <     * completion of source
2813 <     */
2814 <    public void testThenComposeAsyncE() {
2815 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2816 <        CompletableFutureInc r = new CompletableFutureInc();
2817 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2818 <        f.complete(one);
2819 <        checkCompletedNormally(g, two);
2820 <    }
2821 <
2822 <    /**
2823 <     * thenComposeAsync result completes exceptionally after
2824 <     * exceptional completion of source
2825 <     */
2826 <    public void testThenComposeAsync2E() {
2827 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2828 <        CompletableFutureInc r = new CompletableFutureInc();
2829 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2830 <        f.completeExceptionally(new CFException());
2831 <        checkCompletedWithWrappedCFException(g);
2832 <    }
2833 <
2834 <    /**
2835 <     * thenComposeAsync result completes exceptionally if action does
2836 <     */
2837 <    public void testThenComposeAsync3E() {
2838 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2839 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2840 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2841 <        f.complete(one);
2842 <        checkCompletedWithWrappedCFException(g);
2843 <    }
2522 >    public void testThenCompose_sourceCancelled() {
2523 >        for (ExecutionMode m : ExecutionMode.values())
2524 >        for (boolean createIncomplete : new boolean[] { true, false })
2525 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2526 >    {
2527 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2528 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2529 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2530 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2531 >        if (createIncomplete) {
2532 >            checkIncomplete(g);
2533 >            assertTrue(f.cancel(mayInterruptIfRunning));
2534 >        }
2535  
2845    /**
2846     * thenComposeAsync result completes exceptionally if source cancelled
2847     */
2848    public void testThenComposeAsync4E() {
2849        CompletableFuture<Integer> f = new CompletableFuture<>();
2850        CompletableFutureInc r = new CompletableFutureInc();
2851        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2852        assertTrue(f.cancel(true));
2536          checkCompletedWithWrappedCancellationException(g);
2537 <    }
2537 >        checkCancelled(f);
2538 >    }}
2539  
2540      // other static methods
2541  
# Line 2870 | Line 2554 | public class CompletableFutureTest exten
2554       */
2555      public void testAllOf_normal() throws Exception {
2556          for (int k = 1; k < 20; ++k) {
2557 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2557 >            CompletableFuture<Integer>[] fs
2558 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2559              for (int i = 0; i < k; ++i)
2560                  fs[i] = new CompletableFuture<>();
2561              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 2884 | Line 2569 | public class CompletableFutureTest exten
2569          }
2570      }
2571  
2572 +    public void testAllOf_backwards() throws Exception {
2573 +        for (int k = 1; k < 20; ++k) {
2574 +            CompletableFuture<Integer>[] fs
2575 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2576 +            for (int i = 0; i < k; ++i)
2577 +                fs[i] = new CompletableFuture<>();
2578 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2579 +            for (int i = k - 1; i >= 0; i--) {
2580 +                checkIncomplete(f);
2581 +                checkIncomplete(CompletableFuture.allOf(fs));
2582 +                fs[i].complete(one);
2583 +            }
2584 +            checkCompletedNormally(f, null);
2585 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2586 +        }
2587 +    }
2588 +
2589      /**
2590       * anyOf(no component futures) returns an incomplete future
2591       */
# Line 2942 | Line 2644 | public class CompletableFutureTest exten
2644          Runnable[] throwingActions = {
2645              () -> CompletableFuture.supplyAsync(null),
2646              () -> CompletableFuture.supplyAsync(null, exec),
2647 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2647 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2648  
2649              () -> CompletableFuture.runAsync(null),
2650              () -> CompletableFuture.runAsync(null, exec),
# Line 3015 | Line 2717 | public class CompletableFutureTest exten
2717  
2718              () -> f.thenCompose(null),
2719              () -> f.thenComposeAsync(null),
2720 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2720 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2721              () -> f.thenComposeAsync(null, exec),
2722  
2723              () -> f.exceptionally(null),
# Line 3051 | Line 2753 | public class CompletableFutureTest exten
2753       * whenComplete action executes on normal completion, propagating
2754       * source result.
2755       */
2756 <    public void testWhenComplete1() {
2757 <        final AtomicInteger a = new AtomicInteger();
2758 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2759 <        CompletableFuture<Integer> g =
2760 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
2761 <        f.complete(three);
2762 <        checkCompletedNormally(f, three);
2763 <        checkCompletedNormally(g, three);
2764 <        assertEquals(a.get(), 1);
2765 <    }
2766 <
2767 <    /**
2768 <     * whenComplete action executes on exceptional completion, propagating
2769 <     * source result.
2770 <     */
2771 <    public void testWhenComplete2() {
3070 <        final AtomicInteger a = new AtomicInteger();
3071 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3072 <        CompletableFuture<Integer> g =
3073 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3074 <        f.completeExceptionally(new CFException());
3075 <        assertTrue(f.isCompletedExceptionally());
3076 <        assertTrue(g.isCompletedExceptionally());
3077 <        assertEquals(a.get(), 1);
3078 <    }
3079 <
3080 <    /**
3081 <     * If a whenComplete action throws an exception when triggered by
3082 <     * a normal completion, it completes exceptionally
3083 <     */
3084 <    public void testWhenComplete3() {
3085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3086 <        CompletableFuture<Integer> g =
3087 <            f.whenComplete((Integer x, Throwable t) ->
3088 <                           { throw new CFException(); } );
3089 <        f.complete(three);
3090 <        checkCompletedNormally(f, three);
3091 <        assertTrue(g.isCompletedExceptionally());
3092 <        checkCompletedWithWrappedCFException(g);
3093 <    }
3094 <
3095 <    /**
3096 <     * whenCompleteAsync action executes on normal completion, propagating
3097 <     * source result.
3098 <     */
3099 <    public void testWhenCompleteAsync1() {
3100 <        final AtomicInteger a = new AtomicInteger();
3101 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3102 <        CompletableFuture<Integer> g =
3103 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3104 <        f.complete(three);
3105 <        checkCompletedNormally(f, three);
3106 <        checkCompletedNormally(g, three);
3107 <        assertEquals(a.get(), 1);
3108 <    }
3109 <
3110 <    /**
3111 <     * whenCompleteAsync action executes on exceptional completion, propagating
3112 <     * source result.
3113 <     */
3114 <    public void testWhenCompleteAsync2() {
3115 <        final AtomicInteger a = new AtomicInteger();
3116 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3117 <        CompletableFuture<Integer> g =
3118 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3119 <        f.completeExceptionally(new CFException());
3120 <        checkCompletedWithWrappedCFException(f);
3121 <        checkCompletedWithWrappedCFException(g);
3122 <    }
2756 >    public void testWhenComplete_normalCompletion1() {
2757 >        for (ExecutionMode m : ExecutionMode.values())
2758 >        for (boolean createIncomplete : new boolean[] { true, false })
2759 >        for (Integer v1 : new Integer[] { 1, null })
2760 >    {
2761 >        final AtomicInteger a = new AtomicInteger(0);
2762 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2763 >        if (!createIncomplete) f.complete(v1);
2764 >        final CompletableFuture<Integer> g = m.whenComplete
2765 >            (f,
2766 >             (Integer x, Throwable t) -> {
2767 >                threadAssertSame(x, v1);
2768 >                threadAssertNull(t);
2769 >                a.getAndIncrement();
2770 >            });
2771 >        if (createIncomplete) f.complete(v1);
2772  
2773 <    /**
2774 <     * If a whenCompleteAsync action throws an exception when
2775 <     * triggered by a normal completion, it completes exceptionally
2776 <     */
3128 <    public void testWhenCompleteAsync3() {
3129 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3130 <        CompletableFuture<Integer> g =
3131 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3132 <                           { throw new CFException(); } );
3133 <        f.complete(three);
3134 <        checkCompletedNormally(f, three);
3135 <        checkCompletedWithWrappedCFException(g);
3136 <    }
2773 >        checkCompletedNormally(g, v1);
2774 >        checkCompletedNormally(f, v1);
2775 >        assertEquals(1, a.get());
2776 >    }}
2777  
2778      /**
2779 <     * whenCompleteAsync action executes on normal completion, propagating
2779 >     * whenComplete action executes on exceptional completion, propagating
2780       * source result.
2781       */
2782 <    public void testWhenCompleteAsync1e() {
2783 <        final AtomicInteger a = new AtomicInteger();
2784 <        ThreadExecutor exec = new ThreadExecutor();
2785 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2786 <        CompletableFuture<Integer> g =
2787 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2788 <                                exec);
2789 <        f.complete(three);
2790 <        checkCompletedNormally(f, three);
2791 <        checkCompletedNormally(g, three);
2792 <        assertEquals(a.get(), 1);
2793 <    }
2782 >    public void testWhenComplete_exceptionalCompletion() {
2783 >        for (ExecutionMode m : ExecutionMode.values())
2784 >        for (boolean createIncomplete : new boolean[] { true, false })
2785 >        for (Integer v1 : new Integer[] { 1, null })
2786 >    {
2787 >        final AtomicInteger a = new AtomicInteger(0);
2788 >        final CFException ex = new CFException();
2789 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2790 >        if (!createIncomplete) f.completeExceptionally(ex);
2791 >        final CompletableFuture<Integer> g = m.whenComplete
2792 >            (f,
2793 >             (Integer x, Throwable t) -> {
2794 >                threadAssertNull(x);
2795 >                threadAssertSame(t, ex);
2796 >                a.getAndIncrement();
2797 >            });
2798 >        if (createIncomplete) f.completeExceptionally(ex);
2799 >        checkCompletedWithWrappedCFException(f, ex);
2800 >        checkCompletedWithWrappedCFException(g, ex);
2801 >        assertEquals(1, a.get());
2802 >    }}
2803  
2804      /**
2805 <     * whenCompleteAsync action executes on exceptional completion, propagating
2806 <     * source result.
2805 >     * whenComplete action executes on cancelled source, propagating
2806 >     * CancellationException.
2807       */
2808 <    public void testWhenCompleteAsync2e() {
2809 <        final AtomicInteger a = new AtomicInteger();
2810 <        ThreadExecutor exec = new ThreadExecutor();
2811 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2812 <        CompletableFuture<Integer> g =
2813 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
2814 <                                exec);
2815 <        f.completeExceptionally(new CFException());
2816 <        checkCompletedWithWrappedCFException(f);
2817 <        checkCompletedWithWrappedCFException(g);
2818 <    }
2808 >    public void testWhenComplete_sourceCancelled() {
2809 >        for (ExecutionMode m : ExecutionMode.values())
2810 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2811 >        for (boolean createIncomplete : new boolean[] { true, false })
2812 >    {
2813 >        final AtomicInteger a = new AtomicInteger(0);
2814 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2815 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2816 >        final CompletableFuture<Integer> g = m.whenComplete
2817 >            (f,
2818 >             (Integer x, Throwable t) -> {
2819 >                threadAssertNull(x);
2820 >                threadAssertTrue(t instanceof CancellationException);
2821 >                a.getAndIncrement();
2822 >            });
2823 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2824  
2825 <    /**
2826 <     * If a whenCompleteAsync action throws an exception when triggered
2827 <     * by a normal completion, it completes exceptionally
2828 <     */
2829 <    public void testWhenCompleteAsync3e() {
3176 <        ThreadExecutor exec = new ThreadExecutor();
3177 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3178 <        CompletableFuture<Integer> g =
3179 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3180 <                                { throw new CFException(); },
3181 <                                exec);
3182 <        f.complete(three);
3183 <        checkCompletedNormally(f, three);
3184 <        checkCompletedWithWrappedCFException(g);
3185 <    }
2825 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2826 >        checkCompletedWithWrappedCancellationException(g);
2827 >        checkCancelled(f);
2828 >        assertEquals(1, a.get());
2829 >    }}
2830  
2831      /**
2832 <     * handleAsync action completes normally with function value on
2833 <     * either normal or exceptional completion of source
2832 >     * If a whenComplete action throws an exception when triggered by
2833 >     * a normal completion, it completes exceptionally
2834       */
2835 <    public void testHandleAsync() {
2836 <        CompletableFuture<Integer> f, g;
2837 <        IntegerHandler r;
2838 <
2839 <        f = new CompletableFuture<>();
2840 <        g = f.handleAsync(r = new IntegerHandler());
2841 <        assertFalse(r.ran);
2842 <        f.completeExceptionally(new CFException());
2843 <        checkCompletedWithWrappedCFException(f);
2844 <        checkCompletedNormally(g, three);
2845 <        assertTrue(r.ran);
2846 <
2847 <        f = new CompletableFuture<>();
2848 <        g = f.handleAsync(r = new IntegerHandler());
2849 <        assertFalse(r.ran);
2850 <        f.completeExceptionally(new CFException());
2851 <        checkCompletedWithWrappedCFException(f);
2852 <        checkCompletedNormally(g, three);
2853 <        assertTrue(r.ran);
2854 <
2855 <        f = new CompletableFuture<>();
2856 <        g = f.handleAsync(r = new IntegerHandler());
3213 <        assertFalse(r.ran);
3214 <        f.complete(one);
3215 <        checkCompletedNormally(f, one);
3216 <        checkCompletedNormally(g, two);
3217 <        assertTrue(r.ran);
3218 <
3219 <        f = new CompletableFuture<>();
3220 <        g = f.handleAsync(r = new IntegerHandler());
3221 <        assertFalse(r.ran);
3222 <        f.complete(one);
3223 <        checkCompletedNormally(f, one);
3224 <        checkCompletedNormally(g, two);
3225 <        assertTrue(r.ran);
3226 <    }
2835 >    public void testWhenComplete_actionFailed() {
2836 >        for (boolean createIncomplete : new boolean[] { true, false })
2837 >        for (ExecutionMode m : ExecutionMode.values())
2838 >        for (Integer v1 : new Integer[] { 1, null })
2839 >    {
2840 >        final AtomicInteger a = new AtomicInteger(0);
2841 >        final CFException ex = new CFException();
2842 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2843 >        if (!createIncomplete) f.complete(v1);
2844 >        final CompletableFuture<Integer> g = m.whenComplete
2845 >            (f,
2846 >             (Integer x, Throwable t) -> {
2847 >                threadAssertSame(x, v1);
2848 >                threadAssertNull(t);
2849 >                a.getAndIncrement();
2850 >                throw ex;
2851 >            });
2852 >        if (createIncomplete) f.complete(v1);
2853 >        checkCompletedNormally(f, v1);
2854 >        checkCompletedWithWrappedCFException(g, ex);
2855 >        assertEquals(1, a.get());
2856 >    }}
2857  
2858      /**
2859 <     * handleAsync action with Executor completes normally with
2860 <     * function value on either normal or exceptional completion of
2861 <     * source
2859 >     * If a whenComplete action throws an exception when triggered by
2860 >     * a source completion that also throws an exception, the source
2861 >     * exception takes precedence.
2862       */
2863 <    public void testHandleAsync2() {
2864 <        CompletableFuture<Integer> f, g;
2865 <        ThreadExecutor exec = new ThreadExecutor();
2866 <        IntegerHandler r;
2867 <
2868 <        f = new CompletableFuture<>();
2869 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2870 <        assertFalse(r.ran);
2871 <        f.completeExceptionally(new CFException());
2872 <        checkCompletedWithWrappedCFException(f);
2873 <        checkCompletedNormally(g, three);
2874 <        assertTrue(r.ran);
2875 <
2876 <        f = new CompletableFuture<>();
2877 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2878 <        assertFalse(r.ran);
2879 <        f.completeExceptionally(new CFException());
2880 <        checkCompletedWithWrappedCFException(f);
2881 <        checkCompletedNormally(g, three);
2882 <        assertTrue(r.ran);
2883 <
2884 <        f = new CompletableFuture<>();
2885 <        g = f.handleAsync(r = new IntegerHandler(), exec);
2886 <        assertFalse(r.ran);
2887 <        f.complete(one);
3258 <        checkCompletedNormally(f, one);
3259 <        checkCompletedNormally(g, two);
3260 <        assertTrue(r.ran);
3261 <
3262 <        f = new CompletableFuture<>();
3263 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3264 <        assertFalse(r.ran);
3265 <        f.complete(one);
3266 <        checkCompletedNormally(f, one);
3267 <        checkCompletedNormally(g, two);
3268 <        assertTrue(r.ran);
3269 <    }
2863 >    public void testWhenComplete_actionFailedSourceFailed() {
2864 >        for (boolean createIncomplete : new boolean[] { true, false })
2865 >        for (ExecutionMode m : ExecutionMode.values())
2866 >        for (Integer v1 : new Integer[] { 1, null })
2867 >    {
2868 >        final AtomicInteger a = new AtomicInteger(0);
2869 >        final CFException ex1 = new CFException();
2870 >        final CFException ex2 = new CFException();
2871 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2872 >
2873 >        if (!createIncomplete) f.completeExceptionally(ex1);
2874 >        final CompletableFuture<Integer> g = m.whenComplete
2875 >            (f,
2876 >             (Integer x, Throwable t) -> {
2877 >                threadAssertSame(t, ex1);
2878 >                threadAssertNull(x);
2879 >                a.getAndIncrement();
2880 >                throw ex2;
2881 >            });
2882 >        if (createIncomplete) f.completeExceptionally(ex1);
2883 >
2884 >        checkCompletedWithWrappedCFException(f, ex1);
2885 >        checkCompletedWithWrappedCFException(g, ex1);
2886 >        assertEquals(1, a.get());
2887 >    }}
2888  
2889   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines