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.51 by jsr166, Mon Jun 2 19:49:28 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;
981 <
982 <        f = new CompletableFuture<>();
983 <        g = f.thenRun(r = new Noop());
984 <        f.complete(null);
985 <        checkCompletedNormally(g, null);
986 <        assertEquals(1, r.invocationCount);
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  
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
# Line 1169 | Line 1273 | public class CompletableFutureTest exten
1273       */
1274      public void testThenCombine_exceptionalCompletion1() {
1275          for (ExecutionMode m : ExecutionMode.values())
1276 <        for (Integer v1 : new Integer[] { 1, null }) {
1277 <
1276 >        for (Integer v1 : new Integer[] { 1, null })
1277 >    {
1278          final CompletableFuture<Integer> f = new CompletableFuture<>();
1279          final CompletableFuture<Integer> g = new CompletableFuture<>();
1280          final SubtractFunction r = new SubtractFunction();
# Line 1185 | Line 1289 | public class CompletableFutureTest exten
1289          checkCompletedWithWrappedCFException(f, ex);
1290          assertEquals(0, r.invocationCount);
1291          checkCompletedNormally(g, v1);
1292 <        }
1189 <    }
1292 >    }}
1293  
1294      public void testThenCombine_exceptionalCompletion2() {
1295          for (ExecutionMode m : ExecutionMode.values())
1296 <        for (Integer v1 : new Integer[] { 1, null }) {
1297 <
1296 >        for (Integer v1 : new Integer[] { 1, null })
1297 >    {
1298          final CompletableFuture<Integer> f = new CompletableFuture<>();
1299          final CompletableFuture<Integer> g = new CompletableFuture<>();
1300          final SubtractFunction r = new SubtractFunction();
# Line 1206 | Line 1309 | public class CompletableFutureTest exten
1309          checkCompletedWithWrappedCFException(g, ex);
1310          assertEquals(0, r.invocationCount);
1311          checkCompletedNormally(f, v1);
1312 <        }
1210 <    }
1312 >    }}
1313  
1314      public void testThenCombine_exceptionalCompletion3() {
1315          for (ExecutionMode m : ExecutionMode.values())
1316 <        for (Integer v1 : new Integer[] { 1, null }) {
1317 <
1316 >        for (Integer v1 : new Integer[] { 1, null })
1317 >    {
1318          final CompletableFuture<Integer> f = new CompletableFuture<>();
1319          final CompletableFuture<Integer> g = new CompletableFuture<>();
1320          final SubtractFunction r = new SubtractFunction();
# Line 1226 | Line 1328 | public class CompletableFutureTest exten
1328          checkCompletedWithWrappedCFException(g, ex);
1329          assertEquals(0, r.invocationCount);
1330          checkCompletedNormally(f, v1);
1331 <        }
1230 <    }
1331 >    }}
1332  
1333      public void testThenCombine_exceptionalCompletion4() {
1334          for (ExecutionMode m : ExecutionMode.values())
1335 <        for (Integer v1 : new Integer[] { 1, null }) {
1336 <
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();
# Line 1246 | Line 1347 | public class CompletableFutureTest exten
1347          checkCompletedWithWrappedCFException(f, ex);
1348          assertEquals(0, r.invocationCount);
1349          checkCompletedNormally(g, v1);
1350 <        }
1250 <    }
1350 >    }}
1351  
1352      /**
1353       * thenCombine result completes exceptionally if action does
# Line 1255 | Line 1355 | public class CompletableFutureTest exten
1355      public void testThenCombine_actionFailed1() {
1356          for (ExecutionMode m : ExecutionMode.values())
1357          for (Integer v1 : new Integer[] { 1, null })
1358 <        for (Integer v2 : new Integer[] { 2, null }) {
1359 <
1358 >        for (Integer v2 : new Integer[] { 2, null })
1359 >    {
1360          final CompletableFuture<Integer> f = new CompletableFuture<>();
1361          final CompletableFuture<Integer> g = new CompletableFuture<>();
1362          final FailingBiFunction r = new FailingBiFunction();
# Line 1269 | Line 1369 | public class CompletableFutureTest exten
1369          checkCompletedWithWrappedCFException(h);
1370          checkCompletedNormally(f, v1);
1371          checkCompletedNormally(g, v2);
1372 <        }
1273 <    }
1372 >    }}
1373  
1374      public void testThenCombine_actionFailed2() {
1375          for (ExecutionMode m : ExecutionMode.values())
1376          for (Integer v1 : new Integer[] { 1, null })
1377 <        for (Integer v2 : new Integer[] { 2, null }) {
1378 <
1377 >        for (Integer v2 : new Integer[] { 2, null })
1378 >    {
1379          final CompletableFuture<Integer> f = new CompletableFuture<>();
1380          final CompletableFuture<Integer> g = new CompletableFuture<>();
1381          final FailingBiFunction r = new FailingBiFunction();
# Line 1289 | Line 1388 | public class CompletableFutureTest exten
1388          checkCompletedWithWrappedCFException(h);
1389          checkCompletedNormally(f, v1);
1390          checkCompletedNormally(g, v2);
1391 <        }
1293 <    }
1391 >    }}
1392  
1393      /**
1394       * thenCombine result completes exceptionally if either source cancelled
# Line 1298 | Line 1396 | public class CompletableFutureTest exten
1396      public void testThenCombine_sourceCancelled1() {
1397          for (ExecutionMode m : ExecutionMode.values())
1398          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1399 <        for (Integer v1 : new Integer[] { 1, null }) {
1400 <
1399 >        for (Integer v1 : new Integer[] { 1, null })
1400 >    {
1401          final CompletableFuture<Integer> f = new CompletableFuture<>();
1402          final CompletableFuture<Integer> g = new CompletableFuture<>();
1403          final SubtractFunction r = new SubtractFunction();
# Line 1313 | Line 1411 | public class CompletableFutureTest exten
1411          checkCancelled(f);
1412          assertEquals(0, r.invocationCount);
1413          checkCompletedNormally(g, v1);
1414 <        }
1317 <    }
1414 >    }}
1415  
1416      public void testThenCombine_sourceCancelled2() {
1417          for (ExecutionMode m : ExecutionMode.values())
1418          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1419 <        for (Integer v1 : new Integer[] { 1, null }) {
1420 <
1419 >        for (Integer v1 : new Integer[] { 1, null })
1420 >    {
1421          final CompletableFuture<Integer> f = new CompletableFuture<>();
1422          final CompletableFuture<Integer> g = new CompletableFuture<>();
1423          final SubtractFunction r = new SubtractFunction();
# Line 1334 | Line 1431 | public class CompletableFutureTest exten
1431          checkCancelled(g);
1432          assertEquals(0, r.invocationCount);
1433          checkCompletedNormally(f, v1);
1434 <        }
1338 <    }
1434 >    }}
1435  
1436      public void testThenCombine_sourceCancelled3() {
1437          for (ExecutionMode m : ExecutionMode.values())
1438          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1439 <        for (Integer v1 : new Integer[] { 1, null }) {
1440 <
1439 >        for (Integer v1 : new Integer[] { 1, null })
1440 >    {
1441          final CompletableFuture<Integer> f = new CompletableFuture<>();
1442          final CompletableFuture<Integer> g = new CompletableFuture<>();
1443          final SubtractFunction r = new SubtractFunction();
# Line 1354 | Line 1450 | public class CompletableFutureTest exten
1450          checkCancelled(g);
1451          assertEquals(0, r.invocationCount);
1452          checkCompletedNormally(f, v1);
1453 <        }
1358 <    }
1453 >    }}
1454  
1455      public void testThenCombine_sourceCancelled4() {
1456          for (ExecutionMode m : ExecutionMode.values())
1457          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1458 <        for (Integer v1 : new Integer[] { 1, null }) {
1459 <
1458 >        for (Integer v1 : new Integer[] { 1, null })
1459 >    {
1460          final CompletableFuture<Integer> f = new CompletableFuture<>();
1461          final CompletableFuture<Integer> g = new CompletableFuture<>();
1462          final SubtractFunction r = new SubtractFunction();
# Line 1374 | Line 1469 | public class CompletableFutureTest exten
1469          checkCancelled(f);
1470          assertEquals(0, r.invocationCount);
1471          checkCompletedNormally(g, v1);
1472 <        }
1378 <    }
1472 >    }}
1473  
1474      /**
1475       * thenAcceptBoth result completes normally after normal
# Line 1384 | Line 1478 | public class CompletableFutureTest exten
1478      public void testThenAcceptBoth_normalCompletion1() {
1479          for (ExecutionMode m : ExecutionMode.values())
1480          for (Integer v1 : new Integer[] { 1, null })
1481 <        for (Integer v2 : new Integer[] { 2, null }) {
1482 <
1481 >        for (Integer v2 : new Integer[] { 2, null })
1482 >    {
1483          final CompletableFuture<Integer> f = new CompletableFuture<>();
1484          final CompletableFuture<Integer> g = new CompletableFuture<>();
1485          final SubtractAction r = new SubtractAction();
# Line 1400 | Line 1494 | public class CompletableFutureTest exten
1494          assertEquals(subtract(v1, v2), r.value);
1495          checkCompletedNormally(f, v1);
1496          checkCompletedNormally(g, v2);
1497 <        }
1404 <    }
1497 >    }}
1498  
1499      public void testThenAcceptBoth_normalCompletion2() {
1500          for (ExecutionMode m : ExecutionMode.values())
1501          for (Integer v1 : new Integer[] { 1, null })
1502 <        for (Integer v2 : new Integer[] { 2, null }) {
1503 <
1502 >        for (Integer v2 : new Integer[] { 2, null })
1503 >    {
1504          final CompletableFuture<Integer> f = new CompletableFuture<>();
1505          final CompletableFuture<Integer> g = new CompletableFuture<>();
1506          final SubtractAction r = new SubtractAction();
# Line 1422 | Line 1515 | public class CompletableFutureTest exten
1515          assertEquals(subtract(v1, v2), r.value);
1516          checkCompletedNormally(f, v1);
1517          checkCompletedNormally(g, v2);
1518 <        }
1426 <    }
1518 >    }}
1519  
1520      public void testThenAcceptBoth_normalCompletion3() {
1521          for (ExecutionMode m : ExecutionMode.values())
1522          for (Integer v1 : new Integer[] { 1, null })
1523 <        for (Integer v2 : new Integer[] { 2, null }) {
1524 <
1523 >        for (Integer v2 : new Integer[] { 2, null })
1524 >    {
1525          final CompletableFuture<Integer> f = new CompletableFuture<>();
1526          final CompletableFuture<Integer> g = new CompletableFuture<>();
1527          final SubtractAction r = new SubtractAction();
# Line 1442 | Line 1534 | public class CompletableFutureTest exten
1534          assertEquals(subtract(v1, v2), r.value);
1535          checkCompletedNormally(f, v1);
1536          checkCompletedNormally(g, v2);
1537 <        }
1446 <    }
1537 >    }}
1538  
1539      public void testThenAcceptBoth_normalCompletion4() {
1540          for (ExecutionMode m : ExecutionMode.values())
1541          for (Integer v1 : new Integer[] { 1, null })
1542 <        for (Integer v2 : new Integer[] { 2, null }) {
1543 <
1542 >        for (Integer v2 : new Integer[] { 2, null })
1543 >    {
1544          final CompletableFuture<Integer> f = new CompletableFuture<>();
1545          final CompletableFuture<Integer> g = new CompletableFuture<>();
1546          final SubtractAction r = new SubtractAction();
# Line 1462 | Line 1553 | public class CompletableFutureTest exten
1553          assertEquals(subtract(v1, v2), r.value);
1554          checkCompletedNormally(f, v1);
1555          checkCompletedNormally(g, v2);
1556 <        }
1466 <    }
1556 >    }}
1557  
1558      /**
1559       * thenAcceptBoth result completes exceptionally after exceptional
# Line 1471 | Line 1561 | public class CompletableFutureTest exten
1561       */
1562      public void testThenAcceptBoth_exceptionalCompletion1() {
1563          for (ExecutionMode m : ExecutionMode.values())
1564 <        for (Integer v1 : new Integer[] { 1, null }) {
1565 <
1564 >        for (Integer v1 : new Integer[] { 1, null })
1565 >    {
1566          final CompletableFuture<Integer> f = new CompletableFuture<>();
1567          final CompletableFuture<Integer> g = new CompletableFuture<>();
1568          final SubtractAction r = new SubtractAction();
# Line 1487 | Line 1577 | public class CompletableFutureTest exten
1577          checkCompletedWithWrappedCFException(f, ex);
1578          assertEquals(0, r.invocationCount);
1579          checkCompletedNormally(g, v1);
1580 <        }
1491 <    }
1580 >    }}
1581  
1582      public void testThenAcceptBoth_exceptionalCompletion2() {
1583          for (ExecutionMode m : ExecutionMode.values())
1584 <        for (Integer v1 : new Integer[] { 1, null }) {
1585 <
1584 >        for (Integer v1 : new Integer[] { 1, null })
1585 >    {
1586          final CompletableFuture<Integer> f = new CompletableFuture<>();
1587          final CompletableFuture<Integer> g = new CompletableFuture<>();
1588          final SubtractAction r = new SubtractAction();
# Line 1508 | Line 1597 | public class CompletableFutureTest exten
1597          checkCompletedWithWrappedCFException(g, ex);
1598          assertEquals(0, r.invocationCount);
1599          checkCompletedNormally(f, v1);
1600 <        }
1512 <    }
1600 >    }}
1601  
1602      public void testThenAcceptBoth_exceptionalCompletion3() {
1603          for (ExecutionMode m : ExecutionMode.values())
1604 <        for (Integer v1 : new Integer[] { 1, null }) {
1605 <
1604 >        for (Integer v1 : new Integer[] { 1, null })
1605 >    {
1606          final CompletableFuture<Integer> f = new CompletableFuture<>();
1607          final CompletableFuture<Integer> g = new CompletableFuture<>();
1608          final SubtractAction r = new SubtractAction();
# Line 1528 | Line 1616 | public class CompletableFutureTest exten
1616          checkCompletedWithWrappedCFException(g, ex);
1617          assertEquals(0, r.invocationCount);
1618          checkCompletedNormally(f, v1);
1619 <        }
1532 <    }
1619 >    }}
1620  
1621      public void testThenAcceptBoth_exceptionalCompletion4() {
1622          for (ExecutionMode m : ExecutionMode.values())
1623 <        for (Integer v1 : new Integer[] { 1, null }) {
1624 <
1623 >        for (Integer v1 : new Integer[] { 1, null })
1624 >    {
1625          final CompletableFuture<Integer> f = new CompletableFuture<>();
1626          final CompletableFuture<Integer> g = new CompletableFuture<>();
1627          final SubtractAction r = new SubtractAction();
# Line 1548 | Line 1635 | public class CompletableFutureTest exten
1635          checkCompletedWithWrappedCFException(f, ex);
1636          assertEquals(0, r.invocationCount);
1637          checkCompletedNormally(g, v1);
1638 <        }
1552 <    }
1638 >    }}
1639  
1640      /**
1641       * thenAcceptBoth result completes exceptionally if action does
# Line 1557 | Line 1643 | public class CompletableFutureTest exten
1643      public void testThenAcceptBoth_actionFailed1() {
1644          for (ExecutionMode m : ExecutionMode.values())
1645          for (Integer v1 : new Integer[] { 1, null })
1646 <        for (Integer v2 : new Integer[] { 2, null }) {
1647 <
1646 >        for (Integer v2 : new Integer[] { 2, null })
1647 >    {
1648          final CompletableFuture<Integer> f = new CompletableFuture<>();
1649          final CompletableFuture<Integer> g = new CompletableFuture<>();
1650          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1571 | Line 1657 | public class CompletableFutureTest exten
1657          checkCompletedWithWrappedCFException(h);
1658          checkCompletedNormally(f, v1);
1659          checkCompletedNormally(g, v2);
1660 <        }
1575 <    }
1660 >    }}
1661  
1662      public void testThenAcceptBoth_actionFailed2() {
1663          for (ExecutionMode m : ExecutionMode.values())
1664          for (Integer v1 : new Integer[] { 1, null })
1665 <        for (Integer v2 : new Integer[] { 2, null }) {
1666 <
1665 >        for (Integer v2 : new Integer[] { 2, null })
1666 >    {
1667          final CompletableFuture<Integer> f = new CompletableFuture<>();
1668          final CompletableFuture<Integer> g = new CompletableFuture<>();
1669          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1591 | Line 1676 | public class CompletableFutureTest exten
1676          checkCompletedWithWrappedCFException(h);
1677          checkCompletedNormally(f, v1);
1678          checkCompletedNormally(g, v2);
1679 <        }
1595 <    }
1679 >    }}
1680  
1681      /**
1682       * thenAcceptBoth result completes exceptionally if either source cancelled
# Line 1600 | Line 1684 | public class CompletableFutureTest exten
1684      public void testThenAcceptBoth_sourceCancelled1() {
1685          for (ExecutionMode m : ExecutionMode.values())
1686          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1687 <        for (Integer v1 : new Integer[] { 1, null }) {
1688 <
1687 >        for (Integer v1 : new Integer[] { 1, null })
1688 >    {
1689          final CompletableFuture<Integer> f = new CompletableFuture<>();
1690          final CompletableFuture<Integer> g = new CompletableFuture<>();
1691          final SubtractAction r = new SubtractAction();
# Line 1615 | Line 1699 | public class CompletableFutureTest exten
1699          checkCancelled(f);
1700          assertEquals(0, r.invocationCount);
1701          checkCompletedNormally(g, v1);
1702 <        }
1619 <    }
1702 >    }}
1703  
1704      public void testThenAcceptBoth_sourceCancelled2() {
1705          for (ExecutionMode m : ExecutionMode.values())
1706          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1707 <        for (Integer v1 : new Integer[] { 1, null }) {
1708 <
1707 >        for (Integer v1 : new Integer[] { 1, null })
1708 >    {
1709          final CompletableFuture<Integer> f = new CompletableFuture<>();
1710          final CompletableFuture<Integer> g = new CompletableFuture<>();
1711          final SubtractAction r = new SubtractAction();
# Line 1636 | Line 1719 | public class CompletableFutureTest exten
1719          checkCancelled(g);
1720          assertEquals(0, r.invocationCount);
1721          checkCompletedNormally(f, v1);
1722 <        }
1640 <    }
1722 >    }}
1723  
1724      public void testThenAcceptBoth_sourceCancelled3() {
1725          for (ExecutionMode m : ExecutionMode.values())
1726          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1727 <        for (Integer v1 : new Integer[] { 1, null }) {
1728 <
1727 >        for (Integer v1 : new Integer[] { 1, null })
1728 >    {
1729          final CompletableFuture<Integer> f = new CompletableFuture<>();
1730          final CompletableFuture<Integer> g = new CompletableFuture<>();
1731          final SubtractAction r = new SubtractAction();
# Line 1656 | Line 1738 | public class CompletableFutureTest exten
1738          checkCancelled(g);
1739          assertEquals(0, r.invocationCount);
1740          checkCompletedNormally(f, v1);
1741 <        }
1660 <    }
1741 >    }}
1742  
1743      public void testThenAcceptBoth_sourceCancelled4() {
1744          for (ExecutionMode m : ExecutionMode.values())
1745          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1746 <        for (Integer v1 : new Integer[] { 1, null }) {
1747 <
1746 >        for (Integer v1 : new Integer[] { 1, null })
1747 >    {
1748          final CompletableFuture<Integer> f = new CompletableFuture<>();
1749          final CompletableFuture<Integer> g = new CompletableFuture<>();
1750          final SubtractAction r = new SubtractAction();
# Line 1676 | Line 1757 | public class CompletableFutureTest exten
1757          checkCancelled(f);
1758          assertEquals(0, r.invocationCount);
1759          checkCompletedNormally(g, v1);
1760 <        }
1680 <    }
1760 >    }}
1761  
1762      /**
1763       * runAfterBoth result completes normally after normal
# Line 1686 | Line 1766 | public class CompletableFutureTest exten
1766      public void testRunAfterBoth_normalCompletion1() {
1767          for (ExecutionMode m : ExecutionMode.values())
1768          for (Integer v1 : new Integer[] { 1, null })
1769 <        for (Integer v2 : new Integer[] { 2, null }) {
1770 <
1769 >        for (Integer v2 : new Integer[] { 2, null })
1770 >    {
1771          final CompletableFuture<Integer> f = new CompletableFuture<>();
1772          final CompletableFuture<Integer> g = new CompletableFuture<>();
1773          final Noop r = new Noop();
# Line 1702 | Line 1782 | public class CompletableFutureTest exten
1782          assertEquals(1, r.invocationCount);
1783          checkCompletedNormally(f, v1);
1784          checkCompletedNormally(g, v2);
1785 <        }
1706 <    }
1785 >    }}
1786  
1787      public void testRunAfterBoth_normalCompletion2() {
1788          for (ExecutionMode m : ExecutionMode.values())
1789          for (Integer v1 : new Integer[] { 1, null })
1790 <        for (Integer v2 : new Integer[] { 2, null }) {
1791 <
1790 >        for (Integer v2 : new Integer[] { 2, null })
1791 >    {
1792          final CompletableFuture<Integer> f = new CompletableFuture<>();
1793          final CompletableFuture<Integer> g = new CompletableFuture<>();
1794          final Noop r = new Noop();
# Line 1724 | Line 1803 | public class CompletableFutureTest exten
1803          assertEquals(1, r.invocationCount);
1804          checkCompletedNormally(f, v1);
1805          checkCompletedNormally(g, v2);
1806 <        }
1728 <    }
1806 >    }}
1807  
1808      public void testRunAfterBoth_normalCompletion3() {
1809          for (ExecutionMode m : ExecutionMode.values())
1810          for (Integer v1 : new Integer[] { 1, null })
1811 <        for (Integer v2 : new Integer[] { 2, null }) {
1812 <
1811 >        for (Integer v2 : new Integer[] { 2, null })
1812 >    {
1813          final CompletableFuture<Integer> f = new CompletableFuture<>();
1814          final CompletableFuture<Integer> g = new CompletableFuture<>();
1815          final Noop r = new Noop();
# Line 1744 | Line 1822 | public class CompletableFutureTest exten
1822          assertEquals(1, r.invocationCount);
1823          checkCompletedNormally(f, v1);
1824          checkCompletedNormally(g, v2);
1825 <        }
1748 <    }
1825 >    }}
1826  
1827      public void testRunAfterBoth_normalCompletion4() {
1828          for (ExecutionMode m : ExecutionMode.values())
1829          for (Integer v1 : new Integer[] { 1, null })
1830 <        for (Integer v2 : new Integer[] { 2, null }) {
1831 <
1830 >        for (Integer v2 : new Integer[] { 2, null })
1831 >    {
1832          final CompletableFuture<Integer> f = new CompletableFuture<>();
1833          final CompletableFuture<Integer> g = new CompletableFuture<>();
1834          final Noop r = new Noop();
# Line 1764 | Line 1841 | public class CompletableFutureTest exten
1841          assertEquals(1, r.invocationCount);
1842          checkCompletedNormally(f, v1);
1843          checkCompletedNormally(g, v2);
1844 <        }
1768 <    }
1844 >    }}
1845  
1846      /**
1847       * runAfterBoth result completes exceptionally after exceptional
# Line 1773 | Line 1849 | public class CompletableFutureTest exten
1849       */
1850      public void testRunAfterBoth_exceptionalCompletion1() {
1851          for (ExecutionMode m : ExecutionMode.values())
1852 <        for (Integer v1 : new Integer[] { 1, null }) {
1853 <
1852 >        for (Integer v1 : new Integer[] { 1, null })
1853 >    {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856          final Noop r = new Noop();
# Line 1789 | Line 1865 | public class CompletableFutureTest exten
1865          checkCompletedWithWrappedCFException(f, ex);
1866          assertEquals(0, r.invocationCount);
1867          checkCompletedNormally(g, v1);
1868 <        }
1793 <    }
1868 >    }}
1869  
1870      public void testRunAfterBoth_exceptionalCompletion2() {
1871          for (ExecutionMode m : ExecutionMode.values())
1872 <        for (Integer v1 : new Integer[] { 1, null }) {
1873 <
1872 >        for (Integer v1 : new Integer[] { 1, null })
1873 >    {
1874          final CompletableFuture<Integer> f = new CompletableFuture<>();
1875          final CompletableFuture<Integer> g = new CompletableFuture<>();
1876          final Noop r = new Noop();
# Line 1810 | Line 1885 | public class CompletableFutureTest exten
1885          checkCompletedWithWrappedCFException(g, ex);
1886          assertEquals(0, r.invocationCount);
1887          checkCompletedNormally(f, v1);
1888 <        }
1814 <    }
1888 >    }}
1889  
1890      public void testRunAfterBoth_exceptionalCompletion3() {
1891          for (ExecutionMode m : ExecutionMode.values())
1892 <        for (Integer v1 : new Integer[] { 1, null }) {
1893 <
1892 >        for (Integer v1 : new Integer[] { 1, null })
1893 >    {
1894          final CompletableFuture<Integer> f = new CompletableFuture<>();
1895          final CompletableFuture<Integer> g = new CompletableFuture<>();
1896          final Noop r = new Noop();
# Line 1830 | Line 1904 | public class CompletableFutureTest exten
1904          checkCompletedWithWrappedCFException(g, ex);
1905          assertEquals(0, r.invocationCount);
1906          checkCompletedNormally(f, v1);
1907 <        }
1834 <    }
1907 >    }}
1908  
1909      public void testRunAfterBoth_exceptionalCompletion4() {
1910          for (ExecutionMode m : ExecutionMode.values())
1911 <        for (Integer v1 : new Integer[] { 1, null }) {
1912 <
1911 >        for (Integer v1 : new Integer[] { 1, null })
1912 >    {
1913          final CompletableFuture<Integer> f = new CompletableFuture<>();
1914          final CompletableFuture<Integer> g = new CompletableFuture<>();
1915          final Noop r = new Noop();
# Line 1850 | Line 1923 | public class CompletableFutureTest exten
1923          checkCompletedWithWrappedCFException(f, ex);
1924          assertEquals(0, r.invocationCount);
1925          checkCompletedNormally(g, v1);
1926 <        }
1854 <    }
1926 >    }}
1927  
1928      /**
1929       * runAfterBoth result completes exceptionally if action does
# Line 1859 | Line 1931 | public class CompletableFutureTest exten
1931      public void testRunAfterBoth_actionFailed1() {
1932          for (ExecutionMode m : ExecutionMode.values())
1933          for (Integer v1 : new Integer[] { 1, null })
1934 <        for (Integer v2 : new Integer[] { 2, null }) {
1935 <
1934 >        for (Integer v2 : new Integer[] { 2, null })
1935 >    {
1936          final CompletableFuture<Integer> f = new CompletableFuture<>();
1937          final CompletableFuture<Integer> g = new CompletableFuture<>();
1938 <        final FailingNoop r = new FailingNoop();
1938 >        final FailingRunnable r = new FailingRunnable();
1939          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1940  
1941          f.complete(v1);
# Line 1873 | Line 1945 | public class CompletableFutureTest exten
1945          checkCompletedWithWrappedCFException(h);
1946          checkCompletedNormally(f, v1);
1947          checkCompletedNormally(g, v2);
1948 <        }
1877 <    }
1948 >    }}
1949  
1950      public void testRunAfterBoth_actionFailed2() {
1951          for (ExecutionMode m : ExecutionMode.values())
1952          for (Integer v1 : new Integer[] { 1, null })
1953 <        for (Integer v2 : new Integer[] { 2, null }) {
1954 <
1953 >        for (Integer v2 : new Integer[] { 2, null })
1954 >    {
1955          final CompletableFuture<Integer> f = new CompletableFuture<>();
1956          final CompletableFuture<Integer> g = new CompletableFuture<>();
1957 <        final FailingNoop r = new FailingNoop();
1957 >        final FailingRunnable r = new FailingRunnable();
1958          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1959  
1960          g.complete(v2);
# Line 1893 | Line 1964 | public class CompletableFutureTest exten
1964          checkCompletedWithWrappedCFException(h);
1965          checkCompletedNormally(f, v1);
1966          checkCompletedNormally(g, v2);
1967 <        }
1897 <    }
1967 >    }}
1968  
1969      /**
1970       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1902 | Line 1972 | public class CompletableFutureTest exten
1972      public void testRunAfterBoth_sourceCancelled1() {
1973          for (ExecutionMode m : ExecutionMode.values())
1974          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1975 <        for (Integer v1 : new Integer[] { 1, null }) {
1976 <
1975 >        for (Integer v1 : new Integer[] { 1, null })
1976 >    {
1977          final CompletableFuture<Integer> f = new CompletableFuture<>();
1978          final CompletableFuture<Integer> g = new CompletableFuture<>();
1979          final Noop r = new Noop();
# Line 1917 | Line 1987 | public class CompletableFutureTest exten
1987          checkCancelled(f);
1988          assertEquals(0, r.invocationCount);
1989          checkCompletedNormally(g, v1);
1990 <        }
1921 <    }
1990 >    }}
1991  
1992      public void testRunAfterBoth_sourceCancelled2() {
1993          for (ExecutionMode m : ExecutionMode.values())
1994          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1995 <        for (Integer v1 : new Integer[] { 1, null }) {
1996 <
1995 >        for (Integer v1 : new Integer[] { 1, null })
1996 >    {
1997          final CompletableFuture<Integer> f = new CompletableFuture<>();
1998          final CompletableFuture<Integer> g = new CompletableFuture<>();
1999          final Noop r = new Noop();
# Line 1938 | Line 2007 | public class CompletableFutureTest exten
2007          checkCancelled(g);
2008          assertEquals(0, r.invocationCount);
2009          checkCompletedNormally(f, v1);
2010 <        }
1942 <    }
2010 >    }}
2011  
2012      public void testRunAfterBoth_sourceCancelled3() {
2013          for (ExecutionMode m : ExecutionMode.values())
2014          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2015 <        for (Integer v1 : new Integer[] { 1, null }) {
2016 <
2015 >        for (Integer v1 : new Integer[] { 1, null })
2016 >    {
2017          final CompletableFuture<Integer> f = new CompletableFuture<>();
2018          final CompletableFuture<Integer> g = new CompletableFuture<>();
2019          final Noop r = new Noop();
# Line 1958 | Line 2026 | public class CompletableFutureTest exten
2026          checkCancelled(g);
2027          assertEquals(0, r.invocationCount);
2028          checkCompletedNormally(f, v1);
2029 <        }
1962 <    }
2029 >    }}
2030  
2031      public void testRunAfterBoth_sourceCancelled4() {
2032          for (ExecutionMode m : ExecutionMode.values())
2033          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2034 <        for (Integer v1 : new Integer[] { 1, null }) {
2035 <
2034 >        for (Integer v1 : new Integer[] { 1, null })
2035 >    {
2036          final CompletableFuture<Integer> f = new CompletableFuture<>();
2037          final CompletableFuture<Integer> g = new CompletableFuture<>();
2038          final Noop r = new Noop();
# Line 1978 | Line 2045 | public class CompletableFutureTest exten
2045          checkCancelled(f);
2046          assertEquals(0, r.invocationCount);
2047          checkCompletedNormally(g, v1);
2048 <        }
1982 <    }
2048 >    }}
2049  
2050      /**
2051       * applyToEither result completes normally after normal completion
# Line 1988 | Line 2054 | public class CompletableFutureTest exten
2054      public void testApplyToEither_normalCompletion1() {
2055          for (ExecutionMode m : ExecutionMode.values())
2056          for (Integer v1 : new Integer[] { 1, null })
2057 <        for (Integer v2 : new Integer[] { 2, null }) {
2058 <
2057 >        for (Integer v2 : new Integer[] { 2, null })
2058 >    {
2059          final CompletableFuture<Integer> f = new CompletableFuture<>();
2060          final CompletableFuture<Integer> g = new CompletableFuture<>();
2061          final IncFunction r = new IncFunction();
# Line 2002 | Line 2068 | public class CompletableFutureTest exten
2068          checkCompletedNormally(f, v1);
2069          checkCompletedNormally(g, v2);
2070          checkCompletedNormally(h, inc(v1));
2071 <        }
2006 <    }
2071 >    }}
2072  
2073      public void testApplyToEither_normalCompletion2() {
2074          for (ExecutionMode m : ExecutionMode.values())
2075          for (Integer v1 : new Integer[] { 1, null })
2076 <        for (Integer v2 : new Integer[] { 2, null }) {
2077 <
2076 >        for (Integer v2 : new Integer[] { 2, null })
2077 >    {
2078          final CompletableFuture<Integer> f = new CompletableFuture<>();
2079          final CompletableFuture<Integer> g = new CompletableFuture<>();
2080          final IncFunction r = new IncFunction();
# Line 2022 | Line 2087 | public class CompletableFutureTest exten
2087          checkCompletedNormally(f, v1);
2088          checkCompletedNormally(g, v2);
2089          checkCompletedNormally(h, inc(v2));
2090 <        }
2091 <    }
2090 >        }}
2091 >
2092      public void testApplyToEither_normalCompletion3() {
2093          for (ExecutionMode m : ExecutionMode.values())
2094          for (Integer v1 : new Integer[] { 1, null })
2095 <        for (Integer v2 : new Integer[] { 2, null }) {
2096 <
2095 >        for (Integer v2 : new Integer[] { 2, null })
2096 >    {
2097          final CompletableFuture<Integer> f = new CompletableFuture<>();
2098          final CompletableFuture<Integer> g = new CompletableFuture<>();
2099          final IncFunction r = new IncFunction();
# Line 2044 | Line 2109 | public class CompletableFutureTest exten
2109          assertTrue(Objects.equals(h.join(), inc(v1)) ||
2110                     Objects.equals(h.join(), inc(v2)));
2111          assertEquals(1, r.invocationCount);
2112 <        }
2048 <    }
2112 >    }}
2113  
2114      /**
2115       * applyToEither result completes exceptionally after exceptional
# Line 2053 | Line 2117 | public class CompletableFutureTest exten
2117       */
2118      public void testApplyToEither_exceptionalCompletion1() {
2119          for (ExecutionMode m : ExecutionMode.values())
2120 <        for (Integer v1 : new Integer[] { 1, null }) {
2121 <
2120 >        for (Integer v1 : new Integer[] { 1, null })
2121 >    {
2122          final CompletableFuture<Integer> f = new CompletableFuture<>();
2123          final CompletableFuture<Integer> g = new CompletableFuture<>();
2124          final IncFunction r = new IncFunction();
# Line 2069 | Line 2133 | public class CompletableFutureTest exten
2133          checkCompletedNormally(g, v1);
2134          checkCompletedWithWrappedCFException(f, ex);
2135          checkCompletedWithWrappedCFException(h, ex);
2136 <        }
2073 <    }
2136 >    }}
2137  
2138      public void testApplyToEither_exceptionalCompletion2() {
2139          for (ExecutionMode m : ExecutionMode.values())
2140 <        for (Integer v1 : new Integer[] { 1, null }) {
2141 <
2140 >        for (Integer v1 : new Integer[] { 1, null })
2141 >    {
2142          final CompletableFuture<Integer> f = new CompletableFuture<>();
2143          final CompletableFuture<Integer> g = new CompletableFuture<>();
2144          final IncFunction r = new IncFunction();
# Line 2090 | Line 2153 | public class CompletableFutureTest exten
2153          checkCompletedNormally(f, v1);
2154          checkCompletedWithWrappedCFException(g, ex);
2155          checkCompletedWithWrappedCFException(h, ex);
2156 <        }
2094 <    }
2156 >    }}
2157  
2158      public void testApplyToEither_exceptionalCompletion3() {
2159          for (ExecutionMode m : ExecutionMode.values())
2160 <        for (Integer v1 : new Integer[] { 1, null }) {
2161 <
2160 >        for (Integer v1 : new Integer[] { 1, null })
2161 >    {
2162          final CompletableFuture<Integer> f = new CompletableFuture<>();
2163          final CompletableFuture<Integer> g = new CompletableFuture<>();
2164          final IncFunction r = new IncFunction();
# Line 2118 | Line 2180 | public class CompletableFutureTest exten
2180  
2181          checkCompletedWithWrappedCFException(g, ex);
2182          checkCompletedNormally(f, v1);
2183 <        }
2122 <    }
2183 >    }}
2184  
2185      public void testApplyToEither_exceptionalCompletion4() {
2186          for (ExecutionMode m : ExecutionMode.values())
2187 <        for (Integer v1 : new Integer[] { 1, null }) {
2188 <
2187 >        for (Integer v1 : new Integer[] { 1, null })
2188 >    {
2189          final CompletableFuture<Integer> f = new CompletableFuture<>();
2190          final CompletableFuture<Integer> g = new CompletableFuture<>();
2191          final IncFunction r = new IncFunction();
# Line 2146 | Line 2207 | public class CompletableFutureTest exten
2207  
2208          checkCompletedWithWrappedCFException(f, ex);
2209          checkCompletedNormally(g, v1);
2210 <        }
2150 <    }
2210 >    }}
2211  
2212      /**
2213       * applyToEither result completes exceptionally if action does
# Line 2155 | Line 2215 | public class CompletableFutureTest exten
2215      public void testApplyToEither_actionFailed1() {
2216          for (ExecutionMode m : ExecutionMode.values())
2217          for (Integer v1 : new Integer[] { 1, null })
2218 <        for (Integer v2 : new Integer[] { 2, null }) {
2219 <
2218 >        for (Integer v2 : new Integer[] { 2, null })
2219 >    {
2220          final CompletableFuture<Integer> f = new CompletableFuture<>();
2221          final CompletableFuture<Integer> g = new CompletableFuture<>();
2222          final FailingFunction r = new FailingFunction();
# Line 2167 | Line 2227 | public class CompletableFutureTest exten
2227          g.complete(v2);
2228          checkCompletedNormally(f, v1);
2229          checkCompletedNormally(g, v2);
2230 <        }
2171 <    }
2230 >    }}
2231  
2232      public void testApplyToEither_actionFailed2() {
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 FailingFunction r = new FailingFunction();
# Line 2185 | Line 2244 | public class CompletableFutureTest exten
2244          f.complete(v1);
2245          checkCompletedNormally(f, v1);
2246          checkCompletedNormally(g, v2);
2247 <        }
2189 <    }
2247 >    }}
2248  
2249      /**
2250       * applyToEither result completes exceptionally if either source cancelled
# Line 2194 | Line 2252 | public class CompletableFutureTest exten
2252      public void testApplyToEither_sourceCancelled1() {
2253          for (ExecutionMode m : ExecutionMode.values())
2254          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2255 <        for (Integer v1 : new Integer[] { 1, null }) {
2256 <
2255 >        for (Integer v1 : new Integer[] { 1, null })
2256 >    {
2257          final CompletableFuture<Integer> f = new CompletableFuture<>();
2258          final CompletableFuture<Integer> g = new CompletableFuture<>();
2259          final IncFunction r = new IncFunction();
# Line 2209 | Line 2267 | public class CompletableFutureTest exten
2267          assertEquals(0, r.invocationCount);
2268          checkCompletedNormally(g, v1);
2269          checkCompletedWithWrappedCancellationException(h);
2270 <        }
2213 <    }
2270 >    }}
2271  
2272      public void testApplyToEither_sourceCancelled2() {
2273          for (ExecutionMode m : ExecutionMode.values())
2274          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2275 <        for (Integer v1 : new Integer[] { 1, null }) {
2276 <
2275 >        for (Integer v1 : new Integer[] { 1, null })
2276 >    {
2277          final CompletableFuture<Integer> f = new CompletableFuture<>();
2278          final CompletableFuture<Integer> g = new CompletableFuture<>();
2279          final IncFunction r = new IncFunction();
# Line 2230 | Line 2287 | public class CompletableFutureTest exten
2287          assertEquals(0, r.invocationCount);
2288          checkCompletedNormally(f, v1);
2289          checkCompletedWithWrappedCancellationException(h);
2290 <        }
2234 <    }
2290 >    }}
2291  
2292      public void testApplyToEither_sourceCancelled3() {
2293          for (ExecutionMode m : ExecutionMode.values())
2294          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2295 <        for (Integer v1 : new Integer[] { 1, null }) {
2296 <
2295 >        for (Integer v1 : new Integer[] { 1, null })
2296 >    {
2297          final CompletableFuture<Integer> f = new CompletableFuture<>();
2298          final CompletableFuture<Integer> g = new CompletableFuture<>();
2299          final IncFunction r = new IncFunction();
# Line 2258 | Line 2314 | public class CompletableFutureTest exten
2314  
2315          checkCancelled(g);
2316          checkCompletedNormally(f, v1);
2317 <        }
2262 <    }
2317 >    }}
2318  
2319      public void testApplyToEither_sourceCancelled4() {
2320          for (ExecutionMode m : ExecutionMode.values())
2321          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2322 <        for (Integer v1 : new Integer[] { 1, null }) {
2323 <
2322 >        for (Integer v1 : new Integer[] { 1, null })
2323 >    {
2324          final CompletableFuture<Integer> f = new CompletableFuture<>();
2325          final CompletableFuture<Integer> g = new CompletableFuture<>();
2326          final IncFunction r = new IncFunction();
# Line 2286 | Line 2341 | public class CompletableFutureTest exten
2341  
2342          checkCancelled(f);
2343          checkCompletedNormally(g, v1);
2344 <        }
2290 <    }
2344 >    }}
2345  
2346      /**
2347       * acceptEither result completes normally after normal completion
# Line 2296 | Line 2350 | public class CompletableFutureTest exten
2350      public void testAcceptEither_normalCompletion1() {
2351          for (ExecutionMode m : ExecutionMode.values())
2352          for (Integer v1 : new Integer[] { 1, null })
2353 <        for (Integer v2 : new Integer[] { 2, null }) {
2354 <
2353 >        for (Integer v2 : new Integer[] { 2, null })
2354 >    {
2355          final CompletableFuture<Integer> f = new CompletableFuture<>();
2356          final CompletableFuture<Integer> g = new CompletableFuture<>();
2357          final IncAction r = new IncAction();
# Line 2311 | Line 2365 | public class CompletableFutureTest exten
2365          checkCompletedNormally(f, v1);
2366          checkCompletedNormally(g, v2);
2367          checkCompletedNormally(h, null);
2368 <        }
2315 <    }
2368 >    }}
2369  
2370      public void testAcceptEither_normalCompletion2() {
2371          for (ExecutionMode m : ExecutionMode.values())
2372          for (Integer v1 : new Integer[] { 1, null })
2373 <        for (Integer v2 : new Integer[] { 2, null }) {
2374 <
2373 >        for (Integer v2 : new Integer[] { 2, null })
2374 >    {
2375          final CompletableFuture<Integer> f = new CompletableFuture<>();
2376          final CompletableFuture<Integer> g = new CompletableFuture<>();
2377          final IncAction r = new IncAction();
# Line 2332 | Line 2385 | public class CompletableFutureTest exten
2385          checkCompletedNormally(f, v1);
2386          checkCompletedNormally(g, v2);
2387          checkCompletedNormally(h, null);
2388 <        }
2389 <    }
2388 >    }}
2389 >
2390      public void testAcceptEither_normalCompletion3() {
2391          for (ExecutionMode m : ExecutionMode.values())
2392          for (Integer v1 : new Integer[] { 1, null })
2393 <        for (Integer v2 : new Integer[] { 2, null }) {
2394 <
2393 >        for (Integer v2 : new Integer[] { 2, null })
2394 >    {
2395          final CompletableFuture<Integer> f = new CompletableFuture<>();
2396          final CompletableFuture<Integer> g = new CompletableFuture<>();
2397          final IncAction r = new IncAction();
# Line 2354 | Line 2407 | public class CompletableFutureTest exten
2407          // unspecified behavior
2408          assertTrue(Objects.equals(r.value, inc(v1)) ||
2409                     Objects.equals(r.value, inc(v2)));
2410 <        }
2358 <    }
2410 >    }}
2411  
2412      /**
2413       * acceptEither result completes exceptionally after exceptional
# Line 2363 | Line 2415 | public class CompletableFutureTest exten
2415       */
2416      public void testAcceptEither_exceptionalCompletion1() {
2417          for (ExecutionMode m : ExecutionMode.values())
2418 <        for (Integer v1 : new Integer[] { 1, null }) {
2419 <
2418 >        for (Integer v1 : new Integer[] { 1, null })
2419 >    {
2420          final CompletableFuture<Integer> f = new CompletableFuture<>();
2421          final CompletableFuture<Integer> g = new CompletableFuture<>();
2422          final IncAction r = new IncAction();
# Line 2379 | Line 2431 | public class CompletableFutureTest exten
2431          checkCompletedNormally(g, v1);
2432          checkCompletedWithWrappedCFException(f, ex);
2433          checkCompletedWithWrappedCFException(h, ex);
2434 <        }
2383 <    }
2434 >    }}
2435  
2436      public void testAcceptEither_exceptionalCompletion2() {
2437          for (ExecutionMode m : ExecutionMode.values())
2438 <        for (Integer v1 : new Integer[] { 1, null }) {
2439 <
2438 >        for (Integer v1 : new Integer[] { 1, null })
2439 >    {
2440          final CompletableFuture<Integer> f = new CompletableFuture<>();
2441          final CompletableFuture<Integer> g = new CompletableFuture<>();
2442          final IncAction r = new IncAction();
# Line 2400 | Line 2451 | public class CompletableFutureTest exten
2451          checkCompletedNormally(f, v1);
2452          checkCompletedWithWrappedCFException(g, ex);
2453          checkCompletedWithWrappedCFException(h, ex);
2454 <        }
2404 <    }
2454 >    }}
2455  
2456      public void testAcceptEither_exceptionalCompletion3() {
2457          for (ExecutionMode m : ExecutionMode.values())
2458 <        for (Integer v1 : new Integer[] { 1, null }) {
2459 <
2458 >        for (Integer v1 : new Integer[] { 1, null })
2459 >    {
2460          final CompletableFuture<Integer> f = new CompletableFuture<>();
2461          final CompletableFuture<Integer> g = new CompletableFuture<>();
2462          final IncAction r = new IncAction();
# Line 2429 | Line 2479 | public class CompletableFutureTest exten
2479  
2480          checkCompletedWithWrappedCFException(g, ex);
2481          checkCompletedNormally(f, v1);
2482 <        }
2433 <    }
2482 >    }}
2483  
2484      public void testAcceptEither_exceptionalCompletion4() {
2485          for (ExecutionMode m : ExecutionMode.values())
2486 <        for (Integer v1 : new Integer[] { 1, null }) {
2487 <
2486 >        for (Integer v1 : new Integer[] { 1, null })
2487 >    {
2488          final CompletableFuture<Integer> f = new CompletableFuture<>();
2489          final CompletableFuture<Integer> g = new CompletableFuture<>();
2490          final IncAction r = new IncAction();
# Line 2458 | Line 2507 | public class CompletableFutureTest exten
2507  
2508          checkCompletedWithWrappedCFException(f, ex);
2509          checkCompletedNormally(g, v1);
2510 <        }
2462 <    }
2510 >    }}
2511  
2512      /**
2513       * acceptEither result completes exceptionally if action does
# Line 2467 | Line 2515 | public class CompletableFutureTest exten
2515      public void testAcceptEither_actionFailed1() {
2516          for (ExecutionMode m : ExecutionMode.values())
2517          for (Integer v1 : new Integer[] { 1, null })
2518 <        for (Integer v2 : new Integer[] { 2, null }) {
2519 <
2518 >        for (Integer v2 : new Integer[] { 2, null })
2519 >    {
2520          final CompletableFuture<Integer> f = new CompletableFuture<>();
2521          final CompletableFuture<Integer> g = new CompletableFuture<>();
2522          final FailingConsumer r = new FailingConsumer();
# Line 2479 | Line 2527 | public class CompletableFutureTest exten
2527          g.complete(v2);
2528          checkCompletedNormally(f, v1);
2529          checkCompletedNormally(g, v2);
2530 <        }
2483 <    }
2530 >    }}
2531  
2532      public void testAcceptEither_actionFailed2() {
2533          for (ExecutionMode m : ExecutionMode.values())
2534          for (Integer v1 : new Integer[] { 1, null })
2535 <        for (Integer v2 : new Integer[] { 2, null }) {
2536 <
2535 >        for (Integer v2 : new Integer[] { 2, null })
2536 >    {
2537          final CompletableFuture<Integer> f = new CompletableFuture<>();
2538          final CompletableFuture<Integer> g = new CompletableFuture<>();
2539          final FailingConsumer r = new FailingConsumer();
# Line 2497 | Line 2544 | public class CompletableFutureTest exten
2544          f.complete(v1);
2545          checkCompletedNormally(f, v1);
2546          checkCompletedNormally(g, v2);
2547 <        }
2501 <    }
2547 >    }}
2548  
2549      /**
2550       * acceptEither result completes exceptionally if either source cancelled
# Line 2506 | Line 2552 | public class CompletableFutureTest exten
2552      public void testAcceptEither_sourceCancelled1() {
2553          for (ExecutionMode m : ExecutionMode.values())
2554          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2555 <        for (Integer v1 : new Integer[] { 1, null }) {
2556 <
2555 >        for (Integer v1 : new Integer[] { 1, null })
2556 >    {
2557          final CompletableFuture<Integer> f = new CompletableFuture<>();
2558          final CompletableFuture<Integer> g = new CompletableFuture<>();
2559          final IncAction r = new IncAction();
# Line 2521 | Line 2567 | public class CompletableFutureTest exten
2567          assertEquals(0, r.invocationCount);
2568          checkCompletedNormally(g, v1);
2569          checkCompletedWithWrappedCancellationException(h);
2570 <        }
2525 <    }
2570 >    }}
2571  
2572      public void testAcceptEither_sourceCancelled2() {
2573          for (ExecutionMode m : ExecutionMode.values())
2574          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2575 <        for (Integer v1 : new Integer[] { 1, null }) {
2576 <
2575 >        for (Integer v1 : new Integer[] { 1, null })
2576 >    {
2577          final CompletableFuture<Integer> f = new CompletableFuture<>();
2578          final CompletableFuture<Integer> g = new CompletableFuture<>();
2579          final IncAction r = new IncAction();
# Line 2542 | Line 2587 | public class CompletableFutureTest exten
2587          assertEquals(0, r.invocationCount);
2588          checkCompletedNormally(f, v1);
2589          checkCompletedWithWrappedCancellationException(h);
2590 <        }
2546 <    }
2590 >    }}
2591  
2592      public void testAcceptEither_sourceCancelled3() {
2593          for (ExecutionMode m : ExecutionMode.values())
2594          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2595 <        for (Integer v1 : new Integer[] { 1, null }) {
2596 <
2595 >        for (Integer v1 : new Integer[] { 1, null })
2596 >    {
2597          final CompletableFuture<Integer> f = new CompletableFuture<>();
2598          final CompletableFuture<Integer> g = new CompletableFuture<>();
2599          final IncAction r = new IncAction();
# Line 2571 | Line 2615 | public class CompletableFutureTest exten
2615  
2616          checkCancelled(g);
2617          checkCompletedNormally(f, v1);
2618 <        }
2575 <    }
2618 >    }}
2619  
2620      public void testAcceptEither_sourceCancelled4() {
2621          for (ExecutionMode m : ExecutionMode.values())
2622          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2623 <        for (Integer v1 : new Integer[] { 1, null }) {
2624 <
2623 >        for (Integer v1 : new Integer[] { 1, null })
2624 >    {
2625          final CompletableFuture<Integer> f = new CompletableFuture<>();
2626          final CompletableFuture<Integer> g = new CompletableFuture<>();
2627          final IncAction r = new IncAction();
# Line 2600 | Line 2643 | public class CompletableFutureTest exten
2643  
2644          checkCancelled(f);
2645          checkCompletedNormally(g, v1);
2646 <        }
2604 <    }
2646 >    }}
2647  
2648      /**
2649       * runAfterEither result completes normally after normal completion
# Line 2610 | Line 2652 | public class CompletableFutureTest exten
2652      public void testRunAfterEither_normalCompletion1() {
2653          for (ExecutionMode m : ExecutionMode.values())
2654          for (Integer v1 : new Integer[] { 1, null })
2655 <        for (Integer v2 : new Integer[] { 2, null }) {
2656 <
2655 >        for (Integer v2 : new Integer[] { 2, null })
2656 >    {
2657          final CompletableFuture<Integer> f = new CompletableFuture<>();
2658          final CompletableFuture<Integer> g = new CompletableFuture<>();
2659          final Noop r = new Noop();
# Line 2626 | Line 2668 | public class CompletableFutureTest exten
2668          checkCompletedNormally(g, v2);
2669          checkCompletedNormally(h, null);
2670          assertEquals(1, r.invocationCount);
2671 <        }
2630 <    }
2671 >    }}
2672  
2673      public void testRunAfterEither_normalCompletion2() {
2674          for (ExecutionMode m : ExecutionMode.values())
2675          for (Integer v1 : new Integer[] { 1, null })
2676 <        for (Integer v2 : new Integer[] { 2, null }) {
2677 <
2676 >        for (Integer v2 : new Integer[] { 2, null })
2677 >    {
2678          final CompletableFuture<Integer> f = new CompletableFuture<>();
2679          final CompletableFuture<Integer> g = new CompletableFuture<>();
2680          final Noop r = new Noop();
# Line 2648 | Line 2689 | public class CompletableFutureTest exten
2689          checkCompletedNormally(g, v2);
2690          checkCompletedNormally(h, null);
2691          assertEquals(1, r.invocationCount);
2692 <        }
2693 <    }
2692 >        }}
2693 >
2694      public void testRunAfterEither_normalCompletion3() {
2695          for (ExecutionMode m : ExecutionMode.values())
2696          for (Integer v1 : new Integer[] { 1, null })
2697 <        for (Integer v2 : new Integer[] { 2, null }) {
2698 <
2697 >        for (Integer v2 : new Integer[] { 2, null })
2698 >    {
2699          final CompletableFuture<Integer> f = new CompletableFuture<>();
2700          final CompletableFuture<Integer> g = new CompletableFuture<>();
2701          final Noop r = new Noop();
# Line 2667 | Line 2708 | public class CompletableFutureTest exten
2708          checkCompletedNormally(f, v1);
2709          checkCompletedNormally(g, v2);
2710          assertEquals(1, r.invocationCount);
2711 <        }
2671 <    }
2711 >    }}
2712  
2713      /**
2714       * runAfterEither result completes exceptionally after exceptional
# Line 2676 | Line 2716 | public class CompletableFutureTest exten
2716       */
2717      public void testRunAfterEither_exceptionalCompletion1() {
2718          for (ExecutionMode m : ExecutionMode.values())
2719 <        for (Integer v1 : new Integer[] { 1, null }) {
2720 <
2719 >        for (Integer v1 : new Integer[] { 1, null })
2720 >    {
2721          final CompletableFuture<Integer> f = new CompletableFuture<>();
2722          final CompletableFuture<Integer> g = new CompletableFuture<>();
2723          final Noop r = new Noop();
# Line 2692 | Line 2732 | public class CompletableFutureTest exten
2732          checkCompletedNormally(g, v1);
2733          checkCompletedWithWrappedCFException(f, ex);
2734          checkCompletedWithWrappedCFException(h, ex);
2735 <        }
2696 <    }
2735 >    }}
2736  
2737      public void testRunAfterEither_exceptionalCompletion2() {
2738          for (ExecutionMode m : ExecutionMode.values())
2739 <        for (Integer v1 : new Integer[] { 1, null }) {
2740 <
2739 >        for (Integer v1 : new Integer[] { 1, null })
2740 >    {
2741          final CompletableFuture<Integer> f = new CompletableFuture<>();
2742          final CompletableFuture<Integer> g = new CompletableFuture<>();
2743          final Noop r = new Noop();
# Line 2713 | Line 2752 | public class CompletableFutureTest exten
2752          checkCompletedNormally(f, v1);
2753          checkCompletedWithWrappedCFException(g, ex);
2754          checkCompletedWithWrappedCFException(h, ex);
2755 <        }
2717 <    }
2755 >    }}
2756  
2757      public void testRunAfterEither_exceptionalCompletion3() {
2758          for (ExecutionMode m : ExecutionMode.values())
2759 <        for (Integer v1 : new Integer[] { 1, null }) {
2760 <
2759 >        for (Integer v1 : new Integer[] { 1, null })
2760 >    {
2761          final CompletableFuture<Integer> f = new CompletableFuture<>();
2762          final CompletableFuture<Integer> g = new CompletableFuture<>();
2763          final Noop r = new Noop();
# Line 2741 | Line 2779 | public class CompletableFutureTest exten
2779  
2780          checkCompletedWithWrappedCFException(g, ex);
2781          checkCompletedNormally(f, v1);
2782 <        }
2745 <    }
2782 >    }}
2783  
2784      public void testRunAfterEither_exceptionalCompletion4() {
2785          for (ExecutionMode m : ExecutionMode.values())
2786 <        for (Integer v1 : new Integer[] { 1, null }) {
2787 <
2786 >        for (Integer v1 : new Integer[] { 1, null })
2787 >    {
2788          final CompletableFuture<Integer> f = new CompletableFuture<>();
2789          final CompletableFuture<Integer> g = new CompletableFuture<>();
2790          final Noop r = new Noop();
# Line 2769 | Line 2806 | public class CompletableFutureTest exten
2806  
2807          checkCompletedWithWrappedCFException(f, ex);
2808          checkCompletedNormally(g, v1);
2809 <        }
2773 <    }
2809 >    }}
2810  
2811      /**
2812       * runAfterEither result completes exceptionally if action does
# Line 2778 | Line 2814 | public class CompletableFutureTest exten
2814      public void testRunAfterEither_actionFailed1() {
2815          for (ExecutionMode m : ExecutionMode.values())
2816          for (Integer v1 : new Integer[] { 1, null })
2817 <        for (Integer v2 : new Integer[] { 2, null }) {
2818 <
2817 >        for (Integer v2 : new Integer[] { 2, null })
2818 >    {
2819          final CompletableFuture<Integer> f = new CompletableFuture<>();
2820          final CompletableFuture<Integer> g = new CompletableFuture<>();
2821 <        final FailingNoop r = new FailingNoop();
2821 >        final FailingRunnable r = new FailingRunnable();
2822          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2823  
2824          f.complete(v1);
# Line 2790 | Line 2826 | public class CompletableFutureTest exten
2826          g.complete(v2);
2827          checkCompletedNormally(f, v1);
2828          checkCompletedNormally(g, v2);
2829 <        }
2794 <    }
2829 >    }}
2830  
2831      public void testRunAfterEither_actionFailed2() {
2832          for (ExecutionMode m : ExecutionMode.values())
2833          for (Integer v1 : new Integer[] { 1, null })
2834 <        for (Integer v2 : new Integer[] { 2, null }) {
2835 <
2834 >        for (Integer v2 : new Integer[] { 2, null })
2835 >    {
2836          final CompletableFuture<Integer> f = new CompletableFuture<>();
2837          final CompletableFuture<Integer> g = new CompletableFuture<>();
2838 <        final FailingNoop r = new FailingNoop();
2838 >        final FailingRunnable r = new FailingRunnable();
2839          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2840  
2841          g.complete(v2);
# Line 2808 | Line 2843 | public class CompletableFutureTest exten
2843          f.complete(v1);
2844          checkCompletedNormally(f, v1);
2845          checkCompletedNormally(g, v2);
2846 <        }
2812 <    }
2846 >    }}
2847  
2848      /**
2849       * runAfterEither result completes exceptionally if either source cancelled
# Line 2817 | Line 2851 | public class CompletableFutureTest exten
2851      public void testRunAfterEither_sourceCancelled1() {
2852          for (ExecutionMode m : ExecutionMode.values())
2853          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2854 <        for (Integer v1 : new Integer[] { 1, null }) {
2855 <
2854 >        for (Integer v1 : new Integer[] { 1, null })
2855 >    {
2856          final CompletableFuture<Integer> f = new CompletableFuture<>();
2857          final CompletableFuture<Integer> g = new CompletableFuture<>();
2858          final Noop r = new Noop();
# Line 2832 | Line 2866 | public class CompletableFutureTest exten
2866          assertEquals(0, r.invocationCount);
2867          checkCompletedNormally(g, v1);
2868          checkCompletedWithWrappedCancellationException(h);
2869 <        }
2836 <    }
2869 >    }}
2870  
2871      public void testRunAfterEither_sourceCancelled2() {
2872          for (ExecutionMode m : ExecutionMode.values())
2873          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2874 <        for (Integer v1 : new Integer[] { 1, null }) {
2875 <
2874 >        for (Integer v1 : new Integer[] { 1, null })
2875 >    {
2876          final CompletableFuture<Integer> f = new CompletableFuture<>();
2877          final CompletableFuture<Integer> g = new CompletableFuture<>();
2878          final Noop r = new Noop();
# Line 2853 | Line 2886 | public class CompletableFutureTest exten
2886          assertEquals(0, r.invocationCount);
2887          checkCompletedNormally(f, v1);
2888          checkCompletedWithWrappedCancellationException(h);
2889 <        }
2857 <    }
2889 >    }}
2890  
2891      public void testRunAfterEither_sourceCancelled3() {
2892          for (ExecutionMode m : ExecutionMode.values())
2893          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2894 <        for (Integer v1 : new Integer[] { 1, null }) {
2895 <
2894 >        for (Integer v1 : new Integer[] { 1, null })
2895 >    {
2896          final CompletableFuture<Integer> f = new CompletableFuture<>();
2897          final CompletableFuture<Integer> g = new CompletableFuture<>();
2898          final Noop r = new Noop();
# Line 2881 | Line 2913 | public class CompletableFutureTest exten
2913  
2914          checkCancelled(g);
2915          checkCompletedNormally(f, v1);
2916 <        }
2885 <    }
2916 >    }}
2917  
2918      public void testRunAfterEither_sourceCancelled4() {
2919          for (ExecutionMode m : ExecutionMode.values())
2920          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2921 <        for (Integer v1 : new Integer[] { 1, null }) {
2922 <
2921 >        for (Integer v1 : new Integer[] { 1, null })
2922 >    {
2923          final CompletableFuture<Integer> f = new CompletableFuture<>();
2924          final CompletableFuture<Integer> g = new CompletableFuture<>();
2925          final Noop r = new Noop();
# Line 2909 | Line 2940 | public class CompletableFutureTest exten
2940  
2941          checkCancelled(f);
2942          checkCompletedNormally(g, v1);
2943 <        }
2913 <    }
2943 >    }}
2944  
2945      /**
2946       * thenCompose result completes normally after normal completion of source
2947       */
2948 <    public void testThenCompose_normalCompletion1() {
2948 >    public void testThenCompose_normalCompletion() {
2949          for (ExecutionMode m : ExecutionMode.values())
2950 <        for (Integer v1 : new Integer[] { 1, null }) {
2951 <
2950 >        for (boolean createIncomplete : new boolean[] { true, false })
2951 >        for (Integer v1 : new Integer[] { 1, null })
2952 >    {
2953          final CompletableFuture<Integer> f = new CompletableFuture<>();
2954          final CompletableFutureInc r = new CompletableFutureInc();
2955 +        if (!createIncomplete) f.complete(v1);
2956          final CompletableFuture<Integer> g = f.thenCompose(r);
2957 <        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 }) {
2957 >        if (createIncomplete) f.complete(v1);
2958  
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);
2959          checkCompletedNormally(g, inc(v1));
2960          checkCompletedNormally(f, v1);
2961          assertEquals(1, r.invocationCount);
2962 <        }
2944 <    }
2962 >    }}
2963  
2964      /**
2965       * thenCompose result completes exceptionally after exceptional
2966       * completion of source
2967       */
2968 <    public void testThenCompose_exceptionalCompletion1() {
2969 <        for (ExecutionMode m : ExecutionMode.values()) {
2970 <
2968 >    public void testThenCompose_exceptionalCompletion() {
2969 >        for (ExecutionMode m : ExecutionMode.values())
2970 >        for (boolean createIncomplete : new boolean[] { true, false })
2971 >    {
2972          final CFException ex = new CFException();
2973          final CompletableFutureInc r = new CompletableFutureInc();
2974          final CompletableFuture<Integer> f = new CompletableFuture<>();
2975 +        if (!createIncomplete) f.completeExceptionally(ex);
2976          final CompletableFuture<Integer> g = f.thenCompose(r);
2977 <        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()) {
2977 >        if (createIncomplete) f.completeExceptionally(ex);
2978  
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);
2979          checkCompletedWithWrappedCFException(g, ex);
2980          checkCompletedWithWrappedCFException(f, ex);
2981 <        }
2982 <    }
2981 >        assertEquals(0, r.invocationCount);
2982 >    }}
2983  
2984      /**
2985       * thenCompose result completes exceptionally if action does
2986       */
2987 <    public void testThenCompose_actionFailed1() {
2987 >    public void testThenCompose_actionFailed() {
2988          for (ExecutionMode m : ExecutionMode.values())
2989 <        for (Integer v1 : new Integer[] { 1, null }) {
2990 <
2989 >        for (boolean createIncomplete : new boolean[] { true, false })
2990 >        for (Integer v1 : new Integer[] { 1, null })
2991 >    {
2992          final CompletableFuture<Integer> f = new CompletableFuture<>();
2993          final FailingCompletableFutureFunction r
2994              = new FailingCompletableFutureFunction();
2995 +        if (!createIncomplete) f.complete(v1);
2996          final CompletableFuture<Integer> g = f.thenCompose(r);
2997 <        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 }) {
2997 >        if (createIncomplete) f.complete(v1);
2998  
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);
2999          checkCompletedWithWrappedCFException(g);
3000          checkCompletedNormally(f, v1);
3001 <        }
3005 <    }
3001 >    }}
3002  
3003      /**
3004       * thenCompose result completes exceptionally if source cancelled
3005       */
3006 <    public void testThenCompose_sourceCancelled1() {
3006 >    public void testThenCompose_sourceCancelled() {
3007          for (ExecutionMode m : ExecutionMode.values())
3008 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
3009 <
3008 >        for (boolean createIncomplete : new boolean[] { true, false })
3009 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3010 >    {
3011          final CompletableFuture<Integer> f = new CompletableFuture<>();
3012          final CompletableFutureInc r = new CompletableFutureInc();
3013 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3014          final CompletableFuture<Integer> g = f.thenCompose(r);
3015 <        assertTrue(f.cancel(mayInterruptIfRunning));
3016 <        checkCompletedWithWrappedCancellationException(g);
3017 <        checkCancelled(f);
3015 >        if (createIncomplete) {
3016 >            checkIncomplete(g);
3017 >            assertTrue(f.cancel(mayInterruptIfRunning));
3018          }
3021    }
3022
3023    public void testThenCompose_sourceCancelled2() {
3024        for (ExecutionMode m : ExecutionMode.values())
3025        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
3019  
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);
3020          checkCompletedWithWrappedCancellationException(g);
3021          checkCancelled(f);
3022 <        }
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 <    }
3022 >    }}
3023  
3024      // other static methods
3025  
# Line 3607 | Line 3301 | public class CompletableFutureTest exten
3301      public void testWhenComplete_actionFailed() {
3302          for (boolean createIncomplete : new boolean[] { true, false })
3303          for (ExecutionMode m : ExecutionMode.values())
3304 <        for (Integer v1 : new Integer[] { 1, null }) {
3305 <
3304 >        for (Integer v1 : new Integer[] { 1, null })
3305 >    {
3306          final AtomicInteger a = new AtomicInteger(0);
3307          final CFException ex = new CFException();
3308          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 3625 | Line 3319 | public class CompletableFutureTest exten
3319          checkCompletedNormally(f, v1);
3320          checkCompletedWithWrappedCFException(g, ex);
3321          assertEquals(1, a.get());
3322 <        }
3629 <    }
3322 >    }}
3323  
3324      /**
3325       * If a whenComplete action throws an exception when triggered by
# Line 3636 | Line 3329 | public class CompletableFutureTest exten
3329      public void testWhenComplete_actionFailedSourceFailed() {
3330          for (boolean createIncomplete : new boolean[] { true, false })
3331          for (ExecutionMode m : ExecutionMode.values())
3332 <        for (Integer v1 : new Integer[] { 1, null }) {
3333 <
3332 >        for (Integer v1 : new Integer[] { 1, null })
3333 >    {
3334          final AtomicInteger a = new AtomicInteger(0);
3335          final CFException ex1 = new CFException();
3336          final CFException ex2 = new CFException();
# Line 3657 | Line 3350 | public class CompletableFutureTest exten
3350          checkCompletedWithWrappedCFException(f, ex1);
3351          checkCompletedWithWrappedCFException(g, ex1);
3352          assertEquals(1, a.get());
3353 <        }
3661 <    }
3353 >    }}
3354  
3355   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines