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.23 by jsr166, Tue Apr 9 07:50:55 2013 UTC vs.
Revision 1.41 by jsr166, Mon Jun 2 01:46:11 2014 UTC

# Line 16 | Line 16 | import java.util.concurrent.ExecutionExc
16   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.TimeoutException;
21   import java.util.concurrent.atomic.AtomicInteger;
22   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 68 | Line 69 | public class CompletableFutureTest exten
69          } catch (Throwable fail) { threadUnexpectedException(fail); }
70          assertTrue(f.isDone());
71          assertFalse(f.isCancelled());
72 +        assertFalse(f.isCompletedExceptionally());
73          assertTrue(f.toString().contains("[Completed normally]"));
74      }
75  
# Line 101 | Line 103 | public class CompletableFutureTest exten
103          assertTrue(f.toString().contains("[Completed exceptionally]"));
104      }
105  
106 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
107 +                                              CFException ex) {
108 +        try {
109 +            f.get(LONG_DELAY_MS, MILLISECONDS);
110 +            shouldThrow();
111 +        } catch (ExecutionException success) {
112 +            assertSame(ex, success.getCause());
113 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
114 +        try {
115 +            f.join();
116 +            shouldThrow();
117 +        } catch (CompletionException success) {
118 +            assertSame(ex, success.getCause());
119 +        }
120 +        try {
121 +            f.getNow(null);
122 +            shouldThrow();
123 +        } catch (CompletionException success) {
124 +            assertSame(ex, success.getCause());
125 +        }
126 +        try {
127 +            f.get();
128 +            shouldThrow();
129 +        } catch (ExecutionException success) {
130 +            assertSame(ex, success.getCause());
131 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
132 +        assertTrue(f.isDone());
133 +        assertFalse(f.isCancelled());
134 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
135 +    }
136 +
137      void checkCancelled(CompletableFuture<?> f) {
138          try {
139              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 121 | Line 154 | public class CompletableFutureTest exten
154          } catch (CancellationException success) {
155          } catch (Throwable fail) { threadUnexpectedException(fail); }
156          assertTrue(f.isDone());
157 +        assertTrue(f.isCompletedExceptionally());
158          assertTrue(f.isCancelled());
159          assertTrue(f.toString().contains("[Completed exceptionally]"));
160      }
# Line 152 | Line 186 | public class CompletableFutureTest exten
186          } catch (Throwable fail) { threadUnexpectedException(fail); }
187          assertTrue(f.isDone());
188          assertFalse(f.isCancelled());
189 +        assertTrue(f.isCompletedExceptionally());
190          assertTrue(f.toString().contains("[Completed exceptionally]"));
191      }
192  
# Line 256 | Line 291 | public class CompletableFutureTest exten
291          assertEquals(g.getNumberOfDependents(), 0);
292      }
293  
259
294      /**
295       * toString indicates current completion state
296       */
# Line 284 | Line 318 | public class CompletableFutureTest exten
318  
319      // Choose non-commutative actions for better coverage
320  
321 +    // A non-commutative function that handles and produces null values as well.
322 +    static Integer subtract(Integer x, Integer y) {
323 +        return (x == null && y == null) ? null :
324 +            ((x == null) ? 42 : x.intValue())
325 +            - ((y == null) ? 99 : y.intValue());
326 +    }
327 +
328 +    // A function that handles and produces null values as well.
329 +    static Integer inc(Integer x) {
330 +        return (x == null) ? null : x + 1;
331 +    }
332 +
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) -> Integer.valueOf(x.intValue() - y.intValue());
338 >        (Integer x, Integer y) -> subtract(x, y);
339      static final class IncAction implements Consumer<Integer> {
340 <        int value;
341 <        public void accept(Integer x) { value = x.intValue() + 1; }
340 >        int invocationCount = 0;
341 >        Integer value;
342 >        public boolean ran() { return invocationCount == 1; }
343 >        public void accept(Integer x) {
344 >            invocationCount++;
345 >            value = inc(x);
346 >        }
347 >    }
348 >    static final class IncFunction implements Function<Integer,Integer> {
349 >        int invocationCount = 0;
350 >        Integer value;
351 >        public boolean ran() { return invocationCount == 1; }
352 >        public Integer apply(Integer x) {
353 >            invocationCount++;
354 >            return value = inc(x);
355 >        }
356      }
357      static final class SubtractAction implements BiConsumer<Integer, Integer> {
358 <        int value;
358 >        int invocationCount = 0;
359 >        Integer value;
360 >        // Check this action was invoked exactly once when result is computed.
361 >        public boolean ran() { return invocationCount == 1; }
362          public void accept(Integer x, Integer y) {
363 <            value = x.intValue() - y.intValue();
363 >            invocationCount++;
364 >            value = subtract(x, y);
365 >        }
366 >    }
367 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
368 >        int invocationCount = 0;
369 >        Integer value;
370 >        // Check this action was invoked exactly once when result is computed.
371 >        public boolean ran() { return invocationCount == 1; }
372 >        public Integer apply(Integer x, Integer y) {
373 >            invocationCount++;
374 >            return value = subtract(x, y);
375          }
376      }
377      static final class Noop implements Runnable {
378 +        int invocationCount = 0;
379          boolean ran;
380 <        public void run() { ran = true; }
380 >        public void run() {
381 >            invocationCount++;
382 >            ran = true;
383 >        }
384      }
385  
386      static final class FailingSupplier implements Supplier<Integer> {
# Line 371 | Line 449 | public class CompletableFutureTest exten
449          }
450      }
451  
452 +    /**
453 +     * Permits the testing of parallel code for the 3 different
454 +     * execution modes without repeating all the testing code.
455 +     */
456 +    enum ExecutionMode {
457 +        DEFAULT {
458 +            public <T,U> CompletableFuture<Void> runAfterBoth
459 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
460 +                return f.runAfterBoth(g, a);
461 +            }
462 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
463 +                (CompletableFuture<T> f,
464 +                 CompletionStage<? extends U> g,
465 +                 BiConsumer<? super T,? super U> a) {
466 +                return f.thenAcceptBoth(g, a);
467 +            }
468 +            public <T,U,V> CompletableFuture<V> thenCombine
469 +                (CompletableFuture<T> f,
470 +                 CompletionStage<? extends U> g,
471 +                 BiFunction<? super T,? super U,? extends V> a) {
472 +                return f.thenCombine(g, a);
473 +            }
474 +            public <T,U> CompletableFuture<U> applyToEither
475 +                (CompletableFuture<T> f,
476 +                 CompletionStage<? extends T> g,
477 +                 Function<? super T,U> a) {
478 +                return f.applyToEither(g, a);
479 +            }
480 +            public <T> CompletableFuture<Void> acceptEither
481 +                (CompletableFuture<T> f,
482 +                 CompletionStage<? extends T> g,
483 +                 Consumer<? super T> a) {
484 +                return f.acceptEither(g, a);
485 +            }
486 +            public <T> CompletableFuture<Void> runAfterEither
487 +                (CompletableFuture<T> f,
488 +                 CompletionStage<?> g,
489 +                 java.lang.Runnable a) {
490 +                return f.runAfterEither(g, a);
491 +            }
492 +            public <T,U> CompletableFuture<U> thenCompose
493 +                (CompletableFuture<T> f,
494 +                 Function<? super T,? extends CompletionStage<U>> a) {
495 +                return f.thenCompose(a);
496 +            }
497 +            public <T> CompletableFuture<T> whenComplete
498 +                (CompletableFuture<T> f,
499 +                 BiConsumer<? super T,? super Throwable> a) {
500 +                return f.whenComplete(a);
501 +            }
502 +        },
503 +
504 + //             /** Experimental way to do more testing */
505 + //         REVERSE_DEFAULT {
506 + //             public <T,U> CompletableFuture<Void> runAfterBoth
507 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
508 + //                 return g.runAfterBoth(f, a);
509 + //             }
510 + //             public <T,U> CompletableFuture<Void> thenAcceptBoth
511 + //                 (CompletableFuture<T> f,
512 + //                  CompletionStage<? extends U> g,
513 + //                  BiConsumer<? super T,? super U> a) {
514 + //                 return DEFAULT.thenAcceptBoth(f, g, a);
515 + //             }
516 + //         },
517 +
518 +        DEFAULT_ASYNC {
519 +            public <T,U> CompletableFuture<Void> runAfterBoth
520 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
521 +                return f.runAfterBothAsync(g, 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 f.thenAcceptBothAsync(g, a);
528 +            }
529 +            public <T,U,V> CompletableFuture<V> thenCombine
530 +                (CompletableFuture<T> f,
531 +                 CompletionStage<? extends U> g,
532 +                 BiFunction<? super T,? super U,? extends V> a) {
533 +                return f.thenCombineAsync(g, a);
534 +            }
535 +            public <T,U> CompletableFuture<U> applyToEither
536 +                (CompletableFuture<T> f,
537 +                 CompletionStage<? extends T> g,
538 +                 Function<? super T,U> a) {
539 +                return f.applyToEitherAsync(g, a);
540 +            }
541 +            public <T> CompletableFuture<Void> acceptEither
542 +                (CompletableFuture<T> f,
543 +                 CompletionStage<? extends T> g,
544 +                 Consumer<? super T> a) {
545 +                return f.acceptEitherAsync(g, a);
546 +            }
547 +            public <T> CompletableFuture<Void> runAfterEither
548 +                (CompletableFuture<T> f,
549 +                 CompletionStage<?> g,
550 +                 java.lang.Runnable a) {
551 +                return f.runAfterEitherAsync(g, a);
552 +            }
553 +            public <T,U> CompletableFuture<U> thenCompose
554 +                (CompletableFuture<T> f,
555 +                 Function<? super T,? extends CompletionStage<U>> a) {
556 +                return f.thenComposeAsync(a);
557 +            }
558 +            public <T> CompletableFuture<T> whenComplete
559 +                (CompletableFuture<T> f,
560 +                 BiConsumer<? super T,? super Throwable> a) {
561 +                return f.whenCompleteAsync(a);
562 +            }
563 +        },
564 +
565 + //         REVERSE_DEFAULT_ASYNC {
566 + //             public <T,U> CompletableFuture<Void> runAfterBoth
567 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
568 + //                 return f.runAfterBothAsync(g, a);
569 + //             }
570 + //             public <T,U> CompletableFuture<Void> thenAcceptBoth
571 + //                 (CompletableFuture<T> f,
572 + //                  CompletionStage<? extends U> g,
573 + //                  BiConsumer<? super T,? super U> a) {
574 + //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
575 + //             }
576 + //         },
577 +
578 +        EXECUTOR {
579 +            public <T,U> CompletableFuture<Void> runAfterBoth
580 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
581 +                return f.runAfterBothAsync(g, a, new ThreadExecutor());
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 f.thenAcceptBothAsync(g, a, new ThreadExecutor());
588 +            }
589 +            public <T,U,V> CompletableFuture<V> thenCombine
590 +                (CompletableFuture<T> f,
591 +                 CompletionStage<? extends U> g,
592 +                 BiFunction<? super T,? super U,? extends V> a) {
593 +                return f.thenCombineAsync(g, a, new ThreadExecutor());
594 +            }
595 +            public <T,U> CompletableFuture<U> applyToEither
596 +                (CompletableFuture<T> f,
597 +                 CompletionStage<? extends T> g,
598 +                 Function<? super T,U> a) {
599 +                return f.applyToEitherAsync(g, a, new ThreadExecutor());
600 +            }
601 +            public <T> CompletableFuture<Void> acceptEither
602 +                (CompletableFuture<T> f,
603 +                 CompletionStage<? extends T> g,
604 +                 Consumer<? super T> a) {
605 +                return f.acceptEitherAsync(g, a, new ThreadExecutor());
606 +            }
607 +            public <T> CompletableFuture<Void> runAfterEither
608 +                (CompletableFuture<T> f,
609 +                 CompletionStage<?> g,
610 +                 java.lang.Runnable a) {
611 +                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
612 +            }
613 +            public <T,U> CompletableFuture<U> thenCompose
614 +                (CompletableFuture<T> f,
615 +                 Function<? super T,? extends CompletionStage<U>> a) {
616 +                return f.thenComposeAsync(a, new ThreadExecutor());
617 +            }
618 +            public <T> CompletableFuture<T> whenComplete
619 +                (CompletableFuture<T> f,
620 +                 BiConsumer<? super T,? super Throwable> a) {
621 +                return f.whenCompleteAsync(a, new ThreadExecutor());
622 +            }
623 +        };
624 +
625 +        public abstract <T,U> CompletableFuture<Void> runAfterBoth
626 +            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
627 +        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
628 +            (CompletableFuture<T> f,
629 +             CompletionStage<? extends U> g,
630 +             BiConsumer<? super T,? super U> a);
631 +        public abstract <T,U,V> CompletableFuture<V> thenCombine
632 +            (CompletableFuture<T> f,
633 +             CompletionStage<? extends U> g,
634 +             BiFunction<? super T,? super U,? extends V> a);
635 +        public abstract <T,U> CompletableFuture<U> applyToEither
636 +            (CompletableFuture<T> f,
637 +             CompletionStage<? extends T> g,
638 +             Function<? super T,U> a);
639 +        public abstract <T> CompletableFuture<Void> acceptEither
640 +            (CompletableFuture<T> f,
641 +             CompletionStage<? extends T> g,
642 +             Consumer<? super T> a);
643 +        public abstract <T> CompletableFuture<Void> runAfterEither
644 +            (CompletableFuture<T> f,
645 +             CompletionStage<?> g,
646 +             java.lang.Runnable a);
647 +        public abstract <T,U> CompletableFuture<U> thenCompose
648 +            (CompletableFuture<T> f,
649 +             Function<? super T,? extends CompletionStage<U>> a);
650 +        public abstract <T> CompletableFuture<T> whenComplete
651 +            (CompletableFuture<T> f,
652 +             BiConsumer<? super T,? super Throwable> a);
653 +
654 +
655 +    }
656  
657      /**
658       * exceptionally action completes with function value on source
659 <     * exception;  otherwise with source value
659 >     * exception; otherwise with source value
660       */
661      public void testExceptionally() {
662          CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 622 | Line 904 | public class CompletableFutureTest exten
904          CompletableFuture<Void> g = f.thenAccept(r);
905          f.complete(one);
906          checkCompletedNormally(g, null);
907 <        assertEquals(r.value, 2);
907 >        assertEquals(r.value, (Integer) 2);
908      }
909  
910      /**
# Line 660 | Line 942 | public class CompletableFutureTest exten
942          checkCompletedWithWrappedCancellationException(g);
943      }
944  
663
945      /**
946       * thenCombine result completes normally after normal completion
947       * of sources
948       */
949 <    public void testThenCombine() {
950 <        CompletableFuture<Integer> f, g, h;
949 >    public void testThenCombine_normalCompletion1() {
950 >        for (ExecutionMode m : ExecutionMode.values())
951 >        for (Integer v1 : new Integer[] { 1, null })
952 >        for (Integer v2 : new Integer[] { 2, null }) {
953 >
954 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
955 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
956 >        final SubtractFunction r = new SubtractFunction();
957 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
958 >
959 >        f.complete(v1);
960 >        checkIncomplete(h);
961 >        assertEquals(r.invocationCount, 0);
962 >        g.complete(v2);
963 >
964 >        checkCompletedNormally(h, subtract(v1, v2));
965 >        checkCompletedNormally(f, v1);
966 >        checkCompletedNormally(g, v2);
967 >        assertEquals(r.invocationCount, 1);
968 >        }
969 >    }
970  
971 <        f = new CompletableFuture<>();
972 <        g = new CompletableFuture<>();
973 <        h = f.thenCombine(g, subtract);
974 <        f.complete(3);
975 <        checkIncomplete(h);
976 <        g.complete(1);
977 <        checkCompletedNormally(h, 2);
971 >    public void testThenCombine_normalCompletion2() {
972 >        for (ExecutionMode m : ExecutionMode.values())
973 >        for (Integer v1 : new Integer[] { 1, null })
974 >        for (Integer v2 : new Integer[] { 2, null }) {
975 >
976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
978 >        final SubtractFunction r = new SubtractFunction();
979 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
980 >
981 >        g.complete(v2);
982 >        checkIncomplete(h);
983 >        assertEquals(r.invocationCount, 0);
984 >        f.complete(v1);
985 >
986 >        checkCompletedNormally(h, subtract(v1, v2));
987 >        checkCompletedNormally(f, v1);
988 >        checkCompletedNormally(g, v2);
989 >        assertEquals(r.invocationCount, 1);
990 >        }
991 >    }
992  
993 <        f = new CompletableFuture<>();
994 <        g = new CompletableFuture<>();
995 <        h = f.thenCombine(g, subtract);
996 <        g.complete(1);
997 <        checkIncomplete(h);
998 <        f.complete(3);
999 <        checkCompletedNormally(h, 2);
993 >    public void testThenCombine_normalCompletion3() {
994 >        for (ExecutionMode m : ExecutionMode.values())
995 >        for (Integer v1 : new Integer[] { 1, null })
996 >        for (Integer v2 : new Integer[] { 2, null }) {
997 >
998 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
999 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1000 >        final SubtractFunction r = new SubtractFunction();
1001 >
1002 >        g.complete(v2);
1003 >        f.complete(v1);
1004 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1005 >
1006 >        checkCompletedNormally(h, subtract(v1, v2));
1007 >        checkCompletedNormally(f, v1);
1008 >        checkCompletedNormally(g, v2);
1009 >        assertEquals(r.invocationCount, 1);
1010 >        }
1011 >    }
1012  
1013 <        f = new CompletableFuture<>();
1014 <        g = new CompletableFuture<>();
1015 <        g.complete(1);
1016 <        f.complete(3);
1017 <        h = f.thenCombine(g, subtract);
1018 <        checkCompletedNormally(h, 2);
1013 >    public void testThenCombine_normalCompletion4() {
1014 >        for (ExecutionMode m : ExecutionMode.values())
1015 >        for (Integer v1 : new Integer[] { 1, null })
1016 >        for (Integer v2 : new Integer[] { 2, null }) {
1017 >
1018 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1019 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1020 >        final SubtractFunction r = new SubtractFunction();
1021 >
1022 >        f.complete(v1);
1023 >        g.complete(v2);
1024 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1025 >
1026 >        checkCompletedNormally(h, subtract(v1, v2));
1027 >        checkCompletedNormally(f, v1);
1028 >        checkCompletedNormally(g, v2);
1029 >        assertEquals(r.invocationCount, 1);
1030 >        }
1031      }
1032  
1033      /**
1034       * thenCombine result completes exceptionally after exceptional
1035       * completion of either source
1036       */
1037 <    public void testThenCombine2() {
1038 <        CompletableFuture<Integer> f, g, h;
1039 <
1040 <        f = new CompletableFuture<>();
1041 <        g = new CompletableFuture<>();
1042 <        h = f.thenCombine(g, subtract);
1043 <        f.completeExceptionally(new CFException());
1044 <        checkIncomplete(h);
1045 <        g.complete(1);
1046 <        checkCompletedWithWrappedCFException(h);
1037 >    public void testThenCombine_exceptionalCompletion1() {
1038 >        for (ExecutionMode m : ExecutionMode.values())
1039 >        for (Integer v1 : new Integer[] { 1, null }) {
1040 >
1041 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1042 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1043 >        final SubtractFunction r = new SubtractFunction();
1044 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1045 >        final CFException ex = new CFException();
1046 >
1047 >        f.completeExceptionally(ex);
1048 >        checkIncomplete(h);
1049 >        g.complete(v1);
1050 >
1051 >        checkCompletedWithWrappedCFException(h, ex);
1052 >        checkCompletedWithWrappedCFException(f, ex);
1053 >        assertEquals(r.invocationCount, 0);
1054 >        checkCompletedNormally(g, v1);
1055 >        }
1056 >    }
1057  
1058 <        f = new CompletableFuture<>();
1059 <        g = new CompletableFuture<>();
1060 <        h = f.thenCombine(g, subtract);
1061 <        g.completeExceptionally(new CFException());
1062 <        checkIncomplete(h);
1063 <        f.complete(3);
1064 <        checkCompletedWithWrappedCFException(h);
1058 >    public void testThenCombine_exceptionalCompletion2() {
1059 >        for (ExecutionMode m : ExecutionMode.values())
1060 >        for (Integer v1 : new Integer[] { 1, null }) {
1061 >
1062 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1063 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1064 >        final SubtractFunction r = new SubtractFunction();
1065 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1066 >        final CFException ex = new CFException();
1067 >
1068 >        g.completeExceptionally(ex);
1069 >        checkIncomplete(h);
1070 >        f.complete(v1);
1071 >
1072 >        checkCompletedWithWrappedCFException(h, ex);
1073 >        checkCompletedWithWrappedCFException(g, ex);
1074 >        assertEquals(r.invocationCount, 0);
1075 >        checkCompletedNormally(f, v1);
1076 >        }
1077 >    }
1078  
1079 <        f = new CompletableFuture<>();
1080 <        g = new CompletableFuture<>();
1081 <        f.complete(3);
1082 <        g.completeExceptionally(new CFException());
1083 <        h = f.thenCombine(g, subtract);
1084 <        checkCompletedWithWrappedCFException(h);
1079 >    public void testThenCombine_exceptionalCompletion3() {
1080 >        for (ExecutionMode m : ExecutionMode.values())
1081 >        for (Integer v1 : new Integer[] { 1, null }) {
1082 >
1083 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1084 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1085 >        final SubtractFunction r = new SubtractFunction();
1086 >        final CFException ex = new CFException();
1087 >
1088 >        g.completeExceptionally(ex);
1089 >        f.complete(v1);
1090 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1091 >
1092 >        checkCompletedWithWrappedCFException(h, ex);
1093 >        checkCompletedWithWrappedCFException(g, ex);
1094 >        assertEquals(r.invocationCount, 0);
1095 >        checkCompletedNormally(f, v1);
1096 >        }
1097 >    }
1098  
1099 <        f = new CompletableFuture<>();
1100 <        g = new CompletableFuture<>();
1101 <        f.completeExceptionally(new CFException());
1102 <        g.complete(3);
1103 <        h = f.thenCombine(g, subtract);
1104 <        checkCompletedWithWrappedCFException(h);
1099 >    public void testThenCombine_exceptionalCompletion4() {
1100 >        for (ExecutionMode m : ExecutionMode.values())
1101 >        for (Integer v1 : new Integer[] { 1, null }) {
1102 >
1103 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1104 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1105 >        final SubtractFunction r = new SubtractFunction();
1106 >        final CFException ex = new CFException();
1107 >
1108 >        f.completeExceptionally(ex);
1109 >        g.complete(v1);
1110 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1111 >
1112 >        checkCompletedWithWrappedCFException(h, ex);
1113 >        checkCompletedWithWrappedCFException(f, ex);
1114 >        assertEquals(r.invocationCount, 0);
1115 >        checkCompletedNormally(g, v1);
1116 >        }
1117      }
1118  
1119      /**
1120       * thenCombine result completes exceptionally if action does
1121       */
1122 <    public void testThenCombine3() {
1123 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1124 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1125 <        FailingBiFunction r = new FailingBiFunction();
1126 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1127 <        f.complete(one);
1128 <        checkIncomplete(g);
1129 <        assertFalse(r.ran);
1130 <        f2.complete(two);
1131 <        checkCompletedWithWrappedCFException(g);
1132 <        assertTrue(r.ran);
1122 >    public void testThenCombine_actionFailed1() {
1123 >        for (ExecutionMode m : ExecutionMode.values())
1124 >        for (Integer v1 : new Integer[] { 1, null })
1125 >        for (Integer v2 : new Integer[] { 2, null }) {
1126 >
1127 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1128 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1129 >        final FailingBiFunction r = new FailingBiFunction();
1130 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1131 >
1132 >        f.complete(v1);
1133 >        checkIncomplete(h);
1134 >        g.complete(v2);
1135 >
1136 >        checkCompletedWithWrappedCFException(h);
1137 >        checkCompletedNormally(f, v1);
1138 >        checkCompletedNormally(g, v2);
1139 >        }
1140 >    }
1141 >
1142 >    public void testThenCombine_actionFailed2() {
1143 >        for (ExecutionMode m : ExecutionMode.values())
1144 >        for (Integer v1 : new Integer[] { 1, null })
1145 >        for (Integer v2 : new Integer[] { 2, null }) {
1146 >
1147 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1148 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1149 >        final FailingBiFunction r = new FailingBiFunction();
1150 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1151 >
1152 >        g.complete(v2);
1153 >        checkIncomplete(h);
1154 >        f.complete(v1);
1155 >
1156 >        checkCompletedWithWrappedCFException(h);
1157 >        checkCompletedNormally(f, v1);
1158 >        checkCompletedNormally(g, v2);
1159 >        }
1160      }
1161  
1162      /**
1163       * thenCombine result completes exceptionally if either source cancelled
1164       */
1165 <    public void testThenCombine4() {
1166 <        CompletableFuture<Integer> f, g, h;
1165 >    public void testThenCombine_sourceCancelled1() {
1166 >        for (ExecutionMode m : ExecutionMode.values())
1167 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1168 >        for (Integer v1 : new Integer[] { 1, null }) {
1169 >
1170 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1171 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1172 >        final SubtractFunction r = new SubtractFunction();
1173 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1174  
1175 <        f = new CompletableFuture<>();
756 <        g = new CompletableFuture<>();
757 <        h = f.thenCombine(g, subtract);
758 <        assertTrue(f.cancel(true));
1175 >        assertTrue(f.cancel(mayInterruptIfRunning));
1176          checkIncomplete(h);
1177 <        g.complete(1);
1177 >        g.complete(v1);
1178 >
1179          checkCompletedWithWrappedCancellationException(h);
1180 +        checkCancelled(f);
1181 +        assertEquals(r.invocationCount, 0);
1182 +        checkCompletedNormally(g, v1);
1183 +        }
1184 +    }
1185  
1186 <        f = new CompletableFuture<>();
1187 <        g = new CompletableFuture<>();
1188 <        h = f.thenCombine(g, subtract);
1189 <        assertTrue(g.cancel(true));
1186 >    public void testThenCombine_sourceCancelled2() {
1187 >        for (ExecutionMode m : ExecutionMode.values())
1188 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1189 >        for (Integer v1 : new Integer[] { 1, null }) {
1190 >
1191 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1192 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1193 >        final SubtractFunction r = new SubtractFunction();
1194 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1195 >
1196 >        assertTrue(g.cancel(mayInterruptIfRunning));
1197          checkIncomplete(h);
1198 <        f.complete(3);
1198 >        f.complete(v1);
1199 >
1200          checkCompletedWithWrappedCancellationException(h);
1201 +        checkCancelled(g);
1202 +        assertEquals(r.invocationCount, 0);
1203 +        checkCompletedNormally(f, v1);
1204 +        }
1205 +    }
1206 +
1207 +    public void testThenCombine_sourceCancelled3() {
1208 +        for (ExecutionMode m : ExecutionMode.values())
1209 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1210 +        for (Integer v1 : new Integer[] { 1, null }) {
1211 +
1212 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1213 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1214 +        final SubtractFunction r = new SubtractFunction();
1215 +
1216 +        assertTrue(g.cancel(mayInterruptIfRunning));
1217 +        f.complete(v1);
1218 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1219 +
1220 +        checkCompletedWithWrappedCancellationException(h);
1221 +        checkCancelled(g);
1222 +        assertEquals(r.invocationCount, 0);
1223 +        checkCompletedNormally(f, v1);
1224 +        }
1225 +    }
1226 +
1227 +    public void testThenCombine_sourceCancelled4() {
1228 +        for (ExecutionMode m : ExecutionMode.values())
1229 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1230 +        for (Integer v1 : new Integer[] { 1, null }) {
1231 +
1232 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1233 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1234 +        final SubtractFunction r = new SubtractFunction();
1235 +
1236 +        assertTrue(f.cancel(mayInterruptIfRunning));
1237 +        g.complete(v1);
1238 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1239  
771        f = new CompletableFuture<>();
772        g = new CompletableFuture<>();
773        assertTrue(f.cancel(true));
774        assertTrue(g.cancel(true));
775        h = f.thenCombine(g, subtract);
1240          checkCompletedWithWrappedCancellationException(h);
1241 +        checkCancelled(f);
1242 +        assertEquals(r.invocationCount, 0);
1243 +        checkCompletedNormally(g, v1);
1244 +        }
1245      }
1246  
1247      /**
1248       * thenAcceptBoth result completes normally after normal
1249       * completion of sources
1250       */
1251 <    public void testThenAcceptBoth() {
1252 <        CompletableFuture<Integer> f, g;
1253 <        CompletableFuture<Void> h;
1254 <        SubtractAction r;
1251 >    public void testThenAcceptBoth_normalCompletion1() {
1252 >        for (ExecutionMode m : ExecutionMode.values())
1253 >        for (Integer v1 : new Integer[] { 1, null })
1254 >        for (Integer v2 : new Integer[] { 2, null }) {
1255 >
1256 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1257 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1258 >        final SubtractAction r = new SubtractAction();
1259 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1260  
1261 <        f = new CompletableFuture<>();
789 <        g = new CompletableFuture<>();
790 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
791 <        f.complete(3);
1261 >        f.complete(v1);
1262          checkIncomplete(h);
1263 <        g.complete(1);
1263 >        assertFalse(r.ran());
1264 >        g.complete(v2);
1265 >
1266          checkCompletedNormally(h, null);
1267 <        assertEquals(r.value, 2);
1267 >        assertEquals(r.value, subtract(v1, v2));
1268 >        checkCompletedNormally(f, v1);
1269 >        checkCompletedNormally(g, v2);
1270 >        }
1271 >    }
1272  
1273 <        f = new CompletableFuture<>();
1274 <        g = new CompletableFuture<>();
1275 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1276 <        g.complete(1);
1273 >    public void testThenAcceptBoth_normalCompletion2() {
1274 >        for (ExecutionMode m : ExecutionMode.values())
1275 >        for (Integer v1 : new Integer[] { 1, null })
1276 >        for (Integer v2 : new Integer[] { 2, null }) {
1277 >
1278 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1279 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1280 >        final SubtractAction r = new SubtractAction();
1281 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1282 >
1283 >        g.complete(v2);
1284          checkIncomplete(h);
1285 <        f.complete(3);
1285 >        assertFalse(r.ran());
1286 >        f.complete(v1);
1287 >
1288          checkCompletedNormally(h, null);
1289 <        assertEquals(r.value, 2);
1289 >        assertEquals(r.value, subtract(v1, v2));
1290 >        checkCompletedNormally(f, v1);
1291 >        checkCompletedNormally(g, v2);
1292 >        }
1293 >    }
1294 >
1295 >    public void testThenAcceptBoth_normalCompletion3() {
1296 >        for (ExecutionMode m : ExecutionMode.values())
1297 >        for (Integer v1 : new Integer[] { 1, null })
1298 >        for (Integer v2 : new Integer[] { 2, null }) {
1299 >
1300 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1301 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1302 >        final SubtractAction r = new SubtractAction();
1303 >
1304 >        g.complete(v2);
1305 >        f.complete(v1);
1306 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1307 >
1308 >        checkCompletedNormally(h, null);
1309 >        assertEquals(r.value, subtract(v1, v2));
1310 >        checkCompletedNormally(f, v1);
1311 >        checkCompletedNormally(g, v2);
1312 >        }
1313 >    }
1314 >
1315 >    public void testThenAcceptBoth_normalCompletion4() {
1316 >        for (ExecutionMode m : ExecutionMode.values())
1317 >        for (Integer v1 : new Integer[] { 1, null })
1318 >        for (Integer v2 : new Integer[] { 2, null }) {
1319 >
1320 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1321 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1322 >        final SubtractAction r = new SubtractAction();
1323 >
1324 >        f.complete(v1);
1325 >        g.complete(v2);
1326 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1327  
806        f = new CompletableFuture<>();
807        g = new CompletableFuture<>();
808        g.complete(1);
809        f.complete(3);
810        h = f.thenAcceptBoth(g, r = new SubtractAction());
1328          checkCompletedNormally(h, null);
1329 <        assertEquals(r.value, 2);
1329 >        assertEquals(r.value, subtract(v1, v2));
1330 >        checkCompletedNormally(f, v1);
1331 >        checkCompletedNormally(g, v2);
1332 >        }
1333      }
1334  
1335      /**
1336       * thenAcceptBoth result completes exceptionally after exceptional
1337       * completion of either source
1338       */
1339 <    public void testThenAcceptBoth2() {
1340 <        CompletableFuture<Integer> f, g;
1341 <        CompletableFuture<Void> h;
1342 <        SubtractAction r;
1343 <
1344 <        f = new CompletableFuture<>();
1345 <        g = new CompletableFuture<>();
1346 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1347 <        f.completeExceptionally(new CFException());
1348 <        checkIncomplete(h);
1349 <        g.complete(1);
1350 <        checkCompletedWithWrappedCFException(h);
1339 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1340 >        for (ExecutionMode m : ExecutionMode.values())
1341 >        for (Integer v1 : new Integer[] { 1, null }) {
1342 >
1343 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1344 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1345 >        final SubtractAction r = new SubtractAction();
1346 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1347 >        final CFException ex = new CFException();
1348 >
1349 >        f.completeExceptionally(ex);
1350 >        checkIncomplete(h);
1351 >        g.complete(v1);
1352 >
1353 >        checkCompletedWithWrappedCFException(h, ex);
1354 >        checkCompletedWithWrappedCFException(f, ex);
1355 >        assertEquals(r.invocationCount, 0);
1356 >        checkCompletedNormally(g, v1);
1357 >        }
1358 >    }
1359  
1360 <        f = new CompletableFuture<>();
1361 <        g = new CompletableFuture<>();
1362 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1363 <        g.completeExceptionally(new CFException());
1364 <        checkIncomplete(h);
1365 <        f.complete(3);
1366 <        checkCompletedWithWrappedCFException(h);
1360 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1361 >        for (ExecutionMode m : ExecutionMode.values())
1362 >        for (Integer v1 : new Integer[] { 1, null }) {
1363 >
1364 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1365 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1366 >        final SubtractAction r = new SubtractAction();
1367 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1368 >        final CFException ex = new CFException();
1369 >
1370 >        g.completeExceptionally(ex);
1371 >        checkIncomplete(h);
1372 >        f.complete(v1);
1373 >
1374 >        checkCompletedWithWrappedCFException(h, ex);
1375 >        checkCompletedWithWrappedCFException(g, ex);
1376 >        assertEquals(r.invocationCount, 0);
1377 >        checkCompletedNormally(f, v1);
1378 >        }
1379 >    }
1380  
1381 <        f = new CompletableFuture<>();
1382 <        g = new CompletableFuture<>();
1383 <        f.complete(3);
1384 <        g.completeExceptionally(new CFException());
1385 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1386 <        checkCompletedWithWrappedCFException(h);
1381 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1382 >        for (ExecutionMode m : ExecutionMode.values())
1383 >        for (Integer v1 : new Integer[] { 1, null }) {
1384 >
1385 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1386 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1387 >        final SubtractAction r = new SubtractAction();
1388 >        final CFException ex = new CFException();
1389 >
1390 >        g.completeExceptionally(ex);
1391 >        f.complete(v1);
1392 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1393 >
1394 >        checkCompletedWithWrappedCFException(h, ex);
1395 >        checkCompletedWithWrappedCFException(g, ex);
1396 >        assertEquals(r.invocationCount, 0);
1397 >        checkCompletedNormally(f, v1);
1398 >        }
1399 >    }
1400  
1401 <        f = new CompletableFuture<>();
1402 <        g = new CompletableFuture<>();
1403 <        f.completeExceptionally(new CFException());
1404 <        g.complete(3);
1405 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1406 <        checkCompletedWithWrappedCFException(h);
1401 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1402 >        for (ExecutionMode m : ExecutionMode.values())
1403 >        for (Integer v1 : new Integer[] { 1, null }) {
1404 >
1405 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1406 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1407 >        final SubtractAction r = new SubtractAction();
1408 >        final CFException ex = new CFException();
1409 >
1410 >        f.completeExceptionally(ex);
1411 >        g.complete(v1);
1412 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1413 >
1414 >        checkCompletedWithWrappedCFException(h, ex);
1415 >        checkCompletedWithWrappedCFException(f, ex);
1416 >        assertFalse(r.ran());
1417 >        checkCompletedNormally(g, v1);
1418 >        }
1419      }
1420  
1421      /**
1422       * thenAcceptBoth result completes exceptionally if action does
1423       */
1424 <    public void testThenAcceptBoth3() {
1425 <        CompletableFuture<Integer> f, g;
1426 <        CompletableFuture<Void> h;
1427 <        FailingBiConsumer r;
1424 >    public void testThenAcceptBoth_actionFailed1() {
1425 >        for (ExecutionMode m : ExecutionMode.values())
1426 >        for (Integer v1 : new Integer[] { 1, null })
1427 >        for (Integer v2 : new Integer[] { 2, null }) {
1428  
1429 <        f = new CompletableFuture<>();
1430 <        g = new CompletableFuture<>();
1431 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1432 <        f.complete(3);
1429 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1430 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1431 >        final FailingBiConsumer r = new FailingBiConsumer();
1432 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1433 >
1434 >        f.complete(v1);
1435          checkIncomplete(h);
1436 <        g.complete(1);
1436 >        g.complete(v2);
1437 >
1438          checkCompletedWithWrappedCFException(h);
1439 +        checkCompletedNormally(f, v1);
1440 +        checkCompletedNormally(g, v2);
1441 +        }
1442 +    }
1443 +
1444 +    public void testThenAcceptBoth_actionFailed2() {
1445 +        for (ExecutionMode m : ExecutionMode.values())
1446 +        for (Integer v1 : new Integer[] { 1, null })
1447 +        for (Integer v2 : new Integer[] { 2, null }) {
1448 +
1449 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1450 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1451 +        final FailingBiConsumer r = new FailingBiConsumer();
1452 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1453 +
1454 +        g.complete(v2);
1455 +        checkIncomplete(h);
1456 +        f.complete(v1);
1457  
871        f = new CompletableFuture<>();
872        g = new CompletableFuture<>();
873        f.complete(3);
874        g.complete(1);
875        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1458          checkCompletedWithWrappedCFException(h);
1459 +        checkCompletedNormally(f, v1);
1460 +        checkCompletedNormally(g, v2);
1461 +        }
1462      }
1463  
1464      /**
1465       * thenAcceptBoth result completes exceptionally if either source cancelled
1466       */
1467 <    public void testThenAcceptBoth4() {
1468 <        CompletableFuture<Integer> f, g;
1469 <        CompletableFuture<Void> h;
1470 <        SubtractAction r;
1467 >    public void testThenAcceptBoth_sourceCancelled1() {
1468 >        for (ExecutionMode m : ExecutionMode.values())
1469 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1470 >        for (Integer v1 : new Integer[] { 1, null }) {
1471 >
1472 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1474 >        final SubtractAction r = new SubtractAction();
1475 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1476  
1477 <        f = new CompletableFuture<>();
888 <        g = new CompletableFuture<>();
889 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
890 <        assertTrue(f.cancel(true));
1477 >        assertTrue(f.cancel(mayInterruptIfRunning));
1478          checkIncomplete(h);
1479 <        g.complete(1);
1479 >        g.complete(v1);
1480 >
1481          checkCompletedWithWrappedCancellationException(h);
1482 +        checkCancelled(f);
1483 +        assertEquals(r.invocationCount, 0);
1484 +        checkCompletedNormally(g, v1);
1485 +        }
1486 +    }
1487  
1488 <        f = new CompletableFuture<>();
1489 <        g = new CompletableFuture<>();
1490 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1491 <        assertTrue(g.cancel(true));
1488 >    public void testThenAcceptBoth_sourceCancelled2() {
1489 >        for (ExecutionMode m : ExecutionMode.values())
1490 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1491 >        for (Integer v1 : new Integer[] { 1, null }) {
1492 >
1493 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1494 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1495 >        final SubtractAction r = new SubtractAction();
1496 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1497 >
1498 >        assertTrue(g.cancel(mayInterruptIfRunning));
1499          checkIncomplete(h);
1500 <        f.complete(3);
901 <        checkCompletedWithWrappedCancellationException(h);
1500 >        f.complete(v1);
1501  
903        f = new CompletableFuture<>();
904        g = new CompletableFuture<>();
905        f.complete(3);
906        assertTrue(g.cancel(true));
907        h = f.thenAcceptBoth(g, r = new SubtractAction());
1502          checkCompletedWithWrappedCancellationException(h);
1503 +        checkCancelled(g);
1504 +        assertEquals(r.invocationCount, 0);
1505 +        checkCompletedNormally(f, v1);
1506 +        }
1507 +    }
1508 +
1509 +    public void testThenAcceptBoth_sourceCancelled3() {
1510 +        for (ExecutionMode m : ExecutionMode.values())
1511 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1512 +        for (Integer v1 : new Integer[] { 1, null }) {
1513 +
1514 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1515 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1516 +        final SubtractAction r = new SubtractAction();
1517 +
1518 +        assertTrue(g.cancel(mayInterruptIfRunning));
1519 +        f.complete(v1);
1520 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1521 +
1522 +        checkCompletedWithWrappedCancellationException(h);
1523 +        checkCancelled(g);
1524 +        assertEquals(r.invocationCount, 0);
1525 +        checkCompletedNormally(f, v1);
1526 +        }
1527 +    }
1528 +
1529 +    public void testThenAcceptBoth_sourceCancelled4() {
1530 +        for (ExecutionMode m : ExecutionMode.values())
1531 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1532 +        for (Integer v1 : new Integer[] { 1, null }) {
1533 +
1534 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1535 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1536 +        final SubtractAction r = new SubtractAction();
1537 +
1538 +        assertTrue(f.cancel(mayInterruptIfRunning));
1539 +        g.complete(v1);
1540 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1541  
910        f = new CompletableFuture<>();
911        g = new CompletableFuture<>();
912        assertTrue(f.cancel(true));
913        g.complete(3);
914        h = f.thenAcceptBoth(g, r = new SubtractAction());
1542          checkCompletedWithWrappedCancellationException(h);
1543 +        checkCancelled(f);
1544 +        assertEquals(r.invocationCount, 0);
1545 +        checkCompletedNormally(g, v1);
1546 +        }
1547      }
1548  
1549      /**
1550       * runAfterBoth result completes normally after normal
1551       * completion of sources
1552       */
1553 <    public void testRunAfterBoth() {
1554 <        CompletableFuture<Integer> f, g;
1555 <        CompletableFuture<Void> h;
1556 <        Noop r;
1553 >    public void testRunAfterBoth_normalCompletion1() {
1554 >        for (ExecutionMode m : ExecutionMode.values())
1555 >        for (Integer v1 : new Integer[] { 1, null })
1556 >        for (Integer v2 : new Integer[] { 2, null }) {
1557 >
1558 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1559 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1560 >        final Noop r = new Noop();
1561 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1562  
1563 <        f = new CompletableFuture<>();
928 <        g = new CompletableFuture<>();
929 <        h = f.runAfterBoth(g, r = new Noop());
930 <        f.complete(3);
1563 >        f.complete(v1);
1564          checkIncomplete(h);
1565 <        g.complete(1);
1565 >        assertFalse(r.ran);
1566 >        g.complete(v2);
1567 >
1568          checkCompletedNormally(h, null);
1569 <        assertTrue(r.ran);
1569 >        assertEquals(r.invocationCount, 1);
1570 >        checkCompletedNormally(f, v1);
1571 >        checkCompletedNormally(g, v2);
1572 >        }
1573 >    }
1574  
1575 <        f = new CompletableFuture<>();
1576 <        g = new CompletableFuture<>();
1577 <        h = f.runAfterBoth(g, r = new Noop());
1578 <        g.complete(1);
1575 >    public void testRunAfterBoth_normalCompletion2() {
1576 >        for (ExecutionMode m : ExecutionMode.values())
1577 >        for (Integer v1 : new Integer[] { 1, null })
1578 >        for (Integer v2 : new Integer[] { 2, null }) {
1579 >
1580 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1581 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1582 >        final Noop r = new Noop();
1583 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 >
1585 >        g.complete(v2);
1586          checkIncomplete(h);
1587 <        f.complete(3);
1587 >        assertFalse(r.ran);
1588 >        f.complete(v1);
1589 >
1590          checkCompletedNormally(h, null);
1591 <        assertTrue(r.ran);
1591 >        assertEquals(r.invocationCount, 1);
1592 >        checkCompletedNormally(f, v1);
1593 >        checkCompletedNormally(g, v2);
1594 >        }
1595 >    }
1596 >
1597 >    public void testRunAfterBoth_normalCompletion3() {
1598 >        for (ExecutionMode m : ExecutionMode.values())
1599 >        for (Integer v1 : new Integer[] { 1, null })
1600 >        for (Integer v2 : new Integer[] { 2, null }) {
1601 >
1602 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1603 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1604 >        final Noop r = new Noop();
1605 >
1606 >        g.complete(v2);
1607 >        f.complete(v1);
1608 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1609  
945        f = new CompletableFuture<>();
946        g = new CompletableFuture<>();
947        g.complete(1);
948        f.complete(3);
949        h = f.runAfterBoth(g, r = new Noop());
1610          checkCompletedNormally(h, null);
1611          assertTrue(r.ran);
1612 +        checkCompletedNormally(f, v1);
1613 +        checkCompletedNormally(g, v2);
1614 +        }
1615 +    }
1616 +
1617 +    public void testRunAfterBoth_normalCompletion4() {
1618 +        for (ExecutionMode m : ExecutionMode.values())
1619 +        for (Integer v1 : new Integer[] { 1, null })
1620 +        for (Integer v2 : new Integer[] { 2, null }) {
1621 +
1622 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1623 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1624 +        final Noop r = new Noop();
1625 +
1626 +        f.complete(v1);
1627 +        g.complete(v2);
1628 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1629 +
1630 +        checkCompletedNormally(h, null);
1631 +        assertEquals(r.invocationCount, 1);
1632 +        checkCompletedNormally(f, v1);
1633 +        checkCompletedNormally(g, v2);
1634 +        }
1635      }
1636  
1637      /**
1638       * runAfterBoth result completes exceptionally after exceptional
1639       * completion of either source
1640       */
1641 <    public void testRunAfterBoth2() {
1642 <        CompletableFuture<Integer> f, g;
1643 <        CompletableFuture<Void> h;
1644 <        Noop r;
1645 <
1646 <        f = new CompletableFuture<>();
1647 <        g = new CompletableFuture<>();
1648 <        h = f.runAfterBoth(g, r = new Noop());
1649 <        f.completeExceptionally(new CFException());
1650 <        checkIncomplete(h);
1651 <        g.complete(1);
1652 <        checkCompletedWithWrappedCFException(h);
1653 <        assertFalse(r.ran);
1641 >    public void testRunAfterBoth_exceptionalCompletion1() {
1642 >        for (ExecutionMode m : ExecutionMode.values())
1643 >        for (Integer v1 : new Integer[] { 1, null }) {
1644 >
1645 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1646 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1647 >        final Noop r = new Noop();
1648 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1649 >        final CFException ex = new CFException();
1650 >
1651 >        f.completeExceptionally(ex);
1652 >        checkIncomplete(h);
1653 >        g.complete(v1);
1654 >
1655 >        checkCompletedWithWrappedCFException(h, ex);
1656 >        checkCompletedWithWrappedCFException(f, ex);
1657 >        assertEquals(r.invocationCount, 0);
1658 >        checkCompletedNormally(g, v1);
1659 >        }
1660 >    }
1661  
1662 <        f = new CompletableFuture<>();
1663 <        g = new CompletableFuture<>();
1664 <        h = f.runAfterBoth(g, r = new Noop());
1665 <        g.completeExceptionally(new CFException());
1666 <        checkIncomplete(h);
1667 <        f.complete(3);
1668 <        checkCompletedWithWrappedCFException(h);
1669 <        assertFalse(r.ran);
1662 >    public void testRunAfterBoth_exceptionalCompletion2() {
1663 >        for (ExecutionMode m : ExecutionMode.values())
1664 >        for (Integer v1 : new Integer[] { 1, null }) {
1665 >
1666 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 >        final Noop r = new Noop();
1669 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 >        final CFException ex = new CFException();
1671 >
1672 >        g.completeExceptionally(ex);
1673 >        checkIncomplete(h);
1674 >        f.complete(v1);
1675 >
1676 >        checkCompletedWithWrappedCFException(h, ex);
1677 >        checkCompletedWithWrappedCFException(g, ex);
1678 >        assertEquals(r.invocationCount, 0);
1679 >        checkCompletedNormally(f, v1);
1680 >        }
1681 >    }
1682  
1683 <        f = new CompletableFuture<>();
1684 <        g = new CompletableFuture<>();
1685 <        g.completeExceptionally(new CFException());
1686 <        f.complete(3);
1687 <        h = f.runAfterBoth(g, r = new Noop());
1688 <        checkCompletedWithWrappedCFException(h);
1689 <        assertFalse(r.ran);
1683 >    public void testRunAfterBoth_exceptionalCompletion3() {
1684 >        for (ExecutionMode m : ExecutionMode.values())
1685 >        for (Integer v1 : new Integer[] { 1, null }) {
1686 >
1687 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1688 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1689 >        final Noop r = new Noop();
1690 >        final CFException ex = new CFException();
1691 >
1692 >        g.completeExceptionally(ex);
1693 >        f.complete(v1);
1694 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1695 >
1696 >        checkCompletedWithWrappedCFException(h, ex);
1697 >        checkCompletedWithWrappedCFException(g, ex);
1698 >        assertEquals(r.invocationCount, 0);
1699 >        checkCompletedNormally(f, v1);
1700 >        }
1701 >    }
1702  
1703 <        f = new CompletableFuture<>();
1704 <        g = new CompletableFuture<>();
1705 <        f.completeExceptionally(new CFException());
1706 <        g.complete(1);
1707 <        h = f.runAfterBoth(g, r = new Noop());
1708 <        checkCompletedWithWrappedCFException(h);
1709 <        assertFalse(r.ran);
1703 >    public void testRunAfterBoth_exceptionalCompletion4() {
1704 >        for (ExecutionMode m : ExecutionMode.values())
1705 >        for (Integer v1 : new Integer[] { 1, null }) {
1706 >
1707 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1708 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1709 >        final Noop r = new Noop();
1710 >        final CFException ex = new CFException();
1711 >
1712 >        f.completeExceptionally(ex);
1713 >        g.complete(v1);
1714 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1715 >
1716 >        checkCompletedWithWrappedCFException(h, ex);
1717 >        checkCompletedWithWrappedCFException(f, ex);
1718 >        assertEquals(r.invocationCount, 0);
1719 >        checkCompletedNormally(g, v1);
1720 >        }
1721      }
1722  
1723      /**
1724       * runAfterBoth result completes exceptionally if action does
1725       */
1726 <    public void testRunAfterBoth3() {
1727 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1728 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1729 <        FailingNoop r = new FailingNoop();
1730 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1731 <        f.complete(one);
1732 <        checkIncomplete(g);
1733 <        f2.complete(two);
1734 <        checkCompletedWithWrappedCFException(g);
1726 >    public void testRunAfterBoth_actionFailed1() {
1727 >        for (ExecutionMode m : ExecutionMode.values())
1728 >        for (Integer v1 : new Integer[] { 1, null })
1729 >        for (Integer v2 : new Integer[] { 2, null }) {
1730 >
1731 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1732 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1733 >        final FailingNoop r = new FailingNoop();
1734 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1735 >
1736 >        f.complete(v1);
1737 >        checkIncomplete(h);
1738 >        g.complete(v2);
1739 >
1740 >        checkCompletedWithWrappedCFException(h);
1741 >        checkCompletedNormally(f, v1);
1742 >        checkCompletedNormally(g, v2);
1743 >        }
1744 >    }
1745 >
1746 >    public void testRunAfterBoth_actionFailed2() {
1747 >        for (ExecutionMode m : ExecutionMode.values())
1748 >        for (Integer v1 : new Integer[] { 1, null })
1749 >        for (Integer v2 : new Integer[] { 2, null }) {
1750 >
1751 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1752 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1753 >        final FailingNoop r = new FailingNoop();
1754 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1755 >
1756 >        g.complete(v2);
1757 >        checkIncomplete(h);
1758 >        f.complete(v1);
1759 >
1760 >        checkCompletedWithWrappedCFException(h);
1761 >        checkCompletedNormally(f, v1);
1762 >        checkCompletedNormally(g, v2);
1763 >        }
1764      }
1765  
1766      /**
1767       * runAfterBoth result completes exceptionally if either source cancelled
1768       */
1769 <    public void testRunAfterBoth4() {
1770 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1771 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1772 <        Noop r = new Noop();
1773 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1774 <        assertTrue(f.cancel(true));
1775 <        f2.complete(two);
1776 <        checkCompletedWithWrappedCancellationException(g);
1777 <        f = new CompletableFuture<>();
1778 <        f2 = new CompletableFuture<>();
1779 <        r = new Noop();
1780 <        g = f.runAfterBoth(f2, r);
1781 <        f.complete(one);
1782 <        assertTrue(f2.cancel(true));
1783 <        checkCompletedWithWrappedCancellationException(g);
1769 >    public void testRunAfterBoth_sourceCancelled1() {
1770 >        for (ExecutionMode m : ExecutionMode.values())
1771 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1772 >        for (Integer v1 : new Integer[] { 1, null }) {
1773 >
1774 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1775 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1776 >        final Noop r = new Noop();
1777 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1778 >
1779 >        assertTrue(f.cancel(mayInterruptIfRunning));
1780 >        checkIncomplete(h);
1781 >        g.complete(v1);
1782 >
1783 >        checkCompletedWithWrappedCancellationException(h);
1784 >        checkCancelled(f);
1785 >        assertEquals(r.invocationCount, 0);
1786 >        checkCompletedNormally(g, v1);
1787 >        }
1788 >    }
1789 >
1790 >    public void testRunAfterBoth_sourceCancelled2() {
1791 >        for (ExecutionMode m : ExecutionMode.values())
1792 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1793 >        for (Integer v1 : new Integer[] { 1, null }) {
1794 >
1795 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1796 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1797 >        final Noop r = new Noop();
1798 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1799 >
1800 >        assertTrue(g.cancel(mayInterruptIfRunning));
1801 >        checkIncomplete(h);
1802 >        f.complete(v1);
1803 >
1804 >        checkCompletedWithWrappedCancellationException(h);
1805 >        checkCancelled(g);
1806 >        assertEquals(r.invocationCount, 0);
1807 >        checkCompletedNormally(f, v1);
1808 >        }
1809 >    }
1810 >
1811 >    public void testRunAfterBoth_sourceCancelled3() {
1812 >        for (ExecutionMode m : ExecutionMode.values())
1813 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1814 >        for (Integer v1 : new Integer[] { 1, null }) {
1815 >
1816 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1817 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1818 >        final Noop r = new Noop();
1819 >
1820 >        assertTrue(g.cancel(mayInterruptIfRunning));
1821 >        f.complete(v1);
1822 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1823 >
1824 >        checkCompletedWithWrappedCancellationException(h);
1825 >        checkCancelled(g);
1826 >        assertEquals(r.invocationCount, 0);
1827 >        checkCompletedNormally(f, v1);
1828 >        }
1829 >    }
1830 >
1831 >    public void testRunAfterBoth_sourceCancelled4() {
1832 >        for (ExecutionMode m : ExecutionMode.values())
1833 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1834 >        for (Integer v1 : new Integer[] { 1, null }) {
1835 >
1836 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1837 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1838 >        final Noop r = new Noop();
1839 >
1840 >        assertTrue(f.cancel(mayInterruptIfRunning));
1841 >        g.complete(v1);
1842 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1843 >
1844 >        checkCompletedWithWrappedCancellationException(h);
1845 >        checkCancelled(f);
1846 >        assertEquals(r.invocationCount, 0);
1847 >        checkCompletedNormally(g, v1);
1848 >        }
1849      }
1850  
1851      /**
1852       * applyToEither result completes normally after normal completion
1853       * of either source
1854       */
1855 <    public void testApplyToEither() {
1856 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1857 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1858 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1859 <        f.complete(one);
1860 <        checkCompletedNormally(g, two);
1861 <        f2.complete(one);
1862 <        checkCompletedNormally(g, two);
1855 >    public void testApplyToEither_normalCompletion1() {
1856 >        for (ExecutionMode m : ExecutionMode.values())
1857 >        for (Integer v1 : new Integer[] { 1, null })
1858 >        for (Integer v2 : new Integer[] { 2, null }) {
1859 >
1860 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1861 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1862 >        final IncFunction r = new IncFunction();
1863 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1864 >
1865 >        f.complete(v1);
1866 >        checkCompletedNormally(h, inc(v1));
1867 >        g.complete(v2);
1868 >
1869 >        checkCompletedNormally(f, v1);
1870 >        checkCompletedNormally(g, v2);
1871 >        checkCompletedNormally(h, inc(v1));
1872 >        }
1873 >    }
1874  
1875 <        f = new CompletableFuture<>();
1876 <        f.complete(one);
1877 <        f2 = new CompletableFuture<>();
1878 <        g = f.applyToEither(f2, inc);
1879 <        checkCompletedNormally(g, two);
1875 >    public void testApplyToEither_normalCompletion2() {
1876 >        for (ExecutionMode m : ExecutionMode.values())
1877 >        for (Integer v1 : new Integer[] { 1, null })
1878 >        for (Integer v2 : new Integer[] { 2, null }) {
1879 >
1880 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1881 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1882 >        final IncFunction r = new IncFunction();
1883 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1884 >
1885 >        g.complete(v2);
1886 >        checkCompletedNormally(h, inc(v2));
1887 >        f.complete(v1);
1888 >
1889 >        checkCompletedNormally(f, v1);
1890 >        checkCompletedNormally(g, v2);
1891 >        checkCompletedNormally(h, inc(v2));
1892 >        }
1893 >    }
1894 >    public void testApplyToEither_normalCompletion3() {
1895 >        for (ExecutionMode m : ExecutionMode.values())
1896 >        for (Integer v1 : new Integer[] { 1, null })
1897 >        for (Integer v2 : new Integer[] { 2, null }) {
1898 >
1899 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1900 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1901 >        final IncFunction r = new IncFunction();
1902 >
1903 >        f.complete(v1);
1904 >        g.complete(v2);
1905 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1906 >
1907 >        checkCompletedNormally(f, v1);
1908 >        checkCompletedNormally(g, v2);
1909 >
1910 >        // unspecified behavior
1911 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1912 >                   Objects.equals(h.join(), inc(v2)));
1913 >        assertEquals(r.invocationCount, 1);
1914 >        }
1915      }
1916  
1917      /**
1918       * applyToEither result completes exceptionally after exceptional
1919       * completion of either source
1920       */
1921 <    public void testApplyToEither2() {
1922 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1923 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1924 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1925 <        f.completeExceptionally(new CFException());
1926 <        f2.complete(one);
1927 <        checkCompletedWithWrappedCFException(g);
1921 >    public void testApplyToEither_exceptionalCompletion1() {
1922 >        for (ExecutionMode m : ExecutionMode.values())
1923 >        for (Integer v1 : new Integer[] { 1, null }) {
1924 >
1925 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1926 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1927 >        final IncFunction r = new IncFunction();
1928 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1929 >        final CFException ex = new CFException();
1930 >
1931 >        f.completeExceptionally(ex);
1932 >        checkCompletedWithWrappedCFException(h, ex);
1933 >        g.complete(v1);
1934 >
1935 >        assertEquals(r.invocationCount, 0);
1936 >        checkCompletedNormally(g, v1);
1937 >        checkCompletedWithWrappedCFException(f, ex);
1938 >        checkCompletedWithWrappedCFException(h, ex);
1939 >        }
1940 >    }
1941  
1942 <        f = new CompletableFuture<>();
1943 <        f2 = new CompletableFuture<>();
1944 <        f2.completeExceptionally(new CFException());
1945 <        g = f.applyToEither(f2, inc);
1946 <        checkCompletedWithWrappedCFException(g);
1942 >    public void testApplyToEither_exceptionalCompletion2() {
1943 >        for (ExecutionMode m : ExecutionMode.values())
1944 >        for (Integer v1 : new Integer[] { 1, null }) {
1945 >
1946 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1947 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1948 >        final IncFunction r = new IncFunction();
1949 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1950 >        final CFException ex = new CFException();
1951 >
1952 >        g.completeExceptionally(ex);
1953 >        checkCompletedWithWrappedCFException(h, ex);
1954 >        f.complete(v1);
1955 >
1956 >        assertEquals(r.invocationCount, 0);
1957 >        checkCompletedNormally(f, v1);
1958 >        checkCompletedWithWrappedCFException(g, ex);
1959 >        checkCompletedWithWrappedCFException(h, ex);
1960 >        }
1961 >    }
1962 >
1963 >    public void testApplyToEither_exceptionalCompletion3() {
1964 >        for (ExecutionMode m : ExecutionMode.values())
1965 >        for (Integer v1 : new Integer[] { 1, null }) {
1966 >
1967 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1968 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1969 >        final IncFunction r = new IncFunction();
1970 >        final CFException ex = new CFException();
1971 >
1972 >        g.completeExceptionally(ex);
1973 >        f.complete(v1);
1974 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1975 >
1976 >        // unspecified behavior
1977 >        Integer v;
1978 >        try {
1979 >            assertEquals(h.join(), inc(v1));
1980 >            assertEquals(r.invocationCount, 1);
1981 >        } catch (CompletionException ok) {
1982 >            checkCompletedWithWrappedCFException(h, ex);
1983 >            assertEquals(r.invocationCount, 0);
1984 >        }
1985 >
1986 >        checkCompletedWithWrappedCFException(g, ex);
1987 >        checkCompletedNormally(f, v1);
1988 >        }
1989 >    }
1990 >
1991 >    public void testApplyToEither_exceptionalCompletion4() {
1992 >        for (ExecutionMode m : ExecutionMode.values())
1993 >        for (Integer v1 : new Integer[] { 1, null }) {
1994 >
1995 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1996 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1997 >        final IncFunction r = new IncFunction();
1998 >        final CFException ex = new CFException();
1999 >
2000 >        f.completeExceptionally(ex);
2001 >        g.complete(v1);
2002 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2003 >
2004 >        // unspecified behavior
2005 >        Integer v;
2006 >        try {
2007 >            assertEquals(h.join(), inc(v1));
2008 >            assertEquals(r.invocationCount, 1);
2009 >        } catch (CompletionException ok) {
2010 >            checkCompletedWithWrappedCFException(h, ex);
2011 >            assertEquals(r.invocationCount, 0);
2012 >        }
2013 >
2014 >        checkCompletedWithWrappedCFException(f, ex);
2015 >        checkCompletedNormally(g, v1);
2016 >        }
2017      }
2018  
2019      /**
2020       * applyToEither result completes exceptionally if action does
2021       */
2022 <    public void testApplyToEither3() {
2023 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2024 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2025 <        FailingFunction r = new FailingFunction();
2026 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
2027 <        f2.complete(two);
2028 <        checkCompletedWithWrappedCFException(g);
2022 >    public void testApplyToEither_actionFailed1() {
2023 >        for (ExecutionMode m : ExecutionMode.values())
2024 >        for (Integer v1 : new Integer[] { 1, null })
2025 >        for (Integer v2 : new Integer[] { 2, null }) {
2026 >
2027 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2028 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2029 >        final FailingFunction r = new FailingFunction();
2030 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2031 >
2032 >        f.complete(v1);
2033 >        checkCompletedWithWrappedCFException(h);
2034 >        g.complete(v2);
2035 >        checkCompletedNormally(f, v1);
2036 >        checkCompletedNormally(g, v2);
2037 >        }
2038 >    }
2039 >
2040 >    public void testApplyToEither_actionFailed2() {
2041 >        for (ExecutionMode m : ExecutionMode.values())
2042 >        for (Integer v1 : new Integer[] { 1, null })
2043 >        for (Integer v2 : new Integer[] { 2, null }) {
2044 >
2045 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2046 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2047 >        final FailingFunction r = new FailingFunction();
2048 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2049 >
2050 >        g.complete(v2);
2051 >        checkCompletedWithWrappedCFException(h);
2052 >        f.complete(v1);
2053 >        checkCompletedNormally(f, v1);
2054 >        checkCompletedNormally(g, v2);
2055 >        }
2056      }
2057  
2058      /**
2059       * applyToEither result completes exceptionally if either source cancelled
2060       */
2061 <    public void testApplyToEither4() {
2062 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2063 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2064 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2065 <        assertTrue(f.cancel(true));
2066 <        checkCompletedWithWrappedCancellationException(g);
2067 <        f = new CompletableFuture<>();
2068 <        f2 = new CompletableFuture<>();
2069 <        assertTrue(f2.cancel(true));
2070 <        checkCompletedWithWrappedCancellationException(g);
2061 >    public void testApplyToEither_sourceCancelled1() {
2062 >        for (ExecutionMode m : ExecutionMode.values())
2063 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 IncFunction r = new IncFunction();
2069 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2070 >
2071 >        assertTrue(f.cancel(mayInterruptIfRunning));
2072 >        checkCompletedWithWrappedCancellationException(h);
2073 >        g.complete(v1);
2074 >
2075 >        checkCancelled(f);
2076 >        assertEquals(r.invocationCount, 0);
2077 >        checkCompletedNormally(g, v1);
2078 >        checkCompletedWithWrappedCancellationException(h);
2079 >        }
2080 >    }
2081 >
2082 >    public void testApplyToEither_sourceCancelled2() {
2083 >        for (ExecutionMode m : ExecutionMode.values())
2084 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2085 >        for (Integer v1 : new Integer[] { 1, null }) {
2086 >
2087 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2088 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2089 >        final IncFunction r = new IncFunction();
2090 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2091 >
2092 >        assertTrue(g.cancel(mayInterruptIfRunning));
2093 >        checkCompletedWithWrappedCancellationException(h);
2094 >        f.complete(v1);
2095 >
2096 >        checkCancelled(g);
2097 >        assertEquals(r.invocationCount, 0);
2098 >        checkCompletedNormally(f, v1);
2099 >        checkCompletedWithWrappedCancellationException(h);
2100 >        }
2101 >    }
2102 >
2103 >    public void testApplyToEither_sourceCancelled3() {
2104 >        for (ExecutionMode m : ExecutionMode.values())
2105 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2106 >        for (Integer v1 : new Integer[] { 1, null }) {
2107 >
2108 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2109 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2110 >        final IncFunction r = new IncFunction();
2111 >
2112 >        assertTrue(g.cancel(mayInterruptIfRunning));
2113 >        f.complete(v1);
2114 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2115 >
2116 >        // unspecified behavior
2117 >        Integer v;
2118 >        try {
2119 >            assertEquals(h.join(), inc(v1));
2120 >            assertEquals(r.invocationCount, 1);
2121 >        } catch (CompletionException ok) {
2122 >            checkCompletedWithWrappedCancellationException(h);
2123 >            assertEquals(r.invocationCount, 0);
2124 >        }
2125 >
2126 >        checkCancelled(g);
2127 >        checkCompletedNormally(f, v1);
2128 >        }
2129 >    }
2130 >
2131 >    public void testApplyToEither_sourceCancelled4() {
2132 >        for (ExecutionMode m : ExecutionMode.values())
2133 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2134 >        for (Integer v1 : new Integer[] { 1, null }) {
2135 >
2136 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2137 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2138 >        final IncFunction r = new IncFunction();
2139 >
2140 >        assertTrue(f.cancel(mayInterruptIfRunning));
2141 >        g.complete(v1);
2142 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2143 >
2144 >        // unspecified behavior
2145 >        Integer v;
2146 >        try {
2147 >            assertEquals(h.join(), inc(v1));
2148 >            assertEquals(r.invocationCount, 1);
2149 >        } catch (CompletionException ok) {
2150 >            checkCompletedWithWrappedCancellationException(h);
2151 >            assertEquals(r.invocationCount, 0);
2152 >        }
2153 >
2154 >        checkCancelled(f);
2155 >        checkCompletedNormally(g, v1);
2156 >        }
2157      }
2158  
2159      /**
2160       * acceptEither result completes normally after normal completion
2161       * of either source
2162       */
2163 <    public void testAcceptEither() {
2164 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2165 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2166 <        IncAction r = new IncAction();
2167 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2168 <        f.complete(one);
2169 <        checkCompletedNormally(g, null);
2170 <        f2.complete(one);
2171 <        checkCompletedNormally(g, null);
1111 <        assertEquals(r.value, 2);
2163 >    public void testAcceptEither_normalCompletion1() {
2164 >        for (ExecutionMode m : ExecutionMode.values())
2165 >        for (Integer v1 : new Integer[] { 1, null })
2166 >        for (Integer v2 : new Integer[] { 2, null }) {
2167 >
2168 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2169 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2170 >        final IncAction r = new IncAction();
2171 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2172  
2173 <        r = new IncAction();
2174 <        f = new CompletableFuture<>();
2175 <        f.complete(one);
2176 <        f2 = new CompletableFuture<>();
2177 <        g = f.acceptEither(f2, r);
2178 <        checkCompletedNormally(g, null);
2179 <        assertEquals(r.value, 2);
2173 >        f.complete(v1);
2174 >        checkCompletedNormally(h, null);
2175 >        assertEquals(r.value, inc(v1));
2176 >        g.complete(v2);
2177 >
2178 >        checkCompletedNormally(f, v1);
2179 >        checkCompletedNormally(g, v2);
2180 >        checkCompletedNormally(h, null);
2181 >        }
2182 >    }
2183 >
2184 >    public void testAcceptEither_normalCompletion2() {
2185 >        for (ExecutionMode m : ExecutionMode.values())
2186 >        for (Integer v1 : new Integer[] { 1, null })
2187 >        for (Integer v2 : new Integer[] { 2, null }) {
2188 >
2189 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2190 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2191 >        final IncAction r = new IncAction();
2192 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2193 >
2194 >        g.complete(v2);
2195 >        checkCompletedNormally(h, null);
2196 >        assertEquals(r.value, inc(v2));
2197 >        f.complete(v1);
2198 >
2199 >        checkCompletedNormally(f, v1);
2200 >        checkCompletedNormally(g, v2);
2201 >        checkCompletedNormally(h, null);
2202 >        }
2203 >    }
2204 >    public void testAcceptEither_normalCompletion3() {
2205 >        for (ExecutionMode m : ExecutionMode.values())
2206 >        for (Integer v1 : new Integer[] { 1, null })
2207 >        for (Integer v2 : new Integer[] { 2, null }) {
2208 >
2209 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2210 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2211 >        final IncAction r = new IncAction();
2212 >
2213 >        f.complete(v1);
2214 >        g.complete(v2);
2215 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2216 >
2217 >        checkCompletedNormally(h, null);
2218 >        checkCompletedNormally(f, v1);
2219 >        checkCompletedNormally(g, v2);
2220 >
2221 >        // unspecified behavior
2222 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
2223 >                   Objects.equals(r.value, inc(v2)));
2224 >        }
2225      }
2226  
2227      /**
2228       * acceptEither result completes exceptionally after exceptional
2229       * completion of either source
2230       */
2231 <    public void testAcceptEither2() {
2232 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2233 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2234 <        IncAction r = new IncAction();
2235 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2236 <        f.completeExceptionally(new CFException());
2237 <        f2.complete(one);
2238 <        checkCompletedWithWrappedCFException(g);
2231 >    public void testAcceptEither_exceptionalCompletion1() {
2232 >        for (ExecutionMode m : ExecutionMode.values())
2233 >        for (Integer v1 : new Integer[] { 1, null }) {
2234 >
2235 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2236 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2237 >        final IncAction r = new IncAction();
2238 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2239 >        final CFException ex = new CFException();
2240 >
2241 >        f.completeExceptionally(ex);
2242 >        checkCompletedWithWrappedCFException(h, ex);
2243 >        g.complete(v1);
2244 >
2245 >        assertEquals(r.invocationCount, 0);
2246 >        checkCompletedNormally(g, v1);
2247 >        checkCompletedWithWrappedCFException(f, ex);
2248 >        checkCompletedWithWrappedCFException(h, ex);
2249 >        }
2250 >    }
2251  
2252 <        r = new IncAction();
2253 <        f = new CompletableFuture<>();
2254 <        f2 = new CompletableFuture<>();
2255 <        f2.completeExceptionally(new CFException());
2256 <        g = f.acceptEither(f2, r);
2257 <        checkCompletedWithWrappedCFException(g);
2252 >    public void testAcceptEither_exceptionalCompletion2() {
2253 >        for (ExecutionMode m : ExecutionMode.values())
2254 >        for (Integer v1 : new Integer[] { 1, null }) {
2255 >
2256 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2257 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2258 >        final IncAction r = new IncAction();
2259 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2260 >        final CFException ex = new CFException();
2261 >
2262 >        g.completeExceptionally(ex);
2263 >        checkCompletedWithWrappedCFException(h, ex);
2264 >        f.complete(v1);
2265 >
2266 >        assertEquals(r.invocationCount, 0);
2267 >        checkCompletedNormally(f, v1);
2268 >        checkCompletedWithWrappedCFException(g, ex);
2269 >        checkCompletedWithWrappedCFException(h, ex);
2270 >        }
2271 >    }
2272 >
2273 >    public void testAcceptEither_exceptionalCompletion3() {
2274 >        for (ExecutionMode m : ExecutionMode.values())
2275 >        for (Integer v1 : new Integer[] { 1, null }) {
2276 >
2277 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279 >        final IncAction r = new IncAction();
2280 >        final CFException ex = new CFException();
2281 >
2282 >        g.completeExceptionally(ex);
2283 >        f.complete(v1);
2284 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2285 >
2286 >        // unspecified behavior
2287 >        Integer v;
2288 >        try {
2289 >            assertEquals(h.join(), null);
2290 >            assertEquals(r.invocationCount, 1);
2291 >            assertEquals(inc(v1), r.value);
2292 >        } catch (CompletionException ok) {
2293 >            checkCompletedWithWrappedCFException(h, ex);
2294 >            assertEquals(r.invocationCount, 0);
2295 >        }
2296 >
2297 >        checkCompletedWithWrappedCFException(g, ex);
2298 >        checkCompletedNormally(f, v1);
2299 >        }
2300 >    }
2301 >
2302 >    public void testAcceptEither_exceptionalCompletion4() {
2303 >        for (ExecutionMode m : ExecutionMode.values())
2304 >        for (Integer v1 : new Integer[] { 1, null }) {
2305 >
2306 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2307 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2308 >        final IncAction r = new IncAction();
2309 >        final CFException ex = new CFException();
2310 >
2311 >        f.completeExceptionally(ex);
2312 >        g.complete(v1);
2313 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2314 >
2315 >        // unspecified behavior
2316 >        Integer v;
2317 >        try {
2318 >            assertEquals(h.join(), null);
2319 >            assertEquals(r.invocationCount, 1);
2320 >            assertEquals(inc(v1), r.value);
2321 >        } catch (CompletionException ok) {
2322 >            checkCompletedWithWrappedCFException(h, ex);
2323 >            assertEquals(r.invocationCount, 0);
2324 >        }
2325 >
2326 >        checkCompletedWithWrappedCFException(f, ex);
2327 >        checkCompletedNormally(g, v1);
2328 >        }
2329      }
2330  
2331      /**
2332       * acceptEither result completes exceptionally if action does
2333       */
2334 <    public void testAcceptEither3() {
2335 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2336 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2337 <        FailingConsumer r = new FailingConsumer();
2338 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2339 <        f2.complete(two);
2340 <        checkCompletedWithWrappedCFException(g);
2334 >    public void testAcceptEither_actionFailed1() {
2335 >        for (ExecutionMode m : ExecutionMode.values())
2336 >        for (Integer v1 : new Integer[] { 1, null })
2337 >        for (Integer v2 : new Integer[] { 2, null }) {
2338 >
2339 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2340 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2341 >        final FailingConsumer r = new FailingConsumer();
2342 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343 >
2344 >        f.complete(v1);
2345 >        checkCompletedWithWrappedCFException(h);
2346 >        g.complete(v2);
2347 >        checkCompletedNormally(f, v1);
2348 >        checkCompletedNormally(g, v2);
2349 >        }
2350 >    }
2351 >
2352 >    public void testAcceptEither_actionFailed2() {
2353 >        for (ExecutionMode m : ExecutionMode.values())
2354 >        for (Integer v1 : new Integer[] { 1, null })
2355 >        for (Integer v2 : new Integer[] { 2, null }) {
2356 >
2357 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2358 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2359 >        final FailingConsumer r = new FailingConsumer();
2360 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2361 >
2362 >        g.complete(v2);
2363 >        checkCompletedWithWrappedCFException(h);
2364 >        f.complete(v1);
2365 >        checkCompletedNormally(f, v1);
2366 >        checkCompletedNormally(g, v2);
2367 >        }
2368      }
2369  
2370      /**
2371       * acceptEither result completes exceptionally if either source cancelled
2372       */
2373 <    public void testAcceptEither4() {
2374 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2375 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2376 <        IncAction r = new IncAction();
2377 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2378 <        assertTrue(f.cancel(true));
2379 <        checkCompletedWithWrappedCancellationException(g);
2380 <        f = new CompletableFuture<>();
2381 <        f2 = new CompletableFuture<>();
2382 <        assertTrue(f2.cancel(true));
2383 <        checkCompletedWithWrappedCancellationException(g);
2373 >    public void testAcceptEither_sourceCancelled1() {
2374 >        for (ExecutionMode m : ExecutionMode.values())
2375 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2376 >        for (Integer v1 : new Integer[] { 1, null }) {
2377 >
2378 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2379 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2380 >        final IncAction r = new IncAction();
2381 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2382 >
2383 >        assertTrue(f.cancel(mayInterruptIfRunning));
2384 >        checkCompletedWithWrappedCancellationException(h);
2385 >        g.complete(v1);
2386 >
2387 >        checkCancelled(f);
2388 >        assertEquals(r.invocationCount, 0);
2389 >        checkCompletedNormally(g, v1);
2390 >        checkCompletedWithWrappedCancellationException(h);
2391 >        }
2392 >    }
2393 >
2394 >    public void testAcceptEither_sourceCancelled2() {
2395 >        for (ExecutionMode m : ExecutionMode.values())
2396 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2397 >        for (Integer v1 : new Integer[] { 1, null }) {
2398 >
2399 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2400 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2401 >        final IncAction r = new IncAction();
2402 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2403 >
2404 >        assertTrue(g.cancel(mayInterruptIfRunning));
2405 >        checkCompletedWithWrappedCancellationException(h);
2406 >        f.complete(v1);
2407 >
2408 >        checkCancelled(g);
2409 >        assertEquals(r.invocationCount, 0);
2410 >        checkCompletedNormally(f, v1);
2411 >        checkCompletedWithWrappedCancellationException(h);
2412 >        }
2413      }
2414  
2415 +    public void testAcceptEither_sourceCancelled3() {
2416 +        for (ExecutionMode m : ExecutionMode.values())
2417 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2418 +        for (Integer v1 : new Integer[] { 1, null }) {
2419 +
2420 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2421 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2422 +        final IncAction r = new IncAction();
2423 +
2424 +        assertTrue(g.cancel(mayInterruptIfRunning));
2425 +        f.complete(v1);
2426 +        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2427 +
2428 +        // unspecified behavior
2429 +        Integer v;
2430 +        try {
2431 +            assertEquals(h.join(), null);
2432 +            assertEquals(r.invocationCount, 1);
2433 +            assertEquals(inc(v1), r.value);
2434 +        } catch (CompletionException ok) {
2435 +            checkCompletedWithWrappedCancellationException(h);
2436 +            assertEquals(r.invocationCount, 0);
2437 +        }
2438 +
2439 +        checkCancelled(g);
2440 +        checkCompletedNormally(f, v1);
2441 +        }
2442 +    }
2443 +
2444 +    public void testAcceptEither_sourceCancelled4() {
2445 +        for (ExecutionMode m : ExecutionMode.values())
2446 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2447 +        for (Integer v1 : new Integer[] { 1, null }) {
2448 +
2449 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2450 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2451 +        final IncAction r = new IncAction();
2452 +
2453 +        assertTrue(f.cancel(mayInterruptIfRunning));
2454 +        g.complete(v1);
2455 +        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2456 +
2457 +        // unspecified behavior
2458 +        Integer v;
2459 +        try {
2460 +            assertEquals(h.join(), null);
2461 +            assertEquals(r.invocationCount, 1);
2462 +            assertEquals(inc(v1), r.value);
2463 +        } catch (CompletionException ok) {
2464 +            checkCompletedWithWrappedCancellationException(h);
2465 +            assertEquals(r.invocationCount, 0);
2466 +        }
2467 +
2468 +        checkCancelled(f);
2469 +        checkCompletedNormally(g, v1);
2470 +        }
2471 +    }
2472  
2473      /**
2474       * runAfterEither result completes normally after normal completion
2475       * of either source
2476       */
2477 <    public void testRunAfterEither() {
2478 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2479 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2480 <        Noop r = new Noop();
2481 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2482 <        f.complete(one);
2483 <        checkCompletedNormally(g, null);
2484 <        f2.complete(one);
2485 <        checkCompletedNormally(g, null);
1185 <        assertTrue(r.ran);
2477 >    public void testRunAfterEither_normalCompletion1() {
2478 >        for (ExecutionMode m : ExecutionMode.values())
2479 >        for (Integer v1 : new Integer[] { 1, null })
2480 >        for (Integer v2 : new Integer[] { 2, null }) {
2481 >
2482 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2483 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2484 >        final Noop r = new Noop();
2485 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2486  
2487 <        r = new Noop();
2488 <        f = new CompletableFuture<>();
2489 <        f.complete(one);
2490 <        f2 = new CompletableFuture<>();
2491 <        g = f.runAfterEither(f2, r);
2492 <        checkCompletedNormally(g, null);
2493 <        assertTrue(r.ran);
2487 >        f.complete(v1);
2488 >        checkCompletedNormally(h, null);
2489 >        assertEquals(r.invocationCount, 1);
2490 >        g.complete(v2);
2491 >
2492 >        checkCompletedNormally(f, v1);
2493 >        checkCompletedNormally(g, v2);
2494 >        checkCompletedNormally(h, null);
2495 >        assertEquals(r.invocationCount, 1);
2496 >        }
2497 >    }
2498 >
2499 >    public void testRunAfterEither_normalCompletion2() {
2500 >        for (ExecutionMode m : ExecutionMode.values())
2501 >        for (Integer v1 : new Integer[] { 1, null })
2502 >        for (Integer v2 : new Integer[] { 2, null }) {
2503 >
2504 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2505 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2506 >        final Noop r = new Noop();
2507 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2508 >
2509 >        g.complete(v2);
2510 >        checkCompletedNormally(h, null);
2511 >        assertEquals(r.invocationCount, 1);
2512 >        f.complete(v1);
2513 >
2514 >        checkCompletedNormally(f, v1);
2515 >        checkCompletedNormally(g, v2);
2516 >        checkCompletedNormally(h, null);
2517 >        assertEquals(r.invocationCount, 1);
2518 >        }
2519 >    }
2520 >    public void testRunAfterEither_normalCompletion3() {
2521 >        for (ExecutionMode m : ExecutionMode.values())
2522 >        for (Integer v1 : new Integer[] { 1, null })
2523 >        for (Integer v2 : new Integer[] { 2, null }) {
2524 >
2525 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2526 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2527 >        final Noop r = new Noop();
2528 >
2529 >        f.complete(v1);
2530 >        g.complete(v2);
2531 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2532 >
2533 >        checkCompletedNormally(h, null);
2534 >        checkCompletedNormally(f, v1);
2535 >        checkCompletedNormally(g, v2);
2536 >        assertEquals(r.invocationCount, 1);
2537 >        }
2538      }
2539  
2540      /**
2541       * runAfterEither result completes exceptionally after exceptional
2542       * completion of either source
2543       */
2544 <    public void testRunAfterEither2() {
2545 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2546 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2547 <        Noop r = new Noop();
2548 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2549 <        f.completeExceptionally(new CFException());
2550 <        f2.complete(one);
2551 <        checkCompletedWithWrappedCFException(g);
2544 >    public void testRunAfterEither_exceptionalCompletion1() {
2545 >        for (ExecutionMode m : ExecutionMode.values())
2546 >        for (Integer v1 : new Integer[] { 1, null }) {
2547 >
2548 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2549 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2550 >        final Noop r = new Noop();
2551 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2552 >        final CFException ex = new CFException();
2553 >
2554 >        f.completeExceptionally(ex);
2555 >        checkCompletedWithWrappedCFException(h, ex);
2556 >        g.complete(v1);
2557 >
2558 >        assertEquals(r.invocationCount, 0);
2559 >        checkCompletedNormally(g, v1);
2560 >        checkCompletedWithWrappedCFException(f, ex);
2561 >        checkCompletedWithWrappedCFException(h, ex);
2562 >        }
2563 >    }
2564  
2565 <        r = new Noop();
2566 <        f = new CompletableFuture<>();
2567 <        f2 = new CompletableFuture<>();
2568 <        f2.completeExceptionally(new CFException());
2569 <        g = f.runAfterEither(f2, r);
2570 <        checkCompletedWithWrappedCFException(g);
2565 >    public void testRunAfterEither_exceptionalCompletion2() {
2566 >        for (ExecutionMode m : ExecutionMode.values())
2567 >        for (Integer v1 : new Integer[] { 1, null }) {
2568 >
2569 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2570 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2571 >        final Noop r = new Noop();
2572 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2573 >        final CFException ex = new CFException();
2574 >
2575 >        g.completeExceptionally(ex);
2576 >        checkCompletedWithWrappedCFException(h, ex);
2577 >        f.complete(v1);
2578 >
2579 >        assertEquals(r.invocationCount, 0);
2580 >        checkCompletedNormally(f, v1);
2581 >        checkCompletedWithWrappedCFException(g, ex);
2582 >        checkCompletedWithWrappedCFException(h, ex);
2583 >        }
2584 >    }
2585 >
2586 >    public void testRunAfterEither_exceptionalCompletion3() {
2587 >        for (ExecutionMode m : ExecutionMode.values())
2588 >        for (Integer v1 : new Integer[] { 1, null }) {
2589 >
2590 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2591 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2592 >        final Noop r = new Noop();
2593 >        final CFException ex = new CFException();
2594 >
2595 >        g.completeExceptionally(ex);
2596 >        f.complete(v1);
2597 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2598 >
2599 >        // unspecified behavior
2600 >        Integer v;
2601 >        try {
2602 >            assertEquals(h.join(), null);
2603 >            assertEquals(r.invocationCount, 1);
2604 >        } catch (CompletionException ok) {
2605 >            checkCompletedWithWrappedCFException(h, ex);
2606 >            assertEquals(r.invocationCount, 0);
2607 >        }
2608 >
2609 >        checkCompletedWithWrappedCFException(g, ex);
2610 >        checkCompletedNormally(f, v1);
2611 >        }
2612 >    }
2613 >
2614 >    public void testRunAfterEither_exceptionalCompletion4() {
2615 >        for (ExecutionMode m : ExecutionMode.values())
2616 >        for (Integer v1 : new Integer[] { 1, null }) {
2617 >
2618 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2619 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2620 >        final Noop r = new Noop();
2621 >        final CFException ex = new CFException();
2622 >
2623 >        f.completeExceptionally(ex);
2624 >        g.complete(v1);
2625 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2626 >
2627 >        // unspecified behavior
2628 >        Integer v;
2629 >        try {
2630 >            assertEquals(h.join(), null);
2631 >            assertEquals(r.invocationCount, 1);
2632 >        } catch (CompletionException ok) {
2633 >            checkCompletedWithWrappedCFException(h, ex);
2634 >            assertEquals(r.invocationCount, 0);
2635 >        }
2636 >
2637 >        checkCompletedWithWrappedCFException(f, ex);
2638 >        checkCompletedNormally(g, v1);
2639 >        }
2640      }
2641  
2642      /**
2643       * runAfterEither result completes exceptionally if action does
2644       */
2645 <    public void testRunAfterEither3() {
2646 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2647 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2648 <        FailingNoop r = new FailingNoop();
2649 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2650 <        f2.complete(two);
2651 <        checkCompletedWithWrappedCFException(g);
2645 >    public void testRunAfterEither_actionFailed1() {
2646 >        for (ExecutionMode m : ExecutionMode.values())
2647 >        for (Integer v1 : new Integer[] { 1, null })
2648 >        for (Integer v2 : new Integer[] { 2, null }) {
2649 >
2650 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2651 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2652 >        final FailingNoop r = new FailingNoop();
2653 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2654 >
2655 >        f.complete(v1);
2656 >        checkCompletedWithWrappedCFException(h);
2657 >        g.complete(v2);
2658 >        checkCompletedNormally(f, v1);
2659 >        checkCompletedNormally(g, v2);
2660 >        }
2661 >    }
2662 >
2663 >    public void testRunAfterEither_actionFailed2() {
2664 >        for (ExecutionMode m : ExecutionMode.values())
2665 >        for (Integer v1 : new Integer[] { 1, null })
2666 >        for (Integer v2 : new Integer[] { 2, null }) {
2667 >
2668 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2669 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2670 >        final FailingNoop r = new FailingNoop();
2671 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2672 >
2673 >        g.complete(v2);
2674 >        checkCompletedWithWrappedCFException(h);
2675 >        f.complete(v1);
2676 >        checkCompletedNormally(f, v1);
2677 >        checkCompletedNormally(g, v2);
2678 >        }
2679      }
2680  
2681      /**
2682       * runAfterEither result completes exceptionally if either source cancelled
2683       */
2684 <    public void testRunAfterEither4() {
2685 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2686 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2687 <        Noop r = new Noop();
2688 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2689 <        assertTrue(f.cancel(true));
2690 <        checkCompletedWithWrappedCancellationException(g);
2691 <        f = new CompletableFuture<>();
2692 <        f2 = new CompletableFuture<>();
2693 <        assertTrue(f2.cancel(true));
2694 <        checkCompletedWithWrappedCancellationException(g);
2684 >    public void testRunAfterEither_sourceCancelled1() {
2685 >        for (ExecutionMode m : ExecutionMode.values())
2686 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2687 >        for (Integer v1 : new Integer[] { 1, null }) {
2688 >
2689 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2690 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2691 >        final Noop r = new Noop();
2692 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2693 >
2694 >        assertTrue(f.cancel(mayInterruptIfRunning));
2695 >        checkCompletedWithWrappedCancellationException(h);
2696 >        g.complete(v1);
2697 >
2698 >        checkCancelled(f);
2699 >        assertEquals(r.invocationCount, 0);
2700 >        checkCompletedNormally(g, v1);
2701 >        checkCompletedWithWrappedCancellationException(h);
2702 >        }
2703 >    }
2704 >
2705 >    public void testRunAfterEither_sourceCancelled2() {
2706 >        for (ExecutionMode m : ExecutionMode.values())
2707 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2708 >        for (Integer v1 : new Integer[] { 1, null }) {
2709 >
2710 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2711 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2712 >        final Noop r = new Noop();
2713 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2714 >
2715 >        assertTrue(g.cancel(mayInterruptIfRunning));
2716 >        checkCompletedWithWrappedCancellationException(h);
2717 >        f.complete(v1);
2718 >
2719 >        checkCancelled(g);
2720 >        assertEquals(r.invocationCount, 0);
2721 >        checkCompletedNormally(f, v1);
2722 >        checkCompletedWithWrappedCancellationException(h);
2723 >        }
2724 >    }
2725 >
2726 >    public void testRunAfterEither_sourceCancelled3() {
2727 >        for (ExecutionMode m : ExecutionMode.values())
2728 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2729 >        for (Integer v1 : new Integer[] { 1, null }) {
2730 >
2731 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2732 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2733 >        final Noop r = new Noop();
2734 >
2735 >        assertTrue(g.cancel(mayInterruptIfRunning));
2736 >        f.complete(v1);
2737 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2738 >
2739 >        // unspecified behavior
2740 >        Integer v;
2741 >        try {
2742 >            assertEquals(h.join(), null);
2743 >            assertEquals(r.invocationCount, 1);
2744 >        } catch (CompletionException ok) {
2745 >            checkCompletedWithWrappedCancellationException(h);
2746 >            assertEquals(r.invocationCount, 0);
2747 >        }
2748 >
2749 >        checkCancelled(g);
2750 >        checkCompletedNormally(f, v1);
2751 >        }
2752 >    }
2753 >
2754 >    public void testRunAfterEither_sourceCancelled4() {
2755 >        for (ExecutionMode m : ExecutionMode.values())
2756 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2757 >        for (Integer v1 : new Integer[] { 1, null }) {
2758 >
2759 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2760 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2761 >        final Noop r = new Noop();
2762 >
2763 >        assertTrue(f.cancel(mayInterruptIfRunning));
2764 >        g.complete(v1);
2765 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2766 >
2767 >        // unspecified behavior
2768 >        Integer v;
2769 >        try {
2770 >            assertEquals(h.join(), null);
2771 >            assertEquals(r.invocationCount, 1);
2772 >        } catch (CompletionException ok) {
2773 >            checkCompletedWithWrappedCancellationException(h);
2774 >            assertEquals(r.invocationCount, 0);
2775 >        }
2776 >
2777 >        checkCancelled(f);
2778 >        checkCompletedNormally(g, v1);
2779 >        }
2780      }
2781  
2782      /**
# Line 1317 | Line 2854 | public class CompletableFutureTest exten
2854          checkCompletedWithWrappedCancellationException(g);
2855      }
2856  
1320
2857      // asyncs
2858  
2859      /**
# Line 1350 | Line 2886 | public class CompletableFutureTest exten
2886          try {
2887              g.join();
2888              shouldThrow();
2889 <        } catch (Exception ok) {
1354 <        }
2889 >        } catch (CompletionException success) {}
2890          checkCompletedWithWrappedCFException(g);
2891      }
2892  
# Line 1429 | Line 2964 | public class CompletableFutureTest exten
2964          CompletableFuture<Void> g = f.thenAcceptAsync(r);
2965          f.complete(one);
2966          checkCompletedNormally(g, null);
2967 <        assertEquals(r.value, 2);
2967 >        assertEquals(r.value, (Integer) 2);
2968      }
2969  
2970      /**
# Line 1467 | Line 3002 | public class CompletableFutureTest exten
3002      }
3003  
3004      /**
1470     * thenCombineAsync result completes normally after normal
1471     * completion of sources
1472     */
1473    public void testThenCombineAsync() {
1474        CompletableFuture<Integer> f, g, h;
1475
1476        f = new CompletableFuture<>();
1477        g = new CompletableFuture<>();
1478        h = f.thenCombineAsync(g, subtract);
1479        f.complete(3);
1480        checkIncomplete(h);
1481        g.complete(1);
1482        checkCompletedNormally(h, 2);
1483
1484        f = new CompletableFuture<>();
1485        g = new CompletableFuture<>();
1486        h = f.thenCombineAsync(g, subtract);
1487        g.complete(1);
1488        checkIncomplete(h);
1489        f.complete(3);
1490        checkCompletedNormally(h, 2);
1491
1492        f = new CompletableFuture<>();
1493        g = new CompletableFuture<>();
1494        g.complete(1);
1495        f.complete(3);
1496        h = f.thenCombineAsync(g, subtract);
1497        checkCompletedNormally(h, 2);
1498    }
1499
1500    /**
1501     * thenCombineAsync result completes exceptionally after exceptional
1502     * completion of either source
1503     */
1504    public void testThenCombineAsync2() {
1505        CompletableFuture<Integer> f, g, h;
1506
1507        f = new CompletableFuture<>();
1508        g = new CompletableFuture<>();
1509        h = f.thenCombineAsync(g, subtract);
1510        f.completeExceptionally(new CFException());
1511        checkIncomplete(h);
1512        g.complete(1);
1513        checkCompletedWithWrappedCFException(h);
1514
1515        f = new CompletableFuture<>();
1516        g = new CompletableFuture<>();
1517        h = f.thenCombineAsync(g, subtract);
1518        g.completeExceptionally(new CFException());
1519        checkIncomplete(h);
1520        f.complete(3);
1521        checkCompletedWithWrappedCFException(h);
1522
1523        f = new CompletableFuture<>();
1524        g = new CompletableFuture<>();
1525        g.completeExceptionally(new CFException());
1526        f.complete(3);
1527        h = f.thenCombineAsync(g, subtract);
1528        checkCompletedWithWrappedCFException(h);
1529    }
1530
1531    /**
1532     * thenCombineAsync result completes exceptionally if action does
1533     */
1534    public void testThenCombineAsync3() {
1535        CompletableFuture<Integer> f = new CompletableFuture<>();
1536        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1537        FailingBiFunction r = new FailingBiFunction();
1538        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1539        f.complete(one);
1540        checkIncomplete(g);
1541        assertFalse(r.ran);
1542        f2.complete(two);
1543        checkCompletedWithWrappedCFException(g);
1544        assertTrue(r.ran);
1545    }
1546
1547    /**
1548     * thenCombineAsync result completes exceptionally if either source cancelled
1549     */
1550    public void testThenCombineAsync4() {
1551        CompletableFuture<Integer> f, g, h;
1552
1553        f = new CompletableFuture<>();
1554        g = new CompletableFuture<>();
1555        h = f.thenCombineAsync(g, subtract);
1556        assertTrue(f.cancel(true));
1557        checkIncomplete(h);
1558        g.complete(1);
1559        checkCompletedWithWrappedCancellationException(h);
1560
1561        f = new CompletableFuture<>();
1562        g = new CompletableFuture<>();
1563        h = f.thenCombineAsync(g, subtract);
1564        assertTrue(g.cancel(true));
1565        checkIncomplete(h);
1566        f.complete(3);
1567        checkCompletedWithWrappedCancellationException(h);
1568
1569        f = new CompletableFuture<>();
1570        g = new CompletableFuture<>();
1571        g.complete(3);
1572        assertTrue(f.cancel(true));
1573        h = f.thenCombineAsync(g, subtract);
1574        checkCompletedWithWrappedCancellationException(h);
1575
1576        f = new CompletableFuture<>();
1577        g = new CompletableFuture<>();
1578        f.complete(3);
1579        assertTrue(g.cancel(true));
1580        h = f.thenCombineAsync(g, subtract);
1581        checkCompletedWithWrappedCancellationException(h);
1582    }
1583
1584    /**
1585     * thenAcceptBothAsync result completes normally after normal
1586     * completion of sources
1587     */
1588    public void testThenAcceptBothAsync() {
1589        CompletableFuture<Integer> f, g;
1590        CompletableFuture<Void> h;
1591        SubtractAction r;
1592
1593        f = new CompletableFuture<>();
1594        g = new CompletableFuture<>();
1595        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1596        f.complete(3);
1597        checkIncomplete(h);
1598        g.complete(1);
1599        checkCompletedNormally(h, null);
1600        assertEquals(r.value, 2);
1601
1602        f = new CompletableFuture<>();
1603        g = new CompletableFuture<>();
1604        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1605        g.complete(1);
1606        checkIncomplete(h);
1607        f.complete(3);
1608        checkCompletedNormally(h, null);
1609        assertEquals(r.value, 2);
1610
1611        f = new CompletableFuture<>();
1612        g = new CompletableFuture<>();
1613        g.complete(1);
1614        f.complete(3);
1615        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1616        checkCompletedNormally(h, null);
1617        assertEquals(r.value, 2);
1618    }
1619
1620    /**
1621     * thenAcceptBothAsync result completes exceptionally after exceptional
1622     * completion of source
1623     */
1624    public void testThenAcceptBothAsync2() {
1625        CompletableFuture<Integer> f, g;
1626        CompletableFuture<Void> h;
1627        SubtractAction r;
1628
1629        f = new CompletableFuture<>();
1630        g = new CompletableFuture<>();
1631        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1632        f.completeExceptionally(new CFException());
1633        checkIncomplete(h);
1634        g.complete(1);
1635        checkCompletedWithWrappedCFException(h);
1636
1637        f = new CompletableFuture<>();
1638        g = new CompletableFuture<>();
1639        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1640        g.completeExceptionally(new CFException());
1641        checkIncomplete(h);
1642        f.complete(3);
1643        checkCompletedWithWrappedCFException(h);
1644
1645        f = new CompletableFuture<>();
1646        g = new CompletableFuture<>();
1647        f.complete(3);
1648        g.completeExceptionally(new CFException());
1649        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1650        checkCompletedWithWrappedCFException(h);
1651
1652        f = new CompletableFuture<>();
1653        g = new CompletableFuture<>();
1654        f.completeExceptionally(new CFException());
1655        g.complete(3);
1656        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1657        checkCompletedWithWrappedCFException(h);
1658    }
1659
1660    /**
1661     * thenAcceptBothAsync result completes exceptionally if action does
1662     */
1663    public void testThenAcceptBothAsync3() {
1664        CompletableFuture<Integer> f, g;
1665        CompletableFuture<Void> h;
1666        FailingBiConsumer r;
1667
1668        f = new CompletableFuture<>();
1669        g = new CompletableFuture<>();
1670        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1671        f.complete(3);
1672        checkIncomplete(h);
1673        g.complete(1);
1674        checkCompletedWithWrappedCFException(h);
1675
1676        f = new CompletableFuture<>();
1677        g = new CompletableFuture<>();
1678        f.complete(3);
1679        g.complete(1);
1680        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1681        checkCompletedWithWrappedCFException(h);
1682    }
1683
1684    /**
1685     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1686     */
1687    public void testThenAcceptBothAsync4() {
1688        CompletableFuture<Integer> f, g;
1689        CompletableFuture<Void> h;
1690        SubtractAction r;
1691
1692        f = new CompletableFuture<>();
1693        g = new CompletableFuture<>();
1694        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1695        assertTrue(f.cancel(true));
1696        checkIncomplete(h);
1697        g.complete(1);
1698        checkCompletedWithWrappedCancellationException(h);
1699
1700        f = new CompletableFuture<>();
1701        g = new CompletableFuture<>();
1702        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1703        assertTrue(g.cancel(true));
1704        checkIncomplete(h);
1705        f.complete(3);
1706        checkCompletedWithWrappedCancellationException(h);
1707
1708        f = new CompletableFuture<>();
1709        g = new CompletableFuture<>();
1710        f.complete(3);
1711        assertTrue(g.cancel(true));
1712        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1713        checkCompletedWithWrappedCancellationException(h);
1714
1715        f = new CompletableFuture<>();
1716        g = new CompletableFuture<>();
1717        assertTrue(f.cancel(true));
1718        g.complete(3);
1719        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1720        checkCompletedWithWrappedCancellationException(h);
1721    }
1722
1723    /**
1724     * runAfterBothAsync result completes normally after normal
1725     * completion of sources
1726     */
1727    public void testRunAfterBothAsync() {
1728        CompletableFuture<Integer> f = new CompletableFuture<>();
1729        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1730        Noop r = new Noop();
1731        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1732        f.complete(one);
1733        checkIncomplete(g);
1734        f2.complete(two);
1735        checkCompletedNormally(g, null);
1736        assertTrue(r.ran);
1737    }
1738
1739    /**
1740     * runAfterBothAsync result completes exceptionally after exceptional
1741     * completion of source
1742     */
1743    public void testRunAfterBothAsync2() {
1744        CompletableFuture<Integer> f = new CompletableFuture<>();
1745        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1746        Noop r = new Noop();
1747        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1748        f.completeExceptionally(new CFException());
1749        f2.complete(two);
1750        checkCompletedWithWrappedCFException(g);
1751
1752        r = new Noop();
1753        f = new CompletableFuture<>();
1754        f2 = new CompletableFuture<>();
1755        g = f.runAfterBothAsync(f2, r);
1756        f.complete(one);
1757        f2.completeExceptionally(new CFException());
1758        checkCompletedWithWrappedCFException(g);
1759    }
1760
1761    /**
1762     * runAfterBothAsync result completes exceptionally if action does
1763     */
1764    public void testRunAfterBothAsync3() {
1765        CompletableFuture<Integer> f = new CompletableFuture<>();
1766        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1767        FailingNoop r = new FailingNoop();
1768        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1769        f.complete(one);
1770        checkIncomplete(g);
1771        f2.complete(two);
1772        checkCompletedWithWrappedCFException(g);
1773    }
1774
1775    /**
1776     * runAfterBothAsync result completes exceptionally if either source cancelled
1777     */
1778    public void testRunAfterBothAsync4() {
1779        CompletableFuture<Integer> f = new CompletableFuture<>();
1780        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1781        Noop r = new Noop();
1782        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1783        assertTrue(f.cancel(true));
1784        f2.complete(two);
1785        checkCompletedWithWrappedCancellationException(g);
1786
1787        r = new Noop();
1788        f = new CompletableFuture<>();
1789        f2 = new CompletableFuture<>();
1790        g = f.runAfterBothAsync(f2, r);
1791        f.complete(one);
1792        assertTrue(f2.cancel(true));
1793        checkCompletedWithWrappedCancellationException(g);
1794    }
1795
1796    /**
1797     * applyToEitherAsync result completes normally after normal
1798     * completion of sources
1799     */
1800    public void testApplyToEitherAsync() {
1801        CompletableFuture<Integer> f = new CompletableFuture<>();
1802        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1803        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1804        f.complete(one);
1805        checkCompletedNormally(g, two);
1806
1807        f = new CompletableFuture<>();
1808        f.complete(one);
1809        f2 = new CompletableFuture<>();
1810        g = f.applyToEitherAsync(f2, inc);
1811        checkCompletedNormally(g, two);
1812    }
1813
1814    /**
1815     * applyToEitherAsync result completes exceptionally after exceptional
1816     * completion of source
1817     */
1818    public void testApplyToEitherAsync2() {
1819        CompletableFuture<Integer> f = new CompletableFuture<>();
1820        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1821        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1822        f.completeExceptionally(new CFException());
1823        checkCompletedWithWrappedCFException(g);
1824
1825        f = new CompletableFuture<>();
1826        f2 = new CompletableFuture<>();
1827        f2.completeExceptionally(new CFException());
1828        g = f.applyToEitherAsync(f2, inc);
1829        f.complete(one);
1830        checkCompletedWithWrappedCFException(g);
1831    }
1832
1833    /**
1834     * applyToEitherAsync result completes exceptionally if action does
1835     */
1836    public void testApplyToEitherAsync3() {
1837        CompletableFuture<Integer> f = new CompletableFuture<>();
1838        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1839        FailingFunction r = new FailingFunction();
1840        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1841        f.complete(one);
1842        checkCompletedWithWrappedCFException(g);
1843    }
1844
1845    /**
1846     * applyToEitherAsync result completes exceptionally if either source cancelled
1847     */
1848    public void testApplyToEitherAsync4() {
1849        CompletableFuture<Integer> f = new CompletableFuture<>();
1850        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1851        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1852        assertTrue(f.cancel(true));
1853        checkCompletedWithWrappedCancellationException(g);
1854
1855        f = new CompletableFuture<>();
1856        f2 = new CompletableFuture<>();
1857        assertTrue(f2.cancel(true));
1858        g = f.applyToEitherAsync(f2, inc);
1859        checkCompletedWithWrappedCancellationException(g);
1860    }
1861
1862    /**
1863     * acceptEitherAsync result completes normally after normal
1864     * completion of sources
1865     */
1866    public void testAcceptEitherAsync() {
1867        CompletableFuture<Integer> f = new CompletableFuture<>();
1868        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1869        IncAction r = new IncAction();
1870        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1871        f.complete(one);
1872        checkCompletedNormally(g, null);
1873        assertEquals(r.value, 2);
1874
1875        r = new IncAction();
1876        f = new CompletableFuture<>();
1877        f.complete(one);
1878        f2 = new CompletableFuture<>();
1879        g = f.acceptEitherAsync(f2, r);
1880        checkCompletedNormally(g, null);
1881        assertEquals(r.value, 2);
1882    }
1883
1884    /**
1885     * acceptEitherAsync result completes exceptionally after exceptional
1886     * completion of source
1887     */
1888    public void testAcceptEitherAsync2() {
1889        CompletableFuture<Integer> f = new CompletableFuture<>();
1890        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1891        IncAction r = new IncAction();
1892        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1893        f.completeExceptionally(new CFException());
1894        checkCompletedWithWrappedCFException(g);
1895
1896        r = new IncAction();
1897        f = new CompletableFuture<>();
1898        f2 = new CompletableFuture<>();
1899        f2.completeExceptionally(new CFException());
1900        g = f.acceptEitherAsync(f2, r);
1901        f.complete(one);
1902        checkCompletedWithWrappedCFException(g);
1903    }
1904
1905    /**
1906     * acceptEitherAsync result completes exceptionally if action does
1907     */
1908    public void testAcceptEitherAsync3() {
1909        CompletableFuture<Integer> f = new CompletableFuture<>();
1910        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1911        FailingConsumer r = new FailingConsumer();
1912        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1913        f.complete(one);
1914        checkCompletedWithWrappedCFException(g);
1915    }
1916
1917    /**
1918     * acceptEitherAsync result completes exceptionally if either
1919     * source cancelled
1920     */
1921    public void testAcceptEitherAsync4() {
1922        CompletableFuture<Integer> f = new CompletableFuture<>();
1923        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1924        IncAction r = new IncAction();
1925        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1926        assertTrue(f.cancel(true));
1927        checkCompletedWithWrappedCancellationException(g);
1928
1929        r = new IncAction();
1930        f = new CompletableFuture<>();
1931        f2 = new CompletableFuture<>();
1932        assertTrue(f2.cancel(true));
1933        g = f.acceptEitherAsync(f2, r);
1934        checkCompletedWithWrappedCancellationException(g);
1935    }
1936
1937    /**
1938     * runAfterEitherAsync result completes normally after normal
1939     * completion of sources
1940     */
1941    public void testRunAfterEitherAsync() {
1942        CompletableFuture<Integer> f = new CompletableFuture<>();
1943        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1944        Noop r = new Noop();
1945        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1946        f.complete(one);
1947        checkCompletedNormally(g, null);
1948        assertTrue(r.ran);
1949
1950        r = new Noop();
1951        f = new CompletableFuture<>();
1952        f.complete(one);
1953        f2 = new CompletableFuture<>();
1954        g = f.runAfterEitherAsync(f2, r);
1955        checkCompletedNormally(g, null);
1956        assertTrue(r.ran);
1957    }
1958
1959    /**
1960     * runAfterEitherAsync result completes exceptionally after exceptional
1961     * completion of source
1962     */
1963    public void testRunAfterEitherAsync2() {
1964        CompletableFuture<Integer> f = new CompletableFuture<>();
1965        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1966        Noop r = new Noop();
1967        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1968        f.completeExceptionally(new CFException());
1969        checkCompletedWithWrappedCFException(g);
1970
1971        r = new Noop();
1972        f = new CompletableFuture<>();
1973        f2 = new CompletableFuture<>();
1974        f2.completeExceptionally(new CFException());
1975        g = f.runAfterEitherAsync(f2, r);
1976        f.complete(one);
1977        checkCompletedWithWrappedCFException(g);
1978    }
1979
1980    /**
1981     * runAfterEitherAsync result completes exceptionally if action does
1982     */
1983    public void testRunAfterEitherAsync3() {
1984        CompletableFuture<Integer> f = new CompletableFuture<>();
1985        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1986        FailingNoop r = new FailingNoop();
1987        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1988        f.complete(one);
1989        checkCompletedWithWrappedCFException(g);
1990    }
1991
1992    /**
1993     * runAfterEitherAsync result completes exceptionally if either
1994     * source cancelled
1995     */
1996    public void testRunAfterEitherAsync4() {
1997        CompletableFuture<Integer> f = new CompletableFuture<>();
1998        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1999        Noop r = new Noop();
2000        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2001        assertTrue(f.cancel(true));
2002        checkCompletedWithWrappedCancellationException(g);
2003
2004        r = new Noop();
2005        f = new CompletableFuture<>();
2006        f2 = new CompletableFuture<>();
2007        assertTrue(f2.cancel(true));
2008        g = f.runAfterEitherAsync(f2, r);
2009        checkCompletedWithWrappedCancellationException(g);
2010    }
2011
2012    /**
3005       * thenComposeAsync result completes normally after normal
3006       * completion of source
3007       */
# Line 2085 | Line 3077 | public class CompletableFutureTest exten
3077          checkCompletedWithWrappedCancellationException(g);
3078      }
3079  
2088
3080      // async with explicit executors
3081  
3082      /**
# Line 2118 | Line 3109 | public class CompletableFutureTest exten
3109          try {
3110              g.join();
3111              shouldThrow();
3112 <        } catch (Exception ok) {
2122 <        }
3112 >        } catch (CompletionException success) {}
3113          checkCompletedWithWrappedCFException(g);
3114      }
3115  
# Line 2197 | Line 3187 | public class CompletableFutureTest exten
3187          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3188          f.complete(one);
3189          checkCompletedNormally(g, null);
3190 <        assertEquals(r.value, 2);
3190 >        assertEquals(r.value, (Integer) 2);
3191      }
3192  
3193      /**
# Line 2235 | Line 3225 | public class CompletableFutureTest exten
3225      }
3226  
3227      /**
3228 <     * thenCombineAsync result completes normally after normal
3229 <     * completion of sources
3228 >     * thenComposeAsync result completes normally after normal
3229 >     * completion of source
3230       */
3231 <    public void testThenCombineAsyncE() {
3232 <        CompletableFuture<Integer> f, g, h;
3233 <        ThreadExecutor e = new ThreadExecutor();
3234 <        int count = 0;
3235 <
3236 <        f = new CompletableFuture<>();
2247 <        g = new CompletableFuture<>();
2248 <        h = f.thenCombineAsync(g, subtract, e);
2249 <        f.complete(3);
2250 <        checkIncomplete(h);
2251 <        g.complete(1);
2252 <        checkCompletedNormally(h, 2);
2253 <        assertEquals(++count, e.count.get());
2254 <
2255 <        f = new CompletableFuture<>();
2256 <        g = new CompletableFuture<>();
2257 <        h = f.thenCombineAsync(g, subtract, e);
2258 <        g.complete(1);
2259 <        checkIncomplete(h);
2260 <        f.complete(3);
2261 <        checkCompletedNormally(h, 2);
2262 <        assertEquals(++count, e.count.get());
2263 <
2264 <        f = new CompletableFuture<>();
2265 <        g = new CompletableFuture<>();
2266 <        g.complete(1);
2267 <        f.complete(3);
2268 <        h = f.thenCombineAsync(g, subtract, e);
2269 <        checkCompletedNormally(h, 2);
2270 <        assertEquals(++count, e.count.get());
3231 >    public void testThenComposeAsyncE() {
3232 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3233 >        CompletableFutureInc r = new CompletableFutureInc();
3234 >        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3235 >        f.complete(one);
3236 >        checkCompletedNormally(g, two);
3237      }
3238  
3239      /**
3240 <     * thenCombineAsync result completes exceptionally after exceptional
3241 <     * completion of either source
3240 >     * thenComposeAsync result completes exceptionally after
3241 >     * exceptional completion of source
3242       */
3243 <    public void testThenCombineAsync2E() {
3244 <        CompletableFuture<Integer> f, g, h;
3245 <        ThreadExecutor e = new ThreadExecutor();
3246 <        int count = 0;
2281 <
2282 <        f = new CompletableFuture<>();
2283 <        g = new CompletableFuture<>();
2284 <        h = f.thenCombineAsync(g, subtract, e);
3243 >    public void testThenComposeAsync2E() {
3244 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3245 >        CompletableFutureInc r = new CompletableFutureInc();
3246 >        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3247          f.completeExceptionally(new CFException());
3248 <        checkIncomplete(h);
2287 <        g.complete(1);
2288 <        checkCompletedWithWrappedCFException(h);
2289 <
2290 <        f = new CompletableFuture<>();
2291 <        g = new CompletableFuture<>();
2292 <        h = f.thenCombineAsync(g, subtract, e);
2293 <        g.completeExceptionally(new CFException());
2294 <        checkIncomplete(h);
2295 <        f.complete(3);
2296 <        checkCompletedWithWrappedCFException(h);
2297 <
2298 <        f = new CompletableFuture<>();
2299 <        g = new CompletableFuture<>();
2300 <        g.completeExceptionally(new CFException());
2301 <        h = f.thenCombineAsync(g, subtract, e);
2302 <        checkIncomplete(h);
2303 <        f.complete(3);
2304 <        checkCompletedWithWrappedCFException(h);
2305 <
2306 <        assertEquals(0, e.count.get());
3248 >        checkCompletedWithWrappedCFException(g);
3249      }
3250  
3251      /**
3252 <     * thenCombineAsync result completes exceptionally if action does
3252 >     * thenComposeAsync result completes exceptionally if action does
3253       */
3254 <    public void testThenCombineAsync3E() {
3254 >    public void testThenComposeAsync3E() {
3255          CompletableFuture<Integer> f = new CompletableFuture<>();
3256 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3257 <        FailingBiFunction r = new FailingBiFunction();
2316 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
3256 >        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3257 >        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3258          f.complete(one);
2318        checkIncomplete(g);
2319        assertFalse(r.ran);
2320        f2.complete(two);
3259          checkCompletedWithWrappedCFException(g);
2322        assertTrue(r.ran);
3260      }
3261  
3262      /**
3263 <     * thenCombineAsync result completes exceptionally if either source cancelled
3263 >     * thenComposeAsync result completes exceptionally if source cancelled
3264       */
3265 <    public void testThenCombineAsync4E() {
3266 <        CompletableFuture<Integer> f, g, h;
3267 <        ThreadExecutor e = new ThreadExecutor();
3268 <
2332 <        f = new CompletableFuture<>();
2333 <        g = new CompletableFuture<>();
2334 <        h = f.thenCombineAsync(g, subtract, e);
3265 >    public void testThenComposeAsync4E() {
3266 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3267 >        CompletableFutureInc r = new CompletableFutureInc();
3268 >        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3269          assertTrue(f.cancel(true));
3270 <        checkIncomplete(h);
3271 <        g.complete(1);
2338 <        checkCompletedWithWrappedCancellationException(h);
2339 <
2340 <        f = new CompletableFuture<>();
2341 <        g = new CompletableFuture<>();
2342 <        h = f.thenCombineAsync(g, subtract, e);
2343 <        assertTrue(g.cancel(true));
2344 <        checkIncomplete(h);
2345 <        f.complete(3);
2346 <        checkCompletedWithWrappedCancellationException(h);
2347 <
2348 <        f = new CompletableFuture<>();
2349 <        g = new CompletableFuture<>();
2350 <        assertTrue(g.cancel(true));
2351 <        h = f.thenCombineAsync(g, subtract, e);
2352 <        checkIncomplete(h);
2353 <        f.complete(3);
2354 <        checkCompletedWithWrappedCancellationException(h);
3270 >        checkCompletedWithWrappedCancellationException(g);
3271 >    }
3272  
3273 <        f = new CompletableFuture<>();
2357 <        g = new CompletableFuture<>();
2358 <        assertTrue(f.cancel(true));
2359 <        assertTrue(g.cancel(true));
2360 <        h = f.thenCombineAsync(g, subtract, e);
2361 <        checkCompletedWithWrappedCancellationException(h);
3273 >    // other static methods
3274  
3275 <        assertEquals(0, e.count.get());
3275 >    /**
3276 >     * allOf(no component futures) returns a future completed normally
3277 >     * with the value null
3278 >     */
3279 >    public void testAllOf_empty() throws Exception {
3280 >        CompletableFuture<Void> f = CompletableFuture.allOf();
3281 >        checkCompletedNormally(f, null);
3282      }
3283  
3284      /**
3285 <     * thenAcceptBothAsync result completes normally after normal
3286 <     * completion of sources
3285 >     * allOf returns a future completed normally with the value null
3286 >     * when all components complete normally
3287       */
3288 <    public void testThenAcceptBothAsyncE() {
3289 <        CompletableFuture<Integer> f, g;
3290 <        CompletableFuture<Void> h;
3291 <        SubtractAction r;
3292 <        ThreadExecutor e = new ThreadExecutor();
3293 <
3294 <        f = new CompletableFuture<>();
3295 <        g = new CompletableFuture<>();
3296 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
3297 <        f.complete(3);
3298 <        checkIncomplete(h);
3299 <        g.complete(1);
3300 <        checkCompletedNormally(h, null);
3301 <        assertEquals(r.value, 2);
2384 <
2385 <        f = new CompletableFuture<>();
2386 <        g = new CompletableFuture<>();
2387 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2388 <        g.complete(1);
2389 <        checkIncomplete(h);
2390 <        f.complete(3);
2391 <        checkCompletedNormally(h, null);
2392 <        assertEquals(r.value, 2);
2393 <
2394 <        f = new CompletableFuture<>();
2395 <        g = new CompletableFuture<>();
2396 <        g.complete(1);
2397 <        f.complete(3);
2398 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2399 <        checkCompletedNormally(h, null);
2400 <        assertEquals(r.value, 2);
2401 <
2402 <        assertEquals(3, e.count.get());
3288 >    public void testAllOf_normal() throws Exception {
3289 >        for (int k = 1; k < 20; ++k) {
3290 >            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3291 >            for (int i = 0; i < k; ++i)
3292 >                fs[i] = new CompletableFuture<>();
3293 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3294 >            for (int i = 0; i < k; ++i) {
3295 >                checkIncomplete(f);
3296 >                checkIncomplete(CompletableFuture.allOf(fs));
3297 >                fs[i].complete(one);
3298 >            }
3299 >            checkCompletedNormally(f, null);
3300 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3301 >        }
3302      }
3303  
3304      /**
3305 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2407 <     * completion of source
3305 >     * anyOf(no component futures) returns an incomplete future
3306       */
3307 <    public void testThenAcceptBothAsync2E() {
3308 <        CompletableFuture<Integer> f, g;
3309 <        CompletableFuture<Void> h;
2412 <        SubtractAction r;
2413 <        ThreadExecutor e = new ThreadExecutor();
2414 <
2415 <        f = new CompletableFuture<>();
2416 <        g = new CompletableFuture<>();
2417 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2418 <        f.completeExceptionally(new CFException());
2419 <        checkIncomplete(h);
2420 <        g.complete(1);
2421 <        checkCompletedWithWrappedCFException(h);
2422 <
2423 <        f = new CompletableFuture<>();
2424 <        g = new CompletableFuture<>();
2425 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2426 <        g.completeExceptionally(new CFException());
2427 <        checkIncomplete(h);
2428 <        f.complete(3);
2429 <        checkCompletedWithWrappedCFException(h);
2430 <
2431 <        f = new CompletableFuture<>();
2432 <        g = new CompletableFuture<>();
2433 <        f.complete(3);
2434 <        g.completeExceptionally(new CFException());
2435 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2436 <        checkCompletedWithWrappedCFException(h);
2437 <
2438 <        f = new CompletableFuture<>();
2439 <        g = new CompletableFuture<>();
2440 <        f.completeExceptionally(new CFException());
2441 <        g.complete(3);
2442 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2443 <        checkCompletedWithWrappedCFException(h);
2444 <
2445 <        assertEquals(0, e.count.get());
3307 >    public void testAnyOf_empty() throws Exception {
3308 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3309 >        checkIncomplete(f);
3310      }
3311  
3312      /**
3313 <     * thenAcceptBothAsync result completes exceptionally if action does
3313 >     * anyOf returns a future completed normally with a value when
3314 >     * a component future does
3315       */
3316 <    public void testThenAcceptBothAsync3E() {
3317 <        CompletableFuture<Integer> f, g;
3318 <        CompletableFuture<Void> h;
3319 <        FailingBiConsumer r;
3320 <        ThreadExecutor e = new ThreadExecutor();
3321 <
3322 <        f = new CompletableFuture<>();
3323 <        g = new CompletableFuture<>();
3324 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
3325 <        f.complete(3);
3326 <        checkIncomplete(h);
3327 <        g.complete(1);
3328 <        checkCompletedWithWrappedCFException(h);
2464 <
2465 <        f = new CompletableFuture<>();
2466 <        g = new CompletableFuture<>();
2467 <        f.complete(3);
2468 <        g.complete(1);
2469 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2470 <        checkCompletedWithWrappedCFException(h);
2471 <
2472 <        assertEquals(2, e.count.get());
3316 >    public void testAnyOf_normal() throws Exception {
3317 >        for (int k = 0; k < 10; ++k) {
3318 >            CompletableFuture[] fs = new CompletableFuture[k];
3319 >            for (int i = 0; i < k; ++i)
3320 >                fs[i] = new CompletableFuture<>();
3321 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3322 >            checkIncomplete(f);
3323 >            for (int i = 0; i < k; ++i) {
3324 >                fs[i].complete(one);
3325 >                checkCompletedNormally(f, one);
3326 >                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3327 >            }
3328 >        }
3329      }
3330  
3331      /**
3332 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
3332 >     * anyOf result completes exceptionally when any component does.
3333       */
3334 <    public void testThenAcceptBothAsync4E() {
3335 <        CompletableFuture<Integer> f, g;
3336 <        CompletableFuture<Void> h;
3337 <        SubtractAction r;
3338 <        ThreadExecutor e = new ThreadExecutor();
3339 <
3340 <        f = new CompletableFuture<>();
3341 <        g = new CompletableFuture<>();
3342 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
3343 <        assertTrue(f.cancel(true));
3344 <        checkIncomplete(h);
3345 <        g.complete(1);
3346 <        checkCompletedWithWrappedCancellationException(h);
3334 >    public void testAnyOf_exceptional() throws Exception {
3335 >        for (int k = 0; k < 10; ++k) {
3336 >            CompletableFuture[] fs = new CompletableFuture[k];
3337 >            for (int i = 0; i < k; ++i)
3338 >                fs[i] = new CompletableFuture<>();
3339 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3340 >            checkIncomplete(f);
3341 >            for (int i = 0; i < k; ++i) {
3342 >                fs[i].completeExceptionally(new CFException());
3343 >                checkCompletedWithWrappedCFException(f);
3344 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3345 >            }
3346 >        }
3347 >    }
3348  
3349 <        f = new CompletableFuture<>();
3350 <        g = new CompletableFuture<>();
3351 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
3352 <        assertTrue(g.cancel(true));
3353 <        checkIncomplete(h);
3354 <        f.complete(3);
3355 <        checkCompletedWithWrappedCancellationException(h);
3349 >    /**
3350 >     * Completion methods throw NullPointerException with null arguments
3351 >     */
3352 >    public void testNPE() {
3353 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3354 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3355 >        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3356 >        CompletableFuture<?> h;
3357 >        ThreadExecutor exec = new ThreadExecutor();
3358  
3359 <        f = new CompletableFuture<>();
3360 <        g = new CompletableFuture<>();
3361 <        f.complete(3);
3362 <        assertTrue(g.cancel(true));
3363 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
3364 <        checkCompletedWithWrappedCancellationException(h);
3359 >        Runnable[] throwingActions = {
3360 >            () -> CompletableFuture.supplyAsync(null),
3361 >            () -> CompletableFuture.supplyAsync(null, exec),
3362 >            () -> CompletableFuture.supplyAsync(supplyOne, null),
3363 >
3364 >            () -> CompletableFuture.runAsync(null),
3365 >            () -> CompletableFuture.runAsync(null, exec),
3366 >            () -> CompletableFuture.runAsync(() -> {}, null),
3367 >
3368 >            () -> f.completeExceptionally(null),
3369 >
3370 >            () -> f.thenApply(null),
3371 >            () -> f.thenApplyAsync(null),
3372 >            () -> f.thenApplyAsync((x) -> x, null),
3373 >            () -> f.thenApplyAsync(null, exec),
3374 >
3375 >            () -> f.thenAccept(null),
3376 >            () -> f.thenAcceptAsync(null),
3377 >            () -> f.thenAcceptAsync((x) -> {} , null),
3378 >            () -> f.thenAcceptAsync(null, exec),
3379 >
3380 >            () -> f.thenRun(null),
3381 >            () -> f.thenRunAsync(null),
3382 >            () -> f.thenRunAsync(() -> {} , null),
3383 >            () -> f.thenRunAsync(null, exec),
3384 >
3385 >            () -> f.thenCombine(g, null),
3386 >            () -> f.thenCombineAsync(g, null),
3387 >            () -> f.thenCombineAsync(g, null, exec),
3388 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3389 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3390 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3391 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3392 >
3393 >            () -> f.thenAcceptBoth(g, null),
3394 >            () -> f.thenAcceptBothAsync(g, null),
3395 >            () -> f.thenAcceptBothAsync(g, null, exec),
3396 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3397 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3398 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3399 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3400 >
3401 >            () -> f.runAfterBoth(g, null),
3402 >            () -> f.runAfterBothAsync(g, null),
3403 >            () -> f.runAfterBothAsync(g, null, exec),
3404 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3405 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3406 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3407 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3408 >
3409 >            () -> f.applyToEither(g, null),
3410 >            () -> f.applyToEitherAsync(g, null),
3411 >            () -> f.applyToEitherAsync(g, null, exec),
3412 >            () -> f.applyToEither(nullFuture, (x) -> x),
3413 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3414 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3415 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3416 >
3417 >            () -> f.acceptEither(g, null),
3418 >            () -> f.acceptEitherAsync(g, null),
3419 >            () -> f.acceptEitherAsync(g, null, exec),
3420 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3421 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3422 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3423 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3424 >
3425 >            () -> f.runAfterEither(g, null),
3426 >            () -> f.runAfterEitherAsync(g, null),
3427 >            () -> f.runAfterEitherAsync(g, null, exec),
3428 >            () -> f.runAfterEither(nullFuture, () -> {}),
3429 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3430 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3431 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3432 >
3433 >            () -> f.thenCompose(null),
3434 >            () -> f.thenComposeAsync(null),
3435 >            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3436 >            () -> f.thenComposeAsync(null, exec),
3437 >
3438 >            () -> f.exceptionally(null),
3439 >
3440 >            () -> f.handle(null),
3441 >
3442 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3443 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3444 >            () -> CompletableFuture.allOf(f, null),
3445 >            () -> CompletableFuture.allOf(null, f),
3446 >
3447 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3448 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3449 >            () -> CompletableFuture.anyOf(f, null),
3450 >            () -> CompletableFuture.anyOf(null, f),
3451  
3452 <        f = new CompletableFuture<>();
3453 <        g = new CompletableFuture<>();
2509 <        assertTrue(f.cancel(true));
2510 <        g.complete(3);
2511 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2512 <        checkCompletedWithWrappedCancellationException(h);
3452 >            () -> f.obtrudeException(null),
3453 >        };
3454  
3455 <        assertEquals(0, e.count.get());
3455 >        assertThrows(NullPointerException.class, throwingActions);
3456 >        assertEquals(0, exec.count.get());
3457      }
3458  
3459      /**
3460 <     * runAfterBothAsync result completes normally after normal
2519 <     * completion of sources
3460 >     * toCompletableFuture returns this CompletableFuture.
3461       */
3462 <    public void testRunAfterBothAsyncE() {
3462 >    public void testToCompletableFuture() {
3463          CompletableFuture<Integer> f = new CompletableFuture<>();
3464 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2524 <        Noop r = new Noop();
2525 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2526 <        f.complete(one);
2527 <        checkIncomplete(g);
2528 <        f2.complete(two);
2529 <        checkCompletedNormally(g, null);
2530 <        assertTrue(r.ran);
3464 >        assertSame(f, f.toCompletableFuture());
3465      }
3466  
3467      /**
3468 <     * runAfterBothAsync result completes exceptionally after exceptional
3469 <     * completion of source
3468 >     * whenComplete action executes on normal completion, propagating
3469 >     * source result.
3470       */
3471 <    public void testRunAfterBothAsync2E() {
3471 >    public void testWhenComplete1() {
3472 >        final AtomicInteger a = new AtomicInteger();
3473          CompletableFuture<Integer> f = new CompletableFuture<>();
3474 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3475 <        Noop r = new Noop();
3476 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
3477 <        f.completeExceptionally(new CFException());
3478 <        f2.complete(two);
3479 <        checkCompletedWithWrappedCFException(g);
2545 <
2546 <        r = new Noop();
2547 <        f = new CompletableFuture<>();
2548 <        f2 = new CompletableFuture<>();
2549 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2550 <        f.complete(one);
2551 <        f2.completeExceptionally(new CFException());
2552 <        checkCompletedWithWrappedCFException(g);
3474 >        CompletableFuture<Integer> g =
3475 >            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3476 >        f.complete(three);
3477 >        checkCompletedNormally(f, three);
3478 >        checkCompletedNormally(g, three);
3479 >        assertEquals(a.get(), 1);
3480      }
3481  
3482      /**
3483 <     * runAfterBothAsync result completes exceptionally if action does
3483 >     * whenComplete action executes on exceptional completion, propagating
3484 >     * source result.
3485       */
3486 <    public void testRunAfterBothAsync3E() {
3486 >    public void testWhenComplete2() {
3487 >        final AtomicInteger a = new AtomicInteger();
3488          CompletableFuture<Integer> f = new CompletableFuture<>();
3489 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3490 <        FailingNoop r = new FailingNoop();
3491 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
3492 <        f.complete(one);
3493 <        checkIncomplete(g);
3494 <        f2.complete(two);
2566 <        checkCompletedWithWrappedCFException(g);
3489 >        CompletableFuture<Integer> g =
3490 >            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3491 >        f.completeExceptionally(new CFException());
3492 >        assertTrue(f.isCompletedExceptionally());
3493 >        assertTrue(g.isCompletedExceptionally());
3494 >        assertEquals(a.get(), 1);
3495      }
3496  
3497      /**
3498 <     * runAfterBothAsync result completes exceptionally if either source cancelled
3498 >     * If a whenComplete action throws an exception when triggered by
3499 >     * a normal completion, it completes exceptionally
3500       */
3501 <    public void testRunAfterBothAsync4E() {
3501 >    public void testWhenComplete3() {
3502          CompletableFuture<Integer> f = new CompletableFuture<>();
3503 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3504 <        Noop r = new Noop();
3505 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
3506 <        assertTrue(f.cancel(true));
3507 <        f2.complete(two);
3508 <        checkCompletedWithWrappedCancellationException(g);
3509 <
2581 <        r = new Noop();
2582 <        f = new CompletableFuture<>();
2583 <        f2 = new CompletableFuture<>();
2584 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2585 <        f.complete(one);
2586 <        assertTrue(f2.cancel(true));
2587 <        checkCompletedWithWrappedCancellationException(g);
3503 >        CompletableFuture<Integer> g =
3504 >            f.whenComplete((Integer x, Throwable t) ->
3505 >                           { throw new CFException(); } );
3506 >        f.complete(three);
3507 >        checkCompletedNormally(f, three);
3508 >        assertTrue(g.isCompletedExceptionally());
3509 >        checkCompletedWithWrappedCFException(g);
3510      }
3511  
3512      /**
3513 <     * applyToEitherAsync result completes normally after normal
3514 <     * completion of sources
3513 >     * whenCompleteAsync action executes on normal completion, propagating
3514 >     * source result.
3515       */
3516 <    public void testApplyToEitherAsyncE() {
3516 >    public void testWhenCompleteAsync1() {
3517 >        final AtomicInteger a = new AtomicInteger();
3518          CompletableFuture<Integer> f = new CompletableFuture<>();
3519 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3520 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3521 <        f.complete(one);
3522 <        checkCompletedNormally(g, two);
3523 <
3524 <        f = new CompletableFuture<>();
2602 <        f.complete(one);
2603 <        f2 = new CompletableFuture<>();
2604 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2605 <        checkCompletedNormally(g, two);
3519 >        CompletableFuture<Integer> g =
3520 >            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3521 >        f.complete(three);
3522 >        checkCompletedNormally(f, three);
3523 >        checkCompletedNormally(g, three);
3524 >        assertEquals(a.get(), 1);
3525      }
3526  
3527      /**
3528 <     * applyToEitherAsync result completes exceptionally after exceptional
3529 <     * completion of source
3528 >     * whenCompleteAsync action executes on exceptional completion, propagating
3529 >     * source result.
3530       */
3531 <    public void testApplyToEitherAsync2E() {
3531 >    public void testWhenCompleteAsync2() {
3532 >        final AtomicInteger a = new AtomicInteger();
3533          CompletableFuture<Integer> f = new CompletableFuture<>();
3534 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3535 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
3534 >        CompletableFuture<Integer> g =
3535 >            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3536          f.completeExceptionally(new CFException());
3537 <        checkCompletedWithWrappedCFException(g);
2618 <
2619 <        f = new CompletableFuture<>();
2620 <        f2 = new CompletableFuture<>();
2621 <        f2.completeExceptionally(new CFException());
2622 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2623 <        f.complete(one);
3537 >        checkCompletedWithWrappedCFException(f);
3538          checkCompletedWithWrappedCFException(g);
3539      }
3540  
3541      /**
3542 <     * applyToEitherAsync result completes exceptionally if action does
3542 >     * If a whenCompleteAsync action throws an exception when
3543 >     * triggered by a normal completion, it completes exceptionally
3544       */
3545 <    public void testApplyToEitherAsync3E() {
3545 >    public void testWhenCompleteAsync3() {
3546          CompletableFuture<Integer> f = new CompletableFuture<>();
3547 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3548 <        FailingFunction r = new FailingFunction();
3549 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
3550 <        f.complete(one);
3547 >        CompletableFuture<Integer> g =
3548 >            f.whenCompleteAsync((Integer x, Throwable t) ->
3549 >                           { throw new CFException(); } );
3550 >        f.complete(three);
3551 >        checkCompletedNormally(f, three);
3552          checkCompletedWithWrappedCFException(g);
3553      }
3554  
3555      /**
3556 <     * applyToEitherAsync result completes exceptionally if either source cancelled
3557 <     */
2642 <    public void testApplyToEitherAsync4E() {
2643 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2644 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2645 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2646 <        assertTrue(f.cancel(true));
2647 <        checkCompletedWithWrappedCancellationException(g);
2648 <
2649 <        f = new CompletableFuture<>();
2650 <        f2 = new CompletableFuture<>();
2651 <        assertTrue(f2.cancel(true));
2652 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2653 <        checkCompletedWithWrappedCancellationException(g);
2654 <    }
2655 <
2656 <    /**
2657 <     * acceptEitherAsync result completes normally after normal
2658 <     * completion of sources
3556 >     * whenCompleteAsync action executes on normal completion, propagating
3557 >     * source result.
3558       */
3559 <    public void testAcceptEitherAsyncE() {
3559 >    public void testWhenCompleteAsync1e() {
3560 >        final AtomicInteger a = new AtomicInteger();
3561 >        ThreadExecutor exec = new ThreadExecutor();
3562          CompletableFuture<Integer> f = new CompletableFuture<>();
3563 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3564 <        IncAction r = new IncAction();
3565 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3566 <        f.complete(one);
3567 <        checkCompletedNormally(g, null);
3568 <        assertEquals(r.value, 2);
3569 <
2669 <        r = new IncAction();
2670 <        f = new CompletableFuture<>();
2671 <        f.complete(one);
2672 <        f2 = new CompletableFuture<>();
2673 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2674 <        checkCompletedNormally(g, null);
2675 <        assertEquals(r.value, 2);
3563 >        CompletableFuture<Integer> g =
3564 >            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3565 >                                exec);
3566 >        f.complete(three);
3567 >        checkCompletedNormally(f, three);
3568 >        checkCompletedNormally(g, three);
3569 >        assertEquals(a.get(), 1);
3570      }
3571  
3572      /**
3573 <     * acceptEitherAsync result completes exceptionally after exceptional
3574 <     * completion of source
3573 >     * whenCompleteAsync action executes on exceptional completion, propagating
3574 >     * source result.
3575       */
3576 <    public void testAcceptEitherAsync2E() {
3576 >    public void testWhenCompleteAsync2e() {
3577 >        final AtomicInteger a = new AtomicInteger();
3578 >        ThreadExecutor exec = new ThreadExecutor();
3579          CompletableFuture<Integer> f = new CompletableFuture<>();
3580 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3581 <        IncAction r = new IncAction();
3582 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3580 >        CompletableFuture<Integer> g =
3581 >            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3582 >                                exec);
3583          f.completeExceptionally(new CFException());
3584 <        checkCompletedWithWrappedCFException(g);
2689 <
2690 <        r = new IncAction();
2691 <        f = new CompletableFuture<>();
2692 <        f2 = new CompletableFuture<>();
2693 <        f2.completeExceptionally(new CFException());
2694 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2695 <        f.complete(one);
3584 >        checkCompletedWithWrappedCFException(f);
3585          checkCompletedWithWrappedCFException(g);
3586      }
3587  
3588      /**
3589 <     * acceptEitherAsync result completes exceptionally if action does
3589 >     * If a whenCompleteAsync action throws an exception when triggered
3590 >     * by a normal completion, it completes exceptionally
3591       */
3592 <    public void testAcceptEitherAsync3E() {
3592 >    public void testWhenCompleteAsync3e() {
3593 >        ThreadExecutor exec = new ThreadExecutor();
3594          CompletableFuture<Integer> f = new CompletableFuture<>();
3595 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3596 <        FailingConsumer r = new FailingConsumer();
3597 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3598 <        f.complete(one);
3595 >        CompletableFuture<Integer> g =
3596 >            f.whenCompleteAsync((Integer x, Throwable t) ->
3597 >                                { throw new CFException(); },
3598 >                                exec);
3599 >        f.complete(three);
3600 >        checkCompletedNormally(f, three);
3601          checkCompletedWithWrappedCFException(g);
3602      }
3603  
3604      /**
3605 <     * acceptEitherAsync result completes exceptionally if either
3606 <     * source cancelled
3605 >     * handleAsync action completes normally with function value on
3606 >     * either normal or exceptional completion of source
3607       */
3608 <    public void testAcceptEitherAsync4E() {
3609 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3610 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2718 <        IncAction r = new IncAction();
2719 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2720 <        assertTrue(f.cancel(true));
2721 <        checkCompletedWithWrappedCancellationException(g);
3608 >    public void testHandleAsync() {
3609 >        CompletableFuture<Integer> f, g;
3610 >        IntegerHandler r;
3611  
2723        r = new IncAction();
3612          f = new CompletableFuture<>();
3613 <        f2 = new CompletableFuture<>();
3614 <        assertTrue(f2.cancel(true));
3615 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3616 <        checkCompletedWithWrappedCancellationException(g);
3617 <    }
3613 >        g = f.handleAsync(r = new IntegerHandler());
3614 >        assertFalse(r.ran);
3615 >        f.completeExceptionally(new CFException());
3616 >        checkCompletedWithWrappedCFException(f);
3617 >        checkCompletedNormally(g, three);
3618 >        assertTrue(r.ran);
3619  
3620 <    /**
3621 <     * runAfterEitherAsync result completes normally after normal
3622 <     * completion of sources
3623 <     */
3624 <    public void testRunAfterEitherAsyncE() {
3625 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2737 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2738 <        Noop r = new Noop();
2739 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2740 <        f.complete(one);
2741 <        checkCompletedNormally(g, null);
3620 >        f = new CompletableFuture<>();
3621 >        g = f.handleAsync(r = new IntegerHandler());
3622 >        assertFalse(r.ran);
3623 >        f.completeExceptionally(new CFException());
3624 >        checkCompletedWithWrappedCFException(f);
3625 >        checkCompletedNormally(g, three);
3626          assertTrue(r.ran);
3627  
2744        r = new Noop();
3628          f = new CompletableFuture<>();
3629 +        g = f.handleAsync(r = new IntegerHandler());
3630 +        assertFalse(r.ran);
3631          f.complete(one);
3632 <        f2 = new CompletableFuture<>();
3633 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2749 <        checkCompletedNormally(g, null);
3632 >        checkCompletedNormally(f, one);
3633 >        checkCompletedNormally(g, two);
3634          assertTrue(r.ran);
2751    }
3635  
2753    /**
2754     * runAfterEitherAsync result completes exceptionally after exceptional
2755     * completion of source
2756     */
2757    public void testRunAfterEitherAsync2E() {
2758        CompletableFuture<Integer> f = new CompletableFuture<>();
2759        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2760        Noop r = new Noop();
2761        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2762        f.completeExceptionally(new CFException());
2763        checkCompletedWithWrappedCFException(g);
2764
2765        r = new Noop();
3636          f = new CompletableFuture<>();
3637 <        f2 = new CompletableFuture<>();
3638 <        f2.completeExceptionally(new CFException());
2769 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3637 >        g = f.handleAsync(r = new IntegerHandler());
3638 >        assertFalse(r.ran);
3639          f.complete(one);
3640 <        checkCompletedWithWrappedCFException(g);
3640 >        checkCompletedNormally(f, one);
3641 >        checkCompletedNormally(g, two);
3642 >        assertTrue(r.ran);
3643      }
3644  
3645      /**
3646 <     * runAfterEitherAsync result completes exceptionally if action does
3646 >     * handleAsync action with Executor completes normally with
3647 >     * function value on either normal or exceptional completion of
3648 >     * source
3649       */
3650 <    public void testRunAfterEitherAsync3E() {
3651 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3652 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3653 <        FailingNoop r = new FailingNoop();
2781 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2782 <        f.complete(one);
2783 <        checkCompletedWithWrappedCFException(g);
2784 <    }
3650 >    public void testHandleAsync2() {
3651 >        CompletableFuture<Integer> f, g;
3652 >        ThreadExecutor exec = new ThreadExecutor();
3653 >        IntegerHandler r;
3654  
3655 <    /**
3656 <     * runAfterEitherAsync result completes exceptionally if either
3657 <     * source cancelled
3658 <     */
3659 <    public void testRunAfterEitherAsync4E() {
3660 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3661 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2793 <        Noop r = new Noop();
2794 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2795 <        assertTrue(f.cancel(true));
2796 <        checkCompletedWithWrappedCancellationException(g);
3655 >        f = new CompletableFuture<>();
3656 >        g = f.handleAsync(r = new IntegerHandler(), exec);
3657 >        assertFalse(r.ran);
3658 >        f.completeExceptionally(new CFException());
3659 >        checkCompletedWithWrappedCFException(f);
3660 >        checkCompletedNormally(g, three);
3661 >        assertTrue(r.ran);
3662  
2798        r = new Noop();
3663          f = new CompletableFuture<>();
3664 <        f2 = new CompletableFuture<>();
3665 <        assertTrue(f2.cancel(true));
3666 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3667 <        checkCompletedWithWrappedCancellationException(g);
3668 <    }
3664 >        g = f.handleAsync(r = new IntegerHandler(), exec);
3665 >        assertFalse(r.ran);
3666 >        f.completeExceptionally(new CFException());
3667 >        checkCompletedWithWrappedCFException(f);
3668 >        checkCompletedNormally(g, three);
3669 >        assertTrue(r.ran);
3670  
3671 <    /**
3672 <     * thenComposeAsync result completes normally after normal
3673 <     * completion of source
2809 <     */
2810 <    public void testThenComposeAsyncE() {
2811 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2812 <        CompletableFutureInc r = new CompletableFutureInc();
2813 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3671 >        f = new CompletableFuture<>();
3672 >        g = f.handleAsync(r = new IntegerHandler(), exec);
3673 >        assertFalse(r.ran);
3674          f.complete(one);
3675 +        checkCompletedNormally(f, one);
3676          checkCompletedNormally(g, two);
3677 <    }
2817 <
2818 <    /**
2819 <     * thenComposeAsync result completes exceptionally after
2820 <     * exceptional completion of source
2821 <     */
2822 <    public void testThenComposeAsync2E() {
2823 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2824 <        CompletableFutureInc r = new CompletableFutureInc();
2825 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2826 <        f.completeExceptionally(new CFException());
2827 <        checkCompletedWithWrappedCFException(g);
2828 <    }
3677 >        assertTrue(r.ran);
3678  
3679 <    /**
3680 <     * thenComposeAsync result completes exceptionally if action does
3681 <     */
2833 <    public void testThenComposeAsync3E() {
2834 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2835 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2836 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3679 >        f = new CompletableFuture<>();
3680 >        g = f.handleAsync(r = new IntegerHandler(), exec);
3681 >        assertFalse(r.ran);
3682          f.complete(one);
3683 <        checkCompletedWithWrappedCFException(g);
3684 <    }
3685 <
2841 <    /**
2842 <     * thenComposeAsync result completes exceptionally if source cancelled
2843 <     */
2844 <    public void testThenComposeAsync4E() {
2845 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2846 <        CompletableFutureInc r = new CompletableFutureInc();
2847 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2848 <        assertTrue(f.cancel(true));
2849 <        checkCompletedWithWrappedCancellationException(g);
2850 <    }
2851 <
2852 <    // other static methods
2853 <
2854 <    /**
2855 <     * allOf(no component futures) returns a future completed normally
2856 <     * with the value null
2857 <     */
2858 <    public void testAllOf_empty() throws Exception {
2859 <        CompletableFuture<?> f = CompletableFuture.allOf();
2860 <        checkCompletedNormally(f, null);
2861 <    }
2862 <
2863 <    /**
2864 <     * allOf returns a future completed when all components complete
2865 <     */
2866 <    public void testAllOf() throws Exception {
2867 <        for (int k = 1; k < 20; ++k) {
2868 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2869 <            for (int i = 0; i < k; ++i)
2870 <                fs[i] = new CompletableFuture<>();
2871 <            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2872 <            for (int i = 0; i < k; ++i) {
2873 <                checkIncomplete(f);
2874 <                fs[i].complete(one);
2875 <            }
2876 <            checkCompletedNormally(f, null);
2877 <        }
2878 <    }
2879 <
2880 <    /**
2881 <     * anyOf(no component futures) returns an incomplete future
2882 <     */
2883 <    public void testAnyOf_empty() throws Exception {
2884 <        CompletableFuture<?> f = CompletableFuture.anyOf();
2885 <        checkIncomplete(f);
2886 <    }
2887 <
2888 <    /**
2889 <     * anyOf returns a future completed when any components complete
2890 <     */
2891 <    public void testAnyOf() throws Exception {
2892 <        for (int k = 1; k < 20; ++k) {
2893 <            CompletableFuture[] fs = new CompletableFuture[k];
2894 <            for (int i = 0; i < k; ++i)
2895 <                fs[i] = new CompletableFuture<>();
2896 <            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2897 <            checkIncomplete(f);
2898 <            for (int i = 0; i < k; ++i) {
2899 <                fs[i].complete(one);
2900 <                checkCompletedNormally(f, one);
2901 <            }
2902 <        }
2903 <    }
2904 <
2905 <    /**
2906 <     * Completion methods throw NullPointerException with null arguments
2907 <     */
2908 <    public void testNPE() {
2909 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2910 <        CompletableFuture<Integer> g = new CompletableFuture<>();
2911 <        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2912 <        CompletableFuture<?> h;
2913 <        ThreadExecutor exec = new ThreadExecutor();
2914 <
2915 <        Runnable[] throwingActions = {
2916 <            () -> { CompletableFuture.supplyAsync(null); },
2917 <            () -> { CompletableFuture.supplyAsync(null, exec); },
2918 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
2919 <
2920 <            () -> { CompletableFuture.runAsync(null); },
2921 <            () -> { CompletableFuture.runAsync(null, exec); },
2922 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
2923 <
2924 <            () -> { f.completeExceptionally(null); },
2925 <
2926 <            () -> { f.thenApply(null); },
2927 <            () -> { f.thenApplyAsync(null); },
2928 <            () -> { f.thenApplyAsync((x) -> x, null); },
2929 <            () -> { f.thenApplyAsync(null, exec); },
2930 <
2931 <            () -> { f.thenAccept(null); },
2932 <            () -> { f.thenAcceptAsync(null); },
2933 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2934 <            () -> { f.thenAcceptAsync(null, exec); },
2935 <
2936 <            () -> { f.thenRun(null); },
2937 <            () -> { f.thenRunAsync(null); },
2938 <            () -> { f.thenRunAsync(() -> { ; }, null); },
2939 <            () -> { f.thenRunAsync(null, exec); },
2940 <
2941 <            () -> { f.thenCombine(g, null); },
2942 <            () -> { f.thenCombineAsync(g, null); },
2943 <            () -> { f.thenCombineAsync(g, null, exec); },
2944 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2945 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2946 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2947 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2948 <
2949 <            () -> { f.thenAcceptBoth(g, null); },
2950 <            () -> { f.thenAcceptBothAsync(g, null); },
2951 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
2952 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
2953 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
2954 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
2955 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
2956 <
2957 <            () -> { f.runAfterBoth(g, null); },
2958 <            () -> { f.runAfterBothAsync(g, null); },
2959 <            () -> { f.runAfterBothAsync(g, null, exec); },
2960 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
2961 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
2962 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
2963 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
2964 <
2965 <            () -> { f.applyToEither(g, null); },
2966 <            () -> { f.applyToEitherAsync(g, null); },
2967 <            () -> { f.applyToEitherAsync(g, null, exec); },
2968 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
2969 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
2970 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
2971 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
2972 <
2973 <            () -> { f.acceptEither(g, null); },
2974 <            () -> { f.acceptEitherAsync(g, null); },
2975 <            () -> { f.acceptEitherAsync(g, null, exec); },
2976 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
2977 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
2978 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
2979 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
2980 <
2981 <            () -> { f.runAfterEither(g, null); },
2982 <            () -> { f.runAfterEitherAsync(g, null); },
2983 <            () -> { f.runAfterEitherAsync(g, null, exec); },
2984 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
2985 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
2986 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
2987 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
2988 <
2989 <            () -> { f.thenCompose(null); },
2990 <            () -> { f.thenComposeAsync(null); },
2991 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
2992 <            () -> { f.thenComposeAsync(null, exec); },
2993 <
2994 <            () -> { f.exceptionally(null); },
2995 <
2996 <            () -> { f.handle(null); },
2997 <
2998 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
2999 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3000 <            () -> { CompletableFuture.allOf(f, null); },
3001 <            () -> { CompletableFuture.allOf(null, f); },
3002 <
3003 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3004 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3005 <            () -> { CompletableFuture.anyOf(f, null); },
3006 <            () -> { CompletableFuture.anyOf(null, f); },
3007 <        };
3008 <
3009 <        assertThrows(NullPointerException.class, throwingActions);
3010 <        assertEquals(0, exec.count.get());
3683 >        checkCompletedNormally(f, one);
3684 >        checkCompletedNormally(g, two);
3685 >        assertTrue(r.ran);
3686      }
3687  
3688   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines