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.46 by jsr166, Mon Jun 2 17:41:22 2014 UTC vs.
Revision 1.52 by jsr166, Mon Jun 2 20:10:04 2014 UTC

# Line 17 | Line 17 | import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19   import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 414 | Line 416 | public class CompletableFutureTest exten
416              throw new CFException();
417          }
418      }
419 <    static final class FailingNoop implements Runnable {
419 >    static final class FailingRunnable implements Runnable {
420          int invocationCount = 0;
421          public void run() {
422              invocationCount++;
# Line 458 | Line 460 | public class CompletableFutureTest exten
460       */
461      enum ExecutionMode {
462          DEFAULT {
463 +            public void checkExecutionMode() {
464 +                assertNull(ForkJoinTask.getPool());
465 +            }
466              public <T> CompletableFuture<Void> thenRun
467                  (CompletableFuture<T> f, Runnable a) {
468                  return f.thenRun(a);
# Line 521 | Line 526 | public class CompletableFutureTest exten
526              }
527          },
528  
529 <        DEFAULT_ASYNC {
529 >        ASYNC {
530 >            public void checkExecutionMode() {
531 >                assertSame(ForkJoinPool.commonPool(),
532 >                           ForkJoinTask.getPool());
533 >            }
534              public <T> CompletableFuture<Void> thenRun
535                  (CompletableFuture<T> f, Runnable a) {
536                  return f.thenRunAsync(a);
# Line 586 | Line 595 | public class CompletableFutureTest exten
595          },
596  
597          EXECUTOR {
598 +            public void checkExecutionMode() {
599 +                //TODO
600 +            }
601              public <T> CompletableFuture<Void> thenRun
602                  (CompletableFuture<T> f, Runnable a) {
603                  return f.thenRunAsync(a, new ThreadExecutor());
# Line 649 | Line 661 | public class CompletableFutureTest exten
661              }
662          };
663  
664 +        public abstract void checkExecutionMode();
665          public abstract <T> CompletableFuture<Void> thenRun
666              (CompletableFuture<T> f, Runnable a);
667          public abstract <T> CompletableFuture<Void> thenAccept
# Line 920 | Line 933 | public class CompletableFutureTest exten
933       * failing runAsync completes exceptionally after running Runnable
934       */
935      public void testRunAsync3() {
936 <        FailingNoop r = new FailingNoop();
936 >        FailingRunnable r = new FailingRunnable();
937          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
938          checkCompletedWithWrappedCFException(f);
939          assertEquals(1, r.invocationCount);
# Line 961 | Line 974 | public class CompletableFutureTest exten
974      /**
975       * thenRun result completes normally after normal completion of source
976       */
977 <    public void testThenRun() {
978 <        CompletableFuture<Integer> f;
979 <        CompletableFuture<Void> g;
980 <        Noop r;
977 >    public void testThenRun_normalCompletion() {
978 >        for (ExecutionMode m : ExecutionMode.values())
979 >        for (boolean createIncomplete : new boolean[] { true, false })
980 >        for (Integer v1 : new Integer[] { 1, null })
981 >    {
982 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
983 >        final Noop r = new Noop();
984 >        if (!createIncomplete) f.complete(v1);
985 >        final CompletableFuture<Void> g = m.thenRun(f, r);
986 >        if (createIncomplete) {
987 >            checkIncomplete(g);
988 >            f.complete(v1);
989 >        }
990  
969        f = new CompletableFuture<>();
970        g = f.thenRun(r = new Noop());
971        f.complete(null);
972        checkCompletedNormally(g, null);
973        assertEquals(1, r.invocationCount);
974
975        f = new CompletableFuture<>();
976        f.complete(null);
977        g = f.thenRun(r = new Noop());
991          checkCompletedNormally(g, null);
992 +        checkCompletedNormally(f, v1);
993          assertEquals(1, r.invocationCount);
994 <    }
994 >    }}
995  
996      /**
997       * thenRun result completes exceptionally after exceptional
998       * completion of source
999       */
1000 <    public void testThenRun2() {
1001 <        CompletableFuture<Integer> f;
1002 <        CompletableFuture<Void> g;
1003 <        Noop r;
1004 <
1005 <        f = new CompletableFuture<>();
1006 <        g = f.thenRun(r = new Noop());
1007 <        f.completeExceptionally(new CFException());
1008 <        checkCompletedWithWrappedCFException(g);
1009 <        assertEquals(0, r.invocationCount);
1000 >    public void testThenRun_exceptionalCompletion() {
1001 >        for (ExecutionMode m : ExecutionMode.values())
1002 >        for (boolean createIncomplete : new boolean[] { true, false })
1003 >    {
1004 >        final CFException ex = new CFException();
1005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 >        final Noop r = new Noop();
1007 >        if (!createIncomplete) f.completeExceptionally(ex);
1008 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1009 >        if (createIncomplete) {
1010 >            checkIncomplete(g);
1011 >            f.completeExceptionally(ex);
1012 >        }
1013  
1014 <        f = new CompletableFuture<>();
1015 <        f.completeExceptionally(new CFException());
999 <        g = f.thenRun(r = new Noop());
1000 <        checkCompletedWithWrappedCFException(g);
1014 >        checkCompletedWithWrappedCFException(g, ex);
1015 >        checkCompletedWithWrappedCFException(f, ex);
1016          assertEquals(0, r.invocationCount);
1017 <    }
1017 >    }}
1018  
1019      /**
1020 <     * thenRun result completes exceptionally if action does
1020 >     * thenRun result completes exceptionally if source cancelled
1021       */
1022 <    public void testThenRun3() {
1023 <        CompletableFuture<Integer> f;
1024 <        CompletableFuture<Void> g;
1025 <        FailingNoop r;
1026 <
1027 <        f = new CompletableFuture<>();
1028 <        g = f.thenRun(r = new FailingNoop());
1029 <        f.complete(null);
1030 <        checkCompletedWithWrappedCFException(g);
1022 >    public void testThenRun_sourceCancelled() {
1023 >        for (ExecutionMode m : ExecutionMode.values())
1024 >        for (boolean createIncomplete : new boolean[] { true, false })
1025 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1026 >    {
1027 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1028 >        final Noop r = new Noop();
1029 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1030 >        final CompletableFuture<Void> g = f.thenRun(r);
1031 >        if (createIncomplete) {
1032 >            checkIncomplete(g);
1033 >            assertTrue(f.cancel(mayInterruptIfRunning));
1034 >        }
1035  
1036 <        f = new CompletableFuture<>();
1037 <        f.complete(null);
1038 <        g = f.thenRun(r = new FailingNoop());
1039 <        checkCompletedWithWrappedCFException(g);
1021 <    }
1036 >        checkCompletedWithWrappedCancellationException(g);
1037 >        checkCancelled(f);
1038 >        assertEquals(0, r.invocationCount);
1039 >    }}
1040  
1041      /**
1042 <     * thenRun result completes exceptionally if source cancelled
1042 >     * thenRun result completes exceptionally if action does
1043       */
1044 <    public void testThenRun4() {
1045 <        CompletableFuture<Integer> f;
1046 <        CompletableFuture<Void> g;
1047 <        Noop r;
1048 <
1049 <        f = new CompletableFuture<>();
1050 <        g = f.thenRun(r = new Noop());
1051 <        assertTrue(f.cancel(true));
1052 <        checkCompletedWithWrappedCancellationException(g);
1044 >    public void testThenRun_actionFailed() {
1045 >        for (ExecutionMode m : ExecutionMode.values())
1046 >        for (boolean createIncomplete : new boolean[] { true, false })
1047 >        for (Integer v1 : new Integer[] { 1, null })
1048 >    {
1049 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1050 >        final FailingRunnable r = new FailingRunnable();
1051 >        if (!createIncomplete) f.complete(v1);
1052 >        final CompletableFuture<Void> g = f.thenRun(r);
1053 >        if (createIncomplete) {
1054 >            checkIncomplete(g);
1055 >            f.complete(v1);
1056 >        }
1057  
1058 <        f = new CompletableFuture<>();
1059 <        assertTrue(f.cancel(true));
1060 <        g = f.thenRun(r = new Noop());
1039 <        checkCompletedWithWrappedCancellationException(g);
1040 <    }
1058 >        checkCompletedWithWrappedCFException(g);
1059 >        checkCompletedNormally(f, v1);
1060 >    }}
1061  
1062      /**
1063       * thenApply result completes normally after normal completion of source
1064       */
1065 <    public void testThenApply() {
1066 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1067 <        CompletableFuture<Integer> g = f.thenApply(inc);
1068 <        f.complete(one);
1069 <        checkCompletedNormally(g, two);
1070 <    }
1065 >    public void testThenApply_normalCompletion() {
1066 >        for (ExecutionMode m : ExecutionMode.values())
1067 >        for (boolean createIncomplete : new boolean[] { true, false })
1068 >        for (Integer v1 : new Integer[] { 1, null })
1069 >    {
1070 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1071 >        final IncFunction r = new IncFunction();
1072 >        if (!createIncomplete) f.complete(v1);
1073 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1074 >        if (createIncomplete) {
1075 >            checkIncomplete(g);
1076 >            f.complete(v1);
1077 >        }
1078 >
1079 >        checkCompletedNormally(g, inc(v1));
1080 >        checkCompletedNormally(f, v1);
1081 >        assertEquals(1, r.invocationCount);
1082 >    }}
1083  
1084      /**
1085       * thenApply result completes exceptionally after exceptional
1086       * completion of source
1087       */
1088 <    public void testThenApply2() {
1089 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1090 <        CompletableFuture<Integer> g = f.thenApply(inc);
1091 <        f.completeExceptionally(new CFException());
1092 <        checkCompletedWithWrappedCFException(g);
1093 <    }
1088 >    public void testThenApply_exceptionalCompletion() {
1089 >        for (ExecutionMode m : ExecutionMode.values())
1090 >        for (boolean createIncomplete : new boolean[] { true, false })
1091 >    {
1092 >        final CFException ex = new CFException();
1093 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1094 >        final IncFunction r = new IncFunction();
1095 >        if (!createIncomplete) f.completeExceptionally(ex);
1096 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1097 >        if (createIncomplete) {
1098 >            checkIncomplete(g);
1099 >            f.completeExceptionally(ex);
1100 >        }
1101  
1102 <    /**
1103 <     * thenApply result completes exceptionally if action does
1104 <     */
1105 <    public void testThenApply3() {
1067 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1068 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1069 <        f.complete(one);
1070 <        checkCompletedWithWrappedCFException(g);
1071 <    }
1102 >        checkCompletedWithWrappedCFException(g, ex);
1103 >        checkCompletedWithWrappedCFException(f, ex);
1104 >        assertEquals(0, r.invocationCount);
1105 >    }}
1106  
1107      /**
1108       * thenApply result completes exceptionally if source cancelled
1109       */
1110 <    public void testThenApply4() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1112 <        CompletableFuture<Integer> g = f.thenApply(inc);
1113 <        assertTrue(f.cancel(true));
1110 >    public void testThenApply_sourceCancelled() {
1111 >        for (ExecutionMode m : ExecutionMode.values())
1112 >        for (boolean createIncomplete : new boolean[] { true, false })
1113 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1114 >    {
1115 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1116 >        final IncFunction r = new IncFunction();
1117 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1118 >        final CompletableFuture<Integer> g = f.thenApply(r);
1119 >        if (createIncomplete) {
1120 >            checkIncomplete(g);
1121 >            assertTrue(f.cancel(mayInterruptIfRunning));
1122 >        }
1123 >
1124          checkCompletedWithWrappedCancellationException(g);
1125 <    }
1125 >        checkCancelled(f);
1126 >        assertEquals(0, r.invocationCount);
1127 >    }}
1128 >
1129 >    /**
1130 >     * thenApply result completes exceptionally if action does
1131 >     */
1132 >    public void testThenApply_actionFailed() {
1133 >        for (ExecutionMode m : ExecutionMode.values())
1134 >        for (boolean createIncomplete : new boolean[] { true, false })
1135 >        for (Integer v1 : new Integer[] { 1, null })
1136 >    {
1137 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1138 >        final FailingFunction r = new FailingFunction();
1139 >        if (!createIncomplete) f.complete(v1);
1140 >        final CompletableFuture<Integer> g = f.thenApply(r);
1141 >        if (createIncomplete) {
1142 >            checkIncomplete(g);
1143 >            f.complete(v1);
1144 >        }
1145 >
1146 >        checkCompletedWithWrappedCFException(g);
1147 >        checkCompletedNormally(f, v1);
1148 >    }}
1149  
1150      /**
1151       * thenAccept result completes normally after normal completion of source
1152       */
1153 <    public void testThenAccept() {
1154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1155 <        IncAction r = new IncAction();
1156 <        CompletableFuture<Void> g = f.thenAccept(r);
1157 <        f.complete(one);
1153 >    public void testThenAccept_normalCompletion() {
1154 >        for (ExecutionMode m : ExecutionMode.values())
1155 >        for (boolean createIncomplete : new boolean[] { true, false })
1156 >        for (Integer v1 : new Integer[] { 1, null })
1157 >    {
1158 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1159 >        final IncAction r = new IncAction();
1160 >        if (!createIncomplete) f.complete(v1);
1161 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1162 >        if (createIncomplete) {
1163 >            checkIncomplete(g);
1164 >            f.complete(v1);
1165 >        }
1166 >
1167          checkCompletedNormally(g, null);
1168 <        assertEquals(r.value, (Integer) 2);
1169 <    }
1168 >        checkCompletedNormally(f, v1);
1169 >        assertEquals(1, r.invocationCount);
1170 >        assertEquals(inc(v1), r.value);
1171 >    }}
1172  
1173      /**
1174       * thenAccept result completes exceptionally after exceptional
1175       * completion of source
1176       */
1177 <    public void testThenAccept2() {
1178 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1179 <        IncAction r = new IncAction();
1180 <        CompletableFuture<Void> g = f.thenAccept(r);
1181 <        f.completeExceptionally(new CFException());
1182 <        checkCompletedWithWrappedCFException(g);
1183 <    }
1177 >    public void testThenAccept_exceptionalCompletion() {
1178 >        for (ExecutionMode m : ExecutionMode.values())
1179 >        for (boolean createIncomplete : new boolean[] { true, false })
1180 >    {
1181 >        final CFException ex = new CFException();
1182 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1183 >        final IncAction r = new IncAction();
1184 >        if (!createIncomplete) f.completeExceptionally(ex);
1185 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1186 >        if (createIncomplete) {
1187 >            checkIncomplete(g);
1188 >            f.completeExceptionally(ex);
1189 >        }
1190 >
1191 >        checkCompletedWithWrappedCFException(g, ex);
1192 >        checkCompletedWithWrappedCFException(f, ex);
1193 >        assertEquals(0, r.invocationCount);
1194 >    }}
1195  
1196      /**
1197       * thenAccept result completes exceptionally if action does
1198       */
1199 <    public void testThenAccept3() {
1200 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1201 <        FailingConsumer r = new FailingConsumer();
1202 <        CompletableFuture<Void> g = f.thenAccept(r);
1203 <        f.complete(one);
1199 >    public void testThenAccept_actionFailed() {
1200 >        for (ExecutionMode m : ExecutionMode.values())
1201 >        for (boolean createIncomplete : new boolean[] { true, false })
1202 >        for (Integer v1 : new Integer[] { 1, null })
1203 >    {
1204 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1205 >        final FailingConsumer r = new FailingConsumer();
1206 >        if (!createIncomplete) f.complete(v1);
1207 >        final CompletableFuture<Void> g = f.thenAccept(r);
1208 >        if (createIncomplete) {
1209 >            checkIncomplete(g);
1210 >            f.complete(v1);
1211 >        }
1212 >
1213          checkCompletedWithWrappedCFException(g);
1214 <        assertEquals(1, r.invocationCount);
1215 <    }
1214 >        checkCompletedNormally(f, v1);
1215 >    }}
1216  
1217      /**
1218       * thenAccept result completes exceptionally if source cancelled
1219       */
1220 <    public void testThenAccept4() {
1221 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        IncAction r = new IncAction();
1223 <        CompletableFuture<Void> g = f.thenAccept(r);
1224 <        assertTrue(f.cancel(true));
1220 >    public void testThenAccept_sourceCancelled() {
1221 >        for (ExecutionMode m : ExecutionMode.values())
1222 >        for (boolean createIncomplete : new boolean[] { true, false })
1223 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1224 >    {
1225 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1226 >        final IncAction r = new IncAction();
1227 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1228 >        final CompletableFuture<Void> g = f.thenAccept(r);
1229 >        if (createIncomplete) {
1230 >            checkIncomplete(g);
1231 >            assertTrue(f.cancel(mayInterruptIfRunning));
1232 >        }
1233 >
1234          checkCompletedWithWrappedCancellationException(g);
1235 <    }
1235 >        checkCancelled(f);
1236 >        assertEquals(0, r.invocationCount);
1237 >    }}
1238  
1239      /**
1240       * thenCombine result completes normally after normal completion
1241       * of sources
1242       */
1243 <    public void testThenCombine_normalCompletion1() {
1243 >    public void testThenCombine_normalCompletion() {
1244 >        for (ExecutionMode m : ExecutionMode.values())
1245          for (boolean createIncomplete : new boolean[] { true, false })
1246          for (boolean fFirst : new boolean[] { true, false })
1137        for (ExecutionMode m : ExecutionMode.values())
1247          for (Integer v1 : new Integer[] { 1, null })
1248 <        for (Integer v2 : new Integer[] { 2, null }) {
1249 <
1248 >        for (Integer v2 : new Integer[] { 2, null })
1249 >    {
1250          final CompletableFuture<Integer> f = new CompletableFuture<>();
1251          final CompletableFuture<Integer> g = new CompletableFuture<>();
1252          final SubtractFunction r = new SubtractFunction();
1144        CompletableFuture<Integer> h = null;
1145        if (createIncomplete) h = m.thenCombine(f, g, r);
1253  
1254 <        if (fFirst)
1255 <            f.complete(v1);
1256 <        else
1257 <            g.complete(v2);
1258 <        if (createIncomplete) checkIncomplete(h);
1259 <        assertEquals(0, r.invocationCount);
1260 <        if (!fFirst)
1261 <            f.complete(v1);
1262 <        else
1156 <            g.complete(v2);
1157 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1254 >        if (fFirst) f.complete(v1); else g.complete(v2);
1255 >        if (!createIncomplete)
1256 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1257 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1258 >        if (createIncomplete) {
1259 >            checkIncomplete(h);
1260 >            assertEquals(0, r.invocationCount);
1261 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1262 >        }
1263  
1264          checkCompletedNormally(h, subtract(v1, v2));
1265          checkCompletedNormally(f, v1);
1266          checkCompletedNormally(g, v2);
1267          assertEquals(1, r.invocationCount);
1268 <        }
1164 <    }
1268 >    }}
1269  
1270      /**
1271       * thenCombine result completes exceptionally after exceptional
1272       * completion of either source
1273       */
1274 <    public void testThenCombine_exceptionalCompletion1() {
1274 >    public void testThenCombine_exceptionalCompletion() {
1275          for (ExecutionMode m : ExecutionMode.values())
1276 <        for (Integer v1 : new Integer[] { 1, null }) {
1277 <
1276 >        for (boolean createIncomplete : new boolean[] { true, false })
1277 >        for (boolean fFirst : new boolean[] { true, false })
1278 >        for (Integer v1 : new Integer[] { 1, null })
1279 >    {
1280          final CompletableFuture<Integer> f = new CompletableFuture<>();
1281          final CompletableFuture<Integer> g = new CompletableFuture<>();
1176        final SubtractFunction r = new SubtractFunction();
1177        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1282          final CFException ex = new CFException();
1179
1180        f.completeExceptionally(ex);
1181        checkIncomplete(h);
1182        g.complete(v1);
1183
1184        checkCompletedWithWrappedCFException(h, ex);
1185        checkCompletedWithWrappedCFException(f, ex);
1186        assertEquals(0, r.invocationCount);
1187        checkCompletedNormally(g, v1);
1188        }
1189    }
1190
1191    public void testThenCombine_exceptionalCompletion2() {
1192        for (ExecutionMode m : ExecutionMode.values())
1193        for (Integer v1 : new Integer[] { 1, null }) {
1194
1195        final CompletableFuture<Integer> f = new CompletableFuture<>();
1196        final CompletableFuture<Integer> g = new CompletableFuture<>();
1283          final SubtractFunction r = new SubtractFunction();
1198        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1199        final CFException ex = new CFException();
1284  
1285 <        g.completeExceptionally(ex);
1286 <        checkIncomplete(h);
1287 <        f.complete(v1);
1204 <
1205 <        checkCompletedWithWrappedCFException(h, ex);
1206 <        checkCompletedWithWrappedCFException(g, ex);
1207 <        assertEquals(0, r.invocationCount);
1208 <        checkCompletedNormally(f, v1);
1209 <        }
1210 <    }
1211 <
1212 <    public void testThenCombine_exceptionalCompletion3() {
1213 <        for (ExecutionMode m : ExecutionMode.values())
1214 <        for (Integer v1 : new Integer[] { 1, null }) {
1215 <
1216 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1217 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1218 <        final SubtractFunction r = new SubtractFunction();
1219 <        final CFException ex = new CFException();
1220 <
1221 <        g.completeExceptionally(ex);
1222 <        f.complete(v1);
1285 >        (fFirst ? f : g).complete(v1);
1286 >        if (!createIncomplete)
1287 >            (!fFirst ? f : g).completeExceptionally(ex);
1288          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1289 <
1290 <        checkCompletedWithWrappedCFException(h, ex);
1291 <        checkCompletedWithWrappedCFException(g, ex);
1227 <        assertEquals(0, r.invocationCount);
1228 <        checkCompletedNormally(f, v1);
1289 >        if (createIncomplete) {
1290 >            checkIncomplete(h);
1291 >            (!fFirst ? f : g).completeExceptionally(ex);
1292          }
1230    }
1231
1232    public void testThenCombine_exceptionalCompletion4() {
1233        for (ExecutionMode m : ExecutionMode.values())
1234        for (Integer v1 : new Integer[] { 1, null }) {
1235
1236        final CompletableFuture<Integer> f = new CompletableFuture<>();
1237        final CompletableFuture<Integer> g = new CompletableFuture<>();
1238        final SubtractFunction r = new SubtractFunction();
1239        final CFException ex = new CFException();
1240
1241        f.completeExceptionally(ex);
1242        g.complete(v1);
1243        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1293  
1294          checkCompletedWithWrappedCFException(h, ex);
1246        checkCompletedWithWrappedCFException(f, ex);
1295          assertEquals(0, r.invocationCount);
1296 <        checkCompletedNormally(g, v1);
1297 <        }
1298 <    }
1296 >        checkCompletedNormally(fFirst ? f : g, v1);
1297 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1298 >    }}
1299  
1300      /**
1301       * thenCombine result completes exceptionally if action does
1302       */
1303 <    public void testThenCombine_actionFailed1() {
1303 >    public void testThenCombine_actionFailed() {
1304          for (ExecutionMode m : ExecutionMode.values())
1305 +        for (boolean fFirst : new boolean[] { true, false })
1306          for (Integer v1 : new Integer[] { 1, null })
1307 <        for (Integer v2 : new Integer[] { 2, null }) {
1308 <
1307 >        for (Integer v2 : new Integer[] { 2, null })
1308 >    {
1309          final CompletableFuture<Integer> f = new CompletableFuture<>();
1310          final CompletableFuture<Integer> g = new CompletableFuture<>();
1311          final FailingBiFunction r = new FailingBiFunction();
1312          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1313  
1314 <        f.complete(v1);
1315 <        checkIncomplete(h);
1316 <        g.complete(v2);
1317 <
1318 <        checkCompletedWithWrappedCFException(h);
1319 <        checkCompletedNormally(f, v1);
1271 <        checkCompletedNormally(g, v2);
1314 >        if (fFirst) {
1315 >            f.complete(v1);
1316 >            g.complete(v2);
1317 >        } else {
1318 >            g.complete(v2);
1319 >            f.complete(v1);
1320          }
1273    }
1274
1275    public void testThenCombine_actionFailed2() {
1276        for (ExecutionMode m : ExecutionMode.values())
1277        for (Integer v1 : new Integer[] { 1, null })
1278        for (Integer v2 : new Integer[] { 2, null }) {
1279
1280        final CompletableFuture<Integer> f = new CompletableFuture<>();
1281        final CompletableFuture<Integer> g = new CompletableFuture<>();
1282        final FailingBiFunction r = new FailingBiFunction();
1283        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1284
1285        g.complete(v2);
1286        checkIncomplete(h);
1287        f.complete(v1);
1321  
1322          checkCompletedWithWrappedCFException(h);
1323          checkCompletedNormally(f, v1);
1324          checkCompletedNormally(g, v2);
1325 <        }
1293 <    }
1325 >    }}
1326  
1327      /**
1328       * thenCombine result completes exceptionally if either source cancelled
1329       */
1330 <    public void testThenCombine_sourceCancelled1() {
1330 >    public void testThenCombine_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1332          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 <        for (Integer v1 : new Integer[] { 1, null }) {
1334 <
1333 >        for (boolean createIncomplete : new boolean[] { true, false })
1334 >        for (boolean fFirst : new boolean[] { true, false })
1335 >        for (Integer v1 : new Integer[] { 1, null })
1336 >    {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338          final CompletableFuture<Integer> g = new CompletableFuture<>();
1339          final SubtractFunction r = new SubtractFunction();
1306        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1307
1308        assertTrue(f.cancel(mayInterruptIfRunning));
1309        checkIncomplete(h);
1310        g.complete(v1);
1340  
1341 <        checkCompletedWithWrappedCancellationException(h);
1342 <        checkCancelled(f);
1343 <        assertEquals(0, r.invocationCount);
1315 <        checkCompletedNormally(g, v1);
1316 <        }
1317 <    }
1318 <
1319 <    public void testThenCombine_sourceCancelled2() {
1320 <        for (ExecutionMode m : ExecutionMode.values())
1321 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1322 <        for (Integer v1 : new Integer[] { 1, null }) {
1323 <
1324 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1325 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1326 <        final SubtractFunction r = new SubtractFunction();
1341 >        (fFirst ? f : g).complete(v1);
1342 >        if (!createIncomplete)
1343 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1344          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1345 <
1346 <        assertTrue(g.cancel(mayInterruptIfRunning));
1347 <        checkIncomplete(h);
1331 <        f.complete(v1);
1332 <
1333 <        checkCompletedWithWrappedCancellationException(h);
1334 <        checkCancelled(g);
1335 <        assertEquals(0, r.invocationCount);
1336 <        checkCompletedNormally(f, v1);
1345 >        if (createIncomplete) {
1346 >            checkIncomplete(h);
1347 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1348          }
1338    }
1339
1340    public void testThenCombine_sourceCancelled3() {
1341        for (ExecutionMode m : ExecutionMode.values())
1342        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1343        for (Integer v1 : new Integer[] { 1, null }) {
1344
1345        final CompletableFuture<Integer> f = new CompletableFuture<>();
1346        final CompletableFuture<Integer> g = new CompletableFuture<>();
1347        final SubtractFunction r = new SubtractFunction();
1348
1349        assertTrue(g.cancel(mayInterruptIfRunning));
1350        f.complete(v1);
1351        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1349  
1350          checkCompletedWithWrappedCancellationException(h);
1351 <        checkCancelled(g);
1351 >        checkCancelled(!fFirst ? f : g);
1352          assertEquals(0, r.invocationCount);
1353 <        checkCompletedNormally(f, v1);
1354 <        }
1358 <    }
1359 <
1360 <    public void testThenCombine_sourceCancelled4() {
1361 <        for (ExecutionMode m : ExecutionMode.values())
1362 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1363 <        for (Integer v1 : new Integer[] { 1, null }) {
1364 <
1365 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1366 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1367 <        final SubtractFunction r = new SubtractFunction();
1368 <
1369 <        assertTrue(f.cancel(mayInterruptIfRunning));
1370 <        g.complete(v1);
1371 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1372 <
1373 <        checkCompletedWithWrappedCancellationException(h);
1374 <        checkCancelled(f);
1375 <        assertEquals(0, r.invocationCount);
1376 <        checkCompletedNormally(g, v1);
1377 <        }
1378 <    }
1353 >        checkCompletedNormally(fFirst ? f : g, v1);
1354 >    }}
1355  
1356      /**
1357       * thenAcceptBoth result completes normally after normal
# Line 1384 | Line 1360 | public class CompletableFutureTest exten
1360      public void testThenAcceptBoth_normalCompletion1() {
1361          for (ExecutionMode m : ExecutionMode.values())
1362          for (Integer v1 : new Integer[] { 1, null })
1363 <        for (Integer v2 : new Integer[] { 2, null }) {
1364 <
1363 >        for (Integer v2 : new Integer[] { 2, null })
1364 >    {
1365          final CompletableFuture<Integer> f = new CompletableFuture<>();
1366          final CompletableFuture<Integer> g = new CompletableFuture<>();
1367          final SubtractAction r = new SubtractAction();
# Line 1400 | Line 1376 | public class CompletableFutureTest exten
1376          assertEquals(subtract(v1, v2), r.value);
1377          checkCompletedNormally(f, v1);
1378          checkCompletedNormally(g, v2);
1379 <        }
1404 <    }
1379 >    }}
1380  
1381      public void testThenAcceptBoth_normalCompletion2() {
1382          for (ExecutionMode m : ExecutionMode.values())
1383          for (Integer v1 : new Integer[] { 1, null })
1384 <        for (Integer v2 : new Integer[] { 2, null }) {
1385 <
1384 >        for (Integer v2 : new Integer[] { 2, null })
1385 >    {
1386          final CompletableFuture<Integer> f = new CompletableFuture<>();
1387          final CompletableFuture<Integer> g = new CompletableFuture<>();
1388          final SubtractAction r = new SubtractAction();
# Line 1422 | Line 1397 | public class CompletableFutureTest exten
1397          assertEquals(subtract(v1, v2), r.value);
1398          checkCompletedNormally(f, v1);
1399          checkCompletedNormally(g, v2);
1400 <        }
1426 <    }
1400 >    }}
1401  
1402      public void testThenAcceptBoth_normalCompletion3() {
1403          for (ExecutionMode m : ExecutionMode.values())
1404          for (Integer v1 : new Integer[] { 1, null })
1405 <        for (Integer v2 : new Integer[] { 2, null }) {
1406 <
1405 >        for (Integer v2 : new Integer[] { 2, null })
1406 >    {
1407          final CompletableFuture<Integer> f = new CompletableFuture<>();
1408          final CompletableFuture<Integer> g = new CompletableFuture<>();
1409          final SubtractAction r = new SubtractAction();
# Line 1442 | Line 1416 | public class CompletableFutureTest exten
1416          assertEquals(subtract(v1, v2), r.value);
1417          checkCompletedNormally(f, v1);
1418          checkCompletedNormally(g, v2);
1419 <        }
1446 <    }
1419 >    }}
1420  
1421      public void testThenAcceptBoth_normalCompletion4() {
1422          for (ExecutionMode m : ExecutionMode.values())
1423          for (Integer v1 : new Integer[] { 1, null })
1424 <        for (Integer v2 : new Integer[] { 2, null }) {
1425 <
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 SubtractAction r = new SubtractAction();
# Line 1462 | Line 1435 | public class CompletableFutureTest exten
1435          assertEquals(subtract(v1, v2), r.value);
1436          checkCompletedNormally(f, v1);
1437          checkCompletedNormally(g, v2);
1438 <        }
1466 <    }
1438 >    }}
1439  
1440      /**
1441       * thenAcceptBoth result completes exceptionally after exceptional
# Line 1471 | Line 1443 | public class CompletableFutureTest exten
1443       */
1444      public void testThenAcceptBoth_exceptionalCompletion1() {
1445          for (ExecutionMode m : ExecutionMode.values())
1446 <        for (Integer v1 : new Integer[] { 1, null }) {
1447 <
1446 >        for (Integer v1 : new Integer[] { 1, null })
1447 >    {
1448          final CompletableFuture<Integer> f = new CompletableFuture<>();
1449          final CompletableFuture<Integer> g = new CompletableFuture<>();
1450          final SubtractAction r = new SubtractAction();
# Line 1487 | Line 1459 | public class CompletableFutureTest exten
1459          checkCompletedWithWrappedCFException(f, ex);
1460          assertEquals(0, r.invocationCount);
1461          checkCompletedNormally(g, v1);
1462 <        }
1491 <    }
1462 >    }}
1463  
1464      public void testThenAcceptBoth_exceptionalCompletion2() {
1465          for (ExecutionMode m : ExecutionMode.values())
1466 <        for (Integer v1 : new Integer[] { 1, null }) {
1467 <
1466 >        for (Integer v1 : new Integer[] { 1, null })
1467 >    {
1468          final CompletableFuture<Integer> f = new CompletableFuture<>();
1469          final CompletableFuture<Integer> g = new CompletableFuture<>();
1470          final SubtractAction r = new SubtractAction();
# Line 1508 | Line 1479 | public class CompletableFutureTest exten
1479          checkCompletedWithWrappedCFException(g, ex);
1480          assertEquals(0, r.invocationCount);
1481          checkCompletedNormally(f, v1);
1482 <        }
1512 <    }
1482 >    }}
1483  
1484      public void testThenAcceptBoth_exceptionalCompletion3() {
1485          for (ExecutionMode m : ExecutionMode.values())
1486 <        for (Integer v1 : new Integer[] { 1, null }) {
1487 <
1486 >        for (Integer v1 : new Integer[] { 1, null })
1487 >    {
1488          final CompletableFuture<Integer> f = new CompletableFuture<>();
1489          final CompletableFuture<Integer> g = new CompletableFuture<>();
1490          final SubtractAction r = new SubtractAction();
# Line 1528 | Line 1498 | public class CompletableFutureTest exten
1498          checkCompletedWithWrappedCFException(g, ex);
1499          assertEquals(0, r.invocationCount);
1500          checkCompletedNormally(f, v1);
1501 <        }
1532 <    }
1501 >    }}
1502  
1503      public void testThenAcceptBoth_exceptionalCompletion4() {
1504          for (ExecutionMode m : ExecutionMode.values())
1505 <        for (Integer v1 : new Integer[] { 1, null }) {
1506 <
1505 >        for (Integer v1 : new Integer[] { 1, null })
1506 >    {
1507          final CompletableFuture<Integer> f = new CompletableFuture<>();
1508          final CompletableFuture<Integer> g = new CompletableFuture<>();
1509          final SubtractAction r = new SubtractAction();
# Line 1548 | Line 1517 | public class CompletableFutureTest exten
1517          checkCompletedWithWrappedCFException(f, ex);
1518          assertEquals(0, r.invocationCount);
1519          checkCompletedNormally(g, v1);
1520 <        }
1552 <    }
1520 >    }}
1521  
1522      /**
1523       * thenAcceptBoth result completes exceptionally if action does
# Line 1557 | Line 1525 | public class CompletableFutureTest exten
1525      public void testThenAcceptBoth_actionFailed1() {
1526          for (ExecutionMode m : ExecutionMode.values())
1527          for (Integer v1 : new Integer[] { 1, null })
1528 <        for (Integer v2 : new Integer[] { 2, null }) {
1529 <
1528 >        for (Integer v2 : new Integer[] { 2, null })
1529 >    {
1530          final CompletableFuture<Integer> f = new CompletableFuture<>();
1531          final CompletableFuture<Integer> g = new CompletableFuture<>();
1532          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1571 | Line 1539 | public class CompletableFutureTest exten
1539          checkCompletedWithWrappedCFException(h);
1540          checkCompletedNormally(f, v1);
1541          checkCompletedNormally(g, v2);
1542 <        }
1575 <    }
1542 >    }}
1543  
1544      public void testThenAcceptBoth_actionFailed2() {
1545          for (ExecutionMode m : ExecutionMode.values())
1546          for (Integer v1 : new Integer[] { 1, null })
1547 <        for (Integer v2 : new Integer[] { 2, null }) {
1548 <
1547 >        for (Integer v2 : new Integer[] { 2, null })
1548 >    {
1549          final CompletableFuture<Integer> f = new CompletableFuture<>();
1550          final CompletableFuture<Integer> g = new CompletableFuture<>();
1551          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1591 | Line 1558 | public class CompletableFutureTest exten
1558          checkCompletedWithWrappedCFException(h);
1559          checkCompletedNormally(f, v1);
1560          checkCompletedNormally(g, v2);
1561 <        }
1595 <    }
1561 >    }}
1562  
1563      /**
1564       * thenAcceptBoth result completes exceptionally if either source cancelled
# Line 1600 | Line 1566 | public class CompletableFutureTest exten
1566      public void testThenAcceptBoth_sourceCancelled1() {
1567          for (ExecutionMode m : ExecutionMode.values())
1568          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1569 <        for (Integer v1 : new Integer[] { 1, null }) {
1570 <
1569 >        for (Integer v1 : new Integer[] { 1, null })
1570 >    {
1571          final CompletableFuture<Integer> f = new CompletableFuture<>();
1572          final CompletableFuture<Integer> g = new CompletableFuture<>();
1573          final SubtractAction r = new SubtractAction();
# Line 1615 | Line 1581 | public class CompletableFutureTest exten
1581          checkCancelled(f);
1582          assertEquals(0, r.invocationCount);
1583          checkCompletedNormally(g, v1);
1584 <        }
1619 <    }
1584 >    }}
1585  
1586      public void testThenAcceptBoth_sourceCancelled2() {
1587          for (ExecutionMode m : ExecutionMode.values())
1588          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1589 <        for (Integer v1 : new Integer[] { 1, null }) {
1590 <
1589 >        for (Integer v1 : new Integer[] { 1, null })
1590 >    {
1591          final CompletableFuture<Integer> f = new CompletableFuture<>();
1592          final CompletableFuture<Integer> g = new CompletableFuture<>();
1593          final SubtractAction r = new SubtractAction();
# Line 1636 | Line 1601 | public class CompletableFutureTest exten
1601          checkCancelled(g);
1602          assertEquals(0, r.invocationCount);
1603          checkCompletedNormally(f, v1);
1604 <        }
1640 <    }
1604 >    }}
1605  
1606      public void testThenAcceptBoth_sourceCancelled3() {
1607          for (ExecutionMode m : ExecutionMode.values())
1608          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1609 <        for (Integer v1 : new Integer[] { 1, null }) {
1610 <
1609 >        for (Integer v1 : new Integer[] { 1, null })
1610 >    {
1611          final CompletableFuture<Integer> f = new CompletableFuture<>();
1612          final CompletableFuture<Integer> g = new CompletableFuture<>();
1613          final SubtractAction r = new SubtractAction();
# Line 1656 | Line 1620 | public class CompletableFutureTest exten
1620          checkCancelled(g);
1621          assertEquals(0, r.invocationCount);
1622          checkCompletedNormally(f, v1);
1623 <        }
1660 <    }
1623 >    }}
1624  
1625      public void testThenAcceptBoth_sourceCancelled4() {
1626          for (ExecutionMode m : ExecutionMode.values())
1627          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1628 <        for (Integer v1 : new Integer[] { 1, null }) {
1629 <
1628 >        for (Integer v1 : new Integer[] { 1, null })
1629 >    {
1630          final CompletableFuture<Integer> f = new CompletableFuture<>();
1631          final CompletableFuture<Integer> g = new CompletableFuture<>();
1632          final SubtractAction r = new SubtractAction();
# Line 1676 | Line 1639 | public class CompletableFutureTest exten
1639          checkCancelled(f);
1640          assertEquals(0, r.invocationCount);
1641          checkCompletedNormally(g, v1);
1642 <        }
1680 <    }
1642 >    }}
1643  
1644      /**
1645       * runAfterBoth result completes normally after normal
# Line 1686 | Line 1648 | public class CompletableFutureTest exten
1648      public void testRunAfterBoth_normalCompletion1() {
1649          for (ExecutionMode m : ExecutionMode.values())
1650          for (Integer v1 : new Integer[] { 1, null })
1651 <        for (Integer v2 : new Integer[] { 2, null }) {
1652 <
1651 >        for (Integer v2 : new Integer[] { 2, null })
1652 >    {
1653          final CompletableFuture<Integer> f = new CompletableFuture<>();
1654          final CompletableFuture<Integer> g = new CompletableFuture<>();
1655          final Noop r = new Noop();
# Line 1702 | Line 1664 | public class CompletableFutureTest exten
1664          assertEquals(1, r.invocationCount);
1665          checkCompletedNormally(f, v1);
1666          checkCompletedNormally(g, v2);
1667 <        }
1706 <    }
1667 >    }}
1668  
1669      public void testRunAfterBoth_normalCompletion2() {
1670          for (ExecutionMode m : ExecutionMode.values())
1671          for (Integer v1 : new Integer[] { 1, null })
1672 <        for (Integer v2 : new Integer[] { 2, null }) {
1673 <
1672 >        for (Integer v2 : new Integer[] { 2, null })
1673 >    {
1674          final CompletableFuture<Integer> f = new CompletableFuture<>();
1675          final CompletableFuture<Integer> g = new CompletableFuture<>();
1676          final Noop r = new Noop();
# Line 1724 | Line 1685 | public class CompletableFutureTest exten
1685          assertEquals(1, r.invocationCount);
1686          checkCompletedNormally(f, v1);
1687          checkCompletedNormally(g, v2);
1688 <        }
1728 <    }
1688 >    }}
1689  
1690      public void testRunAfterBoth_normalCompletion3() {
1691          for (ExecutionMode m : ExecutionMode.values())
1692          for (Integer v1 : new Integer[] { 1, null })
1693 <        for (Integer v2 : new Integer[] { 2, null }) {
1694 <
1693 >        for (Integer v2 : new Integer[] { 2, null })
1694 >    {
1695          final CompletableFuture<Integer> f = new CompletableFuture<>();
1696          final CompletableFuture<Integer> g = new CompletableFuture<>();
1697          final Noop r = new Noop();
# Line 1744 | Line 1704 | public class CompletableFutureTest exten
1704          assertEquals(1, r.invocationCount);
1705          checkCompletedNormally(f, v1);
1706          checkCompletedNormally(g, v2);
1707 <        }
1748 <    }
1707 >    }}
1708  
1709      public void testRunAfterBoth_normalCompletion4() {
1710          for (ExecutionMode m : ExecutionMode.values())
1711          for (Integer v1 : new Integer[] { 1, null })
1712 <        for (Integer v2 : new Integer[] { 2, null }) {
1713 <
1712 >        for (Integer v2 : new Integer[] { 2, null })
1713 >    {
1714          final CompletableFuture<Integer> f = new CompletableFuture<>();
1715          final CompletableFuture<Integer> g = new CompletableFuture<>();
1716          final Noop r = new Noop();
# Line 1764 | Line 1723 | public class CompletableFutureTest exten
1723          assertEquals(1, r.invocationCount);
1724          checkCompletedNormally(f, v1);
1725          checkCompletedNormally(g, v2);
1726 <        }
1768 <    }
1726 >    }}
1727  
1728      /**
1729       * runAfterBoth result completes exceptionally after exceptional
# Line 1773 | Line 1731 | public class CompletableFutureTest exten
1731       */
1732      public void testRunAfterBoth_exceptionalCompletion1() {
1733          for (ExecutionMode m : ExecutionMode.values())
1734 <        for (Integer v1 : new Integer[] { 1, null }) {
1735 <
1734 >        for (Integer v1 : new Integer[] { 1, null })
1735 >    {
1736          final CompletableFuture<Integer> f = new CompletableFuture<>();
1737          final CompletableFuture<Integer> g = new CompletableFuture<>();
1738          final Noop r = new Noop();
# Line 1789 | Line 1747 | public class CompletableFutureTest exten
1747          checkCompletedWithWrappedCFException(f, ex);
1748          assertEquals(0, r.invocationCount);
1749          checkCompletedNormally(g, v1);
1750 <        }
1793 <    }
1750 >    }}
1751  
1752      public void testRunAfterBoth_exceptionalCompletion2() {
1753          for (ExecutionMode m : ExecutionMode.values())
1754 <        for (Integer v1 : new Integer[] { 1, null }) {
1755 <
1754 >        for (Integer v1 : new Integer[] { 1, null })
1755 >    {
1756          final CompletableFuture<Integer> f = new CompletableFuture<>();
1757          final CompletableFuture<Integer> g = new CompletableFuture<>();
1758          final Noop r = new Noop();
# Line 1810 | Line 1767 | public class CompletableFutureTest exten
1767          checkCompletedWithWrappedCFException(g, ex);
1768          assertEquals(0, r.invocationCount);
1769          checkCompletedNormally(f, v1);
1770 <        }
1814 <    }
1770 >    }}
1771  
1772      public void testRunAfterBoth_exceptionalCompletion3() {
1773          for (ExecutionMode m : ExecutionMode.values())
1774 <        for (Integer v1 : new Integer[] { 1, null }) {
1775 <
1774 >        for (Integer v1 : new Integer[] { 1, null })
1775 >    {
1776          final CompletableFuture<Integer> f = new CompletableFuture<>();
1777          final CompletableFuture<Integer> g = new CompletableFuture<>();
1778          final Noop r = new Noop();
# Line 1830 | Line 1786 | public class CompletableFutureTest exten
1786          checkCompletedWithWrappedCFException(g, ex);
1787          assertEquals(0, r.invocationCount);
1788          checkCompletedNormally(f, v1);
1789 <        }
1834 <    }
1789 >    }}
1790  
1791      public void testRunAfterBoth_exceptionalCompletion4() {
1792          for (ExecutionMode m : ExecutionMode.values())
1793 <        for (Integer v1 : new Integer[] { 1, null }) {
1794 <
1793 >        for (Integer v1 : new Integer[] { 1, null })
1794 >    {
1795          final CompletableFuture<Integer> f = new CompletableFuture<>();
1796          final CompletableFuture<Integer> g = new CompletableFuture<>();
1797          final Noop r = new Noop();
# Line 1850 | Line 1805 | public class CompletableFutureTest exten
1805          checkCompletedWithWrappedCFException(f, ex);
1806          assertEquals(0, r.invocationCount);
1807          checkCompletedNormally(g, v1);
1808 <        }
1854 <    }
1808 >    }}
1809  
1810      /**
1811       * runAfterBoth result completes exceptionally if action does
# Line 1859 | Line 1813 | public class CompletableFutureTest exten
1813      public void testRunAfterBoth_actionFailed1() {
1814          for (ExecutionMode m : ExecutionMode.values())
1815          for (Integer v1 : new Integer[] { 1, null })
1816 <        for (Integer v2 : new Integer[] { 2, null }) {
1817 <
1816 >        for (Integer v2 : new Integer[] { 2, null })
1817 >    {
1818          final CompletableFuture<Integer> f = new CompletableFuture<>();
1819          final CompletableFuture<Integer> g = new CompletableFuture<>();
1820 <        final FailingNoop r = new FailingNoop();
1820 >        final FailingRunnable r = new FailingRunnable();
1821          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1822  
1823          f.complete(v1);
# Line 1873 | Line 1827 | public class CompletableFutureTest exten
1827          checkCompletedWithWrappedCFException(h);
1828          checkCompletedNormally(f, v1);
1829          checkCompletedNormally(g, v2);
1830 <        }
1877 <    }
1830 >    }}
1831  
1832      public void testRunAfterBoth_actionFailed2() {
1833          for (ExecutionMode m : ExecutionMode.values())
1834          for (Integer v1 : new Integer[] { 1, null })
1835 <        for (Integer v2 : new Integer[] { 2, null }) {
1836 <
1835 >        for (Integer v2 : new Integer[] { 2, null })
1836 >    {
1837          final CompletableFuture<Integer> f = new CompletableFuture<>();
1838          final CompletableFuture<Integer> g = new CompletableFuture<>();
1839 <        final FailingNoop r = new FailingNoop();
1839 >        final FailingRunnable r = new FailingRunnable();
1840          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1841  
1842          g.complete(v2);
# Line 1893 | Line 1846 | public class CompletableFutureTest exten
1846          checkCompletedWithWrappedCFException(h);
1847          checkCompletedNormally(f, v1);
1848          checkCompletedNormally(g, v2);
1849 <        }
1897 <    }
1849 >    }}
1850  
1851      /**
1852       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1902 | Line 1854 | public class CompletableFutureTest exten
1854      public void testRunAfterBoth_sourceCancelled1() {
1855          for (ExecutionMode m : ExecutionMode.values())
1856          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1857 <        for (Integer v1 : new Integer[] { 1, null }) {
1858 <
1857 >        for (Integer v1 : new Integer[] { 1, null })
1858 >    {
1859          final CompletableFuture<Integer> f = new CompletableFuture<>();
1860          final CompletableFuture<Integer> g = new CompletableFuture<>();
1861          final Noop r = new Noop();
# Line 1917 | Line 1869 | public class CompletableFutureTest exten
1869          checkCancelled(f);
1870          assertEquals(0, r.invocationCount);
1871          checkCompletedNormally(g, v1);
1872 <        }
1921 <    }
1872 >    }}
1873  
1874      public void testRunAfterBoth_sourceCancelled2() {
1875          for (ExecutionMode m : ExecutionMode.values())
1876          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1877 <        for (Integer v1 : new Integer[] { 1, null }) {
1878 <
1877 >        for (Integer v1 : new Integer[] { 1, null })
1878 >    {
1879          final CompletableFuture<Integer> f = new CompletableFuture<>();
1880          final CompletableFuture<Integer> g = new CompletableFuture<>();
1881          final Noop r = new Noop();
# Line 1938 | Line 1889 | public class CompletableFutureTest exten
1889          checkCancelled(g);
1890          assertEquals(0, r.invocationCount);
1891          checkCompletedNormally(f, v1);
1892 <        }
1942 <    }
1892 >    }}
1893  
1894      public void testRunAfterBoth_sourceCancelled3() {
1895          for (ExecutionMode m : ExecutionMode.values())
1896          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1897 <        for (Integer v1 : new Integer[] { 1, null }) {
1898 <
1897 >        for (Integer v1 : new Integer[] { 1, null })
1898 >    {
1899          final CompletableFuture<Integer> f = new CompletableFuture<>();
1900          final CompletableFuture<Integer> g = new CompletableFuture<>();
1901          final Noop r = new Noop();
# Line 1958 | Line 1908 | public class CompletableFutureTest exten
1908          checkCancelled(g);
1909          assertEquals(0, r.invocationCount);
1910          checkCompletedNormally(f, v1);
1911 <        }
1962 <    }
1911 >    }}
1912  
1913      public void testRunAfterBoth_sourceCancelled4() {
1914          for (ExecutionMode m : ExecutionMode.values())
1915          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1916 <        for (Integer v1 : new Integer[] { 1, null }) {
1917 <
1916 >        for (Integer v1 : new Integer[] { 1, null })
1917 >    {
1918          final CompletableFuture<Integer> f = new CompletableFuture<>();
1919          final CompletableFuture<Integer> g = new CompletableFuture<>();
1920          final Noop r = new Noop();
# Line 1978 | Line 1927 | public class CompletableFutureTest exten
1927          checkCancelled(f);
1928          assertEquals(0, r.invocationCount);
1929          checkCompletedNormally(g, v1);
1930 <        }
1982 <    }
1930 >    }}
1931  
1932      /**
1933       * applyToEither result completes normally after normal completion
# Line 1988 | Line 1936 | public class CompletableFutureTest exten
1936      public void testApplyToEither_normalCompletion1() {
1937          for (ExecutionMode m : ExecutionMode.values())
1938          for (Integer v1 : new Integer[] { 1, null })
1939 <        for (Integer v2 : new Integer[] { 2, null }) {
1940 <
1939 >        for (Integer v2 : new Integer[] { 2, null })
1940 >    {
1941          final CompletableFuture<Integer> f = new CompletableFuture<>();
1942          final CompletableFuture<Integer> g = new CompletableFuture<>();
1943          final IncFunction r = new IncFunction();
# Line 2002 | Line 1950 | public class CompletableFutureTest exten
1950          checkCompletedNormally(f, v1);
1951          checkCompletedNormally(g, v2);
1952          checkCompletedNormally(h, inc(v1));
1953 <        }
2006 <    }
1953 >    }}
1954  
1955      public void testApplyToEither_normalCompletion2() {
1956          for (ExecutionMode m : ExecutionMode.values())
1957          for (Integer v1 : new Integer[] { 1, null })
1958 <        for (Integer v2 : new Integer[] { 2, null }) {
1959 <
1958 >        for (Integer v2 : new Integer[] { 2, null })
1959 >    {
1960          final CompletableFuture<Integer> f = new CompletableFuture<>();
1961          final CompletableFuture<Integer> g = new CompletableFuture<>();
1962          final IncFunction r = new IncFunction();
# Line 2022 | Line 1969 | public class CompletableFutureTest exten
1969          checkCompletedNormally(f, v1);
1970          checkCompletedNormally(g, v2);
1971          checkCompletedNormally(h, inc(v2));
1972 <        }
1973 <    }
1972 >        }}
1973 >
1974      public void testApplyToEither_normalCompletion3() {
1975          for (ExecutionMode m : ExecutionMode.values())
1976          for (Integer v1 : new Integer[] { 1, null })
1977 <        for (Integer v2 : new Integer[] { 2, null }) {
1978 <
1977 >        for (Integer v2 : new Integer[] { 2, null })
1978 >    {
1979          final CompletableFuture<Integer> f = new CompletableFuture<>();
1980          final CompletableFuture<Integer> g = new CompletableFuture<>();
1981          final IncFunction r = new IncFunction();
# Line 2044 | Line 1991 | public class CompletableFutureTest exten
1991          assertTrue(Objects.equals(h.join(), inc(v1)) ||
1992                     Objects.equals(h.join(), inc(v2)));
1993          assertEquals(1, r.invocationCount);
1994 <        }
2048 <    }
1994 >    }}
1995  
1996      /**
1997       * applyToEither result completes exceptionally after exceptional
# Line 2053 | Line 1999 | public class CompletableFutureTest exten
1999       */
2000      public void testApplyToEither_exceptionalCompletion1() {
2001          for (ExecutionMode m : ExecutionMode.values())
2002 <        for (Integer v1 : new Integer[] { 1, null }) {
2003 <
2002 >        for (Integer v1 : new Integer[] { 1, null })
2003 >    {
2004          final CompletableFuture<Integer> f = new CompletableFuture<>();
2005          final CompletableFuture<Integer> g = new CompletableFuture<>();
2006          final IncFunction r = new IncFunction();
# Line 2069 | Line 2015 | public class CompletableFutureTest exten
2015          checkCompletedNormally(g, v1);
2016          checkCompletedWithWrappedCFException(f, ex);
2017          checkCompletedWithWrappedCFException(h, ex);
2018 <        }
2073 <    }
2018 >    }}
2019  
2020      public void testApplyToEither_exceptionalCompletion2() {
2021          for (ExecutionMode m : ExecutionMode.values())
2022 <        for (Integer v1 : new Integer[] { 1, null }) {
2023 <
2022 >        for (Integer v1 : new Integer[] { 1, null })
2023 >    {
2024          final CompletableFuture<Integer> f = new CompletableFuture<>();
2025          final CompletableFuture<Integer> g = new CompletableFuture<>();
2026          final IncFunction r = new IncFunction();
# Line 2090 | Line 2035 | public class CompletableFutureTest exten
2035          checkCompletedNormally(f, v1);
2036          checkCompletedWithWrappedCFException(g, ex);
2037          checkCompletedWithWrappedCFException(h, ex);
2038 <        }
2094 <    }
2038 >    }}
2039  
2040      public void testApplyToEither_exceptionalCompletion3() {
2041          for (ExecutionMode m : ExecutionMode.values())
2042 <        for (Integer v1 : new Integer[] { 1, null }) {
2043 <
2042 >        for (Integer v1 : new Integer[] { 1, null })
2043 >    {
2044          final CompletableFuture<Integer> f = new CompletableFuture<>();
2045          final CompletableFuture<Integer> g = new CompletableFuture<>();
2046          final IncFunction r = new IncFunction();
# Line 2118 | Line 2062 | public class CompletableFutureTest exten
2062  
2063          checkCompletedWithWrappedCFException(g, ex);
2064          checkCompletedNormally(f, v1);
2065 <        }
2122 <    }
2065 >    }}
2066  
2067      public void testApplyToEither_exceptionalCompletion4() {
2068          for (ExecutionMode m : ExecutionMode.values())
2069 <        for (Integer v1 : new Integer[] { 1, null }) {
2070 <
2069 >        for (Integer v1 : new Integer[] { 1, null })
2070 >    {
2071          final CompletableFuture<Integer> f = new CompletableFuture<>();
2072          final CompletableFuture<Integer> g = new CompletableFuture<>();
2073          final IncFunction r = new IncFunction();
# Line 2146 | Line 2089 | public class CompletableFutureTest exten
2089  
2090          checkCompletedWithWrappedCFException(f, ex);
2091          checkCompletedNormally(g, v1);
2092 <        }
2150 <    }
2092 >    }}
2093  
2094      /**
2095       * applyToEither result completes exceptionally if action does
# Line 2155 | Line 2097 | public class CompletableFutureTest exten
2097      public void testApplyToEither_actionFailed1() {
2098          for (ExecutionMode m : ExecutionMode.values())
2099          for (Integer v1 : new Integer[] { 1, null })
2100 <        for (Integer v2 : new Integer[] { 2, null }) {
2101 <
2100 >        for (Integer v2 : new Integer[] { 2, null })
2101 >    {
2102          final CompletableFuture<Integer> f = new CompletableFuture<>();
2103          final CompletableFuture<Integer> g = new CompletableFuture<>();
2104          final FailingFunction r = new FailingFunction();
# Line 2167 | Line 2109 | public class CompletableFutureTest exten
2109          g.complete(v2);
2110          checkCompletedNormally(f, v1);
2111          checkCompletedNormally(g, v2);
2112 <        }
2171 <    }
2112 >    }}
2113  
2114      public void testApplyToEither_actionFailed2() {
2115          for (ExecutionMode m : ExecutionMode.values())
2116          for (Integer v1 : new Integer[] { 1, null })
2117 <        for (Integer v2 : new Integer[] { 2, null }) {
2118 <
2117 >        for (Integer v2 : new Integer[] { 2, null })
2118 >    {
2119          final CompletableFuture<Integer> f = new CompletableFuture<>();
2120          final CompletableFuture<Integer> g = new CompletableFuture<>();
2121          final FailingFunction r = new FailingFunction();
# Line 2185 | Line 2126 | public class CompletableFutureTest exten
2126          f.complete(v1);
2127          checkCompletedNormally(f, v1);
2128          checkCompletedNormally(g, v2);
2129 <        }
2189 <    }
2129 >    }}
2130  
2131      /**
2132       * applyToEither result completes exceptionally if either source cancelled
# Line 2194 | Line 2134 | public class CompletableFutureTest exten
2134      public void testApplyToEither_sourceCancelled1() {
2135          for (ExecutionMode m : ExecutionMode.values())
2136          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2137 <        for (Integer v1 : new Integer[] { 1, null }) {
2138 <
2137 >        for (Integer v1 : new Integer[] { 1, null })
2138 >    {
2139          final CompletableFuture<Integer> f = new CompletableFuture<>();
2140          final CompletableFuture<Integer> g = new CompletableFuture<>();
2141          final IncFunction r = new IncFunction();
# Line 2209 | Line 2149 | public class CompletableFutureTest exten
2149          assertEquals(0, r.invocationCount);
2150          checkCompletedNormally(g, v1);
2151          checkCompletedWithWrappedCancellationException(h);
2152 <        }
2213 <    }
2152 >    }}
2153  
2154      public void testApplyToEither_sourceCancelled2() {
2155          for (ExecutionMode m : ExecutionMode.values())
2156          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2157 <        for (Integer v1 : new Integer[] { 1, null }) {
2158 <
2157 >        for (Integer v1 : new Integer[] { 1, null })
2158 >    {
2159          final CompletableFuture<Integer> f = new CompletableFuture<>();
2160          final CompletableFuture<Integer> g = new CompletableFuture<>();
2161          final IncFunction r = new IncFunction();
# Line 2230 | Line 2169 | public class CompletableFutureTest exten
2169          assertEquals(0, r.invocationCount);
2170          checkCompletedNormally(f, v1);
2171          checkCompletedWithWrappedCancellationException(h);
2172 <        }
2234 <    }
2172 >    }}
2173  
2174      public void testApplyToEither_sourceCancelled3() {
2175          for (ExecutionMode m : ExecutionMode.values())
2176          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2177 <        for (Integer v1 : new Integer[] { 1, null }) {
2178 <
2177 >        for (Integer v1 : new Integer[] { 1, null })
2178 >    {
2179          final CompletableFuture<Integer> f = new CompletableFuture<>();
2180          final CompletableFuture<Integer> g = new CompletableFuture<>();
2181          final IncFunction r = new IncFunction();
# Line 2258 | Line 2196 | public class CompletableFutureTest exten
2196  
2197          checkCancelled(g);
2198          checkCompletedNormally(f, v1);
2199 <        }
2262 <    }
2199 >    }}
2200  
2201      public void testApplyToEither_sourceCancelled4() {
2202          for (ExecutionMode m : ExecutionMode.values())
2203          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2204 <        for (Integer v1 : new Integer[] { 1, null }) {
2205 <
2204 >        for (Integer v1 : new Integer[] { 1, null })
2205 >    {
2206          final CompletableFuture<Integer> f = new CompletableFuture<>();
2207          final CompletableFuture<Integer> g = new CompletableFuture<>();
2208          final IncFunction r = new IncFunction();
# Line 2286 | Line 2223 | public class CompletableFutureTest exten
2223  
2224          checkCancelled(f);
2225          checkCompletedNormally(g, v1);
2226 <        }
2290 <    }
2226 >    }}
2227  
2228      /**
2229       * acceptEither result completes normally after normal completion
# Line 2296 | Line 2232 | public class CompletableFutureTest exten
2232      public void testAcceptEither_normalCompletion1() {
2233          for (ExecutionMode m : ExecutionMode.values())
2234          for (Integer v1 : new Integer[] { 1, null })
2235 <        for (Integer v2 : new Integer[] { 2, null }) {
2236 <
2235 >        for (Integer v2 : new Integer[] { 2, null })
2236 >    {
2237          final CompletableFuture<Integer> f = new CompletableFuture<>();
2238          final CompletableFuture<Integer> g = new CompletableFuture<>();
2239          final IncAction r = new IncAction();
# Line 2311 | Line 2247 | public class CompletableFutureTest exten
2247          checkCompletedNormally(f, v1);
2248          checkCompletedNormally(g, v2);
2249          checkCompletedNormally(h, null);
2250 <        }
2315 <    }
2250 >    }}
2251  
2252      public void testAcceptEither_normalCompletion2() {
2253          for (ExecutionMode m : ExecutionMode.values())
2254          for (Integer v1 : new Integer[] { 1, null })
2255 <        for (Integer v2 : new Integer[] { 2, null }) {
2256 <
2255 >        for (Integer v2 : new Integer[] { 2, null })
2256 >    {
2257          final CompletableFuture<Integer> f = new CompletableFuture<>();
2258          final CompletableFuture<Integer> g = new CompletableFuture<>();
2259          final IncAction r = new IncAction();
# Line 2332 | Line 2267 | public class CompletableFutureTest exten
2267          checkCompletedNormally(f, v1);
2268          checkCompletedNormally(g, v2);
2269          checkCompletedNormally(h, null);
2270 <        }
2271 <    }
2270 >    }}
2271 >
2272      public void testAcceptEither_normalCompletion3() {
2273          for (ExecutionMode m : ExecutionMode.values())
2274          for (Integer v1 : new Integer[] { 1, null })
2275 <        for (Integer v2 : new Integer[] { 2, null }) {
2276 <
2275 >        for (Integer v2 : new Integer[] { 2, null })
2276 >    {
2277          final CompletableFuture<Integer> f = new CompletableFuture<>();
2278          final CompletableFuture<Integer> g = new CompletableFuture<>();
2279          final IncAction r = new IncAction();
# Line 2354 | Line 2289 | public class CompletableFutureTest exten
2289          // unspecified behavior
2290          assertTrue(Objects.equals(r.value, inc(v1)) ||
2291                     Objects.equals(r.value, inc(v2)));
2292 <        }
2358 <    }
2292 >    }}
2293  
2294      /**
2295       * acceptEither result completes exceptionally after exceptional
# Line 2363 | Line 2297 | public class CompletableFutureTest exten
2297       */
2298      public void testAcceptEither_exceptionalCompletion1() {
2299          for (ExecutionMode m : ExecutionMode.values())
2300 <        for (Integer v1 : new Integer[] { 1, null }) {
2301 <
2300 >        for (Integer v1 : new Integer[] { 1, null })
2301 >    {
2302          final CompletableFuture<Integer> f = new CompletableFuture<>();
2303          final CompletableFuture<Integer> g = new CompletableFuture<>();
2304          final IncAction r = new IncAction();
# Line 2379 | Line 2313 | public class CompletableFutureTest exten
2313          checkCompletedNormally(g, v1);
2314          checkCompletedWithWrappedCFException(f, ex);
2315          checkCompletedWithWrappedCFException(h, ex);
2316 <        }
2383 <    }
2316 >    }}
2317  
2318      public void testAcceptEither_exceptionalCompletion2() {
2319          for (ExecutionMode m : ExecutionMode.values())
2320 <        for (Integer v1 : new Integer[] { 1, null }) {
2321 <
2320 >        for (Integer v1 : new Integer[] { 1, null })
2321 >    {
2322          final CompletableFuture<Integer> f = new CompletableFuture<>();
2323          final CompletableFuture<Integer> g = new CompletableFuture<>();
2324          final IncAction r = new IncAction();
# Line 2400 | Line 2333 | public class CompletableFutureTest exten
2333          checkCompletedNormally(f, v1);
2334          checkCompletedWithWrappedCFException(g, ex);
2335          checkCompletedWithWrappedCFException(h, ex);
2336 <        }
2404 <    }
2336 >    }}
2337  
2338      public void testAcceptEither_exceptionalCompletion3() {
2339          for (ExecutionMode m : ExecutionMode.values())
2340 <        for (Integer v1 : new Integer[] { 1, null }) {
2341 <
2340 >        for (Integer v1 : new Integer[] { 1, null })
2341 >    {
2342          final CompletableFuture<Integer> f = new CompletableFuture<>();
2343          final CompletableFuture<Integer> g = new CompletableFuture<>();
2344          final IncAction r = new IncAction();
# Line 2429 | Line 2361 | public class CompletableFutureTest exten
2361  
2362          checkCompletedWithWrappedCFException(g, ex);
2363          checkCompletedNormally(f, v1);
2364 <        }
2433 <    }
2364 >    }}
2365  
2366      public void testAcceptEither_exceptionalCompletion4() {
2367          for (ExecutionMode m : ExecutionMode.values())
2368 <        for (Integer v1 : new Integer[] { 1, null }) {
2369 <
2368 >        for (Integer v1 : new Integer[] { 1, null })
2369 >    {
2370          final CompletableFuture<Integer> f = new CompletableFuture<>();
2371          final CompletableFuture<Integer> g = new CompletableFuture<>();
2372          final IncAction r = new IncAction();
# Line 2458 | Line 2389 | public class CompletableFutureTest exten
2389  
2390          checkCompletedWithWrappedCFException(f, ex);
2391          checkCompletedNormally(g, v1);
2392 <        }
2462 <    }
2392 >    }}
2393  
2394      /**
2395       * acceptEither result completes exceptionally if action does
# Line 2467 | Line 2397 | public class CompletableFutureTest exten
2397      public void testAcceptEither_actionFailed1() {
2398          for (ExecutionMode m : ExecutionMode.values())
2399          for (Integer v1 : new Integer[] { 1, null })
2400 <        for (Integer v2 : new Integer[] { 2, null }) {
2401 <
2400 >        for (Integer v2 : new Integer[] { 2, null })
2401 >    {
2402          final CompletableFuture<Integer> f = new CompletableFuture<>();
2403          final CompletableFuture<Integer> g = new CompletableFuture<>();
2404          final FailingConsumer r = new FailingConsumer();
# Line 2479 | Line 2409 | public class CompletableFutureTest exten
2409          g.complete(v2);
2410          checkCompletedNormally(f, v1);
2411          checkCompletedNormally(g, v2);
2412 <        }
2483 <    }
2412 >    }}
2413  
2414      public void testAcceptEither_actionFailed2() {
2415          for (ExecutionMode m : ExecutionMode.values())
2416          for (Integer v1 : new Integer[] { 1, null })
2417 <        for (Integer v2 : new Integer[] { 2, null }) {
2418 <
2417 >        for (Integer v2 : new Integer[] { 2, null })
2418 >    {
2419          final CompletableFuture<Integer> f = new CompletableFuture<>();
2420          final CompletableFuture<Integer> g = new CompletableFuture<>();
2421          final FailingConsumer r = new FailingConsumer();
# Line 2497 | Line 2426 | public class CompletableFutureTest exten
2426          f.complete(v1);
2427          checkCompletedNormally(f, v1);
2428          checkCompletedNormally(g, v2);
2429 <        }
2501 <    }
2429 >    }}
2430  
2431      /**
2432       * acceptEither result completes exceptionally if either source cancelled
# Line 2506 | Line 2434 | public class CompletableFutureTest exten
2434      public void testAcceptEither_sourceCancelled1() {
2435          for (ExecutionMode m : ExecutionMode.values())
2436          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2437 <        for (Integer v1 : new Integer[] { 1, null }) {
2438 <
2437 >        for (Integer v1 : new Integer[] { 1, null })
2438 >    {
2439          final CompletableFuture<Integer> f = new CompletableFuture<>();
2440          final CompletableFuture<Integer> g = new CompletableFuture<>();
2441          final IncAction r = new IncAction();
# Line 2521 | Line 2449 | public class CompletableFutureTest exten
2449          assertEquals(0, r.invocationCount);
2450          checkCompletedNormally(g, v1);
2451          checkCompletedWithWrappedCancellationException(h);
2452 <        }
2525 <    }
2452 >    }}
2453  
2454      public void testAcceptEither_sourceCancelled2() {
2455          for (ExecutionMode m : ExecutionMode.values())
2456          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2457 <        for (Integer v1 : new Integer[] { 1, null }) {
2458 <
2457 >        for (Integer v1 : new Integer[] { 1, null })
2458 >    {
2459          final CompletableFuture<Integer> f = new CompletableFuture<>();
2460          final CompletableFuture<Integer> g = new CompletableFuture<>();
2461          final IncAction r = new IncAction();
# Line 2542 | Line 2469 | public class CompletableFutureTest exten
2469          assertEquals(0, r.invocationCount);
2470          checkCompletedNormally(f, v1);
2471          checkCompletedWithWrappedCancellationException(h);
2472 <        }
2546 <    }
2472 >    }}
2473  
2474      public void testAcceptEither_sourceCancelled3() {
2475          for (ExecutionMode m : ExecutionMode.values())
2476          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2477 <        for (Integer v1 : new Integer[] { 1, null }) {
2478 <
2477 >        for (Integer v1 : new Integer[] { 1, null })
2478 >    {
2479          final CompletableFuture<Integer> f = new CompletableFuture<>();
2480          final CompletableFuture<Integer> g = new CompletableFuture<>();
2481          final IncAction r = new IncAction();
# Line 2571 | Line 2497 | public class CompletableFutureTest exten
2497  
2498          checkCancelled(g);
2499          checkCompletedNormally(f, v1);
2500 <        }
2575 <    }
2500 >    }}
2501  
2502      public void testAcceptEither_sourceCancelled4() {
2503          for (ExecutionMode m : ExecutionMode.values())
2504          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2505 <        for (Integer v1 : new Integer[] { 1, null }) {
2506 <
2505 >        for (Integer v1 : new Integer[] { 1, null })
2506 >    {
2507          final CompletableFuture<Integer> f = new CompletableFuture<>();
2508          final CompletableFuture<Integer> g = new CompletableFuture<>();
2509          final IncAction r = new IncAction();
# Line 2600 | Line 2525 | public class CompletableFutureTest exten
2525  
2526          checkCancelled(f);
2527          checkCompletedNormally(g, v1);
2528 <        }
2604 <    }
2528 >    }}
2529  
2530      /**
2531       * runAfterEither result completes normally after normal completion
# Line 2610 | Line 2534 | public class CompletableFutureTest exten
2534      public void testRunAfterEither_normalCompletion1() {
2535          for (ExecutionMode m : ExecutionMode.values())
2536          for (Integer v1 : new Integer[] { 1, null })
2537 <        for (Integer v2 : new Integer[] { 2, null }) {
2538 <
2537 >        for (Integer v2 : new Integer[] { 2, null })
2538 >    {
2539          final CompletableFuture<Integer> f = new CompletableFuture<>();
2540          final CompletableFuture<Integer> g = new CompletableFuture<>();
2541          final Noop r = new Noop();
# Line 2626 | Line 2550 | public class CompletableFutureTest exten
2550          checkCompletedNormally(g, v2);
2551          checkCompletedNormally(h, null);
2552          assertEquals(1, r.invocationCount);
2553 <        }
2630 <    }
2553 >    }}
2554  
2555      public void testRunAfterEither_normalCompletion2() {
2556          for (ExecutionMode m : ExecutionMode.values())
2557          for (Integer v1 : new Integer[] { 1, null })
2558 <        for (Integer v2 : new Integer[] { 2, null }) {
2559 <
2558 >        for (Integer v2 : new Integer[] { 2, null })
2559 >    {
2560          final CompletableFuture<Integer> f = new CompletableFuture<>();
2561          final CompletableFuture<Integer> g = new CompletableFuture<>();
2562          final Noop r = new Noop();
# Line 2648 | Line 2571 | public class CompletableFutureTest exten
2571          checkCompletedNormally(g, v2);
2572          checkCompletedNormally(h, null);
2573          assertEquals(1, r.invocationCount);
2574 <        }
2575 <    }
2574 >        }}
2575 >
2576      public void testRunAfterEither_normalCompletion3() {
2577          for (ExecutionMode m : ExecutionMode.values())
2578          for (Integer v1 : new Integer[] { 1, null })
2579 <        for (Integer v2 : new Integer[] { 2, null }) {
2580 <
2579 >        for (Integer v2 : new Integer[] { 2, null })
2580 >    {
2581          final CompletableFuture<Integer> f = new CompletableFuture<>();
2582          final CompletableFuture<Integer> g = new CompletableFuture<>();
2583          final Noop r = new Noop();
# Line 2667 | Line 2590 | public class CompletableFutureTest exten
2590          checkCompletedNormally(f, v1);
2591          checkCompletedNormally(g, v2);
2592          assertEquals(1, r.invocationCount);
2593 <        }
2671 <    }
2593 >    }}
2594  
2595      /**
2596       * runAfterEither result completes exceptionally after exceptional
# Line 2676 | Line 2598 | public class CompletableFutureTest exten
2598       */
2599      public void testRunAfterEither_exceptionalCompletion1() {
2600          for (ExecutionMode m : ExecutionMode.values())
2601 <        for (Integer v1 : new Integer[] { 1, null }) {
2602 <
2601 >        for (Integer v1 : new Integer[] { 1, null })
2602 >    {
2603          final CompletableFuture<Integer> f = new CompletableFuture<>();
2604          final CompletableFuture<Integer> g = new CompletableFuture<>();
2605          final Noop r = new Noop();
# Line 2692 | Line 2614 | public class CompletableFutureTest exten
2614          checkCompletedNormally(g, v1);
2615          checkCompletedWithWrappedCFException(f, ex);
2616          checkCompletedWithWrappedCFException(h, ex);
2617 <        }
2696 <    }
2617 >    }}
2618  
2619      public void testRunAfterEither_exceptionalCompletion2() {
2620          for (ExecutionMode m : ExecutionMode.values())
2621 <        for (Integer v1 : new Integer[] { 1, null }) {
2622 <
2621 >        for (Integer v1 : new Integer[] { 1, null })
2622 >    {
2623          final CompletableFuture<Integer> f = new CompletableFuture<>();
2624          final CompletableFuture<Integer> g = new CompletableFuture<>();
2625          final Noop r = new Noop();
# Line 2713 | Line 2634 | public class CompletableFutureTest exten
2634          checkCompletedNormally(f, v1);
2635          checkCompletedWithWrappedCFException(g, ex);
2636          checkCompletedWithWrappedCFException(h, ex);
2637 <        }
2717 <    }
2637 >    }}
2638  
2639      public void testRunAfterEither_exceptionalCompletion3() {
2640          for (ExecutionMode m : ExecutionMode.values())
2641 <        for (Integer v1 : new Integer[] { 1, null }) {
2642 <
2641 >        for (Integer v1 : new Integer[] { 1, null })
2642 >    {
2643          final CompletableFuture<Integer> f = new CompletableFuture<>();
2644          final CompletableFuture<Integer> g = new CompletableFuture<>();
2645          final Noop r = new Noop();
# Line 2741 | Line 2661 | public class CompletableFutureTest exten
2661  
2662          checkCompletedWithWrappedCFException(g, ex);
2663          checkCompletedNormally(f, v1);
2664 <        }
2745 <    }
2664 >    }}
2665  
2666      public void testRunAfterEither_exceptionalCompletion4() {
2667          for (ExecutionMode m : ExecutionMode.values())
2668 <        for (Integer v1 : new Integer[] { 1, null }) {
2669 <
2668 >        for (Integer v1 : new Integer[] { 1, null })
2669 >    {
2670          final CompletableFuture<Integer> f = new CompletableFuture<>();
2671          final CompletableFuture<Integer> g = new CompletableFuture<>();
2672          final Noop r = new Noop();
# Line 2769 | Line 2688 | public class CompletableFutureTest exten
2688  
2689          checkCompletedWithWrappedCFException(f, ex);
2690          checkCompletedNormally(g, v1);
2691 <        }
2773 <    }
2691 >    }}
2692  
2693      /**
2694       * runAfterEither result completes exceptionally if action does
# Line 2778 | Line 2696 | public class CompletableFutureTest exten
2696      public void testRunAfterEither_actionFailed1() {
2697          for (ExecutionMode m : ExecutionMode.values())
2698          for (Integer v1 : new Integer[] { 1, null })
2699 <        for (Integer v2 : new Integer[] { 2, null }) {
2700 <
2699 >        for (Integer v2 : new Integer[] { 2, null })
2700 >    {
2701          final CompletableFuture<Integer> f = new CompletableFuture<>();
2702          final CompletableFuture<Integer> g = new CompletableFuture<>();
2703 <        final FailingNoop r = new FailingNoop();
2703 >        final FailingRunnable r = new FailingRunnable();
2704          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2705  
2706          f.complete(v1);
# Line 2790 | Line 2708 | public class CompletableFutureTest exten
2708          g.complete(v2);
2709          checkCompletedNormally(f, v1);
2710          checkCompletedNormally(g, v2);
2711 <        }
2794 <    }
2711 >    }}
2712  
2713      public void testRunAfterEither_actionFailed2() {
2714          for (ExecutionMode m : ExecutionMode.values())
2715          for (Integer v1 : new Integer[] { 1, null })
2716 <        for (Integer v2 : new Integer[] { 2, null }) {
2717 <
2716 >        for (Integer v2 : new Integer[] { 2, null })
2717 >    {
2718          final CompletableFuture<Integer> f = new CompletableFuture<>();
2719          final CompletableFuture<Integer> g = new CompletableFuture<>();
2720 <        final FailingNoop r = new FailingNoop();
2720 >        final FailingRunnable r = new FailingRunnable();
2721          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2722  
2723          g.complete(v2);
# Line 2808 | Line 2725 | public class CompletableFutureTest exten
2725          f.complete(v1);
2726          checkCompletedNormally(f, v1);
2727          checkCompletedNormally(g, v2);
2728 <        }
2812 <    }
2728 >    }}
2729  
2730      /**
2731       * runAfterEither result completes exceptionally if either source cancelled
# Line 2817 | Line 2733 | public class CompletableFutureTest exten
2733      public void testRunAfterEither_sourceCancelled1() {
2734          for (ExecutionMode m : ExecutionMode.values())
2735          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2736 <        for (Integer v1 : new Integer[] { 1, null }) {
2737 <
2736 >        for (Integer v1 : new Integer[] { 1, null })
2737 >    {
2738          final CompletableFuture<Integer> f = new CompletableFuture<>();
2739          final CompletableFuture<Integer> g = new CompletableFuture<>();
2740          final Noop r = new Noop();
# Line 2832 | Line 2748 | public class CompletableFutureTest exten
2748          assertEquals(0, r.invocationCount);
2749          checkCompletedNormally(g, v1);
2750          checkCompletedWithWrappedCancellationException(h);
2751 <        }
2836 <    }
2751 >    }}
2752  
2753      public void testRunAfterEither_sourceCancelled2() {
2754          for (ExecutionMode m : ExecutionMode.values())
2755          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2756 <        for (Integer v1 : new Integer[] { 1, null }) {
2757 <
2756 >        for (Integer v1 : new Integer[] { 1, null })
2757 >    {
2758          final CompletableFuture<Integer> f = new CompletableFuture<>();
2759          final CompletableFuture<Integer> g = new CompletableFuture<>();
2760          final Noop r = new Noop();
# Line 2853 | Line 2768 | public class CompletableFutureTest exten
2768          assertEquals(0, r.invocationCount);
2769          checkCompletedNormally(f, v1);
2770          checkCompletedWithWrappedCancellationException(h);
2771 <        }
2857 <    }
2771 >    }}
2772  
2773      public void testRunAfterEither_sourceCancelled3() {
2774          for (ExecutionMode m : ExecutionMode.values())
2775          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2776 <        for (Integer v1 : new Integer[] { 1, null }) {
2777 <
2776 >        for (Integer v1 : new Integer[] { 1, null })
2777 >    {
2778          final CompletableFuture<Integer> f = new CompletableFuture<>();
2779          final CompletableFuture<Integer> g = new CompletableFuture<>();
2780          final Noop r = new Noop();
# Line 2881 | Line 2795 | public class CompletableFutureTest exten
2795  
2796          checkCancelled(g);
2797          checkCompletedNormally(f, v1);
2798 <        }
2885 <    }
2798 >    }}
2799  
2800      public void testRunAfterEither_sourceCancelled4() {
2801          for (ExecutionMode m : ExecutionMode.values())
2802          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2803 <        for (Integer v1 : new Integer[] { 1, null }) {
2804 <
2803 >        for (Integer v1 : new Integer[] { 1, null })
2804 >    {
2805          final CompletableFuture<Integer> f = new CompletableFuture<>();
2806          final CompletableFuture<Integer> g = new CompletableFuture<>();
2807          final Noop r = new Noop();
# Line 2909 | Line 2822 | public class CompletableFutureTest exten
2822  
2823          checkCancelled(f);
2824          checkCompletedNormally(g, v1);
2825 <        }
2913 <    }
2825 >    }}
2826  
2827      /**
2828       * thenCompose result completes normally after normal completion of source
2829       */
2830 <    public void testThenCompose_normalCompletion1() {
2830 >    public void testThenCompose_normalCompletion() {
2831          for (ExecutionMode m : ExecutionMode.values())
2832 <        for (Integer v1 : new Integer[] { 1, null }) {
2833 <
2832 >        for (boolean createIncomplete : new boolean[] { true, false })
2833 >        for (Integer v1 : new Integer[] { 1, null })
2834 >    {
2835          final CompletableFuture<Integer> f = new CompletableFuture<>();
2836          final CompletableFutureInc r = new CompletableFutureInc();
2837 +        if (!createIncomplete) f.complete(v1);
2838          final CompletableFuture<Integer> g = f.thenCompose(r);
2839 <        f.complete(v1);
2926 <        checkCompletedNormally(g, inc(v1));
2927 <        checkCompletedNormally(f, v1);
2928 <        assertEquals(1, r.invocationCount);
2929 <        }
2930 <    }
2931 <
2932 <    public void testThenCompose_normalCompletion2() {
2933 <        for (ExecutionMode m : ExecutionMode.values())
2934 <        for (Integer v1 : new Integer[] { 1, null }) {
2839 >        if (createIncomplete) f.complete(v1);
2840  
2936        final CompletableFuture<Integer> f = new CompletableFuture<>();
2937        final CompletableFutureInc r = new CompletableFutureInc();
2938        f.complete(v1);
2939        final CompletableFuture<Integer> g = f.thenCompose(r);
2841          checkCompletedNormally(g, inc(v1));
2842          checkCompletedNormally(f, v1);
2843          assertEquals(1, r.invocationCount);
2844 <        }
2944 <    }
2844 >    }}
2845  
2846      /**
2847       * thenCompose result completes exceptionally after exceptional
2848       * completion of source
2849       */
2850 <    public void testThenCompose_exceptionalCompletion1() {
2851 <        for (ExecutionMode m : ExecutionMode.values()) {
2852 <
2850 >    public void testThenCompose_exceptionalCompletion() {
2851 >        for (ExecutionMode m : ExecutionMode.values())
2852 >        for (boolean createIncomplete : new boolean[] { true, false })
2853 >    {
2854          final CFException ex = new CFException();
2855          final CompletableFutureInc r = new CompletableFutureInc();
2856          final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 +        if (!createIncomplete) f.completeExceptionally(ex);
2858          final CompletableFuture<Integer> g = f.thenCompose(r);
2859 <        f.completeExceptionally(ex);
2958 <        checkCompletedWithWrappedCFException(g, ex);
2959 <        checkCompletedWithWrappedCFException(f, ex);
2960 <        }
2961 <    }
2962 <
2963 <    public void testThenCompose_exceptionalCompletion2() {
2964 <        for (ExecutionMode m : ExecutionMode.values()) {
2859 >        if (createIncomplete) f.completeExceptionally(ex);
2860  
2966        final CFException ex = new CFException();
2967        final CompletableFuture<Integer> f = new CompletableFuture<>();
2968        f.completeExceptionally(ex);
2969        final CompletableFutureInc r = new CompletableFutureInc();
2970        final CompletableFuture<Integer> g = f.thenCompose(r);
2861          checkCompletedWithWrappedCFException(g, ex);
2862          checkCompletedWithWrappedCFException(f, ex);
2863 <        }
2864 <    }
2863 >        assertEquals(0, r.invocationCount);
2864 >    }}
2865  
2866      /**
2867       * thenCompose result completes exceptionally if action does
2868       */
2869 <    public void testThenCompose_actionFailed1() {
2869 >    public void testThenCompose_actionFailed() {
2870          for (ExecutionMode m : ExecutionMode.values())
2871 <        for (Integer v1 : new Integer[] { 1, null }) {
2872 <
2871 >        for (boolean createIncomplete : new boolean[] { true, false })
2872 >        for (Integer v1 : new Integer[] { 1, null })
2873 >    {
2874          final CompletableFuture<Integer> f = new CompletableFuture<>();
2875          final FailingCompletableFutureFunction r
2876              = new FailingCompletableFutureFunction();
2877 +        if (!createIncomplete) f.complete(v1);
2878          final CompletableFuture<Integer> g = f.thenCompose(r);
2879 <        f.complete(v1);
2988 <        checkCompletedWithWrappedCFException(g);
2989 <        checkCompletedNormally(f, v1);
2990 <        }
2991 <    }
2992 <
2993 <    public void testThenCompose_actionFailed2() {
2994 <        for (ExecutionMode m : ExecutionMode.values())
2995 <        for (Integer v1 : new Integer[] { 1, null }) {
2879 >        if (createIncomplete) f.complete(v1);
2880  
2997        final CompletableFuture<Integer> f = new CompletableFuture<>();
2998        f.complete(v1);
2999        final FailingCompletableFutureFunction r
3000            = new FailingCompletableFutureFunction();
3001        final CompletableFuture<Integer> g = f.thenCompose(r);
2881          checkCompletedWithWrappedCFException(g);
2882          checkCompletedNormally(f, v1);
2883 <        }
3005 <    }
2883 >    }}
2884  
2885      /**
2886       * thenCompose result completes exceptionally if source cancelled
2887       */
2888 <    public void testThenCompose_sourceCancelled1() {
2888 >    public void testThenCompose_sourceCancelled() {
2889          for (ExecutionMode m : ExecutionMode.values())
2890 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2891 <
2890 >        for (boolean createIncomplete : new boolean[] { true, false })
2891 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2892 >    {
2893          final CompletableFuture<Integer> f = new CompletableFuture<>();
2894          final CompletableFutureInc r = new CompletableFutureInc();
2895 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2896          final CompletableFuture<Integer> g = f.thenCompose(r);
2897 <        assertTrue(f.cancel(mayInterruptIfRunning));
2898 <        checkCompletedWithWrappedCancellationException(g);
2899 <        checkCancelled(f);
2897 >        if (createIncomplete) {
2898 >            checkIncomplete(g);
2899 >            assertTrue(f.cancel(mayInterruptIfRunning));
2900          }
3021    }
2901  
3023    public void testThenCompose_sourceCancelled2() {
3024        for (ExecutionMode m : ExecutionMode.values())
3025        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
3026
3027        final CompletableFuture<Integer> f = new CompletableFuture<>();
3028        assertTrue(f.cancel(mayInterruptIfRunning));
3029        final CompletableFutureInc r = new CompletableFutureInc();
3030        final CompletableFuture<Integer> g = f.thenCompose(r);
2902          checkCompletedWithWrappedCancellationException(g);
2903          checkCancelled(f);
2904 <        }
3034 <    }
3035 <
3036 <    // asyncs
3037 <
3038 <    /**
3039 <     * thenRunAsync result completes normally after normal completion of source
3040 <     */
3041 <    public void testThenRunAsync() {
3042 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3043 <        Noop r = new Noop();
3044 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3045 <        f.complete(null);
3046 <        checkCompletedNormally(g, null);
3047 <
3048 <        // reordered version
3049 <        f = new CompletableFuture<>();
3050 <        f.complete(null);
3051 <        r = new Noop();
3052 <        g = f.thenRunAsync(r);
3053 <        checkCompletedNormally(g, null);
3054 <    }
3055 <
3056 <    /**
3057 <     * thenRunAsync result completes exceptionally after exceptional
3058 <     * completion of source
3059 <     */
3060 <    public void testThenRunAsync2() {
3061 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3062 <        Noop r = new Noop();
3063 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3064 <        f.completeExceptionally(new CFException());
3065 <        try {
3066 <            g.join();
3067 <            shouldThrow();
3068 <        } catch (CompletionException success) {}
3069 <        checkCompletedWithWrappedCFException(g);
3070 <    }
3071 <
3072 <    /**
3073 <     * thenRunAsync result completes exceptionally if action does
3074 <     */
3075 <    public void testThenRunAsync3() {
3076 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3077 <        FailingNoop r = new FailingNoop();
3078 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3079 <        f.complete(null);
3080 <        checkCompletedWithWrappedCFException(g);
3081 <    }
3082 <
3083 <    /**
3084 <     * thenRunAsync result completes exceptionally if source cancelled
3085 <     */
3086 <    public void testThenRunAsync4() {
3087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3088 <        Noop r = new Noop();
3089 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3090 <        assertTrue(f.cancel(true));
3091 <        checkCompletedWithWrappedCancellationException(g);
3092 <    }
3093 <
3094 <    /**
3095 <     * thenApplyAsync result completes normally after normal completion of source
3096 <     */
3097 <    public void testThenApplyAsync() {
3098 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3099 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3100 <        f.complete(one);
3101 <        checkCompletedNormally(g, two);
3102 <    }
3103 <
3104 <    /**
3105 <     * thenApplyAsync result completes exceptionally after exceptional
3106 <     * completion of source
3107 <     */
3108 <    public void testThenApplyAsync2() {
3109 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3110 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3111 <        f.completeExceptionally(new CFException());
3112 <        checkCompletedWithWrappedCFException(g);
3113 <    }
3114 <
3115 <    /**
3116 <     * thenApplyAsync result completes exceptionally if action does
3117 <     */
3118 <    public void testThenApplyAsync3() {
3119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3120 <        FailingFunction r = new FailingFunction();
3121 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3122 <        f.complete(null);
3123 <        checkCompletedWithWrappedCFException(g);
3124 <    }
3125 <
3126 <    /**
3127 <     * thenApplyAsync result completes exceptionally if source cancelled
3128 <     */
3129 <    public void testThenApplyAsync4() {
3130 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3131 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3132 <        assertTrue(f.cancel(true));
3133 <        checkCompletedWithWrappedCancellationException(g);
3134 <    }
3135 <
3136 <    /**
3137 <     * thenAcceptAsync result completes normally after normal
3138 <     * completion of source
3139 <     */
3140 <    public void testThenAcceptAsync() {
3141 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3142 <        IncAction r = new IncAction();
3143 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3144 <        f.complete(one);
3145 <        checkCompletedNormally(g, null);
3146 <        assertEquals(r.value, (Integer) 2);
3147 <    }
3148 <
3149 <    /**
3150 <     * thenAcceptAsync result completes exceptionally after exceptional
3151 <     * completion of source
3152 <     */
3153 <    public void testThenAcceptAsync2() {
3154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3155 <        IncAction r = new IncAction();
3156 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3157 <        f.completeExceptionally(new CFException());
3158 <        checkCompletedWithWrappedCFException(g);
3159 <    }
3160 <
3161 <    /**
3162 <     * thenAcceptAsync result completes exceptionally if action does
3163 <     */
3164 <    public void testThenAcceptAsync3() {
3165 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3166 <        FailingConsumer r = new FailingConsumer();
3167 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3168 <        f.complete(null);
3169 <        checkCompletedWithWrappedCFException(g);
3170 <    }
3171 <
3172 <    /**
3173 <     * thenAcceptAsync result completes exceptionally if source cancelled
3174 <     */
3175 <    public void testThenAcceptAsync4() {
3176 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3177 <        IncAction r = new IncAction();
3178 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3179 <        assertTrue(f.cancel(true));
3180 <        checkCompletedWithWrappedCancellationException(g);
3181 <    }
3182 <
3183 <    // async with explicit executors
3184 <
3185 <    /**
3186 <     * thenRunAsync result completes normally after normal completion of source
3187 <     */
3188 <    public void testThenRunAsyncE() {
3189 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3190 <        Noop r = new Noop();
3191 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3192 <        f.complete(null);
3193 <        checkCompletedNormally(g, null);
3194 <
3195 <        // reordered version
3196 <        f = new CompletableFuture<>();
3197 <        f.complete(null);
3198 <        r = new Noop();
3199 <        g = f.thenRunAsync(r, new ThreadExecutor());
3200 <        checkCompletedNormally(g, null);
3201 <    }
3202 <
3203 <    /**
3204 <     * thenRunAsync result completes exceptionally after exceptional
3205 <     * completion of source
3206 <     */
3207 <    public void testThenRunAsync2E() {
3208 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3209 <        Noop r = new Noop();
3210 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3211 <        f.completeExceptionally(new CFException());
3212 <        try {
3213 <            g.join();
3214 <            shouldThrow();
3215 <        } catch (CompletionException success) {}
3216 <        checkCompletedWithWrappedCFException(g);
3217 <    }
3218 <
3219 <    /**
3220 <     * thenRunAsync result completes exceptionally if action does
3221 <     */
3222 <    public void testThenRunAsync3E() {
3223 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3224 <        FailingNoop r = new FailingNoop();
3225 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3226 <        f.complete(null);
3227 <        checkCompletedWithWrappedCFException(g);
3228 <    }
3229 <
3230 <    /**
3231 <     * thenRunAsync result completes exceptionally if source cancelled
3232 <     */
3233 <    public void testThenRunAsync4E() {
3234 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3235 <        Noop r = new Noop();
3236 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3237 <        assertTrue(f.cancel(true));
3238 <        checkCompletedWithWrappedCancellationException(g);
3239 <    }
3240 <
3241 <    /**
3242 <     * thenApplyAsync result completes normally after normal completion of source
3243 <     */
3244 <    public void testThenApplyAsyncE() {
3245 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3246 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3247 <        f.complete(one);
3248 <        checkCompletedNormally(g, two);
3249 <    }
3250 <
3251 <    /**
3252 <     * thenApplyAsync result completes exceptionally after exceptional
3253 <     * completion of source
3254 <     */
3255 <    public void testThenApplyAsync2E() {
3256 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3257 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3258 <        f.completeExceptionally(new CFException());
3259 <        checkCompletedWithWrappedCFException(g);
3260 <    }
3261 <
3262 <    /**
3263 <     * thenApplyAsync result completes exceptionally if action does
3264 <     */
3265 <    public void testThenApplyAsync3E() {
3266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3267 <        FailingFunction r = new FailingFunction();
3268 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3269 <        f.complete(null);
3270 <        checkCompletedWithWrappedCFException(g);
3271 <    }
3272 <
3273 <    /**
3274 <     * thenApplyAsync result completes exceptionally if source cancelled
3275 <     */
3276 <    public void testThenApplyAsync4E() {
3277 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3278 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3279 <        assertTrue(f.cancel(true));
3280 <        checkCompletedWithWrappedCancellationException(g);
3281 <    }
3282 <
3283 <    /**
3284 <     * thenAcceptAsync result completes normally after normal
3285 <     * completion of source
3286 <     */
3287 <    public void testThenAcceptAsyncE() {
3288 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3289 <        IncAction r = new IncAction();
3290 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3291 <        f.complete(one);
3292 <        checkCompletedNormally(g, null);
3293 <        assertEquals(r.value, (Integer) 2);
3294 <    }
3295 <
3296 <    /**
3297 <     * thenAcceptAsync result completes exceptionally after exceptional
3298 <     * completion of source
3299 <     */
3300 <    public void testThenAcceptAsync2E() {
3301 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3302 <        IncAction r = new IncAction();
3303 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3304 <        f.completeExceptionally(new CFException());
3305 <        checkCompletedWithWrappedCFException(g);
3306 <    }
3307 <
3308 <    /**
3309 <     * thenAcceptAsync result completes exceptionally if action does
3310 <     */
3311 <    public void testThenAcceptAsync3E() {
3312 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3313 <        FailingConsumer r = new FailingConsumer();
3314 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3315 <        f.complete(null);
3316 <        checkCompletedWithWrappedCFException(g);
3317 <    }
3318 <
3319 <    /**
3320 <     * thenAcceptAsync result completes exceptionally if source cancelled
3321 <     */
3322 <    public void testThenAcceptAsync4E() {
3323 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3324 <        IncAction r = new IncAction();
3325 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3326 <        assertTrue(f.cancel(true));
3327 <        checkCompletedWithWrappedCancellationException(g);
3328 <    }
2904 >    }}
2905  
2906      // other static methods
2907  
# Line 3607 | Line 3183 | public class CompletableFutureTest exten
3183      public void testWhenComplete_actionFailed() {
3184          for (boolean createIncomplete : new boolean[] { true, false })
3185          for (ExecutionMode m : ExecutionMode.values())
3186 <        for (Integer v1 : new Integer[] { 1, null }) {
3187 <
3186 >        for (Integer v1 : new Integer[] { 1, null })
3187 >    {
3188          final AtomicInteger a = new AtomicInteger(0);
3189          final CFException ex = new CFException();
3190          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 3625 | Line 3201 | public class CompletableFutureTest exten
3201          checkCompletedNormally(f, v1);
3202          checkCompletedWithWrappedCFException(g, ex);
3203          assertEquals(1, a.get());
3204 <        }
3629 <    }
3204 >    }}
3205  
3206      /**
3207       * If a whenComplete action throws an exception when triggered by
# Line 3636 | Line 3211 | public class CompletableFutureTest exten
3211      public void testWhenComplete_actionFailedSourceFailed() {
3212          for (boolean createIncomplete : new boolean[] { true, false })
3213          for (ExecutionMode m : ExecutionMode.values())
3214 <        for (Integer v1 : new Integer[] { 1, null }) {
3215 <
3214 >        for (Integer v1 : new Integer[] { 1, null })
3215 >    {
3216          final AtomicInteger a = new AtomicInteger(0);
3217          final CFException ex1 = new CFException();
3218          final CFException ex2 = new CFException();
# Line 3657 | Line 3232 | public class CompletableFutureTest exten
3232          checkCompletedWithWrappedCFException(f, ex1);
3233          checkCompletedWithWrappedCFException(g, ex1);
3234          assertEquals(1, a.get());
3235 <        }
3661 <    }
3235 >    }}
3236  
3237   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines