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.39 by jsr166, Mon Jun 2 00:46:52 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 {
# Line 371 | Line 445 | public class CompletableFutureTest exten
445          }
446      }
447  
448 +    /**
449 +     * Permits the testing of parallel code for the 3 different
450 +     * execution modes without repeating all the testing code.
451 +     */
452 +    enum ExecutionMode {
453 +        DEFAULT {
454 +            public <T,U> CompletableFuture<Void> runAfterBoth
455 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
456 +                return f.runAfterBoth(g, a);
457 +            }
458 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
459 +                (CompletableFuture<T> f,
460 +                 CompletionStage<? extends U> g,
461 +                 BiConsumer<? super T,? super U> a) {
462 +                return f.thenAcceptBoth(g, a);
463 +            }
464 +            public <T,U,V> CompletableFuture<V> thenCombine
465 +                (CompletableFuture<T> f,
466 +                 CompletionStage<? extends U> g,
467 +                 BiFunction<? super T,? super U,? extends V> a) {
468 +                return f.thenCombine(g, a);
469 +            }
470 +            public <T,U> CompletableFuture<U> applyToEither
471 +                (CompletableFuture<T> f,
472 +                 CompletionStage<? extends T> g,
473 +                 Function<? super T,U> a) {
474 +                return f.applyToEither(g, a);
475 +            }
476 +            public <T> CompletableFuture<Void> acceptEither
477 +                (CompletableFuture<T> f,
478 +                 CompletionStage<? extends T> g,
479 +                 Consumer<? super T> a) {
480 +                return f.acceptEither(g, a);
481 +            }
482 +            public <T> CompletableFuture<Void> runAfterEither
483 +                (CompletableFuture<T> f,
484 +                 CompletionStage<?> g,
485 +                 java.lang.Runnable a) {
486 +                return f.runAfterEither(g, a);
487 +            }
488 +            public <T,U> CompletableFuture<U> thenCompose
489 +                (CompletableFuture<T> f,
490 +                 Function<? super T,? extends CompletionStage<U>> a) {
491 +                return f.thenCompose(a);
492 +            }
493 +            public <T> CompletableFuture<T> whenComplete
494 +                (CompletableFuture<T> f,
495 +                 BiConsumer<? super T,? super Throwable> a) {
496 +                return f.whenComplete(a);
497 +            }
498 +        },
499 +
500 + //             /** Experimental way to do more testing */
501 + //         REVERSE_DEFAULT {
502 + //             public <T,U> CompletableFuture<Void> runAfterBoth
503 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
504 + //                 return g.runAfterBoth(f, a);
505 + //             }
506 + //             public <T,U> CompletableFuture<Void> thenAcceptBoth
507 + //                 (CompletableFuture<T> f,
508 + //                  CompletionStage<? extends U> g,
509 + //                  BiConsumer<? super T,? super U> a) {
510 + //                 return DEFAULT.thenAcceptBoth(f, g, a);
511 + //             }
512 + //         },
513 +
514 +        DEFAULT_ASYNC {
515 +            public <T,U> CompletableFuture<Void> runAfterBoth
516 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
517 +                return f.runAfterBothAsync(g, a);
518 +            }
519 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
520 +                (CompletableFuture<T> f,
521 +                 CompletionStage<? extends U> g,
522 +                 BiConsumer<? super T,? super U> a) {
523 +                return f.thenAcceptBothAsync(g, a);
524 +            }
525 +            public <T,U,V> CompletableFuture<V> thenCombine
526 +                (CompletableFuture<T> f,
527 +                 CompletionStage<? extends U> g,
528 +                 BiFunction<? super T,? super U,? extends V> a) {
529 +                return f.thenCombineAsync(g, a);
530 +            }
531 +            public <T,U> CompletableFuture<U> applyToEither
532 +                (CompletableFuture<T> f,
533 +                 CompletionStage<? extends T> g,
534 +                 Function<? super T,U> a) {
535 +                return f.applyToEitherAsync(g, a);
536 +            }
537 +            public <T> CompletableFuture<Void> acceptEither
538 +                (CompletableFuture<T> f,
539 +                 CompletionStage<? extends T> g,
540 +                 Consumer<? super T> a) {
541 +                return f.acceptEitherAsync(g, a);
542 +            }
543 +            public <T> CompletableFuture<Void> runAfterEither
544 +                (CompletableFuture<T> f,
545 +                 CompletionStage<?> g,
546 +                 java.lang.Runnable a) {
547 +                return f.runAfterEitherAsync(g, a);
548 +            }
549 +            public <T,U> CompletableFuture<U> thenCompose
550 +                (CompletableFuture<T> f,
551 +                 Function<? super T,? extends CompletionStage<U>> a) {
552 +                return f.thenComposeAsync(a);
553 +            }
554 +            public <T> CompletableFuture<T> whenComplete
555 +                (CompletableFuture<T> f,
556 +                 BiConsumer<? super T,? super Throwable> a) {
557 +                return f.whenCompleteAsync(a);
558 +            }
559 +        },
560 +
561 + //         REVERSE_DEFAULT_ASYNC {
562 + //             public <T,U> CompletableFuture<Void> runAfterBoth
563 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
564 + //                 return f.runAfterBothAsync(g, a);
565 + //             }
566 + //             public <T,U> CompletableFuture<Void> thenAcceptBoth
567 + //                 (CompletableFuture<T> f,
568 + //                  CompletionStage<? extends U> g,
569 + //                  BiConsumer<? super T,? super U> a) {
570 + //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
571 + //             }
572 + //         },
573 +
574 +        EXECUTOR {
575 +            public <T,U> CompletableFuture<Void> runAfterBoth
576 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
577 +                return f.runAfterBothAsync(g, a, new ThreadExecutor());
578 +            }
579 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
580 +                (CompletableFuture<T> f,
581 +                 CompletionStage<? extends U> g,
582 +                 BiConsumer<? super T,? super U> a) {
583 +                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
584 +            }
585 +            public <T,U,V> CompletableFuture<V> thenCombine
586 +                (CompletableFuture<T> f,
587 +                 CompletionStage<? extends U> g,
588 +                 BiFunction<? super T,? super U,? extends V> a) {
589 +                return f.thenCombineAsync(g, a, new ThreadExecutor());
590 +            }
591 +            public <T,U> CompletableFuture<U> applyToEither
592 +                (CompletableFuture<T> f,
593 +                 CompletionStage<? extends T> g,
594 +                 Function<? super T,U> a) {
595 +                return f.applyToEitherAsync(g, a, new ThreadExecutor());
596 +            }
597 +            public <T> CompletableFuture<Void> acceptEither
598 +                (CompletableFuture<T> f,
599 +                 CompletionStage<? extends T> g,
600 +                 Consumer<? super T> a) {
601 +                return f.acceptEitherAsync(g, a, new ThreadExecutor());
602 +            }
603 +            public <T> CompletableFuture<Void> runAfterEither
604 +                (CompletableFuture<T> f,
605 +                 CompletionStage<?> g,
606 +                 java.lang.Runnable a) {
607 +                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
608 +            }
609 +            public <T,U> CompletableFuture<U> thenCompose
610 +                (CompletableFuture<T> f,
611 +                 Function<? super T,? extends CompletionStage<U>> a) {
612 +                return f.thenComposeAsync(a, new ThreadExecutor());
613 +            }
614 +            public <T> CompletableFuture<T> whenComplete
615 +                (CompletableFuture<T> f,
616 +                 BiConsumer<? super T,? super Throwable> a) {
617 +                return f.whenCompleteAsync(a, new ThreadExecutor());
618 +            }
619 +        };
620 +
621 +        public abstract <T,U> CompletableFuture<Void> runAfterBoth
622 +            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
623 +        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
624 +            (CompletableFuture<T> f,
625 +             CompletionStage<? extends U> g,
626 +             BiConsumer<? super T,? super U> a);
627 +        public abstract <T,U,V> CompletableFuture<V> thenCombine
628 +            (CompletableFuture<T> f,
629 +             CompletionStage<? extends U> g,
630 +             BiFunction<? super T,? super U,? extends V> a);
631 +        public abstract <T,U> CompletableFuture<U> applyToEither
632 +            (CompletableFuture<T> f,
633 +             CompletionStage<? extends T> g,
634 +             Function<? super T,U> a);
635 +        public abstract <T> CompletableFuture<Void> acceptEither
636 +            (CompletableFuture<T> f,
637 +             CompletionStage<? extends T> g,
638 +             Consumer<? super T> a);
639 +        public abstract <T> CompletableFuture<Void> runAfterEither
640 +            (CompletableFuture<T> f,
641 +             CompletionStage<?> g,
642 +             java.lang.Runnable a);
643 +        public abstract <T,U> CompletableFuture<U> thenCompose
644 +            (CompletableFuture<T> f,
645 +             Function<? super T,? extends CompletionStage<U>> a);
646 +        public abstract <T> CompletableFuture<T> whenComplete
647 +            (CompletableFuture<T> f,
648 +             BiConsumer<? super T,? super Throwable> a);
649 +
650 +
651 +    }
652  
653      /**
654       * exceptionally action completes with function value on source
655 <     * exception;  otherwise with source value
655 >     * exception; otherwise with source value
656       */
657      public void testExceptionally() {
658          CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 622 | Line 900 | public class CompletableFutureTest exten
900          CompletableFuture<Void> g = f.thenAccept(r);
901          f.complete(one);
902          checkCompletedNormally(g, null);
903 <        assertEquals(r.value, 2);
903 >        assertEquals(r.value, (Integer) 2);
904      }
905  
906      /**
# Line 660 | Line 938 | public class CompletableFutureTest exten
938          checkCompletedWithWrappedCancellationException(g);
939      }
940  
663
941      /**
942       * thenCombine result completes normally after normal completion
943       * of sources
944       */
945 <    public void testThenCombine() {
946 <        CompletableFuture<Integer> f, g, h;
945 >    public void testThenCombine_normalCompletion1() {
946 >        for (ExecutionMode m : ExecutionMode.values())
947 >        for (Integer v1 : new Integer[] { 1, null })
948 >        for (Integer v2 : new Integer[] { 2, null }) {
949 >
950 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
951 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
952 >        final SubtractFunction r = new SubtractFunction();
953 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
954 >
955 >        f.complete(v1);
956 >        checkIncomplete(h);
957 >        assertFalse(r.ran());
958 >        g.complete(v2);
959 >
960 >        checkCompletedNormally(h, subtract(v1, v2));
961 >        checkCompletedNormally(f, v1);
962 >        checkCompletedNormally(g, v2);
963 >        }
964 >    }
965  
966 <        f = new CompletableFuture<>();
967 <        g = new CompletableFuture<>();
968 <        h = f.thenCombine(g, subtract);
969 <        f.complete(3);
970 <        checkIncomplete(h);
971 <        g.complete(1);
972 <        checkCompletedNormally(h, 2);
966 >    public void testThenCombine_normalCompletion2() {
967 >        for (ExecutionMode m : ExecutionMode.values())
968 >        for (Integer v1 : new Integer[] { 1, null })
969 >        for (Integer v2 : new Integer[] { 2, null }) {
970 >
971 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
972 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
973 >        final SubtractFunction r = new SubtractFunction();
974 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
975 >
976 >        g.complete(v2);
977 >        checkIncomplete(h);
978 >        assertFalse(r.ran());
979 >        f.complete(v1);
980 >
981 >        checkCompletedNormally(h, subtract(v1, v2));
982 >        checkCompletedNormally(f, v1);
983 >        checkCompletedNormally(g, v2);
984 >        }
985 >    }
986  
987 <        f = new CompletableFuture<>();
988 <        g = new CompletableFuture<>();
989 <        h = f.thenCombine(g, subtract);
990 <        g.complete(1);
991 <        checkIncomplete(h);
992 <        f.complete(3);
993 <        checkCompletedNormally(h, 2);
987 >    public void testThenCombine_normalCompletion3() {
988 >        for (ExecutionMode m : ExecutionMode.values())
989 >        for (Integer v1 : new Integer[] { 1, null })
990 >        for (Integer v2 : new Integer[] { 2, null }) {
991 >
992 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
993 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
994 >        final SubtractFunction r = new SubtractFunction();
995 >
996 >        g.complete(v2);
997 >        f.complete(v1);
998 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
999 >
1000 >        checkCompletedNormally(h, subtract(v1, v2));
1001 >        checkCompletedNormally(f, v1);
1002 >        checkCompletedNormally(g, v2);
1003 >        }
1004 >    }
1005  
1006 <        f = new CompletableFuture<>();
1007 <        g = new CompletableFuture<>();
1008 <        g.complete(1);
1009 <        f.complete(3);
1010 <        h = f.thenCombine(g, subtract);
1011 <        checkCompletedNormally(h, 2);
1006 >    public void testThenCombine_normalCompletion4() {
1007 >        for (ExecutionMode m : ExecutionMode.values())
1008 >        for (Integer v1 : new Integer[] { 1, null })
1009 >        for (Integer v2 : new Integer[] { 2, null }) {
1010 >
1011 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1012 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1013 >        final SubtractFunction r = new SubtractFunction();
1014 >
1015 >        f.complete(v1);
1016 >        g.complete(v2);
1017 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1018 >
1019 >        checkCompletedNormally(h, subtract(v1, v2));
1020 >        checkCompletedNormally(f, v1);
1021 >        checkCompletedNormally(g, v2);
1022 >        }
1023      }
1024  
1025      /**
1026       * thenCombine result completes exceptionally after exceptional
1027       * completion of either source
1028       */
1029 <    public void testThenCombine2() {
1030 <        CompletableFuture<Integer> f, g, h;
1031 <
1032 <        f = new CompletableFuture<>();
1033 <        g = new CompletableFuture<>();
1034 <        h = f.thenCombine(g, subtract);
1035 <        f.completeExceptionally(new CFException());
1036 <        checkIncomplete(h);
1037 <        g.complete(1);
1038 <        checkCompletedWithWrappedCFException(h);
1029 >    public void testThenCombine_exceptionalCompletion1() {
1030 >        for (ExecutionMode m : ExecutionMode.values())
1031 >        for (Integer v1 : new Integer[] { 1, null }) {
1032 >
1033 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1034 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1035 >        final SubtractFunction r = new SubtractFunction();
1036 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1037 >        final CFException ex = new CFException();
1038 >
1039 >        f.completeExceptionally(ex);
1040 >        checkIncomplete(h);
1041 >        g.complete(v1);
1042 >
1043 >        checkCompletedWithWrappedCFException(h, ex);
1044 >        checkCompletedWithWrappedCFException(f, ex);
1045 >        assertFalse(r.ran());
1046 >        checkCompletedNormally(g, v1);
1047 >        }
1048 >    }
1049  
1050 <        f = new CompletableFuture<>();
1051 <        g = new CompletableFuture<>();
1052 <        h = f.thenCombine(g, subtract);
1053 <        g.completeExceptionally(new CFException());
1054 <        checkIncomplete(h);
1055 <        f.complete(3);
1056 <        checkCompletedWithWrappedCFException(h);
1050 >    public void testThenCombine_exceptionalCompletion2() {
1051 >        for (ExecutionMode m : ExecutionMode.values())
1052 >        for (Integer v1 : new Integer[] { 1, null }) {
1053 >
1054 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1055 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1056 >        final SubtractFunction r = new SubtractFunction();
1057 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1058 >        final CFException ex = new CFException();
1059 >
1060 >        g.completeExceptionally(ex);
1061 >        checkIncomplete(h);
1062 >        f.complete(v1);
1063 >
1064 >        checkCompletedWithWrappedCFException(h, ex);
1065 >        checkCompletedWithWrappedCFException(g, ex);
1066 >        assertFalse(r.ran());
1067 >        checkCompletedNormally(f, v1);
1068 >        }
1069 >    }
1070  
1071 <        f = new CompletableFuture<>();
1072 <        g = new CompletableFuture<>();
1073 <        f.complete(3);
1074 <        g.completeExceptionally(new CFException());
1075 <        h = f.thenCombine(g, subtract);
1076 <        checkCompletedWithWrappedCFException(h);
1071 >    public void testThenCombine_exceptionalCompletion3() {
1072 >        for (ExecutionMode m : ExecutionMode.values())
1073 >        for (Integer v1 : new Integer[] { 1, null }) {
1074 >
1075 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1076 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1077 >        final SubtractFunction r = new SubtractFunction();
1078 >        final CFException ex = new CFException();
1079 >
1080 >        g.completeExceptionally(ex);
1081 >        f.complete(v1);
1082 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1083 >
1084 >        checkCompletedWithWrappedCFException(h, ex);
1085 >        checkCompletedWithWrappedCFException(g, ex);
1086 >        assertFalse(r.ran());
1087 >        checkCompletedNormally(f, v1);
1088 >        }
1089 >    }
1090  
1091 <        f = new CompletableFuture<>();
1092 <        g = new CompletableFuture<>();
1093 <        f.completeExceptionally(new CFException());
1094 <        g.complete(3);
1095 <        h = f.thenCombine(g, subtract);
1096 <        checkCompletedWithWrappedCFException(h);
1091 >    public void testThenCombine_exceptionalCompletion4() {
1092 >        for (ExecutionMode m : ExecutionMode.values())
1093 >        for (Integer v1 : new Integer[] { 1, null }) {
1094 >
1095 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1096 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1097 >        final SubtractFunction r = new SubtractFunction();
1098 >        final CFException ex = new CFException();
1099 >
1100 >        f.completeExceptionally(ex);
1101 >        g.complete(v1);
1102 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1103 >
1104 >        checkCompletedWithWrappedCFException(h, ex);
1105 >        checkCompletedWithWrappedCFException(f, ex);
1106 >        assertFalse(r.ran());
1107 >        checkCompletedNormally(g, v1);
1108 >        }
1109      }
1110  
1111      /**
1112       * thenCombine result completes exceptionally if action does
1113       */
1114 <    public void testThenCombine3() {
1115 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1116 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1117 <        FailingBiFunction r = new FailingBiFunction();
1118 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1119 <        f.complete(one);
1120 <        checkIncomplete(g);
1121 <        assertFalse(r.ran);
1122 <        f2.complete(two);
1123 <        checkCompletedWithWrappedCFException(g);
1124 <        assertTrue(r.ran);
1114 >    public void testThenCombine_actionFailed1() {
1115 >        for (ExecutionMode m : ExecutionMode.values())
1116 >        for (Integer v1 : new Integer[] { 1, null })
1117 >        for (Integer v2 : new Integer[] { 2, null }) {
1118 >
1119 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1120 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1121 >        final FailingBiFunction r = new FailingBiFunction();
1122 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1123 >
1124 >        f.complete(v1);
1125 >        checkIncomplete(h);
1126 >        g.complete(v2);
1127 >
1128 >        checkCompletedWithWrappedCFException(h);
1129 >        checkCompletedNormally(f, v1);
1130 >        checkCompletedNormally(g, v2);
1131 >        }
1132 >    }
1133 >
1134 >    public void testThenCombine_actionFailed2() {
1135 >        for (ExecutionMode m : ExecutionMode.values())
1136 >        for (Integer v1 : new Integer[] { 1, null })
1137 >        for (Integer v2 : new Integer[] { 2, null }) {
1138 >
1139 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1140 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1141 >        final FailingBiFunction r = new FailingBiFunction();
1142 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1143 >
1144 >        g.complete(v2);
1145 >        checkIncomplete(h);
1146 >        f.complete(v1);
1147 >
1148 >        checkCompletedWithWrappedCFException(h);
1149 >        checkCompletedNormally(f, v1);
1150 >        checkCompletedNormally(g, v2);
1151 >        }
1152      }
1153  
1154      /**
1155       * thenCombine result completes exceptionally if either source cancelled
1156       */
1157 <    public void testThenCombine4() {
1158 <        CompletableFuture<Integer> f, g, h;
1157 >    public void testThenCombine_sourceCancelled1() {
1158 >        for (ExecutionMode m : ExecutionMode.values())
1159 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1160 >        for (Integer v1 : new Integer[] { 1, null }) {
1161 >
1162 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1163 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1164 >        final SubtractFunction r = new SubtractFunction();
1165 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1166  
1167 <        f = new CompletableFuture<>();
756 <        g = new CompletableFuture<>();
757 <        h = f.thenCombine(g, subtract);
758 <        assertTrue(f.cancel(true));
1167 >        assertTrue(f.cancel(mayInterruptIfRunning));
1168          checkIncomplete(h);
1169 <        g.complete(1);
1169 >        g.complete(v1);
1170 >
1171          checkCompletedWithWrappedCancellationException(h);
1172 +        checkCancelled(f);
1173 +        assertFalse(r.ran());
1174 +        checkCompletedNormally(g, v1);
1175 +        }
1176 +    }
1177  
1178 <        f = new CompletableFuture<>();
1179 <        g = new CompletableFuture<>();
1180 <        h = f.thenCombine(g, subtract);
1181 <        assertTrue(g.cancel(true));
1178 >    public void testThenCombine_sourceCancelled2() {
1179 >        for (ExecutionMode m : ExecutionMode.values())
1180 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1181 >        for (Integer v1 : new Integer[] { 1, null }) {
1182 >
1183 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1184 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1185 >        final SubtractFunction r = new SubtractFunction();
1186 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1187 >
1188 >        assertTrue(g.cancel(mayInterruptIfRunning));
1189          checkIncomplete(h);
1190 <        f.complete(3);
1190 >        f.complete(v1);
1191 >
1192          checkCompletedWithWrappedCancellationException(h);
1193 +        checkCancelled(g);
1194 +        assertFalse(r.ran());
1195 +        checkCompletedNormally(f, v1);
1196 +        }
1197 +    }
1198 +
1199 +    public void testThenCombine_sourceCancelled3() {
1200 +        for (ExecutionMode m : ExecutionMode.values())
1201 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1202 +        for (Integer v1 : new Integer[] { 1, null }) {
1203 +
1204 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1205 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1206 +        final SubtractFunction r = new SubtractFunction();
1207 +
1208 +        assertTrue(g.cancel(mayInterruptIfRunning));
1209 +        f.complete(v1);
1210 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1211 +
1212 +        checkCompletedWithWrappedCancellationException(h);
1213 +        checkCancelled(g);
1214 +        assertFalse(r.ran());
1215 +        checkCompletedNormally(f, v1);
1216 +        }
1217 +    }
1218 +
1219 +    public void testThenCombine_sourceCancelled4() {
1220 +        for (ExecutionMode m : ExecutionMode.values())
1221 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1222 +        for (Integer v1 : new Integer[] { 1, null }) {
1223 +
1224 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1225 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1226 +        final SubtractFunction r = new SubtractFunction();
1227 +
1228 +        assertTrue(f.cancel(mayInterruptIfRunning));
1229 +        g.complete(v1);
1230 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1231  
771        f = new CompletableFuture<>();
772        g = new CompletableFuture<>();
773        assertTrue(f.cancel(true));
774        assertTrue(g.cancel(true));
775        h = f.thenCombine(g, subtract);
1232          checkCompletedWithWrappedCancellationException(h);
1233 +        checkCancelled(f);
1234 +        assertFalse(r.ran());
1235 +        checkCompletedNormally(g, v1);
1236 +        }
1237      }
1238  
1239      /**
1240       * thenAcceptBoth result completes normally after normal
1241       * completion of sources
1242       */
1243 <    public void testThenAcceptBoth() {
1244 <        CompletableFuture<Integer> f, g;
1245 <        CompletableFuture<Void> h;
1246 <        SubtractAction r;
1243 >    public void testThenAcceptBoth_normalCompletion1() {
1244 >        for (ExecutionMode m : ExecutionMode.values())
1245 >        for (Integer v1 : new Integer[] { 1, null })
1246 >        for (Integer v2 : new Integer[] { 2, null }) {
1247 >
1248 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1249 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1250 >        final SubtractAction r = new SubtractAction();
1251 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1252  
1253 <        f = new CompletableFuture<>();
789 <        g = new CompletableFuture<>();
790 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
791 <        f.complete(3);
1253 >        f.complete(v1);
1254          checkIncomplete(h);
1255 <        g.complete(1);
1255 >        assertFalse(r.ran());
1256 >        g.complete(v2);
1257 >
1258          checkCompletedNormally(h, null);
1259 <        assertEquals(r.value, 2);
1259 >        assertEquals(r.value, subtract(v1, v2));
1260 >        checkCompletedNormally(f, v1);
1261 >        checkCompletedNormally(g, v2);
1262 >        }
1263 >    }
1264  
1265 <        f = new CompletableFuture<>();
1266 <        g = new CompletableFuture<>();
1267 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1268 <        g.complete(1);
1265 >    public void testThenAcceptBoth_normalCompletion2() {
1266 >        for (ExecutionMode m : ExecutionMode.values())
1267 >        for (Integer v1 : new Integer[] { 1, null })
1268 >        for (Integer v2 : new Integer[] { 2, null }) {
1269 >
1270 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1272 >        final SubtractAction r = new SubtractAction();
1273 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1274 >
1275 >        g.complete(v2);
1276          checkIncomplete(h);
1277 <        f.complete(3);
1277 >        assertFalse(r.ran());
1278 >        f.complete(v1);
1279 >
1280          checkCompletedNormally(h, null);
1281 <        assertEquals(r.value, 2);
1281 >        assertEquals(r.value, subtract(v1, v2));
1282 >        checkCompletedNormally(f, v1);
1283 >        checkCompletedNormally(g, v2);
1284 >        }
1285 >    }
1286 >
1287 >    public void testThenAcceptBoth_normalCompletion3() {
1288 >        for (ExecutionMode m : ExecutionMode.values())
1289 >        for (Integer v1 : new Integer[] { 1, null })
1290 >        for (Integer v2 : new Integer[] { 2, null }) {
1291 >
1292 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1293 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1294 >        final SubtractAction r = new SubtractAction();
1295 >
1296 >        g.complete(v2);
1297 >        f.complete(v1);
1298 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1299 >
1300 >        checkCompletedNormally(h, null);
1301 >        assertEquals(r.value, subtract(v1, v2));
1302 >        checkCompletedNormally(f, v1);
1303 >        checkCompletedNormally(g, v2);
1304 >        }
1305 >    }
1306 >
1307 >    public void testThenAcceptBoth_normalCompletion4() {
1308 >        for (ExecutionMode m : ExecutionMode.values())
1309 >        for (Integer v1 : new Integer[] { 1, null })
1310 >        for (Integer v2 : new Integer[] { 2, null }) {
1311 >
1312 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1313 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1314 >        final SubtractAction r = new SubtractAction();
1315 >
1316 >        f.complete(v1);
1317 >        g.complete(v2);
1318 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1319  
806        f = new CompletableFuture<>();
807        g = new CompletableFuture<>();
808        g.complete(1);
809        f.complete(3);
810        h = f.thenAcceptBoth(g, r = new SubtractAction());
1320          checkCompletedNormally(h, null);
1321 <        assertEquals(r.value, 2);
1321 >        assertEquals(r.value, subtract(v1, v2));
1322 >        checkCompletedNormally(f, v1);
1323 >        checkCompletedNormally(g, v2);
1324 >        }
1325      }
1326  
1327      /**
1328       * thenAcceptBoth result completes exceptionally after exceptional
1329       * completion of either source
1330       */
1331 <    public void testThenAcceptBoth2() {
1332 <        CompletableFuture<Integer> f, g;
1333 <        CompletableFuture<Void> h;
1334 <        SubtractAction r;
1335 <
1336 <        f = new CompletableFuture<>();
1337 <        g = new CompletableFuture<>();
1338 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1339 <        f.completeExceptionally(new CFException());
1340 <        checkIncomplete(h);
1341 <        g.complete(1);
1342 <        checkCompletedWithWrappedCFException(h);
1331 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1332 >        for (ExecutionMode m : ExecutionMode.values())
1333 >        for (Integer v1 : new Integer[] { 1, null }) {
1334 >
1335 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1336 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1337 >        final SubtractAction r = new SubtractAction();
1338 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1339 >        final CFException ex = new CFException();
1340 >
1341 >        f.completeExceptionally(ex);
1342 >        checkIncomplete(h);
1343 >        g.complete(v1);
1344 >
1345 >        checkCompletedWithWrappedCFException(h, ex);
1346 >        checkCompletedWithWrappedCFException(f, ex);
1347 >        assertFalse(r.ran());
1348 >        checkCompletedNormally(g, v1);
1349 >        }
1350 >    }
1351  
1352 <        f = new CompletableFuture<>();
1353 <        g = new CompletableFuture<>();
1354 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1355 <        g.completeExceptionally(new CFException());
1356 <        checkIncomplete(h);
1357 <        f.complete(3);
1358 <        checkCompletedWithWrappedCFException(h);
1352 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1353 >        for (ExecutionMode m : ExecutionMode.values())
1354 >        for (Integer v1 : new Integer[] { 1, null }) {
1355 >
1356 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1357 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1358 >        final SubtractAction r = new SubtractAction();
1359 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1360 >        final CFException ex = new CFException();
1361 >
1362 >        g.completeExceptionally(ex);
1363 >        checkIncomplete(h);
1364 >        f.complete(v1);
1365 >
1366 >        checkCompletedWithWrappedCFException(h, ex);
1367 >        checkCompletedWithWrappedCFException(g, ex);
1368 >        assertFalse(r.ran());
1369 >        checkCompletedNormally(f, v1);
1370 >        }
1371 >    }
1372  
1373 <        f = new CompletableFuture<>();
1374 <        g = new CompletableFuture<>();
1375 <        f.complete(3);
1376 <        g.completeExceptionally(new CFException());
1377 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1378 <        checkCompletedWithWrappedCFException(h);
1373 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1374 >        for (ExecutionMode m : ExecutionMode.values())
1375 >        for (Integer v1 : new Integer[] { 1, null }) {
1376 >
1377 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1378 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1379 >        final SubtractAction r = new SubtractAction();
1380 >        final CFException ex = new CFException();
1381 >
1382 >        g.completeExceptionally(ex);
1383 >        f.complete(v1);
1384 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1385 >
1386 >        checkCompletedWithWrappedCFException(h, ex);
1387 >        checkCompletedWithWrappedCFException(g, ex);
1388 >        assertFalse(r.ran());
1389 >        checkCompletedNormally(f, v1);
1390 >        }
1391 >    }
1392  
1393 <        f = new CompletableFuture<>();
1394 <        g = new CompletableFuture<>();
1395 <        f.completeExceptionally(new CFException());
1396 <        g.complete(3);
1397 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1398 <        checkCompletedWithWrappedCFException(h);
1393 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1394 >        for (ExecutionMode m : ExecutionMode.values())
1395 >        for (Integer v1 : new Integer[] { 1, null }) {
1396 >
1397 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1398 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1399 >        final SubtractAction r = new SubtractAction();
1400 >        final CFException ex = new CFException();
1401 >
1402 >        f.completeExceptionally(ex);
1403 >        g.complete(v1);
1404 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1405 >
1406 >        checkCompletedWithWrappedCFException(h, ex);
1407 >        checkCompletedWithWrappedCFException(f, ex);
1408 >        assertFalse(r.ran());
1409 >        checkCompletedNormally(g, v1);
1410 >        }
1411      }
1412  
1413      /**
1414       * thenAcceptBoth result completes exceptionally if action does
1415       */
1416 <    public void testThenAcceptBoth3() {
1417 <        CompletableFuture<Integer> f, g;
1418 <        CompletableFuture<Void> h;
1419 <        FailingBiConsumer r;
1416 >    public void testThenAcceptBoth_actionFailed1() {
1417 >        for (ExecutionMode m : ExecutionMode.values())
1418 >        for (Integer v1 : new Integer[] { 1, null })
1419 >        for (Integer v2 : new Integer[] { 2, null }) {
1420  
1421 <        f = new CompletableFuture<>();
1422 <        g = new CompletableFuture<>();
1423 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1424 <        f.complete(3);
1421 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1422 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1423 >        final FailingBiConsumer r = new FailingBiConsumer();
1424 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1425 >
1426 >        f.complete(v1);
1427          checkIncomplete(h);
1428 <        g.complete(1);
1428 >        g.complete(v2);
1429 >
1430          checkCompletedWithWrappedCFException(h);
1431 +        checkCompletedNormally(f, v1);
1432 +        checkCompletedNormally(g, v2);
1433 +        }
1434 +    }
1435 +
1436 +    public void testThenAcceptBoth_actionFailed2() {
1437 +        for (ExecutionMode m : ExecutionMode.values())
1438 +        for (Integer v1 : new Integer[] { 1, null })
1439 +        for (Integer v2 : new Integer[] { 2, null }) {
1440 +
1441 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1442 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1443 +        final FailingBiConsumer r = new FailingBiConsumer();
1444 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1445 +
1446 +        g.complete(v2);
1447 +        checkIncomplete(h);
1448 +        f.complete(v1);
1449  
871        f = new CompletableFuture<>();
872        g = new CompletableFuture<>();
873        f.complete(3);
874        g.complete(1);
875        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1450          checkCompletedWithWrappedCFException(h);
1451 +        checkCompletedNormally(f, v1);
1452 +        checkCompletedNormally(g, v2);
1453 +        }
1454      }
1455  
1456      /**
1457       * thenAcceptBoth result completes exceptionally if either source cancelled
1458       */
1459 <    public void testThenAcceptBoth4() {
1460 <        CompletableFuture<Integer> f, g;
1461 <        CompletableFuture<Void> h;
1462 <        SubtractAction r;
1459 >    public void testThenAcceptBoth_sourceCancelled1() {
1460 >        for (ExecutionMode m : ExecutionMode.values())
1461 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1462 >        for (Integer v1 : new Integer[] { 1, null }) {
1463 >
1464 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1465 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1466 >        final SubtractAction r = new SubtractAction();
1467 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1468  
1469 <        f = new CompletableFuture<>();
888 <        g = new CompletableFuture<>();
889 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
890 <        assertTrue(f.cancel(true));
1469 >        assertTrue(f.cancel(mayInterruptIfRunning));
1470          checkIncomplete(h);
1471 <        g.complete(1);
1471 >        g.complete(v1);
1472 >
1473          checkCompletedWithWrappedCancellationException(h);
1474 +        checkCancelled(f);
1475 +        assertFalse(r.ran());
1476 +        checkCompletedNormally(g, v1);
1477 +        }
1478 +    }
1479  
1480 <        f = new CompletableFuture<>();
1481 <        g = new CompletableFuture<>();
1482 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1483 <        assertTrue(g.cancel(true));
1480 >    public void testThenAcceptBoth_sourceCancelled2() {
1481 >        for (ExecutionMode m : ExecutionMode.values())
1482 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1483 >        for (Integer v1 : new Integer[] { 1, null }) {
1484 >
1485 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1487 >        final SubtractAction r = new SubtractAction();
1488 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1489 >
1490 >        assertTrue(g.cancel(mayInterruptIfRunning));
1491          checkIncomplete(h);
1492 <        f.complete(3);
901 <        checkCompletedWithWrappedCancellationException(h);
1492 >        f.complete(v1);
1493  
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());
1494          checkCompletedWithWrappedCancellationException(h);
1495 +        checkCancelled(g);
1496 +        assertFalse(r.ran());
1497 +        checkCompletedNormally(f, v1);
1498 +        }
1499 +    }
1500 +
1501 +    public void testThenAcceptBoth_sourceCancelled3() {
1502 +        for (ExecutionMode m : ExecutionMode.values())
1503 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1504 +        for (Integer v1 : new Integer[] { 1, null }) {
1505 +
1506 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1507 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1508 +        final SubtractAction r = new SubtractAction();
1509 +
1510 +        assertTrue(g.cancel(mayInterruptIfRunning));
1511 +        f.complete(v1);
1512 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1513 +
1514 +        checkCompletedWithWrappedCancellationException(h);
1515 +        checkCancelled(g);
1516 +        assertFalse(r.ran());
1517 +        checkCompletedNormally(f, v1);
1518 +        }
1519 +    }
1520 +
1521 +    public void testThenAcceptBoth_sourceCancelled4() {
1522 +        for (ExecutionMode m : ExecutionMode.values())
1523 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1524 +        for (Integer v1 : new Integer[] { 1, null }) {
1525 +
1526 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1527 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1528 +        final SubtractAction r = new SubtractAction();
1529 +
1530 +        assertTrue(f.cancel(mayInterruptIfRunning));
1531 +        g.complete(v1);
1532 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1533  
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());
1534          checkCompletedWithWrappedCancellationException(h);
1535 +        checkCancelled(f);
1536 +        assertFalse(r.ran());
1537 +        checkCompletedNormally(g, v1);
1538 +        }
1539      }
1540  
1541      /**
1542       * runAfterBoth result completes normally after normal
1543       * completion of sources
1544       */
1545 <    public void testRunAfterBoth() {
1546 <        CompletableFuture<Integer> f, g;
1547 <        CompletableFuture<Void> h;
1548 <        Noop r;
1545 >    public void testRunAfterBoth_normalCompletion1() {
1546 >        for (ExecutionMode m : ExecutionMode.values())
1547 >        for (Integer v1 : new Integer[] { 1, null })
1548 >        for (Integer v2 : new Integer[] { 2, null }) {
1549 >
1550 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1551 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1552 >        final Noop r = new Noop();
1553 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1554  
1555 <        f = new CompletableFuture<>();
928 <        g = new CompletableFuture<>();
929 <        h = f.runAfterBoth(g, r = new Noop());
930 <        f.complete(3);
1555 >        f.complete(v1);
1556          checkIncomplete(h);
1557 <        g.complete(1);
1557 >        assertFalse(r.ran);
1558 >        g.complete(v2);
1559 >
1560          checkCompletedNormally(h, null);
1561          assertTrue(r.ran);
1562 +        checkCompletedNormally(f, v1);
1563 +        checkCompletedNormally(g, v2);
1564 +        }
1565 +    }
1566  
1567 <        f = new CompletableFuture<>();
1568 <        g = new CompletableFuture<>();
1569 <        h = f.runAfterBoth(g, r = new Noop());
1570 <        g.complete(1);
1567 >    public void testRunAfterBoth_normalCompletion2() {
1568 >        for (ExecutionMode m : ExecutionMode.values())
1569 >        for (Integer v1 : new Integer[] { 1, null })
1570 >        for (Integer v2 : new Integer[] { 2, null }) {
1571 >
1572 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1573 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1574 >        final Noop r = new Noop();
1575 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1576 >
1577 >        g.complete(v2);
1578          checkIncomplete(h);
1579 <        f.complete(3);
1579 >        assertFalse(r.ran);
1580 >        f.complete(v1);
1581 >
1582          checkCompletedNormally(h, null);
1583          assertTrue(r.ran);
1584 +        checkCompletedNormally(f, v1);
1585 +        checkCompletedNormally(g, v2);
1586 +        }
1587 +    }
1588 +
1589 +    public void testRunAfterBoth_normalCompletion3() {
1590 +        for (ExecutionMode m : ExecutionMode.values())
1591 +        for (Integer v1 : new Integer[] { 1, null })
1592 +        for (Integer v2 : new Integer[] { 2, null }) {
1593 +
1594 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1595 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1596 +        final Noop r = new Noop();
1597 +
1598 +        g.complete(v2);
1599 +        f.complete(v1);
1600 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1601 +
1602 +        checkCompletedNormally(h, null);
1603 +        assertTrue(r.ran);
1604 +        checkCompletedNormally(f, v1);
1605 +        checkCompletedNormally(g, v2);
1606 +        }
1607 +    }
1608 +
1609 +    public void testRunAfterBoth_normalCompletion4() {
1610 +        for (ExecutionMode m : ExecutionMode.values())
1611 +        for (Integer v1 : new Integer[] { 1, null })
1612 +        for (Integer v2 : new Integer[] { 2, null }) {
1613 +
1614 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1615 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1616 +        final Noop r = new Noop();
1617 +
1618 +        f.complete(v1);
1619 +        g.complete(v2);
1620 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1621  
945        f = new CompletableFuture<>();
946        g = new CompletableFuture<>();
947        g.complete(1);
948        f.complete(3);
949        h = f.runAfterBoth(g, r = new Noop());
1622          checkCompletedNormally(h, null);
1623          assertTrue(r.ran);
1624 +        checkCompletedNormally(f, v1);
1625 +        checkCompletedNormally(g, v2);
1626 +        }
1627      }
1628  
1629      /**
1630       * runAfterBoth result completes exceptionally after exceptional
1631       * completion of either source
1632       */
1633 <    public void testRunAfterBoth2() {
1634 <        CompletableFuture<Integer> f, g;
1635 <        CompletableFuture<Void> h;
1636 <        Noop r;
1633 >    public void testRunAfterBoth_exceptionalCompletion1() {
1634 >        for (ExecutionMode m : ExecutionMode.values())
1635 >        for (Integer v1 : new Integer[] { 1, null }) {
1636 >
1637 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1638 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1639 >        final Noop r = new Noop();
1640 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1641 >        final CFException ex = new CFException();
1642  
1643 <        f = new CompletableFuture<>();
964 <        g = new CompletableFuture<>();
965 <        h = f.runAfterBoth(g, r = new Noop());
966 <        f.completeExceptionally(new CFException());
1643 >        f.completeExceptionally(ex);
1644          checkIncomplete(h);
1645 <        g.complete(1);
1646 <        checkCompletedWithWrappedCFException(h);
1645 >        g.complete(v1);
1646 >
1647 >        checkCompletedWithWrappedCFException(h, ex);
1648 >        checkCompletedWithWrappedCFException(f, ex);
1649          assertFalse(r.ran);
1650 +        checkCompletedNormally(g, v1);
1651 +        }
1652 +    }
1653  
1654 <        f = new CompletableFuture<>();
1655 <        g = new CompletableFuture<>();
1656 <        h = f.runAfterBoth(g, r = new Noop());
1657 <        g.completeExceptionally(new CFException());
1654 >    public void testRunAfterBoth_exceptionalCompletion2() {
1655 >        for (ExecutionMode m : ExecutionMode.values())
1656 >        for (Integer v1 : new Integer[] { 1, null }) {
1657 >
1658 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1659 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1660 >        final Noop r = new Noop();
1661 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1662 >        final CFException ex = new CFException();
1663 >
1664 >        g.completeExceptionally(ex);
1665          checkIncomplete(h);
1666 <        f.complete(3);
1667 <        checkCompletedWithWrappedCFException(h);
1666 >        f.complete(v1);
1667 >
1668 >        checkCompletedWithWrappedCFException(h, ex);
1669 >        checkCompletedWithWrappedCFException(g, ex);
1670          assertFalse(r.ran);
1671 +        checkCompletedNormally(f, v1);
1672 +        }
1673 +    }
1674  
1675 <        f = new CompletableFuture<>();
1676 <        g = new CompletableFuture<>();
1677 <        g.completeExceptionally(new CFException());
1678 <        f.complete(3);
1679 <        h = f.runAfterBoth(g, r = new Noop());
1680 <        checkCompletedWithWrappedCFException(h);
1675 >    public void testRunAfterBoth_exceptionalCompletion3() {
1676 >        for (ExecutionMode m : ExecutionMode.values())
1677 >        for (Integer v1 : new Integer[] { 1, null }) {
1678 >
1679 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1680 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1681 >        final Noop r = new Noop();
1682 >        final CFException ex = new CFException();
1683 >
1684 >        g.completeExceptionally(ex);
1685 >        f.complete(v1);
1686 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1687 >
1688 >        checkCompletedWithWrappedCFException(h, ex);
1689 >        checkCompletedWithWrappedCFException(g, ex);
1690          assertFalse(r.ran);
1691 +        checkCompletedNormally(f, v1);
1692 +        }
1693 +    }
1694  
1695 <        f = new CompletableFuture<>();
1696 <        g = new CompletableFuture<>();
1697 <        f.completeExceptionally(new CFException());
1698 <        g.complete(1);
1699 <        h = f.runAfterBoth(g, r = new Noop());
1700 <        checkCompletedWithWrappedCFException(h);
1695 >    public void testRunAfterBoth_exceptionalCompletion4() {
1696 >        for (ExecutionMode m : ExecutionMode.values())
1697 >        for (Integer v1 : new Integer[] { 1, null }) {
1698 >
1699 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1700 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1701 >        final Noop r = new Noop();
1702 >        final CFException ex = new CFException();
1703 >
1704 >        f.completeExceptionally(ex);
1705 >        g.complete(v1);
1706 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1707 >
1708 >        checkCompletedWithWrappedCFException(h, ex);
1709 >        checkCompletedWithWrappedCFException(f, ex);
1710          assertFalse(r.ran);
1711 +        checkCompletedNormally(g, v1);
1712 +        }
1713      }
1714  
1715      /**
1716       * runAfterBoth result completes exceptionally if action does
1717       */
1718 <    public void testRunAfterBoth3() {
1719 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1720 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1721 <        FailingNoop r = new FailingNoop();
1722 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1723 <        f.complete(one);
1724 <        checkIncomplete(g);
1725 <        f2.complete(two);
1726 <        checkCompletedWithWrappedCFException(g);
1718 >    public void testRunAfterBoth_actionFailed1() {
1719 >        for (ExecutionMode m : ExecutionMode.values())
1720 >        for (Integer v1 : new Integer[] { 1, null })
1721 >        for (Integer v2 : new Integer[] { 2, null }) {
1722 >
1723 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1724 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1725 >        final FailingNoop r = new FailingNoop();
1726 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1727 >
1728 >        f.complete(v1);
1729 >        checkIncomplete(h);
1730 >        g.complete(v2);
1731 >
1732 >        checkCompletedWithWrappedCFException(h);
1733 >        checkCompletedNormally(f, v1);
1734 >        checkCompletedNormally(g, v2);
1735 >        }
1736 >    }
1737 >
1738 >    public void testRunAfterBoth_actionFailed2() {
1739 >        for (ExecutionMode m : ExecutionMode.values())
1740 >        for (Integer v1 : new Integer[] { 1, null })
1741 >        for (Integer v2 : new Integer[] { 2, null }) {
1742 >
1743 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1744 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1745 >        final FailingNoop r = new FailingNoop();
1746 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1747 >
1748 >        g.complete(v2);
1749 >        checkIncomplete(h);
1750 >        f.complete(v1);
1751 >
1752 >        checkCompletedWithWrappedCFException(h);
1753 >        checkCompletedNormally(f, v1);
1754 >        checkCompletedNormally(g, v2);
1755 >        }
1756      }
1757  
1758      /**
1759       * runAfterBoth result completes exceptionally if either source cancelled
1760       */
1761 <    public void testRunAfterBoth4() {
1762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1763 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1764 <        Noop r = new Noop();
1765 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1766 <        assertTrue(f.cancel(true));
1767 <        f2.complete(two);
1768 <        checkCompletedWithWrappedCancellationException(g);
1769 <        f = new CompletableFuture<>();
1770 <        f2 = new CompletableFuture<>();
1771 <        r = new Noop();
1772 <        g = f.runAfterBoth(f2, r);
1773 <        f.complete(one);
1774 <        assertTrue(f2.cancel(true));
1775 <        checkCompletedWithWrappedCancellationException(g);
1761 >    public void testRunAfterBoth_sourceCancelled1() {
1762 >        for (ExecutionMode m : ExecutionMode.values())
1763 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1764 >        for (Integer v1 : new Integer[] { 1, null }) {
1765 >
1766 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1767 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1768 >        final Noop r = new Noop();
1769 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1770 >
1771 >        assertTrue(f.cancel(mayInterruptIfRunning));
1772 >        checkIncomplete(h);
1773 >        g.complete(v1);
1774 >
1775 >        checkCompletedWithWrappedCancellationException(h);
1776 >        checkCancelled(f);
1777 >        assertFalse(r.ran);
1778 >        checkCompletedNormally(g, v1);
1779 >        }
1780 >    }
1781 >
1782 >    public void testRunAfterBoth_sourceCancelled2() {
1783 >        for (ExecutionMode m : ExecutionMode.values())
1784 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1785 >        for (Integer v1 : new Integer[] { 1, null }) {
1786 >
1787 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1788 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1789 >        final Noop r = new Noop();
1790 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1791 >
1792 >        assertTrue(g.cancel(mayInterruptIfRunning));
1793 >        checkIncomplete(h);
1794 >        f.complete(v1);
1795 >
1796 >        checkCompletedWithWrappedCancellationException(h);
1797 >        checkCancelled(g);
1798 >        assertFalse(r.ran);
1799 >        checkCompletedNormally(f, v1);
1800 >        }
1801 >    }
1802 >
1803 >    public void testRunAfterBoth_sourceCancelled3() {
1804 >        for (ExecutionMode m : ExecutionMode.values())
1805 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1806 >        for (Integer v1 : new Integer[] { 1, null }) {
1807 >
1808 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1809 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1810 >        final Noop r = new Noop();
1811 >
1812 >        assertTrue(g.cancel(mayInterruptIfRunning));
1813 >        f.complete(v1);
1814 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1815 >
1816 >        checkCompletedWithWrappedCancellationException(h);
1817 >        checkCancelled(g);
1818 >        assertFalse(r.ran);
1819 >        checkCompletedNormally(f, v1);
1820 >        }
1821 >    }
1822 >
1823 >    public void testRunAfterBoth_sourceCancelled4() {
1824 >        for (ExecutionMode m : ExecutionMode.values())
1825 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1826 >        for (Integer v1 : new Integer[] { 1, null }) {
1827 >
1828 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1829 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1830 >        final Noop r = new Noop();
1831 >
1832 >        assertTrue(f.cancel(mayInterruptIfRunning));
1833 >        g.complete(v1);
1834 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1835 >
1836 >        checkCompletedWithWrappedCancellationException(h);
1837 >        checkCancelled(f);
1838 >        assertFalse(r.ran);
1839 >        checkCompletedNormally(g, v1);
1840 >        }
1841      }
1842  
1843      /**
1844       * applyToEither result completes normally after normal completion
1845       * of either source
1846       */
1847 <    public void testApplyToEither() {
1848 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1849 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1850 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1851 <        f.complete(one);
1852 <        checkCompletedNormally(g, two);
1853 <        f2.complete(one);
1854 <        checkCompletedNormally(g, two);
1847 >    public void testApplyToEither_normalCompletion1() {
1848 >        for (ExecutionMode m : ExecutionMode.values())
1849 >        for (Integer v1 : new Integer[] { 1, null })
1850 >        for (Integer v2 : new Integer[] { 2, null }) {
1851 >
1852 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1853 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1854 >        final IncFunction r = new IncFunction();
1855 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1856 >
1857 >        f.complete(v1);
1858 >        checkCompletedNormally(h, inc(v1));
1859 >        g.complete(v2);
1860 >
1861 >        checkCompletedNormally(f, v1);
1862 >        checkCompletedNormally(g, v2);
1863 >        checkCompletedNormally(h, inc(v1));
1864 >        }
1865 >    }
1866  
1867 <        f = new CompletableFuture<>();
1868 <        f.complete(one);
1869 <        f2 = new CompletableFuture<>();
1870 <        g = f.applyToEither(f2, inc);
1871 <        checkCompletedNormally(g, two);
1867 >    public void testApplyToEither_normalCompletion2() {
1868 >        for (ExecutionMode m : ExecutionMode.values())
1869 >        for (Integer v1 : new Integer[] { 1, null })
1870 >        for (Integer v2 : new Integer[] { 2, null }) {
1871 >
1872 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1873 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1874 >        final IncFunction r = new IncFunction();
1875 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1876 >
1877 >        g.complete(v2);
1878 >        checkCompletedNormally(h, inc(v2));
1879 >        f.complete(v1);
1880 >
1881 >        checkCompletedNormally(f, v1);
1882 >        checkCompletedNormally(g, v2);
1883 >        checkCompletedNormally(h, inc(v2));
1884 >        }
1885 >    }
1886 >    public void testApplyToEither_normalCompletion3() {
1887 >        for (ExecutionMode m : ExecutionMode.values())
1888 >        for (Integer v1 : new Integer[] { 1, null })
1889 >        for (Integer v2 : new Integer[] { 2, null }) {
1890 >
1891 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1892 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1893 >        final IncFunction r = new IncFunction();
1894 >
1895 >        f.complete(v1);
1896 >        g.complete(v2);
1897 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1898 >
1899 >        checkCompletedNormally(f, v1);
1900 >        checkCompletedNormally(g, v2);
1901 >
1902 >        // unspecified behavior
1903 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1904 >                   Objects.equals(h.join(), inc(v2)));
1905 >        }
1906      }
1907  
1908      /**
1909       * applyToEither result completes exceptionally after exceptional
1910       * completion of either source
1911       */
1912 <    public void testApplyToEither2() {
1913 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1914 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1915 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1916 <        f.completeExceptionally(new CFException());
1917 <        f2.complete(one);
1918 <        checkCompletedWithWrappedCFException(g);
1912 >    public void testApplyToEither_exceptionalCompletion1() {
1913 >        for (ExecutionMode m : ExecutionMode.values())
1914 >        for (Integer v1 : new Integer[] { 1, null }) {
1915 >
1916 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1917 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1918 >        final IncFunction r = new IncFunction();
1919 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1920 >        final CFException ex = new CFException();
1921 >
1922 >        f.completeExceptionally(ex);
1923 >        checkCompletedWithWrappedCFException(h, ex);
1924 >        g.complete(v1);
1925 >
1926 >        assertFalse(r.ran());
1927 >        checkCompletedNormally(g, v1);
1928 >        checkCompletedWithWrappedCFException(f, ex);
1929 >        checkCompletedWithWrappedCFException(h, ex);
1930 >        }
1931 >    }
1932  
1933 <        f = new CompletableFuture<>();
1934 <        f2 = new CompletableFuture<>();
1935 <        f2.completeExceptionally(new CFException());
1936 <        g = f.applyToEither(f2, inc);
1937 <        checkCompletedWithWrappedCFException(g);
1933 >    public void testApplyToEither_exceptionalCompletion2() {
1934 >        for (ExecutionMode m : ExecutionMode.values())
1935 >        for (Integer v1 : new Integer[] { 1, null }) {
1936 >
1937 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1938 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1939 >        final IncFunction r = new IncFunction();
1940 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1941 >        final CFException ex = new CFException();
1942 >
1943 >        g.completeExceptionally(ex);
1944 >        checkCompletedWithWrappedCFException(h, ex);
1945 >        f.complete(v1);
1946 >
1947 >        assertFalse(r.ran());
1948 >        checkCompletedNormally(f, v1);
1949 >        checkCompletedWithWrappedCFException(g, ex);
1950 >        checkCompletedWithWrappedCFException(h, ex);
1951 >        }
1952 >    }
1953 >
1954 >    public void testApplyToEither_exceptionalCompletion3() {
1955 >        for (ExecutionMode m : ExecutionMode.values())
1956 >        for (Integer v1 : new Integer[] { 1, null }) {
1957 >
1958 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1959 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1960 >        final IncFunction r = new IncFunction();
1961 >        final CFException ex = new CFException();
1962 >
1963 >        g.completeExceptionally(ex);
1964 >        f.complete(v1);
1965 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1966 >
1967 >        // unspecified behavior
1968 >        Integer v;
1969 >        try {
1970 >            assertEquals(h.join(), inc(v1));
1971 >            assertTrue(r.ran());
1972 >        } catch (CompletionException ok) {
1973 >            checkCompletedWithWrappedCFException(h, ex);
1974 >            assertFalse(r.ran());
1975 >        }
1976 >
1977 >        checkCompletedWithWrappedCFException(g, ex);
1978 >        checkCompletedNormally(f, v1);
1979 >        }
1980 >    }
1981 >
1982 >    public void testApplyToEither_exceptionalCompletion4() {
1983 >        for (ExecutionMode m : ExecutionMode.values())
1984 >        for (Integer v1 : new Integer[] { 1, null }) {
1985 >
1986 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1987 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1988 >        final IncFunction r = new IncFunction();
1989 >        final CFException ex = new CFException();
1990 >
1991 >        f.completeExceptionally(ex);
1992 >        g.complete(v1);
1993 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1994 >
1995 >        // unspecified behavior
1996 >        Integer v;
1997 >        try {
1998 >            assertEquals(h.join(), inc(v1));
1999 >            assertTrue(r.ran());
2000 >        } catch (CompletionException ok) {
2001 >            checkCompletedWithWrappedCFException(h, ex);
2002 >            assertFalse(r.ran());
2003 >        }
2004 >
2005 >        checkCompletedWithWrappedCFException(f, ex);
2006 >        assertFalse(r.ran());
2007 >        checkCompletedNormally(g, v1);
2008 >        }
2009      }
2010  
2011      /**
2012       * applyToEither result completes exceptionally if action does
2013       */
2014 <    public void testApplyToEither3() {
2015 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2016 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2017 <        FailingFunction r = new FailingFunction();
2018 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
2019 <        f2.complete(two);
2020 <        checkCompletedWithWrappedCFException(g);
2014 >    public void testApplyToEither_actionFailed1() {
2015 >        for (ExecutionMode m : ExecutionMode.values())
2016 >        for (Integer v1 : new Integer[] { 1, null })
2017 >        for (Integer v2 : new Integer[] { 2, null }) {
2018 >
2019 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2020 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2021 >        final FailingFunction r = new FailingFunction();
2022 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2023 >
2024 >        f.complete(v1);
2025 >        checkCompletedWithWrappedCFException(h);
2026 >        g.complete(v2);
2027 >        checkCompletedNormally(f, v1);
2028 >        checkCompletedNormally(g, v2);
2029 >        }
2030 >    }
2031 >
2032 >    public void testApplyToEither_actionFailed2() {
2033 >        for (ExecutionMode m : ExecutionMode.values())
2034 >        for (Integer v1 : new Integer[] { 1, null })
2035 >        for (Integer v2 : new Integer[] { 2, null }) {
2036 >
2037 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2038 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2039 >        final FailingFunction r = new FailingFunction();
2040 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2041 >
2042 >        g.complete(v2);
2043 >        checkCompletedWithWrappedCFException(h);
2044 >        f.complete(v1);
2045 >        checkCompletedNormally(f, v1);
2046 >        checkCompletedNormally(g, v2);
2047 >        }
2048      }
2049  
2050      /**
2051       * applyToEither result completes exceptionally if either source cancelled
2052       */
2053 <    public void testApplyToEither4() {
2054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2055 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2056 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2057 <        assertTrue(f.cancel(true));
2058 <        checkCompletedWithWrappedCancellationException(g);
2059 <        f = new CompletableFuture<>();
2060 <        f2 = new CompletableFuture<>();
2061 <        assertTrue(f2.cancel(true));
2062 <        checkCompletedWithWrappedCancellationException(g);
2053 >    public void testApplyToEither_sourceCancelled1() {
2054 >        for (ExecutionMode m : ExecutionMode.values())
2055 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2056 >        for (Integer v1 : new Integer[] { 1, null }) {
2057 >
2058 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2059 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2060 >        final IncFunction r = new IncFunction();
2061 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2062 >
2063 >        assertTrue(f.cancel(mayInterruptIfRunning));
2064 >        checkCompletedWithWrappedCancellationException(h);
2065 >        g.complete(v1);
2066 >
2067 >        checkCancelled(f);
2068 >        assertFalse(r.ran());
2069 >        checkCompletedNormally(g, v1);
2070 >        checkCompletedWithWrappedCancellationException(h);
2071 >        }
2072 >    }
2073 >
2074 >    public void testApplyToEither_sourceCancelled2() {
2075 >        for (ExecutionMode m : ExecutionMode.values())
2076 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2077 >        for (Integer v1 : new Integer[] { 1, null }) {
2078 >
2079 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2080 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 >        final IncFunction r = new IncFunction();
2082 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2083 >
2084 >        assertTrue(g.cancel(mayInterruptIfRunning));
2085 >        checkCompletedWithWrappedCancellationException(h);
2086 >        f.complete(v1);
2087 >
2088 >        checkCancelled(g);
2089 >        assertFalse(r.ran());
2090 >        checkCompletedNormally(f, v1);
2091 >        checkCompletedWithWrappedCancellationException(h);
2092 >        }
2093 >    }
2094 >
2095 >    public void testApplyToEither_sourceCancelled3() {
2096 >        for (ExecutionMode m : ExecutionMode.values())
2097 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2098 >        for (Integer v1 : new Integer[] { 1, null }) {
2099 >
2100 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2101 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2102 >        final IncFunction r = new IncFunction();
2103 >
2104 >        assertTrue(g.cancel(mayInterruptIfRunning));
2105 >        f.complete(v1);
2106 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2107 >
2108 >        // unspecified behavior
2109 >        Integer v;
2110 >        try {
2111 >            assertEquals(h.join(), inc(v1));
2112 >            assertTrue(r.ran());
2113 >        } catch (CompletionException ok) {
2114 >            checkCompletedWithWrappedCancellationException(h);
2115 >            assertFalse(r.ran());
2116 >        }
2117 >
2118 >        checkCancelled(g);
2119 >        checkCompletedNormally(f, v1);
2120 >        }
2121 >    }
2122 >
2123 >    public void testApplyToEither_sourceCancelled4() {
2124 >        for (ExecutionMode m : ExecutionMode.values())
2125 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2126 >        for (Integer v1 : new Integer[] { 1, null }) {
2127 >
2128 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2129 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2130 >        final IncFunction r = new IncFunction();
2131 >
2132 >        assertTrue(f.cancel(mayInterruptIfRunning));
2133 >        g.complete(v1);
2134 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2135 >
2136 >        // unspecified behavior
2137 >        Integer v;
2138 >        try {
2139 >            assertEquals(h.join(), inc(v1));
2140 >            assertTrue(r.ran());
2141 >        } catch (CompletionException ok) {
2142 >            checkCompletedWithWrappedCancellationException(h);
2143 >            assertFalse(r.ran());
2144 >        }
2145 >
2146 >        checkCancelled(f);
2147 >        checkCompletedNormally(g, v1);
2148 >        }
2149      }
2150  
2151      /**
# Line 1108 | Line 2161 | public class CompletableFutureTest exten
2161          checkCompletedNormally(g, null);
2162          f2.complete(one);
2163          checkCompletedNormally(g, null);
2164 <        assertEquals(r.value, 2);
2164 >        assertEquals(r.value, (Integer) 2);
2165  
2166          r = new IncAction();
2167          f = new CompletableFuture<>();
# Line 1116 | Line 2169 | public class CompletableFutureTest exten
2169          f2 = new CompletableFuture<>();
2170          g = f.acceptEither(f2, r);
2171          checkCompletedNormally(g, null);
2172 <        assertEquals(r.value, 2);
2172 >        assertEquals(r.value, (Integer) 2);
2173      }
2174  
2175      /**
# Line 1168 | Line 2221 | public class CompletableFutureTest exten
2221          checkCompletedWithWrappedCancellationException(g);
2222      }
2223  
1171
2224      /**
2225       * runAfterEither result completes normally after normal completion
2226       * of either source
# Line 1317 | Line 2369 | public class CompletableFutureTest exten
2369          checkCompletedWithWrappedCancellationException(g);
2370      }
2371  
1320
2372      // asyncs
2373  
2374      /**
# Line 1350 | Line 2401 | public class CompletableFutureTest exten
2401          try {
2402              g.join();
2403              shouldThrow();
2404 <        } catch (Exception ok) {
1354 <        }
2404 >        } catch (CompletionException success) {}
2405          checkCompletedWithWrappedCFException(g);
2406      }
2407  
# Line 1429 | Line 2479 | public class CompletableFutureTest exten
2479          CompletableFuture<Void> g = f.thenAcceptAsync(r);
2480          f.complete(one);
2481          checkCompletedNormally(g, null);
2482 <        assertEquals(r.value, 2);
2482 >        assertEquals(r.value, (Integer) 2);
2483      }
2484  
2485      /**
# Line 1467 | Line 2517 | public class CompletableFutureTest exten
2517      }
2518  
2519      /**
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    /**
2520       * acceptEitherAsync result completes normally after normal
2521       * completion of sources
2522       */
# Line 1870 | Line 2527 | public class CompletableFutureTest exten
2527          CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2528          f.complete(one);
2529          checkCompletedNormally(g, null);
2530 <        assertEquals(r.value, 2);
2530 >        assertEquals(r.value, (Integer) 2);
2531  
2532          r = new IncAction();
2533          f = new CompletableFuture<>();
# Line 1878 | Line 2535 | public class CompletableFutureTest exten
2535          f2 = new CompletableFuture<>();
2536          g = f.acceptEitherAsync(f2, r);
2537          checkCompletedNormally(g, null);
2538 <        assertEquals(r.value, 2);
2538 >        assertEquals(r.value, (Integer) 2);
2539      }
2540  
2541      /**
# Line 2085 | Line 2742 | public class CompletableFutureTest exten
2742          checkCompletedWithWrappedCancellationException(g);
2743      }
2744  
2088
2745      // async with explicit executors
2746  
2747      /**
# Line 2118 | Line 2774 | public class CompletableFutureTest exten
2774          try {
2775              g.join();
2776              shouldThrow();
2777 <        } catch (Exception ok) {
2122 <        }
2777 >        } catch (CompletionException success) {}
2778          checkCompletedWithWrappedCFException(g);
2779      }
2780  
# Line 2197 | Line 2852 | public class CompletableFutureTest exten
2852          CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2853          f.complete(one);
2854          checkCompletedNormally(g, null);
2855 <        assertEquals(r.value, 2);
2855 >        assertEquals(r.value, (Integer) 2);
2856      }
2857  
2858      /**
# Line 2235 | Line 2890 | public class CompletableFutureTest exten
2890      }
2891  
2892      /**
2238     * thenCombineAsync result completes normally after normal
2239     * completion of sources
2240     */
2241    public void testThenCombineAsyncE() {
2242        CompletableFuture<Integer> f, g, h;
2243        ThreadExecutor e = new ThreadExecutor();
2244        int count = 0;
2245
2246        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());
2271    }
2272
2273    /**
2274     * thenCombineAsync result completes exceptionally after exceptional
2275     * completion of either source
2276     */
2277    public void testThenCombineAsync2E() {
2278        CompletableFuture<Integer> f, g, h;
2279        ThreadExecutor e = new ThreadExecutor();
2280        int count = 0;
2281
2282        f = new CompletableFuture<>();
2283        g = new CompletableFuture<>();
2284        h = f.thenCombineAsync(g, subtract, e);
2285        f.completeExceptionally(new CFException());
2286        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());
2307    }
2308
2309    /**
2310     * thenCombineAsync result completes exceptionally if action does
2311     */
2312    public void testThenCombineAsync3E() {
2313        CompletableFuture<Integer> f = new CompletableFuture<>();
2314        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2315        FailingBiFunction r = new FailingBiFunction();
2316        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2317        f.complete(one);
2318        checkIncomplete(g);
2319        assertFalse(r.ran);
2320        f2.complete(two);
2321        checkCompletedWithWrappedCFException(g);
2322        assertTrue(r.ran);
2323    }
2324
2325    /**
2326     * thenCombineAsync result completes exceptionally if either source cancelled
2327     */
2328    public void testThenCombineAsync4E() {
2329        CompletableFuture<Integer> f, g, h;
2330        ThreadExecutor e = new ThreadExecutor();
2331
2332        f = new CompletableFuture<>();
2333        g = new CompletableFuture<>();
2334        h = f.thenCombineAsync(g, subtract, e);
2335        assertTrue(f.cancel(true));
2336        checkIncomplete(h);
2337        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);
2355
2356        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);
2362
2363        assertEquals(0, e.count.get());
2364    }
2365
2366    /**
2367     * thenAcceptBothAsync result completes normally after normal
2368     * completion of sources
2369     */
2370    public void testThenAcceptBothAsyncE() {
2371        CompletableFuture<Integer> f, g;
2372        CompletableFuture<Void> h;
2373        SubtractAction r;
2374        ThreadExecutor e = new ThreadExecutor();
2375
2376        f = new CompletableFuture<>();
2377        g = new CompletableFuture<>();
2378        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2379        f.complete(3);
2380        checkIncomplete(h);
2381        g.complete(1);
2382        checkCompletedNormally(h, null);
2383        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());
2403    }
2404
2405    /**
2406     * thenAcceptBothAsync result completes exceptionally after exceptional
2407     * completion of source
2408     */
2409    public void testThenAcceptBothAsync2E() {
2410        CompletableFuture<Integer> f, g;
2411        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());
2446    }
2447
2448    /**
2449     * thenAcceptBothAsync result completes exceptionally if action does
2450     */
2451    public void testThenAcceptBothAsync3E() {
2452        CompletableFuture<Integer> f, g;
2453        CompletableFuture<Void> h;
2454        FailingBiConsumer r;
2455        ThreadExecutor e = new ThreadExecutor();
2456
2457        f = new CompletableFuture<>();
2458        g = new CompletableFuture<>();
2459        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2460        f.complete(3);
2461        checkIncomplete(h);
2462        g.complete(1);
2463        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());
2473    }
2474
2475    /**
2476     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2477     */
2478    public void testThenAcceptBothAsync4E() {
2479        CompletableFuture<Integer> f, g;
2480        CompletableFuture<Void> h;
2481        SubtractAction r;
2482        ThreadExecutor e = new ThreadExecutor();
2483
2484        f = new CompletableFuture<>();
2485        g = new CompletableFuture<>();
2486        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2487        assertTrue(f.cancel(true));
2488        checkIncomplete(h);
2489        g.complete(1);
2490        checkCompletedWithWrappedCancellationException(h);
2491
2492        f = new CompletableFuture<>();
2493        g = new CompletableFuture<>();
2494        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2495        assertTrue(g.cancel(true));
2496        checkIncomplete(h);
2497        f.complete(3);
2498        checkCompletedWithWrappedCancellationException(h);
2499
2500        f = new CompletableFuture<>();
2501        g = new CompletableFuture<>();
2502        f.complete(3);
2503        assertTrue(g.cancel(true));
2504        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2505        checkCompletedWithWrappedCancellationException(h);
2506
2507        f = new CompletableFuture<>();
2508        g = new CompletableFuture<>();
2509        assertTrue(f.cancel(true));
2510        g.complete(3);
2511        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2512        checkCompletedWithWrappedCancellationException(h);
2513
2514        assertEquals(0, e.count.get());
2515    }
2516
2517    /**
2518     * runAfterBothAsync result completes normally after normal
2519     * completion of sources
2520     */
2521    public void testRunAfterBothAsyncE() {
2522        CompletableFuture<Integer> f = new CompletableFuture<>();
2523        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);
2531    }
2532
2533    /**
2534     * runAfterBothAsync result completes exceptionally after exceptional
2535     * completion of source
2536     */
2537    public void testRunAfterBothAsync2E() {
2538        CompletableFuture<Integer> f = new CompletableFuture<>();
2539        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2540        Noop r = new Noop();
2541        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2542        f.completeExceptionally(new CFException());
2543        f2.complete(two);
2544        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);
2553    }
2554
2555    /**
2556     * runAfterBothAsync result completes exceptionally if action does
2557     */
2558    public void testRunAfterBothAsync3E() {
2559        CompletableFuture<Integer> f = new CompletableFuture<>();
2560        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2561        FailingNoop r = new FailingNoop();
2562        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2563        f.complete(one);
2564        checkIncomplete(g);
2565        f2.complete(two);
2566        checkCompletedWithWrappedCFException(g);
2567    }
2568
2569    /**
2570     * runAfterBothAsync result completes exceptionally if either source cancelled
2571     */
2572    public void testRunAfterBothAsync4E() {
2573        CompletableFuture<Integer> f = new CompletableFuture<>();
2574        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2575        Noop r = new Noop();
2576        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2577        assertTrue(f.cancel(true));
2578        f2.complete(two);
2579        checkCompletedWithWrappedCancellationException(g);
2580
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);
2588    }
2589
2590    /**
2591     * applyToEitherAsync result completes normally after normal
2592     * completion of sources
2593     */
2594    public void testApplyToEitherAsyncE() {
2595        CompletableFuture<Integer> f = new CompletableFuture<>();
2596        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2597        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2598        f.complete(one);
2599        checkCompletedNormally(g, two);
2600
2601        f = new CompletableFuture<>();
2602        f.complete(one);
2603        f2 = new CompletableFuture<>();
2604        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2605        checkCompletedNormally(g, two);
2606    }
2607
2608    /**
2609     * applyToEitherAsync result completes exceptionally after exceptional
2610     * completion of source
2611     */
2612    public void testApplyToEitherAsync2E() {
2613        CompletableFuture<Integer> f = new CompletableFuture<>();
2614        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2615        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2616        f.completeExceptionally(new CFException());
2617        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);
2624        checkCompletedWithWrappedCFException(g);
2625    }
2626
2627    /**
2628     * applyToEitherAsync result completes exceptionally if action does
2629     */
2630    public void testApplyToEitherAsync3E() {
2631        CompletableFuture<Integer> f = new CompletableFuture<>();
2632        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2633        FailingFunction r = new FailingFunction();
2634        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2635        f.complete(one);
2636        checkCompletedWithWrappedCFException(g);
2637    }
2638
2639    /**
2640     * applyToEitherAsync result completes exceptionally if either source cancelled
2641     */
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    /**
2893       * acceptEitherAsync result completes normally after normal
2894       * completion of sources
2895       */
# Line 2664 | Line 2900 | public class CompletableFutureTest exten
2900          CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2901          f.complete(one);
2902          checkCompletedNormally(g, null);
2903 <        assertEquals(r.value, 2);
2903 >        assertEquals(r.value, (Integer) 2);
2904  
2905          r = new IncAction();
2906          f = new CompletableFuture<>();
# Line 2672 | Line 2908 | public class CompletableFutureTest exten
2908          f2 = new CompletableFuture<>();
2909          g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2910          checkCompletedNormally(g, null);
2911 <        assertEquals(r.value, 2);
2911 >        assertEquals(r.value, (Integer) 2);
2912      }
2913  
2914      /**
# Line 2856 | Line 3092 | public class CompletableFutureTest exten
3092       * with the value null
3093       */
3094      public void testAllOf_empty() throws Exception {
3095 <        CompletableFuture<?> f = CompletableFuture.allOf();
3095 >        CompletableFuture<Void> f = CompletableFuture.allOf();
3096          checkCompletedNormally(f, null);
3097      }
3098  
3099      /**
3100 <     * allOf returns a future completed when all components complete
3100 >     * allOf returns a future completed normally with the value null
3101 >     * when all components complete normally
3102       */
3103 <    public void testAllOf() throws Exception {
3103 >    public void testAllOf_normal() throws Exception {
3104          for (int k = 1; k < 20; ++k) {
3105              CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3106              for (int i = 0; i < k; ++i)
# Line 2871 | Line 3108 | public class CompletableFutureTest exten
3108              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3109              for (int i = 0; i < k; ++i) {
3110                  checkIncomplete(f);
3111 +                checkIncomplete(CompletableFuture.allOf(fs));
3112                  fs[i].complete(one);
3113              }
3114              checkCompletedNormally(f, null);
3115 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3116          }
3117      }
3118  
# Line 2881 | Line 3120 | public class CompletableFutureTest exten
3120       * anyOf(no component futures) returns an incomplete future
3121       */
3122      public void testAnyOf_empty() throws Exception {
3123 <        CompletableFuture<?> f = CompletableFuture.anyOf();
3123 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3124          checkIncomplete(f);
3125      }
3126  
3127      /**
3128 <     * anyOf returns a future completed when any components complete
3128 >     * anyOf returns a future completed normally with a value when
3129 >     * a component future does
3130       */
3131 <    public void testAnyOf() throws Exception {
3132 <        for (int k = 1; k < 20; ++k) {
3131 >    public void testAnyOf_normal() throws Exception {
3132 >        for (int k = 0; k < 10; ++k) {
3133              CompletableFuture[] fs = new CompletableFuture[k];
3134              for (int i = 0; i < k; ++i)
3135                  fs[i] = new CompletableFuture<>();
# Line 2898 | Line 3138 | public class CompletableFutureTest exten
3138              for (int i = 0; i < k; ++i) {
3139                  fs[i].complete(one);
3140                  checkCompletedNormally(f, one);
3141 +                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3142 +            }
3143 +        }
3144 +    }
3145 +
3146 +    /**
3147 +     * anyOf result completes exceptionally when any component does.
3148 +     */
3149 +    public void testAnyOf_exceptional() throws Exception {
3150 +        for (int k = 0; k < 10; ++k) {
3151 +            CompletableFuture[] fs = new CompletableFuture[k];
3152 +            for (int i = 0; i < k; ++i)
3153 +                fs[i] = new CompletableFuture<>();
3154 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3155 +            checkIncomplete(f);
3156 +            for (int i = 0; i < k; ++i) {
3157 +                fs[i].completeExceptionally(new CFException());
3158 +                checkCompletedWithWrappedCFException(f);
3159 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3160              }
3161          }
3162      }
# Line 2913 | Line 3172 | public class CompletableFutureTest exten
3172          ThreadExecutor exec = new ThreadExecutor();
3173  
3174          Runnable[] throwingActions = {
3175 <            () -> { CompletableFuture.supplyAsync(null); },
3176 <            () -> { CompletableFuture.supplyAsync(null, exec); },
3177 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
3178 <
3179 <            () -> { CompletableFuture.runAsync(null); },
3180 <            () -> { CompletableFuture.runAsync(null, exec); },
3181 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
3182 <
3183 <            () -> { f.completeExceptionally(null); },
3184 <
3185 <            () -> { f.thenApply(null); },
3186 <            () -> { f.thenApplyAsync(null); },
3187 <            () -> { f.thenApplyAsync((x) -> x, null); },
3188 <            () -> { f.thenApplyAsync(null, exec); },
3189 <
3190 <            () -> { f.thenAccept(null); },
3191 <            () -> { f.thenAcceptAsync(null); },
3192 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
3193 <            () -> { f.thenAcceptAsync(null, exec); },
3194 <
3195 <            () -> { f.thenRun(null); },
3196 <            () -> { f.thenRunAsync(null); },
3197 <            () -> { f.thenRunAsync(() -> { ; }, null); },
3198 <            () -> { f.thenRunAsync(null, exec); },
3199 <
3200 <            () -> { f.thenCombine(g, null); },
3201 <            () -> { f.thenCombineAsync(g, null); },
3202 <            () -> { f.thenCombineAsync(g, null, exec); },
3203 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
3204 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
3205 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
3206 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
3207 <
3208 <            () -> { f.thenAcceptBoth(g, null); },
3209 <            () -> { f.thenAcceptBothAsync(g, null); },
3210 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
3211 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
3212 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
3213 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
3214 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
3215 <
3216 <            () -> { f.runAfterBoth(g, null); },
3217 <            () -> { f.runAfterBothAsync(g, null); },
3218 <            () -> { f.runAfterBothAsync(g, null, exec); },
3219 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
3220 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
3221 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
3222 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
3223 <
3224 <            () -> { f.applyToEither(g, null); },
3225 <            () -> { f.applyToEitherAsync(g, null); },
3226 <            () -> { f.applyToEitherAsync(g, null, exec); },
3227 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
3228 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
3229 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
3230 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
3231 <
3232 <            () -> { f.acceptEither(g, null); },
3233 <            () -> { f.acceptEitherAsync(g, null); },
3234 <            () -> { f.acceptEitherAsync(g, null, exec); },
3235 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
3236 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
3237 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
3238 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
3239 <
3240 <            () -> { f.runAfterEither(g, null); },
3241 <            () -> { f.runAfterEitherAsync(g, null); },
3242 <            () -> { f.runAfterEitherAsync(g, null, exec); },
3243 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
3244 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
3245 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
3246 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
3247 <
3248 <            () -> { f.thenCompose(null); },
3249 <            () -> { f.thenComposeAsync(null); },
3250 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
3251 <            () -> { f.thenComposeAsync(null, exec); },
3252 <
3253 <            () -> { f.exceptionally(null); },
3254 <
3255 <            () -> { f.handle(null); },
3256 <
3257 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
3258 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3259 <            () -> { CompletableFuture.allOf(f, null); },
3260 <            () -> { CompletableFuture.allOf(null, f); },
3261 <
3262 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3263 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3264 <            () -> { CompletableFuture.anyOf(f, null); },
3265 <            () -> { CompletableFuture.anyOf(null, f); },
3175 >            () -> CompletableFuture.supplyAsync(null),
3176 >            () -> CompletableFuture.supplyAsync(null, exec),
3177 >            () -> CompletableFuture.supplyAsync(supplyOne, null),
3178 >
3179 >            () -> CompletableFuture.runAsync(null),
3180 >            () -> CompletableFuture.runAsync(null, exec),
3181 >            () -> CompletableFuture.runAsync(() -> {}, null),
3182 >
3183 >            () -> f.completeExceptionally(null),
3184 >
3185 >            () -> f.thenApply(null),
3186 >            () -> f.thenApplyAsync(null),
3187 >            () -> f.thenApplyAsync((x) -> x, null),
3188 >            () -> f.thenApplyAsync(null, exec),
3189 >
3190 >            () -> f.thenAccept(null),
3191 >            () -> f.thenAcceptAsync(null),
3192 >            () -> f.thenAcceptAsync((x) -> {} , null),
3193 >            () -> f.thenAcceptAsync(null, exec),
3194 >
3195 >            () -> f.thenRun(null),
3196 >            () -> f.thenRunAsync(null),
3197 >            () -> f.thenRunAsync(() -> {} , null),
3198 >            () -> f.thenRunAsync(null, exec),
3199 >
3200 >            () -> f.thenCombine(g, null),
3201 >            () -> f.thenCombineAsync(g, null),
3202 >            () -> f.thenCombineAsync(g, null, exec),
3203 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3204 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3205 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3206 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3207 >
3208 >            () -> f.thenAcceptBoth(g, null),
3209 >            () -> f.thenAcceptBothAsync(g, null),
3210 >            () -> f.thenAcceptBothAsync(g, null, exec),
3211 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3212 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3213 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3214 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3215 >
3216 >            () -> f.runAfterBoth(g, null),
3217 >            () -> f.runAfterBothAsync(g, null),
3218 >            () -> f.runAfterBothAsync(g, null, exec),
3219 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3220 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3221 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3222 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3223 >
3224 >            () -> f.applyToEither(g, null),
3225 >            () -> f.applyToEitherAsync(g, null),
3226 >            () -> f.applyToEitherAsync(g, null, exec),
3227 >            () -> f.applyToEither(nullFuture, (x) -> x),
3228 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3229 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3230 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3231 >
3232 >            () -> f.acceptEither(g, null),
3233 >            () -> f.acceptEitherAsync(g, null),
3234 >            () -> f.acceptEitherAsync(g, null, exec),
3235 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3236 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3237 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3238 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3239 >
3240 >            () -> f.runAfterEither(g, null),
3241 >            () -> f.runAfterEitherAsync(g, null),
3242 >            () -> f.runAfterEitherAsync(g, null, exec),
3243 >            () -> f.runAfterEither(nullFuture, () -> {}),
3244 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3245 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3246 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3247 >
3248 >            () -> f.thenCompose(null),
3249 >            () -> f.thenComposeAsync(null),
3250 >            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3251 >            () -> f.thenComposeAsync(null, exec),
3252 >
3253 >            () -> f.exceptionally(null),
3254 >
3255 >            () -> f.handle(null),
3256 >
3257 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3258 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3259 >            () -> CompletableFuture.allOf(f, null),
3260 >            () -> CompletableFuture.allOf(null, f),
3261 >
3262 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3263 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3264 >            () -> CompletableFuture.anyOf(f, null),
3265 >            () -> CompletableFuture.anyOf(null, f),
3266 >
3267 >            () -> f.obtrudeException(null),
3268          };
3269  
3270          assertThrows(NullPointerException.class, throwingActions);
3271          assertEquals(0, exec.count.get());
3272      }
3273  
3274 +    /**
3275 +     * toCompletableFuture returns this CompletableFuture.
3276 +     */
3277 +    public void testToCompletableFuture() {
3278 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3279 +        assertSame(f, f.toCompletableFuture());
3280 +    }
3281 +
3282 +    /**
3283 +     * whenComplete action executes on normal completion, propagating
3284 +     * source result.
3285 +     */
3286 +    public void testWhenComplete1() {
3287 +        final AtomicInteger a = new AtomicInteger();
3288 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3289 +        CompletableFuture<Integer> g =
3290 +            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3291 +        f.complete(three);
3292 +        checkCompletedNormally(f, three);
3293 +        checkCompletedNormally(g, three);
3294 +        assertEquals(a.get(), 1);
3295 +    }
3296 +
3297 +    /**
3298 +     * whenComplete action executes on exceptional completion, propagating
3299 +     * source result.
3300 +     */
3301 +    public void testWhenComplete2() {
3302 +        final AtomicInteger a = new AtomicInteger();
3303 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3304 +        CompletableFuture<Integer> g =
3305 +            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3306 +        f.completeExceptionally(new CFException());
3307 +        assertTrue(f.isCompletedExceptionally());
3308 +        assertTrue(g.isCompletedExceptionally());
3309 +        assertEquals(a.get(), 1);
3310 +    }
3311 +
3312 +    /**
3313 +     * If a whenComplete action throws an exception when triggered by
3314 +     * a normal completion, it completes exceptionally
3315 +     */
3316 +    public void testWhenComplete3() {
3317 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3318 +        CompletableFuture<Integer> g =
3319 +            f.whenComplete((Integer x, Throwable t) ->
3320 +                           { throw new CFException(); } );
3321 +        f.complete(three);
3322 +        checkCompletedNormally(f, three);
3323 +        assertTrue(g.isCompletedExceptionally());
3324 +        checkCompletedWithWrappedCFException(g);
3325 +    }
3326 +
3327 +    /**
3328 +     * whenCompleteAsync action executes on normal completion, propagating
3329 +     * source result.
3330 +     */
3331 +    public void testWhenCompleteAsync1() {
3332 +        final AtomicInteger a = new AtomicInteger();
3333 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3334 +        CompletableFuture<Integer> g =
3335 +            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3336 +        f.complete(three);
3337 +        checkCompletedNormally(f, three);
3338 +        checkCompletedNormally(g, three);
3339 +        assertEquals(a.get(), 1);
3340 +    }
3341 +
3342 +    /**
3343 +     * whenCompleteAsync action executes on exceptional completion, propagating
3344 +     * source result.
3345 +     */
3346 +    public void testWhenCompleteAsync2() {
3347 +        final AtomicInteger a = new AtomicInteger();
3348 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3349 +        CompletableFuture<Integer> g =
3350 +            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3351 +        f.completeExceptionally(new CFException());
3352 +        checkCompletedWithWrappedCFException(f);
3353 +        checkCompletedWithWrappedCFException(g);
3354 +    }
3355 +
3356 +    /**
3357 +     * If a whenCompleteAsync action throws an exception when
3358 +     * triggered by a normal completion, it completes exceptionally
3359 +     */
3360 +    public void testWhenCompleteAsync3() {
3361 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3362 +        CompletableFuture<Integer> g =
3363 +            f.whenCompleteAsync((Integer x, Throwable t) ->
3364 +                           { throw new CFException(); } );
3365 +        f.complete(three);
3366 +        checkCompletedNormally(f, three);
3367 +        checkCompletedWithWrappedCFException(g);
3368 +    }
3369 +
3370 +    /**
3371 +     * whenCompleteAsync action executes on normal completion, propagating
3372 +     * source result.
3373 +     */
3374 +    public void testWhenCompleteAsync1e() {
3375 +        final AtomicInteger a = new AtomicInteger();
3376 +        ThreadExecutor exec = new ThreadExecutor();
3377 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3378 +        CompletableFuture<Integer> g =
3379 +            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3380 +                                exec);
3381 +        f.complete(three);
3382 +        checkCompletedNormally(f, three);
3383 +        checkCompletedNormally(g, three);
3384 +        assertEquals(a.get(), 1);
3385 +    }
3386 +
3387 +    /**
3388 +     * whenCompleteAsync action executes on exceptional completion, propagating
3389 +     * source result.
3390 +     */
3391 +    public void testWhenCompleteAsync2e() {
3392 +        final AtomicInteger a = new AtomicInteger();
3393 +        ThreadExecutor exec = new ThreadExecutor();
3394 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3395 +        CompletableFuture<Integer> g =
3396 +            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3397 +                                exec);
3398 +        f.completeExceptionally(new CFException());
3399 +        checkCompletedWithWrappedCFException(f);
3400 +        checkCompletedWithWrappedCFException(g);
3401 +    }
3402 +
3403 +    /**
3404 +     * If a whenCompleteAsync action throws an exception when triggered
3405 +     * by a normal completion, it completes exceptionally
3406 +     */
3407 +    public void testWhenCompleteAsync3e() {
3408 +        ThreadExecutor exec = new ThreadExecutor();
3409 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3410 +        CompletableFuture<Integer> g =
3411 +            f.whenCompleteAsync((Integer x, Throwable t) ->
3412 +                                { throw new CFException(); },
3413 +                                exec);
3414 +        f.complete(three);
3415 +        checkCompletedNormally(f, three);
3416 +        checkCompletedWithWrappedCFException(g);
3417 +    }
3418 +
3419 +    /**
3420 +     * handleAsync action completes normally with function value on
3421 +     * either normal or exceptional completion of source
3422 +     */
3423 +    public void testHandleAsync() {
3424 +        CompletableFuture<Integer> f, g;
3425 +        IntegerHandler r;
3426 +
3427 +        f = new CompletableFuture<>();
3428 +        g = f.handleAsync(r = new IntegerHandler());
3429 +        assertFalse(r.ran);
3430 +        f.completeExceptionally(new CFException());
3431 +        checkCompletedWithWrappedCFException(f);
3432 +        checkCompletedNormally(g, three);
3433 +        assertTrue(r.ran);
3434 +
3435 +        f = new CompletableFuture<>();
3436 +        g = f.handleAsync(r = new IntegerHandler());
3437 +        assertFalse(r.ran);
3438 +        f.completeExceptionally(new CFException());
3439 +        checkCompletedWithWrappedCFException(f);
3440 +        checkCompletedNormally(g, three);
3441 +        assertTrue(r.ran);
3442 +
3443 +        f = new CompletableFuture<>();
3444 +        g = f.handleAsync(r = new IntegerHandler());
3445 +        assertFalse(r.ran);
3446 +        f.complete(one);
3447 +        checkCompletedNormally(f, one);
3448 +        checkCompletedNormally(g, two);
3449 +        assertTrue(r.ran);
3450 +
3451 +        f = new CompletableFuture<>();
3452 +        g = f.handleAsync(r = new IntegerHandler());
3453 +        assertFalse(r.ran);
3454 +        f.complete(one);
3455 +        checkCompletedNormally(f, one);
3456 +        checkCompletedNormally(g, two);
3457 +        assertTrue(r.ran);
3458 +    }
3459 +
3460 +    /**
3461 +     * handleAsync action with Executor completes normally with
3462 +     * function value on either normal or exceptional completion of
3463 +     * source
3464 +     */
3465 +    public void testHandleAsync2() {
3466 +        CompletableFuture<Integer> f, g;
3467 +        ThreadExecutor exec = new ThreadExecutor();
3468 +        IntegerHandler r;
3469 +
3470 +        f = new CompletableFuture<>();
3471 +        g = f.handleAsync(r = new IntegerHandler(), exec);
3472 +        assertFalse(r.ran);
3473 +        f.completeExceptionally(new CFException());
3474 +        checkCompletedWithWrappedCFException(f);
3475 +        checkCompletedNormally(g, three);
3476 +        assertTrue(r.ran);
3477 +
3478 +        f = new CompletableFuture<>();
3479 +        g = f.handleAsync(r = new IntegerHandler(), exec);
3480 +        assertFalse(r.ran);
3481 +        f.completeExceptionally(new CFException());
3482 +        checkCompletedWithWrappedCFException(f);
3483 +        checkCompletedNormally(g, three);
3484 +        assertTrue(r.ran);
3485 +
3486 +        f = new CompletableFuture<>();
3487 +        g = f.handleAsync(r = new IntegerHandler(), exec);
3488 +        assertFalse(r.ran);
3489 +        f.complete(one);
3490 +        checkCompletedNormally(f, one);
3491 +        checkCompletedNormally(g, two);
3492 +        assertTrue(r.ran);
3493 +
3494 +        f = new CompletableFuture<>();
3495 +        g = f.handleAsync(r = new IntegerHandler(), exec);
3496 +        assertFalse(r.ran);
3497 +        f.complete(one);
3498 +        checkCompletedNormally(f, one);
3499 +        checkCompletedNormally(g, two);
3500 +        assertTrue(r.ran);
3501 +    }
3502 +
3503   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines