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.44 by jsr166, Mon Jun 2 06:06:30 2014 UTC vs.
Revision 1.61 by jsr166, Wed Jun 4 04:34:49 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines