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.42 by jsr166, Mon Jun 2 02:19:23 2014 UTC vs.
Revision 1.57 by jsr166, Mon Jun 2 22:48:50 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 339 | Line 343 | public class CompletableFutureTest exten
343      static final class IncAction implements Consumer<Integer> {
344          int invocationCount = 0;
345          Integer value;
342        public boolean ran() { return invocationCount == 1; }
346          public void accept(Integer x) {
347              invocationCount++;
348              value = inc(x);
349          }
350      }
351      static final class IncFunction implements Function<Integer,Integer> {
352 +        final ExecutionMode m;
353          int invocationCount = 0;
354          Integer value;
355 <        public boolean ran() { return invocationCount == 1; }
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 <        public boolean ran() { return invocationCount == 1; }
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 <        public boolean ran() { return invocationCount == 1; }
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 <        boolean ran;
389 >        Noop(ExecutionMode m) { this.m = m; }
390          public void run() {
391 +            m.checkExecutionMode();
392              invocationCount++;
382            ran = true;
393          }
394      }
395  
396      static final class FailingSupplier implements Supplier<Integer> {
397 <        boolean ran;
398 <        public Integer get() { ran = true; throw new CFException(); }
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 <        boolean ran;
408 <        public void accept(Integer x) { ran = true; throw new CFException(); }
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 <        boolean ran;
418 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
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 <        boolean ran;
428 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
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 <        boolean ran;
438 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
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 {
447 <        boolean ran;
448 <        public void run() { ran = true; throw new CFException(); }
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 >        }
455      }
456  
457      static final class CompletableFutureInc
458          implements Function<Integer, CompletableFuture<Integer>> {
459 <        boolean ran;
459 >        final ExecutionMode m;
460 >        int invocationCount = 0;
461 >        CompletableFutureInc(ExecutionMode m) { this.m = m; }
462          public CompletableFuture<Integer> apply(Integer x) {
463 <            ran = true;
463 >            m.checkExecutionMode();
464 >            invocationCount++;
465              CompletableFuture<Integer> f = new CompletableFuture<>();
466 <            f.complete(Integer.valueOf(x.intValue() + 1));
466 >            f.complete(inc(x));
467              return f;
468          }
469      }
470  
471      static final class FailingCompletableFutureFunction
472          implements Function<Integer, CompletableFuture<Integer>> {
473 <        boolean ran;
473 >        final ExecutionMode m;
474 >        int invocationCount = 0;
475 >        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
476          public CompletableFuture<Integer> apply(Integer x) {
477 <            ran = true; throw new CFException();
477 >            m.checkExecutionMode();
478 >            invocationCount++;
479 >            throw new CFException();
480          }
481      }
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();
437 <        }
438 <    }
439 <
440 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
441 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
442 <    }
443 <
444 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
445 <        boolean ran;
446 <        public Integer apply(Integer x, Throwable t) {
447 <            ran = true;
448 <            return (t == null) ? two : three;
493 >            new Thread(tg, r).start();
494          }
495      }
496  
# Line 455 | Line 500 | public class CompletableFutureTest exten
500       */
501      enum ExecutionMode {
502          DEFAULT {
503 +            public void checkExecutionMode() {
504 +                assertNull(ForkJoinTask.getPool());
505 +            }
506 +            public CompletableFuture<Void> runAsync(Runnable a) {
507 +                throw new UnsupportedOperationException();
508 +            }
509 +            public <T> CompletableFuture<Void> thenRun
510 +                (CompletableFuture<T> f, Runnable a) {
511 +                return f.thenRun(a);
512 +            }
513 +            public <T> CompletableFuture<Void> thenAccept
514 +                (CompletableFuture<T> f, Consumer<? super T> a) {
515 +                return f.thenAccept(a);
516 +            }
517 +            public <T,U> CompletableFuture<U> thenApply
518 +                (CompletableFuture<T> f, Function<? super T,U> a) {
519 +                return f.thenApply(a);
520 +            }
521 +            public <T,U> CompletableFuture<U> thenCompose
522 +                (CompletableFuture<T> f,
523 +                 Function<? super T,? extends CompletionStage<U>> a) {
524 +                return f.thenCompose(a);
525 +            }
526 +            public <T,U> CompletableFuture<U> handle
527 +                (CompletableFuture<T> f,
528 +                 BiFunction<? super T,Throwable,? extends U> a) {
529 +                return f.handle(a);
530 +            }
531 +            public <T> CompletableFuture<T> whenComplete
532 +                (CompletableFuture<T> f,
533 +                 BiConsumer<? super T,? super Throwable> a) {
534 +                return f.whenComplete(a);
535 +            }
536              public <T,U> CompletableFuture<Void> runAfterBoth
537                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
538                  return f.runAfterBoth(g, a);
# Line 471 | Line 549 | public class CompletableFutureTest exten
549                   BiFunction<? super T,? super U,? extends V> a) {
550                  return f.thenCombine(g, a);
551              }
552 <            public <T,U> CompletableFuture<U> applyToEither
552 >            public <T> CompletableFuture<Void> runAfterEither
553                  (CompletableFuture<T> f,
554 <                 CompletionStage<? extends T> g,
555 <                 Function<? super T,U> a) {
556 <                return f.applyToEither(g, a);
554 >                 CompletionStage<?> g,
555 >                 java.lang.Runnable a) {
556 >                return f.runAfterEither(g, a);
557              }
558              public <T> CompletableFuture<Void> acceptEither
559                  (CompletableFuture<T> f,
# Line 483 | Line 561 | public class CompletableFutureTest exten
561                   Consumer<? super T> a) {
562                  return f.acceptEither(g, a);
563              }
564 <            public <T> CompletableFuture<Void> runAfterEither
564 >            public <T,U> CompletableFuture<U> applyToEither
565                  (CompletableFuture<T> f,
566 <                 CompletionStage<?> g,
567 <                 java.lang.Runnable a) {
568 <                return f.runAfterEither(g, a);
566 >                 CompletionStage<? extends T> g,
567 >                 Function<? super T,U> a) {
568 >                return f.applyToEither(g, a);
569 >            }
570 >        },
571 >
572 >        ASYNC {
573 >            public void checkExecutionMode() {
574 >                assertSame(ForkJoinPool.commonPool(),
575 >                           ForkJoinTask.getPool());
576 >            }
577 >            public CompletableFuture<Void> runAsync(Runnable a) {
578 >                return CompletableFuture.runAsync(a);
579 >            }
580 >            public <T> CompletableFuture<Void> thenRun
581 >                (CompletableFuture<T> f, Runnable a) {
582 >                return f.thenRunAsync(a);
583 >            }
584 >            public <T> CompletableFuture<Void> thenAccept
585 >                (CompletableFuture<T> f, Consumer<? super T> a) {
586 >                return f.thenAcceptAsync(a);
587 >            }
588 >            public <T,U> CompletableFuture<U> thenApply
589 >                (CompletableFuture<T> f, Function<? super T,U> a) {
590 >                return f.thenApplyAsync(a);
591              }
592              public <T,U> CompletableFuture<U> thenCompose
593                  (CompletableFuture<T> f,
594                   Function<? super T,? extends CompletionStage<U>> a) {
595 <                return f.thenCompose(a);
595 >                return f.thenComposeAsync(a);
596 >            }
597 >            public <T,U> CompletableFuture<U> handle
598 >                (CompletableFuture<T> f,
599 >                 BiFunction<? super T,Throwable,? extends U> a) {
600 >                return f.handleAsync(a);
601              }
602              public <T> CompletableFuture<T> whenComplete
603                  (CompletableFuture<T> f,
604                   BiConsumer<? super T,? super Throwable> a) {
605 <                return f.whenComplete(a);
605 >                return f.whenCompleteAsync(a);
606              }
502        },
503
504 //             /** Experimental way to do more testing */
505 //         REVERSE_DEFAULT {
506 //             public <T,U> CompletableFuture<Void> runAfterBoth
507 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
508 //                 return g.runAfterBoth(f, a);
509 //             }
510 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
511 //                 (CompletableFuture<T> f,
512 //                  CompletionStage<? extends U> g,
513 //                  BiConsumer<? super T,? super U> a) {
514 //                 return DEFAULT.thenAcceptBoth(f, g, a);
515 //             }
516 //         },
517
518        DEFAULT_ASYNC {
607              public <T,U> CompletableFuture<Void> runAfterBoth
608                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
609                  return f.runAfterBothAsync(g, a);
# Line 532 | Line 620 | public class CompletableFutureTest exten
620                   BiFunction<? super T,? super U,? extends V> a) {
621                  return f.thenCombineAsync(g, a);
622              }
623 <            public <T,U> CompletableFuture<U> applyToEither
623 >            public <T> CompletableFuture<Void> runAfterEither
624                  (CompletableFuture<T> f,
625 <                 CompletionStage<? extends T> g,
626 <                 Function<? super T,U> a) {
627 <                return f.applyToEitherAsync(g, a);
625 >                 CompletionStage<?> g,
626 >                 java.lang.Runnable a) {
627 >                return f.runAfterEitherAsync(g, a);
628              }
629              public <T> CompletableFuture<Void> acceptEither
630                  (CompletableFuture<T> f,
# Line 544 | Line 632 | public class CompletableFutureTest exten
632                   Consumer<? super T> a) {
633                  return f.acceptEitherAsync(g, a);
634              }
635 <            public <T> CompletableFuture<Void> runAfterEither
635 >            public <T,U> CompletableFuture<U> applyToEither
636                  (CompletableFuture<T> f,
637 <                 CompletionStage<?> g,
638 <                 java.lang.Runnable a) {
639 <                return f.runAfterEitherAsync(g, a);
637 >                 CompletionStage<? extends T> g,
638 >                 Function<? super T,U> a) {
639 >                return f.applyToEitherAsync(g, a);
640 >            }
641 >        },
642 >
643 >        EXECUTOR {
644 >            public void checkExecutionMode() {
645 >                assertTrue(ThreadExecutor.startedCurrentThread());
646 >            }
647 >            public CompletableFuture<Void> runAsync(Runnable a) {
648 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
649 >            }
650 >            public <T> CompletableFuture<Void> thenRun
651 >                (CompletableFuture<T> f, Runnable a) {
652 >                return f.thenRunAsync(a, new ThreadExecutor());
653 >            }
654 >            public <T> CompletableFuture<Void> thenAccept
655 >                (CompletableFuture<T> f, Consumer<? super T> a) {
656 >                return f.thenAcceptAsync(a, new ThreadExecutor());
657 >            }
658 >            public <T,U> CompletableFuture<U> thenApply
659 >                (CompletableFuture<T> f, Function<? super T,U> a) {
660 >                return f.thenApplyAsync(a, new ThreadExecutor());
661              }
662              public <T,U> CompletableFuture<U> thenCompose
663                  (CompletableFuture<T> f,
664                   Function<? super T,? extends CompletionStage<U>> a) {
665 <                return f.thenComposeAsync(a);
665 >                return f.thenComposeAsync(a, new ThreadExecutor());
666 >            }
667 >            public <T,U> CompletableFuture<U> handle
668 >                (CompletableFuture<T> f,
669 >                 BiFunction<? super T,Throwable,? extends U> a) {
670 >                return f.handleAsync(a, new ThreadExecutor());
671              }
672              public <T> CompletableFuture<T> whenComplete
673                  (CompletableFuture<T> f,
674                   BiConsumer<? super T,? super Throwable> a) {
675 <                return f.whenCompleteAsync(a);
675 >                return f.whenCompleteAsync(a, new ThreadExecutor());
676              }
563        },
564
565 //         REVERSE_DEFAULT_ASYNC {
566 //             public <T,U> CompletableFuture<Void> runAfterBoth
567 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
568 //                 return f.runAfterBothAsync(g, a);
569 //             }
570 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
571 //                 (CompletableFuture<T> f,
572 //                  CompletionStage<? extends U> g,
573 //                  BiConsumer<? super T,? super U> a) {
574 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
575 //             }
576 //         },
577
578        EXECUTOR {
677              public <T,U> CompletableFuture<Void> runAfterBoth
678                  (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
679                  return f.runAfterBothAsync(g, a, new ThreadExecutor());
# Line 592 | Line 690 | public class CompletableFutureTest exten
690                   BiFunction<? super T,? super U,? extends V> a) {
691                  return f.thenCombineAsync(g, a, new ThreadExecutor());
692              }
595            public <T,U> CompletableFuture<U> applyToEither
596                (CompletableFuture<T> f,
597                 CompletionStage<? extends T> g,
598                 Function<? super T,U> a) {
599                return f.applyToEitherAsync(g, a, new ThreadExecutor());
600            }
601            public <T> CompletableFuture<Void> acceptEither
602                (CompletableFuture<T> f,
603                 CompletionStage<? extends T> g,
604                 Consumer<? super T> a) {
605                return f.acceptEitherAsync(g, a, new ThreadExecutor());
606            }
693              public <T> CompletableFuture<Void> runAfterEither
694                  (CompletableFuture<T> f,
695                   CompletionStage<?> g,
696                   java.lang.Runnable a) {
697                  return f.runAfterEitherAsync(g, a, new ThreadExecutor());
698              }
699 <            public <T,U> CompletableFuture<U> thenCompose
699 >            public <T> CompletableFuture<Void> acceptEither
700                  (CompletableFuture<T> f,
701 <                 Function<? super T,? extends CompletionStage<U>> a) {
702 <                return f.thenComposeAsync(a, new ThreadExecutor());
701 >                 CompletionStage<? extends T> g,
702 >                 Consumer<? super T> a) {
703 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
704              }
705 <            public <T> CompletableFuture<T> whenComplete
705 >            public <T,U> CompletableFuture<U> applyToEither
706                  (CompletableFuture<T> f,
707 <                 BiConsumer<? super T,? super Throwable> a) {
708 <                return f.whenCompleteAsync(a, new ThreadExecutor());
707 >                 CompletionStage<? extends T> g,
708 >                 Function<? super T,U> a) {
709 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
710              }
711          };
712  
713 +        public abstract void checkExecutionMode();
714 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
715 +        public abstract <T> CompletableFuture<Void> thenRun
716 +            (CompletableFuture<T> f, Runnable a);
717 +        public abstract <T> CompletableFuture<Void> thenAccept
718 +            (CompletableFuture<T> f, Consumer<? super T> a);
719 +        public abstract <T,U> CompletableFuture<U> thenApply
720 +            (CompletableFuture<T> f, Function<? super T,U> a);
721 +        public abstract <T,U> CompletableFuture<U> thenCompose
722 +            (CompletableFuture<T> f,
723 +             Function<? super T,? extends CompletionStage<U>> a);
724 +        public abstract <T,U> CompletableFuture<U> handle
725 +            (CompletableFuture<T> f,
726 +             BiFunction<? super T,Throwable,? extends U> a);
727 +        public abstract <T> CompletableFuture<T> whenComplete
728 +            (CompletableFuture<T> f,
729 +             BiConsumer<? super T,? super Throwable> a);
730          public abstract <T,U> CompletableFuture<Void> runAfterBoth
731              (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
732          public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
# Line 632 | Line 737 | public class CompletableFutureTest exten
737              (CompletableFuture<T> f,
738               CompletionStage<? extends U> g,
739               BiFunction<? super T,? super U,? extends V> a);
635        public abstract <T,U> CompletableFuture<U> applyToEither
636            (CompletableFuture<T> f,
637             CompletionStage<? extends T> g,
638             Function<? super T,U> a);
639        public abstract <T> CompletableFuture<Void> acceptEither
640            (CompletableFuture<T> f,
641             CompletionStage<? extends T> g,
642             Consumer<? super T> a);
740          public abstract <T> CompletableFuture<Void> runAfterEither
741              (CompletableFuture<T> f,
742               CompletionStage<?> g,
743               java.lang.Runnable a);
744 <        public abstract <T,U> CompletableFuture<U> thenCompose
744 >        public abstract <T> CompletableFuture<Void> acceptEither
745              (CompletableFuture<T> f,
746 <             Function<? super T,? extends CompletionStage<U>> a);
747 <        public abstract <T> CompletableFuture<T> whenComplete
746 >             CompletionStage<? extends T> g,
747 >             Consumer<? super T> a);
748 >        public abstract <T,U> CompletableFuture<U> applyToEither
749              (CompletableFuture<T> f,
750 <             BiConsumer<? super T,? super Throwable> a);
750 >             CompletionStage<? extends T> g,
751 >             Function<? super T,U> a);
752 >    }
753  
754 +    /**
755 +     * exceptionally action is not invoked when source completes
756 +     * normally, and source result is propagated
757 +     */
758 +    public void testExceptionally_normalCompletion() {
759 +        for (boolean createIncomplete : new boolean[] { true, false })
760 +        for (Integer v1 : new Integer[] { 1, null })
761 +    {
762 +        final AtomicInteger a = new AtomicInteger(0);
763 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
764 +        if (!createIncomplete) f.complete(v1);
765 +        final CompletableFuture<Integer> g = f.exceptionally
766 +            ((Throwable t) -> {
767 +                // Should not be called
768 +                a.getAndIncrement();
769 +                throw new AssertionError();
770 +            });
771 +        if (createIncomplete) f.complete(v1);
772 +
773 +        checkCompletedNormally(g, v1);
774 +        checkCompletedNormally(f, v1);
775 +        assertEquals(0, a.get());
776 +    }}
777  
655    }
778  
779      /**
780       * exceptionally action completes with function value on source
781 <     * exception; otherwise with source value
781 >     * exception
782       */
783 <    public void testExceptionally() {
784 <        CompletableFuture<Integer> f = new CompletableFuture<>();
785 <        ExceptionToInteger r = new ExceptionToInteger();
786 <        CompletableFuture<Integer> g = f.exceptionally(r);
787 <        f.completeExceptionally(new CFException());
788 <        checkCompletedNormally(g, three);
783 >    public void testExceptionally_exceptionalCompletion() {
784 >        for (boolean createIncomplete : new boolean[] { true, false })
785 >        for (Integer v1 : new Integer[] { 1, null })
786 >    {
787 >        final AtomicInteger a = new AtomicInteger(0);
788 >        final CFException ex = new CFException();
789 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
790 >        if (!createIncomplete) f.completeExceptionally(ex);
791 >        final CompletableFuture<Integer> g = f.exceptionally
792 >            ((Throwable t) -> {
793 >                ExecutionMode.DEFAULT.checkExecutionMode();
794 >                threadAssertSame(t, ex);
795 >                a.getAndIncrement();
796 >                return v1;
797 >            });
798 >        if (createIncomplete) f.completeExceptionally(ex);
799  
800 <        f = new CompletableFuture<>();
801 <        r = new ExceptionToInteger();
802 <        g = f.exceptionally(r);
803 <        f.complete(one);
804 <        checkCompletedNormally(g, one);
805 <    }
800 >        checkCompletedNormally(g, v1);
801 >        assertEquals(1, a.get());
802 >    }}
803 >
804 >    public void testExceptionally_exceptionalCompletionActionFailed() {
805 >        for (boolean createIncomplete : new boolean[] { true, false })
806 >        for (Integer v1 : new Integer[] { 1, null })
807 >    {
808 >        final AtomicInteger a = new AtomicInteger(0);
809 >        final CFException ex1 = new CFException();
810 >        final CFException ex2 = new CFException();
811 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
812 >        if (!createIncomplete) f.completeExceptionally(ex1);
813 >        final CompletableFuture<Integer> g = f.exceptionally
814 >            ((Throwable t) -> {
815 >                ExecutionMode.DEFAULT.checkExecutionMode();
816 >                threadAssertSame(t, ex1);
817 >                a.getAndIncrement();
818 >                throw ex2;
819 >            });
820 >        if (createIncomplete) f.completeExceptionally(ex1);
821 >
822 >        checkCompletedWithWrappedCFException(g, ex2);
823 >        assertEquals(1, a.get());
824 >    }}
825  
826      /**
827 <     * handle action completes normally with function value on either
828 <     * normal or exceptional completion of source
827 >     * handle action completes normally with function value on normal
828 >     * completion of source
829       */
830 <    public void testHandle() {
831 <        CompletableFuture<Integer> f, g;
832 <        IntegerHandler r;
830 >    public void testHandle_normalCompletion() {
831 >        for (ExecutionMode m : ExecutionMode.values())
832 >        for (boolean createIncomplete : new boolean[] { true, false })
833 >        for (Integer v1 : new Integer[] { 1, null })
834 >    {
835 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
836 >        final AtomicInteger a = new AtomicInteger(0);
837 >        if (!createIncomplete) f.complete(v1);
838 >        final CompletableFuture<Integer> g = m.handle
839 >            (f,
840 >             (Integer x, Throwable t) -> {
841 >                m.checkExecutionMode();
842 >                threadAssertSame(x, v1);
843 >                threadAssertNull(t);
844 >                a.getAndIncrement();
845 >                return inc(v1);
846 >            });
847 >        if (createIncomplete) f.complete(v1);
848  
849 <        f = new CompletableFuture<>();
850 <        f.completeExceptionally(new CFException());
851 <        g = f.handle(r = new IntegerHandler());
852 <        assertTrue(r.ran);
687 <        checkCompletedNormally(g, three);
849 >        checkCompletedNormally(g, inc(v1));
850 >        checkCompletedNormally(f, v1);
851 >        assertEquals(1, a.get());
852 >    }}
853  
854 <        f = new CompletableFuture<>();
855 <        g = f.handle(r = new IntegerHandler());
856 <        assertFalse(r.ran);
857 <        f.completeExceptionally(new CFException());
858 <        checkCompletedNormally(g, three);
859 <        assertTrue(r.ran);
854 >    /**
855 >     * handle action completes normally with function value on
856 >     * exceptional completion of source
857 >     */
858 >    public void testHandle_exceptionalCompletion() {
859 >        for (ExecutionMode m : ExecutionMode.values())
860 >        for (boolean createIncomplete : new boolean[] { true, false })
861 >        for (Integer v1 : new Integer[] { 1, null })
862 >    {
863 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
864 >        final AtomicInteger a = new AtomicInteger(0);
865 >        final CFException ex = new CFException();
866 >        if (!createIncomplete) f.completeExceptionally(ex);
867 >        final CompletableFuture<Integer> g = m.handle
868 >            (f,
869 >             (Integer x, Throwable t) -> {
870 >                m.checkExecutionMode();
871 >                threadAssertNull(x);
872 >                threadAssertSame(t, ex);
873 >                a.getAndIncrement();
874 >                return v1;
875 >            });
876 >        if (createIncomplete) f.completeExceptionally(ex);
877  
878 <        f = new CompletableFuture<>();
879 <        f.complete(one);
880 <        g = f.handle(r = new IntegerHandler());
881 <        assertTrue(r.ran);
700 <        checkCompletedNormally(g, two);
878 >        checkCompletedNormally(g, v1);
879 >        checkCompletedWithWrappedCFException(f, ex);
880 >        assertEquals(1, a.get());
881 >    }}
882  
883 <        f = new CompletableFuture<>();
884 <        g = f.handle(r = new IntegerHandler());
885 <        assertFalse(r.ran);
886 <        f.complete(one);
887 <        assertTrue(r.ran);
888 <        checkCompletedNormally(g, two);
889 <    }
883 >    /**
884 >     * handle action completes normally with function value on
885 >     * cancelled source
886 >     */
887 >    public void testHandle_sourceCancelled() {
888 >        for (ExecutionMode m : ExecutionMode.values())
889 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
890 >        for (boolean createIncomplete : new boolean[] { true, false })
891 >        for (Integer v1 : new Integer[] { 1, null })
892 >    {
893 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
894 >        final AtomicInteger a = new AtomicInteger(0);
895 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
896 >        final CompletableFuture<Integer> g = m.handle
897 >            (f,
898 >             (Integer x, Throwable t) -> {
899 >                m.checkExecutionMode();
900 >                threadAssertNull(x);
901 >                threadAssertTrue(t instanceof CancellationException);
902 >                a.getAndIncrement();
903 >                return v1;
904 >            });
905 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
906 >
907 >        checkCompletedNormally(g, v1);
908 >        checkCancelled(f);
909 >        assertEquals(1, a.get());
910 >    }}
911  
912      /**
913 <     * runAsync completes after running Runnable
913 >     * handle result completes exceptionally if action does
914       */
915 <    public void testRunAsync() {
916 <        Noop r = new Noop();
917 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
918 <        assertNull(f.join());
919 <        assertTrue(r.ran);
920 <        checkCompletedNormally(f, null);
921 <    }
915 >    public void testHandle_sourceFailedActionFailed() {
916 >        for (ExecutionMode m : ExecutionMode.values())
917 >        for (boolean createIncomplete : new boolean[] { true, false })
918 >    {
919 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
920 >        final AtomicInteger a = new AtomicInteger(0);
921 >        final CFException ex1 = new CFException();
922 >        final CFException ex2 = new CFException();
923 >        if (!createIncomplete) f.completeExceptionally(ex1);
924 >        final CompletableFuture<Integer> g = m.handle
925 >            (f,
926 >             (Integer x, Throwable t) -> {
927 >                m.checkExecutionMode();
928 >                threadAssertNull(x);
929 >                threadAssertSame(ex1, t);
930 >                a.getAndIncrement();
931 >                throw ex2;
932 >            });
933 >        if (createIncomplete) f.completeExceptionally(ex1);
934 >
935 >        checkCompletedWithWrappedCFException(g, ex2);
936 >        checkCompletedWithWrappedCFException(f, ex1);
937 >        assertEquals(1, a.get());
938 >    }}
939 >
940 >    public void testHandle_sourceCompletedNormallyActionFailed() {
941 >        for (ExecutionMode m : ExecutionMode.values())
942 >        for (boolean createIncomplete : new boolean[] { true, false })
943 >        for (Integer v1 : new Integer[] { 1, null })
944 >    {
945 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
946 >        final AtomicInteger a = new AtomicInteger(0);
947 >        final CFException ex = new CFException();
948 >        if (!createIncomplete) f.complete(v1);
949 >        final CompletableFuture<Integer> g = m.handle
950 >            (f,
951 >             (Integer x, Throwable t) -> {
952 >                m.checkExecutionMode();
953 >                threadAssertSame(x, v1);
954 >                threadAssertNull(t);
955 >                a.getAndIncrement();
956 >                throw ex;
957 >            });
958 >        if (createIncomplete) f.complete(v1);
959 >
960 >        checkCompletedWithWrappedCFException(g, ex);
961 >        checkCompletedNormally(f, v1);
962 >        assertEquals(1, a.get());
963 >    }}
964  
965      /**
966 <     * runAsync with executor completes after running Runnable
966 >     * runAsync completes after running Runnable
967       */
968 <    public void testRunAsync2() {
969 <        Noop r = new Noop();
970 <        ThreadExecutor exec = new ThreadExecutor();
971 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
968 >    public void testRunAsync_normalCompletion() {
969 >        ExecutionMode[] executionModes = {
970 >            ExecutionMode.ASYNC,
971 >            ExecutionMode.EXECUTOR,
972 >        };
973 >        for (ExecutionMode m : executionModes)
974 >    {
975 >        final Noop r = new Noop(m);
976 >        final CompletableFuture<Void> f = m.runAsync(r);
977          assertNull(f.join());
729        assertTrue(r.ran);
978          checkCompletedNormally(f, null);
979 <        assertEquals(1, exec.count.get());
980 <    }
979 >        assertEquals(1, r.invocationCount);
980 >    }}
981  
982      /**
983       * failing runAsync completes exceptionally after running Runnable
984       */
985 <    public void testRunAsync3() {
986 <        FailingNoop r = new FailingNoop();
987 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
985 >    public void testRunAsync_exceptionalCompletion() {
986 >        ExecutionMode[] executionModes = {
987 >            ExecutionMode.ASYNC,
988 >            ExecutionMode.EXECUTOR,
989 >        };
990 >        for (ExecutionMode m : executionModes)
991 >    {
992 >        final FailingRunnable r = new FailingRunnable(m);
993 >        final CompletableFuture<Void> f = m.runAsync(r);
994          checkCompletedWithWrappedCFException(f);
995 <        assertTrue(r.ran);
996 <    }
995 >        assertEquals(1, r.invocationCount);
996 >    }}
997  
998      /**
999       * supplyAsync completes with result of supplier
# Line 765 | Line 1019 | public class CompletableFutureTest exten
1019       * Failing supplyAsync completes exceptionally
1020       */
1021      public void testSupplyAsync3() {
1022 <        FailingSupplier r = new FailingSupplier();
1022 >        FailingSupplier r = new FailingSupplier(ExecutionMode.ASYNC);
1023          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1024          checkCompletedWithWrappedCFException(f);
1025 <        assertTrue(r.ran);
1025 >        assertEquals(1, r.invocationCount);
1026      }
1027  
1028      // seq completion methods
# Line 776 | Line 1030 | public class CompletableFutureTest exten
1030      /**
1031       * thenRun result completes normally after normal completion of source
1032       */
1033 <    public void testThenRun() {
1034 <        CompletableFuture<Integer> f;
1035 <        CompletableFuture<Void> g;
1036 <        Noop r;
1037 <
1038 <        f = new CompletableFuture<>();
1039 <        g = f.thenRun(r = new Noop());
1040 <        f.complete(null);
1041 <        checkCompletedNormally(g, null);
1042 <        assertTrue(r.ran);
1033 >    public void testThenRun_normalCompletion() {
1034 >        for (ExecutionMode m : ExecutionMode.values())
1035 >        for (boolean createIncomplete : new boolean[] { true, false })
1036 >        for (Integer v1 : new Integer[] { 1, null })
1037 >    {
1038 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1039 >        final Noop r = new Noop(m);
1040 >        if (!createIncomplete) f.complete(v1);
1041 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1042 >        if (createIncomplete) {
1043 >            checkIncomplete(g);
1044 >            f.complete(v1);
1045 >        }
1046  
790        f = new CompletableFuture<>();
791        f.complete(null);
792        g = f.thenRun(r = new Noop());
1047          checkCompletedNormally(g, null);
1048 <        assertTrue(r.ran);
1049 <    }
1048 >        checkCompletedNormally(f, v1);
1049 >        assertEquals(1, r.invocationCount);
1050 >    }}
1051  
1052      /**
1053       * thenRun result completes exceptionally after exceptional
1054       * completion of source
1055       */
1056 <    public void testThenRun2() {
1057 <        CompletableFuture<Integer> f;
1058 <        CompletableFuture<Void> g;
1059 <        Noop r;
1060 <
1061 <        f = new CompletableFuture<>();
1062 <        g = f.thenRun(r = new Noop());
1063 <        f.completeExceptionally(new CFException());
1064 <        checkCompletedWithWrappedCFException(g);
1065 <        assertFalse(r.ran);
1056 >    public void testThenRun_exceptionalCompletion() {
1057 >        for (ExecutionMode m : ExecutionMode.values())
1058 >        for (boolean createIncomplete : new boolean[] { true, false })
1059 >    {
1060 >        final CFException ex = new CFException();
1061 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1062 >        final Noop r = new Noop(m);
1063 >        if (!createIncomplete) f.completeExceptionally(ex);
1064 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1065 >        if (createIncomplete) {
1066 >            checkIncomplete(g);
1067 >            f.completeExceptionally(ex);
1068 >        }
1069  
1070 <        f = new CompletableFuture<>();
1071 <        f.completeExceptionally(new CFException());
1072 <        g = f.thenRun(r = new Noop());
1073 <        checkCompletedWithWrappedCFException(g);
816 <        assertFalse(r.ran);
817 <    }
1070 >        checkCompletedWithWrappedCFException(g, ex);
1071 >        checkCompletedWithWrappedCFException(f, ex);
1072 >        assertEquals(0, r.invocationCount);
1073 >    }}
1074  
1075      /**
1076 <     * thenRun result completes exceptionally if action does
1076 >     * thenRun result completes exceptionally if source cancelled
1077       */
1078 <    public void testThenRun3() {
1079 <        CompletableFuture<Integer> f;
1080 <        CompletableFuture<Void> g;
1081 <        FailingNoop r;
1082 <
1083 <        f = new CompletableFuture<>();
1084 <        g = f.thenRun(r = new FailingNoop());
1085 <        f.complete(null);
1086 <        checkCompletedWithWrappedCFException(g);
1078 >    public void testThenRun_sourceCancelled() {
1079 >        for (ExecutionMode m : ExecutionMode.values())
1080 >        for (boolean createIncomplete : new boolean[] { true, false })
1081 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1082 >    {
1083 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1084 >        final Noop r = new Noop(m);
1085 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1086 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1087 >        if (createIncomplete) {
1088 >            checkIncomplete(g);
1089 >            assertTrue(f.cancel(mayInterruptIfRunning));
1090 >        }
1091  
1092 <        f = new CompletableFuture<>();
1093 <        f.complete(null);
1094 <        g = f.thenRun(r = new FailingNoop());
1095 <        checkCompletedWithWrappedCFException(g);
836 <    }
1092 >        checkCompletedWithWrappedCancellationException(g);
1093 >        checkCancelled(f);
1094 >        assertEquals(0, r.invocationCount);
1095 >    }}
1096  
1097      /**
1098 <     * thenRun result completes exceptionally if source cancelled
1098 >     * thenRun result completes exceptionally if action does
1099       */
1100 <    public void testThenRun4() {
1101 <        CompletableFuture<Integer> f;
1102 <        CompletableFuture<Void> g;
1103 <        Noop r;
1104 <
1105 <        f = new CompletableFuture<>();
1106 <        g = f.thenRun(r = new Noop());
1107 <        assertTrue(f.cancel(true));
1108 <        checkCompletedWithWrappedCancellationException(g);
1100 >    public void testThenRun_actionFailed() {
1101 >        for (ExecutionMode m : ExecutionMode.values())
1102 >        for (boolean createIncomplete : new boolean[] { true, false })
1103 >        for (Integer v1 : new Integer[] { 1, null })
1104 >    {
1105 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1106 >        final FailingRunnable r = new FailingRunnable(m);
1107 >        if (!createIncomplete) f.complete(v1);
1108 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1109 >        if (createIncomplete) {
1110 >            checkIncomplete(g);
1111 >            f.complete(v1);
1112 >        }
1113  
1114 <        f = new CompletableFuture<>();
1115 <        assertTrue(f.cancel(true));
1116 <        g = f.thenRun(r = new Noop());
854 <        checkCompletedWithWrappedCancellationException(g);
855 <    }
1114 >        checkCompletedWithWrappedCFException(g);
1115 >        checkCompletedNormally(f, v1);
1116 >    }}
1117  
1118      /**
1119       * thenApply result completes normally after normal completion of source
1120       */
1121 <    public void testThenApply() {
1122 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1123 <        CompletableFuture<Integer> g = f.thenApply(inc);
1124 <        f.complete(one);
1125 <        checkCompletedNormally(g, two);
1126 <    }
1121 >    public void testThenApply_normalCompletion() {
1122 >        for (ExecutionMode m : ExecutionMode.values())
1123 >        for (boolean createIncomplete : new boolean[] { true, false })
1124 >        for (Integer v1 : new Integer[] { 1, null })
1125 >    {
1126 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1127 >        final IncFunction r = new IncFunction(m);
1128 >        if (!createIncomplete) f.complete(v1);
1129 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1130 >        if (createIncomplete) {
1131 >            checkIncomplete(g);
1132 >            f.complete(v1);
1133 >        }
1134 >
1135 >        checkCompletedNormally(g, inc(v1));
1136 >        checkCompletedNormally(f, v1);
1137 >        assertEquals(1, r.invocationCount);
1138 >    }}
1139  
1140      /**
1141       * thenApply result completes exceptionally after exceptional
1142       * completion of source
1143       */
1144 <    public void testThenApply2() {
1145 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1146 <        CompletableFuture<Integer> g = f.thenApply(inc);
1147 <        f.completeExceptionally(new CFException());
1148 <        checkCompletedWithWrappedCFException(g);
1149 <    }
1144 >    public void testThenApply_exceptionalCompletion() {
1145 >        for (ExecutionMode m : ExecutionMode.values())
1146 >        for (boolean createIncomplete : new boolean[] { true, false })
1147 >    {
1148 >        final CFException ex = new CFException();
1149 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1150 >        final IncFunction r = new IncFunction(m);
1151 >        if (!createIncomplete) f.completeExceptionally(ex);
1152 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1153 >        if (createIncomplete) {
1154 >            checkIncomplete(g);
1155 >            f.completeExceptionally(ex);
1156 >        }
1157  
1158 <    /**
1159 <     * thenApply result completes exceptionally if action does
1160 <     */
1161 <    public void testThenApply3() {
882 <        CompletableFuture<Integer> f = new CompletableFuture<>();
883 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
884 <        f.complete(one);
885 <        checkCompletedWithWrappedCFException(g);
886 <    }
1158 >        checkCompletedWithWrappedCFException(g, ex);
1159 >        checkCompletedWithWrappedCFException(f, ex);
1160 >        assertEquals(0, r.invocationCount);
1161 >    }}
1162  
1163      /**
1164       * thenApply result completes exceptionally if source cancelled
1165       */
1166 <    public void testThenApply4() {
1167 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1168 <        CompletableFuture<Integer> g = f.thenApply(inc);
1169 <        assertTrue(f.cancel(true));
1166 >    public void testThenApply_sourceCancelled() {
1167 >        for (ExecutionMode m : ExecutionMode.values())
1168 >        for (boolean createIncomplete : new boolean[] { true, false })
1169 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1170 >    {
1171 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1172 >        final IncFunction r = new IncFunction(m);
1173 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1174 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1175 >        if (createIncomplete) {
1176 >            checkIncomplete(g);
1177 >            assertTrue(f.cancel(mayInterruptIfRunning));
1178 >        }
1179 >
1180          checkCompletedWithWrappedCancellationException(g);
1181 <    }
1181 >        checkCancelled(f);
1182 >        assertEquals(0, r.invocationCount);
1183 >    }}
1184  
1185      /**
1186 <     * thenAccept result completes normally after normal completion of source
1186 >     * thenApply result completes exceptionally if action does
1187       */
1188 <    public void testThenAccept() {
1189 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1190 <        IncAction r = new IncAction();
1191 <        CompletableFuture<Void> g = f.thenAccept(r);
1192 <        f.complete(one);
1193 <        checkCompletedNormally(g, null);
1194 <        assertEquals(r.value, (Integer) 2);
1195 <    }
1188 >    public void testThenApply_actionFailed() {
1189 >        for (ExecutionMode m : ExecutionMode.values())
1190 >        for (boolean createIncomplete : new boolean[] { true, false })
1191 >        for (Integer v1 : new Integer[] { 1, null })
1192 >    {
1193 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1194 >        final FailingFunction r = new FailingFunction(m);
1195 >        if (!createIncomplete) f.complete(v1);
1196 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1197 >        if (createIncomplete) {
1198 >            checkIncomplete(g);
1199 >            f.complete(v1);
1200 >        }
1201  
910    /**
911     * thenAccept result completes exceptionally after exceptional
912     * completion of source
913     */
914    public void testThenAccept2() {
915        CompletableFuture<Integer> f = new CompletableFuture<>();
916        IncAction r = new IncAction();
917        CompletableFuture<Void> g = f.thenAccept(r);
918        f.completeExceptionally(new CFException());
1202          checkCompletedWithWrappedCFException(g);
1203 <    }
1203 >        checkCompletedNormally(f, v1);
1204 >    }}
1205  
1206      /**
1207 <     * thenAccept result completes exceptionally if action does
1207 >     * thenAccept result completes normally after normal completion of source
1208       */
1209 <    public void testThenAccept3() {
1210 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1211 <        FailingConsumer r = new FailingConsumer();
1212 <        CompletableFuture<Void> g = f.thenAccept(r);
1213 <        f.complete(one);
1214 <        checkCompletedWithWrappedCFException(g);
1215 <        assertTrue(r.ran);
1216 <    }
1209 >    public void testThenAccept_normalCompletion() {
1210 >        for (ExecutionMode m : ExecutionMode.values())
1211 >        for (boolean createIncomplete : new boolean[] { true, false })
1212 >        for (Integer v1 : new Integer[] { 1, null })
1213 >    {
1214 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1215 >        final IncAction r = new IncAction();
1216 >        if (!createIncomplete) f.complete(v1);
1217 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1218 >        if (createIncomplete) {
1219 >            checkIncomplete(g);
1220 >            f.complete(v1);
1221 >        }
1222  
1223 <    /**
1224 <     * thenAccept result completes exceptionally if source cancelled
1225 <     */
1226 <    public void testThenAccept4() {
1227 <        CompletableFuture<Integer> f = new CompletableFuture<>();
939 <        IncAction r = new IncAction();
940 <        CompletableFuture<Void> g = f.thenAccept(r);
941 <        assertTrue(f.cancel(true));
942 <        checkCompletedWithWrappedCancellationException(g);
943 <    }
1223 >        checkCompletedNormally(g, null);
1224 >        checkCompletedNormally(f, v1);
1225 >        assertEquals(1, r.invocationCount);
1226 >        assertEquals(inc(v1), r.value);
1227 >    }}
1228  
1229      /**
1230 <     * thenCombine result completes normally after normal completion
1231 <     * of sources
1230 >     * thenAccept result completes exceptionally after exceptional
1231 >     * completion of source
1232       */
1233 <    public void testThenCombine_normalCompletion1() {
1233 >    public void testThenAccept_exceptionalCompletion() {
1234          for (ExecutionMode m : ExecutionMode.values())
1235 <        for (Integer v1 : new Integer[] { 1, null })
1236 <        for (Integer v2 : new Integer[] { 2, null }) {
1237 <
1235 >        for (boolean createIncomplete : new boolean[] { true, false })
1236 >    {
1237 >        final CFException ex = new CFException();
1238          final CompletableFuture<Integer> f = new CompletableFuture<>();
1239 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1240 <        final SubtractFunction r = new SubtractFunction();
1241 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1242 <
1243 <        f.complete(v1);
1244 <        checkIncomplete(h);
961 <        assertEquals(r.invocationCount, 0);
962 <        g.complete(v2);
963 <
964 <        checkCompletedNormally(h, subtract(v1, v2));
965 <        checkCompletedNormally(f, v1);
966 <        checkCompletedNormally(g, v2);
967 <        assertEquals(r.invocationCount, 1);
1239 >        final IncAction r = new IncAction();
1240 >        if (!createIncomplete) f.completeExceptionally(ex);
1241 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1242 >        if (createIncomplete) {
1243 >            checkIncomplete(g);
1244 >            f.completeExceptionally(ex);
1245          }
969    }
1246  
1247 <    public void testThenCombine_normalCompletion2() {
1247 >        checkCompletedWithWrappedCFException(g, ex);
1248 >        checkCompletedWithWrappedCFException(f, ex);
1249 >        assertEquals(0, r.invocationCount);
1250 >    }}
1251 >
1252 >    /**
1253 >     * thenAccept result completes exceptionally if action does
1254 >     */
1255 >    public void testThenAccept_actionFailed() {
1256          for (ExecutionMode m : ExecutionMode.values())
1257 +        for (boolean createIncomplete : new boolean[] { true, false })
1258          for (Integer v1 : new Integer[] { 1, null })
1259 <        for (Integer v2 : new Integer[] { 2, null }) {
975 <
1259 >    {
1260          final CompletableFuture<Integer> f = new CompletableFuture<>();
1261 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1262 <        final SubtractFunction r = new SubtractFunction();
1263 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1264 <
1265 <        g.complete(v2);
1266 <        checkIncomplete(h);
1267 <        assertEquals(r.invocationCount, 0);
984 <        f.complete(v1);
1261 >        final FailingConsumer r = new FailingConsumer(m);
1262 >        if (!createIncomplete) f.complete(v1);
1263 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1264 >        if (createIncomplete) {
1265 >            checkIncomplete(g);
1266 >            f.complete(v1);
1267 >        }
1268  
1269 <        checkCompletedNormally(h, subtract(v1, v2));
1269 >        checkCompletedWithWrappedCFException(g);
1270          checkCompletedNormally(f, v1);
1271 <        checkCompletedNormally(g, v2);
989 <        assertEquals(r.invocationCount, 1);
990 <        }
991 <    }
1271 >    }}
1272  
1273 <    public void testThenCombine_normalCompletion3() {
1273 >    /**
1274 >     * thenAccept result completes exceptionally if source cancelled
1275 >     */
1276 >    public void testThenAccept_sourceCancelled() {
1277          for (ExecutionMode m : ExecutionMode.values())
1278 <        for (Integer v1 : new Integer[] { 1, null })
1279 <        for (Integer v2 : new Integer[] { 2, null }) {
1280 <
1278 >        for (boolean createIncomplete : new boolean[] { true, false })
1279 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1280 >    {
1281          final CompletableFuture<Integer> f = new CompletableFuture<>();
1282 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1283 <        final SubtractFunction r = new SubtractFunction();
1284 <
1285 <        g.complete(v2);
1286 <        f.complete(v1);
1287 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1005 <
1006 <        checkCompletedNormally(h, subtract(v1, v2));
1007 <        checkCompletedNormally(f, v1);
1008 <        checkCompletedNormally(g, v2);
1009 <        assertEquals(r.invocationCount, 1);
1282 >        final IncAction r = new IncAction();
1283 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1284 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1285 >        if (createIncomplete) {
1286 >            checkIncomplete(g);
1287 >            assertTrue(f.cancel(mayInterruptIfRunning));
1288          }
1011    }
1289  
1290 <    public void testThenCombine_normalCompletion4() {
1290 >        checkCompletedWithWrappedCancellationException(g);
1291 >        checkCancelled(f);
1292 >        assertEquals(0, r.invocationCount);
1293 >    }}
1294 >
1295 >    /**
1296 >     * thenCombine result completes normally after normal completion
1297 >     * of sources
1298 >     */
1299 >    public void testThenCombine_normalCompletion() {
1300          for (ExecutionMode m : ExecutionMode.values())
1301 +        for (boolean createIncomplete : new boolean[] { true, false })
1302 +        for (boolean fFirst : new boolean[] { true, false })
1303          for (Integer v1 : new Integer[] { 1, null })
1304 <        for (Integer v2 : new Integer[] { 2, null }) {
1305 <
1304 >        for (Integer v2 : new Integer[] { 2, null })
1305 >    {
1306          final CompletableFuture<Integer> f = new CompletableFuture<>();
1307          final CompletableFuture<Integer> g = new CompletableFuture<>();
1308 <        final SubtractFunction r = new SubtractFunction();
1308 >        final SubtractFunction r = new SubtractFunction(m);
1309  
1310 <        f.complete(v1);
1311 <        g.complete(v2);
1310 >        if (fFirst) f.complete(v1); else g.complete(v2);
1311 >        if (!createIncomplete)
1312 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1313          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1314 +        if (createIncomplete) {
1315 +            checkIncomplete(h);
1316 +            assertEquals(0, r.invocationCount);
1317 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1318 +        }
1319  
1320          checkCompletedNormally(h, subtract(v1, v2));
1321          checkCompletedNormally(f, v1);
1322          checkCompletedNormally(g, v2);
1323 <        assertEquals(r.invocationCount, 1);
1324 <        }
1031 <    }
1323 >        assertEquals(1, r.invocationCount);
1324 >    }}
1325  
1326      /**
1327       * thenCombine result completes exceptionally after exceptional
1328       * completion of either source
1329       */
1330 <    public void testThenCombine_exceptionalCompletion1() {
1038 <        for (ExecutionMode m : ExecutionMode.values())
1039 <        for (Integer v1 : new Integer[] { 1, null }) {
1040 <
1041 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1042 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1043 <        final SubtractFunction r = new SubtractFunction();
1044 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1045 <        final CFException ex = new CFException();
1046 <
1047 <        f.completeExceptionally(ex);
1048 <        checkIncomplete(h);
1049 <        g.complete(v1);
1050 <
1051 <        checkCompletedWithWrappedCFException(h, ex);
1052 <        checkCompletedWithWrappedCFException(f, ex);
1053 <        assertEquals(r.invocationCount, 0);
1054 <        checkCompletedNormally(g, v1);
1055 <        }
1056 <    }
1057 <
1058 <    public void testThenCombine_exceptionalCompletion2() {
1330 >    public void testThenCombine_exceptionalCompletion() {
1331          for (ExecutionMode m : ExecutionMode.values())
1332 <        for (Integer v1 : new Integer[] { 1, null }) {
1333 <
1334 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1064 <        final SubtractFunction r = new SubtractFunction();
1065 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1066 <        final CFException ex = new CFException();
1067 <
1068 <        g.completeExceptionally(ex);
1069 <        checkIncomplete(h);
1070 <        f.complete(v1);
1071 <
1072 <        checkCompletedWithWrappedCFException(h, ex);
1073 <        checkCompletedWithWrappedCFException(g, ex);
1074 <        assertEquals(r.invocationCount, 0);
1075 <        checkCompletedNormally(f, v1);
1076 <        }
1077 <    }
1078 <
1079 <    public void testThenCombine_exceptionalCompletion3() {
1080 <        for (ExecutionMode m : ExecutionMode.values())
1081 <        for (Integer v1 : new Integer[] { 1, null }) {
1082 <
1332 >        for (boolean createIncomplete : new boolean[] { true, false })
1333 >        for (boolean fFirst : new boolean[] { true, false })
1334 >        for (Integer v1 : new Integer[] { 1, null })
1335 >    {
1336          final CompletableFuture<Integer> f = new CompletableFuture<>();
1337          final CompletableFuture<Integer> g = new CompletableFuture<>();
1085        final SubtractFunction r = new SubtractFunction();
1338          final CFException ex = new CFException();
1339 +        final SubtractFunction r = new SubtractFunction(m);
1340  
1341 <        g.completeExceptionally(ex);
1342 <        f.complete(v1);
1341 >        (fFirst ? f : g).complete(v1);
1342 >        if (!createIncomplete)
1343 >            (!fFirst ? f : g).completeExceptionally(ex);
1344          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1345 <
1346 <        checkCompletedWithWrappedCFException(h, ex);
1347 <        checkCompletedWithWrappedCFException(g, ex);
1094 <        assertEquals(r.invocationCount, 0);
1095 <        checkCompletedNormally(f, v1);
1345 >        if (createIncomplete) {
1346 >            checkIncomplete(h);
1347 >            (!fFirst ? f : g).completeExceptionally(ex);
1348          }
1097    }
1098
1099    public void testThenCombine_exceptionalCompletion4() {
1100        for (ExecutionMode m : ExecutionMode.values())
1101        for (Integer v1 : new Integer[] { 1, null }) {
1102
1103        final CompletableFuture<Integer> f = new CompletableFuture<>();
1104        final CompletableFuture<Integer> g = new CompletableFuture<>();
1105        final SubtractFunction r = new SubtractFunction();
1106        final CFException ex = new CFException();
1107
1108        f.completeExceptionally(ex);
1109        g.complete(v1);
1110        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1349  
1350          checkCompletedWithWrappedCFException(h, ex);
1351 <        checkCompletedWithWrappedCFException(f, ex);
1352 <        assertEquals(r.invocationCount, 0);
1353 <        checkCompletedNormally(g, v1);
1354 <        }
1117 <    }
1351 >        assertEquals(0, r.invocationCount);
1352 >        checkCompletedNormally(fFirst ? f : g, v1);
1353 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1354 >    }}
1355  
1356      /**
1357       * thenCombine result completes exceptionally if action does
1358       */
1359 <    public void testThenCombine_actionFailed1() {
1359 >    public void testThenCombine_actionFailed() {
1360          for (ExecutionMode m : ExecutionMode.values())
1361 +        for (boolean fFirst : new boolean[] { true, false })
1362          for (Integer v1 : new Integer[] { 1, null })
1363 <        for (Integer v2 : new Integer[] { 2, null }) {
1364 <
1363 >        for (Integer v2 : new Integer[] { 2, null })
1364 >    {
1365          final CompletableFuture<Integer> f = new CompletableFuture<>();
1366          final CompletableFuture<Integer> g = new CompletableFuture<>();
1367 <        final FailingBiFunction r = new FailingBiFunction();
1367 >        final FailingBiFunction r = new FailingBiFunction(m);
1368          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1369  
1370 <        f.complete(v1);
1371 <        checkIncomplete(h);
1372 <        g.complete(v2);
1373 <
1374 <        checkCompletedWithWrappedCFException(h);
1375 <        checkCompletedNormally(f, v1);
1138 <        checkCompletedNormally(g, v2);
1370 >        if (fFirst) {
1371 >            f.complete(v1);
1372 >            g.complete(v2);
1373 >        } else {
1374 >            g.complete(v2);
1375 >            f.complete(v1);
1376          }
1140    }
1141
1142    public void testThenCombine_actionFailed2() {
1143        for (ExecutionMode m : ExecutionMode.values())
1144        for (Integer v1 : new Integer[] { 1, null })
1145        for (Integer v2 : new Integer[] { 2, null }) {
1146
1147        final CompletableFuture<Integer> f = new CompletableFuture<>();
1148        final CompletableFuture<Integer> g = new CompletableFuture<>();
1149        final FailingBiFunction r = new FailingBiFunction();
1150        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1151
1152        g.complete(v2);
1153        checkIncomplete(h);
1154        f.complete(v1);
1377  
1378          checkCompletedWithWrappedCFException(h);
1379          checkCompletedNormally(f, v1);
1380          checkCompletedNormally(g, v2);
1381 <        }
1160 <    }
1381 >    }}
1382  
1383      /**
1384       * thenCombine result completes exceptionally if either source cancelled
1385       */
1386 <    public void testThenCombine_sourceCancelled1() {
1386 >    public void testThenCombine_sourceCancelled() {
1387          for (ExecutionMode m : ExecutionMode.values())
1388          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1389 <        for (Integer v1 : new Integer[] { 1, null }) {
1390 <
1389 >        for (boolean createIncomplete : new boolean[] { true, false })
1390 >        for (boolean fFirst : new boolean[] { true, false })
1391 >        for (Integer v1 : new Integer[] { 1, null })
1392 >    {
1393          final CompletableFuture<Integer> f = new CompletableFuture<>();
1394          final CompletableFuture<Integer> g = new CompletableFuture<>();
1395 <        final SubtractFunction r = new SubtractFunction();
1173 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1174 <
1175 <        assertTrue(f.cancel(mayInterruptIfRunning));
1176 <        checkIncomplete(h);
1177 <        g.complete(v1);
1178 <
1179 <        checkCompletedWithWrappedCancellationException(h);
1180 <        checkCancelled(f);
1181 <        assertEquals(r.invocationCount, 0);
1182 <        checkCompletedNormally(g, v1);
1183 <        }
1184 <    }
1185 <
1186 <    public void testThenCombine_sourceCancelled2() {
1187 <        for (ExecutionMode m : ExecutionMode.values())
1188 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1189 <        for (Integer v1 : new Integer[] { 1, null }) {
1395 >        final SubtractFunction r = new SubtractFunction(m);
1396  
1397 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1398 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1399 <        final SubtractFunction r = new SubtractFunction();
1397 >        (fFirst ? f : g).complete(v1);
1398 >        if (!createIncomplete)
1399 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1400          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1401 <
1402 <        assertTrue(g.cancel(mayInterruptIfRunning));
1403 <        checkIncomplete(h);
1198 <        f.complete(v1);
1199 <
1200 <        checkCompletedWithWrappedCancellationException(h);
1201 <        checkCancelled(g);
1202 <        assertEquals(r.invocationCount, 0);
1203 <        checkCompletedNormally(f, v1);
1401 >        if (createIncomplete) {
1402 >            checkIncomplete(h);
1403 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1404          }
1205    }
1206
1207    public void testThenCombine_sourceCancelled3() {
1208        for (ExecutionMode m : ExecutionMode.values())
1209        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1210        for (Integer v1 : new Integer[] { 1, null }) {
1211
1212        final CompletableFuture<Integer> f = new CompletableFuture<>();
1213        final CompletableFuture<Integer> g = new CompletableFuture<>();
1214        final SubtractFunction r = new SubtractFunction();
1215
1216        assertTrue(g.cancel(mayInterruptIfRunning));
1217        f.complete(v1);
1218        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1405  
1406          checkCompletedWithWrappedCancellationException(h);
1407 <        checkCancelled(g);
1408 <        assertEquals(r.invocationCount, 0);
1409 <        checkCompletedNormally(f, v1);
1410 <        }
1225 <    }
1226 <
1227 <    public void testThenCombine_sourceCancelled4() {
1228 <        for (ExecutionMode m : ExecutionMode.values())
1229 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1230 <        for (Integer v1 : new Integer[] { 1, null }) {
1231 <
1232 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1233 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1234 <        final SubtractFunction r = new SubtractFunction();
1235 <
1236 <        assertTrue(f.cancel(mayInterruptIfRunning));
1237 <        g.complete(v1);
1238 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1239 <
1240 <        checkCompletedWithWrappedCancellationException(h);
1241 <        checkCancelled(f);
1242 <        assertEquals(r.invocationCount, 0);
1243 <        checkCompletedNormally(g, v1);
1244 <        }
1245 <    }
1407 >        checkCancelled(!fFirst ? f : g);
1408 >        assertEquals(0, r.invocationCount);
1409 >        checkCompletedNormally(fFirst ? f : g, v1);
1410 >    }}
1411  
1412      /**
1413       * thenAcceptBoth result completes normally after normal
1414       * completion of sources
1415       */
1416 <    public void testThenAcceptBoth_normalCompletion1() {
1252 <        for (ExecutionMode m : ExecutionMode.values())
1253 <        for (Integer v1 : new Integer[] { 1, null })
1254 <        for (Integer v2 : new Integer[] { 2, null }) {
1255 <
1256 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1257 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1258 <        final SubtractAction r = new SubtractAction();
1259 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1260 <
1261 <        f.complete(v1);
1262 <        checkIncomplete(h);
1263 <        assertFalse(r.ran());
1264 <        g.complete(v2);
1265 <
1266 <        checkCompletedNormally(h, null);
1267 <        assertEquals(r.value, subtract(v1, v2));
1268 <        checkCompletedNormally(f, v1);
1269 <        checkCompletedNormally(g, v2);
1270 <        }
1271 <    }
1272 <
1273 <    public void testThenAcceptBoth_normalCompletion2() {
1274 <        for (ExecutionMode m : ExecutionMode.values())
1275 <        for (Integer v1 : new Integer[] { 1, null })
1276 <        for (Integer v2 : new Integer[] { 2, null }) {
1277 <
1278 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280 <        final SubtractAction r = new SubtractAction();
1281 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1282 <
1283 <        g.complete(v2);
1284 <        checkIncomplete(h);
1285 <        assertFalse(r.ran());
1286 <        f.complete(v1);
1287 <
1288 <        checkCompletedNormally(h, null);
1289 <        assertEquals(r.value, subtract(v1, v2));
1290 <        checkCompletedNormally(f, v1);
1291 <        checkCompletedNormally(g, v2);
1292 <        }
1293 <    }
1294 <
1295 <    public void testThenAcceptBoth_normalCompletion3() {
1416 >    public void testThenAcceptBoth_normalCompletion() {
1417          for (ExecutionMode m : ExecutionMode.values())
1418 +        for (boolean createIncomplete : new boolean[] { true, false })
1419 +        for (boolean fFirst : new boolean[] { true, false })
1420          for (Integer v1 : new Integer[] { 1, null })
1421 <        for (Integer v2 : new Integer[] { 2, null }) {
1422 <
1421 >        for (Integer v2 : new Integer[] { 2, null })
1422 >    {
1423          final CompletableFuture<Integer> f = new CompletableFuture<>();
1424          final CompletableFuture<Integer> g = new CompletableFuture<>();
1425 <        final SubtractAction r = new SubtractAction();
1425 >        final SubtractAction r = new SubtractAction(m);
1426  
1427 <        g.complete(v2);
1428 <        f.complete(v1);
1427 >        if (fFirst) f.complete(v1); else g.complete(v2);
1428 >        if (!createIncomplete)
1429 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1430          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1431 <
1432 <        checkCompletedNormally(h, null);
1433 <        assertEquals(r.value, subtract(v1, v2));
1434 <        checkCompletedNormally(f, v1);
1311 <        checkCompletedNormally(g, v2);
1431 >        if (createIncomplete) {
1432 >            checkIncomplete(h);
1433 >            assertEquals(0, r.invocationCount);
1434 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1435          }
1313    }
1314
1315    public void testThenAcceptBoth_normalCompletion4() {
1316        for (ExecutionMode m : ExecutionMode.values())
1317        for (Integer v1 : new Integer[] { 1, null })
1318        for (Integer v2 : new Integer[] { 2, null }) {
1319
1320        final CompletableFuture<Integer> f = new CompletableFuture<>();
1321        final CompletableFuture<Integer> g = new CompletableFuture<>();
1322        final SubtractAction r = new SubtractAction();
1323
1324        f.complete(v1);
1325        g.complete(v2);
1326        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1436  
1437          checkCompletedNormally(h, null);
1438 <        assertEquals(r.value, subtract(v1, v2));
1438 >        assertEquals(subtract(v1, v2), r.value);
1439          checkCompletedNormally(f, v1);
1440          checkCompletedNormally(g, v2);
1441 <        }
1333 <    }
1441 >    }}
1442  
1443      /**
1444       * thenAcceptBoth result completes exceptionally after exceptional
1445       * completion of either source
1446       */
1447 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1340 <        for (ExecutionMode m : ExecutionMode.values())
1341 <        for (Integer v1 : new Integer[] { 1, null }) {
1342 <
1343 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1344 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1345 <        final SubtractAction r = new SubtractAction();
1346 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1347 <        final CFException ex = new CFException();
1348 <
1349 <        f.completeExceptionally(ex);
1350 <        checkIncomplete(h);
1351 <        g.complete(v1);
1352 <
1353 <        checkCompletedWithWrappedCFException(h, ex);
1354 <        checkCompletedWithWrappedCFException(f, ex);
1355 <        assertEquals(r.invocationCount, 0);
1356 <        checkCompletedNormally(g, v1);
1357 <        }
1358 <    }
1359 <
1360 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1361 <        for (ExecutionMode m : ExecutionMode.values())
1362 <        for (Integer v1 : new Integer[] { 1, null }) {
1363 <
1364 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1365 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1366 <        final SubtractAction r = new SubtractAction();
1367 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1368 <        final CFException ex = new CFException();
1369 <
1370 <        g.completeExceptionally(ex);
1371 <        checkIncomplete(h);
1372 <        f.complete(v1);
1373 <
1374 <        checkCompletedWithWrappedCFException(h, ex);
1375 <        checkCompletedWithWrappedCFException(g, ex);
1376 <        assertEquals(r.invocationCount, 0);
1377 <        checkCompletedNormally(f, v1);
1378 <        }
1379 <    }
1380 <
1381 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1447 >    public void testThenAcceptBoth_exceptionalCompletion() {
1448          for (ExecutionMode m : ExecutionMode.values())
1449 <        for (Integer v1 : new Integer[] { 1, null }) {
1450 <
1449 >        for (boolean createIncomplete : new boolean[] { true, false })
1450 >        for (boolean fFirst : new boolean[] { true, false })
1451 >        for (Integer v1 : new Integer[] { 1, null })
1452 >    {
1453          final CompletableFuture<Integer> f = new CompletableFuture<>();
1454          final CompletableFuture<Integer> g = new CompletableFuture<>();
1387        final SubtractAction r = new SubtractAction();
1455          final CFException ex = new CFException();
1456 +        final SubtractAction r = new SubtractAction(m);
1457  
1458 <        g.completeExceptionally(ex);
1459 <        f.complete(v1);
1458 >        (fFirst ? f : g).complete(v1);
1459 >        if (!createIncomplete)
1460 >            (!fFirst ? f : g).completeExceptionally(ex);
1461          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1462 <
1463 <        checkCompletedWithWrappedCFException(h, ex);
1464 <        checkCompletedWithWrappedCFException(g, ex);
1396 <        assertEquals(r.invocationCount, 0);
1397 <        checkCompletedNormally(f, v1);
1462 >        if (createIncomplete) {
1463 >            checkIncomplete(h);
1464 >            (!fFirst ? f : g).completeExceptionally(ex);
1465          }
1399    }
1400
1401    public void testThenAcceptBoth_exceptionalCompletion4() {
1402        for (ExecutionMode m : ExecutionMode.values())
1403        for (Integer v1 : new Integer[] { 1, null }) {
1404
1405        final CompletableFuture<Integer> f = new CompletableFuture<>();
1406        final CompletableFuture<Integer> g = new CompletableFuture<>();
1407        final SubtractAction r = new SubtractAction();
1408        final CFException ex = new CFException();
1409
1410        f.completeExceptionally(ex);
1411        g.complete(v1);
1412        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1466  
1467          checkCompletedWithWrappedCFException(h, ex);
1468 <        checkCompletedWithWrappedCFException(f, ex);
1469 <        assertFalse(r.ran());
1470 <        checkCompletedNormally(g, v1);
1471 <        }
1419 <    }
1468 >        assertEquals(0, r.invocationCount);
1469 >        checkCompletedNormally(fFirst ? f : g, v1);
1470 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1471 >    }}
1472  
1473      /**
1474       * thenAcceptBoth result completes exceptionally if action does
1475       */
1476 <    public void testThenAcceptBoth_actionFailed1() {
1476 >    public void testThenAcceptBoth_actionFailed() {
1477          for (ExecutionMode m : ExecutionMode.values())
1478 +        for (boolean fFirst : new boolean[] { true, false })
1479          for (Integer v1 : new Integer[] { 1, null })
1480 <        for (Integer v2 : new Integer[] { 2, null }) {
1481 <
1480 >        for (Integer v2 : new Integer[] { 2, null })
1481 >    {
1482          final CompletableFuture<Integer> f = new CompletableFuture<>();
1483          final CompletableFuture<Integer> g = new CompletableFuture<>();
1484 <        final FailingBiConsumer r = new FailingBiConsumer();
1484 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1485          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1486  
1487 <        f.complete(v1);
1488 <        checkIncomplete(h);
1489 <        g.complete(v2);
1490 <
1491 <        checkCompletedWithWrappedCFException(h);
1492 <        checkCompletedNormally(f, v1);
1440 <        checkCompletedNormally(g, v2);
1487 >        if (fFirst) {
1488 >            f.complete(v1);
1489 >            g.complete(v2);
1490 >        } else {
1491 >            g.complete(v2);
1492 >            f.complete(v1);
1493          }
1442    }
1443
1444    public void testThenAcceptBoth_actionFailed2() {
1445        for (ExecutionMode m : ExecutionMode.values())
1446        for (Integer v1 : new Integer[] { 1, null })
1447        for (Integer v2 : new Integer[] { 2, null }) {
1448
1449        final CompletableFuture<Integer> f = new CompletableFuture<>();
1450        final CompletableFuture<Integer> g = new CompletableFuture<>();
1451        final FailingBiConsumer r = new FailingBiConsumer();
1452        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1453
1454        g.complete(v2);
1455        checkIncomplete(h);
1456        f.complete(v1);
1494  
1495          checkCompletedWithWrappedCFException(h);
1496          checkCompletedNormally(f, v1);
1497          checkCompletedNormally(g, v2);
1498 <        }
1462 <    }
1498 >    }}
1499  
1500      /**
1501       * thenAcceptBoth result completes exceptionally if either source cancelled
1502       */
1503 <    public void testThenAcceptBoth_sourceCancelled1() {
1468 <        for (ExecutionMode m : ExecutionMode.values())
1469 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1470 <        for (Integer v1 : new Integer[] { 1, null }) {
1471 <
1472 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1474 <        final SubtractAction r = new SubtractAction();
1475 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1476 <
1477 <        assertTrue(f.cancel(mayInterruptIfRunning));
1478 <        checkIncomplete(h);
1479 <        g.complete(v1);
1480 <
1481 <        checkCompletedWithWrappedCancellationException(h);
1482 <        checkCancelled(f);
1483 <        assertEquals(r.invocationCount, 0);
1484 <        checkCompletedNormally(g, v1);
1485 <        }
1486 <    }
1487 <
1488 <    public void testThenAcceptBoth_sourceCancelled2() {
1489 <        for (ExecutionMode m : ExecutionMode.values())
1490 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1491 <        for (Integer v1 : new Integer[] { 1, null }) {
1492 <
1493 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1494 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1495 <        final SubtractAction r = new SubtractAction();
1496 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1497 <
1498 <        assertTrue(g.cancel(mayInterruptIfRunning));
1499 <        checkIncomplete(h);
1500 <        f.complete(v1);
1501 <
1502 <        checkCompletedWithWrappedCancellationException(h);
1503 <        checkCancelled(g);
1504 <        assertEquals(r.invocationCount, 0);
1505 <        checkCompletedNormally(f, v1);
1506 <        }
1507 <    }
1508 <
1509 <    public void testThenAcceptBoth_sourceCancelled3() {
1503 >    public void testThenAcceptBoth_sourceCancelled() {
1504          for (ExecutionMode m : ExecutionMode.values())
1505          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1506 <        for (Integer v1 : new Integer[] { 1, null }) {
1507 <
1506 >        for (boolean createIncomplete : new boolean[] { true, false })
1507 >        for (boolean fFirst : new boolean[] { true, false })
1508 >        for (Integer v1 : new Integer[] { 1, null })
1509 >    {
1510          final CompletableFuture<Integer> f = new CompletableFuture<>();
1511          final CompletableFuture<Integer> g = new CompletableFuture<>();
1512 <        final SubtractAction r = new SubtractAction();
1512 >        final SubtractAction r = new SubtractAction(m);
1513  
1514 <        assertTrue(g.cancel(mayInterruptIfRunning));
1515 <        f.complete(v1);
1514 >        (fFirst ? f : g).complete(v1);
1515 >        if (!createIncomplete)
1516 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1517          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1518 <
1519 <        checkCompletedWithWrappedCancellationException(h);
1520 <        checkCancelled(g);
1524 <        assertEquals(r.invocationCount, 0);
1525 <        checkCompletedNormally(f, v1);
1518 >        if (createIncomplete) {
1519 >            checkIncomplete(h);
1520 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1521          }
1527    }
1528
1529    public void testThenAcceptBoth_sourceCancelled4() {
1530        for (ExecutionMode m : ExecutionMode.values())
1531        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1532        for (Integer v1 : new Integer[] { 1, null }) {
1533
1534        final CompletableFuture<Integer> f = new CompletableFuture<>();
1535        final CompletableFuture<Integer> g = new CompletableFuture<>();
1536        final SubtractAction r = new SubtractAction();
1537
1538        assertTrue(f.cancel(mayInterruptIfRunning));
1539        g.complete(v1);
1540        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1522  
1523          checkCompletedWithWrappedCancellationException(h);
1524 <        checkCancelled(f);
1525 <        assertEquals(r.invocationCount, 0);
1526 <        checkCompletedNormally(g, v1);
1527 <        }
1547 <    }
1524 >        checkCancelled(!fFirst ? f : g);
1525 >        assertEquals(0, r.invocationCount);
1526 >        checkCompletedNormally(fFirst ? f : g, v1);
1527 >    }}
1528  
1529      /**
1530       * runAfterBoth result completes normally after normal
1531       * completion of sources
1532       */
1533 <    public void testRunAfterBoth_normalCompletion1() {
1554 <        for (ExecutionMode m : ExecutionMode.values())
1555 <        for (Integer v1 : new Integer[] { 1, null })
1556 <        for (Integer v2 : new Integer[] { 2, null }) {
1557 <
1558 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1559 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1560 <        final Noop r = new Noop();
1561 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1562 <
1563 <        f.complete(v1);
1564 <        checkIncomplete(h);
1565 <        assertFalse(r.ran);
1566 <        g.complete(v2);
1567 <
1568 <        checkCompletedNormally(h, null);
1569 <        assertEquals(r.invocationCount, 1);
1570 <        checkCompletedNormally(f, v1);
1571 <        checkCompletedNormally(g, v2);
1572 <        }
1573 <    }
1574 <
1575 <    public void testRunAfterBoth_normalCompletion2() {
1576 <        for (ExecutionMode m : ExecutionMode.values())
1577 <        for (Integer v1 : new Integer[] { 1, null })
1578 <        for (Integer v2 : new Integer[] { 2, 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 <
1585 <        g.complete(v2);
1586 <        checkIncomplete(h);
1587 <        assertFalse(r.ran);
1588 <        f.complete(v1);
1589 <
1590 <        checkCompletedNormally(h, null);
1591 <        assertEquals(r.invocationCount, 1);
1592 <        checkCompletedNormally(f, v1);
1593 <        checkCompletedNormally(g, v2);
1594 <        }
1595 <    }
1596 <
1597 <    public void testRunAfterBoth_normalCompletion3() {
1533 >    public void testRunAfterBoth_normalCompletion() {
1534          for (ExecutionMode m : ExecutionMode.values())
1535 +        for (boolean createIncomplete : new boolean[] { true, false })
1536 +        for (boolean fFirst : new boolean[] { true, false })
1537          for (Integer v1 : new Integer[] { 1, null })
1538 <        for (Integer v2 : new Integer[] { 2, null }) {
1539 <
1538 >        for (Integer v2 : new Integer[] { 2, null })
1539 >    {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541          final CompletableFuture<Integer> g = new CompletableFuture<>();
1542 <        final Noop r = new Noop();
1542 >        final Noop r = new Noop(m);
1543  
1544 <        g.complete(v2);
1545 <        f.complete(v1);
1544 >        if (fFirst) f.complete(v1); else g.complete(v2);
1545 >        if (!createIncomplete)
1546 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1547          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1548 <
1549 <        checkCompletedNormally(h, null);
1550 <        assertTrue(r.ran);
1551 <        checkCompletedNormally(f, v1);
1613 <        checkCompletedNormally(g, v2);
1548 >        if (createIncomplete) {
1549 >            checkIncomplete(h);
1550 >            assertEquals(0, r.invocationCount);
1551 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1552          }
1615    }
1616
1617    public void testRunAfterBoth_normalCompletion4() {
1618        for (ExecutionMode m : ExecutionMode.values())
1619        for (Integer v1 : new Integer[] { 1, null })
1620        for (Integer v2 : new Integer[] { 2, null }) {
1621
1622        final CompletableFuture<Integer> f = new CompletableFuture<>();
1623        final CompletableFuture<Integer> g = new CompletableFuture<>();
1624        final Noop r = new Noop();
1625
1626        f.complete(v1);
1627        g.complete(v2);
1628        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1553  
1554          checkCompletedNormally(h, null);
1555 <        assertEquals(r.invocationCount, 1);
1555 >        assertEquals(1, r.invocationCount);
1556          checkCompletedNormally(f, v1);
1557          checkCompletedNormally(g, v2);
1558 <        }
1635 <    }
1558 >    }}
1559  
1560      /**
1561       * runAfterBoth result completes exceptionally after exceptional
1562       * completion of either source
1563       */
1564 <    public void testRunAfterBoth_exceptionalCompletion1() {
1564 >    public void testRunAfterBoth_exceptionalCompletion() {
1565          for (ExecutionMode m : ExecutionMode.values())
1566 <        for (Integer v1 : new Integer[] { 1, null }) {
1567 <
1568 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1647 <        final Noop r = new Noop();
1648 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1649 <        final CFException ex = new CFException();
1650 <
1651 <        f.completeExceptionally(ex);
1652 <        checkIncomplete(h);
1653 <        g.complete(v1);
1654 <
1655 <        checkCompletedWithWrappedCFException(h, ex);
1656 <        checkCompletedWithWrappedCFException(f, ex);
1657 <        assertEquals(r.invocationCount, 0);
1658 <        checkCompletedNormally(g, v1);
1659 <        }
1660 <    }
1661 <
1662 <    public void testRunAfterBoth_exceptionalCompletion2() {
1663 <        for (ExecutionMode m : ExecutionMode.values())
1664 <        for (Integer v1 : new Integer[] { 1, null }) {
1665 <
1666 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final Noop r = new Noop();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 <        final CFException ex = new CFException();
1671 <
1672 <        g.completeExceptionally(ex);
1673 <        checkIncomplete(h);
1674 <        f.complete(v1);
1675 <
1676 <        checkCompletedWithWrappedCFException(h, ex);
1677 <        checkCompletedWithWrappedCFException(g, ex);
1678 <        assertEquals(r.invocationCount, 0);
1679 <        checkCompletedNormally(f, v1);
1680 <        }
1681 <    }
1682 <
1683 <    public void testRunAfterBoth_exceptionalCompletion3() {
1684 <        for (ExecutionMode m : ExecutionMode.values())
1685 <        for (Integer v1 : new Integer[] { 1, null }) {
1686 <
1566 >        for (boolean createIncomplete : new boolean[] { true, false })
1567 >        for (boolean fFirst : new boolean[] { true, false })
1568 >        for (Integer v1 : new Integer[] { 1, null })
1569 >    {
1570          final CompletableFuture<Integer> f = new CompletableFuture<>();
1571          final CompletableFuture<Integer> g = new CompletableFuture<>();
1689        final Noop r = new Noop();
1572          final CFException ex = new CFException();
1573 +        final Noop r = new Noop(m);
1574  
1575 <        g.completeExceptionally(ex);
1576 <        f.complete(v1);
1575 >        (fFirst ? f : g).complete(v1);
1576 >        if (!createIncomplete)
1577 >            (!fFirst ? f : g).completeExceptionally(ex);
1578          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1579 <
1580 <        checkCompletedWithWrappedCFException(h, ex);
1581 <        checkCompletedWithWrappedCFException(g, ex);
1698 <        assertEquals(r.invocationCount, 0);
1699 <        checkCompletedNormally(f, v1);
1579 >        if (createIncomplete) {
1580 >            checkIncomplete(h);
1581 >            (!fFirst ? f : g).completeExceptionally(ex);
1582          }
1701    }
1702
1703    public void testRunAfterBoth_exceptionalCompletion4() {
1704        for (ExecutionMode m : ExecutionMode.values())
1705        for (Integer v1 : new Integer[] { 1, null }) {
1706
1707        final CompletableFuture<Integer> f = new CompletableFuture<>();
1708        final CompletableFuture<Integer> g = new CompletableFuture<>();
1709        final Noop r = new Noop();
1710        final CFException ex = new CFException();
1711
1712        f.completeExceptionally(ex);
1713        g.complete(v1);
1714        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1583  
1584          checkCompletedWithWrappedCFException(h, ex);
1585 <        checkCompletedWithWrappedCFException(f, ex);
1586 <        assertEquals(r.invocationCount, 0);
1587 <        checkCompletedNormally(g, v1);
1588 <        }
1721 <    }
1585 >        assertEquals(0, r.invocationCount);
1586 >        checkCompletedNormally(fFirst ? f : g, v1);
1587 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1588 >    }}
1589  
1590      /**
1591       * runAfterBoth result completes exceptionally if action does
1592       */
1593 <    public void testRunAfterBoth_actionFailed1() {
1593 >    public void testRunAfterBoth_actionFailed() {
1594          for (ExecutionMode m : ExecutionMode.values())
1595 +        for (boolean fFirst : new boolean[] { true, false })
1596          for (Integer v1 : new Integer[] { 1, null })
1597 <        for (Integer v2 : new Integer[] { 2, null }) {
1598 <
1597 >        for (Integer v2 : new Integer[] { 2, null })
1598 >    {
1599          final CompletableFuture<Integer> f = new CompletableFuture<>();
1600          final CompletableFuture<Integer> g = new CompletableFuture<>();
1601 <        final FailingNoop r = new FailingNoop();
1734 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1735 <
1736 <        f.complete(v1);
1737 <        checkIncomplete(h);
1738 <        g.complete(v2);
1601 >        final FailingRunnable r = new FailingRunnable(m);
1602  
1603 <        checkCompletedWithWrappedCFException(h);
1604 <        checkCompletedNormally(f, v1);
1605 <        checkCompletedNormally(g, v2);
1603 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1604 >        if (fFirst) {
1605 >            f.complete(v1);
1606 >            g.complete(v2);
1607 >        } else {
1608 >            g.complete(v2);
1609 >            f.complete(v1);
1610          }
1611 <    }
1611 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1612  
1613 <    public void testRunAfterBoth_actionFailed2() {
1614 <        for (ExecutionMode m : ExecutionMode.values())
1748 <        for (Integer v1 : new Integer[] { 1, null })
1749 <        for (Integer v2 : new Integer[] { 2, null }) {
1750 <
1751 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1752 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1753 <        final FailingNoop r = new FailingNoop();
1754 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1755 <
1756 <        g.complete(v2);
1757 <        checkIncomplete(h);
1758 <        f.complete(v1);
1759 <
1760 <        checkCompletedWithWrappedCFException(h);
1613 >        checkCompletedWithWrappedCFException(h1);
1614 >        checkCompletedWithWrappedCFException(h2);
1615          checkCompletedNormally(f, v1);
1616          checkCompletedNormally(g, v2);
1617 <        }
1764 <    }
1617 >    }}
1618  
1619      /**
1620       * runAfterBoth result completes exceptionally if either source cancelled
1621       */
1622 <    public void testRunAfterBoth_sourceCancelled1() {
1770 <        for (ExecutionMode m : ExecutionMode.values())
1771 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1772 <        for (Integer v1 : new Integer[] { 1, null }) {
1773 <
1774 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1775 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1776 <        final Noop r = new Noop();
1777 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1778 <
1779 <        assertTrue(f.cancel(mayInterruptIfRunning));
1780 <        checkIncomplete(h);
1781 <        g.complete(v1);
1782 <
1783 <        checkCompletedWithWrappedCancellationException(h);
1784 <        checkCancelled(f);
1785 <        assertEquals(r.invocationCount, 0);
1786 <        checkCompletedNormally(g, v1);
1787 <        }
1788 <    }
1789 <
1790 <    public void testRunAfterBoth_sourceCancelled2() {
1622 >    public void testRunAfterBoth_sourceCancelled() {
1623          for (ExecutionMode m : ExecutionMode.values())
1624          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1625 <        for (Integer v1 : new Integer[] { 1, null }) {
1626 <
1625 >        for (boolean createIncomplete : new boolean[] { true, false })
1626 >        for (boolean fFirst : new boolean[] { true, false })
1627 >        for (Integer v1 : new Integer[] { 1, null })
1628 >    {
1629          final CompletableFuture<Integer> f = new CompletableFuture<>();
1630          final CompletableFuture<Integer> g = new CompletableFuture<>();
1631 <        final Noop r = new Noop();
1798 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1631 >        final Noop r = new Noop(m);
1632  
1800        assertTrue(g.cancel(mayInterruptIfRunning));
1801        checkIncomplete(h);
1802        f.complete(v1);
1633  
1634 <        checkCompletedWithWrappedCancellationException(h);
1635 <        checkCancelled(g);
1636 <        assertEquals(r.invocationCount, 0);
1807 <        checkCompletedNormally(f, v1);
1808 <        }
1809 <    }
1810 <
1811 <    public void testRunAfterBoth_sourceCancelled3() {
1812 <        for (ExecutionMode m : ExecutionMode.values())
1813 <        for (boolean mayInterruptIfRunning : 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 Noop r = new Noop();
1819 <
1820 <        assertTrue(g.cancel(mayInterruptIfRunning));
1821 <        f.complete(v1);
1634 >        (fFirst ? f : g).complete(v1);
1635 >        if (!createIncomplete)
1636 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1637          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1638 <
1639 <        checkCompletedWithWrappedCancellationException(h);
1640 <        checkCancelled(g);
1826 <        assertEquals(r.invocationCount, 0);
1827 <        checkCompletedNormally(f, v1);
1638 >        if (createIncomplete) {
1639 >            checkIncomplete(h);
1640 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1641          }
1829    }
1830
1831    public void testRunAfterBoth_sourceCancelled4() {
1832        for (ExecutionMode m : ExecutionMode.values())
1833        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1834        for (Integer v1 : new Integer[] { 1, null }) {
1835
1836        final CompletableFuture<Integer> f = new CompletableFuture<>();
1837        final CompletableFuture<Integer> g = new CompletableFuture<>();
1838        final Noop r = new Noop();
1839
1840        assertTrue(f.cancel(mayInterruptIfRunning));
1841        g.complete(v1);
1842        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1642  
1643          checkCompletedWithWrappedCancellationException(h);
1644 <        checkCancelled(f);
1645 <        assertEquals(r.invocationCount, 0);
1646 <        checkCompletedNormally(g, v1);
1647 <        }
1849 <    }
1644 >        checkCancelled(!fFirst ? f : g);
1645 >        assertEquals(0, r.invocationCount);
1646 >        checkCompletedNormally(fFirst ? f : g, v1);
1647 >    }}
1648  
1649      /**
1650       * applyToEither result completes normally after normal completion
1651       * of either source
1652       */
1653 <    public void testApplyToEither_normalCompletion1() {
1653 >    public void testApplyToEither_normalCompletion() {
1654          for (ExecutionMode m : ExecutionMode.values())
1655 +        for (boolean createIncomplete : new boolean[] { true, false })
1656 +        for (boolean fFirst : new boolean[] { true, false })
1657          for (Integer v1 : new Integer[] { 1, null })
1658 <        for (Integer v2 : new Integer[] { 2, null }) {
1659 <
1658 >        for (Integer v2 : new Integer[] { 2, null })
1659 >    {
1660          final CompletableFuture<Integer> f = new CompletableFuture<>();
1661          final CompletableFuture<Integer> g = new CompletableFuture<>();
1662 <        final IncFunction r = new IncFunction();
1863 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1662 >        final IncFunction r = new IncFunction(m);
1663  
1664 <        f.complete(v1);
1665 <        checkCompletedNormally(h, inc(v1));
1666 <        g.complete(v2);
1664 >        if (!createIncomplete)
1665 >            if (fFirst) f.complete(v1); else g.complete(v2);
1666 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1667 >        if (createIncomplete) {
1668 >            checkIncomplete(h);
1669 >            assertEquals(0, r.invocationCount);
1670 >            if (fFirst) f.complete(v1); else g.complete(v2);
1671 >        }
1672 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1673 >        if (!fFirst) f.complete(v1); else g.complete(v2);
1674  
1675          checkCompletedNormally(f, v1);
1676          checkCompletedNormally(g, v2);
1677 <        checkCompletedNormally(h, inc(v1));
1678 <        }
1873 <    }
1677 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1678 >    }}
1679  
1680 <    public void testApplyToEither_normalCompletion2() {
1680 >    public void testApplyToEither_normalCompletionBothAvailable() {
1681          for (ExecutionMode m : ExecutionMode.values())
1682 +        for (boolean fFirst : new boolean[] { true, false })
1683          for (Integer v1 : new Integer[] { 1, null })
1684 <        for (Integer v2 : new Integer[] { 2, null }) {
1685 <
1684 >        for (Integer v2 : new Integer[] { 2, null })
1685 >    {
1686          final CompletableFuture<Integer> f = new CompletableFuture<>();
1687          final CompletableFuture<Integer> g = new CompletableFuture<>();
1688 <        final IncFunction r = new IncFunction();
1883 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1688 >        final IncFunction r = new IncFunction(m);
1689  
1690 <        g.complete(v2);
1691 <        checkCompletedNormally(h, inc(v2));
1692 <        f.complete(v1);
1693 <
1694 <        checkCompletedNormally(f, v1);
1695 <        checkCompletedNormally(g, v2);
1891 <        checkCompletedNormally(h, inc(v2));
1690 >        if (fFirst) {
1691 >            f.complete(v1);
1692 >            g.complete(v2);
1693 >        } else {
1694 >            g.complete(v2);
1695 >            f.complete(v1);
1696          }
1893    }
1894    public void testApplyToEither_normalCompletion3() {
1895        for (ExecutionMode m : ExecutionMode.values())
1896        for (Integer v1 : new Integer[] { 1, null })
1897        for (Integer v2 : new Integer[] { 2, null }) {
1898
1899        final CompletableFuture<Integer> f = new CompletableFuture<>();
1900        final CompletableFuture<Integer> g = new CompletableFuture<>();
1901        final IncFunction r = new IncFunction();
1697  
1903        f.complete(v1);
1904        g.complete(v2);
1698          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1699  
1700          checkCompletedNormally(f, v1);
# Line 1910 | Line 1703 | public class CompletableFutureTest exten
1703          // unspecified behavior
1704          assertTrue(Objects.equals(h.join(), inc(v1)) ||
1705                     Objects.equals(h.join(), inc(v2)));
1706 <        assertEquals(r.invocationCount, 1);
1707 <        }
1915 <    }
1706 >        assertEquals(1, r.invocationCount);
1707 >    }}
1708  
1709      /**
1710       * applyToEither result completes exceptionally after exceptional
# Line 1920 | Line 1712 | public class CompletableFutureTest exten
1712       */
1713      public void testApplyToEither_exceptionalCompletion1() {
1714          for (ExecutionMode m : ExecutionMode.values())
1715 <        for (Integer v1 : new Integer[] { 1, null }) {
1716 <
1715 >        for (boolean createIncomplete : new boolean[] { true, false })
1716 >        for (boolean fFirst : new boolean[] { true, false })
1717 >        for (Integer v1 : new Integer[] { 1, null })
1718 >    {
1719          final CompletableFuture<Integer> f = new CompletableFuture<>();
1720          final CompletableFuture<Integer> g = new CompletableFuture<>();
1927        final IncFunction r = new IncFunction();
1928        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1721          final CFException ex = new CFException();
1722 +        final IncFunction r = new IncFunction(m);
1723  
1724 <        f.completeExceptionally(ex);
1932 <        checkCompletedWithWrappedCFException(h, ex);
1933 <        g.complete(v1);
1934 <
1935 <        assertEquals(r.invocationCount, 0);
1936 <        checkCompletedNormally(g, v1);
1937 <        checkCompletedWithWrappedCFException(f, ex);
1938 <        checkCompletedWithWrappedCFException(h, ex);
1939 <        }
1940 <    }
1941 <
1942 <    public void testApplyToEither_exceptionalCompletion2() {
1943 <        for (ExecutionMode m : ExecutionMode.values())
1944 <        for (Integer v1 : new Integer[] { 1, null }) {
1945 <
1946 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1947 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1948 <        final IncFunction r = new IncFunction();
1724 >        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1725          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1726 <        final CFException ex = new CFException();
1726 >        if (createIncomplete) {
1727 >            checkIncomplete(h);
1728 >            assertEquals(0, r.invocationCount);
1729 >            (fFirst ? f : g).completeExceptionally(ex);
1730 >        }
1731  
1952        g.completeExceptionally(ex);
1732          checkCompletedWithWrappedCFException(h, ex);
1733 <        f.complete(v1);
1733 >        (!fFirst ? f : g).complete(v1);
1734  
1735 <        assertEquals(r.invocationCount, 0);
1736 <        checkCompletedNormally(f, v1);
1737 <        checkCompletedWithWrappedCFException(g, ex);
1735 >        assertEquals(0, r.invocationCount);
1736 >        checkCompletedNormally(!fFirst ? f : g, v1);
1737 >        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1738          checkCompletedWithWrappedCFException(h, ex);
1739 <        }
1961 <    }
1739 >    }}
1740  
1741 <    public void testApplyToEither_exceptionalCompletion3() {
1741 >    public void testApplyToEither_exceptionalCompletion2() {
1742          for (ExecutionMode m : ExecutionMode.values())
1743 <        for (Integer v1 : new Integer[] { 1, null }) {
1744 <
1743 >        for (boolean reverseArgs : new boolean[] { true, false })
1744 >        for (boolean fFirst : new boolean[] { true, false })
1745 >        for (Integer v1 : new Integer[] { 1, null })
1746 >    {
1747          final CompletableFuture<Integer> f = new CompletableFuture<>();
1748          final CompletableFuture<Integer> g = new CompletableFuture<>();
1749 <        final IncFunction r = new IncFunction();
1749 >        final IncFunction r1 = new IncFunction(m);
1750 >        final IncFunction r2 = new IncFunction(m);
1751          final CFException ex = new CFException();
1752 <
1753 <        g.completeExceptionally(ex);
1754 <        f.complete(v1);
1755 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1752 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1753 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1754 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1755 >        if (fFirst) {
1756 >            f.complete(v1);
1757 >            g.completeExceptionally(ex);
1758 >        } else {
1759 >            g.completeExceptionally(ex);
1760 >            f.complete(v1);
1761 >        }
1762 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1763  
1764          // unspecified behavior
1977        Integer v;
1765          try {
1766 <            assertEquals(h.join(), inc(v1));
1767 <            assertEquals(r.invocationCount, 1);
1766 >            assertEquals(inc(v1), h1.join());
1767 >            assertEquals(1, r1.invocationCount);
1768          } catch (CompletionException ok) {
1769 <            checkCompletedWithWrappedCFException(h, ex);
1770 <            assertEquals(r.invocationCount, 0);
1769 >            checkCompletedWithWrappedCFException(h1, ex);
1770 >            assertEquals(0, r1.invocationCount);
1771          }
1772  
1986        checkCompletedWithWrappedCFException(g, ex);
1987        checkCompletedNormally(f, v1);
1988        }
1989    }
1990
1991    public void testApplyToEither_exceptionalCompletion4() {
1992        for (ExecutionMode m : ExecutionMode.values())
1993        for (Integer v1 : new Integer[] { 1, null }) {
1994
1995        final CompletableFuture<Integer> f = new CompletableFuture<>();
1996        final CompletableFuture<Integer> g = new CompletableFuture<>();
1997        final IncFunction r = new IncFunction();
1998        final CFException ex = new CFException();
1999
2000        f.completeExceptionally(ex);
2001        g.complete(v1);
2002        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2003
2004        // unspecified behavior
2005        Integer v;
1773          try {
1774 <            assertEquals(h.join(), inc(v1));
1775 <            assertEquals(r.invocationCount, 1);
1774 >            assertEquals(inc(v1), h2.join());
1775 >            assertEquals(1, r2.invocationCount);
1776          } catch (CompletionException ok) {
1777 <            checkCompletedWithWrappedCFException(h, ex);
1778 <            assertEquals(r.invocationCount, 0);
1777 >            checkCompletedWithWrappedCFException(h2, ex);
1778 >            assertEquals(0, r2.invocationCount);
1779          }
1780  
1781 <        checkCompletedWithWrappedCFException(f, ex);
1782 <        checkCompletedNormally(g, v1);
1783 <        }
2017 <    }
1781 >        checkCompletedWithWrappedCFException(g, ex);
1782 >        checkCompletedNormally(f, v1);
1783 >    }}
1784  
1785      /**
1786       * applyToEither result completes exceptionally if action does
# Line 2022 | Line 1788 | public class CompletableFutureTest exten
1788      public void testApplyToEither_actionFailed1() {
1789          for (ExecutionMode m : ExecutionMode.values())
1790          for (Integer v1 : new Integer[] { 1, null })
1791 <        for (Integer v2 : new Integer[] { 2, null }) {
1792 <
1791 >        for (Integer v2 : new Integer[] { 2, null })
1792 >    {
1793          final CompletableFuture<Integer> f = new CompletableFuture<>();
1794          final CompletableFuture<Integer> g = new CompletableFuture<>();
1795 <        final FailingFunction r = new FailingFunction();
1795 >        final FailingFunction r = new FailingFunction(m);
1796          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1797  
1798          f.complete(v1);
# Line 2034 | Line 1800 | public class CompletableFutureTest exten
1800          g.complete(v2);
1801          checkCompletedNormally(f, v1);
1802          checkCompletedNormally(g, v2);
1803 <        }
2038 <    }
1803 >    }}
1804  
1805      public void testApplyToEither_actionFailed2() {
1806          for (ExecutionMode m : ExecutionMode.values())
1807          for (Integer v1 : new Integer[] { 1, null })
1808 <        for (Integer v2 : new Integer[] { 2, null }) {
1809 <
1808 >        for (Integer v2 : new Integer[] { 2, null })
1809 >    {
1810          final CompletableFuture<Integer> f = new CompletableFuture<>();
1811          final CompletableFuture<Integer> g = new CompletableFuture<>();
1812 <        final FailingFunction r = new FailingFunction();
1812 >        final FailingFunction r = new FailingFunction(m);
1813          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1814  
1815          g.complete(v2);
# Line 2052 | Line 1817 | public class CompletableFutureTest exten
1817          f.complete(v1);
1818          checkCompletedNormally(f, v1);
1819          checkCompletedNormally(g, v2);
1820 <        }
2056 <    }
1820 >    }}
1821  
1822      /**
1823       * applyToEither result completes exceptionally if either source cancelled
# Line 2061 | Line 1825 | public class CompletableFutureTest exten
1825      public void testApplyToEither_sourceCancelled1() {
1826          for (ExecutionMode m : ExecutionMode.values())
1827          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1828 <        for (Integer v1 : new Integer[] { 1, null }) {
1829 <
1828 >        for (boolean createIncomplete : new boolean[] { true, false })
1829 >        for (boolean fFirst : new boolean[] { true, false })
1830 >        for (Integer v1 : new Integer[] { 1, null })
1831 >    {
1832          final CompletableFuture<Integer> f = new CompletableFuture<>();
1833          final CompletableFuture<Integer> g = new CompletableFuture<>();
1834 <        final IncFunction r = new IncFunction();
1834 >        final IncFunction r = new IncFunction(m);
1835 >
1836 >        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1837          final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1838 +        if (createIncomplete) {
1839 +            checkIncomplete(h);
1840 +            assertEquals(0, r.invocationCount);
1841 +            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1842 +        }
1843  
2071        assertTrue(f.cancel(mayInterruptIfRunning));
1844          checkCompletedWithWrappedCancellationException(h);
1845 <        g.complete(v1);
1845 >        (!fFirst ? f : g).complete(v1);
1846  
1847 <        checkCancelled(f);
1848 <        assertEquals(r.invocationCount, 0);
1849 <        checkCompletedNormally(g, v1);
1847 >        assertEquals(0, r.invocationCount);
1848 >        checkCompletedNormally(!fFirst ? f : g, v1);
1849 >        checkCancelled(fFirst ? f : g);
1850          checkCompletedWithWrappedCancellationException(h);
1851 <        }
2080 <    }
1851 >    }}
1852  
1853      public void testApplyToEither_sourceCancelled2() {
1854          for (ExecutionMode m : ExecutionMode.values())
1855          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1856 <        for (Integer v1 : new Integer[] { 1, null }) {
1857 <
1856 >        for (boolean reverseArgs : new boolean[] { true, false })
1857 >        for (boolean fFirst : new boolean[] { true, false })
1858 >        for (Integer v1 : new Integer[] { 1, null })
1859 >    {
1860          final CompletableFuture<Integer> f = new CompletableFuture<>();
1861          final CompletableFuture<Integer> g = new CompletableFuture<>();
1862 <        final IncFunction r = new IncFunction();
1863 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1864 <
1865 <        assertTrue(g.cancel(mayInterruptIfRunning));
1866 <        checkCompletedWithWrappedCancellationException(h);
2094 <        f.complete(v1);
1862 >        final IncFunction r1 = new IncFunction(m);
1863 >        final IncFunction r2 = new IncFunction(m);
1864 >        final CFException ex = new CFException();
1865 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1866 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1867  
1868 <        checkCancelled(g);
1869 <        assertEquals(r.invocationCount, 0);
1870 <        checkCompletedNormally(f, v1);
1871 <        checkCompletedWithWrappedCancellationException(h);
1868 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1869 >        if (fFirst) {
1870 >            f.complete(v1);
1871 >            assertTrue(g.cancel(mayInterruptIfRunning));
1872 >        } else {
1873 >            assertTrue(g.cancel(mayInterruptIfRunning));
1874 >            f.complete(v1);
1875          }
1876 <    }
2102 <
2103 <    public void testApplyToEither_sourceCancelled3() {
2104 <        for (ExecutionMode m : ExecutionMode.values())
2105 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2106 <        for (Integer v1 : new Integer[] { 1, null }) {
2107 <
2108 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2109 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2110 <        final IncFunction r = new IncFunction();
2111 <
2112 <        assertTrue(g.cancel(mayInterruptIfRunning));
2113 <        f.complete(v1);
2114 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1876 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1877  
1878          // unspecified behavior
2117        Integer v;
1879          try {
1880 <            assertEquals(h.join(), inc(v1));
1881 <            assertEquals(r.invocationCount, 1);
1880 >            assertEquals(inc(v1), h1.join());
1881 >            assertEquals(1, r1.invocationCount);
1882          } catch (CompletionException ok) {
1883 <            checkCompletedWithWrappedCancellationException(h);
1884 <            assertEquals(r.invocationCount, 0);
2124 <        }
2125 <
2126 <        checkCancelled(g);
2127 <        checkCompletedNormally(f, v1);
1883 >            checkCompletedWithWrappedCancellationException(h1);
1884 >            assertEquals(0, r1.invocationCount);
1885          }
2129    }
2130
2131    public void testApplyToEither_sourceCancelled4() {
2132        for (ExecutionMode m : ExecutionMode.values())
2133        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2134        for (Integer v1 : new Integer[] { 1, null }) {
1886  
2136        final CompletableFuture<Integer> f = new CompletableFuture<>();
2137        final CompletableFuture<Integer> g = new CompletableFuture<>();
2138        final IncFunction r = new IncFunction();
2139
2140        assertTrue(f.cancel(mayInterruptIfRunning));
2141        g.complete(v1);
2142        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2143
2144        // unspecified behavior
2145        Integer v;
1887          try {
1888 <            assertEquals(h.join(), inc(v1));
1889 <            assertEquals(r.invocationCount, 1);
1888 >            assertEquals(inc(v1), h2.join());
1889 >            assertEquals(1, r2.invocationCount);
1890          } catch (CompletionException ok) {
1891 <            checkCompletedWithWrappedCancellationException(h);
1892 <            assertEquals(r.invocationCount, 0);
1891 >            checkCompletedWithWrappedCancellationException(h2);
1892 >            assertEquals(0, r2.invocationCount);
1893          }
1894  
1895 <        checkCancelled(f);
1896 <        checkCompletedNormally(g, v1);
1897 <        }
2157 <    }
1895 >        checkCancelled(g);
1896 >        checkCompletedNormally(f, v1);
1897 >    }}
1898  
1899      /**
1900       * acceptEither result completes normally after normal completion
# Line 2163 | Line 1903 | public class CompletableFutureTest exten
1903      public void testAcceptEither_normalCompletion1() {
1904          for (ExecutionMode m : ExecutionMode.values())
1905          for (Integer v1 : new Integer[] { 1, null })
1906 <        for (Integer v2 : new Integer[] { 2, null }) {
1907 <
1906 >        for (Integer v2 : new Integer[] { 2, null })
1907 >    {
1908          final CompletableFuture<Integer> f = new CompletableFuture<>();
1909          final CompletableFuture<Integer> g = new CompletableFuture<>();
1910          final IncAction r = new IncAction();
# Line 2172 | Line 1912 | public class CompletableFutureTest exten
1912  
1913          f.complete(v1);
1914          checkCompletedNormally(h, null);
1915 <        assertEquals(r.value, inc(v1));
1915 >        assertEquals(inc(v1), r.value);
1916          g.complete(v2);
1917  
1918          checkCompletedNormally(f, v1);
1919          checkCompletedNormally(g, v2);
1920          checkCompletedNormally(h, null);
1921 <        }
2182 <    }
1921 >    }}
1922  
1923      public void testAcceptEither_normalCompletion2() {
1924          for (ExecutionMode m : ExecutionMode.values())
1925          for (Integer v1 : new Integer[] { 1, null })
1926 <        for (Integer v2 : new Integer[] { 2, null }) {
1927 <
1926 >        for (Integer v2 : new Integer[] { 2, null })
1927 >    {
1928          final CompletableFuture<Integer> f = new CompletableFuture<>();
1929          final CompletableFuture<Integer> g = new CompletableFuture<>();
1930          final IncAction r = new IncAction();
# Line 2193 | Line 1932 | public class CompletableFutureTest exten
1932  
1933          g.complete(v2);
1934          checkCompletedNormally(h, null);
1935 <        assertEquals(r.value, inc(v2));
1935 >        assertEquals(inc(v2), r.value);
1936          f.complete(v1);
1937  
1938          checkCompletedNormally(f, v1);
1939          checkCompletedNormally(g, v2);
1940          checkCompletedNormally(h, null);
1941 <        }
1942 <    }
1941 >    }}
1942 >
1943      public void testAcceptEither_normalCompletion3() {
1944          for (ExecutionMode m : ExecutionMode.values())
1945          for (Integer v1 : new Integer[] { 1, null })
1946 <        for (Integer v2 : new Integer[] { 2, null }) {
1947 <
1946 >        for (Integer v2 : new Integer[] { 2, null })
1947 >    {
1948          final CompletableFuture<Integer> f = new CompletableFuture<>();
1949          final CompletableFuture<Integer> g = new CompletableFuture<>();
1950          final IncAction r = new IncAction();
# Line 2221 | Line 1960 | public class CompletableFutureTest exten
1960          // unspecified behavior
1961          assertTrue(Objects.equals(r.value, inc(v1)) ||
1962                     Objects.equals(r.value, inc(v2)));
1963 <        }
2225 <    }
1963 >    }}
1964  
1965      /**
1966       * acceptEither result completes exceptionally after exceptional
# Line 2230 | Line 1968 | public class CompletableFutureTest exten
1968       */
1969      public void testAcceptEither_exceptionalCompletion1() {
1970          for (ExecutionMode m : ExecutionMode.values())
1971 <        for (Integer v1 : new Integer[] { 1, null }) {
1972 <
1971 >        for (Integer v1 : new Integer[] { 1, null })
1972 >    {
1973          final CompletableFuture<Integer> f = new CompletableFuture<>();
1974          final CompletableFuture<Integer> g = new CompletableFuture<>();
1975          final IncAction r = new IncAction();
# Line 2242 | Line 1980 | public class CompletableFutureTest exten
1980          checkCompletedWithWrappedCFException(h, ex);
1981          g.complete(v1);
1982  
1983 <        assertEquals(r.invocationCount, 0);
1983 >        assertEquals(0, r.invocationCount);
1984          checkCompletedNormally(g, v1);
1985          checkCompletedWithWrappedCFException(f, ex);
1986          checkCompletedWithWrappedCFException(h, ex);
1987 <        }
2250 <    }
1987 >    }}
1988  
1989      public void testAcceptEither_exceptionalCompletion2() {
1990          for (ExecutionMode m : ExecutionMode.values())
1991 <        for (Integer v1 : new Integer[] { 1, null }) {
1992 <
1991 >        for (Integer v1 : new Integer[] { 1, null })
1992 >    {
1993          final CompletableFuture<Integer> f = new CompletableFuture<>();
1994          final CompletableFuture<Integer> g = new CompletableFuture<>();
1995          final IncAction r = new IncAction();
# Line 2263 | Line 2000 | public class CompletableFutureTest exten
2000          checkCompletedWithWrappedCFException(h, ex);
2001          f.complete(v1);
2002  
2003 <        assertEquals(r.invocationCount, 0);
2003 >        assertEquals(0, r.invocationCount);
2004          checkCompletedNormally(f, v1);
2005          checkCompletedWithWrappedCFException(g, ex);
2006          checkCompletedWithWrappedCFException(h, ex);
2007 <        }
2271 <    }
2007 >    }}
2008  
2009      public void testAcceptEither_exceptionalCompletion3() {
2010          for (ExecutionMode m : ExecutionMode.values())
2011 <        for (Integer v1 : new Integer[] { 1, null }) {
2012 <
2011 >        for (Integer v1 : new Integer[] { 1, null })
2012 >    {
2013          final CompletableFuture<Integer> f = new CompletableFuture<>();
2014          final CompletableFuture<Integer> g = new CompletableFuture<>();
2015          final IncAction r = new IncAction();
# Line 2286 | Line 2022 | public class CompletableFutureTest exten
2022          // unspecified behavior
2023          Integer v;
2024          try {
2025 <            assertEquals(h.join(), null);
2026 <            assertEquals(r.invocationCount, 1);
2025 >            assertNull(h.join());
2026 >            assertEquals(1, r.invocationCount);
2027              assertEquals(inc(v1), r.value);
2028          } catch (CompletionException ok) {
2029              checkCompletedWithWrappedCFException(h, ex);
2030 <            assertEquals(r.invocationCount, 0);
2030 >            assertEquals(0, r.invocationCount);
2031          }
2032  
2033          checkCompletedWithWrappedCFException(g, ex);
2034          checkCompletedNormally(f, v1);
2035 <        }
2300 <    }
2035 >    }}
2036  
2037      public void testAcceptEither_exceptionalCompletion4() {
2038          for (ExecutionMode m : ExecutionMode.values())
2039 <        for (Integer v1 : new Integer[] { 1, null }) {
2040 <
2039 >        for (Integer v1 : new Integer[] { 1, null })
2040 >    {
2041          final CompletableFuture<Integer> f = new CompletableFuture<>();
2042          final CompletableFuture<Integer> g = new CompletableFuture<>();
2043          final IncAction r = new IncAction();
# Line 2315 | Line 2050 | public class CompletableFutureTest exten
2050          // unspecified behavior
2051          Integer v;
2052          try {
2053 <            assertEquals(h.join(), null);
2054 <            assertEquals(r.invocationCount, 1);
2053 >            assertNull(h.join());
2054 >            assertEquals(1, r.invocationCount);
2055              assertEquals(inc(v1), r.value);
2056          } catch (CompletionException ok) {
2057              checkCompletedWithWrappedCFException(h, ex);
2058 <            assertEquals(r.invocationCount, 0);
2058 >            assertEquals(0, r.invocationCount);
2059          }
2060  
2061          checkCompletedWithWrappedCFException(f, ex);
2062          checkCompletedNormally(g, v1);
2063 <        }
2329 <    }
2063 >    }}
2064  
2065      /**
2066       * acceptEither result completes exceptionally if action does
# Line 2334 | Line 2068 | public class CompletableFutureTest exten
2068      public void testAcceptEither_actionFailed1() {
2069          for (ExecutionMode m : ExecutionMode.values())
2070          for (Integer v1 : new Integer[] { 1, null })
2071 <        for (Integer v2 : new Integer[] { 2, null }) {
2072 <
2071 >        for (Integer v2 : new Integer[] { 2, null })
2072 >    {
2073          final CompletableFuture<Integer> f = new CompletableFuture<>();
2074          final CompletableFuture<Integer> g = new CompletableFuture<>();
2075 <        final FailingConsumer r = new FailingConsumer();
2075 >        final FailingConsumer r = new FailingConsumer(m);
2076          final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2077  
2078          f.complete(v1);
# Line 2346 | Line 2080 | public class CompletableFutureTest exten
2080          g.complete(v2);
2081          checkCompletedNormally(f, v1);
2082          checkCompletedNormally(g, v2);
2083 <        }
2350 <    }
2083 >    }}
2084  
2085      public void testAcceptEither_actionFailed2() {
2086          for (ExecutionMode m : ExecutionMode.values())
2087          for (Integer v1 : new Integer[] { 1, null })
2088 <        for (Integer v2 : new Integer[] { 2, null }) {
2089 <
2088 >        for (Integer v2 : new Integer[] { 2, null })
2089 >    {
2090          final CompletableFuture<Integer> f = new CompletableFuture<>();
2091          final CompletableFuture<Integer> g = new CompletableFuture<>();
2092 <        final FailingConsumer r = new FailingConsumer();
2092 >        final FailingConsumer r = new FailingConsumer(m);
2093          final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2094  
2095          g.complete(v2);
# Line 2364 | Line 2097 | public class CompletableFutureTest exten
2097          f.complete(v1);
2098          checkCompletedNormally(f, v1);
2099          checkCompletedNormally(g, v2);
2100 <        }
2368 <    }
2100 >    }}
2101  
2102      /**
2103       * acceptEither result completes exceptionally if either source cancelled
# Line 2373 | Line 2105 | public class CompletableFutureTest exten
2105      public void testAcceptEither_sourceCancelled1() {
2106          for (ExecutionMode m : ExecutionMode.values())
2107          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2108 <        for (Integer v1 : new Integer[] { 1, null }) {
2109 <
2108 >        for (Integer v1 : new Integer[] { 1, null })
2109 >    {
2110          final CompletableFuture<Integer> f = new CompletableFuture<>();
2111          final CompletableFuture<Integer> g = new CompletableFuture<>();
2112          final IncAction r = new IncAction();
# Line 2385 | Line 2117 | public class CompletableFutureTest exten
2117          g.complete(v1);
2118  
2119          checkCancelled(f);
2120 <        assertEquals(r.invocationCount, 0);
2120 >        assertEquals(0, r.invocationCount);
2121          checkCompletedNormally(g, v1);
2122          checkCompletedWithWrappedCancellationException(h);
2123 <        }
2392 <    }
2123 >    }}
2124  
2125      public void testAcceptEither_sourceCancelled2() {
2126          for (ExecutionMode m : ExecutionMode.values())
2127          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2128 <        for (Integer v1 : new Integer[] { 1, null }) {
2129 <
2128 >        for (Integer v1 : new Integer[] { 1, null })
2129 >    {
2130          final CompletableFuture<Integer> f = new CompletableFuture<>();
2131          final CompletableFuture<Integer> g = new CompletableFuture<>();
2132          final IncAction r = new IncAction();
# Line 2406 | Line 2137 | public class CompletableFutureTest exten
2137          f.complete(v1);
2138  
2139          checkCancelled(g);
2140 <        assertEquals(r.invocationCount, 0);
2140 >        assertEquals(0, r.invocationCount);
2141          checkCompletedNormally(f, v1);
2142          checkCompletedWithWrappedCancellationException(h);
2143 <        }
2413 <    }
2143 >    }}
2144  
2145      public void testAcceptEither_sourceCancelled3() {
2146          for (ExecutionMode m : ExecutionMode.values())
2147          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2148 <        for (Integer v1 : new Integer[] { 1, null }) {
2149 <
2148 >        for (Integer v1 : new Integer[] { 1, null })
2149 >    {
2150          final CompletableFuture<Integer> f = new CompletableFuture<>();
2151          final CompletableFuture<Integer> g = new CompletableFuture<>();
2152          final IncAction r = new IncAction();
# Line 2428 | Line 2158 | public class CompletableFutureTest exten
2158          // unspecified behavior
2159          Integer v;
2160          try {
2161 <            assertEquals(h.join(), null);
2162 <            assertEquals(r.invocationCount, 1);
2161 >            assertNull(h.join());
2162 >            assertEquals(1, r.invocationCount);
2163              assertEquals(inc(v1), r.value);
2164          } catch (CompletionException ok) {
2165              checkCompletedWithWrappedCancellationException(h);
2166 <            assertEquals(r.invocationCount, 0);
2166 >            assertEquals(0, r.invocationCount);
2167          }
2168  
2169          checkCancelled(g);
2170          checkCompletedNormally(f, v1);
2171 <        }
2442 <    }
2171 >    }}
2172  
2173      public void testAcceptEither_sourceCancelled4() {
2174          for (ExecutionMode m : ExecutionMode.values())
2175          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2176 <        for (Integer v1 : new Integer[] { 1, null }) {
2177 <
2176 >        for (Integer v1 : new Integer[] { 1, null })
2177 >    {
2178          final CompletableFuture<Integer> f = new CompletableFuture<>();
2179          final CompletableFuture<Integer> g = new CompletableFuture<>();
2180          final IncAction r = new IncAction();
# Line 2457 | Line 2186 | public class CompletableFutureTest exten
2186          // unspecified behavior
2187          Integer v;
2188          try {
2189 <            assertEquals(h.join(), null);
2190 <            assertEquals(r.invocationCount, 1);
2189 >            assertNull(h.join());
2190 >            assertEquals(1, r.invocationCount);
2191              assertEquals(inc(v1), r.value);
2192          } catch (CompletionException ok) {
2193              checkCompletedWithWrappedCancellationException(h);
2194 <            assertEquals(r.invocationCount, 0);
2194 >            assertEquals(0, r.invocationCount);
2195          }
2196  
2197          checkCancelled(f);
2198          checkCompletedNormally(g, v1);
2199 <        }
2471 <    }
2199 >    }}
2200  
2201      /**
2202       * runAfterEither result completes normally after normal completion
# Line 2477 | Line 2205 | public class CompletableFutureTest exten
2205      public void testRunAfterEither_normalCompletion1() {
2206          for (ExecutionMode m : ExecutionMode.values())
2207          for (Integer v1 : new Integer[] { 1, null })
2208 <        for (Integer v2 : new Integer[] { 2, null }) {
2209 <
2208 >        for (Integer v2 : new Integer[] { 2, null })
2209 >    {
2210          final CompletableFuture<Integer> f = new CompletableFuture<>();
2211          final CompletableFuture<Integer> g = new CompletableFuture<>();
2212 <        final Noop r = new Noop();
2212 >        final Noop r = new Noop(m);
2213          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2214  
2215          f.complete(v1);
2216          checkCompletedNormally(h, null);
2217 <        assertEquals(r.invocationCount, 1);
2217 >        assertEquals(1, r.invocationCount);
2218          g.complete(v2);
2219  
2220          checkCompletedNormally(f, v1);
2221          checkCompletedNormally(g, v2);
2222          checkCompletedNormally(h, null);
2223 <        assertEquals(r.invocationCount, 1);
2224 <        }
2497 <    }
2223 >        assertEquals(1, r.invocationCount);
2224 >    }}
2225  
2226      public void testRunAfterEither_normalCompletion2() {
2227          for (ExecutionMode m : ExecutionMode.values())
2228          for (Integer v1 : new Integer[] { 1, null })
2229 <        for (Integer v2 : new Integer[] { 2, null }) {
2230 <
2229 >        for (Integer v2 : new Integer[] { 2, null })
2230 >    {
2231          final CompletableFuture<Integer> f = new CompletableFuture<>();
2232          final CompletableFuture<Integer> g = new CompletableFuture<>();
2233 <        final Noop r = new Noop();
2233 >        final Noop r = new Noop(m);
2234          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2235  
2236          g.complete(v2);
2237          checkCompletedNormally(h, null);
2238 <        assertEquals(r.invocationCount, 1);
2238 >        assertEquals(1, r.invocationCount);
2239          f.complete(v1);
2240  
2241          checkCompletedNormally(f, v1);
2242          checkCompletedNormally(g, v2);
2243          checkCompletedNormally(h, null);
2244 <        assertEquals(r.invocationCount, 1);
2245 <        }
2246 <    }
2244 >        assertEquals(1, r.invocationCount);
2245 >        }}
2246 >
2247      public void testRunAfterEither_normalCompletion3() {
2248          for (ExecutionMode m : ExecutionMode.values())
2249          for (Integer v1 : new Integer[] { 1, null })
2250 <        for (Integer v2 : new Integer[] { 2, null }) {
2251 <
2250 >        for (Integer v2 : new Integer[] { 2, null })
2251 >    {
2252          final CompletableFuture<Integer> f = new CompletableFuture<>();
2253          final CompletableFuture<Integer> g = new CompletableFuture<>();
2254 <        final Noop r = new Noop();
2254 >        final Noop r = new Noop(m);
2255  
2256          f.complete(v1);
2257          g.complete(v2);
# Line 2533 | Line 2260 | public class CompletableFutureTest exten
2260          checkCompletedNormally(h, null);
2261          checkCompletedNormally(f, v1);
2262          checkCompletedNormally(g, v2);
2263 <        assertEquals(r.invocationCount, 1);
2264 <        }
2538 <    }
2263 >        assertEquals(1, r.invocationCount);
2264 >    }}
2265  
2266      /**
2267       * runAfterEither result completes exceptionally after exceptional
# Line 2543 | Line 2269 | public class CompletableFutureTest exten
2269       */
2270      public void testRunAfterEither_exceptionalCompletion1() {
2271          for (ExecutionMode m : ExecutionMode.values())
2272 <        for (Integer v1 : new Integer[] { 1, null }) {
2273 <
2272 >        for (Integer v1 : new Integer[] { 1, null })
2273 >    {
2274          final CompletableFuture<Integer> f = new CompletableFuture<>();
2275          final CompletableFuture<Integer> g = new CompletableFuture<>();
2276 <        final Noop r = new Noop();
2276 >        final Noop r = new Noop(m);
2277          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2278          final CFException ex = new CFException();
2279  
# Line 2555 | Line 2281 | public class CompletableFutureTest exten
2281          checkCompletedWithWrappedCFException(h, ex);
2282          g.complete(v1);
2283  
2284 <        assertEquals(r.invocationCount, 0);
2284 >        assertEquals(0, r.invocationCount);
2285          checkCompletedNormally(g, v1);
2286          checkCompletedWithWrappedCFException(f, ex);
2287          checkCompletedWithWrappedCFException(h, ex);
2288 <        }
2563 <    }
2288 >    }}
2289  
2290      public void testRunAfterEither_exceptionalCompletion2() {
2291          for (ExecutionMode m : ExecutionMode.values())
2292 <        for (Integer v1 : new Integer[] { 1, null }) {
2293 <
2292 >        for (Integer v1 : new Integer[] { 1, null })
2293 >    {
2294          final CompletableFuture<Integer> f = new CompletableFuture<>();
2295          final CompletableFuture<Integer> g = new CompletableFuture<>();
2296 <        final Noop r = new Noop();
2296 >        final Noop r = new Noop(m);
2297          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2298          final CFException ex = new CFException();
2299  
# Line 2576 | Line 2301 | public class CompletableFutureTest exten
2301          checkCompletedWithWrappedCFException(h, ex);
2302          f.complete(v1);
2303  
2304 <        assertEquals(r.invocationCount, 0);
2304 >        assertEquals(0, r.invocationCount);
2305          checkCompletedNormally(f, v1);
2306          checkCompletedWithWrappedCFException(g, ex);
2307          checkCompletedWithWrappedCFException(h, ex);
2308 <        }
2584 <    }
2308 >    }}
2309  
2310      public void testRunAfterEither_exceptionalCompletion3() {
2311          for (ExecutionMode m : ExecutionMode.values())
2312 <        for (Integer v1 : new Integer[] { 1, null }) {
2313 <
2312 >        for (Integer v1 : new Integer[] { 1, null })
2313 >    {
2314          final CompletableFuture<Integer> f = new CompletableFuture<>();
2315          final CompletableFuture<Integer> g = new CompletableFuture<>();
2316 <        final Noop r = new Noop();
2316 >        final Noop r = new Noop(m);
2317          final CFException ex = new CFException();
2318  
2319          g.completeExceptionally(ex);
# Line 2599 | Line 2323 | public class CompletableFutureTest exten
2323          // unspecified behavior
2324          Integer v;
2325          try {
2326 <            assertEquals(h.join(), null);
2327 <            assertEquals(r.invocationCount, 1);
2326 >            assertNull(h.join());
2327 >            assertEquals(1, r.invocationCount);
2328          } catch (CompletionException ok) {
2329              checkCompletedWithWrappedCFException(h, ex);
2330 <            assertEquals(r.invocationCount, 0);
2330 >            assertEquals(0, r.invocationCount);
2331          }
2332  
2333          checkCompletedWithWrappedCFException(g, ex);
2334          checkCompletedNormally(f, v1);
2335 <        }
2612 <    }
2335 >    }}
2336  
2337      public void testRunAfterEither_exceptionalCompletion4() {
2338          for (ExecutionMode m : ExecutionMode.values())
2339 <        for (Integer v1 : new Integer[] { 1, null }) {
2340 <
2339 >        for (Integer v1 : new Integer[] { 1, null })
2340 >    {
2341          final CompletableFuture<Integer> f = new CompletableFuture<>();
2342          final CompletableFuture<Integer> g = new CompletableFuture<>();
2343 <        final Noop r = new Noop();
2343 >        final Noop r = new Noop(m);
2344          final CFException ex = new CFException();
2345  
2346          f.completeExceptionally(ex);
# Line 2627 | Line 2350 | public class CompletableFutureTest exten
2350          // unspecified behavior
2351          Integer v;
2352          try {
2353 <            assertEquals(h.join(), null);
2354 <            assertEquals(r.invocationCount, 1);
2353 >            assertNull(h.join());
2354 >            assertEquals(1, r.invocationCount);
2355          } catch (CompletionException ok) {
2356              checkCompletedWithWrappedCFException(h, ex);
2357 <            assertEquals(r.invocationCount, 0);
2357 >            assertEquals(0, r.invocationCount);
2358          }
2359  
2360          checkCompletedWithWrappedCFException(f, ex);
2361          checkCompletedNormally(g, v1);
2362 <        }
2640 <    }
2362 >    }}
2363  
2364      /**
2365       * runAfterEither result completes exceptionally if action does
# Line 2645 | Line 2367 | public class CompletableFutureTest exten
2367      public void testRunAfterEither_actionFailed1() {
2368          for (ExecutionMode m : ExecutionMode.values())
2369          for (Integer v1 : new Integer[] { 1, null })
2370 <        for (Integer v2 : new Integer[] { 2, null }) {
2371 <
2370 >        for (Integer v2 : new Integer[] { 2, null })
2371 >    {
2372          final CompletableFuture<Integer> f = new CompletableFuture<>();
2373          final CompletableFuture<Integer> g = new CompletableFuture<>();
2374 <        final FailingNoop r = new FailingNoop();
2374 >        final FailingRunnable r = new FailingRunnable(m);
2375          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2376  
2377          f.complete(v1);
# Line 2657 | Line 2379 | public class CompletableFutureTest exten
2379          g.complete(v2);
2380          checkCompletedNormally(f, v1);
2381          checkCompletedNormally(g, v2);
2382 <        }
2661 <    }
2382 >    }}
2383  
2384      public void testRunAfterEither_actionFailed2() {
2385          for (ExecutionMode m : ExecutionMode.values())
2386          for (Integer v1 : new Integer[] { 1, null })
2387 <        for (Integer v2 : new Integer[] { 2, null }) {
2388 <
2387 >        for (Integer v2 : new Integer[] { 2, null })
2388 >    {
2389          final CompletableFuture<Integer> f = new CompletableFuture<>();
2390          final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final FailingNoop r = new FailingNoop();
2391 >        final FailingRunnable r = new FailingRunnable(m);
2392          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2393  
2394          g.complete(v2);
# Line 2675 | Line 2396 | public class CompletableFutureTest exten
2396          f.complete(v1);
2397          checkCompletedNormally(f, v1);
2398          checkCompletedNormally(g, v2);
2399 <        }
2679 <    }
2399 >    }}
2400  
2401      /**
2402       * runAfterEither result completes exceptionally if either source cancelled
# Line 2684 | Line 2404 | public class CompletableFutureTest exten
2404      public void testRunAfterEither_sourceCancelled1() {
2405          for (ExecutionMode m : ExecutionMode.values())
2406          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2407 <        for (Integer v1 : new Integer[] { 1, null }) {
2408 <
2407 >        for (Integer v1 : new Integer[] { 1, null })
2408 >    {
2409          final CompletableFuture<Integer> f = new CompletableFuture<>();
2410          final CompletableFuture<Integer> g = new CompletableFuture<>();
2411 <        final Noop r = new Noop();
2411 >        final Noop r = new Noop(m);
2412          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2413  
2414          assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2696 | Line 2416 | public class CompletableFutureTest exten
2416          g.complete(v1);
2417  
2418          checkCancelled(f);
2419 <        assertEquals(r.invocationCount, 0);
2419 >        assertEquals(0, r.invocationCount);
2420          checkCompletedNormally(g, v1);
2421          checkCompletedWithWrappedCancellationException(h);
2422 <        }
2703 <    }
2422 >    }}
2423  
2424      public void testRunAfterEither_sourceCancelled2() {
2425          for (ExecutionMode m : ExecutionMode.values())
2426          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2427 <        for (Integer v1 : new Integer[] { 1, null }) {
2428 <
2427 >        for (Integer v1 : new Integer[] { 1, null })
2428 >    {
2429          final CompletableFuture<Integer> f = new CompletableFuture<>();
2430          final CompletableFuture<Integer> g = new CompletableFuture<>();
2431 <        final Noop r = new Noop();
2431 >        final Noop r = new Noop(m);
2432          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2433  
2434          assertTrue(g.cancel(mayInterruptIfRunning));
# Line 2717 | Line 2436 | public class CompletableFutureTest exten
2436          f.complete(v1);
2437  
2438          checkCancelled(g);
2439 <        assertEquals(r.invocationCount, 0);
2439 >        assertEquals(0, r.invocationCount);
2440          checkCompletedNormally(f, v1);
2441          checkCompletedWithWrappedCancellationException(h);
2442 <        }
2724 <    }
2442 >    }}
2443  
2444      public void testRunAfterEither_sourceCancelled3() {
2445          for (ExecutionMode m : ExecutionMode.values())
2446          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2447 <        for (Integer v1 : new Integer[] { 1, null }) {
2448 <
2447 >        for (Integer v1 : new Integer[] { 1, null })
2448 >    {
2449          final CompletableFuture<Integer> f = new CompletableFuture<>();
2450          final CompletableFuture<Integer> g = new CompletableFuture<>();
2451 <        final Noop r = new Noop();
2451 >        final Noop r = new Noop(m);
2452  
2453          assertTrue(g.cancel(mayInterruptIfRunning));
2454          f.complete(v1);
# Line 2739 | Line 2457 | public class CompletableFutureTest exten
2457          // unspecified behavior
2458          Integer v;
2459          try {
2460 <            assertEquals(h.join(), null);
2461 <            assertEquals(r.invocationCount, 1);
2460 >            assertNull(h.join());
2461 >            assertEquals(1, r.invocationCount);
2462          } catch (CompletionException ok) {
2463              checkCompletedWithWrappedCancellationException(h);
2464 <            assertEquals(r.invocationCount, 0);
2464 >            assertEquals(0, r.invocationCount);
2465          }
2466  
2467          checkCancelled(g);
2468          checkCompletedNormally(f, v1);
2469 <        }
2752 <    }
2469 >    }}
2470  
2471      public void testRunAfterEither_sourceCancelled4() {
2472          for (ExecutionMode m : ExecutionMode.values())
2473          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2474 <        for (Integer v1 : new Integer[] { 1, null }) {
2475 <
2474 >        for (Integer v1 : new Integer[] { 1, null })
2475 >    {
2476          final CompletableFuture<Integer> f = new CompletableFuture<>();
2477          final CompletableFuture<Integer> g = new CompletableFuture<>();
2478 <        final Noop r = new Noop();
2478 >        final Noop r = new Noop(m);
2479  
2480          assertTrue(f.cancel(mayInterruptIfRunning));
2481          g.complete(v1);
# Line 2767 | Line 2484 | public class CompletableFutureTest exten
2484          // unspecified behavior
2485          Integer v;
2486          try {
2487 <            assertEquals(h.join(), null);
2488 <            assertEquals(r.invocationCount, 1);
2487 >            assertNull(h.join());
2488 >            assertEquals(1, r.invocationCount);
2489          } catch (CompletionException ok) {
2490              checkCompletedWithWrappedCancellationException(h);
2491 <            assertEquals(r.invocationCount, 0);
2491 >            assertEquals(0, r.invocationCount);
2492          }
2493  
2494          checkCancelled(f);
2495          checkCompletedNormally(g, v1);
2496 <        }
2780 <    }
2496 >    }}
2497  
2498      /**
2499       * thenCompose result completes normally after normal completion of source
2500       */
2501 <    public void testThenCompose() {
2502 <        CompletableFuture<Integer> f, g;
2503 <        CompletableFutureInc r;
2504 <
2505 <        f = new CompletableFuture<>();
2506 <        g = f.thenCompose(r = new CompletableFutureInc());
2507 <        f.complete(one);
2508 <        checkCompletedNormally(g, two);
2509 <        assertTrue(r.ran);
2501 >    public void testThenCompose_normalCompletion() {
2502 >        for (ExecutionMode m : ExecutionMode.values())
2503 >        for (boolean createIncomplete : new boolean[] { true, false })
2504 >        for (Integer v1 : new Integer[] { 1, null })
2505 >    {
2506 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2507 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2508 >        if (!createIncomplete) f.complete(v1);
2509 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2510 >        if (createIncomplete) f.complete(v1);
2511  
2512 <        f = new CompletableFuture<>();
2513 <        f.complete(one);
2514 <        g = f.thenCompose(r = new CompletableFutureInc());
2515 <        checkCompletedNormally(g, two);
2799 <        assertTrue(r.ran);
2800 <    }
2512 >        checkCompletedNormally(g, inc(v1));
2513 >        checkCompletedNormally(f, v1);
2514 >        assertEquals(1, r.invocationCount);
2515 >    }}
2516  
2517      /**
2518       * thenCompose result completes exceptionally after exceptional
2519       * completion of source
2520       */
2521 <    public void testThenCompose2() {
2522 <        CompletableFuture<Integer> f, g;
2523 <        CompletableFutureInc r;
2524 <
2525 <        f = new CompletableFuture<>();
2526 <        g = f.thenCompose(r = new CompletableFutureInc());
2527 <        f.completeExceptionally(new CFException());
2528 <        checkCompletedWithWrappedCFException(g);
2521 >    public void testThenCompose_exceptionalCompletion() {
2522 >        for (ExecutionMode m : ExecutionMode.values())
2523 >        for (boolean createIncomplete : new boolean[] { true, false })
2524 >    {
2525 >        final CFException ex = new CFException();
2526 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2527 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2528 >        if (!createIncomplete) f.completeExceptionally(ex);
2529 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2530 >        if (createIncomplete) f.completeExceptionally(ex);
2531  
2532 <        f = new CompletableFuture<>();
2533 <        f.completeExceptionally(new CFException());
2534 <        g = f.thenCompose(r = new CompletableFutureInc());
2535 <        checkCompletedWithWrappedCFException(g);
2819 <    }
2532 >        checkCompletedWithWrappedCFException(g, ex);
2533 >        checkCompletedWithWrappedCFException(f, ex);
2534 >        assertEquals(0, r.invocationCount);
2535 >    }}
2536  
2537      /**
2538       * thenCompose result completes exceptionally if action does
2539       */
2540 <    public void testThenCompose3() {
2541 <        CompletableFuture<Integer> f, g;
2542 <        FailingCompletableFutureFunction r;
2543 <
2544 <        f = new CompletableFuture<>();
2545 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2546 <        f.complete(one);
2547 <        checkCompletedWithWrappedCFException(g);
2540 >    public void testThenCompose_actionFailed() {
2541 >        for (ExecutionMode m : ExecutionMode.values())
2542 >        for (boolean createIncomplete : new boolean[] { true, false })
2543 >        for (Integer v1 : new Integer[] { 1, null })
2544 >    {
2545 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2546 >        final FailingCompletableFutureFunction r
2547 >            = new FailingCompletableFutureFunction(m);
2548 >        if (!createIncomplete) f.complete(v1);
2549 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2550 >        if (createIncomplete) f.complete(v1);
2551  
2833        f = new CompletableFuture<>();
2834        f.complete(one);
2835        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2552          checkCompletedWithWrappedCFException(g);
2553 <    }
2553 >        checkCompletedNormally(f, v1);
2554 >    }}
2555  
2556      /**
2557       * thenCompose result completes exceptionally if source cancelled
2558       */
2559 <    public void testThenCompose4() {
2560 <        CompletableFuture<Integer> f, g;
2561 <        CompletableFutureInc r;
2562 <
2563 <        f = new CompletableFuture<>();
2564 <        g = f.thenCompose(r = new CompletableFutureInc());
2565 <        assertTrue(f.cancel(true));
2566 <        checkCompletedWithWrappedCancellationException(g);
2567 <
2568 <        f = new CompletableFuture<>();
2569 <        assertTrue(f.cancel(true));
2570 <        g = f.thenCompose(r = new CompletableFutureInc());
2571 <        checkCompletedWithWrappedCancellationException(g);
2855 <    }
2856 <
2857 <    // asyncs
2858 <
2859 <    /**
2860 <     * thenRunAsync result completes normally after normal completion of source
2861 <     */
2862 <    public void testThenRunAsync() {
2863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2864 <        Noop r = new Noop();
2865 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2866 <        f.complete(null);
2867 <        checkCompletedNormally(g, null);
2868 <
2869 <        // reordered version
2870 <        f = new CompletableFuture<>();
2871 <        f.complete(null);
2872 <        r = new Noop();
2873 <        g = f.thenRunAsync(r);
2874 <        checkCompletedNormally(g, null);
2875 <    }
2876 <
2877 <    /**
2878 <     * thenRunAsync result completes exceptionally after exceptional
2879 <     * completion of source
2880 <     */
2881 <    public void testThenRunAsync2() {
2882 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2883 <        Noop r = new Noop();
2884 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2885 <        f.completeExceptionally(new CFException());
2886 <        try {
2887 <            g.join();
2888 <            shouldThrow();
2889 <        } catch (CompletionException success) {}
2890 <        checkCompletedWithWrappedCFException(g);
2891 <    }
2892 <
2893 <    /**
2894 <     * thenRunAsync result completes exceptionally if action does
2895 <     */
2896 <    public void testThenRunAsync3() {
2897 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2898 <        FailingNoop r = new FailingNoop();
2899 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2900 <        f.complete(null);
2901 <        checkCompletedWithWrappedCFException(g);
2902 <    }
2903 <
2904 <    /**
2905 <     * thenRunAsync result completes exceptionally if source cancelled
2906 <     */
2907 <    public void testThenRunAsync4() {
2908 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2909 <        Noop r = new Noop();
2910 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2911 <        assertTrue(f.cancel(true));
2912 <        checkCompletedWithWrappedCancellationException(g);
2913 <    }
2914 <
2915 <    /**
2916 <     * thenApplyAsync result completes normally after normal completion of source
2917 <     */
2918 <    public void testThenApplyAsync() {
2919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2920 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2921 <        f.complete(one);
2922 <        checkCompletedNormally(g, two);
2923 <    }
2924 <
2925 <    /**
2926 <     * thenApplyAsync result completes exceptionally after exceptional
2927 <     * completion of source
2928 <     */
2929 <    public void testThenApplyAsync2() {
2930 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2931 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2932 <        f.completeExceptionally(new CFException());
2933 <        checkCompletedWithWrappedCFException(g);
2934 <    }
2935 <
2936 <    /**
2937 <     * thenApplyAsync result completes exceptionally if action does
2938 <     */
2939 <    public void testThenApplyAsync3() {
2940 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2941 <        FailingFunction r = new FailingFunction();
2942 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2943 <        f.complete(null);
2944 <        checkCompletedWithWrappedCFException(g);
2945 <    }
2946 <
2947 <    /**
2948 <     * thenApplyAsync result completes exceptionally if source cancelled
2949 <     */
2950 <    public void testThenApplyAsync4() {
2951 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2952 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2953 <        assertTrue(f.cancel(true));
2954 <        checkCompletedWithWrappedCancellationException(g);
2955 <    }
2956 <
2957 <    /**
2958 <     * thenAcceptAsync result completes normally after normal
2959 <     * completion of source
2960 <     */
2961 <    public void testThenAcceptAsync() {
2962 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2963 <        IncAction r = new IncAction();
2964 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2965 <        f.complete(one);
2966 <        checkCompletedNormally(g, null);
2967 <        assertEquals(r.value, (Integer) 2);
2968 <    }
2969 <
2970 <    /**
2971 <     * thenAcceptAsync result completes exceptionally after exceptional
2972 <     * completion of source
2973 <     */
2974 <    public void testThenAcceptAsync2() {
2975 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2976 <        IncAction r = new IncAction();
2977 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2978 <        f.completeExceptionally(new CFException());
2979 <        checkCompletedWithWrappedCFException(g);
2980 <    }
2981 <
2982 <    /**
2983 <     * thenAcceptAsync result completes exceptionally if action does
2984 <     */
2985 <    public void testThenAcceptAsync3() {
2986 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2987 <        FailingConsumer r = new FailingConsumer();
2988 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989 <        f.complete(null);
2990 <        checkCompletedWithWrappedCFException(g);
2991 <    }
2992 <
2993 <    /**
2994 <     * thenAcceptAsync result completes exceptionally if source cancelled
2995 <     */
2996 <    public void testThenAcceptAsync4() {
2997 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2998 <        IncAction r = new IncAction();
2999 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000 <        assertTrue(f.cancel(true));
3001 <        checkCompletedWithWrappedCancellationException(g);
3002 <    }
3003 <
3004 <    /**
3005 <     * thenComposeAsync result completes normally after normal
3006 <     * completion of source
3007 <     */
3008 <    public void testThenComposeAsync() {
3009 <        CompletableFuture<Integer> f, g;
3010 <        CompletableFutureInc r;
3011 <
3012 <        f = new CompletableFuture<>();
3013 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3014 <        f.complete(one);
3015 <        checkCompletedNormally(g, two);
3016 <
3017 <        f = new CompletableFuture<>();
3018 <        f.complete(one);
3019 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3020 <        checkCompletedNormally(g, two);
3021 <    }
3022 <
3023 <    /**
3024 <     * thenComposeAsync result completes exceptionally after
3025 <     * exceptional completion of source
3026 <     */
3027 <    public void testThenComposeAsync2() {
3028 <        CompletableFuture<Integer> f, g;
3029 <        CompletableFutureInc r;
3030 <
3031 <        f = new CompletableFuture<>();
3032 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3033 <        f.completeExceptionally(new CFException());
3034 <        checkCompletedWithWrappedCFException(g);
3035 <        assertFalse(r.ran);
3036 <
3037 <        f = new CompletableFuture<>();
3038 <        f.completeExceptionally(new CFException());
3039 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3040 <        checkCompletedWithWrappedCFException(g);
3041 <        assertFalse(r.ran);
3042 <    }
3043 <
3044 <    /**
3045 <     * thenComposeAsync result completes exceptionally if action does
3046 <     */
3047 <    public void testThenComposeAsync3() {
3048 <        CompletableFuture<Integer> f, g;
3049 <        FailingCompletableFutureFunction r;
3050 <
3051 <        f = new CompletableFuture<>();
3052 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3053 <        f.complete(one);
3054 <        checkCompletedWithWrappedCFException(g);
3055 <
3056 <        f = new CompletableFuture<>();
3057 <        f.complete(one);
3058 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3059 <        checkCompletedWithWrappedCFException(g);
3060 <    }
3061 <
3062 <    /**
3063 <     * thenComposeAsync result completes exceptionally if source cancelled
3064 <     */
3065 <    public void testThenComposeAsync4() {
3066 <        CompletableFuture<Integer> f, g;
3067 <        CompletableFutureInc r;
3068 <
3069 <        f = new CompletableFuture<>();
3070 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3071 <        assertTrue(f.cancel(true));
3072 <        checkCompletedWithWrappedCancellationException(g);
3073 <
3074 <        f = new CompletableFuture<>();
3075 <        assertTrue(f.cancel(true));
3076 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
3077 <        checkCompletedWithWrappedCancellationException(g);
3078 <    }
3079 <
3080 <    // async with explicit executors
3081 <
3082 <    /**
3083 <     * thenRunAsync result completes normally after normal completion of source
3084 <     */
3085 <    public void testThenRunAsyncE() {
3086 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3087 <        Noop r = new Noop();
3088 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3089 <        f.complete(null);
3090 <        checkCompletedNormally(g, null);
3091 <
3092 <        // reordered version
3093 <        f = new CompletableFuture<>();
3094 <        f.complete(null);
3095 <        r = new Noop();
3096 <        g = f.thenRunAsync(r, new ThreadExecutor());
3097 <        checkCompletedNormally(g, null);
3098 <    }
3099 <
3100 <    /**
3101 <     * thenRunAsync result completes exceptionally after exceptional
3102 <     * completion of source
3103 <     */
3104 <    public void testThenRunAsync2E() {
3105 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3106 <        Noop r = new Noop();
3107 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3108 <        f.completeExceptionally(new CFException());
3109 <        try {
3110 <            g.join();
3111 <            shouldThrow();
3112 <        } catch (CompletionException success) {}
3113 <        checkCompletedWithWrappedCFException(g);
3114 <    }
3115 <
3116 <    /**
3117 <     * thenRunAsync result completes exceptionally if action does
3118 <     */
3119 <    public void testThenRunAsync3E() {
3120 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3121 <        FailingNoop r = new FailingNoop();
3122 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3123 <        f.complete(null);
3124 <        checkCompletedWithWrappedCFException(g);
3125 <    }
3126 <
3127 <    /**
3128 <     * thenRunAsync result completes exceptionally if source cancelled
3129 <     */
3130 <    public void testThenRunAsync4E() {
3131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3132 <        Noop r = new Noop();
3133 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3134 <        assertTrue(f.cancel(true));
3135 <        checkCompletedWithWrappedCancellationException(g);
3136 <    }
3137 <
3138 <    /**
3139 <     * thenApplyAsync result completes normally after normal completion of source
3140 <     */
3141 <    public void testThenApplyAsyncE() {
3142 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3143 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3144 <        f.complete(one);
3145 <        checkCompletedNormally(g, two);
3146 <    }
3147 <
3148 <    /**
3149 <     * thenApplyAsync result completes exceptionally after exceptional
3150 <     * completion of source
3151 <     */
3152 <    public void testThenApplyAsync2E() {
3153 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3154 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3155 <        f.completeExceptionally(new CFException());
3156 <        checkCompletedWithWrappedCFException(g);
3157 <    }
3158 <
3159 <    /**
3160 <     * thenApplyAsync result completes exceptionally if action does
3161 <     */
3162 <    public void testThenApplyAsync3E() {
3163 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3164 <        FailingFunction r = new FailingFunction();
3165 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3166 <        f.complete(null);
3167 <        checkCompletedWithWrappedCFException(g);
3168 <    }
3169 <
3170 <    /**
3171 <     * thenApplyAsync result completes exceptionally if source cancelled
3172 <     */
3173 <    public void testThenApplyAsync4E() {
3174 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3175 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3176 <        assertTrue(f.cancel(true));
3177 <        checkCompletedWithWrappedCancellationException(g);
3178 <    }
3179 <
3180 <    /**
3181 <     * thenAcceptAsync result completes normally after normal
3182 <     * completion of source
3183 <     */
3184 <    public void testThenAcceptAsyncE() {
3185 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3186 <        IncAction r = new IncAction();
3187 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3188 <        f.complete(one);
3189 <        checkCompletedNormally(g, null);
3190 <        assertEquals(r.value, (Integer) 2);
3191 <    }
3192 <
3193 <    /**
3194 <     * thenAcceptAsync result completes exceptionally after exceptional
3195 <     * completion of source
3196 <     */
3197 <    public void testThenAcceptAsync2E() {
3198 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3199 <        IncAction r = new IncAction();
3200 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3201 <        f.completeExceptionally(new CFException());
3202 <        checkCompletedWithWrappedCFException(g);
3203 <    }
3204 <
3205 <    /**
3206 <     * thenAcceptAsync result completes exceptionally if action does
3207 <     */
3208 <    public void testThenAcceptAsync3E() {
3209 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3210 <        FailingConsumer r = new FailingConsumer();
3211 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3212 <        f.complete(null);
3213 <        checkCompletedWithWrappedCFException(g);
3214 <    }
3215 <
3216 <    /**
3217 <     * thenAcceptAsync result completes exceptionally if source cancelled
3218 <     */
3219 <    public void testThenAcceptAsync4E() {
3220 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3221 <        IncAction r = new IncAction();
3222 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3223 <        assertTrue(f.cancel(true));
3224 <        checkCompletedWithWrappedCancellationException(g);
3225 <    }
3226 <
3227 <    /**
3228 <     * thenComposeAsync result completes normally after normal
3229 <     * completion of source
3230 <     */
3231 <    public void testThenComposeAsyncE() {
3232 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3233 <        CompletableFutureInc r = new CompletableFutureInc();
3234 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3235 <        f.complete(one);
3236 <        checkCompletedNormally(g, two);
3237 <    }
3238 <
3239 <    /**
3240 <     * thenComposeAsync result completes exceptionally after
3241 <     * exceptional completion of source
3242 <     */
3243 <    public void testThenComposeAsync2E() {
3244 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3245 <        CompletableFutureInc r = new CompletableFutureInc();
3246 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3247 <        f.completeExceptionally(new CFException());
3248 <        checkCompletedWithWrappedCFException(g);
3249 <    }
3250 <
3251 <    /**
3252 <     * thenComposeAsync result completes exceptionally if action does
3253 <     */
3254 <    public void testThenComposeAsync3E() {
3255 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3256 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3257 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3258 <        f.complete(one);
3259 <        checkCompletedWithWrappedCFException(g);
3260 <    }
2559 >    public void testThenCompose_sourceCancelled() {
2560 >        for (ExecutionMode m : ExecutionMode.values())
2561 >        for (boolean createIncomplete : new boolean[] { true, false })
2562 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2563 >    {
2564 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2565 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2566 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2567 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2568 >        if (createIncomplete) {
2569 >            checkIncomplete(g);
2570 >            assertTrue(f.cancel(mayInterruptIfRunning));
2571 >        }
2572  
3262    /**
3263     * thenComposeAsync result completes exceptionally if source cancelled
3264     */
3265    public void testThenComposeAsync4E() {
3266        CompletableFuture<Integer> f = new CompletableFuture<>();
3267        CompletableFutureInc r = new CompletableFutureInc();
3268        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3269        assertTrue(f.cancel(true));
2573          checkCompletedWithWrappedCancellationException(g);
2574 <    }
2574 >        checkCancelled(f);
2575 >    }}
2576  
2577      // other static methods
2578  
# Line 3432 | Line 2736 | public class CompletableFutureTest exten
2736  
2737              () -> f.thenCompose(null),
2738              () -> f.thenComposeAsync(null),
2739 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2739 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2740              () -> f.thenComposeAsync(null, exec),
2741  
2742              () -> f.exceptionally(null),
# Line 3470 | Line 2774 | public class CompletableFutureTest exten
2774       */
2775      public void testWhenComplete_normalCompletion1() {
2776          for (ExecutionMode m : ExecutionMode.values())
2777 <        for (Integer v1 : new Integer[] { 1, null }) {
2778 <
2779 <        final AtomicInteger a = new AtomicInteger();
2777 >        for (boolean createIncomplete : new boolean[] { true, false })
2778 >        for (Integer v1 : new Integer[] { 1, null })
2779 >    {
2780 >        final AtomicInteger a = new AtomicInteger(0);
2781          final CompletableFuture<Integer> f = new CompletableFuture<>();
2782 <        final CompletableFuture<Integer> g =
2783 <            m.whenComplete(f,
2784 <                           (Integer x, Throwable t) -> {
2785 <                               threadAssertSame(x, v1);
2786 <                               threadAssertNull(t);
2787 <                               a.getAndIncrement();
2788 <                           });
2789 <        f.complete(v1);
2790 <        checkCompletedNormally(f, v1);
2782 >        if (!createIncomplete) f.complete(v1);
2783 >        final CompletableFuture<Integer> g = m.whenComplete
2784 >            (f,
2785 >             (Integer x, Throwable t) -> {
2786 >                threadAssertSame(x, v1);
2787 >                threadAssertNull(t);
2788 >                a.getAndIncrement();
2789 >            });
2790 >        if (createIncomplete) f.complete(v1);
2791 >
2792          checkCompletedNormally(g, v1);
2793 <        assertEquals(a.get(), 1);
2794 <        }
2795 <    }
2793 >        checkCompletedNormally(f, v1);
2794 >        assertEquals(1, a.get());
2795 >    }}
2796  
2797      /**
2798       * whenComplete action executes on exceptional completion, propagating
# Line 3494 | Line 2800 | public class CompletableFutureTest exten
2800       */
2801      public void testWhenComplete_exceptionalCompletion() {
2802          for (ExecutionMode m : ExecutionMode.values())
2803 <        for (Integer v1 : new Integer[] { 1, null }) {
2804 <
2805 <        final AtomicInteger a = new AtomicInteger();
2803 >        for (boolean createIncomplete : new boolean[] { true, false })
2804 >        for (Integer v1 : new Integer[] { 1, null })
2805 >    {
2806 >        final AtomicInteger a = new AtomicInteger(0);
2807          final CFException ex = new CFException();
2808          final CompletableFuture<Integer> f = new CompletableFuture<>();
2809 +        if (!createIncomplete) f.completeExceptionally(ex);
2810          final CompletableFuture<Integer> g = m.whenComplete
2811              (f,
2812               (Integer x, Throwable t) -> {
# Line 3506 | Line 2814 | public class CompletableFutureTest exten
2814                  threadAssertSame(t, ex);
2815                  a.getAndIncrement();
2816              });
2817 <        f.completeExceptionally(ex);
2817 >        if (createIncomplete) f.completeExceptionally(ex);
2818          checkCompletedWithWrappedCFException(f, ex);
2819          checkCompletedWithWrappedCFException(g, ex);
2820 <        assertEquals(a.get(), 1);
2821 <        }
2822 <    }
2820 >        assertEquals(1, a.get());
2821 >    }}
2822 >
2823 >    /**
2824 >     * whenComplete action executes on cancelled source, propagating
2825 >     * CancellationException.
2826 >     */
2827 >    public void testWhenComplete_sourceCancelled() {
2828 >        for (ExecutionMode m : ExecutionMode.values())
2829 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2830 >        for (boolean createIncomplete : new boolean[] { true, false })
2831 >    {
2832 >        final AtomicInteger a = new AtomicInteger(0);
2833 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2834 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2835 >        final CompletableFuture<Integer> g = m.whenComplete
2836 >            (f,
2837 >             (Integer x, Throwable t) -> {
2838 >                threadAssertNull(x);
2839 >                threadAssertTrue(t instanceof CancellationException);
2840 >                a.getAndIncrement();
2841 >            });
2842 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2843 >
2844 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2845 >        checkCompletedWithWrappedCancellationException(g);
2846 >        checkCancelled(f);
2847 >        assertEquals(1, a.get());
2848 >    }}
2849  
2850      /**
2851       * If a whenComplete action throws an exception when triggered by
2852       * a normal completion, it completes exceptionally
2853       */
2854      public void testWhenComplete_actionFailed() {
2855 +        for (boolean createIncomplete : new boolean[] { true, false })
2856          for (ExecutionMode m : ExecutionMode.values())
2857 <        for (Integer v1 : new Integer[] { 1, null }) {
2858 <
2857 >        for (Integer v1 : new Integer[] { 1, null })
2858 >    {
2859 >        final AtomicInteger a = new AtomicInteger(0);
2860          final CFException ex = new CFException();
2861          final CompletableFuture<Integer> f = new CompletableFuture<>();
2862 +        if (!createIncomplete) f.complete(v1);
2863          final CompletableFuture<Integer> g = m.whenComplete
2864              (f,
2865               (Integer x, Throwable t) -> {
2866                  threadAssertSame(x, v1);
2867                  threadAssertNull(t);
2868 +                a.getAndIncrement();
2869                  throw ex;
2870              });
2871 <        f.complete(v1);
2871 >        if (createIncomplete) f.complete(v1);
2872          checkCompletedNormally(f, v1);
2873          checkCompletedWithWrappedCFException(g, ex);
2874 <        }
2875 <    }
2874 >        assertEquals(1, a.get());
2875 >    }}
2876  
2877      /**
2878       * If a whenComplete action throws an exception when triggered by
# Line 3542 | Line 2880 | public class CompletableFutureTest exten
2880       * exception takes precedence.
2881       */
2882      public void testWhenComplete_actionFailedSourceFailed() {
2883 +        for (boolean createIncomplete : new boolean[] { true, false })
2884          for (ExecutionMode m : ExecutionMode.values())
2885 <        for (Integer v1 : new Integer[] { 1, null }) {
2886 <
2885 >        for (Integer v1 : new Integer[] { 1, null })
2886 >    {
2887 >        final AtomicInteger a = new AtomicInteger(0);
2888          final CFException ex1 = new CFException();
2889          final CFException ex2 = new CFException();
2890          final CompletableFuture<Integer> f = new CompletableFuture<>();
2891 +
2892 +        if (!createIncomplete) f.completeExceptionally(ex1);
2893          final CompletableFuture<Integer> g = m.whenComplete
2894              (f,
2895               (Integer x, Throwable t) -> {
2896                  threadAssertSame(t, ex1);
2897                  threadAssertNull(x);
2898 +                a.getAndIncrement();
2899                  throw ex2;
2900              });
2901 <        f.completeExceptionally(ex1);
2901 >        if (createIncomplete) f.completeExceptionally(ex1);
2902 >
2903          checkCompletedWithWrappedCFException(f, ex1);
2904          checkCompletedWithWrappedCFException(g, ex1);
2905 <        }
2906 <    }
3563 <
3564 <    /**
3565 <     * handleAsync action completes normally with function value on
3566 <     * either normal or exceptional completion of source
3567 <     */
3568 <    public void testHandleAsync() {
3569 <        CompletableFuture<Integer> f, g;
3570 <        IntegerHandler r;
3571 <
3572 <        f = new CompletableFuture<>();
3573 <        g = f.handleAsync(r = new IntegerHandler());
3574 <        assertFalse(r.ran);
3575 <        f.completeExceptionally(new CFException());
3576 <        checkCompletedWithWrappedCFException(f);
3577 <        checkCompletedNormally(g, three);
3578 <        assertTrue(r.ran);
3579 <
3580 <        f = new CompletableFuture<>();
3581 <        g = f.handleAsync(r = new IntegerHandler());
3582 <        assertFalse(r.ran);
3583 <        f.completeExceptionally(new CFException());
3584 <        checkCompletedWithWrappedCFException(f);
3585 <        checkCompletedNormally(g, three);
3586 <        assertTrue(r.ran);
3587 <
3588 <        f = new CompletableFuture<>();
3589 <        g = f.handleAsync(r = new IntegerHandler());
3590 <        assertFalse(r.ran);
3591 <        f.complete(one);
3592 <        checkCompletedNormally(f, one);
3593 <        checkCompletedNormally(g, two);
3594 <        assertTrue(r.ran);
3595 <
3596 <        f = new CompletableFuture<>();
3597 <        g = f.handleAsync(r = new IntegerHandler());
3598 <        assertFalse(r.ran);
3599 <        f.complete(one);
3600 <        checkCompletedNormally(f, one);
3601 <        checkCompletedNormally(g, two);
3602 <        assertTrue(r.ran);
3603 <    }
3604 <
3605 <    /**
3606 <     * handleAsync action with Executor completes normally with
3607 <     * function value on either normal or exceptional completion of
3608 <     * source
3609 <     */
3610 <    public void testHandleAsync2() {
3611 <        CompletableFuture<Integer> f, g;
3612 <        ThreadExecutor exec = new ThreadExecutor();
3613 <        IntegerHandler r;
3614 <
3615 <        f = new CompletableFuture<>();
3616 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3617 <        assertFalse(r.ran);
3618 <        f.completeExceptionally(new CFException());
3619 <        checkCompletedWithWrappedCFException(f);
3620 <        checkCompletedNormally(g, three);
3621 <        assertTrue(r.ran);
3622 <
3623 <        f = new CompletableFuture<>();
3624 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3625 <        assertFalse(r.ran);
3626 <        f.completeExceptionally(new CFException());
3627 <        checkCompletedWithWrappedCFException(f);
3628 <        checkCompletedNormally(g, three);
3629 <        assertTrue(r.ran);
3630 <
3631 <        f = new CompletableFuture<>();
3632 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3633 <        assertFalse(r.ran);
3634 <        f.complete(one);
3635 <        checkCompletedNormally(f, one);
3636 <        checkCompletedNormally(g, two);
3637 <        assertTrue(r.ran);
3638 <
3639 <        f = new CompletableFuture<>();
3640 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3641 <        assertFalse(r.ran);
3642 <        f.complete(one);
3643 <        checkCompletedNormally(f, one);
3644 <        checkCompletedNormally(g, two);
3645 <        assertTrue(r.ran);
3646 <    }
2905 >        assertEquals(1, a.get());
2906 >    }}
2907  
2908   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines