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.28 by jsr166, Sun Jul 14 16:34:49 2013 UTC vs.
Revision 1.36 by jsr166, Sun Jun 1 23:12:45 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 102 | 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 286 | Line 318 | public class CompletableFutureTest exten
318  
319      // Choose non-commutative actions for better coverage
320  
321 +    // A non-commutative function that handles null values as well
322 +    public static int subtract(Integer x, Integer y) {
323 +        return ((x == null) ? 42 : x.intValue())
324 +            - ((y == null) ? 99 : y.intValue());
325 +    }
326 +
327      static final Supplier<Integer> supplyOne =
328          () -> Integer.valueOf(1);
329      static final Function<Integer, Integer> inc =
330          (Integer x) -> Integer.valueOf(x.intValue() + 1);
331      static final BiFunction<Integer, Integer, Integer> subtract =
332 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
332 >        (Integer x, Integer y) -> subtract(x, y);
333      static final class IncAction implements Consumer<Integer> {
334          int value;
335          public void accept(Integer x) { value = x.intValue() + 1; }
336      }
337      static final class SubtractAction implements BiConsumer<Integer, Integer> {
338 +        volatile int invocationCount = 0;
339          int value;
340 +        // Check this action was invoked exactly once when result is computed.
341 +        public boolean ran() { return invocationCount == 1; }
342          public void accept(Integer x, Integer y) {
343 <            value = x.intValue() - y.intValue();
343 >            invocationCount++;
344 >            value = subtract(x, y);
345 >        }
346 >    }
347 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
348 >        volatile int invocationCount = 0;
349 >        int value;
350 >        // Check this action was invoked exactly once when result is computed.
351 >        public boolean ran() { return invocationCount == 1; }
352 >        public Integer apply(Integer x, Integer y) {
353 >            invocationCount++;
354 >            return subtract(x, y);
355          }
356      }
357      static final class Noop implements Runnable {
# Line 374 | Line 426 | public class CompletableFutureTest exten
426      }
427  
428      /**
429 +     * Permits the testing of parallel code for the 3 different
430 +     * execution modes without repeating all the testing code.
431 +     */
432 +    enum ExecutionMode {
433 +        DEFAULT {
434 +            public <T,U> CompletableFuture<Void> runAfterBoth
435 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
436 +                return f.runAfterBoth(g, a);
437 +            }
438 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
439 +                (CompletableFuture<T> f,
440 +                 CompletionStage<? extends U> g,
441 +                 BiConsumer<? super T,? super U> a) {
442 +                return f.thenAcceptBoth(g, a);
443 +            }
444 +            public <T,U,V> CompletableFuture<V> thenCombine
445 +                (CompletableFuture<T> f,
446 +                 CompletionStage<? extends U> g,
447 +                 BiFunction<? super T,? super U,? extends V> a) {
448 +                return f.thenCombine(g, a);
449 +            }
450 +        },
451 +
452 + //             /** Experimental way to do more testing */
453 + //         REVERSE_DEFAULT {
454 + //             public <T,U> CompletableFuture<Void> runAfterBoth
455 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
456 + //                 return g.runAfterBoth(f, 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 DEFAULT.thenAcceptBoth(f, g, a);
463 + //             }
464 + //         },
465 +
466 +        DEFAULT_ASYNC {
467 +            public <T,U> CompletableFuture<Void> runAfterBoth
468 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
469 +                return f.runAfterBothAsync(g, a);
470 +            }
471 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
472 +                (CompletableFuture<T> f,
473 +                 CompletionStage<? extends U> g,
474 +                 BiConsumer<? super T,? super U> a) {
475 +                return f.thenAcceptBothAsync(g, a);
476 +            }
477 +            public <T,U,V> CompletableFuture<V> thenCombine
478 +                (CompletableFuture<T> f,
479 +                 CompletionStage<? extends U> g,
480 +                 BiFunction<? super T,? super U,? extends V> a) {
481 +                return f.thenCombineAsync(g, a);
482 +            }
483 +        },
484 +
485 + //         REVERSE_DEFAULT_ASYNC {
486 + //             public <T,U> CompletableFuture<Void> runAfterBoth
487 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
488 + //                 return f.runAfterBothAsync(g, a);
489 + //             }
490 + //             public <T,U> CompletableFuture<Void> thenAcceptBoth
491 + //                 (CompletableFuture<T> f,
492 + //                  CompletionStage<? extends U> g,
493 + //                  BiConsumer<? super T,? super U> a) {
494 + //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
495 + //             }
496 + //         },
497 +
498 +        EXECUTOR {
499 +            public <T,U> CompletableFuture<Void> runAfterBoth
500 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
501 +                return f.runAfterBothAsync(g, a, new ThreadExecutor());
502 +            }
503 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
504 +                (CompletableFuture<T> f,
505 +                 CompletionStage<? extends U> g,
506 +                 BiConsumer<? super T,? super U> a) {
507 +                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
508 +            }
509 +            public <T,U,V> CompletableFuture<V> thenCombine
510 +                (CompletableFuture<T> f,
511 +                 CompletionStage<? extends U> g,
512 +                 BiFunction<? super T,? super U,? extends V> a) {
513 +                return f.thenCombineAsync(g, a, new ThreadExecutor());
514 +            }
515 +        };
516 +
517 +        public abstract <T,U> CompletableFuture<Void> runAfterBoth
518 +            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
519 +        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
520 +            (CompletableFuture<T> f,
521 +             CompletionStage<? extends U> g,
522 +             BiConsumer<? super T,? super U> a);
523 +        public abstract <T,U,V> CompletableFuture<V> thenCombine
524 +            (CompletableFuture<T> f,
525 +             CompletionStage<? extends U> g,
526 +             BiFunction<? super T,? super U,? extends V> a);
527 +    }
528 +
529 +    /**
530       * exceptionally action completes with function value on source
531 <     * exception;  otherwise with source value
531 >     * exception; otherwise with source value
532       */
533      public void testExceptionally() {
534          CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 665 | Line 818 | public class CompletableFutureTest exten
818       * thenCombine result completes normally after normal completion
819       * of sources
820       */
821 <    public void testThenCombine() {
822 <        CompletableFuture<Integer> f, g, h;
821 >    public void testThenCombine_normalCompletion1() {
822 >        for (ExecutionMode m : ExecutionMode.values())
823 >        for (Integer v1 : new Integer[] { 1, null })
824 >        for (Integer v2 : new Integer[] { 2, null }) {
825 >
826 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
827 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
828 >        final SubtractFunction r = new SubtractFunction();
829 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
830 >
831 >        f.complete(v1);
832 >        checkIncomplete(h);
833 >        assertFalse(r.ran());
834 >        g.complete(v2);
835 >
836 >        checkCompletedNormally(h, subtract(v1, v2));
837 >        checkCompletedNormally(f, v1);
838 >        checkCompletedNormally(g, v2);
839 >        }
840 >    }
841  
842 <        f = new CompletableFuture<>();
843 <        g = new CompletableFuture<>();
844 <        h = f.thenCombine(g, subtract);
845 <        f.complete(3);
846 <        checkIncomplete(h);
847 <        g.complete(1);
848 <        checkCompletedNormally(h, 2);
842 >    public void testThenCombine_normalCompletion2() {
843 >        for (ExecutionMode m : ExecutionMode.values())
844 >        for (Integer v1 : new Integer[] { 1, null })
845 >        for (Integer v2 : new Integer[] { 2, null }) {
846 >
847 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
848 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
849 >        final SubtractFunction r = new SubtractFunction();
850 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
851 >
852 >        g.complete(v2);
853 >        checkIncomplete(h);
854 >        assertFalse(r.ran());
855 >        f.complete(v1);
856 >
857 >        checkCompletedNormally(h, subtract(v1, v2));
858 >        checkCompletedNormally(f, v1);
859 >        checkCompletedNormally(g, v2);
860 >        }
861 >    }
862  
863 <        f = new CompletableFuture<>();
864 <        g = new CompletableFuture<>();
865 <        h = f.thenCombine(g, subtract);
866 <        g.complete(1);
867 <        checkIncomplete(h);
868 <        f.complete(3);
869 <        checkCompletedNormally(h, 2);
863 >    public void testThenCombine_normalCompletion3() {
864 >        for (ExecutionMode m : ExecutionMode.values())
865 >        for (Integer v1 : new Integer[] { 1, null })
866 >        for (Integer v2 : new Integer[] { 2, null }) {
867 >
868 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
869 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
870 >        final SubtractFunction r = new SubtractFunction();
871 >
872 >        g.complete(v2);
873 >        f.complete(v1);
874 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
875 >
876 >        checkCompletedNormally(h, subtract(v1, v2));
877 >        checkCompletedNormally(f, v1);
878 >        checkCompletedNormally(g, v2);
879 >        }
880 >    }
881  
882 <        f = new CompletableFuture<>();
883 <        g = new CompletableFuture<>();
884 <        g.complete(1);
885 <        f.complete(3);
886 <        h = f.thenCombine(g, subtract);
887 <        checkCompletedNormally(h, 2);
882 >    public void testThenCombine_normalCompletion4() {
883 >        for (ExecutionMode m : ExecutionMode.values())
884 >        for (Integer v1 : new Integer[] { 1, null })
885 >        for (Integer v2 : new Integer[] { 2, null }) {
886 >
887 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
888 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
889 >        final SubtractFunction r = new SubtractFunction();
890 >
891 >        f.complete(v1);
892 >        g.complete(v2);
893 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
894 >
895 >        checkCompletedNormally(h, subtract(v1, v2));
896 >        checkCompletedNormally(f, v1);
897 >        checkCompletedNormally(g, v2);
898 >        }
899      }
900  
901      /**
902       * thenCombine result completes exceptionally after exceptional
903       * completion of either source
904       */
905 <    public void testThenCombine2() {
906 <        CompletableFuture<Integer> f, g, h;
907 <
908 <        f = new CompletableFuture<>();
909 <        g = new CompletableFuture<>();
910 <        h = f.thenCombine(g, subtract);
911 <        f.completeExceptionally(new CFException());
912 <        checkIncomplete(h);
913 <        g.complete(1);
914 <        checkCompletedWithWrappedCFException(h);
905 >    public void testThenCombine_exceptionalCompletion1() {
906 >        for (ExecutionMode m : ExecutionMode.values())
907 >        for (Integer v1 : new Integer[] { 1, null }) {
908 >
909 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
910 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
911 >        final SubtractFunction r = new SubtractFunction();
912 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
913 >        final CFException ex = new CFException();
914 >
915 >        f.completeExceptionally(ex);
916 >        checkIncomplete(h);
917 >        g.complete(v1);
918 >
919 >        checkCompletedWithWrappedCFException(h, ex);
920 >        checkCompletedWithWrappedCFException(f, ex);
921 >        assertFalse(r.ran());
922 >        checkCompletedNormally(g, v1);
923 >        }
924 >    }
925  
926 <        f = new CompletableFuture<>();
927 <        g = new CompletableFuture<>();
928 <        h = f.thenCombine(g, subtract);
929 <        g.completeExceptionally(new CFException());
930 <        checkIncomplete(h);
931 <        f.complete(3);
932 <        checkCompletedWithWrappedCFException(h);
926 >    public void testThenCombine_exceptionalCompletion2() {
927 >        for (ExecutionMode m : ExecutionMode.values())
928 >        for (Integer v1 : new Integer[] { 1, null }) {
929 >
930 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
931 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
932 >        final SubtractFunction r = new SubtractFunction();
933 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, subtract);
934 >        final CFException ex = new CFException();
935 >
936 >        g.completeExceptionally(ex);
937 >        checkIncomplete(h);
938 >        f.complete(v1);
939 >
940 >        checkCompletedWithWrappedCFException(h, ex);
941 >        checkCompletedWithWrappedCFException(g, ex);
942 >        assertFalse(r.ran());
943 >        checkCompletedNormally(f, v1);
944 >        }
945 >    }
946  
947 <        f = new CompletableFuture<>();
948 <        g = new CompletableFuture<>();
949 <        f.complete(3);
950 <        g.completeExceptionally(new CFException());
951 <        h = f.thenCombine(g, subtract);
952 <        checkCompletedWithWrappedCFException(h);
947 >    public void testThenCombine_exceptionalCompletion3() {
948 >        for (ExecutionMode m : ExecutionMode.values())
949 >        for (Integer v1 : new Integer[] { 1, null }) {
950 >
951 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
952 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
953 >        final SubtractFunction r = new SubtractFunction();
954 >        final CFException ex = new CFException();
955 >
956 >        g.completeExceptionally(ex);
957 >        f.complete(v1);
958 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
959 >
960 >        checkCompletedWithWrappedCFException(h, ex);
961 >        checkCompletedWithWrappedCFException(g, ex);
962 >        assertFalse(r.ran());
963 >        checkCompletedNormally(f, v1);
964 >        }
965 >    }
966  
967 <        f = new CompletableFuture<>();
968 <        g = new CompletableFuture<>();
969 <        f.completeExceptionally(new CFException());
970 <        g.complete(3);
971 <        h = f.thenCombine(g, subtract);
972 <        checkCompletedWithWrappedCFException(h);
967 >    public void testThenCombine_exceptionalCompletion4() {
968 >        for (ExecutionMode m : ExecutionMode.values())
969 >        for (Integer v1 : new Integer[] { 1, null }) {
970 >
971 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
972 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
973 >        final SubtractFunction r = new SubtractFunction();
974 >        final CFException ex = new CFException();
975 >
976 >        f.completeExceptionally(ex);
977 >        g.complete(v1);
978 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, subtract);
979 >
980 >        checkCompletedWithWrappedCFException(h, ex);
981 >        checkCompletedWithWrappedCFException(f, ex);
982 >        assertFalse(r.ran());
983 >        checkCompletedNormally(g, v1);
984 >        }
985      }
986  
987      /**
988       * thenCombine result completes exceptionally if action does
989       */
990 <    public void testThenCombine3() {
991 <        CompletableFuture<Integer> f = new CompletableFuture<>();
992 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
993 <        FailingBiFunction r = new FailingBiFunction();
994 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
995 <        f.complete(one);
996 <        checkIncomplete(g);
997 <        assertFalse(r.ran);
998 <        f2.complete(two);
999 <        checkCompletedWithWrappedCFException(g);
1000 <        assertTrue(r.ran);
990 >    public void testThenCombine_actionFailed1() {
991 >        for (ExecutionMode m : ExecutionMode.values())
992 >        for (Integer v1 : new Integer[] { 1, null })
993 >        for (Integer v2 : new Integer[] { 2, null }) {
994 >
995 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
996 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
997 >        final FailingBiFunction r = new FailingBiFunction();
998 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
999 >
1000 >        f.complete(v1);
1001 >        checkIncomplete(h);
1002 >        g.complete(v2);
1003 >
1004 >        checkCompletedWithWrappedCFException(h);
1005 >        checkCompletedNormally(f, v1);
1006 >        checkCompletedNormally(g, v2);
1007 >        }
1008 >    }
1009 >
1010 >    public void testThenCombine_actionFailed2() {
1011 >        for (ExecutionMode m : ExecutionMode.values())
1012 >        for (Integer v1 : new Integer[] { 1, null })
1013 >        for (Integer v2 : new Integer[] { 2, null }) {
1014 >
1015 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1016 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1017 >        final FailingBiFunction r = new FailingBiFunction();
1018 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1019 >
1020 >        g.complete(v2);
1021 >        checkIncomplete(h);
1022 >        f.complete(v1);
1023 >
1024 >        checkCompletedWithWrappedCFException(h);
1025 >        checkCompletedNormally(f, v1);
1026 >        checkCompletedNormally(g, v2);
1027 >        }
1028      }
1029  
1030      /**
1031       * thenCombine result completes exceptionally if either source cancelled
1032       */
1033 <    public void testThenCombine4() {
1034 <        CompletableFuture<Integer> f, g, h;
1033 >    public void testThenCombine_sourceCancelled1() {
1034 >        for (ExecutionMode m : ExecutionMode.values())
1035 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1036 >        for (Integer v1 : new Integer[] { 1, null }) {
1037 >
1038 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1039 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1040 >        final SubtractFunction r = new SubtractFunction();
1041 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1042  
1043 <        f = new CompletableFuture<>();
756 <        g = new CompletableFuture<>();
757 <        h = f.thenCombine(g, subtract);
758 <        assertTrue(f.cancel(true));
1043 >        assertTrue(f.cancel(mayInterruptIfRunning));
1044          checkIncomplete(h);
1045 <        g.complete(1);
1045 >        g.complete(v1);
1046 >
1047          checkCompletedWithWrappedCancellationException(h);
1048 +        checkCancelled(f);
1049 +        assertFalse(r.ran());
1050 +        checkCompletedNormally(g, v1);
1051 +        }
1052 +    }
1053  
1054 <        f = new CompletableFuture<>();
1055 <        g = new CompletableFuture<>();
1056 <        h = f.thenCombine(g, subtract);
1057 <        assertTrue(g.cancel(true));
1054 >    public void testThenCombine_sourceCancelled2() {
1055 >        for (ExecutionMode m : ExecutionMode.values())
1056 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1057 >        for (Integer v1 : new Integer[] { 1, null }) {
1058 >
1059 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1060 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1061 >        final SubtractFunction r = new SubtractFunction();
1062 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1063 >
1064 >        assertTrue(g.cancel(mayInterruptIfRunning));
1065          checkIncomplete(h);
1066 <        f.complete(3);
1066 >        f.complete(v1);
1067 >
1068          checkCompletedWithWrappedCancellationException(h);
1069 +        checkCancelled(g);
1070 +        assertFalse(r.ran());
1071 +        checkCompletedNormally(f, v1);
1072 +        }
1073 +    }
1074 +
1075 +    public void testThenCombine_sourceCancelled3() {
1076 +        for (ExecutionMode m : ExecutionMode.values())
1077 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1078 +        for (Integer v1 : new Integer[] { 1, null }) {
1079 +
1080 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1081 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1082 +        final SubtractFunction r = new SubtractFunction();
1083 +
1084 +        assertTrue(g.cancel(mayInterruptIfRunning));
1085 +        f.complete(v1);
1086 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1087 +
1088 +        checkCompletedWithWrappedCancellationException(h);
1089 +        checkCancelled(g);
1090 +        assertFalse(r.ran());
1091 +        checkCompletedNormally(f, v1);
1092 +        }
1093 +    }
1094 +
1095 +    public void testThenCombine_sourceCancelled4() {
1096 +        for (ExecutionMode m : ExecutionMode.values())
1097 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1098 +        for (Integer v1 : new Integer[] { 1, null }) {
1099 +
1100 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1101 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1102 +        final SubtractFunction r = new SubtractFunction();
1103 +
1104 +        assertTrue(f.cancel(mayInterruptIfRunning));
1105 +        g.complete(v1);
1106 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1107  
771        f = new CompletableFuture<>();
772        g = new CompletableFuture<>();
773        assertTrue(f.cancel(true));
774        assertTrue(g.cancel(true));
775        h = f.thenCombine(g, subtract);
1108          checkCompletedWithWrappedCancellationException(h);
1109 +        checkCancelled(f);
1110 +        assertFalse(r.ran());
1111 +        checkCompletedNormally(g, v1);
1112 +        }
1113      }
1114  
1115      /**
1116       * thenAcceptBoth result completes normally after normal
1117       * completion of sources
1118       */
1119 <    public void testThenAcceptBoth() {
1120 <        CompletableFuture<Integer> f, g;
1121 <        CompletableFuture<Void> h;
1122 <        SubtractAction r;
1119 >    public void testThenAcceptBoth_normalCompletion1() {
1120 >        for (ExecutionMode m : ExecutionMode.values())
1121 >        for (Integer v1 : new Integer[] { 1, null })
1122 >        for (Integer v2 : new Integer[] { 2, null }) {
1123 >
1124 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1125 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1126 >        final SubtractAction r = new SubtractAction();
1127 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1128  
1129 <        f = new CompletableFuture<>();
789 <        g = new CompletableFuture<>();
790 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
791 <        f.complete(3);
1129 >        f.complete(v1);
1130          checkIncomplete(h);
1131 <        g.complete(1);
1131 >        assertEquals(r.value, 0);
1132 >        g.complete(v2);
1133 >
1134          checkCompletedNormally(h, null);
1135 <        assertEquals(r.value, 2);
1135 >        assertEquals(r.value, subtract(v1, v2));
1136 >        checkCompletedNormally(f, v1);
1137 >        checkCompletedNormally(g, v2);
1138 >        }
1139 >    }
1140  
1141 <        f = new CompletableFuture<>();
1142 <        g = new CompletableFuture<>();
1143 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1144 <        g.complete(1);
1141 >    public void testThenAcceptBoth_normalCompletion2() {
1142 >        for (ExecutionMode m : ExecutionMode.values())
1143 >        for (Integer v1 : new Integer[] { 1, null })
1144 >        for (Integer v2 : new Integer[] { 2, null }) {
1145 >
1146 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1147 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1148 >        final SubtractAction r = new SubtractAction();
1149 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1150 >
1151 >        g.complete(v2);
1152          checkIncomplete(h);
1153 <        f.complete(3);
1153 >        assertEquals(r.value, 0);
1154 >        f.complete(v1);
1155 >
1156          checkCompletedNormally(h, null);
1157 <        assertEquals(r.value, 2);
1157 >        assertEquals(r.value, subtract(v1, v2));
1158 >        checkCompletedNormally(f, v1);
1159 >        checkCompletedNormally(g, v2);
1160 >        }
1161 >    }
1162 >
1163 >    public void testThenAcceptBoth_normalCompletion3() {
1164 >        for (ExecutionMode m : ExecutionMode.values())
1165 >        for (Integer v1 : new Integer[] { 1, null })
1166 >        for (Integer v2 : new Integer[] { 2, null }) {
1167 >
1168 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1169 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1170 >        final SubtractAction r = new SubtractAction();
1171 >
1172 >        g.complete(v2);
1173 >        f.complete(v1);
1174 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1175  
806        f = new CompletableFuture<>();
807        g = new CompletableFuture<>();
808        g.complete(1);
809        f.complete(3);
810        h = f.thenAcceptBoth(g, r = new SubtractAction());
1176          checkCompletedNormally(h, null);
1177 <        assertEquals(r.value, 2);
1177 >        assertEquals(r.value, subtract(v1, v2));
1178 >        checkCompletedNormally(f, v1);
1179 >        checkCompletedNormally(g, v2);
1180 >        }
1181 >    }
1182 >
1183 >    public void testThenAcceptBoth_normalCompletion4() {
1184 >        for (ExecutionMode m : ExecutionMode.values())
1185 >        for (Integer v1 : new Integer[] { 1, null })
1186 >        for (Integer v2 : new Integer[] { 2, null }) {
1187 >
1188 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1189 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1190 >        final SubtractAction r = new SubtractAction();
1191 >
1192 >        f.complete(v1);
1193 >        g.complete(v2);
1194 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1195 >
1196 >        checkCompletedNormally(h, null);
1197 >        assertEquals(r.value, subtract(v1, v2));
1198 >        checkCompletedNormally(f, v1);
1199 >        checkCompletedNormally(g, v2);
1200 >        }
1201      }
1202  
1203      /**
1204       * thenAcceptBoth result completes exceptionally after exceptional
1205       * completion of either source
1206       */
1207 <    public void testThenAcceptBoth2() {
1208 <        CompletableFuture<Integer> f, g;
1209 <        CompletableFuture<Void> h;
1210 <        SubtractAction r;
1211 <
1212 <        f = new CompletableFuture<>();
1213 <        g = new CompletableFuture<>();
1214 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1215 <        f.completeExceptionally(new CFException());
1216 <        checkIncomplete(h);
1217 <        g.complete(1);
1218 <        checkCompletedWithWrappedCFException(h);
1207 >    public void testThenAcceptBoth_exceptionalCompletion1() {
1208 >        for (ExecutionMode m : ExecutionMode.values())
1209 >        for (Integer v1 : new Integer[] { 1, null }) {
1210 >
1211 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1212 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1213 >        final SubtractAction r = new SubtractAction();
1214 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1215 >        final CFException ex = new CFException();
1216 >
1217 >        f.completeExceptionally(ex);
1218 >        checkIncomplete(h);
1219 >        g.complete(v1);
1220 >
1221 >        checkCompletedWithWrappedCFException(h, ex);
1222 >        checkCompletedWithWrappedCFException(f, ex);
1223 >        assertFalse(r.ran());
1224 >        checkCompletedNormally(g, v1);
1225 >        }
1226 >    }
1227  
1228 <        f = new CompletableFuture<>();
1229 <        g = new CompletableFuture<>();
1230 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1231 <        g.completeExceptionally(new CFException());
1232 <        checkIncomplete(h);
1233 <        f.complete(3);
1234 <        checkCompletedWithWrappedCFException(h);
1228 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1229 >        for (ExecutionMode m : ExecutionMode.values())
1230 >        for (Integer v1 : new Integer[] { 1, null }) {
1231 >
1232 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1233 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1234 >        final SubtractAction r = new SubtractAction();
1235 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1236 >        final CFException ex = new CFException();
1237 >
1238 >        g.completeExceptionally(ex);
1239 >        checkIncomplete(h);
1240 >        f.complete(v1);
1241 >
1242 >        checkCompletedWithWrappedCFException(h, ex);
1243 >        checkCompletedWithWrappedCFException(g, ex);
1244 >        assertFalse(r.ran());
1245 >        checkCompletedNormally(f, v1);
1246 >        }
1247 >    }
1248  
1249 <        f = new CompletableFuture<>();
1250 <        g = new CompletableFuture<>();
1251 <        f.complete(3);
1252 <        g.completeExceptionally(new CFException());
1253 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1254 <        checkCompletedWithWrappedCFException(h);
1249 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1250 >        for (ExecutionMode m : ExecutionMode.values())
1251 >        for (Integer v1 : new Integer[] { 1, null }) {
1252 >
1253 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1254 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1255 >        final SubtractAction r = new SubtractAction();
1256 >        final CFException ex = new CFException();
1257 >
1258 >        g.completeExceptionally(ex);
1259 >        f.complete(v1);
1260 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1261 >
1262 >        checkCompletedWithWrappedCFException(h, ex);
1263 >        checkCompletedWithWrappedCFException(g, ex);
1264 >        assertFalse(r.ran());
1265 >        checkCompletedNormally(f, v1);
1266 >        }
1267 >    }
1268  
1269 <        f = new CompletableFuture<>();
1270 <        g = new CompletableFuture<>();
1271 <        f.completeExceptionally(new CFException());
1272 <        g.complete(3);
1273 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1274 <        checkCompletedWithWrappedCFException(h);
1269 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1270 >        for (ExecutionMode m : ExecutionMode.values())
1271 >        for (Integer v1 : new Integer[] { 1, null }) {
1272 >
1273 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1274 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1275 >        final SubtractAction r = new SubtractAction();
1276 >        final CFException ex = new CFException();
1277 >
1278 >        f.completeExceptionally(ex);
1279 >        g.complete(v1);
1280 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1281 >
1282 >        checkCompletedWithWrappedCFException(h, ex);
1283 >        checkCompletedWithWrappedCFException(f, ex);
1284 >        assertFalse(r.ran());
1285 >        checkCompletedNormally(g, v1);
1286 >        }
1287      }
1288  
1289      /**
1290       * thenAcceptBoth result completes exceptionally if action does
1291       */
1292 <    public void testThenAcceptBoth3() {
1293 <        CompletableFuture<Integer> f, g;
1294 <        CompletableFuture<Void> h;
1295 <        FailingBiConsumer r;
1292 >    public void testThenAcceptBoth_actionFailed1() {
1293 >        for (ExecutionMode m : ExecutionMode.values())
1294 >        for (Integer v1 : new Integer[] { 1, null })
1295 >        for (Integer v2 : new Integer[] { 2, null }) {
1296  
1297 <        f = new CompletableFuture<>();
1298 <        g = new CompletableFuture<>();
1299 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1300 <        f.complete(3);
1297 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1298 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1299 >        final FailingBiConsumer r = new FailingBiConsumer();
1300 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1301 >
1302 >        f.complete(v1);
1303          checkIncomplete(h);
1304 <        g.complete(1);
1304 >        g.complete(v2);
1305 >
1306          checkCompletedWithWrappedCFException(h);
1307 +        checkCompletedNormally(f, v1);
1308 +        checkCompletedNormally(g, v2);
1309 +        }
1310 +    }
1311 +
1312 +    public void testThenAcceptBoth_actionFailed2() {
1313 +        for (ExecutionMode m : ExecutionMode.values())
1314 +        for (Integer v1 : new Integer[] { 1, null })
1315 +        for (Integer v2 : new Integer[] { 2, null }) {
1316 +
1317 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1318 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1319 +        final FailingBiConsumer r = new FailingBiConsumer();
1320 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1321 +
1322 +        g.complete(v2);
1323 +        checkIncomplete(h);
1324 +        f.complete(v1);
1325  
871        f = new CompletableFuture<>();
872        g = new CompletableFuture<>();
873        f.complete(3);
874        g.complete(1);
875        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1326          checkCompletedWithWrappedCFException(h);
1327 +        checkCompletedNormally(f, v1);
1328 +        checkCompletedNormally(g, v2);
1329 +        }
1330      }
1331  
1332      /**
1333       * thenAcceptBoth result completes exceptionally if either source cancelled
1334       */
1335 <    public void testThenAcceptBoth4() {
1336 <        CompletableFuture<Integer> f, g;
1337 <        CompletableFuture<Void> h;
1338 <        SubtractAction r;
1335 >    public void testThenAcceptBoth_sourceCancelled1() {
1336 >        for (ExecutionMode m : ExecutionMode.values())
1337 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1338 >        for (Integer v1 : new Integer[] { 1, null }) {
1339 >
1340 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1341 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1342 >        final SubtractAction r = new SubtractAction();
1343 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1344  
1345 <        f = new CompletableFuture<>();
888 <        g = new CompletableFuture<>();
889 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
890 <        assertTrue(f.cancel(true));
1345 >        assertTrue(f.cancel(mayInterruptIfRunning));
1346          checkIncomplete(h);
1347 <        g.complete(1);
1347 >        g.complete(v1);
1348 >
1349          checkCompletedWithWrappedCancellationException(h);
1350 +        checkCancelled(f);
1351 +        assertFalse(r.ran());
1352 +        checkCompletedNormally(g, v1);
1353 +        }
1354 +    }
1355  
1356 <        f = new CompletableFuture<>();
1357 <        g = new CompletableFuture<>();
1358 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1359 <        assertTrue(g.cancel(true));
1356 >    public void testThenAcceptBoth_sourceCancelled2() {
1357 >        for (ExecutionMode m : ExecutionMode.values())
1358 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1359 >        for (Integer v1 : new Integer[] { 1, null }) {
1360 >
1361 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1362 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1363 >        final SubtractAction r = new SubtractAction();
1364 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1365 >
1366 >        assertTrue(g.cancel(mayInterruptIfRunning));
1367          checkIncomplete(h);
1368 <        f.complete(3);
901 <        checkCompletedWithWrappedCancellationException(h);
1368 >        f.complete(v1);
1369  
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());
1370          checkCompletedWithWrappedCancellationException(h);
1371 +        checkCancelled(g);
1372 +        assertFalse(r.ran());
1373 +        checkCompletedNormally(f, v1);
1374 +        }
1375 +    }
1376 +
1377 +    public void testThenAcceptBoth_sourceCancelled3() {
1378 +        for (ExecutionMode m : ExecutionMode.values())
1379 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1380 +        for (Integer v1 : new Integer[] { 1, null }) {
1381 +
1382 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1383 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1384 +        final SubtractAction r = new SubtractAction();
1385 +
1386 +        assertTrue(g.cancel(mayInterruptIfRunning));
1387 +        f.complete(v1);
1388 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1389 +
1390 +        checkCompletedWithWrappedCancellationException(h);
1391 +        checkCancelled(g);
1392 +        assertFalse(r.ran());
1393 +        checkCompletedNormally(f, v1);
1394 +        }
1395 +    }
1396 +
1397 +    public void testThenAcceptBoth_sourceCancelled4() {
1398 +        for (ExecutionMode m : ExecutionMode.values())
1399 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1400 +        for (Integer v1 : new Integer[] { 1, null }) {
1401 +
1402 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1403 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1404 +        final SubtractAction r = new SubtractAction();
1405 +
1406 +        assertTrue(f.cancel(mayInterruptIfRunning));
1407 +        g.complete(v1);
1408 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1409  
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());
1410          checkCompletedWithWrappedCancellationException(h);
1411 +        checkCancelled(f);
1412 +        assertFalse(r.ran());
1413 +        checkCompletedNormally(g, v1);
1414 +        }
1415      }
1416  
1417      /**
1418       * runAfterBoth result completes normally after normal
1419       * completion of sources
1420       */
1421 <    public void testRunAfterBoth() {
1422 <        CompletableFuture<Integer> f, g;
1423 <        CompletableFuture<Void> h;
1424 <        Noop r;
1421 >    public void testRunAfterBoth_normalCompletion1() {
1422 >        for (ExecutionMode m : ExecutionMode.values())
1423 >        for (Integer v1 : new Integer[] { 1, null })
1424 >        for (Integer v2 : new Integer[] { 2, null }) {
1425 >
1426 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1427 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1428 >        final Noop r = new Noop();
1429 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1430  
1431 <        f = new CompletableFuture<>();
928 <        g = new CompletableFuture<>();
929 <        h = f.runAfterBoth(g, r = new Noop());
930 <        f.complete(3);
1431 >        f.complete(v1);
1432          checkIncomplete(h);
1433 <        g.complete(1);
1433 >        assertFalse(r.ran);
1434 >        g.complete(v2);
1435 >
1436          checkCompletedNormally(h, null);
1437          assertTrue(r.ran);
1438 +        checkCompletedNormally(f, v1);
1439 +        checkCompletedNormally(g, v2);
1440 +        }
1441 +    }
1442  
1443 <        f = new CompletableFuture<>();
1444 <        g = new CompletableFuture<>();
1445 <        h = f.runAfterBoth(g, r = new Noop());
1446 <        g.complete(1);
1443 >    public void testRunAfterBoth_normalCompletion2() {
1444 >        for (ExecutionMode m : ExecutionMode.values())
1445 >        for (Integer v1 : new Integer[] { 1, null })
1446 >        for (Integer v2 : new Integer[] { 2, null }) {
1447 >
1448 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1449 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1450 >        final Noop r = new Noop();
1451 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1452 >
1453 >        g.complete(v2);
1454          checkIncomplete(h);
1455 <        f.complete(3);
1455 >        assertFalse(r.ran);
1456 >        f.complete(v1);
1457 >
1458 >        checkCompletedNormally(h, null);
1459 >        assertTrue(r.ran);
1460 >        checkCompletedNormally(f, v1);
1461 >        checkCompletedNormally(g, v2);
1462 >        }
1463 >    }
1464 >
1465 >    public void testRunAfterBoth_normalCompletion3() {
1466 >        for (ExecutionMode m : ExecutionMode.values())
1467 >        for (Integer v1 : new Integer[] { 1, null })
1468 >        for (Integer v2 : new Integer[] { 2, null }) {
1469 >
1470 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1471 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1472 >        final Noop r = new Noop();
1473 >
1474 >        g.complete(v2);
1475 >        f.complete(v1);
1476 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1477 >
1478          checkCompletedNormally(h, null);
1479          assertTrue(r.ran);
1480 +        checkCompletedNormally(f, v1);
1481 +        checkCompletedNormally(g, v2);
1482 +        }
1483 +    }
1484 +
1485 +    public void testRunAfterBoth_normalCompletion4() {
1486 +        for (ExecutionMode m : ExecutionMode.values())
1487 +        for (Integer v1 : new Integer[] { 1, null })
1488 +        for (Integer v2 : new Integer[] { 2, null }) {
1489 +
1490 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1491 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1492 +        final Noop r = new Noop();
1493 +
1494 +        f.complete(v1);
1495 +        g.complete(v2);
1496 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1497  
945        f = new CompletableFuture<>();
946        g = new CompletableFuture<>();
947        g.complete(1);
948        f.complete(3);
949        h = f.runAfterBoth(g, r = new Noop());
1498          checkCompletedNormally(h, null);
1499          assertTrue(r.ran);
1500 +        checkCompletedNormally(f, v1);
1501 +        checkCompletedNormally(g, v2);
1502 +        }
1503      }
1504  
1505      /**
1506       * runAfterBoth result completes exceptionally after exceptional
1507       * completion of either source
1508       */
1509 <    public void testRunAfterBoth2() {
1510 <        CompletableFuture<Integer> f, g;
1511 <        CompletableFuture<Void> h;
1512 <        Noop r;
1509 >    public void testRunAfterBoth_exceptionalCompletion1() {
1510 >        for (ExecutionMode m : ExecutionMode.values())
1511 >        for (Integer v1 : new Integer[] { 1, null }) {
1512 >
1513 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1515 >        final Noop r = new Noop();
1516 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1517 >        final CFException ex = new CFException();
1518  
1519 <        f = new CompletableFuture<>();
964 <        g = new CompletableFuture<>();
965 <        h = f.runAfterBoth(g, r = new Noop());
966 <        f.completeExceptionally(new CFException());
1519 >        f.completeExceptionally(ex);
1520          checkIncomplete(h);
1521 <        g.complete(1);
1522 <        checkCompletedWithWrappedCFException(h);
1521 >        g.complete(v1);
1522 >
1523 >        checkCompletedWithWrappedCFException(h, ex);
1524 >        checkCompletedWithWrappedCFException(f, ex);
1525          assertFalse(r.ran);
1526 +        checkCompletedNormally(g, v1);
1527 +        }
1528 +    }
1529  
1530 <        f = new CompletableFuture<>();
1531 <        g = new CompletableFuture<>();
1532 <        h = f.runAfterBoth(g, r = new Noop());
1533 <        g.completeExceptionally(new CFException());
1530 >    public void testRunAfterBoth_exceptionalCompletion2() {
1531 >        for (ExecutionMode m : ExecutionMode.values())
1532 >        for (Integer v1 : new Integer[] { 1, null }) {
1533 >
1534 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1535 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1536 >        final Noop r = new Noop();
1537 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1538 >        final CFException ex = new CFException();
1539 >
1540 >        g.completeExceptionally(ex);
1541          checkIncomplete(h);
1542 <        f.complete(3);
1543 <        checkCompletedWithWrappedCFException(h);
1542 >        f.complete(v1);
1543 >
1544 >        checkCompletedWithWrappedCFException(h, ex);
1545 >        checkCompletedWithWrappedCFException(g, ex);
1546          assertFalse(r.ran);
1547 +        checkCompletedNormally(f, v1);
1548 +        }
1549 +    }
1550  
1551 <        f = new CompletableFuture<>();
1552 <        g = new CompletableFuture<>();
1553 <        g.completeExceptionally(new CFException());
1554 <        f.complete(3);
1555 <        h = f.runAfterBoth(g, r = new Noop());
1556 <        checkCompletedWithWrappedCFException(h);
1551 >    public void testRunAfterBoth_exceptionalCompletion3() {
1552 >        for (ExecutionMode m : ExecutionMode.values())
1553 >        for (Integer v1 : new Integer[] { 1, null }) {
1554 >
1555 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1556 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1557 >        final Noop r = new Noop();
1558 >        final CFException ex = new CFException();
1559 >
1560 >        g.completeExceptionally(ex);
1561 >        f.complete(v1);
1562 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1563 >
1564 >        checkCompletedWithWrappedCFException(h, ex);
1565 >        checkCompletedWithWrappedCFException(g, ex);
1566          assertFalse(r.ran);
1567 +        checkCompletedNormally(f, v1);
1568 +        }
1569 +    }
1570  
1571 <        f = new CompletableFuture<>();
1572 <        g = new CompletableFuture<>();
1573 <        f.completeExceptionally(new CFException());
1574 <        g.complete(1);
1575 <        h = f.runAfterBoth(g, r = new Noop());
1576 <        checkCompletedWithWrappedCFException(h);
1571 >    public void testRunAfterBoth_exceptionalCompletion4() {
1572 >        for (ExecutionMode m : ExecutionMode.values())
1573 >        for (Integer v1 : new Integer[] { 1, null }) {
1574 >
1575 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1576 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1577 >        final Noop r = new Noop();
1578 >        final CFException ex = new CFException();
1579 >
1580 >        f.completeExceptionally(ex);
1581 >        g.complete(v1);
1582 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1583 >
1584 >        checkCompletedWithWrappedCFException(h, ex);
1585 >        checkCompletedWithWrappedCFException(f, ex);
1586          assertFalse(r.ran);
1587 +        checkCompletedNormally(g, v1);
1588 +        }
1589      }
1590  
1591      /**
1592       * runAfterBoth result completes exceptionally if action does
1593       */
1594 <    public void testRunAfterBoth3() {
1595 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1596 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1597 <        FailingNoop r = new FailingNoop();
1598 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1599 <        f.complete(one);
1600 <        checkIncomplete(g);
1601 <        f2.complete(two);
1602 <        checkCompletedWithWrappedCFException(g);
1594 >    public void testRunAfterBoth_actionFailed1() {
1595 >        for (ExecutionMode m : ExecutionMode.values())
1596 >        for (Integer v1 : new Integer[] { 1, null })
1597 >        for (Integer v2 : new Integer[] { 2, null }) {
1598 >
1599 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1600 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1601 >        final FailingNoop r = new FailingNoop();
1602 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1603 >
1604 >        f.complete(v1);
1605 >        checkIncomplete(h);
1606 >        g.complete(v2);
1607 >
1608 >        checkCompletedWithWrappedCFException(h);
1609 >        checkCompletedNormally(f, v1);
1610 >        checkCompletedNormally(g, v2);
1611 >        }
1612 >    }
1613 >
1614 >    public void testRunAfterBoth_actionFailed2() {
1615 >        for (ExecutionMode m : ExecutionMode.values())
1616 >        for (Integer v1 : new Integer[] { 1, null })
1617 >        for (Integer v2 : new Integer[] { 2, null }) {
1618 >
1619 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1620 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1621 >        final FailingNoop r = new FailingNoop();
1622 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1623 >
1624 >        g.complete(v2);
1625 >        checkIncomplete(h);
1626 >        f.complete(v1);
1627 >
1628 >        checkCompletedWithWrappedCFException(h);
1629 >        checkCompletedNormally(f, v1);
1630 >        checkCompletedNormally(g, v2);
1631 >        }
1632      }
1633  
1634      /**
1635       * runAfterBoth result completes exceptionally if either source cancelled
1636       */
1637 <    public void testRunAfterBoth4() {
1638 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1639 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1640 <        Noop r = new Noop();
1641 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1642 <        assertTrue(f.cancel(true));
1643 <        f2.complete(two);
1644 <        checkCompletedWithWrappedCancellationException(g);
1645 <        f = new CompletableFuture<>();
1646 <        f2 = new CompletableFuture<>();
1647 <        r = new Noop();
1648 <        g = f.runAfterBoth(f2, r);
1649 <        f.complete(one);
1650 <        assertTrue(f2.cancel(true));
1651 <        checkCompletedWithWrappedCancellationException(g);
1637 >    public void testRunAfterBoth_sourceCancelled1() {
1638 >        for (ExecutionMode m : ExecutionMode.values())
1639 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1640 >        for (Integer v1 : new Integer[] { 1, null }) {
1641 >
1642 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1643 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1644 >        final Noop r = new Noop();
1645 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1646 >
1647 >        assertTrue(f.cancel(mayInterruptIfRunning));
1648 >        checkIncomplete(h);
1649 >        g.complete(v1);
1650 >
1651 >        checkCompletedWithWrappedCancellationException(h);
1652 >        checkCancelled(f);
1653 >        assertFalse(r.ran);
1654 >        checkCompletedNormally(g, v1);
1655 >        }
1656 >    }
1657 >
1658 >    public void testRunAfterBoth_sourceCancelled2() {
1659 >        for (ExecutionMode m : ExecutionMode.values())
1660 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1661 >        for (Integer v1 : new Integer[] { 1, null }) {
1662 >
1663 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1664 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1665 >        final Noop r = new Noop();
1666 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1667 >
1668 >        assertTrue(g.cancel(mayInterruptIfRunning));
1669 >        checkIncomplete(h);
1670 >        f.complete(v1);
1671 >
1672 >        checkCompletedWithWrappedCancellationException(h);
1673 >        checkCancelled(g);
1674 >        assertFalse(r.ran);
1675 >        checkCompletedNormally(f, v1);
1676 >        }
1677 >    }
1678 >
1679 >    public void testRunAfterBoth_sourceCancelled3() {
1680 >        for (ExecutionMode m : ExecutionMode.values())
1681 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1682 >        for (Integer v1 : new Integer[] { 1, null }) {
1683 >
1684 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1685 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1686 >        final Noop r = new Noop();
1687 >
1688 >        assertTrue(g.cancel(mayInterruptIfRunning));
1689 >        f.complete(v1);
1690 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1691 >
1692 >        checkCompletedWithWrappedCancellationException(h);
1693 >        checkCancelled(g);
1694 >        assertFalse(r.ran);
1695 >        checkCompletedNormally(f, v1);
1696 >        }
1697 >    }
1698 >
1699 >    public void testRunAfterBoth_sourceCancelled4() {
1700 >        for (ExecutionMode m : ExecutionMode.values())
1701 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1702 >        for (Integer v1 : new Integer[] { 1, null }) {
1703 >
1704 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1705 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1706 >        final Noop r = new Noop();
1707 >
1708 >        assertTrue(f.cancel(mayInterruptIfRunning));
1709 >        g.complete(v1);
1710 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1711 >
1712 >        checkCompletedWithWrappedCancellationException(h);
1713 >        checkCancelled(f);
1714 >        assertFalse(r.ran);
1715 >        checkCompletedNormally(g, v1);
1716 >        }
1717      }
1718  
1719      /**
# Line 1348 | Line 2035 | public class CompletableFutureTest exten
2035          try {
2036              g.join();
2037              shouldThrow();
2038 <        } catch (Exception ok) {
1352 <        }
2038 >        } catch (CompletionException success) {}
2039          checkCompletedWithWrappedCFException(g);
2040      }
2041  
# Line 1465 | Line 2151 | public class CompletableFutureTest exten
2151      }
2152  
2153      /**
1468     * thenCombineAsync result completes normally after normal
1469     * completion of sources
1470     */
1471    public void testThenCombineAsync() {
1472        CompletableFuture<Integer> f, g, h;
1473
1474        f = new CompletableFuture<>();
1475        g = new CompletableFuture<>();
1476        h = f.thenCombineAsync(g, subtract);
1477        f.complete(3);
1478        checkIncomplete(h);
1479        g.complete(1);
1480        checkCompletedNormally(h, 2);
1481
1482        f = new CompletableFuture<>();
1483        g = new CompletableFuture<>();
1484        h = f.thenCombineAsync(g, subtract);
1485        g.complete(1);
1486        checkIncomplete(h);
1487        f.complete(3);
1488        checkCompletedNormally(h, 2);
1489
1490        f = new CompletableFuture<>();
1491        g = new CompletableFuture<>();
1492        g.complete(1);
1493        f.complete(3);
1494        h = f.thenCombineAsync(g, subtract);
1495        checkCompletedNormally(h, 2);
1496    }
1497
1498    /**
1499     * thenCombineAsync result completes exceptionally after exceptional
1500     * completion of either source
1501     */
1502    public void testThenCombineAsync2() {
1503        CompletableFuture<Integer> f, g, h;
1504
1505        f = new CompletableFuture<>();
1506        g = new CompletableFuture<>();
1507        h = f.thenCombineAsync(g, subtract);
1508        f.completeExceptionally(new CFException());
1509        checkIncomplete(h);
1510        g.complete(1);
1511        checkCompletedWithWrappedCFException(h);
1512
1513        f = new CompletableFuture<>();
1514        g = new CompletableFuture<>();
1515        h = f.thenCombineAsync(g, subtract);
1516        g.completeExceptionally(new CFException());
1517        checkIncomplete(h);
1518        f.complete(3);
1519        checkCompletedWithWrappedCFException(h);
1520
1521        f = new CompletableFuture<>();
1522        g = new CompletableFuture<>();
1523        g.completeExceptionally(new CFException());
1524        f.complete(3);
1525        h = f.thenCombineAsync(g, subtract);
1526        checkCompletedWithWrappedCFException(h);
1527    }
1528
1529    /**
1530     * thenCombineAsync result completes exceptionally if action does
1531     */
1532    public void testThenCombineAsync3() {
1533        CompletableFuture<Integer> f = new CompletableFuture<>();
1534        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1535        FailingBiFunction r = new FailingBiFunction();
1536        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1537        f.complete(one);
1538        checkIncomplete(g);
1539        assertFalse(r.ran);
1540        f2.complete(two);
1541        checkCompletedWithWrappedCFException(g);
1542        assertTrue(r.ran);
1543    }
1544
1545    /**
1546     * thenCombineAsync result completes exceptionally if either source cancelled
1547     */
1548    public void testThenCombineAsync4() {
1549        CompletableFuture<Integer> f, g, h;
1550
1551        f = new CompletableFuture<>();
1552        g = new CompletableFuture<>();
1553        h = f.thenCombineAsync(g, subtract);
1554        assertTrue(f.cancel(true));
1555        checkIncomplete(h);
1556        g.complete(1);
1557        checkCompletedWithWrappedCancellationException(h);
1558
1559        f = new CompletableFuture<>();
1560        g = new CompletableFuture<>();
1561        h = f.thenCombineAsync(g, subtract);
1562        assertTrue(g.cancel(true));
1563        checkIncomplete(h);
1564        f.complete(3);
1565        checkCompletedWithWrappedCancellationException(h);
1566
1567        f = new CompletableFuture<>();
1568        g = new CompletableFuture<>();
1569        g.complete(3);
1570        assertTrue(f.cancel(true));
1571        h = f.thenCombineAsync(g, subtract);
1572        checkCompletedWithWrappedCancellationException(h);
1573
1574        f = new CompletableFuture<>();
1575        g = new CompletableFuture<>();
1576        f.complete(3);
1577        assertTrue(g.cancel(true));
1578        h = f.thenCombineAsync(g, subtract);
1579        checkCompletedWithWrappedCancellationException(h);
1580    }
1581
1582    /**
1583     * thenAcceptBothAsync result completes normally after normal
1584     * completion of sources
1585     */
1586    public void testThenAcceptBothAsync() {
1587        CompletableFuture<Integer> f, g;
1588        CompletableFuture<Void> h;
1589        SubtractAction r;
1590
1591        f = new CompletableFuture<>();
1592        g = new CompletableFuture<>();
1593        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1594        f.complete(3);
1595        checkIncomplete(h);
1596        g.complete(1);
1597        checkCompletedNormally(h, null);
1598        assertEquals(r.value, 2);
1599
1600        f = new CompletableFuture<>();
1601        g = new CompletableFuture<>();
1602        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1603        g.complete(1);
1604        checkIncomplete(h);
1605        f.complete(3);
1606        checkCompletedNormally(h, null);
1607        assertEquals(r.value, 2);
1608
1609        f = new CompletableFuture<>();
1610        g = new CompletableFuture<>();
1611        g.complete(1);
1612        f.complete(3);
1613        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1614        checkCompletedNormally(h, null);
1615        assertEquals(r.value, 2);
1616    }
1617
1618    /**
1619     * thenAcceptBothAsync result completes exceptionally after exceptional
1620     * completion of source
1621     */
1622    public void testThenAcceptBothAsync2() {
1623        CompletableFuture<Integer> f, g;
1624        CompletableFuture<Void> h;
1625        SubtractAction r;
1626
1627        f = new CompletableFuture<>();
1628        g = new CompletableFuture<>();
1629        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1630        f.completeExceptionally(new CFException());
1631        checkIncomplete(h);
1632        g.complete(1);
1633        checkCompletedWithWrappedCFException(h);
1634
1635        f = new CompletableFuture<>();
1636        g = new CompletableFuture<>();
1637        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1638        g.completeExceptionally(new CFException());
1639        checkIncomplete(h);
1640        f.complete(3);
1641        checkCompletedWithWrappedCFException(h);
1642
1643        f = new CompletableFuture<>();
1644        g = new CompletableFuture<>();
1645        f.complete(3);
1646        g.completeExceptionally(new CFException());
1647        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1648        checkCompletedWithWrappedCFException(h);
1649
1650        f = new CompletableFuture<>();
1651        g = new CompletableFuture<>();
1652        f.completeExceptionally(new CFException());
1653        g.complete(3);
1654        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1655        checkCompletedWithWrappedCFException(h);
1656    }
1657
1658    /**
1659     * thenAcceptBothAsync result completes exceptionally if action does
1660     */
1661    public void testThenAcceptBothAsync3() {
1662        CompletableFuture<Integer> f, g;
1663        CompletableFuture<Void> h;
1664        FailingBiConsumer r;
1665
1666        f = new CompletableFuture<>();
1667        g = new CompletableFuture<>();
1668        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1669        f.complete(3);
1670        checkIncomplete(h);
1671        g.complete(1);
1672        checkCompletedWithWrappedCFException(h);
1673
1674        f = new CompletableFuture<>();
1675        g = new CompletableFuture<>();
1676        f.complete(3);
1677        g.complete(1);
1678        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1679        checkCompletedWithWrappedCFException(h);
1680    }
1681
1682    /**
1683     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1684     */
1685    public void testThenAcceptBothAsync4() {
1686        CompletableFuture<Integer> f, g;
1687        CompletableFuture<Void> h;
1688        SubtractAction r;
1689
1690        f = new CompletableFuture<>();
1691        g = new CompletableFuture<>();
1692        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1693        assertTrue(f.cancel(true));
1694        checkIncomplete(h);
1695        g.complete(1);
1696        checkCompletedWithWrappedCancellationException(h);
1697
1698        f = new CompletableFuture<>();
1699        g = new CompletableFuture<>();
1700        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1701        assertTrue(g.cancel(true));
1702        checkIncomplete(h);
1703        f.complete(3);
1704        checkCompletedWithWrappedCancellationException(h);
1705
1706        f = new CompletableFuture<>();
1707        g = new CompletableFuture<>();
1708        f.complete(3);
1709        assertTrue(g.cancel(true));
1710        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1711        checkCompletedWithWrappedCancellationException(h);
1712
1713        f = new CompletableFuture<>();
1714        g = new CompletableFuture<>();
1715        assertTrue(f.cancel(true));
1716        g.complete(3);
1717        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1718        checkCompletedWithWrappedCancellationException(h);
1719    }
1720
1721    /**
1722     * runAfterBothAsync result completes normally after normal
1723     * completion of sources
1724     */
1725    public void testRunAfterBothAsync() {
1726        CompletableFuture<Integer> f = new CompletableFuture<>();
1727        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1728        Noop r = new Noop();
1729        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1730        f.complete(one);
1731        checkIncomplete(g);
1732        f2.complete(two);
1733        checkCompletedNormally(g, null);
1734        assertTrue(r.ran);
1735    }
1736
1737    /**
1738     * runAfterBothAsync result completes exceptionally after exceptional
1739     * completion of source
1740     */
1741    public void testRunAfterBothAsync2() {
1742        CompletableFuture<Integer> f = new CompletableFuture<>();
1743        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1744        Noop r = new Noop();
1745        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1746        f.completeExceptionally(new CFException());
1747        f2.complete(two);
1748        checkCompletedWithWrappedCFException(g);
1749
1750        r = new Noop();
1751        f = new CompletableFuture<>();
1752        f2 = new CompletableFuture<>();
1753        g = f.runAfterBothAsync(f2, r);
1754        f.complete(one);
1755        f2.completeExceptionally(new CFException());
1756        checkCompletedWithWrappedCFException(g);
1757    }
1758
1759    /**
1760     * runAfterBothAsync result completes exceptionally if action does
1761     */
1762    public void testRunAfterBothAsync3() {
1763        CompletableFuture<Integer> f = new CompletableFuture<>();
1764        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1765        FailingNoop r = new FailingNoop();
1766        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1767        f.complete(one);
1768        checkIncomplete(g);
1769        f2.complete(two);
1770        checkCompletedWithWrappedCFException(g);
1771    }
1772
1773    /**
1774     * runAfterBothAsync result completes exceptionally if either source cancelled
1775     */
1776    public void testRunAfterBothAsync4() {
1777        CompletableFuture<Integer> f = new CompletableFuture<>();
1778        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1779        Noop r = new Noop();
1780        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1781        assertTrue(f.cancel(true));
1782        f2.complete(two);
1783        checkCompletedWithWrappedCancellationException(g);
1784
1785        r = new Noop();
1786        f = new CompletableFuture<>();
1787        f2 = new CompletableFuture<>();
1788        g = f.runAfterBothAsync(f2, r);
1789        f.complete(one);
1790        assertTrue(f2.cancel(true));
1791        checkCompletedWithWrappedCancellationException(g);
1792    }
1793
1794    /**
2154       * applyToEitherAsync result completes normally after normal
2155       * completion of sources
2156       */
# Line 2115 | Line 2474 | public class CompletableFutureTest exten
2474          try {
2475              g.join();
2476              shouldThrow();
2477 <        } catch (Exception ok) {
2119 <        }
2477 >        } catch (CompletionException success) {}
2478          checkCompletedWithWrappedCFException(g);
2479      }
2480  
# Line 2232 | Line 2590 | public class CompletableFutureTest exten
2590      }
2591  
2592      /**
2235     * thenCombineAsync result completes normally after normal
2236     * completion of sources
2237     */
2238    public void testThenCombineAsyncE() {
2239        CompletableFuture<Integer> f, g, h;
2240        ThreadExecutor e = new ThreadExecutor();
2241        int count = 0;
2242
2243        f = new CompletableFuture<>();
2244        g = new CompletableFuture<>();
2245        h = f.thenCombineAsync(g, subtract, e);
2246        f.complete(3);
2247        checkIncomplete(h);
2248        g.complete(1);
2249        checkCompletedNormally(h, 2);
2250        assertEquals(++count, e.count.get());
2251
2252        f = new CompletableFuture<>();
2253        g = new CompletableFuture<>();
2254        h = f.thenCombineAsync(g, subtract, e);
2255        g.complete(1);
2256        checkIncomplete(h);
2257        f.complete(3);
2258        checkCompletedNormally(h, 2);
2259        assertEquals(++count, e.count.get());
2260
2261        f = new CompletableFuture<>();
2262        g = new CompletableFuture<>();
2263        g.complete(1);
2264        f.complete(3);
2265        h = f.thenCombineAsync(g, subtract, e);
2266        checkCompletedNormally(h, 2);
2267        assertEquals(++count, e.count.get());
2268    }
2269
2270    /**
2271     * thenCombineAsync result completes exceptionally after exceptional
2272     * completion of either source
2273     */
2274    public void testThenCombineAsync2E() {
2275        CompletableFuture<Integer> f, g, h;
2276        ThreadExecutor e = new ThreadExecutor();
2277        int count = 0;
2278
2279        f = new CompletableFuture<>();
2280        g = new CompletableFuture<>();
2281        h = f.thenCombineAsync(g, subtract, e);
2282        f.completeExceptionally(new CFException());
2283        checkIncomplete(h);
2284        g.complete(1);
2285        checkCompletedWithWrappedCFException(h);
2286
2287        f = new CompletableFuture<>();
2288        g = new CompletableFuture<>();
2289        h = f.thenCombineAsync(g, subtract, e);
2290        g.completeExceptionally(new CFException());
2291        checkIncomplete(h);
2292        f.complete(3);
2293        checkCompletedWithWrappedCFException(h);
2294
2295        f = new CompletableFuture<>();
2296        g = new CompletableFuture<>();
2297        g.completeExceptionally(new CFException());
2298        h = f.thenCombineAsync(g, subtract, e);
2299        checkIncomplete(h);
2300        f.complete(3);
2301        checkCompletedWithWrappedCFException(h);
2302
2303        assertEquals(0, e.count.get());
2304    }
2305
2306    /**
2307     * thenCombineAsync result completes exceptionally if action does
2308     */
2309    public void testThenCombineAsync3E() {
2310        CompletableFuture<Integer> f = new CompletableFuture<>();
2311        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2312        FailingBiFunction r = new FailingBiFunction();
2313        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2314        f.complete(one);
2315        checkIncomplete(g);
2316        assertFalse(r.ran);
2317        f2.complete(two);
2318        checkCompletedWithWrappedCFException(g);
2319        assertTrue(r.ran);
2320    }
2321
2322    /**
2323     * thenCombineAsync result completes exceptionally if either source cancelled
2324     */
2325    public void testThenCombineAsync4E() {
2326        CompletableFuture<Integer> f, g, h;
2327        ThreadExecutor e = new ThreadExecutor();
2328
2329        f = new CompletableFuture<>();
2330        g = new CompletableFuture<>();
2331        h = f.thenCombineAsync(g, subtract, e);
2332        assertTrue(f.cancel(true));
2333        checkIncomplete(h);
2334        g.complete(1);
2335        checkCompletedWithWrappedCancellationException(h);
2336
2337        f = new CompletableFuture<>();
2338        g = new CompletableFuture<>();
2339        h = f.thenCombineAsync(g, subtract, e);
2340        assertTrue(g.cancel(true));
2341        checkIncomplete(h);
2342        f.complete(3);
2343        checkCompletedWithWrappedCancellationException(h);
2344
2345        f = new CompletableFuture<>();
2346        g = new CompletableFuture<>();
2347        assertTrue(g.cancel(true));
2348        h = f.thenCombineAsync(g, subtract, e);
2349        checkIncomplete(h);
2350        f.complete(3);
2351        checkCompletedWithWrappedCancellationException(h);
2352
2353        f = new CompletableFuture<>();
2354        g = new CompletableFuture<>();
2355        assertTrue(f.cancel(true));
2356        assertTrue(g.cancel(true));
2357        h = f.thenCombineAsync(g, subtract, e);
2358        checkCompletedWithWrappedCancellationException(h);
2359
2360        assertEquals(0, e.count.get());
2361    }
2362
2363    /**
2364     * thenAcceptBothAsync result completes normally after normal
2365     * completion of sources
2366     */
2367    public void testThenAcceptBothAsyncE() {
2368        CompletableFuture<Integer> f, g;
2369        CompletableFuture<Void> h;
2370        SubtractAction r;
2371        ThreadExecutor e = new ThreadExecutor();
2372
2373        f = new CompletableFuture<>();
2374        g = new CompletableFuture<>();
2375        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2376        f.complete(3);
2377        checkIncomplete(h);
2378        g.complete(1);
2379        checkCompletedNormally(h, null);
2380        assertEquals(r.value, 2);
2381
2382        f = new CompletableFuture<>();
2383        g = new CompletableFuture<>();
2384        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2385        g.complete(1);
2386        checkIncomplete(h);
2387        f.complete(3);
2388        checkCompletedNormally(h, null);
2389        assertEquals(r.value, 2);
2390
2391        f = new CompletableFuture<>();
2392        g = new CompletableFuture<>();
2393        g.complete(1);
2394        f.complete(3);
2395        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2396        checkCompletedNormally(h, null);
2397        assertEquals(r.value, 2);
2398
2399        assertEquals(3, e.count.get());
2400    }
2401
2402    /**
2403     * thenAcceptBothAsync result completes exceptionally after exceptional
2404     * completion of source
2405     */
2406    public void testThenAcceptBothAsync2E() {
2407        CompletableFuture<Integer> f, g;
2408        CompletableFuture<Void> h;
2409        SubtractAction r;
2410        ThreadExecutor e = new ThreadExecutor();
2411
2412        f = new CompletableFuture<>();
2413        g = new CompletableFuture<>();
2414        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2415        f.completeExceptionally(new CFException());
2416        checkIncomplete(h);
2417        g.complete(1);
2418        checkCompletedWithWrappedCFException(h);
2419
2420        f = new CompletableFuture<>();
2421        g = new CompletableFuture<>();
2422        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2423        g.completeExceptionally(new CFException());
2424        checkIncomplete(h);
2425        f.complete(3);
2426        checkCompletedWithWrappedCFException(h);
2427
2428        f = new CompletableFuture<>();
2429        g = new CompletableFuture<>();
2430        f.complete(3);
2431        g.completeExceptionally(new CFException());
2432        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2433        checkCompletedWithWrappedCFException(h);
2434
2435        f = new CompletableFuture<>();
2436        g = new CompletableFuture<>();
2437        f.completeExceptionally(new CFException());
2438        g.complete(3);
2439        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2440        checkCompletedWithWrappedCFException(h);
2441
2442        assertEquals(0, e.count.get());
2443    }
2444
2445    /**
2446     * thenAcceptBothAsync result completes exceptionally if action does
2447     */
2448    public void testThenAcceptBothAsync3E() {
2449        CompletableFuture<Integer> f, g;
2450        CompletableFuture<Void> h;
2451        FailingBiConsumer r;
2452        ThreadExecutor e = new ThreadExecutor();
2453
2454        f = new CompletableFuture<>();
2455        g = new CompletableFuture<>();
2456        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2457        f.complete(3);
2458        checkIncomplete(h);
2459        g.complete(1);
2460        checkCompletedWithWrappedCFException(h);
2461
2462        f = new CompletableFuture<>();
2463        g = new CompletableFuture<>();
2464        f.complete(3);
2465        g.complete(1);
2466        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2467        checkCompletedWithWrappedCFException(h);
2468
2469        assertEquals(2, e.count.get());
2470    }
2471
2472    /**
2473     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2474     */
2475    public void testThenAcceptBothAsync4E() {
2476        CompletableFuture<Integer> f, g;
2477        CompletableFuture<Void> h;
2478        SubtractAction r;
2479        ThreadExecutor e = new ThreadExecutor();
2480
2481        f = new CompletableFuture<>();
2482        g = new CompletableFuture<>();
2483        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2484        assertTrue(f.cancel(true));
2485        checkIncomplete(h);
2486        g.complete(1);
2487        checkCompletedWithWrappedCancellationException(h);
2488
2489        f = new CompletableFuture<>();
2490        g = new CompletableFuture<>();
2491        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2492        assertTrue(g.cancel(true));
2493        checkIncomplete(h);
2494        f.complete(3);
2495        checkCompletedWithWrappedCancellationException(h);
2496
2497        f = new CompletableFuture<>();
2498        g = new CompletableFuture<>();
2499        f.complete(3);
2500        assertTrue(g.cancel(true));
2501        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2502        checkCompletedWithWrappedCancellationException(h);
2503
2504        f = new CompletableFuture<>();
2505        g = new CompletableFuture<>();
2506        assertTrue(f.cancel(true));
2507        g.complete(3);
2508        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2509        checkCompletedWithWrappedCancellationException(h);
2510
2511        assertEquals(0, e.count.get());
2512    }
2513
2514    /**
2515     * runAfterBothAsync result completes normally after normal
2516     * completion of sources
2517     */
2518    public void testRunAfterBothAsyncE() {
2519        CompletableFuture<Integer> f = new CompletableFuture<>();
2520        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2521        Noop r = new Noop();
2522        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2523        f.complete(one);
2524        checkIncomplete(g);
2525        f2.complete(two);
2526        checkCompletedNormally(g, null);
2527        assertTrue(r.ran);
2528    }
2529
2530    /**
2531     * runAfterBothAsync result completes exceptionally after exceptional
2532     * completion of source
2533     */
2534    public void testRunAfterBothAsync2E() {
2535        CompletableFuture<Integer> f = new CompletableFuture<>();
2536        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2537        Noop r = new Noop();
2538        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2539        f.completeExceptionally(new CFException());
2540        f2.complete(two);
2541        checkCompletedWithWrappedCFException(g);
2542
2543        r = new Noop();
2544        f = new CompletableFuture<>();
2545        f2 = new CompletableFuture<>();
2546        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2547        f.complete(one);
2548        f2.completeExceptionally(new CFException());
2549        checkCompletedWithWrappedCFException(g);
2550    }
2551
2552    /**
2553     * runAfterBothAsync result completes exceptionally if action does
2554     */
2555    public void testRunAfterBothAsync3E() {
2556        CompletableFuture<Integer> f = new CompletableFuture<>();
2557        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2558        FailingNoop r = new FailingNoop();
2559        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2560        f.complete(one);
2561        checkIncomplete(g);
2562        f2.complete(two);
2563        checkCompletedWithWrappedCFException(g);
2564    }
2565
2566    /**
2567     * runAfterBothAsync result completes exceptionally if either source cancelled
2568     */
2569    public void testRunAfterBothAsync4E() {
2570        CompletableFuture<Integer> f = new CompletableFuture<>();
2571        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2572        Noop r = new Noop();
2573        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2574        assertTrue(f.cancel(true));
2575        f2.complete(two);
2576        checkCompletedWithWrappedCancellationException(g);
2577
2578        r = new Noop();
2579        f = new CompletableFuture<>();
2580        f2 = new CompletableFuture<>();
2581        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2582        f.complete(one);
2583        assertTrue(f2.cancel(true));
2584        checkCompletedWithWrappedCancellationException(g);
2585    }
2586
2587    /**
2593       * applyToEitherAsync result completes normally after normal
2594       * completion of sources
2595       */
# Line 2933 | Line 2938 | public class CompletableFutureTest exten
2938          ThreadExecutor exec = new ThreadExecutor();
2939  
2940          Runnable[] throwingActions = {
2941 <            () -> { CompletableFuture.supplyAsync(null); },
2942 <            () -> { CompletableFuture.supplyAsync(null, exec); },
2943 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
2944 <
2945 <            () -> { CompletableFuture.runAsync(null); },
2946 <            () -> { CompletableFuture.runAsync(null, exec); },
2947 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
2948 <
2949 <            () -> { f.completeExceptionally(null); },
2950 <
2951 <            () -> { f.thenApply(null); },
2952 <            () -> { f.thenApplyAsync(null); },
2953 <            () -> { f.thenApplyAsync((x) -> x, null); },
2954 <            () -> { f.thenApplyAsync(null, exec); },
2955 <
2956 <            () -> { f.thenAccept(null); },
2957 <            () -> { f.thenAcceptAsync(null); },
2958 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2959 <            () -> { f.thenAcceptAsync(null, exec); },
2960 <
2961 <            () -> { f.thenRun(null); },
2962 <            () -> { f.thenRunAsync(null); },
2963 <            () -> { f.thenRunAsync(() -> { ; }, null); },
2964 <            () -> { f.thenRunAsync(null, exec); },
2965 <
2966 <            () -> { f.thenCombine(g, null); },
2967 <            () -> { f.thenCombineAsync(g, null); },
2968 <            () -> { f.thenCombineAsync(g, null, exec); },
2969 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2970 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2971 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2972 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2973 <
2974 <            () -> { f.thenAcceptBoth(g, null); },
2975 <            () -> { f.thenAcceptBothAsync(g, null); },
2976 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
2977 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
2978 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
2979 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
2980 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
2981 <
2982 <            () -> { f.runAfterBoth(g, null); },
2983 <            () -> { f.runAfterBothAsync(g, null); },
2984 <            () -> { f.runAfterBothAsync(g, null, exec); },
2985 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
2986 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
2987 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
2988 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
2989 <
2990 <            () -> { f.applyToEither(g, null); },
2991 <            () -> { f.applyToEitherAsync(g, null); },
2992 <            () -> { f.applyToEitherAsync(g, null, exec); },
2993 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
2994 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
2995 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
2996 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
2997 <
2998 <            () -> { f.acceptEither(g, null); },
2999 <            () -> { f.acceptEitherAsync(g, null); },
3000 <            () -> { f.acceptEitherAsync(g, null, exec); },
3001 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
3002 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
3003 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
3004 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
3005 <
3006 <            () -> { f.runAfterEither(g, null); },
3007 <            () -> { f.runAfterEitherAsync(g, null); },
3008 <            () -> { f.runAfterEitherAsync(g, null, exec); },
3009 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
3010 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
3011 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
3012 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
3013 <
3014 <            () -> { f.thenCompose(null); },
3015 <            () -> { f.thenComposeAsync(null); },
3016 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
3017 <            () -> { f.thenComposeAsync(null, exec); },
3018 <
3019 <            () -> { f.exceptionally(null); },
3020 <
3021 <            () -> { f.handle(null); },
3022 <
3023 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
3024 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3025 <            () -> { CompletableFuture.allOf(f, null); },
3026 <            () -> { CompletableFuture.allOf(null, f); },
3027 <
3028 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3029 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3030 <            () -> { CompletableFuture.anyOf(f, null); },
3031 <            () -> { CompletableFuture.anyOf(null, f); },
2941 >            () -> CompletableFuture.supplyAsync(null),
2942 >            () -> CompletableFuture.supplyAsync(null, exec),
2943 >            () -> CompletableFuture.supplyAsync(supplyOne, null),
2944 >
2945 >            () -> CompletableFuture.runAsync(null),
2946 >            () -> CompletableFuture.runAsync(null, exec),
2947 >            () -> CompletableFuture.runAsync(() -> {}, null),
2948 >
2949 >            () -> f.completeExceptionally(null),
2950 >
2951 >            () -> f.thenApply(null),
2952 >            () -> f.thenApplyAsync(null),
2953 >            () -> f.thenApplyAsync((x) -> x, null),
2954 >            () -> f.thenApplyAsync(null, exec),
2955 >
2956 >            () -> f.thenAccept(null),
2957 >            () -> f.thenAcceptAsync(null),
2958 >            () -> f.thenAcceptAsync((x) -> {} , null),
2959 >            () -> f.thenAcceptAsync(null, exec),
2960 >
2961 >            () -> f.thenRun(null),
2962 >            () -> f.thenRunAsync(null),
2963 >            () -> f.thenRunAsync(() -> {} , null),
2964 >            () -> f.thenRunAsync(null, exec),
2965 >
2966 >            () -> f.thenCombine(g, null),
2967 >            () -> f.thenCombineAsync(g, null),
2968 >            () -> f.thenCombineAsync(g, null, exec),
2969 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
2970 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
2971 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
2972 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
2973 >
2974 >            () -> f.thenAcceptBoth(g, null),
2975 >            () -> f.thenAcceptBothAsync(g, null),
2976 >            () -> f.thenAcceptBothAsync(g, null, exec),
2977 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
2978 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
2979 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
2980 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
2981 >
2982 >            () -> f.runAfterBoth(g, null),
2983 >            () -> f.runAfterBothAsync(g, null),
2984 >            () -> f.runAfterBothAsync(g, null, exec),
2985 >            () -> f.runAfterBoth(nullFuture, () -> {}),
2986 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
2987 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
2988 >            () -> f.runAfterBothAsync(g, () -> {}, null),
2989 >
2990 >            () -> f.applyToEither(g, null),
2991 >            () -> f.applyToEitherAsync(g, null),
2992 >            () -> f.applyToEitherAsync(g, null, exec),
2993 >            () -> f.applyToEither(nullFuture, (x) -> x),
2994 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
2995 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
2996 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
2997 >
2998 >            () -> f.acceptEither(g, null),
2999 >            () -> f.acceptEitherAsync(g, null),
3000 >            () -> f.acceptEitherAsync(g, null, exec),
3001 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3002 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3003 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3004 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3005 >
3006 >            () -> f.runAfterEither(g, null),
3007 >            () -> f.runAfterEitherAsync(g, null),
3008 >            () -> f.runAfterEitherAsync(g, null, exec),
3009 >            () -> f.runAfterEither(nullFuture, () -> {}),
3010 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3011 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3012 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3013 >
3014 >            () -> f.thenCompose(null),
3015 >            () -> f.thenComposeAsync(null),
3016 >            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3017 >            () -> f.thenComposeAsync(null, exec),
3018 >
3019 >            () -> f.exceptionally(null),
3020 >
3021 >            () -> f.handle(null),
3022 >
3023 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3024 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3025 >            () -> CompletableFuture.allOf(f, null),
3026 >            () -> CompletableFuture.allOf(null, f),
3027 >
3028 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3029 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3030 >            () -> CompletableFuture.anyOf(f, null),
3031 >            () -> CompletableFuture.anyOf(null, f),
3032 >
3033 >            () -> f.obtrudeException(null),
3034          };
3035  
3036          assertThrows(NullPointerException.class, throwingActions);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines