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.45 by jsr166, Mon Jun 2 06:07:34 2014 UTC vs.
Revision 1.56 by jsr166, Mon Jun 2 22:20:32 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 345 | Line 349 | public class CompletableFutureTest exten
349          }
350      }
351      static final class IncFunction implements Function<Integer,Integer> {
352 +        final ExecutionMode m;
353          int invocationCount = 0;
354          Integer value;
355 +        IncFunction(ExecutionMode m) { this.m = m; }
356          public Integer apply(Integer x) {
357 +            m.checkExecutionMode();
358              invocationCount++;
359              return value = inc(x);
360          }
361      }
362      static final class SubtractAction implements BiConsumer<Integer, Integer> {
363 +        final ExecutionMode m;
364          int invocationCount = 0;
365          Integer value;
366          // Check this action was invoked exactly once when result is computed.
367 +        SubtractAction(ExecutionMode m) { this.m = m; }
368          public void accept(Integer x, Integer y) {
369 +            m.checkExecutionMode();
370              invocationCount++;
371              value = subtract(x, y);
372          }
373      }
374      static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
375 +        final ExecutionMode m;
376          int invocationCount = 0;
377          Integer value;
378          // Check this action was invoked exactly once when result is computed.
379 +        SubtractFunction(ExecutionMode m) { this.m = m; }
380          public Integer apply(Integer x, Integer y) {
381 +            m.checkExecutionMode();
382              invocationCount++;
383              return value = subtract(x, y);
384          }
385      }
386      static final class Noop implements Runnable {
387 +        final ExecutionMode m;
388          int invocationCount = 0;
389 +        Noop(ExecutionMode m) { this.m = m; }
390          public void run() {
391 +            m.checkExecutionMode();
392              invocationCount++;
393          }
394      }
395  
396      static final class FailingSupplier implements Supplier<Integer> {
397 +        final ExecutionMode m;
398          int invocationCount = 0;
399 +        FailingSupplier(ExecutionMode m) { this.m = m; }
400          public Integer get() {
401 +            m.checkExecutionMode();
402              invocationCount++;
403              throw new CFException();
404          }
405      }
406      static final class FailingConsumer implements Consumer<Integer> {
407 +        final ExecutionMode m;
408          int invocationCount = 0;
409 +        FailingConsumer(ExecutionMode m) { this.m = m; }
410          public void accept(Integer x) {
411 +            m.checkExecutionMode();
412              invocationCount++;
413              throw new CFException();
414          }
415      }
416      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
417 +        final ExecutionMode m;
418          int invocationCount = 0;
419 +        FailingBiConsumer(ExecutionMode m) { this.m = m; }
420          public void accept(Integer x, Integer y) {
421 +            m.checkExecutionMode();
422              invocationCount++;
423              throw new CFException();
424          }
425      }
426      static final class FailingFunction implements Function<Integer, Integer> {
427 +        final ExecutionMode m;
428          int invocationCount = 0;
429 +        FailingFunction(ExecutionMode m) { this.m = m; }
430          public Integer apply(Integer x) {
431 +            m.checkExecutionMode();
432              invocationCount++;
433              throw new CFException();
434          }
435      }
436      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
437 +        final ExecutionMode m;
438          int invocationCount = 0;
439 +        FailingBiFunction(ExecutionMode m) { this.m = m; }
440          public Integer apply(Integer x, Integer y) {
441 +            m.checkExecutionMode();
442              invocationCount++;
443              throw new CFException();
444          }
445      }
446 <    static final class FailingNoop implements Runnable {
446 >    static final class FailingRunnable implements Runnable {
447 >        final ExecutionMode m;
448          int invocationCount = 0;
449 +        FailingRunnable(ExecutionMode m) { this.m = m; }
450          public void run() {
451 +            m.checkExecutionMode();
452              invocationCount++;
453              throw new CFException();
454          }
# Line 422 | Line 456 | public class CompletableFutureTest exten
456  
457      static final class CompletableFutureInc
458          implements Function<Integer, CompletableFuture<Integer>> {
459 +        final ExecutionMode m;
460          int invocationCount = 0;
461 +        CompletableFutureInc(ExecutionMode m) { this.m = m; }
462          public CompletableFuture<Integer> apply(Integer x) {
463 +            m.checkExecutionMode();
464              invocationCount++;
465              CompletableFuture<Integer> f = new CompletableFuture<>();
466              f.complete(inc(x));
# Line 433 | Line 470 | public class CompletableFutureTest exten
470  
471      static final class FailingCompletableFutureFunction
472          implements Function<Integer, CompletableFuture<Integer>> {
473 +        final ExecutionMode m;
474          int invocationCount = 0;
475 +        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
476          public CompletableFuture<Integer> apply(Integer x) {
477 +            m.checkExecutionMode();
478              invocationCount++;
479              throw new CFException();
480          }
# Line 442 | Line 482 | public class CompletableFutureTest exten
482  
483      // Used for explicit executor tests
484      static final class ThreadExecutor implements Executor {
485 <        AtomicInteger count = new AtomicInteger(0);
485 >        final AtomicInteger count = new AtomicInteger(0);
486 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
487 >        static boolean startedCurrentThread() {
488 >            return Thread.currentThread().getThreadGroup() == tg;
489 >        }
490  
491          public void execute(Runnable r) {
492              count.getAndIncrement();
493 <            new Thread(r).start();
450 <        }
451 <    }
452 <
453 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
454 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
455 <    }
456 <
457 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
458 <        int invocationCount = 0;
459 <        public Integer apply(Integer x, Throwable t) {
460 <            invocationCount++;
461 <            return (t == null) ? two : three;
493 >            new Thread(tg, r).start();
494          }
495      }
496  
# Line 468 | Line 500 | public class CompletableFutureTest exten
500       */
501      enum ExecutionMode {
502          DEFAULT {
503 +            public void checkExecutionMode() {
504 +                assertNull(ForkJoinTask.getPool());
505 +            }
506 +            public <T> CompletableFuture<Void> thenRun
507 +                (CompletableFuture<T> f, Runnable a) {
508 +                return f.thenRun(a);
509 +            }
510 +            public <T> CompletableFuture<Void> thenAccept
511 +                (CompletableFuture<T> f, Consumer<? super T> a) {
512 +                return f.thenAccept(a);
513 +            }
514 +            public <T,U> CompletableFuture<U> thenApply
515 +                (CompletableFuture<T> f, Function<? super T,U> a) {
516 +                return f.thenApply(a);
517 +            }
518 +            public <T,U> CompletableFuture<U> thenCompose
519 +                (CompletableFuture<T> f,
520 +                 Function<? super T,? extends CompletionStage<U>> a) {
521 +                return f.thenCompose(a);
522 +            }
523 +            public <T,U> CompletableFuture<U> handle
524 +                (CompletableFuture<T> f,
525 +                 BiFunction<? super T,Throwable,? extends U> a) {
526 +                return f.handle(a);
527 +            }
528 +            public <T> CompletableFuture<T> whenComplete
529 +                (CompletableFuture<T> f,
530 +                 BiConsumer<? super T,? super Throwable> a) {
531 +                return f.whenComplete(a);
532 +            }
533              public <T,U> CompletableFuture<Void> runAfterBoth
534                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
535                  return f.runAfterBoth(g, a);
# Line 484 | Line 546 | public class CompletableFutureTest exten
546                   BiFunction<? super T,? super U,? extends V> a) {
547                  return f.thenCombine(g, a);
548              }
549 <            public <T,U> CompletableFuture<U> applyToEither
549 >            public <T> CompletableFuture<Void> runAfterEither
550                  (CompletableFuture<T> f,
551 <                 CompletionStage<? extends T> g,
552 <                 Function<? super T,U> a) {
553 <                return f.applyToEither(g, a);
551 >                 CompletionStage<?> g,
552 >                 java.lang.Runnable a) {
553 >                return f.runAfterEither(g, a);
554              }
555              public <T> CompletableFuture<Void> acceptEither
556                  (CompletableFuture<T> f,
# Line 496 | Line 558 | public class CompletableFutureTest exten
558                   Consumer<? super T> a) {
559                  return f.acceptEither(g, a);
560              }
561 <            public <T> CompletableFuture<Void> runAfterEither
561 >            public <T,U> CompletableFuture<U> applyToEither
562                  (CompletableFuture<T> f,
563 <                 CompletionStage<?> g,
564 <                 java.lang.Runnable a) {
565 <                return f.runAfterEither(g, a);
563 >                 CompletionStage<? extends T> g,
564 >                 Function<? super T,U> a) {
565 >                return f.applyToEither(g, a);
566 >            }
567 >        },
568 >
569 >        ASYNC {
570 >            public void checkExecutionMode() {
571 >                assertSame(ForkJoinPool.commonPool(),
572 >                           ForkJoinTask.getPool());
573 >            }
574 >            public <T> CompletableFuture<Void> thenRun
575 >                (CompletableFuture<T> f, Runnable a) {
576 >                return f.thenRunAsync(a);
577 >            }
578 >            public <T> CompletableFuture<Void> thenAccept
579 >                (CompletableFuture<T> f, Consumer<? super T> a) {
580 >                return f.thenAcceptAsync(a);
581 >            }
582 >            public <T,U> CompletableFuture<U> thenApply
583 >                (CompletableFuture<T> f, Function<? super T,U> a) {
584 >                return f.thenApplyAsync(a);
585              }
586              public <T,U> CompletableFuture<U> thenCompose
587                  (CompletableFuture<T> f,
588                   Function<? super T,? extends CompletionStage<U>> a) {
589 <                return f.thenCompose(a);
589 >                return f.thenComposeAsync(a);
590 >            }
591 >            public <T,U> CompletableFuture<U> handle
592 >                (CompletableFuture<T> f,
593 >                 BiFunction<? super T,Throwable,? extends U> a) {
594 >                return f.handleAsync(a);
595              }
596              public <T> CompletableFuture<T> whenComplete
597                  (CompletableFuture<T> f,
598                   BiConsumer<? super T,? super Throwable> a) {
599 <                return f.whenComplete(a);
599 >                return f.whenCompleteAsync(a);
600              }
515        },
516
517        DEFAULT_ASYNC {
601              public <T,U> CompletableFuture<Void> runAfterBoth
602                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
603                  return f.runAfterBothAsync(g, a);
# Line 531 | Line 614 | public class CompletableFutureTest exten
614                   BiFunction<? super T,? super U,? extends V> a) {
615                  return f.thenCombineAsync(g, a);
616              }
617 <            public <T,U> CompletableFuture<U> applyToEither
617 >            public <T> CompletableFuture<Void> runAfterEither
618                  (CompletableFuture<T> f,
619 <                 CompletionStage<? extends T> g,
620 <                 Function<? super T,U> a) {
621 <                return f.applyToEitherAsync(g, a);
619 >                 CompletionStage<?> g,
620 >                 java.lang.Runnable a) {
621 >                return f.runAfterEitherAsync(g, a);
622              }
623              public <T> CompletableFuture<Void> acceptEither
624                  (CompletableFuture<T> f,
# Line 543 | Line 626 | public class CompletableFutureTest exten
626                   Consumer<? super T> a) {
627                  return f.acceptEitherAsync(g, a);
628              }
629 <            public <T> CompletableFuture<Void> runAfterEither
629 >            public <T,U> CompletableFuture<U> applyToEither
630                  (CompletableFuture<T> f,
631 <                 CompletionStage<?> g,
632 <                 java.lang.Runnable a) {
633 <                return f.runAfterEitherAsync(g, a);
631 >                 CompletionStage<? extends T> g,
632 >                 Function<? super T,U> a) {
633 >                return f.applyToEitherAsync(g, a);
634 >            }
635 >        },
636 >
637 >        EXECUTOR {
638 >            public void checkExecutionMode() {
639 >                assertTrue(ThreadExecutor.startedCurrentThread());
640 >            }
641 >            public <T> CompletableFuture<Void> thenRun
642 >                (CompletableFuture<T> f, Runnable a) {
643 >                return f.thenRunAsync(a, new ThreadExecutor());
644 >            }
645 >            public <T> CompletableFuture<Void> thenAccept
646 >                (CompletableFuture<T> f, Consumer<? super T> a) {
647 >                return f.thenAcceptAsync(a, new ThreadExecutor());
648 >            }
649 >            public <T,U> CompletableFuture<U> thenApply
650 >                (CompletableFuture<T> f, Function<? super T,U> a) {
651 >                return f.thenApplyAsync(a, new ThreadExecutor());
652              }
653              public <T,U> CompletableFuture<U> thenCompose
654                  (CompletableFuture<T> f,
655                   Function<? super T,? extends CompletionStage<U>> a) {
656 <                return f.thenComposeAsync(a);
656 >                return f.thenComposeAsync(a, new ThreadExecutor());
657 >            }
658 >            public <T,U> CompletableFuture<U> handle
659 >                (CompletableFuture<T> f,
660 >                 BiFunction<? super T,Throwable,? extends U> a) {
661 >                return f.handleAsync(a, new ThreadExecutor());
662              }
663              public <T> CompletableFuture<T> whenComplete
664                  (CompletableFuture<T> f,
665                   BiConsumer<? super T,? super Throwable> a) {
666 <                return f.whenCompleteAsync(a);
666 >                return f.whenCompleteAsync(a, new ThreadExecutor());
667              }
562        },
563
564        EXECUTOR {
668              public <T,U> CompletableFuture<Void> runAfterBoth
669                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
670                  return f.runAfterBothAsync(g, a, new ThreadExecutor());
# Line 578 | Line 681 | public class CompletableFutureTest exten
681                   BiFunction<? super T,? super U,? extends V> a) {
682                  return f.thenCombineAsync(g, a, new ThreadExecutor());
683              }
581            public <T,U> CompletableFuture<U> applyToEither
582                (CompletableFuture<T> f,
583                 CompletionStage<? extends T> g,
584                 Function<? super T,U> a) {
585                return f.applyToEitherAsync(g, a, new ThreadExecutor());
586            }
587            public <T> CompletableFuture<Void> acceptEither
588                (CompletableFuture<T> f,
589                 CompletionStage<? extends T> g,
590                 Consumer<? super T> a) {
591                return f.acceptEitherAsync(g, a, new ThreadExecutor());
592            }
684              public <T> CompletableFuture<Void> runAfterEither
685                  (CompletableFuture<T> f,
686                   CompletionStage<?> g,
687                   java.lang.Runnable a) {
688                  return f.runAfterEitherAsync(g, a, new ThreadExecutor());
689              }
690 <            public <T,U> CompletableFuture<U> thenCompose
690 >            public <T> CompletableFuture<Void> acceptEither
691                  (CompletableFuture<T> f,
692 <                 Function<? super T,? extends CompletionStage<U>> a) {
693 <                return f.thenComposeAsync(a, new ThreadExecutor());
692 >                 CompletionStage<? extends T> g,
693 >                 Consumer<? super T> a) {
694 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
695              }
696 <            public <T> CompletableFuture<T> whenComplete
696 >            public <T,U> CompletableFuture<U> applyToEither
697                  (CompletableFuture<T> f,
698 <                 BiConsumer<? super T,? super Throwable> a) {
699 <                return f.whenCompleteAsync(a, new ThreadExecutor());
698 >                 CompletionStage<? extends T> g,
699 >                 Function<? super T,U> a) {
700 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
701              }
702          };
703  
704 +        public abstract void checkExecutionMode();
705 +        public abstract <T> CompletableFuture<Void> thenRun
706 +            (CompletableFuture<T> f, Runnable a);
707 +        public abstract <T> CompletableFuture<Void> thenAccept
708 +            (CompletableFuture<T> f, Consumer<? super T> a);
709 +        public abstract <T,U> CompletableFuture<U> thenApply
710 +            (CompletableFuture<T> f, Function<? super T,U> a);
711 +        public abstract <T,U> CompletableFuture<U> thenCompose
712 +            (CompletableFuture<T> f,
713 +             Function<? super T,? extends CompletionStage<U>> a);
714 +        public abstract <T,U> CompletableFuture<U> handle
715 +            (CompletableFuture<T> f,
716 +             BiFunction<? super T,Throwable,? extends U> a);
717 +        public abstract <T> CompletableFuture<T> whenComplete
718 +            (CompletableFuture<T> f,
719 +             BiConsumer<? super T,? super Throwable> a);
720          public abstract <T,U> CompletableFuture<Void> runAfterBoth
721              (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
722          public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
# Line 618 | Line 727 | public class CompletableFutureTest exten
727              (CompletableFuture<T> f,
728               CompletionStage<? extends U> g,
729               BiFunction<? super T,? super U,? extends V> a);
621        public abstract <T,U> CompletableFuture<U> applyToEither
622            (CompletableFuture<T> f,
623             CompletionStage<? extends T> g,
624             Function<? super T,U> a);
625        public abstract <T> CompletableFuture<Void> acceptEither
626            (CompletableFuture<T> f,
627             CompletionStage<? extends T> g,
628             Consumer<? super T> a);
730          public abstract <T> CompletableFuture<Void> runAfterEither
731              (CompletableFuture<T> f,
732               CompletionStage<?> g,
733               java.lang.Runnable a);
734 <        public abstract <T,U> CompletableFuture<U> thenCompose
734 >        public abstract <T> CompletableFuture<Void> acceptEither
735              (CompletableFuture<T> f,
736 <             Function<? super T,? extends CompletionStage<U>> a);
737 <        public abstract <T> CompletableFuture<T> whenComplete
736 >             CompletionStage<? extends T> g,
737 >             Consumer<? super T> a);
738 >        public abstract <T,U> CompletableFuture<U> applyToEither
739              (CompletableFuture<T> f,
740 <             BiConsumer<? super T,? super Throwable> a);
740 >             CompletionStage<? extends T> g,
741 >             Function<? super T,U> a);
742 >    }
743  
744 +    /**
745 +     * exceptionally action is not invoked when source completes
746 +     * normally, and source result is propagated
747 +     */
748 +    public void testExceptionally_normalCompletion() {
749 +        for (boolean createIncomplete : new boolean[] { true, false })
750 +        for (Integer v1 : new Integer[] { 1, null })
751 +    {
752 +        final AtomicInteger a = new AtomicInteger(0);
753 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
754 +        if (!createIncomplete) f.complete(v1);
755 +        final CompletableFuture<Integer> g = f.exceptionally
756 +            ((Throwable t) -> {
757 +                // Should not be called
758 +                a.getAndIncrement();
759 +                throw new AssertionError();
760 +            });
761 +        if (createIncomplete) f.complete(v1);
762 +
763 +        checkCompletedNormally(g, v1);
764 +        checkCompletedNormally(f, v1);
765 +        assertEquals(0, a.get());
766 +    }}
767  
641    }
768  
769      /**
770       * exceptionally action completes with function value on source
771 <     * exception; otherwise with source value
771 >     * exception
772       */
773 <    public void testExceptionally() {
774 <        CompletableFuture<Integer> f = new CompletableFuture<>();
775 <        ExceptionToInteger r = new ExceptionToInteger();
776 <        CompletableFuture<Integer> g = f.exceptionally(r);
777 <        f.completeExceptionally(new CFException());
778 <        checkCompletedNormally(g, three);
773 >    public void testExceptionally_exceptionalCompletion() {
774 >        for (boolean createIncomplete : new boolean[] { true, false })
775 >        for (Integer v1 : new Integer[] { 1, null })
776 >    {
777 >        final AtomicInteger a = new AtomicInteger(0);
778 >        final CFException ex = new CFException();
779 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
780 >        if (!createIncomplete) f.completeExceptionally(ex);
781 >        final CompletableFuture<Integer> g = f.exceptionally
782 >            ((Throwable t) -> {
783 >                threadAssertSame(t, ex);
784 >                a.getAndIncrement();
785 >                return v1;
786 >            });
787 >        if (createIncomplete) f.completeExceptionally(ex);
788  
789 <        f = new CompletableFuture<>();
790 <        r = new ExceptionToInteger();
791 <        g = f.exceptionally(r);
792 <        f.complete(one);
793 <        checkCompletedNormally(g, one);
794 <    }
789 >        checkCompletedNormally(g, v1);
790 >        assertEquals(1, a.get());
791 >    }}
792 >
793 >    public void testExceptionally_exceptionalCompletionActionFailed() {
794 >        for (boolean createIncomplete : new boolean[] { true, false })
795 >        for (Integer v1 : new Integer[] { 1, null })
796 >    {
797 >        final AtomicInteger a = new AtomicInteger(0);
798 >        final CFException ex1 = new CFException();
799 >        final CFException ex2 = new CFException();
800 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
801 >        if (!createIncomplete) f.completeExceptionally(ex1);
802 >        final CompletableFuture<Integer> g = f.exceptionally
803 >            ((Throwable t) -> {
804 >                threadAssertSame(t, ex1);
805 >                a.getAndIncrement();
806 >                throw ex2;
807 >            });
808 >        if (createIncomplete) f.completeExceptionally(ex1);
809 >
810 >        checkCompletedWithWrappedCFException(g, ex2);
811 >        assertEquals(1, a.get());
812 >    }}
813  
814      /**
815 <     * handle action completes normally with function value on either
816 <     * normal or exceptional completion of source
815 >     * handle action completes normally with function value on normal
816 >     * completion of source
817       */
818 <    public void testHandle() {
819 <        CompletableFuture<Integer> f, g;
820 <        IntegerHandler r;
818 >    public void testHandle_normalCompletion() {
819 >        for (ExecutionMode m : ExecutionMode.values())
820 >        for (boolean createIncomplete : new boolean[] { true, false })
821 >        for (Integer v1 : new Integer[] { 1, null })
822 >    {
823 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
824 >        final AtomicInteger a = new AtomicInteger(0);
825 >        if (!createIncomplete) f.complete(v1);
826 >        final CompletableFuture<Integer> g = m.handle
827 >            (f,
828 >             (Integer x, Throwable t) -> {
829 >                threadAssertSame(x, v1);
830 >                threadAssertNull(t);
831 >                a.getAndIncrement();
832 >                return inc(v1);
833 >            });
834 >        if (createIncomplete) f.complete(v1);
835  
836 <        f = new CompletableFuture<>();
837 <        f.completeExceptionally(new CFException());
838 <        g = f.handle(r = new IntegerHandler());
839 <        assertEquals(1, r.invocationCount);
673 <        assertEquals(1, r.invocationCount);
674 <        checkCompletedNormally(g, three);
836 >        checkCompletedNormally(g, inc(v1));
837 >        checkCompletedNormally(f, v1);
838 >        assertEquals(1, a.get());
839 >    }}
840  
841 <        f = new CompletableFuture<>();
842 <        g = f.handle(r = new IntegerHandler());
843 <        assertEquals(0, r.invocationCount);
844 <        f.completeExceptionally(new CFException());
845 <        checkCompletedNormally(g, three);
846 <        assertEquals(1, r.invocationCount);
841 >    /**
842 >     * handle action completes normally with function value on
843 >     * exceptional completion of source
844 >     */
845 >    public void testHandle_exceptionalCompletion() {
846 >        for (ExecutionMode m : ExecutionMode.values())
847 >        for (boolean createIncomplete : new boolean[] { true, false })
848 >        for (Integer v1 : new Integer[] { 1, null })
849 >    {
850 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
851 >        final AtomicInteger a = new AtomicInteger(0);
852 >        final CFException ex = new CFException();
853 >        if (!createIncomplete) f.completeExceptionally(ex);
854 >        final CompletableFuture<Integer> g = m.handle
855 >            (f,
856 >             (Integer x, Throwable t) -> {
857 >                threadAssertNull(x);
858 >                threadAssertSame(t, ex);
859 >                a.getAndIncrement();
860 >                return v1;
861 >            });
862 >        if (createIncomplete) f.completeExceptionally(ex);
863  
864 <        f = new CompletableFuture<>();
865 <        f.complete(one);
866 <        g = f.handle(r = new IntegerHandler());
867 <        assertEquals(1, r.invocationCount);
687 <        checkCompletedNormally(g, two);
864 >        checkCompletedNormally(g, v1);
865 >        checkCompletedWithWrappedCFException(f, ex);
866 >        assertEquals(1, a.get());
867 >    }}
868  
869 <        f = new CompletableFuture<>();
870 <        g = f.handle(r = new IntegerHandler());
871 <        assertEquals(0, r.invocationCount);
872 <        f.complete(one);
873 <        assertEquals(1, r.invocationCount);
874 <        checkCompletedNormally(g, two);
875 <    }
869 >    /**
870 >     * handle action completes normally with function value on
871 >     * cancelled source
872 >     */
873 >    public void testHandle_sourceCancelled() {
874 >        for (ExecutionMode m : ExecutionMode.values())
875 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
876 >        for (boolean createIncomplete : new boolean[] { true, false })
877 >        for (Integer v1 : new Integer[] { 1, null })
878 >    {
879 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
880 >        final AtomicInteger a = new AtomicInteger(0);
881 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
882 >        final CompletableFuture<Integer> g = m.handle
883 >            (f,
884 >             (Integer x, Throwable t) -> {
885 >                threadAssertNull(x);
886 >                threadAssertTrue(t instanceof CancellationException);
887 >                a.getAndIncrement();
888 >                return v1;
889 >            });
890 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
891 >
892 >        checkCompletedNormally(g, v1);
893 >        checkCancelled(f);
894 >        assertEquals(1, a.get());
895 >    }}
896 >
897 >    /**
898 >     * handle result completes exceptionally if action does
899 >     */
900 >    public void testHandle_sourceFailedActionFailed() {
901 >        for (ExecutionMode m : ExecutionMode.values())
902 >        for (boolean createIncomplete : new boolean[] { true, false })
903 >    {
904 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
905 >        final AtomicInteger a = new AtomicInteger(0);
906 >        final CFException ex1 = new CFException();
907 >        final CFException ex2 = new CFException();
908 >        if (!createIncomplete) f.completeExceptionally(ex1);
909 >        final CompletableFuture<Integer> g = m.handle
910 >            (f,
911 >             (Integer x, Throwable t) -> {
912 >                threadAssertNull(x);
913 >                threadAssertSame(ex1, t);
914 >                a.getAndIncrement();
915 >                throw ex2;
916 >            });
917 >        if (createIncomplete) f.completeExceptionally(ex1);
918 >
919 >        checkCompletedWithWrappedCFException(g, ex2);
920 >        checkCompletedWithWrappedCFException(f, ex1);
921 >        assertEquals(1, a.get());
922 >    }}
923 >
924 >    public void testHandle_sourceCompletedNormallyActionFailed() {
925 >        for (ExecutionMode m : ExecutionMode.values())
926 >        for (boolean createIncomplete : new boolean[] { true, false })
927 >        for (Integer v1 : new Integer[] { 1, null })
928 >    {
929 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
930 >        final AtomicInteger a = new AtomicInteger(0);
931 >        final CFException ex = new CFException();
932 >        if (!createIncomplete) f.complete(v1);
933 >        final CompletableFuture<Integer> g = m.handle
934 >            (f,
935 >             (Integer x, Throwable t) -> {
936 >                threadAssertSame(x, v1);
937 >                threadAssertNull(t);
938 >                a.getAndIncrement();
939 >                throw ex;
940 >            });
941 >        if (createIncomplete) f.complete(v1);
942 >
943 >        checkCompletedWithWrappedCFException(g, ex);
944 >        checkCompletedNormally(f, v1);
945 >        assertEquals(1, a.get());
946 >    }}
947  
948      /**
949       * runAsync completes after running Runnable
950       */
951      public void testRunAsync() {
952 <        Noop r = new Noop();
952 >        Noop r = new Noop(ExecutionMode.ASYNC);
953          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
954          assertNull(f.join());
955          assertEquals(1, r.invocationCount);
# Line 709 | Line 960 | public class CompletableFutureTest exten
960       * runAsync with executor completes after running Runnable
961       */
962      public void testRunAsync2() {
963 <        Noop r = new Noop();
963 >        Noop r = new Noop(ExecutionMode.EXECUTOR);
964          ThreadExecutor exec = new ThreadExecutor();
965          CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
966          assertNull(f.join());
# Line 722 | Line 973 | public class CompletableFutureTest exten
973       * failing runAsync completes exceptionally after running Runnable
974       */
975      public void testRunAsync3() {
976 <        FailingNoop r = new FailingNoop();
976 >        FailingRunnable r = new FailingRunnable(ExecutionMode.ASYNC);
977          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
978          checkCompletedWithWrappedCFException(f);
979          assertEquals(1, r.invocationCount);
# Line 752 | Line 1003 | public class CompletableFutureTest exten
1003       * Failing supplyAsync completes exceptionally
1004       */
1005      public void testSupplyAsync3() {
1006 <        FailingSupplier r = new FailingSupplier();
1006 >        FailingSupplier r = new FailingSupplier(ExecutionMode.ASYNC);
1007          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1008          checkCompletedWithWrappedCFException(f);
1009          assertEquals(1, r.invocationCount);
# Line 763 | Line 1014 | public class CompletableFutureTest exten
1014      /**
1015       * thenRun result completes normally after normal completion of source
1016       */
1017 <    public void testThenRun() {
1018 <        CompletableFuture<Integer> f;
1019 <        CompletableFuture<Void> g;
1020 <        Noop r;
1017 >    public void testThenRun_normalCompletion() {
1018 >        for (ExecutionMode m : ExecutionMode.values())
1019 >        for (boolean createIncomplete : new boolean[] { true, false })
1020 >        for (Integer v1 : new Integer[] { 1, null })
1021 >    {
1022 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1023 >        final Noop r = new Noop(m);
1024 >        if (!createIncomplete) f.complete(v1);
1025 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1026 >        if (createIncomplete) {
1027 >            checkIncomplete(g);
1028 >            f.complete(v1);
1029 >        }
1030  
771        f = new CompletableFuture<>();
772        g = f.thenRun(r = new Noop());
773        f.complete(null);
774        checkCompletedNormally(g, null);
775        assertEquals(1, r.invocationCount);
776
777        f = new CompletableFuture<>();
778        f.complete(null);
779        g = f.thenRun(r = new Noop());
1031          checkCompletedNormally(g, null);
1032 +        checkCompletedNormally(f, v1);
1033          assertEquals(1, r.invocationCount);
1034 <    }
1034 >    }}
1035  
1036      /**
1037       * thenRun result completes exceptionally after exceptional
1038       * completion of source
1039       */
1040 <    public void testThenRun2() {
1041 <        CompletableFuture<Integer> f;
1042 <        CompletableFuture<Void> g;
1043 <        Noop r;
1044 <
1045 <        f = new CompletableFuture<>();
1046 <        g = f.thenRun(r = new Noop());
1047 <        f.completeExceptionally(new CFException());
1048 <        checkCompletedWithWrappedCFException(g);
1049 <        assertEquals(0, r.invocationCount);
1040 >    public void testThenRun_exceptionalCompletion() {
1041 >        for (ExecutionMode m : ExecutionMode.values())
1042 >        for (boolean createIncomplete : new boolean[] { true, false })
1043 >    {
1044 >        final CFException ex = new CFException();
1045 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1046 >        final Noop r = new Noop(m);
1047 >        if (!createIncomplete) f.completeExceptionally(ex);
1048 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1049 >        if (createIncomplete) {
1050 >            checkIncomplete(g);
1051 >            f.completeExceptionally(ex);
1052 >        }
1053  
1054 <        f = new CompletableFuture<>();
1055 <        f.completeExceptionally(new CFException());
801 <        g = f.thenRun(r = new Noop());
802 <        checkCompletedWithWrappedCFException(g);
1054 >        checkCompletedWithWrappedCFException(g, ex);
1055 >        checkCompletedWithWrappedCFException(f, ex);
1056          assertEquals(0, r.invocationCount);
1057 <    }
1057 >    }}
1058  
1059      /**
1060 <     * thenRun result completes exceptionally if action does
1060 >     * thenRun result completes exceptionally if source cancelled
1061       */
1062 <    public void testThenRun3() {
1063 <        CompletableFuture<Integer> f;
1064 <        CompletableFuture<Void> g;
1065 <        FailingNoop r;
1066 <
1067 <        f = new CompletableFuture<>();
1068 <        g = f.thenRun(r = new FailingNoop());
1069 <        f.complete(null);
1070 <        checkCompletedWithWrappedCFException(g);
1062 >    public void testThenRun_sourceCancelled() {
1063 >        for (ExecutionMode m : ExecutionMode.values())
1064 >        for (boolean createIncomplete : new boolean[] { true, false })
1065 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1066 >    {
1067 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1068 >        final Noop r = new Noop(m);
1069 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1070 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1071 >        if (createIncomplete) {
1072 >            checkIncomplete(g);
1073 >            assertTrue(f.cancel(mayInterruptIfRunning));
1074 >        }
1075  
1076 <        f = new CompletableFuture<>();
1077 <        f.complete(null);
1078 <        g = f.thenRun(r = new FailingNoop());
1079 <        checkCompletedWithWrappedCFException(g);
823 <    }
1076 >        checkCompletedWithWrappedCancellationException(g);
1077 >        checkCancelled(f);
1078 >        assertEquals(0, r.invocationCount);
1079 >    }}
1080  
1081      /**
1082 <     * thenRun result completes exceptionally if source cancelled
1082 >     * thenRun result completes exceptionally if action does
1083       */
1084 <    public void testThenRun4() {
1085 <        CompletableFuture<Integer> f;
1086 <        CompletableFuture<Void> g;
1087 <        Noop r;
1088 <
1089 <        f = new CompletableFuture<>();
1090 <        g = f.thenRun(r = new Noop());
1091 <        assertTrue(f.cancel(true));
1092 <        checkCompletedWithWrappedCancellationException(g);
1084 >    public void testThenRun_actionFailed() {
1085 >        for (ExecutionMode m : ExecutionMode.values())
1086 >        for (boolean createIncomplete : new boolean[] { true, false })
1087 >        for (Integer v1 : new Integer[] { 1, null })
1088 >    {
1089 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1090 >        final FailingRunnable r = new FailingRunnable(m);
1091 >        if (!createIncomplete) f.complete(v1);
1092 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1093 >        if (createIncomplete) {
1094 >            checkIncomplete(g);
1095 >            f.complete(v1);
1096 >        }
1097  
1098 <        f = new CompletableFuture<>();
1099 <        assertTrue(f.cancel(true));
1100 <        g = f.thenRun(r = new Noop());
841 <        checkCompletedWithWrappedCancellationException(g);
842 <    }
1098 >        checkCompletedWithWrappedCFException(g);
1099 >        checkCompletedNormally(f, v1);
1100 >    }}
1101  
1102      /**
1103       * thenApply result completes normally after normal completion of source
1104       */
1105 <    public void testThenApply() {
1106 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1107 <        CompletableFuture<Integer> g = f.thenApply(inc);
1108 <        f.complete(one);
1109 <        checkCompletedNormally(g, two);
1110 <    }
1105 >    public void testThenApply_normalCompletion() {
1106 >        for (ExecutionMode m : ExecutionMode.values())
1107 >        for (boolean createIncomplete : new boolean[] { true, false })
1108 >        for (Integer v1 : new Integer[] { 1, null })
1109 >    {
1110 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1111 >        final IncFunction r = new IncFunction(m);
1112 >        if (!createIncomplete) f.complete(v1);
1113 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1114 >        if (createIncomplete) {
1115 >            checkIncomplete(g);
1116 >            f.complete(v1);
1117 >        }
1118 >
1119 >        checkCompletedNormally(g, inc(v1));
1120 >        checkCompletedNormally(f, v1);
1121 >        assertEquals(1, r.invocationCount);
1122 >    }}
1123  
1124      /**
1125       * thenApply result completes exceptionally after exceptional
1126       * completion of source
1127       */
1128 <    public void testThenApply2() {
1129 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1130 <        CompletableFuture<Integer> g = f.thenApply(inc);
1131 <        f.completeExceptionally(new CFException());
1132 <        checkCompletedWithWrappedCFException(g);
1133 <    }
1128 >    public void testThenApply_exceptionalCompletion() {
1129 >        for (ExecutionMode m : ExecutionMode.values())
1130 >        for (boolean createIncomplete : new boolean[] { true, false })
1131 >    {
1132 >        final CFException ex = new CFException();
1133 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1134 >        final IncFunction r = new IncFunction(m);
1135 >        if (!createIncomplete) f.completeExceptionally(ex);
1136 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1137 >        if (createIncomplete) {
1138 >            checkIncomplete(g);
1139 >            f.completeExceptionally(ex);
1140 >        }
1141  
1142 <    /**
1143 <     * thenApply result completes exceptionally if action does
1144 <     */
1145 <    public void testThenApply3() {
869 <        CompletableFuture<Integer> f = new CompletableFuture<>();
870 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
871 <        f.complete(one);
872 <        checkCompletedWithWrappedCFException(g);
873 <    }
1142 >        checkCompletedWithWrappedCFException(g, ex);
1143 >        checkCompletedWithWrappedCFException(f, ex);
1144 >        assertEquals(0, r.invocationCount);
1145 >    }}
1146  
1147      /**
1148       * thenApply result completes exceptionally if source cancelled
1149       */
1150 <    public void testThenApply4() {
1151 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1152 <        CompletableFuture<Integer> g = f.thenApply(inc);
1153 <        assertTrue(f.cancel(true));
1150 >    public void testThenApply_sourceCancelled() {
1151 >        for (ExecutionMode m : ExecutionMode.values())
1152 >        for (boolean createIncomplete : new boolean[] { true, false })
1153 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1154 >    {
1155 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1156 >        final IncFunction r = new IncFunction(m);
1157 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1158 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1159 >        if (createIncomplete) {
1160 >            checkIncomplete(g);
1161 >            assertTrue(f.cancel(mayInterruptIfRunning));
1162 >        }
1163 >
1164          checkCompletedWithWrappedCancellationException(g);
1165 <    }
1165 >        checkCancelled(f);
1166 >        assertEquals(0, r.invocationCount);
1167 >    }}
1168 >
1169 >    /**
1170 >     * thenApply result completes exceptionally if action does
1171 >     */
1172 >    public void testThenApply_actionFailed() {
1173 >        for (ExecutionMode m : ExecutionMode.values())
1174 >        for (boolean createIncomplete : new boolean[] { true, false })
1175 >        for (Integer v1 : new Integer[] { 1, null })
1176 >    {
1177 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 >        final FailingFunction r = new FailingFunction(m);
1179 >        if (!createIncomplete) f.complete(v1);
1180 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1181 >        if (createIncomplete) {
1182 >            checkIncomplete(g);
1183 >            f.complete(v1);
1184 >        }
1185 >
1186 >        checkCompletedWithWrappedCFException(g);
1187 >        checkCompletedNormally(f, v1);
1188 >    }}
1189  
1190      /**
1191       * thenAccept result completes normally after normal completion of source
1192       */
1193 <    public void testThenAccept() {
1194 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1195 <        IncAction r = new IncAction();
1196 <        CompletableFuture<Void> g = f.thenAccept(r);
1197 <        f.complete(one);
1193 >    public void testThenAccept_normalCompletion() {
1194 >        for (ExecutionMode m : ExecutionMode.values())
1195 >        for (boolean createIncomplete : new boolean[] { true, false })
1196 >        for (Integer v1 : new Integer[] { 1, null })
1197 >    {
1198 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1199 >        final IncAction r = new IncAction();
1200 >        if (!createIncomplete) f.complete(v1);
1201 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1202 >        if (createIncomplete) {
1203 >            checkIncomplete(g);
1204 >            f.complete(v1);
1205 >        }
1206 >
1207          checkCompletedNormally(g, null);
1208 <        assertEquals(r.value, (Integer) 2);
1209 <    }
1208 >        checkCompletedNormally(f, v1);
1209 >        assertEquals(1, r.invocationCount);
1210 >        assertEquals(inc(v1), r.value);
1211 >    }}
1212  
1213      /**
1214       * thenAccept result completes exceptionally after exceptional
1215       * completion of source
1216       */
1217 <    public void testThenAccept2() {
1218 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1219 <        IncAction r = new IncAction();
1220 <        CompletableFuture<Void> g = f.thenAccept(r);
1221 <        f.completeExceptionally(new CFException());
1222 <        checkCompletedWithWrappedCFException(g);
1223 <    }
1217 >    public void testThenAccept_exceptionalCompletion() {
1218 >        for (ExecutionMode m : ExecutionMode.values())
1219 >        for (boolean createIncomplete : new boolean[] { true, false })
1220 >    {
1221 >        final CFException ex = new CFException();
1222 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1223 >        final IncAction r = new IncAction();
1224 >        if (!createIncomplete) f.completeExceptionally(ex);
1225 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1226 >        if (createIncomplete) {
1227 >            checkIncomplete(g);
1228 >            f.completeExceptionally(ex);
1229 >        }
1230 >
1231 >        checkCompletedWithWrappedCFException(g, ex);
1232 >        checkCompletedWithWrappedCFException(f, ex);
1233 >        assertEquals(0, r.invocationCount);
1234 >    }}
1235  
1236      /**
1237       * thenAccept result completes exceptionally if action does
1238       */
1239 <    public void testThenAccept3() {
1240 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1241 <        FailingConsumer r = new FailingConsumer();
1242 <        CompletableFuture<Void> g = f.thenAccept(r);
1243 <        f.complete(one);
1239 >    public void testThenAccept_actionFailed() {
1240 >        for (ExecutionMode m : ExecutionMode.values())
1241 >        for (boolean createIncomplete : new boolean[] { true, false })
1242 >        for (Integer v1 : new Integer[] { 1, null })
1243 >    {
1244 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1245 >        final FailingConsumer r = new FailingConsumer(m);
1246 >        if (!createIncomplete) f.complete(v1);
1247 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1248 >        if (createIncomplete) {
1249 >            checkIncomplete(g);
1250 >            f.complete(v1);
1251 >        }
1252 >
1253          checkCompletedWithWrappedCFException(g);
1254 <        assertEquals(1, r.invocationCount);
1255 <    }
1254 >        checkCompletedNormally(f, v1);
1255 >    }}
1256  
1257      /**
1258       * thenAccept result completes exceptionally if source cancelled
1259       */
1260 <    public void testThenAccept4() {
1261 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1262 <        IncAction r = new IncAction();
1263 <        CompletableFuture<Void> g = f.thenAccept(r);
1264 <        assertTrue(f.cancel(true));
1260 >    public void testThenAccept_sourceCancelled() {
1261 >        for (ExecutionMode m : ExecutionMode.values())
1262 >        for (boolean createIncomplete : new boolean[] { true, false })
1263 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1264 >    {
1265 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1266 >        final IncAction r = new IncAction();
1267 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1268 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1269 >        if (createIncomplete) {
1270 >            checkIncomplete(g);
1271 >            assertTrue(f.cancel(mayInterruptIfRunning));
1272 >        }
1273 >
1274          checkCompletedWithWrappedCancellationException(g);
1275 <    }
1275 >        checkCancelled(f);
1276 >        assertEquals(0, r.invocationCount);
1277 >    }}
1278  
1279      /**
1280       * thenCombine result completes normally after normal completion
1281       * of sources
1282       */
1283 <    public void testThenCombine_normalCompletion1() {
1283 >    public void testThenCombine_normalCompletion() {
1284 >        for (ExecutionMode m : ExecutionMode.values())
1285          for (boolean createIncomplete : new boolean[] { true, false })
1286          for (boolean fFirst : new boolean[] { true, false })
939        for (ExecutionMode m : ExecutionMode.values())
1287          for (Integer v1 : new Integer[] { 1, null })
1288 <        for (Integer v2 : new Integer[] { 2, null }) {
1289 <
1288 >        for (Integer v2 : new Integer[] { 2, null })
1289 >    {
1290          final CompletableFuture<Integer> f = new CompletableFuture<>();
1291          final CompletableFuture<Integer> g = new CompletableFuture<>();
1292 <        final SubtractFunction r = new SubtractFunction();
946 <        CompletableFuture<Integer> h = null;
947 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1292 >        final SubtractFunction r = new SubtractFunction(m);
1293  
1294 <        if (fFirst)
1295 <            f.complete(v1);
1296 <        else
1297 <            g.complete(v2);
1298 <        if (createIncomplete) checkIncomplete(h);
1299 <        assertEquals(0, r.invocationCount);
1300 <        if (!fFirst)
1301 <            f.complete(v1);
1302 <        else
958 <            g.complete(v2);
959 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1294 >        if (fFirst) f.complete(v1); else g.complete(v2);
1295 >        if (!createIncomplete)
1296 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1297 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1298 >        if (createIncomplete) {
1299 >            checkIncomplete(h);
1300 >            assertEquals(0, r.invocationCount);
1301 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1302 >        }
1303  
1304          checkCompletedNormally(h, subtract(v1, v2));
1305          checkCompletedNormally(f, v1);
1306          checkCompletedNormally(g, v2);
1307          assertEquals(1, r.invocationCount);
1308 <        }
966 <    }
1308 >    }}
1309  
1310      /**
1311       * thenCombine result completes exceptionally after exceptional
1312       * completion of either source
1313       */
1314 <    public void testThenCombine_exceptionalCompletion1() {
973 <        for (ExecutionMode m : ExecutionMode.values())
974 <        for (Integer v1 : new Integer[] { 1, null }) {
975 <
976 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
978 <        final SubtractFunction r = new SubtractFunction();
979 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
980 <        final CFException ex = new CFException();
981 <
982 <        f.completeExceptionally(ex);
983 <        checkIncomplete(h);
984 <        g.complete(v1);
985 <
986 <        checkCompletedWithWrappedCFException(h, ex);
987 <        checkCompletedWithWrappedCFException(f, ex);
988 <        assertEquals(0, r.invocationCount);
989 <        checkCompletedNormally(g, v1);
990 <        }
991 <    }
992 <
993 <    public void testThenCombine_exceptionalCompletion2() {
1314 >    public void testThenCombine_exceptionalCompletion() {
1315          for (ExecutionMode m : ExecutionMode.values())
1316 <        for (Integer v1 : new Integer[] { 1, null }) {
1317 <
1318 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
999 <        final SubtractFunction r = new SubtractFunction();
1000 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1001 <        final CFException ex = new CFException();
1002 <
1003 <        g.completeExceptionally(ex);
1004 <        checkIncomplete(h);
1005 <        f.complete(v1);
1006 <
1007 <        checkCompletedWithWrappedCFException(h, ex);
1008 <        checkCompletedWithWrappedCFException(g, ex);
1009 <        assertEquals(0, r.invocationCount);
1010 <        checkCompletedNormally(f, v1);
1011 <        }
1012 <    }
1013 <
1014 <    public void testThenCombine_exceptionalCompletion3() {
1015 <        for (ExecutionMode m : ExecutionMode.values())
1016 <        for (Integer v1 : new Integer[] { 1, null }) {
1017 <
1316 >        for (boolean createIncomplete : new boolean[] { true, false })
1317 >        for (boolean fFirst : new boolean[] { true, false })
1318 >        for (Integer v1 : new Integer[] { 1, null })
1319 >    {
1320          final CompletableFuture<Integer> f = new CompletableFuture<>();
1321          final CompletableFuture<Integer> g = new CompletableFuture<>();
1020        final SubtractFunction r = new SubtractFunction();
1322          final CFException ex = new CFException();
1323 +        final SubtractFunction r = new SubtractFunction(m);
1324  
1325 <        g.completeExceptionally(ex);
1326 <        f.complete(v1);
1325 >        (fFirst ? f : g).complete(v1);
1326 >        if (!createIncomplete)
1327 >            (!fFirst ? f : g).completeExceptionally(ex);
1328          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1329 <
1330 <        checkCompletedWithWrappedCFException(h, ex);
1331 <        checkCompletedWithWrappedCFException(g, ex);
1029 <        assertEquals(0, r.invocationCount);
1030 <        checkCompletedNormally(f, v1);
1329 >        if (createIncomplete) {
1330 >            checkIncomplete(h);
1331 >            (!fFirst ? f : g).completeExceptionally(ex);
1332          }
1032    }
1033
1034    public void testThenCombine_exceptionalCompletion4() {
1035        for (ExecutionMode m : ExecutionMode.values())
1036        for (Integer v1 : new Integer[] { 1, null }) {
1037
1038        final CompletableFuture<Integer> f = new CompletableFuture<>();
1039        final CompletableFuture<Integer> g = new CompletableFuture<>();
1040        final SubtractFunction r = new SubtractFunction();
1041        final CFException ex = new CFException();
1042
1043        f.completeExceptionally(ex);
1044        g.complete(v1);
1045        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1333  
1334          checkCompletedWithWrappedCFException(h, ex);
1048        checkCompletedWithWrappedCFException(f, ex);
1335          assertEquals(0, r.invocationCount);
1336 <        checkCompletedNormally(g, v1);
1337 <        }
1338 <    }
1336 >        checkCompletedNormally(fFirst ? f : g, v1);
1337 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1338 >    }}
1339  
1340      /**
1341       * thenCombine result completes exceptionally if action does
1342       */
1343 <    public void testThenCombine_actionFailed1() {
1343 >    public void testThenCombine_actionFailed() {
1344          for (ExecutionMode m : ExecutionMode.values())
1345 +        for (boolean fFirst : new boolean[] { true, false })
1346          for (Integer v1 : new Integer[] { 1, null })
1347 <        for (Integer v2 : new Integer[] { 2, null }) {
1348 <
1347 >        for (Integer v2 : new Integer[] { 2, null })
1348 >    {
1349          final CompletableFuture<Integer> f = new CompletableFuture<>();
1350          final CompletableFuture<Integer> g = new CompletableFuture<>();
1351 <        final FailingBiFunction r = new FailingBiFunction();
1351 >        final FailingBiFunction r = new FailingBiFunction(m);
1352          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1353  
1354 <        f.complete(v1);
1355 <        checkIncomplete(h);
1356 <        g.complete(v2);
1357 <
1358 <        checkCompletedWithWrappedCFException(h);
1359 <        checkCompletedNormally(f, v1);
1073 <        checkCompletedNormally(g, v2);
1354 >        if (fFirst) {
1355 >            f.complete(v1);
1356 >            g.complete(v2);
1357 >        } else {
1358 >            g.complete(v2);
1359 >            f.complete(v1);
1360          }
1075    }
1076
1077    public void testThenCombine_actionFailed2() {
1078        for (ExecutionMode m : ExecutionMode.values())
1079        for (Integer v1 : new Integer[] { 1, null })
1080        for (Integer v2 : new Integer[] { 2, null }) {
1081
1082        final CompletableFuture<Integer> f = new CompletableFuture<>();
1083        final CompletableFuture<Integer> g = new CompletableFuture<>();
1084        final FailingBiFunction r = new FailingBiFunction();
1085        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1086
1087        g.complete(v2);
1088        checkIncomplete(h);
1089        f.complete(v1);
1361  
1362          checkCompletedWithWrappedCFException(h);
1363          checkCompletedNormally(f, v1);
1364          checkCompletedNormally(g, v2);
1365 <        }
1095 <    }
1365 >    }}
1366  
1367      /**
1368       * thenCombine result completes exceptionally if either source cancelled
1369       */
1370 <    public void testThenCombine_sourceCancelled1() {
1370 >    public void testThenCombine_sourceCancelled() {
1371          for (ExecutionMode m : ExecutionMode.values())
1372          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1373 <        for (Integer v1 : new Integer[] { 1, null }) {
1374 <
1375 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1376 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1107 <        final SubtractFunction r = new SubtractFunction();
1108 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1109 <
1110 <        assertTrue(f.cancel(mayInterruptIfRunning));
1111 <        checkIncomplete(h);
1112 <        g.complete(v1);
1113 <
1114 <        checkCompletedWithWrappedCancellationException(h);
1115 <        checkCancelled(f);
1116 <        assertEquals(0, r.invocationCount);
1117 <        checkCompletedNormally(g, v1);
1118 <        }
1119 <    }
1120 <
1121 <    public void testThenCombine_sourceCancelled2() {
1122 <        for (ExecutionMode m : ExecutionMode.values())
1123 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1124 <        for (Integer v1 : new Integer[] { 1, null }) {
1125 <
1126 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1127 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1128 <        final SubtractFunction r = new SubtractFunction();
1129 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1130 <
1131 <        assertTrue(g.cancel(mayInterruptIfRunning));
1132 <        checkIncomplete(h);
1133 <        f.complete(v1);
1134 <
1135 <        checkCompletedWithWrappedCancellationException(h);
1136 <        checkCancelled(g);
1137 <        assertEquals(0, r.invocationCount);
1138 <        checkCompletedNormally(f, v1);
1139 <        }
1140 <    }
1141 <
1142 <    public void testThenCombine_sourceCancelled3() {
1143 <        for (ExecutionMode m : ExecutionMode.values())
1144 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1145 <        for (Integer v1 : new Integer[] { 1, null }) {
1146 <
1373 >        for (boolean createIncomplete : new boolean[] { true, false })
1374 >        for (boolean fFirst : new boolean[] { true, false })
1375 >        for (Integer v1 : new Integer[] { 1, null })
1376 >    {
1377          final CompletableFuture<Integer> f = new CompletableFuture<>();
1378          final CompletableFuture<Integer> g = new CompletableFuture<>();
1379 <        final SubtractFunction r = new SubtractFunction();
1379 >        final SubtractFunction r = new SubtractFunction(m);
1380  
1381 <        assertTrue(g.cancel(mayInterruptIfRunning));
1382 <        f.complete(v1);
1381 >        (fFirst ? f : g).complete(v1);
1382 >        if (!createIncomplete)
1383 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1384          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1385 <
1386 <        checkCompletedWithWrappedCancellationException(h);
1387 <        checkCancelled(g);
1157 <        assertEquals(0, r.invocationCount);
1158 <        checkCompletedNormally(f, v1);
1385 >        if (createIncomplete) {
1386 >            checkIncomplete(h);
1387 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1388          }
1160    }
1161
1162    public void testThenCombine_sourceCancelled4() {
1163        for (ExecutionMode m : ExecutionMode.values())
1164        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1165        for (Integer v1 : new Integer[] { 1, null }) {
1166
1167        final CompletableFuture<Integer> f = new CompletableFuture<>();
1168        final CompletableFuture<Integer> g = new CompletableFuture<>();
1169        final SubtractFunction r = new SubtractFunction();
1170
1171        assertTrue(f.cancel(mayInterruptIfRunning));
1172        g.complete(v1);
1173        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1389  
1390          checkCompletedWithWrappedCancellationException(h);
1391 <        checkCancelled(f);
1391 >        checkCancelled(!fFirst ? f : g);
1392          assertEquals(0, r.invocationCount);
1393 <        checkCompletedNormally(g, v1);
1394 <        }
1180 <    }
1393 >        checkCompletedNormally(fFirst ? f : g, v1);
1394 >    }}
1395  
1396      /**
1397       * thenAcceptBoth result completes normally after normal
1398       * completion of sources
1399       */
1400 <    public void testThenAcceptBoth_normalCompletion1() {
1187 <        for (ExecutionMode m : ExecutionMode.values())
1188 <        for (Integer v1 : new Integer[] { 1, null })
1189 <        for (Integer v2 : new Integer[] { 2, null }) {
1190 <
1191 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1192 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1193 <        final SubtractAction r = new SubtractAction();
1194 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1195 <
1196 <        f.complete(v1);
1197 <        checkIncomplete(h);
1198 <        assertEquals(0, r.invocationCount);
1199 <        g.complete(v2);
1200 <
1201 <        checkCompletedNormally(h, null);
1202 <        assertEquals(r.value, subtract(v1, v2));
1203 <        checkCompletedNormally(f, v1);
1204 <        checkCompletedNormally(g, v2);
1205 <        }
1206 <    }
1207 <
1208 <    public void testThenAcceptBoth_normalCompletion2() {
1209 <        for (ExecutionMode m : ExecutionMode.values())
1210 <        for (Integer v1 : new Integer[] { 1, null })
1211 <        for (Integer v2 : new Integer[] { 2, null }) {
1212 <
1213 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1214 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1215 <        final SubtractAction r = new SubtractAction();
1216 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1217 <
1218 <        g.complete(v2);
1219 <        checkIncomplete(h);
1220 <        assertEquals(0, r.invocationCount);
1221 <        f.complete(v1);
1222 <
1223 <        checkCompletedNormally(h, null);
1224 <        assertEquals(r.value, subtract(v1, v2));
1225 <        checkCompletedNormally(f, v1);
1226 <        checkCompletedNormally(g, v2);
1227 <        }
1228 <    }
1229 <
1230 <    public void testThenAcceptBoth_normalCompletion3() {
1400 >    public void testThenAcceptBoth_normalCompletion() {
1401          for (ExecutionMode m : ExecutionMode.values())
1402 +        for (boolean createIncomplete : new boolean[] { true, false })
1403 +        for (boolean fFirst : new boolean[] { true, false })
1404          for (Integer v1 : new Integer[] { 1, null })
1405 <        for (Integer v2 : new Integer[] { 2, null }) {
1406 <
1405 >        for (Integer v2 : new Integer[] { 2, null })
1406 >    {
1407          final CompletableFuture<Integer> f = new CompletableFuture<>();
1408          final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 <        final SubtractAction r = new SubtractAction();
1409 >        final SubtractAction r = new SubtractAction(m);
1410  
1411 <        g.complete(v2);
1412 <        f.complete(v1);
1411 >        if (fFirst) f.complete(v1); else g.complete(v2);
1412 >        if (!createIncomplete)
1413 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1414          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1415 <
1416 <        checkCompletedNormally(h, null);
1417 <        assertEquals(r.value, subtract(v1, v2));
1418 <        checkCompletedNormally(f, v1);
1246 <        checkCompletedNormally(g, v2);
1415 >        if (createIncomplete) {
1416 >            checkIncomplete(h);
1417 >            assertEquals(0, r.invocationCount);
1418 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1419          }
1248    }
1249
1250    public void testThenAcceptBoth_normalCompletion4() {
1251        for (ExecutionMode m : ExecutionMode.values())
1252        for (Integer v1 : new Integer[] { 1, null })
1253        for (Integer v2 : new Integer[] { 2, null }) {
1254
1255        final CompletableFuture<Integer> f = new CompletableFuture<>();
1256        final CompletableFuture<Integer> g = new CompletableFuture<>();
1257        final SubtractAction r = new SubtractAction();
1258
1259        f.complete(v1);
1260        g.complete(v2);
1261        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1420  
1421          checkCompletedNormally(h, null);
1422 <        assertEquals(r.value, subtract(v1, v2));
1422 >        assertEquals(subtract(v1, v2), r.value);
1423          checkCompletedNormally(f, v1);
1424          checkCompletedNormally(g, v2);
1425 <        }
1268 <    }
1425 >    }}
1426  
1427      /**
1428       * thenAcceptBoth result completes exceptionally after exceptional
1429       * completion of either source
1430       */
1431 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1431 >    public void testThenAcceptBoth_exceptionalCompletion() {
1432          for (ExecutionMode m : ExecutionMode.values())
1433 <        for (Integer v1 : new Integer[] { 1, null }) {
1434 <
1433 >        for (boolean createIncomplete : new boolean[] { true, false })
1434 >        for (boolean fFirst : new boolean[] { true, false })
1435 >        for (Integer v1 : new Integer[] { 1, null })
1436 >    {
1437          final CompletableFuture<Integer> f = new CompletableFuture<>();
1438          final CompletableFuture<Integer> g = new CompletableFuture<>();
1280        final SubtractAction r = new SubtractAction();
1281        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1439          final CFException ex = new CFException();
1440 +        final SubtractAction r = new SubtractAction(m);
1441  
1442 <        f.completeExceptionally(ex);
1443 <        checkIncomplete(h);
1444 <        g.complete(v1);
1287 <
1288 <        checkCompletedWithWrappedCFException(h, ex);
1289 <        checkCompletedWithWrappedCFException(f, ex);
1290 <        assertEquals(0, r.invocationCount);
1291 <        checkCompletedNormally(g, v1);
1292 <        }
1293 <    }
1294 <
1295 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1296 <        for (ExecutionMode m : ExecutionMode.values())
1297 <        for (Integer v1 : new Integer[] { 1, null }) {
1298 <
1299 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1300 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1301 <        final SubtractAction r = new SubtractAction();
1442 >        (fFirst ? f : g).complete(v1);
1443 >        if (!createIncomplete)
1444 >            (!fFirst ? f : g).completeExceptionally(ex);
1445          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1446 <        final CFException ex = new CFException();
1447 <
1448 <        g.completeExceptionally(ex);
1306 <        checkIncomplete(h);
1307 <        f.complete(v1);
1308 <
1309 <        checkCompletedWithWrappedCFException(h, ex);
1310 <        checkCompletedWithWrappedCFException(g, ex);
1311 <        assertEquals(0, r.invocationCount);
1312 <        checkCompletedNormally(f, v1);
1446 >        if (createIncomplete) {
1447 >            checkIncomplete(h);
1448 >            (!fFirst ? f : g).completeExceptionally(ex);
1449          }
1314    }
1315
1316    public void testThenAcceptBoth_exceptionalCompletion3() {
1317        for (ExecutionMode m : ExecutionMode.values())
1318        for (Integer v1 : new Integer[] { 1, null }) {
1319
1320        final CompletableFuture<Integer> f = new CompletableFuture<>();
1321        final CompletableFuture<Integer> g = new CompletableFuture<>();
1322        final SubtractAction r = new SubtractAction();
1323        final CFException ex = new CFException();
1324
1325        g.completeExceptionally(ex);
1326        f.complete(v1);
1327        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1450  
1451          checkCompletedWithWrappedCFException(h, ex);
1330        checkCompletedWithWrappedCFException(g, ex);
1452          assertEquals(0, r.invocationCount);
1453 <        checkCompletedNormally(f, v1);
1454 <        }
1455 <    }
1335 <
1336 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1337 <        for (ExecutionMode m : ExecutionMode.values())
1338 <        for (Integer v1 : new Integer[] { 1, null }) {
1339 <
1340 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1341 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1342 <        final SubtractAction r = new SubtractAction();
1343 <        final CFException ex = new CFException();
1344 <
1345 <        f.completeExceptionally(ex);
1346 <        g.complete(v1);
1347 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1348 <
1349 <        checkCompletedWithWrappedCFException(h, ex);
1350 <        checkCompletedWithWrappedCFException(f, ex);
1351 <        assertEquals(0, r.invocationCount);
1352 <        checkCompletedNormally(g, v1);
1353 <        }
1354 <    }
1453 >        checkCompletedNormally(fFirst ? f : g, v1);
1454 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1455 >    }}
1456  
1457      /**
1458       * thenAcceptBoth result completes exceptionally if action does
1459       */
1460 <    public void testThenAcceptBoth_actionFailed1() {
1460 >    public void testThenAcceptBoth_actionFailed() {
1461          for (ExecutionMode m : ExecutionMode.values())
1462 +        for (boolean fFirst : new boolean[] { true, false })
1463          for (Integer v1 : new Integer[] { 1, null })
1464 <        for (Integer v2 : new Integer[] { 2, null }) {
1465 <
1464 >        for (Integer v2 : new Integer[] { 2, null })
1465 >    {
1466          final CompletableFuture<Integer> f = new CompletableFuture<>();
1467          final CompletableFuture<Integer> g = new CompletableFuture<>();
1468 <        final FailingBiConsumer r = new FailingBiConsumer();
1468 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1469          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1470  
1471 <        f.complete(v1);
1472 <        checkIncomplete(h);
1473 <        g.complete(v2);
1474 <
1475 <        checkCompletedWithWrappedCFException(h);
1476 <        checkCompletedNormally(f, v1);
1375 <        checkCompletedNormally(g, v2);
1471 >        if (fFirst) {
1472 >            f.complete(v1);
1473 >            g.complete(v2);
1474 >        } else {
1475 >            g.complete(v2);
1476 >            f.complete(v1);
1477          }
1377    }
1378
1379    public void testThenAcceptBoth_actionFailed2() {
1380        for (ExecutionMode m : ExecutionMode.values())
1381        for (Integer v1 : new Integer[] { 1, null })
1382        for (Integer v2 : new Integer[] { 2, null }) {
1383
1384        final CompletableFuture<Integer> f = new CompletableFuture<>();
1385        final CompletableFuture<Integer> g = new CompletableFuture<>();
1386        final FailingBiConsumer r = new FailingBiConsumer();
1387        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1388
1389        g.complete(v2);
1390        checkIncomplete(h);
1391        f.complete(v1);
1478  
1479          checkCompletedWithWrappedCFException(h);
1480          checkCompletedNormally(f, v1);
1481          checkCompletedNormally(g, v2);
1482 <        }
1397 <    }
1482 >    }}
1483  
1484      /**
1485       * thenAcceptBoth result completes exceptionally if either source cancelled
1486       */
1487 <    public void testThenAcceptBoth_sourceCancelled1() {
1403 <        for (ExecutionMode m : ExecutionMode.values())
1404 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1405 <        for (Integer v1 : new Integer[] { 1, null }) {
1406 <
1407 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 <        final SubtractAction r = new SubtractAction();
1410 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1411 <
1412 <        assertTrue(f.cancel(mayInterruptIfRunning));
1413 <        checkIncomplete(h);
1414 <        g.complete(v1);
1415 <
1416 <        checkCompletedWithWrappedCancellationException(h);
1417 <        checkCancelled(f);
1418 <        assertEquals(0, r.invocationCount);
1419 <        checkCompletedNormally(g, v1);
1420 <        }
1421 <    }
1422 <
1423 <    public void testThenAcceptBoth_sourceCancelled2() {
1424 <        for (ExecutionMode m : ExecutionMode.values())
1425 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1426 <        for (Integer v1 : new Integer[] { 1, null }) {
1427 <
1428 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1429 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1430 <        final SubtractAction r = new SubtractAction();
1431 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1432 <
1433 <        assertTrue(g.cancel(mayInterruptIfRunning));
1434 <        checkIncomplete(h);
1435 <        f.complete(v1);
1436 <
1437 <        checkCompletedWithWrappedCancellationException(h);
1438 <        checkCancelled(g);
1439 <        assertEquals(0, r.invocationCount);
1440 <        checkCompletedNormally(f, v1);
1441 <        }
1442 <    }
1443 <
1444 <    public void testThenAcceptBoth_sourceCancelled3() {
1487 >    public void testThenAcceptBoth_sourceCancelled() {
1488          for (ExecutionMode m : ExecutionMode.values())
1489          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490 <        for (Integer v1 : new Integer[] { 1, null }) {
1491 <
1490 >        for (boolean createIncomplete : new boolean[] { true, false })
1491 >        for (boolean fFirst : new boolean[] { true, false })
1492 >        for (Integer v1 : new Integer[] { 1, null })
1493 >    {
1494          final CompletableFuture<Integer> f = new CompletableFuture<>();
1495          final CompletableFuture<Integer> g = new CompletableFuture<>();
1496 <        final SubtractAction r = new SubtractAction();
1496 >        final SubtractAction r = new SubtractAction(m);
1497  
1498 <        assertTrue(g.cancel(mayInterruptIfRunning));
1499 <        f.complete(v1);
1498 >        (fFirst ? f : g).complete(v1);
1499 >        if (!createIncomplete)
1500 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1501          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1502 <
1503 <        checkCompletedWithWrappedCancellationException(h);
1504 <        checkCancelled(g);
1459 <        assertEquals(0, r.invocationCount);
1460 <        checkCompletedNormally(f, v1);
1502 >        if (createIncomplete) {
1503 >            checkIncomplete(h);
1504 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1505          }
1462    }
1463
1464    public void testThenAcceptBoth_sourceCancelled4() {
1465        for (ExecutionMode m : ExecutionMode.values())
1466        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1467        for (Integer v1 : new Integer[] { 1, null }) {
1468
1469        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471        final SubtractAction r = new SubtractAction();
1472
1473        assertTrue(f.cancel(mayInterruptIfRunning));
1474        g.complete(v1);
1475        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1506  
1507          checkCompletedWithWrappedCancellationException(h);
1508 <        checkCancelled(f);
1508 >        checkCancelled(!fFirst ? f : g);
1509          assertEquals(0, r.invocationCount);
1510 <        checkCompletedNormally(g, v1);
1511 <        }
1482 <    }
1510 >        checkCompletedNormally(fFirst ? f : g, v1);
1511 >    }}
1512  
1513      /**
1514       * runAfterBoth result completes normally after normal
1515       * completion of sources
1516       */
1517 <    public void testRunAfterBoth_normalCompletion1() {
1489 <        for (ExecutionMode m : ExecutionMode.values())
1490 <        for (Integer v1 : new Integer[] { 1, null })
1491 <        for (Integer v2 : new Integer[] { 2, null }) {
1492 <
1493 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1494 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1495 <        final Noop r = new Noop();
1496 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1497 <
1498 <        f.complete(v1);
1499 <        checkIncomplete(h);
1500 <        assertEquals(0, r.invocationCount);
1501 <        g.complete(v2);
1502 <
1503 <        checkCompletedNormally(h, null);
1504 <        assertEquals(1, r.invocationCount);
1505 <        checkCompletedNormally(f, v1);
1506 <        checkCompletedNormally(g, v2);
1507 <        }
1508 <    }
1509 <
1510 <    public void testRunAfterBoth_normalCompletion2() {
1511 <        for (ExecutionMode m : ExecutionMode.values())
1512 <        for (Integer v1 : new Integer[] { 1, null })
1513 <        for (Integer v2 : new Integer[] { 2, null }) {
1514 <
1515 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1517 <        final Noop r = new Noop();
1518 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1519 <
1520 <        g.complete(v2);
1521 <        checkIncomplete(h);
1522 <        assertEquals(0, r.invocationCount);
1523 <        f.complete(v1);
1524 <
1525 <        checkCompletedNormally(h, null);
1526 <        assertEquals(1, r.invocationCount);
1527 <        checkCompletedNormally(f, v1);
1528 <        checkCompletedNormally(g, v2);
1529 <        }
1530 <    }
1531 <
1532 <    public void testRunAfterBoth_normalCompletion3() {
1517 >    public void testRunAfterBoth_normalCompletion() {
1518          for (ExecutionMode m : ExecutionMode.values())
1519 +        for (boolean createIncomplete : new boolean[] { true, false })
1520 +        for (boolean fFirst : new boolean[] { true, false })
1521          for (Integer v1 : new Integer[] { 1, null })
1522 <        for (Integer v2 : new Integer[] { 2, null }) {
1523 <
1522 >        for (Integer v2 : new Integer[] { 2, null })
1523 >    {
1524          final CompletableFuture<Integer> f = new CompletableFuture<>();
1525          final CompletableFuture<Integer> g = new CompletableFuture<>();
1526 <        final Noop r = new Noop();
1526 >        final Noop r = new Noop(m);
1527  
1528 <        g.complete(v2);
1529 <        f.complete(v1);
1528 >        if (fFirst) f.complete(v1); else g.complete(v2);
1529 >        if (!createIncomplete)
1530 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1531          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1532 <
1533 <        checkCompletedNormally(h, null);
1534 <        assertEquals(1, r.invocationCount);
1535 <        checkCompletedNormally(f, v1);
1548 <        checkCompletedNormally(g, v2);
1532 >        if (createIncomplete) {
1533 >            checkIncomplete(h);
1534 >            assertEquals(0, r.invocationCount);
1535 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1536          }
1550    }
1551
1552    public void testRunAfterBoth_normalCompletion4() {
1553        for (ExecutionMode m : ExecutionMode.values())
1554        for (Integer v1 : new Integer[] { 1, null })
1555        for (Integer v2 : new Integer[] { 2, null }) {
1556
1557        final CompletableFuture<Integer> f = new CompletableFuture<>();
1558        final CompletableFuture<Integer> g = new CompletableFuture<>();
1559        final Noop r = new Noop();
1560
1561        f.complete(v1);
1562        g.complete(v2);
1563        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1537  
1538          checkCompletedNormally(h, null);
1539          assertEquals(1, r.invocationCount);
1540          checkCompletedNormally(f, v1);
1541          checkCompletedNormally(g, v2);
1542 <        }
1570 <    }
1542 >    }}
1543  
1544      /**
1545       * runAfterBoth result completes exceptionally after exceptional
1546       * completion of either source
1547       */
1548 <    public void testRunAfterBoth_exceptionalCompletion1() {
1577 <        for (ExecutionMode m : ExecutionMode.values())
1578 <        for (Integer v1 : new Integer[] { 1, null }) {
1579 <
1580 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1581 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1582 <        final Noop r = new Noop();
1583 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 <        final CFException ex = new CFException();
1585 <
1586 <        f.completeExceptionally(ex);
1587 <        checkIncomplete(h);
1588 <        g.complete(v1);
1589 <
1590 <        checkCompletedWithWrappedCFException(h, ex);
1591 <        checkCompletedWithWrappedCFException(f, ex);
1592 <        assertEquals(0, r.invocationCount);
1593 <        checkCompletedNormally(g, v1);
1594 <        }
1595 <    }
1596 <
1597 <    public void testRunAfterBoth_exceptionalCompletion2() {
1548 >    public void testRunAfterBoth_exceptionalCompletion() {
1549          for (ExecutionMode m : ExecutionMode.values())
1550 <        for (Integer v1 : new Integer[] { 1, null }) {
1551 <
1552 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1553 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1603 <        final Noop r = new Noop();
1604 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1605 <        final CFException ex = new CFException();
1606 <
1607 <        g.completeExceptionally(ex);
1608 <        checkIncomplete(h);
1609 <        f.complete(v1);
1610 <
1611 <        checkCompletedWithWrappedCFException(h, ex);
1612 <        checkCompletedWithWrappedCFException(g, ex);
1613 <        assertEquals(0, r.invocationCount);
1614 <        checkCompletedNormally(f, v1);
1615 <        }
1616 <    }
1617 <
1618 <    public void testRunAfterBoth_exceptionalCompletion3() {
1619 <        for (ExecutionMode m : ExecutionMode.values())
1620 <        for (Integer v1 : new Integer[] { 1, null }) {
1621 <
1550 >        for (boolean createIncomplete : new boolean[] { true, false })
1551 >        for (boolean fFirst : new boolean[] { true, false })
1552 >        for (Integer v1 : new Integer[] { 1, null })
1553 >    {
1554          final CompletableFuture<Integer> f = new CompletableFuture<>();
1555          final CompletableFuture<Integer> g = new CompletableFuture<>();
1624        final Noop r = new Noop();
1556          final CFException ex = new CFException();
1557 +        final Noop r = new Noop(m);
1558  
1559 <        g.completeExceptionally(ex);
1560 <        f.complete(v1);
1559 >        (fFirst ? f : g).complete(v1);
1560 >        if (!createIncomplete)
1561 >            (!fFirst ? f : g).completeExceptionally(ex);
1562          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1563 <
1564 <        checkCompletedWithWrappedCFException(h, ex);
1565 <        checkCompletedWithWrappedCFException(g, ex);
1633 <        assertEquals(0, r.invocationCount);
1634 <        checkCompletedNormally(f, v1);
1563 >        if (createIncomplete) {
1564 >            checkIncomplete(h);
1565 >            (!fFirst ? f : g).completeExceptionally(ex);
1566          }
1636    }
1637
1638    public void testRunAfterBoth_exceptionalCompletion4() {
1639        for (ExecutionMode m : ExecutionMode.values())
1640        for (Integer v1 : new Integer[] { 1, null }) {
1641
1642        final CompletableFuture<Integer> f = new CompletableFuture<>();
1643        final CompletableFuture<Integer> g = new CompletableFuture<>();
1644        final Noop r = new Noop();
1645        final CFException ex = new CFException();
1646
1647        f.completeExceptionally(ex);
1648        g.complete(v1);
1649        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1567  
1568          checkCompletedWithWrappedCFException(h, ex);
1652        checkCompletedWithWrappedCFException(f, ex);
1569          assertEquals(0, r.invocationCount);
1570 <        checkCompletedNormally(g, v1);
1571 <        }
1572 <    }
1570 >        checkCompletedNormally(fFirst ? f : g, v1);
1571 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1572 >    }}
1573  
1574      /**
1575       * runAfterBoth result completes exceptionally if action does
1576       */
1577 <    public void testRunAfterBoth_actionFailed1() {
1577 >    public void testRunAfterBoth_actionFailed() {
1578          for (ExecutionMode m : ExecutionMode.values())
1579 +        for (boolean fFirst : new boolean[] { true, false })
1580          for (Integer v1 : new Integer[] { 1, null })
1581 <        for (Integer v2 : new Integer[] { 2, null }) {
1582 <
1581 >        for (Integer v2 : new Integer[] { 2, null })
1582 >    {
1583          final CompletableFuture<Integer> f = new CompletableFuture<>();
1584          final CompletableFuture<Integer> g = new CompletableFuture<>();
1585 <        final FailingNoop r = new FailingNoop();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1585 >        final FailingRunnable r = new FailingRunnable(m);
1586  
1587 <        f.complete(v1);
1588 <        checkIncomplete(h);
1589 <        g.complete(v2);
1590 <
1591 <        checkCompletedWithWrappedCFException(h);
1592 <        checkCompletedNormally(f, v1);
1593 <        checkCompletedNormally(g, v2);
1587 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1588 >        if (fFirst) {
1589 >            f.complete(v1);
1590 >            g.complete(v2);
1591 >        } else {
1592 >            g.complete(v2);
1593 >            f.complete(v1);
1594          }
1595 <    }
1680 <
1681 <    public void testRunAfterBoth_actionFailed2() {
1682 <        for (ExecutionMode m : ExecutionMode.values())
1683 <        for (Integer v1 : new Integer[] { 1, null })
1684 <        for (Integer v2 : new Integer[] { 2, null }) {
1595 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1596  
1597 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1598 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1688 <        final FailingNoop r = new FailingNoop();
1689 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1690 <
1691 <        g.complete(v2);
1692 <        checkIncomplete(h);
1693 <        f.complete(v1);
1694 <
1695 <        checkCompletedWithWrappedCFException(h);
1597 >        checkCompletedWithWrappedCFException(h1);
1598 >        checkCompletedWithWrappedCFException(h2);
1599          checkCompletedNormally(f, v1);
1600          checkCompletedNormally(g, v2);
1601 <        }
1699 <    }
1601 >    }}
1602  
1603      /**
1604       * runAfterBoth result completes exceptionally if either source cancelled
1605       */
1606 <    public void testRunAfterBoth_sourceCancelled1() {
1606 >    public void testRunAfterBoth_sourceCancelled() {
1607          for (ExecutionMode m : ExecutionMode.values())
1608          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1609 <        for (Integer v1 : new Integer[] { 1, null }) {
1610 <
1611 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1612 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1711 <        final Noop r = new Noop();
1712 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1713 <
1714 <        assertTrue(f.cancel(mayInterruptIfRunning));
1715 <        checkIncomplete(h);
1716 <        g.complete(v1);
1717 <
1718 <        checkCompletedWithWrappedCancellationException(h);
1719 <        checkCancelled(f);
1720 <        assertEquals(0, r.invocationCount);
1721 <        checkCompletedNormally(g, v1);
1722 <        }
1723 <    }
1724 <
1725 <    public void testRunAfterBoth_sourceCancelled2() {
1726 <        for (ExecutionMode m : ExecutionMode.values())
1727 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1728 <        for (Integer v1 : new Integer[] { 1, null }) {
1729 <
1609 >        for (boolean createIncomplete : new boolean[] { true, false })
1610 >        for (boolean fFirst : new boolean[] { true, false })
1611 >        for (Integer v1 : new Integer[] { 1, null })
1612 >    {
1613          final CompletableFuture<Integer> f = new CompletableFuture<>();
1614          final CompletableFuture<Integer> g = new CompletableFuture<>();
1615 <        final Noop r = new Noop();
1733 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1734 <
1735 <        assertTrue(g.cancel(mayInterruptIfRunning));
1736 <        checkIncomplete(h);
1737 <        f.complete(v1);
1738 <
1739 <        checkCompletedWithWrappedCancellationException(h);
1740 <        checkCancelled(g);
1741 <        assertEquals(0, r.invocationCount);
1742 <        checkCompletedNormally(f, v1);
1743 <        }
1744 <    }
1615 >        final Noop r = new Noop(m);
1616  
1746    public void testRunAfterBoth_sourceCancelled3() {
1747        for (ExecutionMode m : ExecutionMode.values())
1748        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1749        for (Integer v1 : new Integer[] { 1, null }) {
1617  
1618 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1619 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1620 <        final Noop r = new Noop();
1754 <
1755 <        assertTrue(g.cancel(mayInterruptIfRunning));
1756 <        f.complete(v1);
1618 >        (fFirst ? f : g).complete(v1);
1619 >        if (!createIncomplete)
1620 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1621          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1622 <
1623 <        checkCompletedWithWrappedCancellationException(h);
1624 <        checkCancelled(g);
1761 <        assertEquals(0, r.invocationCount);
1762 <        checkCompletedNormally(f, v1);
1622 >        if (createIncomplete) {
1623 >            checkIncomplete(h);
1624 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1625          }
1764    }
1765
1766    public void testRunAfterBoth_sourceCancelled4() {
1767        for (ExecutionMode m : ExecutionMode.values())
1768        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1769        for (Integer v1 : new Integer[] { 1, null }) {
1770
1771        final CompletableFuture<Integer> f = new CompletableFuture<>();
1772        final CompletableFuture<Integer> g = new CompletableFuture<>();
1773        final Noop r = new Noop();
1774
1775        assertTrue(f.cancel(mayInterruptIfRunning));
1776        g.complete(v1);
1777        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1626  
1627          checkCompletedWithWrappedCancellationException(h);
1628 <        checkCancelled(f);
1628 >        checkCancelled(!fFirst ? f : g);
1629          assertEquals(0, r.invocationCount);
1630 <        checkCompletedNormally(g, v1);
1631 <        }
1784 <    }
1630 >        checkCompletedNormally(fFirst ? f : g, v1);
1631 >    }}
1632  
1633      /**
1634       * applyToEither result completes normally after normal completion
1635       * of either source
1636       */
1637 <    public void testApplyToEither_normalCompletion1() {
1637 >    public void testApplyToEither_normalCompletion() {
1638          for (ExecutionMode m : ExecutionMode.values())
1639 +        for (boolean createIncomplete : new boolean[] { true, false })
1640 +        for (boolean fFirst : new boolean[] { true, false })
1641          for (Integer v1 : new Integer[] { 1, null })
1642 <        for (Integer v2 : new Integer[] { 2, null }) {
1643 <
1642 >        for (Integer v2 : new Integer[] { 2, null })
1643 >    {
1644          final CompletableFuture<Integer> f = new CompletableFuture<>();
1645          final CompletableFuture<Integer> g = new CompletableFuture<>();
1646 <        final IncFunction r = new IncFunction();
1798 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1646 >        final IncFunction r = new IncFunction(m);
1647  
1648 <        f.complete(v1);
1649 <        checkCompletedNormally(h, inc(v1));
1650 <        g.complete(v2);
1648 >        if (!createIncomplete)
1649 >            if (fFirst) f.complete(v1); else g.complete(v2);
1650 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1651 >        if (createIncomplete) {
1652 >            checkIncomplete(h);
1653 >            assertEquals(0, r.invocationCount);
1654 >            if (fFirst) f.complete(v1); else g.complete(v2);
1655 >        }
1656 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1657 >        if (!fFirst) f.complete(v1); else g.complete(v2);
1658  
1659          checkCompletedNormally(f, v1);
1660          checkCompletedNormally(g, v2);
1661 <        checkCompletedNormally(h, inc(v1));
1662 <        }
1808 <    }
1661 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1662 >    }}
1663  
1664 <    public void testApplyToEither_normalCompletion2() {
1664 >    public void testApplyToEither_normalCompletionBothAvailable() {
1665          for (ExecutionMode m : ExecutionMode.values())
1666 +        for (boolean fFirst : new boolean[] { true, false })
1667          for (Integer v1 : new Integer[] { 1, null })
1668 <        for (Integer v2 : new Integer[] { 2, null }) {
1669 <
1668 >        for (Integer v2 : new Integer[] { 2, null })
1669 >    {
1670          final CompletableFuture<Integer> f = new CompletableFuture<>();
1671          final CompletableFuture<Integer> g = new CompletableFuture<>();
1672 <        final IncFunction r = new IncFunction();
1818 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1672 >        final IncFunction r = new IncFunction(m);
1673  
1674 <        g.complete(v2);
1675 <        checkCompletedNormally(h, inc(v2));
1676 <        f.complete(v1);
1677 <
1678 <        checkCompletedNormally(f, v1);
1679 <        checkCompletedNormally(g, v2);
1826 <        checkCompletedNormally(h, inc(v2));
1674 >        if (fFirst) {
1675 >            f.complete(v1);
1676 >            g.complete(v2);
1677 >        } else {
1678 >            g.complete(v2);
1679 >            f.complete(v1);
1680          }
1828    }
1829    public void testApplyToEither_normalCompletion3() {
1830        for (ExecutionMode m : ExecutionMode.values())
1831        for (Integer v1 : new Integer[] { 1, null })
1832        for (Integer v2 : new Integer[] { 2, null }) {
1681  
1834        final CompletableFuture<Integer> f = new CompletableFuture<>();
1835        final CompletableFuture<Integer> g = new CompletableFuture<>();
1836        final IncFunction r = new IncFunction();
1837
1838        f.complete(v1);
1839        g.complete(v2);
1682          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1683  
1684          checkCompletedNormally(f, v1);
# Line 1846 | Line 1688 | public class CompletableFutureTest exten
1688          assertTrue(Objects.equals(h.join(), inc(v1)) ||
1689                     Objects.equals(h.join(), inc(v2)));
1690          assertEquals(1, r.invocationCount);
1691 <        }
1850 <    }
1691 >    }}
1692  
1693      /**
1694       * applyToEither result completes exceptionally after exceptional
# Line 1855 | Line 1696 | public class CompletableFutureTest exten
1696       */
1697      public void testApplyToEither_exceptionalCompletion1() {
1698          for (ExecutionMode m : ExecutionMode.values())
1699 <        for (Integer v1 : new Integer[] { 1, null }) {
1700 <
1699 >        for (boolean createIncomplete : new boolean[] { true, false })
1700 >        for (boolean fFirst : new boolean[] { true, false })
1701 >        for (Integer v1 : new Integer[] { 1, null })
1702 >    {
1703          final CompletableFuture<Integer> f = new CompletableFuture<>();
1704          final CompletableFuture<Integer> g = new CompletableFuture<>();
1862        final IncFunction r = new IncFunction();
1863        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1705          final CFException ex = new CFException();
1706 +        final IncFunction r = new IncFunction(m);
1707  
1708 <        f.completeExceptionally(ex);
1867 <        checkCompletedWithWrappedCFException(h, ex);
1868 <        g.complete(v1);
1869 <
1870 <        assertEquals(0, r.invocationCount);
1871 <        checkCompletedNormally(g, v1);
1872 <        checkCompletedWithWrappedCFException(f, ex);
1873 <        checkCompletedWithWrappedCFException(h, ex);
1874 <        }
1875 <    }
1876 <
1877 <    public void testApplyToEither_exceptionalCompletion2() {
1878 <        for (ExecutionMode m : ExecutionMode.values())
1879 <        for (Integer v1 : new Integer[] { 1, null }) {
1880 <
1881 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1882 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1883 <        final IncFunction r = new IncFunction();
1708 >        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1709          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1710 <        final CFException ex = new CFException();
1710 >        if (createIncomplete) {
1711 >            checkIncomplete(h);
1712 >            assertEquals(0, r.invocationCount);
1713 >            (fFirst ? f : g).completeExceptionally(ex);
1714 >        }
1715  
1887        g.completeExceptionally(ex);
1716          checkCompletedWithWrappedCFException(h, ex);
1717 <        f.complete(v1);
1717 >        (!fFirst ? f : g).complete(v1);
1718  
1719          assertEquals(0, r.invocationCount);
1720 <        checkCompletedNormally(f, v1);
1721 <        checkCompletedWithWrappedCFException(g, ex);
1720 >        checkCompletedNormally(!fFirst ? f : g, v1);
1721 >        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1722          checkCompletedWithWrappedCFException(h, ex);
1723 <        }
1896 <    }
1723 >    }}
1724  
1725 <    public void testApplyToEither_exceptionalCompletion3() {
1725 >    public void testApplyToEither_exceptionalCompletion2() {
1726          for (ExecutionMode m : ExecutionMode.values())
1727 <        for (Integer v1 : new Integer[] { 1, null }) {
1728 <
1727 >        for (boolean reverseArgs : new boolean[] { true, false })
1728 >        for (boolean fFirst : new boolean[] { true, false })
1729 >        for (Integer v1 : new Integer[] { 1, null })
1730 >    {
1731          final CompletableFuture<Integer> f = new CompletableFuture<>();
1732          final CompletableFuture<Integer> g = new CompletableFuture<>();
1733 <        final IncFunction r = new IncFunction();
1733 >        final IncFunction r1 = new IncFunction(m);
1734 >        final IncFunction r2 = new IncFunction(m);
1735          final CFException ex = new CFException();
1736 <
1737 <        g.completeExceptionally(ex);
1738 <        f.complete(v1);
1739 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1736 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1737 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1738 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1739 >        if (fFirst) {
1740 >            f.complete(v1);
1741 >            g.completeExceptionally(ex);
1742 >        } else {
1743 >            g.completeExceptionally(ex);
1744 >            f.complete(v1);
1745 >        }
1746 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1747  
1748          // unspecified behavior
1912        Integer v;
1749          try {
1750 <            assertEquals(h.join(), inc(v1));
1751 <            assertEquals(1, r.invocationCount);
1750 >            assertEquals(inc(v1), h1.join());
1751 >            assertEquals(1, r1.invocationCount);
1752          } catch (CompletionException ok) {
1753 <            checkCompletedWithWrappedCFException(h, ex);
1754 <            assertEquals(0, r.invocationCount);
1753 >            checkCompletedWithWrappedCFException(h1, ex);
1754 >            assertEquals(0, r1.invocationCount);
1755          }
1756  
1921        checkCompletedWithWrappedCFException(g, ex);
1922        checkCompletedNormally(f, v1);
1923        }
1924    }
1925
1926    public void testApplyToEither_exceptionalCompletion4() {
1927        for (ExecutionMode m : ExecutionMode.values())
1928        for (Integer v1 : new Integer[] { 1, null }) {
1929
1930        final CompletableFuture<Integer> f = new CompletableFuture<>();
1931        final CompletableFuture<Integer> g = new CompletableFuture<>();
1932        final IncFunction r = new IncFunction();
1933        final CFException ex = new CFException();
1934
1935        f.completeExceptionally(ex);
1936        g.complete(v1);
1937        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1938
1939        // unspecified behavior
1940        Integer v;
1757          try {
1758 <            assertEquals(h.join(), inc(v1));
1759 <            assertEquals(1, r.invocationCount);
1758 >            assertEquals(inc(v1), h2.join());
1759 >            assertEquals(1, r2.invocationCount);
1760          } catch (CompletionException ok) {
1761 <            checkCompletedWithWrappedCFException(h, ex);
1762 <            assertEquals(0, r.invocationCount);
1761 >            checkCompletedWithWrappedCFException(h2, ex);
1762 >            assertEquals(0, r2.invocationCount);
1763          }
1764  
1765 <        checkCompletedWithWrappedCFException(f, ex);
1766 <        checkCompletedNormally(g, v1);
1767 <        }
1952 <    }
1765 >        checkCompletedWithWrappedCFException(g, ex);
1766 >        checkCompletedNormally(f, v1);
1767 >    }}
1768  
1769      /**
1770       * applyToEither result completes exceptionally if action does
# Line 1957 | Line 1772 | public class CompletableFutureTest exten
1772      public void testApplyToEither_actionFailed1() {
1773          for (ExecutionMode m : ExecutionMode.values())
1774          for (Integer v1 : new Integer[] { 1, null })
1775 <        for (Integer v2 : new Integer[] { 2, null }) {
1776 <
1775 >        for (Integer v2 : new Integer[] { 2, null })
1776 >    {
1777          final CompletableFuture<Integer> f = new CompletableFuture<>();
1778          final CompletableFuture<Integer> g = new CompletableFuture<>();
1779 <        final FailingFunction r = new FailingFunction();
1779 >        final FailingFunction r = new FailingFunction(m);
1780          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1781  
1782          f.complete(v1);
# Line 1969 | Line 1784 | public class CompletableFutureTest exten
1784          g.complete(v2);
1785          checkCompletedNormally(f, v1);
1786          checkCompletedNormally(g, v2);
1787 <        }
1973 <    }
1787 >    }}
1788  
1789      public void testApplyToEither_actionFailed2() {
1790          for (ExecutionMode m : ExecutionMode.values())
1791          for (Integer v1 : new Integer[] { 1, null })
1792 <        for (Integer v2 : new Integer[] { 2, null }) {
1793 <
1792 >        for (Integer v2 : new Integer[] { 2, null })
1793 >    {
1794          final CompletableFuture<Integer> f = new CompletableFuture<>();
1795          final CompletableFuture<Integer> g = new CompletableFuture<>();
1796 <        final FailingFunction r = new FailingFunction();
1796 >        final FailingFunction r = new FailingFunction(m);
1797          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1798  
1799          g.complete(v2);
# Line 1987 | Line 1801 | public class CompletableFutureTest exten
1801          f.complete(v1);
1802          checkCompletedNormally(f, v1);
1803          checkCompletedNormally(g, v2);
1804 <        }
1991 <    }
1804 >    }}
1805  
1806      /**
1807       * applyToEither result completes exceptionally if either source cancelled
# Line 1996 | Line 1809 | public class CompletableFutureTest exten
1809      public void testApplyToEither_sourceCancelled1() {
1810          for (ExecutionMode m : ExecutionMode.values())
1811          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1812 <        for (Integer v1 : new Integer[] { 1, null }) {
1813 <
1812 >        for (boolean createIncomplete : new boolean[] { true, false })
1813 >        for (boolean fFirst : new boolean[] { true, false })
1814 >        for (Integer v1 : new Integer[] { 1, null })
1815 >    {
1816          final CompletableFuture<Integer> f = new CompletableFuture<>();
1817          final CompletableFuture<Integer> g = new CompletableFuture<>();
1818 <        final IncFunction r = new IncFunction();
1818 >        final IncFunction r = new IncFunction(m);
1819 >
1820 >        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1821          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1822 +        if (createIncomplete) {
1823 +            checkIncomplete(h);
1824 +            assertEquals(0, r.invocationCount);
1825 +            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1826 +        }
1827  
2006        assertTrue(f.cancel(mayInterruptIfRunning));
1828          checkCompletedWithWrappedCancellationException(h);
1829 <        g.complete(v1);
1829 >        (!fFirst ? f : g).complete(v1);
1830  
2010        checkCancelled(f);
1831          assertEquals(0, r.invocationCount);
1832 <        checkCompletedNormally(g, v1);
1832 >        checkCompletedNormally(!fFirst ? f : g, v1);
1833 >        checkCancelled(fFirst ? f : g);
1834          checkCompletedWithWrappedCancellationException(h);
1835 <        }
2015 <    }
1835 >    }}
1836  
1837      public void testApplyToEither_sourceCancelled2() {
1838          for (ExecutionMode m : ExecutionMode.values())
1839          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1840 <        for (Integer v1 : new Integer[] { 1, null }) {
1841 <
1840 >        for (boolean reverseArgs : new boolean[] { true, false })
1841 >        for (boolean fFirst : new boolean[] { true, false })
1842 >        for (Integer v1 : new Integer[] { 1, null })
1843 >    {
1844          final CompletableFuture<Integer> f = new CompletableFuture<>();
1845          final CompletableFuture<Integer> g = new CompletableFuture<>();
1846 <        final IncFunction r = new IncFunction();
1847 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1848 <
1849 <        assertTrue(g.cancel(mayInterruptIfRunning));
1850 <        checkCompletedWithWrappedCancellationException(h);
2029 <        f.complete(v1);
1846 >        final IncFunction r1 = new IncFunction(m);
1847 >        final IncFunction r2 = new IncFunction(m);
1848 >        final CFException ex = new CFException();
1849 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1850 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1851  
1852 <        checkCancelled(g);
1853 <        assertEquals(0, r.invocationCount);
1854 <        checkCompletedNormally(f, v1);
1855 <        checkCompletedWithWrappedCancellationException(h);
1852 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1853 >        if (fFirst) {
1854 >            f.complete(v1);
1855 >            assertTrue(g.cancel(mayInterruptIfRunning));
1856 >        } else {
1857 >            assertTrue(g.cancel(mayInterruptIfRunning));
1858 >            f.complete(v1);
1859          }
1860 <    }
2037 <
2038 <    public void testApplyToEither_sourceCancelled3() {
2039 <        for (ExecutionMode m : ExecutionMode.values())
2040 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2041 <        for (Integer v1 : new Integer[] { 1, null }) {
2042 <
2043 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2044 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2045 <        final IncFunction r = new IncFunction();
2046 <
2047 <        assertTrue(g.cancel(mayInterruptIfRunning));
2048 <        f.complete(v1);
2049 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1860 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1861  
1862          // unspecified behavior
2052        Integer v;
1863          try {
1864 <            assertEquals(h.join(), inc(v1));
1865 <            assertEquals(1, r.invocationCount);
1864 >            assertEquals(inc(v1), h1.join());
1865 >            assertEquals(1, r1.invocationCount);
1866          } catch (CompletionException ok) {
1867 <            checkCompletedWithWrappedCancellationException(h);
1868 <            assertEquals(0, r.invocationCount);
2059 <        }
2060 <
2061 <        checkCancelled(g);
2062 <        checkCompletedNormally(f, v1);
1867 >            checkCompletedWithWrappedCancellationException(h1);
1868 >            assertEquals(0, r1.invocationCount);
1869          }
2064    }
2065
2066    public void testApplyToEither_sourceCancelled4() {
2067        for (ExecutionMode m : ExecutionMode.values())
2068        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2069        for (Integer v1 : new Integer[] { 1, null }) {
1870  
2071        final CompletableFuture<Integer> f = new CompletableFuture<>();
2072        final CompletableFuture<Integer> g = new CompletableFuture<>();
2073        final IncFunction r = new IncFunction();
2074
2075        assertTrue(f.cancel(mayInterruptIfRunning));
2076        g.complete(v1);
2077        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2078
2079        // unspecified behavior
2080        Integer v;
1871          try {
1872 <            assertEquals(h.join(), inc(v1));
1873 <            assertEquals(1, r.invocationCount);
1872 >            assertEquals(inc(v1), h2.join());
1873 >            assertEquals(1, r2.invocationCount);
1874          } catch (CompletionException ok) {
1875 <            checkCompletedWithWrappedCancellationException(h);
1876 <            assertEquals(0, r.invocationCount);
1875 >            checkCompletedWithWrappedCancellationException(h2);
1876 >            assertEquals(0, r2.invocationCount);
1877          }
1878  
1879 <        checkCancelled(f);
1880 <        checkCompletedNormally(g, v1);
1881 <        }
2092 <    }
1879 >        checkCancelled(g);
1880 >        checkCompletedNormally(f, v1);
1881 >    }}
1882  
1883      /**
1884       * acceptEither result completes normally after normal completion
# Line 2098 | Line 1887 | public class CompletableFutureTest exten
1887      public void testAcceptEither_normalCompletion1() {
1888          for (ExecutionMode m : ExecutionMode.values())
1889          for (Integer v1 : new Integer[] { 1, null })
1890 <        for (Integer v2 : new Integer[] { 2, null }) {
1891 <
1890 >        for (Integer v2 : new Integer[] { 2, null })
1891 >    {
1892          final CompletableFuture<Integer> f = new CompletableFuture<>();
1893          final CompletableFuture<Integer> g = new CompletableFuture<>();
1894          final IncAction r = new IncAction();
# Line 2107 | Line 1896 | public class CompletableFutureTest exten
1896  
1897          f.complete(v1);
1898          checkCompletedNormally(h, null);
1899 <        assertEquals(r.value, inc(v1));
1899 >        assertEquals(inc(v1), r.value);
1900          g.complete(v2);
1901  
1902          checkCompletedNormally(f, v1);
1903          checkCompletedNormally(g, v2);
1904          checkCompletedNormally(h, null);
1905 <        }
2117 <    }
1905 >    }}
1906  
1907      public void testAcceptEither_normalCompletion2() {
1908          for (ExecutionMode m : ExecutionMode.values())
1909          for (Integer v1 : new Integer[] { 1, null })
1910 <        for (Integer v2 : new Integer[] { 2, null }) {
1911 <
1910 >        for (Integer v2 : new Integer[] { 2, null })
1911 >    {
1912          final CompletableFuture<Integer> f = new CompletableFuture<>();
1913          final CompletableFuture<Integer> g = new CompletableFuture<>();
1914          final IncAction r = new IncAction();
# Line 2128 | Line 1916 | public class CompletableFutureTest exten
1916  
1917          g.complete(v2);
1918          checkCompletedNormally(h, null);
1919 <        assertEquals(r.value, inc(v2));
1919 >        assertEquals(inc(v2), r.value);
1920          f.complete(v1);
1921  
1922          checkCompletedNormally(f, v1);
1923          checkCompletedNormally(g, v2);
1924          checkCompletedNormally(h, null);
1925 <        }
1926 <    }
1925 >    }}
1926 >
1927      public void testAcceptEither_normalCompletion3() {
1928          for (ExecutionMode m : ExecutionMode.values())
1929          for (Integer v1 : new Integer[] { 1, null })
1930 <        for (Integer v2 : new Integer[] { 2, null }) {
1931 <
1930 >        for (Integer v2 : new Integer[] { 2, null })
1931 >    {
1932          final CompletableFuture<Integer> f = new CompletableFuture<>();
1933          final CompletableFuture<Integer> g = new CompletableFuture<>();
1934          final IncAction r = new IncAction();
# Line 2156 | Line 1944 | public class CompletableFutureTest exten
1944          // unspecified behavior
1945          assertTrue(Objects.equals(r.value, inc(v1)) ||
1946                     Objects.equals(r.value, inc(v2)));
1947 <        }
2160 <    }
1947 >    }}
1948  
1949      /**
1950       * acceptEither result completes exceptionally after exceptional
# Line 2165 | Line 1952 | public class CompletableFutureTest exten
1952       */
1953      public void testAcceptEither_exceptionalCompletion1() {
1954          for (ExecutionMode m : ExecutionMode.values())
1955 <        for (Integer v1 : new Integer[] { 1, null }) {
1956 <
1955 >        for (Integer v1 : new Integer[] { 1, null })
1956 >    {
1957          final CompletableFuture<Integer> f = new CompletableFuture<>();
1958          final CompletableFuture<Integer> g = new CompletableFuture<>();
1959          final IncAction r = new IncAction();
# Line 2181 | Line 1968 | public class CompletableFutureTest exten
1968          checkCompletedNormally(g, v1);
1969          checkCompletedWithWrappedCFException(f, ex);
1970          checkCompletedWithWrappedCFException(h, ex);
1971 <        }
2185 <    }
1971 >    }}
1972  
1973      public void testAcceptEither_exceptionalCompletion2() {
1974          for (ExecutionMode m : ExecutionMode.values())
1975 <        for (Integer v1 : new Integer[] { 1, null }) {
1976 <
1975 >        for (Integer v1 : new Integer[] { 1, null })
1976 >    {
1977          final CompletableFuture<Integer> f = new CompletableFuture<>();
1978          final CompletableFuture<Integer> g = new CompletableFuture<>();
1979          final IncAction r = new IncAction();
# Line 2202 | Line 1988 | public class CompletableFutureTest exten
1988          checkCompletedNormally(f, v1);
1989          checkCompletedWithWrappedCFException(g, ex);
1990          checkCompletedWithWrappedCFException(h, ex);
1991 <        }
2206 <    }
1991 >    }}
1992  
1993      public void testAcceptEither_exceptionalCompletion3() {
1994          for (ExecutionMode m : ExecutionMode.values())
1995 <        for (Integer v1 : new Integer[] { 1, null }) {
1996 <
1995 >        for (Integer v1 : new Integer[] { 1, null })
1996 >    {
1997          final CompletableFuture<Integer> f = new CompletableFuture<>();
1998          final CompletableFuture<Integer> g = new CompletableFuture<>();
1999          final IncAction r = new IncAction();
# Line 2221 | Line 2006 | public class CompletableFutureTest exten
2006          // unspecified behavior
2007          Integer v;
2008          try {
2009 <            assertEquals(h.join(), null);
2009 >            assertNull(h.join());
2010              assertEquals(1, r.invocationCount);
2011              assertEquals(inc(v1), r.value);
2012          } catch (CompletionException ok) {
# Line 2231 | Line 2016 | public class CompletableFutureTest exten
2016  
2017          checkCompletedWithWrappedCFException(g, ex);
2018          checkCompletedNormally(f, v1);
2019 <        }
2235 <    }
2019 >    }}
2020  
2021      public void testAcceptEither_exceptionalCompletion4() {
2022          for (ExecutionMode m : ExecutionMode.values())
2023 <        for (Integer v1 : new Integer[] { 1, null }) {
2024 <
2023 >        for (Integer v1 : new Integer[] { 1, null })
2024 >    {
2025          final CompletableFuture<Integer> f = new CompletableFuture<>();
2026          final CompletableFuture<Integer> g = new CompletableFuture<>();
2027          final IncAction r = new IncAction();
# Line 2250 | Line 2034 | public class CompletableFutureTest exten
2034          // unspecified behavior
2035          Integer v;
2036          try {
2037 <            assertEquals(h.join(), null);
2037 >            assertNull(h.join());
2038              assertEquals(1, r.invocationCount);
2039              assertEquals(inc(v1), r.value);
2040          } catch (CompletionException ok) {
# Line 2260 | Line 2044 | public class CompletableFutureTest exten
2044  
2045          checkCompletedWithWrappedCFException(f, ex);
2046          checkCompletedNormally(g, v1);
2047 <        }
2264 <    }
2047 >    }}
2048  
2049      /**
2050       * acceptEither result completes exceptionally if action does
# Line 2269 | Line 2052 | public class CompletableFutureTest exten
2052      public void testAcceptEither_actionFailed1() {
2053          for (ExecutionMode m : ExecutionMode.values())
2054          for (Integer v1 : new Integer[] { 1, null })
2055 <        for (Integer v2 : new Integer[] { 2, null }) {
2056 <
2055 >        for (Integer v2 : new Integer[] { 2, null })
2056 >    {
2057          final CompletableFuture<Integer> f = new CompletableFuture<>();
2058          final CompletableFuture<Integer> g = new CompletableFuture<>();
2059 <        final FailingConsumer r = new FailingConsumer();
2059 >        final FailingConsumer r = new FailingConsumer(m);
2060          final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2061  
2062          f.complete(v1);
# Line 2281 | Line 2064 | public class CompletableFutureTest exten
2064          g.complete(v2);
2065          checkCompletedNormally(f, v1);
2066          checkCompletedNormally(g, v2);
2067 <        }
2285 <    }
2067 >    }}
2068  
2069      public void testAcceptEither_actionFailed2() {
2070          for (ExecutionMode m : ExecutionMode.values())
2071          for (Integer v1 : new Integer[] { 1, null })
2072 <        for (Integer v2 : new Integer[] { 2, null }) {
2073 <
2072 >        for (Integer v2 : new Integer[] { 2, null })
2073 >    {
2074          final CompletableFuture<Integer> f = new CompletableFuture<>();
2075          final CompletableFuture<Integer> g = new CompletableFuture<>();
2076 <        final FailingConsumer r = new FailingConsumer();
2076 >        final FailingConsumer r = new FailingConsumer(m);
2077          final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2078  
2079          g.complete(v2);
# Line 2299 | Line 2081 | public class CompletableFutureTest exten
2081          f.complete(v1);
2082          checkCompletedNormally(f, v1);
2083          checkCompletedNormally(g, v2);
2084 <        }
2303 <    }
2084 >    }}
2085  
2086      /**
2087       * acceptEither result completes exceptionally if either source cancelled
# Line 2308 | Line 2089 | public class CompletableFutureTest exten
2089      public void testAcceptEither_sourceCancelled1() {
2090          for (ExecutionMode m : ExecutionMode.values())
2091          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2092 <        for (Integer v1 : new Integer[] { 1, null }) {
2093 <
2092 >        for (Integer v1 : new Integer[] { 1, null })
2093 >    {
2094          final CompletableFuture<Integer> f = new CompletableFuture<>();
2095          final CompletableFuture<Integer> g = new CompletableFuture<>();
2096          final IncAction r = new IncAction();
# Line 2323 | Line 2104 | public class CompletableFutureTest exten
2104          assertEquals(0, r.invocationCount);
2105          checkCompletedNormally(g, v1);
2106          checkCompletedWithWrappedCancellationException(h);
2107 <        }
2327 <    }
2107 >    }}
2108  
2109      public void testAcceptEither_sourceCancelled2() {
2110          for (ExecutionMode m : ExecutionMode.values())
2111          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2112 <        for (Integer v1 : new Integer[] { 1, null }) {
2113 <
2112 >        for (Integer v1 : new Integer[] { 1, null })
2113 >    {
2114          final CompletableFuture<Integer> f = new CompletableFuture<>();
2115          final CompletableFuture<Integer> g = new CompletableFuture<>();
2116          final IncAction r = new IncAction();
# Line 2344 | Line 2124 | public class CompletableFutureTest exten
2124          assertEquals(0, r.invocationCount);
2125          checkCompletedNormally(f, v1);
2126          checkCompletedWithWrappedCancellationException(h);
2127 <        }
2348 <    }
2127 >    }}
2128  
2129      public void testAcceptEither_sourceCancelled3() {
2130          for (ExecutionMode m : ExecutionMode.values())
2131          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2132 <        for (Integer v1 : new Integer[] { 1, null }) {
2133 <
2132 >        for (Integer v1 : new Integer[] { 1, null })
2133 >    {
2134          final CompletableFuture<Integer> f = new CompletableFuture<>();
2135          final CompletableFuture<Integer> g = new CompletableFuture<>();
2136          final IncAction r = new IncAction();
# Line 2363 | Line 2142 | public class CompletableFutureTest exten
2142          // unspecified behavior
2143          Integer v;
2144          try {
2145 <            assertEquals(h.join(), null);
2145 >            assertNull(h.join());
2146              assertEquals(1, r.invocationCount);
2147              assertEquals(inc(v1), r.value);
2148          } catch (CompletionException ok) {
# Line 2373 | Line 2152 | public class CompletableFutureTest exten
2152  
2153          checkCancelled(g);
2154          checkCompletedNormally(f, v1);
2155 <        }
2377 <    }
2155 >    }}
2156  
2157      public void testAcceptEither_sourceCancelled4() {
2158          for (ExecutionMode m : ExecutionMode.values())
2159          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2160 <        for (Integer v1 : new Integer[] { 1, null }) {
2161 <
2160 >        for (Integer v1 : new Integer[] { 1, null })
2161 >    {
2162          final CompletableFuture<Integer> f = new CompletableFuture<>();
2163          final CompletableFuture<Integer> g = new CompletableFuture<>();
2164          final IncAction r = new IncAction();
# Line 2392 | Line 2170 | public class CompletableFutureTest exten
2170          // unspecified behavior
2171          Integer v;
2172          try {
2173 <            assertEquals(h.join(), null);
2173 >            assertNull(h.join());
2174              assertEquals(1, r.invocationCount);
2175              assertEquals(inc(v1), r.value);
2176          } catch (CompletionException ok) {
# Line 2402 | Line 2180 | public class CompletableFutureTest exten
2180  
2181          checkCancelled(f);
2182          checkCompletedNormally(g, v1);
2183 <        }
2406 <    }
2183 >    }}
2184  
2185      /**
2186       * runAfterEither result completes normally after normal completion
# Line 2412 | Line 2189 | public class CompletableFutureTest exten
2189      public void testRunAfterEither_normalCompletion1() {
2190          for (ExecutionMode m : ExecutionMode.values())
2191          for (Integer v1 : new Integer[] { 1, null })
2192 <        for (Integer v2 : new Integer[] { 2, null }) {
2193 <
2192 >        for (Integer v2 : new Integer[] { 2, null })
2193 >    {
2194          final CompletableFuture<Integer> f = new CompletableFuture<>();
2195          final CompletableFuture<Integer> g = new CompletableFuture<>();
2196 <        final Noop r = new Noop();
2196 >        final Noop r = new Noop(m);
2197          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2198  
2199          f.complete(v1);
# Line 2428 | Line 2205 | public class CompletableFutureTest exten
2205          checkCompletedNormally(g, v2);
2206          checkCompletedNormally(h, null);
2207          assertEquals(1, r.invocationCount);
2208 <        }
2432 <    }
2208 >    }}
2209  
2210      public void testRunAfterEither_normalCompletion2() {
2211          for (ExecutionMode m : ExecutionMode.values())
2212          for (Integer v1 : new Integer[] { 1, null })
2213 <        for (Integer v2 : new Integer[] { 2, null }) {
2214 <
2213 >        for (Integer v2 : new Integer[] { 2, null })
2214 >    {
2215          final CompletableFuture<Integer> f = new CompletableFuture<>();
2216          final CompletableFuture<Integer> g = new CompletableFuture<>();
2217 <        final Noop r = new Noop();
2217 >        final Noop r = new Noop(m);
2218          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2219  
2220          g.complete(v2);
# Line 2450 | Line 2226 | public class CompletableFutureTest exten
2226          checkCompletedNormally(g, v2);
2227          checkCompletedNormally(h, null);
2228          assertEquals(1, r.invocationCount);
2229 <        }
2230 <    }
2229 >        }}
2230 >
2231      public void testRunAfterEither_normalCompletion3() {
2232          for (ExecutionMode m : ExecutionMode.values())
2233          for (Integer v1 : new Integer[] { 1, null })
2234 <        for (Integer v2 : new Integer[] { 2, null }) {
2235 <
2234 >        for (Integer v2 : new Integer[] { 2, null })
2235 >    {
2236          final CompletableFuture<Integer> f = new CompletableFuture<>();
2237          final CompletableFuture<Integer> g = new CompletableFuture<>();
2238 <        final Noop r = new Noop();
2238 >        final Noop r = new Noop(m);
2239  
2240          f.complete(v1);
2241          g.complete(v2);
# Line 2469 | Line 2245 | public class CompletableFutureTest exten
2245          checkCompletedNormally(f, v1);
2246          checkCompletedNormally(g, v2);
2247          assertEquals(1, r.invocationCount);
2248 <        }
2473 <    }
2248 >    }}
2249  
2250      /**
2251       * runAfterEither result completes exceptionally after exceptional
# Line 2478 | Line 2253 | public class CompletableFutureTest exten
2253       */
2254      public void testRunAfterEither_exceptionalCompletion1() {
2255          for (ExecutionMode m : ExecutionMode.values())
2256 <        for (Integer v1 : new Integer[] { 1, null }) {
2257 <
2256 >        for (Integer v1 : new Integer[] { 1, null })
2257 >    {
2258          final CompletableFuture<Integer> f = new CompletableFuture<>();
2259          final CompletableFuture<Integer> g = new CompletableFuture<>();
2260 <        final Noop r = new Noop();
2260 >        final Noop r = new Noop(m);
2261          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2262          final CFException ex = new CFException();
2263  
# Line 2494 | Line 2269 | public class CompletableFutureTest exten
2269          checkCompletedNormally(g, v1);
2270          checkCompletedWithWrappedCFException(f, ex);
2271          checkCompletedWithWrappedCFException(h, ex);
2272 <        }
2498 <    }
2272 >    }}
2273  
2274      public void testRunAfterEither_exceptionalCompletion2() {
2275          for (ExecutionMode m : ExecutionMode.values())
2276 <        for (Integer v1 : new Integer[] { 1, null }) {
2277 <
2276 >        for (Integer v1 : new Integer[] { 1, null })
2277 >    {
2278          final CompletableFuture<Integer> f = new CompletableFuture<>();
2279          final CompletableFuture<Integer> g = new CompletableFuture<>();
2280 <        final Noop r = new Noop();
2280 >        final Noop r = new Noop(m);
2281          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2282          final CFException ex = new CFException();
2283  
# Line 2515 | Line 2289 | public class CompletableFutureTest exten
2289          checkCompletedNormally(f, v1);
2290          checkCompletedWithWrappedCFException(g, ex);
2291          checkCompletedWithWrappedCFException(h, ex);
2292 <        }
2519 <    }
2292 >    }}
2293  
2294      public void testRunAfterEither_exceptionalCompletion3() {
2295          for (ExecutionMode m : ExecutionMode.values())
2296 <        for (Integer v1 : new Integer[] { 1, null }) {
2297 <
2296 >        for (Integer v1 : new Integer[] { 1, null })
2297 >    {
2298          final CompletableFuture<Integer> f = new CompletableFuture<>();
2299          final CompletableFuture<Integer> g = new CompletableFuture<>();
2300 <        final Noop r = new Noop();
2300 >        final Noop r = new Noop(m);
2301          final CFException ex = new CFException();
2302  
2303          g.completeExceptionally(ex);
# Line 2534 | Line 2307 | public class CompletableFutureTest exten
2307          // unspecified behavior
2308          Integer v;
2309          try {
2310 <            assertEquals(h.join(), null);
2310 >            assertNull(h.join());
2311              assertEquals(1, r.invocationCount);
2312          } catch (CompletionException ok) {
2313              checkCompletedWithWrappedCFException(h, ex);
# Line 2543 | Line 2316 | public class CompletableFutureTest exten
2316  
2317          checkCompletedWithWrappedCFException(g, ex);
2318          checkCompletedNormally(f, v1);
2319 <        }
2547 <    }
2319 >    }}
2320  
2321      public void testRunAfterEither_exceptionalCompletion4() {
2322          for (ExecutionMode m : ExecutionMode.values())
2323 <        for (Integer v1 : new Integer[] { 1, null }) {
2324 <
2323 >        for (Integer v1 : new Integer[] { 1, null })
2324 >    {
2325          final CompletableFuture<Integer> f = new CompletableFuture<>();
2326          final CompletableFuture<Integer> g = new CompletableFuture<>();
2327 <        final Noop r = new Noop();
2327 >        final Noop r = new Noop(m);
2328          final CFException ex = new CFException();
2329  
2330          f.completeExceptionally(ex);
# Line 2562 | Line 2334 | public class CompletableFutureTest exten
2334          // unspecified behavior
2335          Integer v;
2336          try {
2337 <            assertEquals(h.join(), null);
2337 >            assertNull(h.join());
2338              assertEquals(1, r.invocationCount);
2339          } catch (CompletionException ok) {
2340              checkCompletedWithWrappedCFException(h, ex);
# Line 2571 | Line 2343 | public class CompletableFutureTest exten
2343  
2344          checkCompletedWithWrappedCFException(f, ex);
2345          checkCompletedNormally(g, v1);
2346 <        }
2575 <    }
2346 >    }}
2347  
2348      /**
2349       * runAfterEither result completes exceptionally if action does
# Line 2580 | Line 2351 | public class CompletableFutureTest exten
2351      public void testRunAfterEither_actionFailed1() {
2352          for (ExecutionMode m : ExecutionMode.values())
2353          for (Integer v1 : new Integer[] { 1, null })
2354 <        for (Integer v2 : new Integer[] { 2, null }) {
2355 <
2354 >        for (Integer v2 : new Integer[] { 2, null })
2355 >    {
2356          final CompletableFuture<Integer> f = new CompletableFuture<>();
2357          final CompletableFuture<Integer> g = new CompletableFuture<>();
2358 <        final FailingNoop r = new FailingNoop();
2358 >        final FailingRunnable r = new FailingRunnable(m);
2359          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2360  
2361          f.complete(v1);
# Line 2592 | Line 2363 | public class CompletableFutureTest exten
2363          g.complete(v2);
2364          checkCompletedNormally(f, v1);
2365          checkCompletedNormally(g, v2);
2366 <        }
2596 <    }
2366 >    }}
2367  
2368      public void testRunAfterEither_actionFailed2() {
2369          for (ExecutionMode m : ExecutionMode.values())
2370          for (Integer v1 : new Integer[] { 1, null })
2371 <        for (Integer v2 : new Integer[] { 2, null }) {
2372 <
2371 >        for (Integer v2 : new Integer[] { 2, null })
2372 >    {
2373          final CompletableFuture<Integer> f = new CompletableFuture<>();
2374          final CompletableFuture<Integer> g = new CompletableFuture<>();
2375 <        final FailingNoop r = new FailingNoop();
2375 >        final FailingRunnable r = new FailingRunnable(m);
2376          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2377  
2378          g.complete(v2);
# Line 2610 | Line 2380 | public class CompletableFutureTest exten
2380          f.complete(v1);
2381          checkCompletedNormally(f, v1);
2382          checkCompletedNormally(g, v2);
2383 <        }
2614 <    }
2383 >    }}
2384  
2385      /**
2386       * runAfterEither result completes exceptionally if either source cancelled
# Line 2619 | Line 2388 | public class CompletableFutureTest exten
2388      public void testRunAfterEither_sourceCancelled1() {
2389          for (ExecutionMode m : ExecutionMode.values())
2390          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2391 <        for (Integer v1 : new Integer[] { 1, null }) {
2392 <
2391 >        for (Integer v1 : new Integer[] { 1, null })
2392 >    {
2393          final CompletableFuture<Integer> f = new CompletableFuture<>();
2394          final CompletableFuture<Integer> g = new CompletableFuture<>();
2395 <        final Noop r = new Noop();
2395 >        final Noop r = new Noop(m);
2396          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2397  
2398          assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2634 | Line 2403 | public class CompletableFutureTest exten
2403          assertEquals(0, r.invocationCount);
2404          checkCompletedNormally(g, v1);
2405          checkCompletedWithWrappedCancellationException(h);
2406 <        }
2638 <    }
2406 >    }}
2407  
2408      public void testRunAfterEither_sourceCancelled2() {
2409          for (ExecutionMode m : ExecutionMode.values())
2410          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2411 <        for (Integer v1 : new Integer[] { 1, null }) {
2412 <
2411 >        for (Integer v1 : new Integer[] { 1, null })
2412 >    {
2413          final CompletableFuture<Integer> f = new CompletableFuture<>();
2414          final CompletableFuture<Integer> g = new CompletableFuture<>();
2415 <        final Noop r = new Noop();
2415 >        final Noop r = new Noop(m);
2416          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2417  
2418          assertTrue(g.cancel(mayInterruptIfRunning));
# Line 2655 | Line 2423 | public class CompletableFutureTest exten
2423          assertEquals(0, r.invocationCount);
2424          checkCompletedNormally(f, v1);
2425          checkCompletedWithWrappedCancellationException(h);
2426 <        }
2659 <    }
2426 >    }}
2427  
2428      public void testRunAfterEither_sourceCancelled3() {
2429          for (ExecutionMode m : ExecutionMode.values())
2430          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2431 <        for (Integer v1 : new Integer[] { 1, null }) {
2432 <
2431 >        for (Integer v1 : new Integer[] { 1, null })
2432 >    {
2433          final CompletableFuture<Integer> f = new CompletableFuture<>();
2434          final CompletableFuture<Integer> g = new CompletableFuture<>();
2435 <        final Noop r = new Noop();
2435 >        final Noop r = new Noop(m);
2436  
2437          assertTrue(g.cancel(mayInterruptIfRunning));
2438          f.complete(v1);
# Line 2674 | Line 2441 | public class CompletableFutureTest exten
2441          // unspecified behavior
2442          Integer v;
2443          try {
2444 <            assertEquals(h.join(), null);
2444 >            assertNull(h.join());
2445              assertEquals(1, r.invocationCount);
2446          } catch (CompletionException ok) {
2447              checkCompletedWithWrappedCancellationException(h);
# Line 2683 | Line 2450 | public class CompletableFutureTest exten
2450  
2451          checkCancelled(g);
2452          checkCompletedNormally(f, v1);
2453 <        }
2687 <    }
2453 >    }}
2454  
2455      public void testRunAfterEither_sourceCancelled4() {
2456          for (ExecutionMode m : ExecutionMode.values())
2457          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2458 <        for (Integer v1 : new Integer[] { 1, null }) {
2459 <
2458 >        for (Integer v1 : new Integer[] { 1, null })
2459 >    {
2460          final CompletableFuture<Integer> f = new CompletableFuture<>();
2461          final CompletableFuture<Integer> g = new CompletableFuture<>();
2462 <        final Noop r = new Noop();
2462 >        final Noop r = new Noop(m);
2463  
2464          assertTrue(f.cancel(mayInterruptIfRunning));
2465          g.complete(v1);
# Line 2702 | Line 2468 | public class CompletableFutureTest exten
2468          // unspecified behavior
2469          Integer v;
2470          try {
2471 <            assertEquals(h.join(), null);
2471 >            assertNull(h.join());
2472              assertEquals(1, r.invocationCount);
2473          } catch (CompletionException ok) {
2474              checkCompletedWithWrappedCancellationException(h);
# Line 2711 | Line 2477 | public class CompletableFutureTest exten
2477  
2478          checkCancelled(f);
2479          checkCompletedNormally(g, v1);
2480 <        }
2715 <    }
2480 >    }}
2481  
2482      /**
2483       * thenCompose result completes normally after normal completion of source
2484       */
2485 <    public void testThenCompose_normalCompletion1() {
2485 >    public void testThenCompose_normalCompletion() {
2486          for (ExecutionMode m : ExecutionMode.values())
2487 <        for (Integer v1 : new Integer[] { 1, null }) {
2488 <
2487 >        for (boolean createIncomplete : new boolean[] { true, false })
2488 >        for (Integer v1 : new Integer[] { 1, null })
2489 >    {
2490          final CompletableFuture<Integer> f = new CompletableFuture<>();
2491 <        final CompletableFutureInc r = new CompletableFutureInc();
2492 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2493 <        f.complete(v1);
2494 <        checkCompletedNormally(g, inc(v1));
2729 <        checkCompletedNormally(f, v1);
2730 <        assertEquals(1, r.invocationCount);
2731 <        }
2732 <    }
2733 <
2734 <    public void testThenCompose_normalCompletion2() {
2735 <        for (ExecutionMode m : ExecutionMode.values())
2736 <        for (Integer v1 : new Integer[] { 1, null }) {
2491 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2492 >        if (!createIncomplete) f.complete(v1);
2493 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2494 >        if (createIncomplete) f.complete(v1);
2495  
2738        final CompletableFuture<Integer> f = new CompletableFuture<>();
2739        final CompletableFutureInc r = new CompletableFutureInc();
2740        f.complete(v1);
2741        final CompletableFuture<Integer> g = f.thenCompose(r);
2496          checkCompletedNormally(g, inc(v1));
2497          checkCompletedNormally(f, v1);
2498          assertEquals(1, r.invocationCount);
2499 <        }
2746 <    }
2499 >    }}
2500  
2501      /**
2502       * thenCompose result completes exceptionally after exceptional
2503       * completion of source
2504       */
2505 <    public void testThenCompose_exceptionalCompletion1() {
2506 <        for (ExecutionMode m : ExecutionMode.values()) {
2507 <
2505 >    public void testThenCompose_exceptionalCompletion() {
2506 >        for (ExecutionMode m : ExecutionMode.values())
2507 >        for (boolean createIncomplete : new boolean[] { true, false })
2508 >    {
2509          final CFException ex = new CFException();
2510 <        final CompletableFutureInc r = new CompletableFutureInc();
2510 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2511          final CompletableFuture<Integer> f = new CompletableFuture<>();
2512 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2513 <        f.completeExceptionally(ex);
2514 <        checkCompletedWithWrappedCFException(g, ex);
2761 <        checkCompletedWithWrappedCFException(f, ex);
2762 <        }
2763 <    }
2764 <
2765 <    public void testThenCompose_exceptionalCompletion2() {
2766 <        for (ExecutionMode m : ExecutionMode.values()) {
2512 >        if (!createIncomplete) f.completeExceptionally(ex);
2513 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2514 >        if (createIncomplete) f.completeExceptionally(ex);
2515  
2768        final CFException ex = new CFException();
2769        final CompletableFuture<Integer> f = new CompletableFuture<>();
2770        f.completeExceptionally(ex);
2771        final CompletableFutureInc r = new CompletableFutureInc();
2772        final CompletableFuture<Integer> g = f.thenCompose(r);
2516          checkCompletedWithWrappedCFException(g, ex);
2517          checkCompletedWithWrappedCFException(f, ex);
2518 <        }
2519 <    }
2518 >        assertEquals(0, r.invocationCount);
2519 >    }}
2520  
2521      /**
2522       * thenCompose result completes exceptionally if action does
2523       */
2524 <    public void testThenCompose_actionFailed1() {
2524 >    public void testThenCompose_actionFailed() {
2525          for (ExecutionMode m : ExecutionMode.values())
2526 <        for (Integer v1 : new Integer[] { 1, null }) {
2527 <
2526 >        for (boolean createIncomplete : new boolean[] { true, false })
2527 >        for (Integer v1 : new Integer[] { 1, null })
2528 >    {
2529          final CompletableFuture<Integer> f = new CompletableFuture<>();
2530          final FailingCompletableFutureFunction r
2531 <            = new FailingCompletableFutureFunction();
2532 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2533 <        f.complete(v1);
2534 <        checkCompletedWithWrappedCFException(g);
2791 <        checkCompletedNormally(f, v1);
2792 <        }
2793 <    }
2794 <
2795 <    public void testThenCompose_actionFailed2() {
2796 <        for (ExecutionMode m : ExecutionMode.values())
2797 <        for (Integer v1 : new Integer[] { 1, null }) {
2531 >            = new FailingCompletableFutureFunction(m);
2532 >        if (!createIncomplete) f.complete(v1);
2533 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2534 >        if (createIncomplete) f.complete(v1);
2535  
2799        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800        f.complete(v1);
2801        final FailingCompletableFutureFunction r
2802            = new FailingCompletableFutureFunction();
2803        final CompletableFuture<Integer> g = f.thenCompose(r);
2536          checkCompletedWithWrappedCFException(g);
2537          checkCompletedNormally(f, v1);
2538 <        }
2807 <    }
2538 >    }}
2539  
2540      /**
2541       * thenCompose result completes exceptionally if source cancelled
2542       */
2543 <    public void testThenCompose_sourceCancelled1() {
2543 >    public void testThenCompose_sourceCancelled() {
2544          for (ExecutionMode m : ExecutionMode.values())
2545 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2546 <
2545 >        for (boolean createIncomplete : new boolean[] { true, false })
2546 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2547 >    {
2548          final CompletableFuture<Integer> f = new CompletableFuture<>();
2549 <        final CompletableFutureInc r = new CompletableFutureInc();
2550 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2551 <        assertTrue(f.cancel(mayInterruptIfRunning));
2552 <        checkCompletedWithWrappedCancellationException(g);
2553 <        checkCancelled(f);
2549 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2550 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2551 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2552 >        if (createIncomplete) {
2553 >            checkIncomplete(g);
2554 >            assertTrue(f.cancel(mayInterruptIfRunning));
2555          }
2823    }
2824
2825    public void testThenCompose_sourceCancelled2() {
2826        for (ExecutionMode m : ExecutionMode.values())
2827        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2556  
2829        final CompletableFuture<Integer> f = new CompletableFuture<>();
2830        assertTrue(f.cancel(mayInterruptIfRunning));
2831        final CompletableFutureInc r = new CompletableFutureInc();
2832        final CompletableFuture<Integer> g = f.thenCompose(r);
2557          checkCompletedWithWrappedCancellationException(g);
2558          checkCancelled(f);
2559 <        }
2836 <    }
2837 <
2838 <    // asyncs
2839 <
2840 <    /**
2841 <     * thenRunAsync result completes normally after normal completion of source
2842 <     */
2843 <    public void testThenRunAsync() {
2844 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2845 <        Noop r = new Noop();
2846 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2847 <        f.complete(null);
2848 <        checkCompletedNormally(g, null);
2849 <
2850 <        // reordered version
2851 <        f = new CompletableFuture<>();
2852 <        f.complete(null);
2853 <        r = new Noop();
2854 <        g = f.thenRunAsync(r);
2855 <        checkCompletedNormally(g, null);
2856 <    }
2857 <
2858 <    /**
2859 <     * thenRunAsync result completes exceptionally after exceptional
2860 <     * completion of source
2861 <     */
2862 <    public void testThenRunAsync2() {
2863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2864 <        Noop r = new Noop();
2865 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2866 <        f.completeExceptionally(new CFException());
2867 <        try {
2868 <            g.join();
2869 <            shouldThrow();
2870 <        } catch (CompletionException success) {}
2871 <        checkCompletedWithWrappedCFException(g);
2872 <    }
2873 <
2874 <    /**
2875 <     * thenRunAsync result completes exceptionally if action does
2876 <     */
2877 <    public void testThenRunAsync3() {
2878 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2879 <        FailingNoop r = new FailingNoop();
2880 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2881 <        f.complete(null);
2882 <        checkCompletedWithWrappedCFException(g);
2883 <    }
2884 <
2885 <    /**
2886 <     * thenRunAsync result completes exceptionally if source cancelled
2887 <     */
2888 <    public void testThenRunAsync4() {
2889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2890 <        Noop r = new Noop();
2891 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2892 <        assertTrue(f.cancel(true));
2893 <        checkCompletedWithWrappedCancellationException(g);
2894 <    }
2895 <
2896 <    /**
2897 <     * thenApplyAsync result completes normally after normal completion of source
2898 <     */
2899 <    public void testThenApplyAsync() {
2900 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2901 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2902 <        f.complete(one);
2903 <        checkCompletedNormally(g, two);
2904 <    }
2905 <
2906 <    /**
2907 <     * thenApplyAsync result completes exceptionally after exceptional
2908 <     * completion of source
2909 <     */
2910 <    public void testThenApplyAsync2() {
2911 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2912 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2913 <        f.completeExceptionally(new CFException());
2914 <        checkCompletedWithWrappedCFException(g);
2915 <    }
2916 <
2917 <    /**
2918 <     * thenApplyAsync result completes exceptionally if action does
2919 <     */
2920 <    public void testThenApplyAsync3() {
2921 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2922 <        FailingFunction r = new FailingFunction();
2923 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2924 <        f.complete(null);
2925 <        checkCompletedWithWrappedCFException(g);
2926 <    }
2927 <
2928 <    /**
2929 <     * thenApplyAsync result completes exceptionally if source cancelled
2930 <     */
2931 <    public void testThenApplyAsync4() {
2932 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2933 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2934 <        assertTrue(f.cancel(true));
2935 <        checkCompletedWithWrappedCancellationException(g);
2936 <    }
2937 <
2938 <    /**
2939 <     * thenAcceptAsync result completes normally after normal
2940 <     * completion of source
2941 <     */
2942 <    public void testThenAcceptAsync() {
2943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2944 <        IncAction r = new IncAction();
2945 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2946 <        f.complete(one);
2947 <        checkCompletedNormally(g, null);
2948 <        assertEquals(r.value, (Integer) 2);
2949 <    }
2950 <
2951 <    /**
2952 <     * thenAcceptAsync result completes exceptionally after exceptional
2953 <     * completion of source
2954 <     */
2955 <    public void testThenAcceptAsync2() {
2956 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2957 <        IncAction r = new IncAction();
2958 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2959 <        f.completeExceptionally(new CFException());
2960 <        checkCompletedWithWrappedCFException(g);
2961 <    }
2962 <
2963 <    /**
2964 <     * thenAcceptAsync result completes exceptionally if action does
2965 <     */
2966 <    public void testThenAcceptAsync3() {
2967 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2968 <        FailingConsumer r = new FailingConsumer();
2969 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2970 <        f.complete(null);
2971 <        checkCompletedWithWrappedCFException(g);
2972 <    }
2973 <
2974 <    /**
2975 <     * thenAcceptAsync result completes exceptionally if source cancelled
2976 <     */
2977 <    public void testThenAcceptAsync4() {
2978 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2979 <        IncAction r = new IncAction();
2980 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2981 <        assertTrue(f.cancel(true));
2982 <        checkCompletedWithWrappedCancellationException(g);
2983 <    }
2984 <
2985 <    // async with explicit executors
2986 <
2987 <    /**
2988 <     * thenRunAsync result completes normally after normal completion of source
2989 <     */
2990 <    public void testThenRunAsyncE() {
2991 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2992 <        Noop r = new Noop();
2993 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2994 <        f.complete(null);
2995 <        checkCompletedNormally(g, null);
2996 <
2997 <        // reordered version
2998 <        f = new CompletableFuture<>();
2999 <        f.complete(null);
3000 <        r = new Noop();
3001 <        g = f.thenRunAsync(r, new ThreadExecutor());
3002 <        checkCompletedNormally(g, null);
3003 <    }
3004 <
3005 <    /**
3006 <     * thenRunAsync result completes exceptionally after exceptional
3007 <     * completion of source
3008 <     */
3009 <    public void testThenRunAsync2E() {
3010 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3011 <        Noop r = new Noop();
3012 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3013 <        f.completeExceptionally(new CFException());
3014 <        try {
3015 <            g.join();
3016 <            shouldThrow();
3017 <        } catch (CompletionException success) {}
3018 <        checkCompletedWithWrappedCFException(g);
3019 <    }
3020 <
3021 <    /**
3022 <     * thenRunAsync result completes exceptionally if action does
3023 <     */
3024 <    public void testThenRunAsync3E() {
3025 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3026 <        FailingNoop r = new FailingNoop();
3027 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3028 <        f.complete(null);
3029 <        checkCompletedWithWrappedCFException(g);
3030 <    }
3031 <
3032 <    /**
3033 <     * thenRunAsync result completes exceptionally if source cancelled
3034 <     */
3035 <    public void testThenRunAsync4E() {
3036 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3037 <        Noop r = new Noop();
3038 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3039 <        assertTrue(f.cancel(true));
3040 <        checkCompletedWithWrappedCancellationException(g);
3041 <    }
3042 <
3043 <    /**
3044 <     * thenApplyAsync result completes normally after normal completion of source
3045 <     */
3046 <    public void testThenApplyAsyncE() {
3047 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3048 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3049 <        f.complete(one);
3050 <        checkCompletedNormally(g, two);
3051 <    }
3052 <
3053 <    /**
3054 <     * thenApplyAsync result completes exceptionally after exceptional
3055 <     * completion of source
3056 <     */
3057 <    public void testThenApplyAsync2E() {
3058 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3059 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3060 <        f.completeExceptionally(new CFException());
3061 <        checkCompletedWithWrappedCFException(g);
3062 <    }
3063 <
3064 <    /**
3065 <     * thenApplyAsync result completes exceptionally if action does
3066 <     */
3067 <    public void testThenApplyAsync3E() {
3068 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3069 <        FailingFunction r = new FailingFunction();
3070 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3071 <        f.complete(null);
3072 <        checkCompletedWithWrappedCFException(g);
3073 <    }
3074 <
3075 <    /**
3076 <     * thenApplyAsync result completes exceptionally if source cancelled
3077 <     */
3078 <    public void testThenApplyAsync4E() {
3079 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3080 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3081 <        assertTrue(f.cancel(true));
3082 <        checkCompletedWithWrappedCancellationException(g);
3083 <    }
3084 <
3085 <    /**
3086 <     * thenAcceptAsync result completes normally after normal
3087 <     * completion of source
3088 <     */
3089 <    public void testThenAcceptAsyncE() {
3090 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3091 <        IncAction r = new IncAction();
3092 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3093 <        f.complete(one);
3094 <        checkCompletedNormally(g, null);
3095 <        assertEquals(r.value, (Integer) 2);
3096 <    }
3097 <
3098 <    /**
3099 <     * thenAcceptAsync result completes exceptionally after exceptional
3100 <     * completion of source
3101 <     */
3102 <    public void testThenAcceptAsync2E() {
3103 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3104 <        IncAction r = new IncAction();
3105 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3106 <        f.completeExceptionally(new CFException());
3107 <        checkCompletedWithWrappedCFException(g);
3108 <    }
3109 <
3110 <    /**
3111 <     * thenAcceptAsync result completes exceptionally if action does
3112 <     */
3113 <    public void testThenAcceptAsync3E() {
3114 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3115 <        FailingConsumer r = new FailingConsumer();
3116 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3117 <        f.complete(null);
3118 <        checkCompletedWithWrappedCFException(g);
3119 <    }
3120 <
3121 <    /**
3122 <     * thenAcceptAsync result completes exceptionally if source cancelled
3123 <     */
3124 <    public void testThenAcceptAsync4E() {
3125 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3126 <        IncAction r = new IncAction();
3127 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3128 <        assertTrue(f.cancel(true));
3129 <        checkCompletedWithWrappedCancellationException(g);
3130 <    }
2559 >    }}
2560  
2561      // other static methods
2562  
# Line 3291 | Line 2720 | public class CompletableFutureTest exten
2720  
2721              () -> f.thenCompose(null),
2722              () -> f.thenComposeAsync(null),
2723 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2723 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2724              () -> f.thenComposeAsync(null, exec),
2725  
2726              () -> f.exceptionally(null),
# Line 3328 | Line 2757 | public class CompletableFutureTest exten
2757       * source result.
2758       */
2759      public void testWhenComplete_normalCompletion1() {
3331        for (boolean createIncomplete : new boolean[] { true, false })
2760          for (ExecutionMode m : ExecutionMode.values())
2761 <        for (Integer v1 : new Integer[] { 1, null }) {
2762 <
2763 <        final AtomicInteger a = new AtomicInteger();
2761 >        for (boolean createIncomplete : new boolean[] { true, false })
2762 >        for (Integer v1 : new Integer[] { 1, null })
2763 >    {
2764 >        final AtomicInteger a = new AtomicInteger(0);
2765          final CompletableFuture<Integer> f = new CompletableFuture<>();
2766          if (!createIncomplete) f.complete(v1);
2767 <        final CompletableFuture<Integer> g =
2768 <            m.whenComplete(f,
2769 <                           (Integer x, Throwable t) -> {
2770 <                               threadAssertSame(x, v1);
2771 <                               threadAssertNull(t);
2772 <                               a.getAndIncrement();
2773 <                           });
2767 >        final CompletableFuture<Integer> g = m.whenComplete
2768 >            (f,
2769 >             (Integer x, Throwable t) -> {
2770 >                threadAssertSame(x, v1);
2771 >                threadAssertNull(t);
2772 >                a.getAndIncrement();
2773 >            });
2774          if (createIncomplete) f.complete(v1);
2775 <        checkCompletedNormally(f, v1);
2775 >
2776          checkCompletedNormally(g, v1);
2777 <        assertEquals(a.get(), 1);
2778 <        }
2779 <    }
2777 >        checkCompletedNormally(f, v1);
2778 >        assertEquals(1, a.get());
2779 >    }}
2780  
2781      /**
2782       * whenComplete action executes on exceptional completion, propagating
2783       * source result.
2784       */
2785      public void testWhenComplete_exceptionalCompletion() {
3357        for (boolean createIncomplete : new boolean[] { true, false })
2786          for (ExecutionMode m : ExecutionMode.values())
2787 <        for (Integer v1 : new Integer[] { 1, null }) {
2788 <
2789 <        final AtomicInteger a = new AtomicInteger();
2787 >        for (boolean createIncomplete : new boolean[] { true, false })
2788 >        for (Integer v1 : new Integer[] { 1, null })
2789 >    {
2790 >        final AtomicInteger a = new AtomicInteger(0);
2791          final CFException ex = new CFException();
2792          final CompletableFuture<Integer> f = new CompletableFuture<>();
2793          if (!createIncomplete) f.completeExceptionally(ex);
# Line 3372 | Line 2801 | public class CompletableFutureTest exten
2801          if (createIncomplete) f.completeExceptionally(ex);
2802          checkCompletedWithWrappedCFException(f, ex);
2803          checkCompletedWithWrappedCFException(g, ex);
2804 <        assertEquals(a.get(), 1);
2805 <        }
2806 <    }
2804 >        assertEquals(1, a.get());
2805 >    }}
2806 >
2807 >    /**
2808 >     * whenComplete action executes on cancelled source, propagating
2809 >     * CancellationException.
2810 >     */
2811 >    public void testWhenComplete_sourceCancelled() {
2812 >        for (ExecutionMode m : ExecutionMode.values())
2813 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2814 >        for (boolean createIncomplete : new boolean[] { true, false })
2815 >    {
2816 >        final AtomicInteger a = new AtomicInteger(0);
2817 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2818 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2819 >        final CompletableFuture<Integer> g = m.whenComplete
2820 >            (f,
2821 >             (Integer x, Throwable t) -> {
2822 >                threadAssertNull(x);
2823 >                threadAssertTrue(t instanceof CancellationException);
2824 >                a.getAndIncrement();
2825 >            });
2826 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2827 >
2828 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2829 >        checkCompletedWithWrappedCancellationException(g);
2830 >        checkCancelled(f);
2831 >        assertEquals(1, a.get());
2832 >    }}
2833  
2834      /**
2835       * If a whenComplete action throws an exception when triggered by
# Line 3383 | Line 2838 | public class CompletableFutureTest exten
2838      public void testWhenComplete_actionFailed() {
2839          for (boolean createIncomplete : new boolean[] { true, false })
2840          for (ExecutionMode m : ExecutionMode.values())
2841 <        for (Integer v1 : new Integer[] { 1, null }) {
2842 <
2841 >        for (Integer v1 : new Integer[] { 1, null })
2842 >    {
2843 >        final AtomicInteger a = new AtomicInteger(0);
2844          final CFException ex = new CFException();
2845          final CompletableFuture<Integer> f = new CompletableFuture<>();
2846          if (!createIncomplete) f.complete(v1);
# Line 3393 | Line 2849 | public class CompletableFutureTest exten
2849               (Integer x, Throwable t) -> {
2850                  threadAssertSame(x, v1);
2851                  threadAssertNull(t);
2852 +                a.getAndIncrement();
2853                  throw ex;
2854              });
2855          if (createIncomplete) f.complete(v1);
2856          checkCompletedNormally(f, v1);
2857          checkCompletedWithWrappedCFException(g, ex);
2858 <        }
2859 <    }
2858 >        assertEquals(1, a.get());
2859 >    }}
2860  
2861      /**
2862       * If a whenComplete action throws an exception when triggered by
# Line 3409 | Line 2866 | public class CompletableFutureTest exten
2866      public void testWhenComplete_actionFailedSourceFailed() {
2867          for (boolean createIncomplete : new boolean[] { true, false })
2868          for (ExecutionMode m : ExecutionMode.values())
2869 <        for (Integer v1 : new Integer[] { 1, null }) {
2870 <
2869 >        for (Integer v1 : new Integer[] { 1, null })
2870 >    {
2871 >        final AtomicInteger a = new AtomicInteger(0);
2872          final CFException ex1 = new CFException();
2873          final CFException ex2 = new CFException();
2874          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 3421 | Line 2879 | public class CompletableFutureTest exten
2879               (Integer x, Throwable t) -> {
2880                  threadAssertSame(t, ex1);
2881                  threadAssertNull(x);
2882 +                a.getAndIncrement();
2883                  throw ex2;
2884              });
2885          if (createIncomplete) f.completeExceptionally(ex1);
2886  
2887          checkCompletedWithWrappedCFException(f, ex1);
2888          checkCompletedWithWrappedCFException(g, ex1);
2889 <        }
2890 <    }
3432 <
3433 <    /**
3434 <     * handleAsync action completes normally with function value on
3435 <     * either normal or exceptional completion of source
3436 <     */
3437 <    public void testHandleAsync() {
3438 <        CompletableFuture<Integer> f, g;
3439 <        IntegerHandler r;
3440 <
3441 <        f = new CompletableFuture<>();
3442 <        g = f.handleAsync(r = new IntegerHandler());
3443 <        assertEquals(0, r.invocationCount);
3444 <        f.completeExceptionally(new CFException());
3445 <        checkCompletedWithWrappedCFException(f);
3446 <        checkCompletedNormally(g, three);
3447 <        assertEquals(1, r.invocationCount);
3448 <
3449 <        f = new CompletableFuture<>();
3450 <        g = f.handleAsync(r = new IntegerHandler());
3451 <        assertEquals(0, r.invocationCount);
3452 <        f.completeExceptionally(new CFException());
3453 <        checkCompletedWithWrappedCFException(f);
3454 <        checkCompletedNormally(g, three);
3455 <        assertEquals(1, r.invocationCount);
3456 <
3457 <        f = new CompletableFuture<>();
3458 <        g = f.handleAsync(r = new IntegerHandler());
3459 <        assertEquals(0, r.invocationCount);
3460 <        f.complete(one);
3461 <        checkCompletedNormally(f, one);
3462 <        checkCompletedNormally(g, two);
3463 <        assertEquals(1, r.invocationCount);
3464 <
3465 <        f = new CompletableFuture<>();
3466 <        g = f.handleAsync(r = new IntegerHandler());
3467 <        assertEquals(0, r.invocationCount);
3468 <        f.complete(one);
3469 <        checkCompletedNormally(f, one);
3470 <        checkCompletedNormally(g, two);
3471 <        assertEquals(1, r.invocationCount);
3472 <    }
3473 <
3474 <    /**
3475 <     * handleAsync action with Executor completes normally with
3476 <     * function value on either normal or exceptional completion of
3477 <     * source
3478 <     */
3479 <    public void testHandleAsync2() {
3480 <        CompletableFuture<Integer> f, g;
3481 <        ThreadExecutor exec = new ThreadExecutor();
3482 <        IntegerHandler r;
3483 <
3484 <        f = new CompletableFuture<>();
3485 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3486 <        assertEquals(0, r.invocationCount);
3487 <        f.completeExceptionally(new CFException());
3488 <        checkCompletedWithWrappedCFException(f);
3489 <        checkCompletedNormally(g, three);
3490 <        assertEquals(1, r.invocationCount);
3491 <
3492 <        f = new CompletableFuture<>();
3493 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3494 <        assertEquals(0, r.invocationCount);
3495 <        f.completeExceptionally(new CFException());
3496 <        checkCompletedWithWrappedCFException(f);
3497 <        checkCompletedNormally(g, three);
3498 <        assertEquals(1, r.invocationCount);
3499 <
3500 <        f = new CompletableFuture<>();
3501 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3502 <        assertEquals(0, r.invocationCount);
3503 <        f.complete(one);
3504 <        checkCompletedNormally(f, one);
3505 <        checkCompletedNormally(g, two);
3506 <        assertEquals(1, r.invocationCount);
3507 <
3508 <        f = new CompletableFuture<>();
3509 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3510 <        assertEquals(0, r.invocationCount);
3511 <        f.complete(one);
3512 <        checkCompletedNormally(f, one);
3513 <        checkCompletedNormally(g, two);
3514 <        assertEquals(1, r.invocationCount);
3515 <    }
2889 >        assertEquals(1, a.get());
2890 >    }}
2891  
2892   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines