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.27 by jsr166, Mon Jul 8 21:12:28 2013 UTC vs.
Revision 1.35 by jsr166, Sun Jun 1 22:22:49 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 259 | Line 291 | public class CompletableFutureTest exten
291          assertEquals(g.getNumberOfDependents(), 0);
292      }
293  
262
294      /**
295       * toString indicates current completion state
296       */
# Line 298 | Line 329 | public class CompletableFutureTest exten
329          public void accept(Integer x) { value = x.intValue() + 1; }
330      }
331      static final class SubtractAction implements BiConsumer<Integer, Integer> {
332 +        // Handle null values as well
333 +        public int subtract(Integer x, Integer y) {
334 +            return ((x == null) ? 42 : x.intValue())
335 +                - ((y == null) ? 99 : y.intValue());
336 +        }
337          int value;
338 +        public boolean ran() { return value != 0; }
339          public void accept(Integer x, Integer y) {
340 <            value = x.intValue() - y.intValue();
340 >            value = subtract(x, y);
341          }
342      }
343      static final class Noop implements Runnable {
# Line 374 | Line 411 | public class CompletableFutureTest exten
411          }
412      }
413  
414 +    /**
415 +     * Permits the testing of parallel code for the 3 different
416 +     * execution modes without repeating all the testing code.
417 +     */
418 +    enum ExecutionMode {
419 +        DEFAULT {
420 +            public <T,U> CompletableFuture<Void> runAfterBoth
421 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
422 +                return f.runAfterBoth(g, a);
423 +            }
424 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
425 +                (CompletableFuture<T> f,
426 +                 CompletionStage<? extends U> g,
427 +                 BiConsumer<? super T,? super U> a) {
428 +                return f.thenAcceptBoth(g, a);
429 +            }
430 +        },
431 +
432 + //             /** Experimental way to do more testing */
433 + //         REVERSE_DEFAULT {
434 + //             public <T,U> CompletableFuture<Void> runAfterBoth
435 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
436 + //                 return g.runAfterBoth(f, 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 DEFAULT.thenAcceptBoth(f, g, a);
443 + //             }
444 + //         },
445 +
446 +        DEFAULT_ASYNC {
447 +            public <T,U> CompletableFuture<Void> runAfterBoth
448 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
449 +                return f.runAfterBothAsync(g, a);
450 +            }
451 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
452 +                (CompletableFuture<T> f,
453 +                 CompletionStage<? extends U> g,
454 +                 BiConsumer<? super T,? super U> a) {
455 +                return f.thenAcceptBothAsync(g, a);
456 +            }
457 +        },
458 +
459 + //         REVERSE_DEFAULT_ASYNC {
460 + //             public <T,U> CompletableFuture<Void> runAfterBoth
461 + //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
462 + //                 return f.runAfterBothAsync(g, a);
463 + //             }
464 + //             public <T,U> CompletableFuture<Void> thenAcceptBoth
465 + //                 (CompletableFuture<T> f,
466 + //                  CompletionStage<? extends U> g,
467 + //                  BiConsumer<? super T,? super U> a) {
468 + //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
469 + //             }
470 + //         },
471 +
472 +        EXECUTOR {
473 +            public <T,U> CompletableFuture<Void> runAfterBoth
474 +                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
475 +                return f.runAfterBothAsync(g, a, new ThreadExecutor());
476 +            }
477 +            public <T,U> CompletableFuture<Void> thenAcceptBoth
478 +                (CompletableFuture<T> f,
479 +                 CompletionStage<? extends U> g,
480 +                 BiConsumer<? super T,? super U> a) {
481 +                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
482 +            }
483 +        };
484 +
485 +        public abstract <T,U> CompletableFuture<Void> runAfterBoth
486 +            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
487 +        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
488 +            (CompletableFuture<T> f,
489 +             CompletionStage<? extends U> g,
490 +             BiConsumer<? super T,? super U> a);
491 +    }
492  
493      /**
494       * exceptionally action completes with function value on source
495 <     * exception;  otherwise with source value
495 >     * exception; otherwise with source value
496       */
497      public void testExceptionally() {
498          CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 663 | Line 778 | public class CompletableFutureTest exten
778          checkCompletedWithWrappedCancellationException(g);
779      }
780  
666
781      /**
782       * thenCombine result completes normally after normal completion
783       * of sources
# Line 783 | Line 897 | public class CompletableFutureTest exten
897       * thenAcceptBoth result completes normally after normal
898       * completion of sources
899       */
900 <    public void testThenAcceptBoth() {
901 <        CompletableFuture<Integer> f, g;
902 <        CompletableFuture<Void> h;
903 <        SubtractAction r;
900 >    public void testThenAcceptBoth_normalCompletion1() {
901 >        for (ExecutionMode m : ExecutionMode.values())
902 >        for (Integer v1 : new Integer[] { 1, null })
903 >        for (Integer v2 : new Integer[] { 2, null }) {
904 >
905 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
906 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
907 >        final SubtractAction r = new SubtractAction();
908 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
909  
910 <        f = new CompletableFuture<>();
792 <        g = new CompletableFuture<>();
793 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
794 <        f.complete(3);
910 >        f.complete(v1);
911          checkIncomplete(h);
912 <        g.complete(1);
912 >        assertEquals(r.value, 0);
913 >        g.complete(v2);
914 >
915          checkCompletedNormally(h, null);
916 <        assertEquals(r.value, 2);
916 >        assertEquals(r.value, r.subtract(v1, v2));
917 >        checkCompletedNormally(f, v1);
918 >        checkCompletedNormally(g, v2);
919 >        }
920 >    }
921  
922 <        f = new CompletableFuture<>();
923 <        g = new CompletableFuture<>();
924 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
925 <        g.complete(1);
922 >    public void testThenAcceptBoth_normalCompletion2() {
923 >        for (ExecutionMode m : ExecutionMode.values())
924 >        for (Integer v1 : new Integer[] { 1, null })
925 >        for (Integer v2 : new Integer[] { 2, null }) {
926 >
927 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
928 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
929 >        final SubtractAction r = new SubtractAction();
930 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
931 >
932 >        g.complete(v2);
933          checkIncomplete(h);
934 <        f.complete(3);
934 >        assertEquals(r.value, 0);
935 >        f.complete(v1);
936 >
937          checkCompletedNormally(h, null);
938 <        assertEquals(r.value, 2);
938 >        assertEquals(r.value, r.subtract(v1, v2));
939 >        checkCompletedNormally(f, v1);
940 >        checkCompletedNormally(g, v2);
941 >        }
942 >    }
943 >
944 >    public void testThenAcceptBoth_normalCompletion3() {
945 >        for (ExecutionMode m : ExecutionMode.values())
946 >        for (Integer v1 : new Integer[] { 1, null })
947 >        for (Integer v2 : new Integer[] { 2, null }) {
948 >
949 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
950 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
951 >        final SubtractAction r = new SubtractAction();
952 >
953 >        g.complete(v2);
954 >        f.complete(v1);
955 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
956  
809        f = new CompletableFuture<>();
810        g = new CompletableFuture<>();
811        g.complete(1);
812        f.complete(3);
813        h = f.thenAcceptBoth(g, r = new SubtractAction());
957          checkCompletedNormally(h, null);
958 <        assertEquals(r.value, 2);
958 >        assertEquals(r.value, r.subtract(v1, v2));
959 >        checkCompletedNormally(f, v1);
960 >        checkCompletedNormally(g, v2);
961 >        }
962 >    }
963 >
964 >    public void testThenAcceptBoth_normalCompletion4() {
965 >        for (ExecutionMode m : ExecutionMode.values())
966 >        for (Integer v1 : new Integer[] { 1, null })
967 >        for (Integer v2 : new Integer[] { 2, null }) {
968 >
969 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
970 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
971 >        final SubtractAction r = new SubtractAction();
972 >
973 >        f.complete(v1);
974 >        g.complete(v2);
975 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
976 >
977 >        checkCompletedNormally(h, null);
978 >        assertEquals(r.value, r.subtract(v1, v2));
979 >        checkCompletedNormally(f, v1);
980 >        checkCompletedNormally(g, v2);
981 >        }
982      }
983  
984      /**
985       * thenAcceptBoth result completes exceptionally after exceptional
986       * completion of either source
987       */
988 <    public void testThenAcceptBoth2() {
989 <        CompletableFuture<Integer> f, g;
990 <        CompletableFuture<Void> h;
991 <        SubtractAction r;
992 <
993 <        f = new CompletableFuture<>();
994 <        g = new CompletableFuture<>();
995 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
996 <        f.completeExceptionally(new CFException());
997 <        checkIncomplete(h);
998 <        g.complete(1);
999 <        checkCompletedWithWrappedCFException(h);
988 >    public void testThenAcceptBoth_exceptionalCompletion1() {
989 >        for (ExecutionMode m : ExecutionMode.values())
990 >        for (Integer v1 : new Integer[] { 1, null }) {
991 >
992 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
993 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
994 >        final SubtractAction r = new SubtractAction();
995 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
996 >        final CFException ex = new CFException();
997 >
998 >        f.completeExceptionally(ex);
999 >        checkIncomplete(h);
1000 >        g.complete(v1);
1001 >
1002 >        checkCompletedWithWrappedCFException(h, ex);
1003 >        checkCompletedWithWrappedCFException(f, ex);
1004 >        assertFalse(r.ran());
1005 >        checkCompletedNormally(g, v1);
1006 >        }
1007 >    }
1008  
1009 <        f = new CompletableFuture<>();
1010 <        g = new CompletableFuture<>();
1011 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1012 <        g.completeExceptionally(new CFException());
1013 <        checkIncomplete(h);
1014 <        f.complete(3);
1015 <        checkCompletedWithWrappedCFException(h);
1009 >    public void testThenAcceptBoth_exceptionalCompletion2() {
1010 >        for (ExecutionMode m : ExecutionMode.values())
1011 >        for (Integer v1 : new Integer[] { 1, null }) {
1012 >
1013 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1014 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1015 >        final SubtractAction r = new SubtractAction();
1016 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1017 >        final CFException ex = new CFException();
1018 >
1019 >        g.completeExceptionally(ex);
1020 >        checkIncomplete(h);
1021 >        f.complete(v1);
1022 >
1023 >        checkCompletedWithWrappedCFException(h, ex);
1024 >        checkCompletedWithWrappedCFException(g, ex);
1025 >        assertFalse(r.ran());
1026 >        checkCompletedNormally(f, v1);
1027 >        }
1028 >    }
1029  
1030 <        f = new CompletableFuture<>();
1031 <        g = new CompletableFuture<>();
1032 <        f.complete(3);
1033 <        g.completeExceptionally(new CFException());
1034 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1035 <        checkCompletedWithWrappedCFException(h);
1030 >    public void testThenAcceptBoth_exceptionalCompletion3() {
1031 >        for (ExecutionMode m : ExecutionMode.values())
1032 >        for (Integer v1 : new Integer[] { 1, null }) {
1033 >
1034 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1035 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1036 >        final SubtractAction r = new SubtractAction();
1037 >        final CFException ex = new CFException();
1038 >
1039 >        g.completeExceptionally(ex);
1040 >        f.complete(v1);
1041 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1042 >
1043 >        checkCompletedWithWrappedCFException(h, ex);
1044 >        checkCompletedWithWrappedCFException(g, ex);
1045 >        assertFalse(r.ran());
1046 >        checkCompletedNormally(f, v1);
1047 >        }
1048 >    }
1049  
1050 <        f = new CompletableFuture<>();
1051 <        g = new CompletableFuture<>();
1052 <        f.completeExceptionally(new CFException());
1053 <        g.complete(3);
1054 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1055 <        checkCompletedWithWrappedCFException(h);
1050 >    public void testThenAcceptBoth_exceptionalCompletion4() {
1051 >        for (ExecutionMode m : ExecutionMode.values())
1052 >        for (Integer v1 : new Integer[] { 1, null }) {
1053 >
1054 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1055 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1056 >        final SubtractAction r = new SubtractAction();
1057 >        final CFException ex = new CFException();
1058 >
1059 >        f.completeExceptionally(ex);
1060 >        g.complete(v1);
1061 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1062 >
1063 >        checkCompletedWithWrappedCFException(h, ex);
1064 >        checkCompletedWithWrappedCFException(f, ex);
1065 >        assertFalse(r.ran());
1066 >        checkCompletedNormally(g, v1);
1067 >        }
1068      }
1069  
1070      /**
1071       * thenAcceptBoth result completes exceptionally if action does
1072       */
1073 <    public void testThenAcceptBoth3() {
1074 <        CompletableFuture<Integer> f, g;
1075 <        CompletableFuture<Void> h;
1076 <        FailingBiConsumer r;
1073 >    public void testThenAcceptBoth_actionFailed1() {
1074 >        for (ExecutionMode m : ExecutionMode.values())
1075 >        for (Integer v1 : new Integer[] { 1, null })
1076 >        for (Integer v2 : new Integer[] { 2, null }) {
1077  
1078 <        f = new CompletableFuture<>();
1079 <        g = new CompletableFuture<>();
1080 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1081 <        f.complete(3);
1078 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1079 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1080 >        final FailingBiConsumer r = new FailingBiConsumer();
1081 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1082 >
1083 >        f.complete(v1);
1084          checkIncomplete(h);
1085 <        g.complete(1);
1085 >        g.complete(v2);
1086 >
1087          checkCompletedWithWrappedCFException(h);
1088 +        checkCompletedNormally(f, v1);
1089 +        checkCompletedNormally(g, v2);
1090 +        }
1091 +    }
1092 +
1093 +    public void testThenAcceptBoth_actionFailed2() {
1094 +        for (ExecutionMode m : ExecutionMode.values())
1095 +        for (Integer v1 : new Integer[] { 1, null })
1096 +        for (Integer v2 : new Integer[] { 2, null }) {
1097 +
1098 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1099 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1100 +        final FailingBiConsumer r = new FailingBiConsumer();
1101 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1102 +
1103 +        g.complete(v2);
1104 +        checkIncomplete(h);
1105 +        f.complete(v1);
1106  
874        f = new CompletableFuture<>();
875        g = new CompletableFuture<>();
876        f.complete(3);
877        g.complete(1);
878        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1107          checkCompletedWithWrappedCFException(h);
1108 +        checkCompletedNormally(f, v1);
1109 +        checkCompletedNormally(g, v2);
1110 +        }
1111      }
1112  
1113      /**
1114       * thenAcceptBoth result completes exceptionally if either source cancelled
1115       */
1116 <    public void testThenAcceptBoth4() {
1117 <        CompletableFuture<Integer> f, g;
1118 <        CompletableFuture<Void> h;
1119 <        SubtractAction r;
1116 >    public void testThenAcceptBoth_sourceCancelled1() {
1117 >        for (ExecutionMode m : ExecutionMode.values())
1118 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1119 >        for (Integer v1 : new Integer[] { 1, null }) {
1120 >
1121 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1122 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1123 >        final SubtractAction r = new SubtractAction();
1124 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1125  
1126 <        f = new CompletableFuture<>();
891 <        g = new CompletableFuture<>();
892 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
893 <        assertTrue(f.cancel(true));
1126 >        assertTrue(f.cancel(mayInterruptIfRunning));
1127          checkIncomplete(h);
1128 <        g.complete(1);
1128 >        g.complete(v1);
1129 >
1130          checkCompletedWithWrappedCancellationException(h);
1131 +        checkCancelled(f);
1132 +        assertFalse(r.ran());
1133 +        checkCompletedNormally(g, v1);
1134 +        }
1135 +    }
1136  
1137 <        f = new CompletableFuture<>();
1138 <        g = new CompletableFuture<>();
1139 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1140 <        assertTrue(g.cancel(true));
1137 >    public void testThenAcceptBoth_sourceCancelled2() {
1138 >        for (ExecutionMode m : ExecutionMode.values())
1139 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1140 >        for (Integer v1 : new Integer[] { 1, null }) {
1141 >
1142 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1143 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1144 >        final SubtractAction r = new SubtractAction();
1145 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1146 >
1147 >        assertTrue(g.cancel(mayInterruptIfRunning));
1148          checkIncomplete(h);
1149 <        f.complete(3);
904 <        checkCompletedWithWrappedCancellationException(h);
1149 >        f.complete(v1);
1150  
906        f = new CompletableFuture<>();
907        g = new CompletableFuture<>();
908        f.complete(3);
909        assertTrue(g.cancel(true));
910        h = f.thenAcceptBoth(g, r = new SubtractAction());
1151          checkCompletedWithWrappedCancellationException(h);
1152 +        checkCancelled(g);
1153 +        assertFalse(r.ran());
1154 +        checkCompletedNormally(f, v1);
1155 +        }
1156 +    }
1157 +
1158 +    public void testThenAcceptBoth_sourceCancelled3() {
1159 +        for (ExecutionMode m : ExecutionMode.values())
1160 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1161 +        for (Integer v1 : new Integer[] { 1, null }) {
1162 +
1163 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1165 +        final SubtractAction r = new SubtractAction();
1166 +
1167 +        assertTrue(g.cancel(mayInterruptIfRunning));
1168 +        f.complete(v1);
1169 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1170 +
1171 +        checkCompletedWithWrappedCancellationException(h);
1172 +        checkCancelled(g);
1173 +        assertFalse(r.ran());
1174 +        checkCompletedNormally(f, v1);
1175 +        }
1176 +    }
1177 +
1178 +    public void testThenAcceptBoth_sourceCancelled4() {
1179 +        for (ExecutionMode m : ExecutionMode.values())
1180 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1181 +        for (Integer v1 : new Integer[] { 1, null }) {
1182 +
1183 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1184 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1185 +        final SubtractAction r = new SubtractAction();
1186 +
1187 +        assertTrue(f.cancel(mayInterruptIfRunning));
1188 +        g.complete(v1);
1189 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1190  
913        f = new CompletableFuture<>();
914        g = new CompletableFuture<>();
915        assertTrue(f.cancel(true));
916        g.complete(3);
917        h = f.thenAcceptBoth(g, r = new SubtractAction());
1191          checkCompletedWithWrappedCancellationException(h);
1192 +        checkCancelled(f);
1193 +        assertFalse(r.ran());
1194 +        checkCompletedNormally(g, v1);
1195 +        }
1196      }
1197  
1198      /**
1199       * runAfterBoth result completes normally after normal
1200       * completion of sources
1201       */
1202 <    public void testRunAfterBoth() {
1203 <        CompletableFuture<Integer> f, g;
1204 <        CompletableFuture<Void> h;
1205 <        Noop r;
1202 >    public void testRunAfterBoth_normalCompletion1() {
1203 >        for (ExecutionMode m : ExecutionMode.values())
1204 >        for (Integer v1 : new Integer[] { 1, null })
1205 >        for (Integer v2 : new Integer[] { 2, null }) {
1206 >
1207 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1208 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1209 >        final Noop r = new Noop();
1210 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1211  
1212 <        f = new CompletableFuture<>();
931 <        g = new CompletableFuture<>();
932 <        h = f.runAfterBoth(g, r = new Noop());
933 <        f.complete(3);
1212 >        f.complete(v1);
1213          checkIncomplete(h);
1214 <        g.complete(1);
1214 >        assertFalse(r.ran);
1215 >        g.complete(v2);
1216 >
1217          checkCompletedNormally(h, null);
1218          assertTrue(r.ran);
1219 +        checkCompletedNormally(f, v1);
1220 +        checkCompletedNormally(g, v2);
1221 +        }
1222 +    }
1223  
1224 <        f = new CompletableFuture<>();
1225 <        g = new CompletableFuture<>();
1226 <        h = f.runAfterBoth(g, r = new Noop());
1227 <        g.complete(1);
1224 >    public void testRunAfterBoth_normalCompletion2() {
1225 >        for (ExecutionMode m : ExecutionMode.values())
1226 >        for (Integer v1 : new Integer[] { 1, null })
1227 >        for (Integer v2 : new Integer[] { 2, null }) {
1228 >
1229 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1230 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1231 >        final Noop r = new Noop();
1232 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1233 >
1234 >        g.complete(v2);
1235          checkIncomplete(h);
1236 <        f.complete(3);
1236 >        assertFalse(r.ran);
1237 >        f.complete(v1);
1238 >
1239          checkCompletedNormally(h, null);
1240          assertTrue(r.ran);
1241 +        checkCompletedNormally(f, v1);
1242 +        checkCompletedNormally(g, v2);
1243 +        }
1244 +    }
1245 +
1246 +    public void testRunAfterBoth_normalCompletion3() {
1247 +        for (ExecutionMode m : ExecutionMode.values())
1248 +        for (Integer v1 : new Integer[] { 1, null })
1249 +        for (Integer v2 : new Integer[] { 2, null }) {
1250 +
1251 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1253 +        final Noop r = new Noop();
1254 +
1255 +        g.complete(v2);
1256 +        f.complete(v1);
1257 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1258 +
1259 +        checkCompletedNormally(h, null);
1260 +        assertTrue(r.ran);
1261 +        checkCompletedNormally(f, v1);
1262 +        checkCompletedNormally(g, v2);
1263 +        }
1264 +    }
1265 +
1266 +    public void testRunAfterBoth_normalCompletion4() {
1267 +        for (ExecutionMode m : ExecutionMode.values())
1268 +        for (Integer v1 : new Integer[] { 1, null })
1269 +        for (Integer v2 : new Integer[] { 2, null }) {
1270 +
1271 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1272 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1273 +        final Noop r = new Noop();
1274 +
1275 +        f.complete(v1);
1276 +        g.complete(v2);
1277 +        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1278  
948        f = new CompletableFuture<>();
949        g = new CompletableFuture<>();
950        g.complete(1);
951        f.complete(3);
952        h = f.runAfterBoth(g, r = new Noop());
1279          checkCompletedNormally(h, null);
1280          assertTrue(r.ran);
1281 +        checkCompletedNormally(f, v1);
1282 +        checkCompletedNormally(g, v2);
1283 +        }
1284      }
1285  
1286      /**
1287       * runAfterBoth result completes exceptionally after exceptional
1288       * completion of either source
1289       */
1290 <    public void testRunAfterBoth2() {
1291 <        CompletableFuture<Integer> f, g;
1292 <        CompletableFuture<Void> h;
1293 <        Noop r;
1290 >    public void testRunAfterBoth_exceptionalCompletion1() {
1291 >        for (ExecutionMode m : ExecutionMode.values())
1292 >        for (Integer v1 : new Integer[] { 1, null }) {
1293 >
1294 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1295 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1296 >        final Noop r = new Noop();
1297 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1298 >        final CFException ex = new CFException();
1299  
1300 <        f = new CompletableFuture<>();
967 <        g = new CompletableFuture<>();
968 <        h = f.runAfterBoth(g, r = new Noop());
969 <        f.completeExceptionally(new CFException());
1300 >        f.completeExceptionally(ex);
1301          checkIncomplete(h);
1302 <        g.complete(1);
1303 <        checkCompletedWithWrappedCFException(h);
1302 >        g.complete(v1);
1303 >
1304 >        checkCompletedWithWrappedCFException(h, ex);
1305 >        checkCompletedWithWrappedCFException(f, ex);
1306          assertFalse(r.ran);
1307 +        checkCompletedNormally(g, v1);
1308 +        }
1309 +    }
1310  
1311 <        f = new CompletableFuture<>();
1312 <        g = new CompletableFuture<>();
1313 <        h = f.runAfterBoth(g, r = new Noop());
1314 <        g.completeExceptionally(new CFException());
1311 >    public void testRunAfterBoth_exceptionalCompletion2() {
1312 >        for (ExecutionMode m : ExecutionMode.values())
1313 >        for (Integer v1 : new Integer[] { 1, null }) {
1314 >
1315 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1316 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1317 >        final Noop r = new Noop();
1318 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1319 >        final CFException ex = new CFException();
1320 >
1321 >        g.completeExceptionally(ex);
1322          checkIncomplete(h);
1323 <        f.complete(3);
1324 <        checkCompletedWithWrappedCFException(h);
1323 >        f.complete(v1);
1324 >
1325 >        checkCompletedWithWrappedCFException(h, ex);
1326 >        checkCompletedWithWrappedCFException(g, ex);
1327          assertFalse(r.ran);
1328 +        checkCompletedNormally(f, v1);
1329 +        }
1330 +    }
1331  
1332 <        f = new CompletableFuture<>();
1333 <        g = new CompletableFuture<>();
1334 <        g.completeExceptionally(new CFException());
1335 <        f.complete(3);
1336 <        h = f.runAfterBoth(g, r = new Noop());
1337 <        checkCompletedWithWrappedCFException(h);
1332 >    public void testRunAfterBoth_exceptionalCompletion3() {
1333 >        for (ExecutionMode m : ExecutionMode.values())
1334 >        for (Integer v1 : new Integer[] { 1, null }) {
1335 >
1336 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1337 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1338 >        final Noop r = new Noop();
1339 >        final CFException ex = new CFException();
1340 >
1341 >        g.completeExceptionally(ex);
1342 >        f.complete(v1);
1343 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1344 >
1345 >        checkCompletedWithWrappedCFException(h, ex);
1346 >        checkCompletedWithWrappedCFException(g, ex);
1347          assertFalse(r.ran);
1348 +        checkCompletedNormally(f, v1);
1349 +        }
1350 +    }
1351  
1352 <        f = new CompletableFuture<>();
1353 <        g = new CompletableFuture<>();
1354 <        f.completeExceptionally(new CFException());
1355 <        g.complete(1);
1356 <        h = f.runAfterBoth(g, r = new Noop());
1357 <        checkCompletedWithWrappedCFException(h);
1352 >    public void testRunAfterBoth_exceptionalCompletion4() {
1353 >        for (ExecutionMode m : ExecutionMode.values())
1354 >        for (Integer v1 : new Integer[] { 1, null }) {
1355 >
1356 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1357 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1358 >        final Noop r = new Noop();
1359 >        final CFException ex = new CFException();
1360 >
1361 >        f.completeExceptionally(ex);
1362 >        g.complete(v1);
1363 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1364 >
1365 >        checkCompletedWithWrappedCFException(h, ex);
1366 >        checkCompletedWithWrappedCFException(f, ex);
1367          assertFalse(r.ran);
1368 +        checkCompletedNormally(g, v1);
1369 +        }
1370      }
1371  
1372      /**
1373       * runAfterBoth result completes exceptionally if action does
1374       */
1375 <    public void testRunAfterBoth3() {
1376 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1377 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1378 <        FailingNoop r = new FailingNoop();
1379 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1380 <        f.complete(one);
1381 <        checkIncomplete(g);
1382 <        f2.complete(two);
1383 <        checkCompletedWithWrappedCFException(g);
1375 >    public void testRunAfterBoth_actionFailed1() {
1376 >        for (ExecutionMode m : ExecutionMode.values())
1377 >        for (Integer v1 : new Integer[] { 1, null })
1378 >        for (Integer v2 : new Integer[] { 2, null }) {
1379 >
1380 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1381 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1382 >        final FailingNoop r = new FailingNoop();
1383 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1384 >
1385 >        f.complete(v1);
1386 >        checkIncomplete(h);
1387 >        g.complete(v2);
1388 >
1389 >        checkCompletedWithWrappedCFException(h);
1390 >        checkCompletedNormally(f, v1);
1391 >        checkCompletedNormally(g, v2);
1392 >        }
1393 >    }
1394 >
1395 >    public void testRunAfterBoth_actionFailed2() {
1396 >        for (ExecutionMode m : ExecutionMode.values())
1397 >        for (Integer v1 : new Integer[] { 1, null })
1398 >        for (Integer v2 : new Integer[] { 2, null }) {
1399 >
1400 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1401 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1402 >        final FailingNoop r = new FailingNoop();
1403 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1404 >
1405 >        g.complete(v2);
1406 >        checkIncomplete(h);
1407 >        f.complete(v1);
1408 >
1409 >        checkCompletedWithWrappedCFException(h);
1410 >        checkCompletedNormally(f, v1);
1411 >        checkCompletedNormally(g, v2);
1412 >        }
1413      }
1414  
1415      /**
1416       * runAfterBoth result completes exceptionally if either source cancelled
1417       */
1418 <    public void testRunAfterBoth4() {
1419 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1420 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1421 <        Noop r = new Noop();
1422 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1423 <        assertTrue(f.cancel(true));
1424 <        f2.complete(two);
1425 <        checkCompletedWithWrappedCancellationException(g);
1426 <        f = new CompletableFuture<>();
1427 <        f2 = new CompletableFuture<>();
1428 <        r = new Noop();
1429 <        g = f.runAfterBoth(f2, r);
1430 <        f.complete(one);
1431 <        assertTrue(f2.cancel(true));
1432 <        checkCompletedWithWrappedCancellationException(g);
1418 >    public void testRunAfterBoth_sourceCancelled1() {
1419 >        for (ExecutionMode m : ExecutionMode.values())
1420 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1421 >        for (Integer v1 : new Integer[] { 1, null }) {
1422 >
1423 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1424 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1425 >        final Noop r = new Noop();
1426 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1427 >
1428 >        assertTrue(f.cancel(mayInterruptIfRunning));
1429 >        checkIncomplete(h);
1430 >        g.complete(v1);
1431 >
1432 >        checkCompletedWithWrappedCancellationException(h);
1433 >        checkCancelled(f);
1434 >        assertFalse(r.ran);
1435 >        checkCompletedNormally(g, v1);
1436 >        }
1437 >    }
1438 >
1439 >    public void testRunAfterBoth_sourceCancelled2() {
1440 >        for (ExecutionMode m : ExecutionMode.values())
1441 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1442 >        for (Integer v1 : new Integer[] { 1, null }) {
1443 >
1444 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1445 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1446 >        final Noop r = new Noop();
1447 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1448 >
1449 >        assertTrue(g.cancel(mayInterruptIfRunning));
1450 >        checkIncomplete(h);
1451 >        f.complete(v1);
1452 >
1453 >        checkCompletedWithWrappedCancellationException(h);
1454 >        checkCancelled(g);
1455 >        assertFalse(r.ran);
1456 >        checkCompletedNormally(f, v1);
1457 >        }
1458 >    }
1459 >
1460 >    public void testRunAfterBoth_sourceCancelled3() {
1461 >        for (ExecutionMode m : ExecutionMode.values())
1462 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1463 >        for (Integer v1 : new Integer[] { 1, null }) {
1464 >
1465 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1466 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1467 >        final Noop r = new Noop();
1468 >
1469 >        assertTrue(g.cancel(mayInterruptIfRunning));
1470 >        f.complete(v1);
1471 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1472 >
1473 >        checkCompletedWithWrappedCancellationException(h);
1474 >        checkCancelled(g);
1475 >        assertFalse(r.ran);
1476 >        checkCompletedNormally(f, v1);
1477 >        }
1478 >    }
1479 >
1480 >    public void testRunAfterBoth_sourceCancelled4() {
1481 >        for (ExecutionMode m : ExecutionMode.values())
1482 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1483 >        for (Integer v1 : new Integer[] { 1, null }) {
1484 >
1485 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1486 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1487 >        final Noop r = new Noop();
1488 >
1489 >        assertTrue(f.cancel(mayInterruptIfRunning));
1490 >        g.complete(v1);
1491 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1492 >
1493 >        checkCompletedWithWrappedCancellationException(h);
1494 >        checkCancelled(f);
1495 >        assertFalse(r.ran);
1496 >        checkCompletedNormally(g, v1);
1497 >        }
1498      }
1499  
1500      /**
# Line 1171 | Line 1636 | public class CompletableFutureTest exten
1636          checkCompletedWithWrappedCancellationException(g);
1637      }
1638  
1174
1639      /**
1640       * runAfterEither result completes normally after normal completion
1641       * of either source
# Line 1320 | Line 1784 | public class CompletableFutureTest exten
1784          checkCompletedWithWrappedCancellationException(g);
1785      }
1786  
1323
1787      // asyncs
1788  
1789      /**
# Line 1353 | Line 1816 | public class CompletableFutureTest exten
1816          try {
1817              g.join();
1818              shouldThrow();
1819 <        } catch (Exception ok) {
1357 <        }
1819 >        } catch (CompletionException success) {}
1820          checkCompletedWithWrappedCFException(g);
1821      }
1822  
# Line 1585 | Line 2047 | public class CompletableFutureTest exten
2047      }
2048  
2049      /**
1588     * thenAcceptBothAsync result completes normally after normal
1589     * completion of sources
1590     */
1591    public void testThenAcceptBothAsync() {
1592        CompletableFuture<Integer> f, g;
1593        CompletableFuture<Void> h;
1594        SubtractAction r;
1595
1596        f = new CompletableFuture<>();
1597        g = new CompletableFuture<>();
1598        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1599        f.complete(3);
1600        checkIncomplete(h);
1601        g.complete(1);
1602        checkCompletedNormally(h, null);
1603        assertEquals(r.value, 2);
1604
1605        f = new CompletableFuture<>();
1606        g = new CompletableFuture<>();
1607        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1608        g.complete(1);
1609        checkIncomplete(h);
1610        f.complete(3);
1611        checkCompletedNormally(h, null);
1612        assertEquals(r.value, 2);
1613
1614        f = new CompletableFuture<>();
1615        g = new CompletableFuture<>();
1616        g.complete(1);
1617        f.complete(3);
1618        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1619        checkCompletedNormally(h, null);
1620        assertEquals(r.value, 2);
1621    }
1622
1623    /**
1624     * thenAcceptBothAsync result completes exceptionally after exceptional
1625     * completion of source
1626     */
1627    public void testThenAcceptBothAsync2() {
1628        CompletableFuture<Integer> f, g;
1629        CompletableFuture<Void> h;
1630        SubtractAction r;
1631
1632        f = new CompletableFuture<>();
1633        g = new CompletableFuture<>();
1634        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1635        f.completeExceptionally(new CFException());
1636        checkIncomplete(h);
1637        g.complete(1);
1638        checkCompletedWithWrappedCFException(h);
1639
1640        f = new CompletableFuture<>();
1641        g = new CompletableFuture<>();
1642        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1643        g.completeExceptionally(new CFException());
1644        checkIncomplete(h);
1645        f.complete(3);
1646        checkCompletedWithWrappedCFException(h);
1647
1648        f = new CompletableFuture<>();
1649        g = new CompletableFuture<>();
1650        f.complete(3);
1651        g.completeExceptionally(new CFException());
1652        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1653        checkCompletedWithWrappedCFException(h);
1654
1655        f = new CompletableFuture<>();
1656        g = new CompletableFuture<>();
1657        f.completeExceptionally(new CFException());
1658        g.complete(3);
1659        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1660        checkCompletedWithWrappedCFException(h);
1661    }
1662
1663    /**
1664     * thenAcceptBothAsync result completes exceptionally if action does
1665     */
1666    public void testThenAcceptBothAsync3() {
1667        CompletableFuture<Integer> f, g;
1668        CompletableFuture<Void> h;
1669        FailingBiConsumer r;
1670
1671        f = new CompletableFuture<>();
1672        g = new CompletableFuture<>();
1673        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1674        f.complete(3);
1675        checkIncomplete(h);
1676        g.complete(1);
1677        checkCompletedWithWrappedCFException(h);
1678
1679        f = new CompletableFuture<>();
1680        g = new CompletableFuture<>();
1681        f.complete(3);
1682        g.complete(1);
1683        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1684        checkCompletedWithWrappedCFException(h);
1685    }
1686
1687    /**
1688     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1689     */
1690    public void testThenAcceptBothAsync4() {
1691        CompletableFuture<Integer> f, g;
1692        CompletableFuture<Void> h;
1693        SubtractAction r;
1694
1695        f = new CompletableFuture<>();
1696        g = new CompletableFuture<>();
1697        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1698        assertTrue(f.cancel(true));
1699        checkIncomplete(h);
1700        g.complete(1);
1701        checkCompletedWithWrappedCancellationException(h);
1702
1703        f = new CompletableFuture<>();
1704        g = new CompletableFuture<>();
1705        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1706        assertTrue(g.cancel(true));
1707        checkIncomplete(h);
1708        f.complete(3);
1709        checkCompletedWithWrappedCancellationException(h);
1710
1711        f = new CompletableFuture<>();
1712        g = new CompletableFuture<>();
1713        f.complete(3);
1714        assertTrue(g.cancel(true));
1715        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1716        checkCompletedWithWrappedCancellationException(h);
1717
1718        f = new CompletableFuture<>();
1719        g = new CompletableFuture<>();
1720        assertTrue(f.cancel(true));
1721        g.complete(3);
1722        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1723        checkCompletedWithWrappedCancellationException(h);
1724    }
1725
1726    /**
1727     * runAfterBothAsync result completes normally after normal
1728     * completion of sources
1729     */
1730    public void testRunAfterBothAsync() {
1731        CompletableFuture<Integer> f = new CompletableFuture<>();
1732        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1733        Noop r = new Noop();
1734        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1735        f.complete(one);
1736        checkIncomplete(g);
1737        f2.complete(two);
1738        checkCompletedNormally(g, null);
1739        assertTrue(r.ran);
1740    }
1741
1742    /**
1743     * runAfterBothAsync result completes exceptionally after exceptional
1744     * completion of source
1745     */
1746    public void testRunAfterBothAsync2() {
1747        CompletableFuture<Integer> f = new CompletableFuture<>();
1748        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1749        Noop r = new Noop();
1750        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1751        f.completeExceptionally(new CFException());
1752        f2.complete(two);
1753        checkCompletedWithWrappedCFException(g);
1754
1755        r = new Noop();
1756        f = new CompletableFuture<>();
1757        f2 = new CompletableFuture<>();
1758        g = f.runAfterBothAsync(f2, r);
1759        f.complete(one);
1760        f2.completeExceptionally(new CFException());
1761        checkCompletedWithWrappedCFException(g);
1762    }
1763
1764    /**
1765     * runAfterBothAsync result completes exceptionally if action does
1766     */
1767    public void testRunAfterBothAsync3() {
1768        CompletableFuture<Integer> f = new CompletableFuture<>();
1769        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1770        FailingNoop r = new FailingNoop();
1771        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1772        f.complete(one);
1773        checkIncomplete(g);
1774        f2.complete(two);
1775        checkCompletedWithWrappedCFException(g);
1776    }
1777
1778    /**
1779     * runAfterBothAsync result completes exceptionally if either source cancelled
1780     */
1781    public void testRunAfterBothAsync4() {
1782        CompletableFuture<Integer> f = new CompletableFuture<>();
1783        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1784        Noop r = new Noop();
1785        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1786        assertTrue(f.cancel(true));
1787        f2.complete(two);
1788        checkCompletedWithWrappedCancellationException(g);
1789
1790        r = new Noop();
1791        f = new CompletableFuture<>();
1792        f2 = new CompletableFuture<>();
1793        g = f.runAfterBothAsync(f2, r);
1794        f.complete(one);
1795        assertTrue(f2.cancel(true));
1796        checkCompletedWithWrappedCancellationException(g);
1797    }
1798
1799    /**
2050       * applyToEitherAsync result completes normally after normal
2051       * completion of sources
2052       */
# Line 2088 | Line 2338 | public class CompletableFutureTest exten
2338          checkCompletedWithWrappedCancellationException(g);
2339      }
2340  
2091
2341      // async with explicit executors
2342  
2343      /**
# Line 2121 | Line 2370 | public class CompletableFutureTest exten
2370          try {
2371              g.join();
2372              shouldThrow();
2373 <        } catch (Exception ok) {
2125 <        }
2373 >        } catch (CompletionException success) {}
2374          checkCompletedWithWrappedCFException(g);
2375      }
2376  
# Line 2367 | Line 2615 | public class CompletableFutureTest exten
2615      }
2616  
2617      /**
2370     * thenAcceptBothAsync result completes normally after normal
2371     * completion of sources
2372     */
2373    public void testThenAcceptBothAsyncE() {
2374        CompletableFuture<Integer> f, g;
2375        CompletableFuture<Void> h;
2376        SubtractAction r;
2377        ThreadExecutor e = new ThreadExecutor();
2378
2379        f = new CompletableFuture<>();
2380        g = new CompletableFuture<>();
2381        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2382        f.complete(3);
2383        checkIncomplete(h);
2384        g.complete(1);
2385        checkCompletedNormally(h, null);
2386        assertEquals(r.value, 2);
2387
2388        f = new CompletableFuture<>();
2389        g = new CompletableFuture<>();
2390        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2391        g.complete(1);
2392        checkIncomplete(h);
2393        f.complete(3);
2394        checkCompletedNormally(h, null);
2395        assertEquals(r.value, 2);
2396
2397        f = new CompletableFuture<>();
2398        g = new CompletableFuture<>();
2399        g.complete(1);
2400        f.complete(3);
2401        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2402        checkCompletedNormally(h, null);
2403        assertEquals(r.value, 2);
2404
2405        assertEquals(3, e.count.get());
2406    }
2407
2408    /**
2409     * thenAcceptBothAsync result completes exceptionally after exceptional
2410     * completion of source
2411     */
2412    public void testThenAcceptBothAsync2E() {
2413        CompletableFuture<Integer> f, g;
2414        CompletableFuture<Void> h;
2415        SubtractAction r;
2416        ThreadExecutor e = new ThreadExecutor();
2417
2418        f = new CompletableFuture<>();
2419        g = new CompletableFuture<>();
2420        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2421        f.completeExceptionally(new CFException());
2422        checkIncomplete(h);
2423        g.complete(1);
2424        checkCompletedWithWrappedCFException(h);
2425
2426        f = new CompletableFuture<>();
2427        g = new CompletableFuture<>();
2428        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2429        g.completeExceptionally(new CFException());
2430        checkIncomplete(h);
2431        f.complete(3);
2432        checkCompletedWithWrappedCFException(h);
2433
2434        f = new CompletableFuture<>();
2435        g = new CompletableFuture<>();
2436        f.complete(3);
2437        g.completeExceptionally(new CFException());
2438        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2439        checkCompletedWithWrappedCFException(h);
2440
2441        f = new CompletableFuture<>();
2442        g = new CompletableFuture<>();
2443        f.completeExceptionally(new CFException());
2444        g.complete(3);
2445        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2446        checkCompletedWithWrappedCFException(h);
2447
2448        assertEquals(0, e.count.get());
2449    }
2450
2451    /**
2452     * thenAcceptBothAsync result completes exceptionally if action does
2453     */
2454    public void testThenAcceptBothAsync3E() {
2455        CompletableFuture<Integer> f, g;
2456        CompletableFuture<Void> h;
2457        FailingBiConsumer r;
2458        ThreadExecutor e = new ThreadExecutor();
2459
2460        f = new CompletableFuture<>();
2461        g = new CompletableFuture<>();
2462        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2463        f.complete(3);
2464        checkIncomplete(h);
2465        g.complete(1);
2466        checkCompletedWithWrappedCFException(h);
2467
2468        f = new CompletableFuture<>();
2469        g = new CompletableFuture<>();
2470        f.complete(3);
2471        g.complete(1);
2472        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2473        checkCompletedWithWrappedCFException(h);
2474
2475        assertEquals(2, e.count.get());
2476    }
2477
2478    /**
2479     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2480     */
2481    public void testThenAcceptBothAsync4E() {
2482        CompletableFuture<Integer> f, g;
2483        CompletableFuture<Void> h;
2484        SubtractAction r;
2485        ThreadExecutor e = new ThreadExecutor();
2486
2487        f = new CompletableFuture<>();
2488        g = new CompletableFuture<>();
2489        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2490        assertTrue(f.cancel(true));
2491        checkIncomplete(h);
2492        g.complete(1);
2493        checkCompletedWithWrappedCancellationException(h);
2494
2495        f = new CompletableFuture<>();
2496        g = new CompletableFuture<>();
2497        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2498        assertTrue(g.cancel(true));
2499        checkIncomplete(h);
2500        f.complete(3);
2501        checkCompletedWithWrappedCancellationException(h);
2502
2503        f = new CompletableFuture<>();
2504        g = new CompletableFuture<>();
2505        f.complete(3);
2506        assertTrue(g.cancel(true));
2507        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2508        checkCompletedWithWrappedCancellationException(h);
2509
2510        f = new CompletableFuture<>();
2511        g = new CompletableFuture<>();
2512        assertTrue(f.cancel(true));
2513        g.complete(3);
2514        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2515        checkCompletedWithWrappedCancellationException(h);
2516
2517        assertEquals(0, e.count.get());
2518    }
2519
2520    /**
2521     * runAfterBothAsync result completes normally after normal
2522     * completion of sources
2523     */
2524    public void testRunAfterBothAsyncE() {
2525        CompletableFuture<Integer> f = new CompletableFuture<>();
2526        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2527        Noop r = new Noop();
2528        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2529        f.complete(one);
2530        checkIncomplete(g);
2531        f2.complete(two);
2532        checkCompletedNormally(g, null);
2533        assertTrue(r.ran);
2534    }
2535
2536    /**
2537     * runAfterBothAsync result completes exceptionally after exceptional
2538     * completion of source
2539     */
2540    public void testRunAfterBothAsync2E() {
2541        CompletableFuture<Integer> f = new CompletableFuture<>();
2542        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2543        Noop r = new Noop();
2544        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2545        f.completeExceptionally(new CFException());
2546        f2.complete(two);
2547        checkCompletedWithWrappedCFException(g);
2548
2549        r = new Noop();
2550        f = new CompletableFuture<>();
2551        f2 = new CompletableFuture<>();
2552        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2553        f.complete(one);
2554        f2.completeExceptionally(new CFException());
2555        checkCompletedWithWrappedCFException(g);
2556    }
2557
2558    /**
2559     * runAfterBothAsync result completes exceptionally if action does
2560     */
2561    public void testRunAfterBothAsync3E() {
2562        CompletableFuture<Integer> f = new CompletableFuture<>();
2563        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2564        FailingNoop r = new FailingNoop();
2565        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2566        f.complete(one);
2567        checkIncomplete(g);
2568        f2.complete(two);
2569        checkCompletedWithWrappedCFException(g);
2570    }
2571
2572    /**
2573     * runAfterBothAsync result completes exceptionally if either source cancelled
2574     */
2575    public void testRunAfterBothAsync4E() {
2576        CompletableFuture<Integer> f = new CompletableFuture<>();
2577        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2578        Noop r = new Noop();
2579        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2580        assertTrue(f.cancel(true));
2581        f2.complete(two);
2582        checkCompletedWithWrappedCancellationException(g);
2583
2584        r = new Noop();
2585        f = new CompletableFuture<>();
2586        f2 = new CompletableFuture<>();
2587        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2588        f.complete(one);
2589        assertTrue(f2.cancel(true));
2590        checkCompletedWithWrappedCancellationException(g);
2591    }
2592
2593    /**
2618       * applyToEitherAsync result completes normally after normal
2619       * completion of sources
2620       */
# Line 2939 | Line 2963 | public class CompletableFutureTest exten
2963          ThreadExecutor exec = new ThreadExecutor();
2964  
2965          Runnable[] throwingActions = {
2966 <            () -> { CompletableFuture.supplyAsync(null); },
2967 <            () -> { CompletableFuture.supplyAsync(null, exec); },
2968 <            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
2969 <
2970 <            () -> { CompletableFuture.runAsync(null); },
2971 <            () -> { CompletableFuture.runAsync(null, exec); },
2972 <            () -> { CompletableFuture.runAsync(() -> {}, null); },
2973 <
2974 <            () -> { f.completeExceptionally(null); },
2975 <
2976 <            () -> { f.thenApply(null); },
2977 <            () -> { f.thenApplyAsync(null); },
2978 <            () -> { f.thenApplyAsync((x) -> x, null); },
2979 <            () -> { f.thenApplyAsync(null, exec); },
2980 <
2981 <            () -> { f.thenAccept(null); },
2982 <            () -> { f.thenAcceptAsync(null); },
2983 <            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2984 <            () -> { f.thenAcceptAsync(null, exec); },
2985 <
2986 <            () -> { f.thenRun(null); },
2987 <            () -> { f.thenRunAsync(null); },
2988 <            () -> { f.thenRunAsync(() -> { ; }, null); },
2989 <            () -> { f.thenRunAsync(null, exec); },
2990 <
2991 <            () -> { f.thenCombine(g, null); },
2992 <            () -> { f.thenCombineAsync(g, null); },
2993 <            () -> { f.thenCombineAsync(g, null, exec); },
2994 <            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2995 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2996 <            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2997 <            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2998 <
2999 <            () -> { f.thenAcceptBoth(g, null); },
3000 <            () -> { f.thenAcceptBothAsync(g, null); },
3001 <            () -> { f.thenAcceptBothAsync(g, null, exec); },
3002 <            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
3003 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
3004 <            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
3005 <            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
3006 <
3007 <            () -> { f.runAfterBoth(g, null); },
3008 <            () -> { f.runAfterBothAsync(g, null); },
3009 <            () -> { f.runAfterBothAsync(g, null, exec); },
3010 <            () -> { f.runAfterBoth(nullFuture, () -> {}); },
3011 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
3012 <            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
3013 <            () -> { f.runAfterBothAsync(g, () -> {}, null); },
3014 <
3015 <            () -> { f.applyToEither(g, null); },
3016 <            () -> { f.applyToEitherAsync(g, null); },
3017 <            () -> { f.applyToEitherAsync(g, null, exec); },
3018 <            () -> { f.applyToEither(nullFuture, (x) -> x); },
3019 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
3020 <            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
3021 <            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
3022 <
3023 <            () -> { f.acceptEither(g, null); },
3024 <            () -> { f.acceptEitherAsync(g, null); },
3025 <            () -> { f.acceptEitherAsync(g, null, exec); },
3026 <            () -> { f.acceptEither(nullFuture, (x) -> {}); },
3027 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
3028 <            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
3029 <            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
3030 <
3031 <            () -> { f.runAfterEither(g, null); },
3032 <            () -> { f.runAfterEitherAsync(g, null); },
3033 <            () -> { f.runAfterEitherAsync(g, null, exec); },
3034 <            () -> { f.runAfterEither(nullFuture, () -> {}); },
3035 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
3036 <            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
3037 <            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
3038 <
3039 <            () -> { f.thenCompose(null); },
3040 <            () -> { f.thenComposeAsync(null); },
3041 <            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
3042 <            () -> { f.thenComposeAsync(null, exec); },
3043 <
3044 <            () -> { f.exceptionally(null); },
3045 <
3046 <            () -> { f.handle(null); },
3047 <
3048 <            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
3049 <            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3050 <            () -> { CompletableFuture.allOf(f, null); },
3051 <            () -> { CompletableFuture.allOf(null, f); },
3052 <
3053 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3054 <            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3055 <            () -> { CompletableFuture.anyOf(f, null); },
3056 <            () -> { CompletableFuture.anyOf(null, f); },
2966 >            () -> CompletableFuture.supplyAsync(null),
2967 >            () -> CompletableFuture.supplyAsync(null, exec),
2968 >            () -> CompletableFuture.supplyAsync(supplyOne, null),
2969 >
2970 >            () -> CompletableFuture.runAsync(null),
2971 >            () -> CompletableFuture.runAsync(null, exec),
2972 >            () -> CompletableFuture.runAsync(() -> {}, null),
2973 >
2974 >            () -> f.completeExceptionally(null),
2975 >
2976 >            () -> f.thenApply(null),
2977 >            () -> f.thenApplyAsync(null),
2978 >            () -> f.thenApplyAsync((x) -> x, null),
2979 >            () -> f.thenApplyAsync(null, exec),
2980 >
2981 >            () -> f.thenAccept(null),
2982 >            () -> f.thenAcceptAsync(null),
2983 >            () -> f.thenAcceptAsync((x) -> {} , null),
2984 >            () -> f.thenAcceptAsync(null, exec),
2985 >
2986 >            () -> f.thenRun(null),
2987 >            () -> f.thenRunAsync(null),
2988 >            () -> f.thenRunAsync(() -> {} , null),
2989 >            () -> f.thenRunAsync(null, exec),
2990 >
2991 >            () -> f.thenCombine(g, null),
2992 >            () -> f.thenCombineAsync(g, null),
2993 >            () -> f.thenCombineAsync(g, null, exec),
2994 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
2995 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
2996 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
2997 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
2998 >
2999 >            () -> f.thenAcceptBoth(g, null),
3000 >            () -> f.thenAcceptBothAsync(g, null),
3001 >            () -> f.thenAcceptBothAsync(g, null, exec),
3002 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3003 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3004 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3005 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3006 >
3007 >            () -> f.runAfterBoth(g, null),
3008 >            () -> f.runAfterBothAsync(g, null),
3009 >            () -> f.runAfterBothAsync(g, null, exec),
3010 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3011 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3012 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3013 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3014 >
3015 >            () -> f.applyToEither(g, null),
3016 >            () -> f.applyToEitherAsync(g, null),
3017 >            () -> f.applyToEitherAsync(g, null, exec),
3018 >            () -> f.applyToEither(nullFuture, (x) -> x),
3019 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3020 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3021 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3022 >
3023 >            () -> f.acceptEither(g, null),
3024 >            () -> f.acceptEitherAsync(g, null),
3025 >            () -> f.acceptEitherAsync(g, null, exec),
3026 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3027 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3028 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3029 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3030 >
3031 >            () -> f.runAfterEither(g, null),
3032 >            () -> f.runAfterEitherAsync(g, null),
3033 >            () -> f.runAfterEitherAsync(g, null, exec),
3034 >            () -> f.runAfterEither(nullFuture, () -> {}),
3035 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3036 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3037 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3038 >
3039 >            () -> f.thenCompose(null),
3040 >            () -> f.thenComposeAsync(null),
3041 >            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3042 >            () -> f.thenComposeAsync(null, exec),
3043 >
3044 >            () -> f.exceptionally(null),
3045 >
3046 >            () -> f.handle(null),
3047 >
3048 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3049 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3050 >            () -> CompletableFuture.allOf(f, null),
3051 >            () -> CompletableFuture.allOf(null, f),
3052 >
3053 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3054 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3055 >            () -> CompletableFuture.anyOf(f, null),
3056 >            () -> CompletableFuture.anyOf(null, f),
3057 >
3058 >            () -> f.obtrudeException(null),
3059          };
3060  
3061          assertThrows(NullPointerException.class, throwingActions);
# Line 3181 | Line 3207 | public class CompletableFutureTest exten
3207          checkCompletedWithWrappedCFException(g);
3208      }
3209  
3184
3210      /**
3211       * handleAsync action completes normally with function value on
3212       * either normal or exceptional completion of source

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines