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.50 by jsr166, Mon Jun 2 19:32:57 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) f.complete(v1);
987  
975        f = new CompletableFuture<>();
976        f.complete(null);
977        g = f.thenRun(r = new Noop());
988          checkCompletedNormally(g, null);
989 +        checkCompletedNormally(f, v1);
990          assertEquals(1, r.invocationCount);
991 <    }
991 >    }}
992  
993      /**
994       * thenRun result completes exceptionally after exceptional
995       * completion of source
996       */
997 <    public void testThenRun2() {
998 <        CompletableFuture<Integer> f;
999 <        CompletableFuture<Void> g;
1000 <        Noop r;
1001 <
1002 <        f = new CompletableFuture<>();
1003 <        g = f.thenRun(r = new Noop());
1004 <        f.completeExceptionally(new CFException());
1005 <        checkCompletedWithWrappedCFException(g);
1006 <        assertEquals(0, r.invocationCount);
997 >    public void testThenRun_exceptionalCompletion() {
998 >        for (ExecutionMode m : ExecutionMode.values())
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >    {
1001 >        final CFException ex = new CFException();
1002 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1003 >        final Noop r = new Noop();
1004 >        if (!createIncomplete) f.completeExceptionally(ex);
1005 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 >        if (createIncomplete) f.completeExceptionally(ex);
1007  
1008 <        f = new CompletableFuture<>();
1009 <        f.completeExceptionally(new CFException());
999 <        g = f.thenRun(r = new Noop());
1000 <        checkCompletedWithWrappedCFException(g);
1008 >        checkCompletedWithWrappedCFException(g, ex);
1009 >        checkCompletedWithWrappedCFException(f, ex);
1010          assertEquals(0, r.invocationCount);
1011 <    }
1011 >    }}
1012  
1013      /**
1014 <     * thenRun result completes exceptionally if action does
1014 >     * thenRun result completes exceptionally if source cancelled
1015       */
1016 <    public void testThenRun3() {
1017 <        CompletableFuture<Integer> f;
1018 <        CompletableFuture<Void> g;
1019 <        FailingNoop r;
1020 <
1021 <        f = new CompletableFuture<>();
1022 <        g = f.thenRun(r = new FailingNoop());
1023 <        f.complete(null);
1024 <        checkCompletedWithWrappedCFException(g);
1016 >    public void testThenRun_sourceCancelled() {
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1020 >    {
1021 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1022 >        final Noop r = new Noop();
1023 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 >        final CompletableFuture<Void> g = f.thenRun(r);
1025 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1026  
1027 <        f = new CompletableFuture<>();
1028 <        f.complete(null);
1029 <        g = f.thenRun(r = new FailingNoop());
1030 <        checkCompletedWithWrappedCFException(g);
1021 <    }
1027 >        checkCompletedWithWrappedCancellationException(g);
1028 >        checkCancelled(f);
1029 >        assertEquals(0, r.invocationCount);
1030 >    }}
1031  
1032      /**
1033 <     * thenRun result completes exceptionally if source cancelled
1033 >     * thenRun result completes exceptionally if action does
1034       */
1035 <    public void testThenRun4() {
1036 <        CompletableFuture<Integer> f;
1037 <        CompletableFuture<Void> g;
1038 <        Noop r;
1039 <
1040 <        f = new CompletableFuture<>();
1041 <        g = f.thenRun(r = new Noop());
1042 <        assertTrue(f.cancel(true));
1043 <        checkCompletedWithWrappedCancellationException(g);
1035 >    public void testThenRun_actionFailed() {
1036 >        for (ExecutionMode m : ExecutionMode.values())
1037 >        for (boolean createIncomplete : new boolean[] { true, false })
1038 >        for (Integer v1 : new Integer[] { 1, null })
1039 >    {
1040 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1041 >        final FailingRunnable r = new FailingRunnable();
1042 >        if (!createIncomplete) f.complete(v1);
1043 >        final CompletableFuture<Void> g = f.thenRun(r);
1044 >        if (createIncomplete) f.complete(v1);
1045  
1046 <        f = new CompletableFuture<>();
1047 <        assertTrue(f.cancel(true));
1048 <        g = f.thenRun(r = new Noop());
1039 <        checkCompletedWithWrappedCancellationException(g);
1040 <    }
1046 >        checkCompletedWithWrappedCFException(g);
1047 >        checkCompletedNormally(f, v1);
1048 >    }}
1049  
1050      /**
1051       * thenApply result completes normally after normal completion of source
1052       */
1053 <    public void testThenApply() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1055 <        CompletableFuture<Integer> g = f.thenApply(inc);
1056 <        f.complete(one);
1057 <        checkCompletedNormally(g, two);
1058 <    }
1053 >    public void testThenApply_normalCompletion() {
1054 >        for (ExecutionMode m : ExecutionMode.values())
1055 >        for (boolean createIncomplete : new boolean[] { true, false })
1056 >        for (Integer v1 : new Integer[] { 1, null })
1057 >    {
1058 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1059 >        final IncFunction r = new IncFunction();
1060 >        if (!createIncomplete) f.complete(v1);
1061 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1062 >        if (createIncomplete) {
1063 >            checkIncomplete(g);
1064 >            f.complete(v1);
1065 >        }
1066 >
1067 >        checkCompletedNormally(g, inc(v1));
1068 >        checkCompletedNormally(f, v1);
1069 >        assertEquals(1, r.invocationCount);
1070 >    }}
1071  
1072      /**
1073       * thenApply result completes exceptionally after exceptional
1074       * completion of source
1075       */
1076 <    public void testThenApply2() {
1077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1078 <        CompletableFuture<Integer> g = f.thenApply(inc);
1079 <        f.completeExceptionally(new CFException());
1080 <        checkCompletedWithWrappedCFException(g);
1081 <    }
1076 >    public void testThenApply_exceptionalCompletion() {
1077 >        for (ExecutionMode m : ExecutionMode.values())
1078 >        for (boolean createIncomplete : new boolean[] { true, false })
1079 >    {
1080 >        final CFException ex = new CFException();
1081 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1082 >        final IncFunction r = new IncFunction();
1083 >        if (!createIncomplete) f.completeExceptionally(ex);
1084 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1085 >        if (createIncomplete) f.completeExceptionally(ex);
1086  
1087 <    /**
1088 <     * thenApply result completes exceptionally if action does
1089 <     */
1090 <    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 <    }
1087 >        checkCompletedWithWrappedCFException(g, ex);
1088 >        checkCompletedWithWrappedCFException(f, ex);
1089 >        assertEquals(0, r.invocationCount);
1090 >    }}
1091  
1092      /**
1093       * thenApply result completes exceptionally if source cancelled
1094       */
1095 <    public void testThenApply4() {
1096 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1097 <        CompletableFuture<Integer> g = f.thenApply(inc);
1098 <        assertTrue(f.cancel(true));
1095 >    public void testThenApply_sourceCancelled() {
1096 >        for (ExecutionMode m : ExecutionMode.values())
1097 >        for (boolean createIncomplete : new boolean[] { true, false })
1098 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1099 >    {
1100 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1101 >        final IncFunction r = new IncFunction();
1102 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1103 >        final CompletableFuture<Integer> g = f.thenApply(r);
1104 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1105 >
1106          checkCompletedWithWrappedCancellationException(g);
1107 <    }
1107 >        checkCancelled(f);
1108 >        assertEquals(0, r.invocationCount);
1109 >    }}
1110 >
1111 >    /**
1112 >     * thenApply result completes exceptionally if action does
1113 >     */
1114 >    public void testThenApply_actionFailed() {
1115 >        for (ExecutionMode m : ExecutionMode.values())
1116 >        for (boolean createIncomplete : new boolean[] { true, false })
1117 >        for (Integer v1 : new Integer[] { 1, null })
1118 >    {
1119 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1120 >        final FailingFunction r = new FailingFunction();
1121 >        if (!createIncomplete) f.complete(v1);
1122 >        final CompletableFuture<Integer> g = f.thenApply(r);
1123 >        if (createIncomplete) f.complete(v1);
1124 >
1125 >        checkCompletedWithWrappedCFException(g);
1126 >        checkCompletedNormally(f, v1);
1127 >    }}
1128  
1129      /**
1130       * thenAccept result completes normally after normal completion of source
1131       */
1132 <    public void testThenAccept() {
1133 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1134 <        IncAction r = new IncAction();
1135 <        CompletableFuture<Void> g = f.thenAccept(r);
1136 <        f.complete(one);
1132 >    public void testThenAccept_normalCompletion() {
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 IncAction r = new IncAction();
1139 >        if (!createIncomplete) f.complete(v1);
1140 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1141 >        if (createIncomplete) f.complete(v1);
1142 >
1143          checkCompletedNormally(g, null);
1144 <        assertEquals(r.value, (Integer) 2);
1145 <    }
1144 >        checkCompletedNormally(f, v1);
1145 >        assertEquals(1, r.invocationCount);
1146 >        assertEquals(inc(v1), r.value);
1147 >    }}
1148  
1149      /**
1150       * thenAccept result completes exceptionally after exceptional
1151       * completion of source
1152       */
1153 <    public void testThenAccept2() {
1154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1155 <        IncAction r = new IncAction();
1156 <        CompletableFuture<Void> g = f.thenAccept(r);
1157 <        f.completeExceptionally(new CFException());
1158 <        checkCompletedWithWrappedCFException(g);
1159 <    }
1153 >    public void testThenAccept_exceptionalCompletion() {
1154 >        for (ExecutionMode m : ExecutionMode.values())
1155 >        for (boolean createIncomplete : new boolean[] { true, false })
1156 >    {
1157 >        final CFException ex = new CFException();
1158 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1159 >        final IncAction r = new IncAction();
1160 >        if (!createIncomplete) f.completeExceptionally(ex);
1161 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1162 >        if (createIncomplete) f.completeExceptionally(ex);
1163 >
1164 >        checkCompletedWithWrappedCFException(g, ex);
1165 >        checkCompletedWithWrappedCFException(f, ex);
1166 >        assertEquals(0, r.invocationCount);
1167 >    }}
1168  
1169      /**
1170       * thenAccept result completes exceptionally if action does
1171       */
1172 <    public void testThenAccept3() {
1173 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1174 <        FailingConsumer r = new FailingConsumer();
1175 <        CompletableFuture<Void> g = f.thenAccept(r);
1176 <        f.complete(one);
1172 >    public void testThenAccept_actionFailed() {
1173 >        for (ExecutionMode m : ExecutionMode.values())
1174 >        for (boolean createIncomplete : new boolean[] { true, false })
1175 >        for (Integer v1 : new Integer[] { 1, null })
1176 >    {
1177 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 >        final FailingConsumer r = new FailingConsumer();
1179 >        if (!createIncomplete) f.complete(v1);
1180 >        final CompletableFuture<Void> g = f.thenAccept(r);
1181 >        if (createIncomplete) f.complete(v1);
1182 >
1183          checkCompletedWithWrappedCFException(g);
1184 <        assertEquals(1, r.invocationCount);
1185 <    }
1184 >        checkCompletedNormally(f, v1);
1185 >    }}
1186  
1187      /**
1188       * thenAccept result completes exceptionally if source cancelled
1189       */
1190 <    public void testThenAccept4() {
1191 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1192 <        IncAction r = new IncAction();
1193 <        CompletableFuture<Void> g = f.thenAccept(r);
1194 <        assertTrue(f.cancel(true));
1190 >    public void testThenAccept_sourceCancelled() {
1191 >        for (ExecutionMode m : ExecutionMode.values())
1192 >        for (boolean createIncomplete : new boolean[] { true, false })
1193 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1194 >    {
1195 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1196 >        final IncAction r = new IncAction();
1197 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1198 >        final CompletableFuture<Void> g = f.thenAccept(r);
1199 >        if (createIncomplete) {
1200 >            checkIncomplete(g);
1201 >            assertTrue(f.cancel(mayInterruptIfRunning));
1202 >        }
1203 >
1204          checkCompletedWithWrappedCancellationException(g);
1205 <    }
1205 >        checkCancelled(f);
1206 >        assertEquals(0, r.invocationCount);
1207 >    }}
1208  
1209      /**
1210       * thenCombine result completes normally after normal completion
# Line 1136 | Line 1215 | public class CompletableFutureTest exten
1215          for (boolean fFirst : new boolean[] { true, false })
1216          for (ExecutionMode m : ExecutionMode.values())
1217          for (Integer v1 : new Integer[] { 1, null })
1218 <        for (Integer v2 : new Integer[] { 2, null }) {
1219 <
1218 >        for (Integer v2 : new Integer[] { 2, null })
1219 >    {
1220          final CompletableFuture<Integer> f = new CompletableFuture<>();
1221          final CompletableFuture<Integer> g = new CompletableFuture<>();
1222          final SubtractFunction r = new SubtractFunction();
# Line 1160 | Line 1239 | public class CompletableFutureTest exten
1239          checkCompletedNormally(f, v1);
1240          checkCompletedNormally(g, v2);
1241          assertEquals(1, r.invocationCount);
1242 <        }
1164 <    }
1242 >    }}
1243  
1244      /**
1245       * thenCombine result completes exceptionally after exceptional
# Line 1169 | Line 1247 | public class CompletableFutureTest exten
1247       */
1248      public void testThenCombine_exceptionalCompletion1() {
1249          for (ExecutionMode m : ExecutionMode.values())
1250 <        for (Integer v1 : new Integer[] { 1, null }) {
1251 <
1250 >        for (Integer v1 : new Integer[] { 1, null })
1251 >    {
1252          final CompletableFuture<Integer> f = new CompletableFuture<>();
1253          final CompletableFuture<Integer> g = new CompletableFuture<>();
1254          final SubtractFunction r = new SubtractFunction();
# Line 1185 | Line 1263 | public class CompletableFutureTest exten
1263          checkCompletedWithWrappedCFException(f, ex);
1264          assertEquals(0, r.invocationCount);
1265          checkCompletedNormally(g, v1);
1266 <        }
1189 <    }
1266 >    }}
1267  
1268      public void testThenCombine_exceptionalCompletion2() {
1269          for (ExecutionMode m : ExecutionMode.values())
1270 <        for (Integer v1 : new Integer[] { 1, null }) {
1271 <
1270 >        for (Integer v1 : new Integer[] { 1, null })
1271 >    {
1272          final CompletableFuture<Integer> f = new CompletableFuture<>();
1273          final CompletableFuture<Integer> g = new CompletableFuture<>();
1274          final SubtractFunction r = new SubtractFunction();
# Line 1206 | Line 1283 | public class CompletableFutureTest exten
1283          checkCompletedWithWrappedCFException(g, ex);
1284          assertEquals(0, r.invocationCount);
1285          checkCompletedNormally(f, v1);
1286 <        }
1210 <    }
1286 >    }}
1287  
1288      public void testThenCombine_exceptionalCompletion3() {
1289          for (ExecutionMode m : ExecutionMode.values())
1290 <        for (Integer v1 : new Integer[] { 1, null }) {
1291 <
1290 >        for (Integer v1 : new Integer[] { 1, null })
1291 >    {
1292          final CompletableFuture<Integer> f = new CompletableFuture<>();
1293          final CompletableFuture<Integer> g = new CompletableFuture<>();
1294          final SubtractFunction r = new SubtractFunction();
# Line 1226 | Line 1302 | public class CompletableFutureTest exten
1302          checkCompletedWithWrappedCFException(g, ex);
1303          assertEquals(0, r.invocationCount);
1304          checkCompletedNormally(f, v1);
1305 <        }
1230 <    }
1305 >    }}
1306  
1307      public void testThenCombine_exceptionalCompletion4() {
1308          for (ExecutionMode m : ExecutionMode.values())
1309 <        for (Integer v1 : new Integer[] { 1, null }) {
1310 <
1309 >        for (Integer v1 : new Integer[] { 1, null })
1310 >    {
1311          final CompletableFuture<Integer> f = new CompletableFuture<>();
1312          final CompletableFuture<Integer> g = new CompletableFuture<>();
1313          final SubtractFunction r = new SubtractFunction();
# Line 1246 | Line 1321 | public class CompletableFutureTest exten
1321          checkCompletedWithWrappedCFException(f, ex);
1322          assertEquals(0, r.invocationCount);
1323          checkCompletedNormally(g, v1);
1324 <        }
1250 <    }
1324 >    }}
1325  
1326      /**
1327       * thenCombine result completes exceptionally if action does
# Line 1255 | Line 1329 | public class CompletableFutureTest exten
1329      public void testThenCombine_actionFailed1() {
1330          for (ExecutionMode m : ExecutionMode.values())
1331          for (Integer v1 : new Integer[] { 1, null })
1332 <        for (Integer v2 : new Integer[] { 2, null }) {
1333 <
1332 >        for (Integer v2 : new Integer[] { 2, null })
1333 >    {
1334          final CompletableFuture<Integer> f = new CompletableFuture<>();
1335          final CompletableFuture<Integer> g = new CompletableFuture<>();
1336          final FailingBiFunction r = new FailingBiFunction();
# Line 1269 | Line 1343 | public class CompletableFutureTest exten
1343          checkCompletedWithWrappedCFException(h);
1344          checkCompletedNormally(f, v1);
1345          checkCompletedNormally(g, v2);
1346 <        }
1273 <    }
1346 >    }}
1347  
1348      public void testThenCombine_actionFailed2() {
1349          for (ExecutionMode m : ExecutionMode.values())
1350          for (Integer v1 : new Integer[] { 1, null })
1351 <        for (Integer v2 : new Integer[] { 2, null }) {
1352 <
1351 >        for (Integer v2 : new Integer[] { 2, null })
1352 >    {
1353          final CompletableFuture<Integer> f = new CompletableFuture<>();
1354          final CompletableFuture<Integer> g = new CompletableFuture<>();
1355          final FailingBiFunction r = new FailingBiFunction();
# Line 1289 | Line 1362 | public class CompletableFutureTest exten
1362          checkCompletedWithWrappedCFException(h);
1363          checkCompletedNormally(f, v1);
1364          checkCompletedNormally(g, v2);
1365 <        }
1293 <    }
1365 >    }}
1366  
1367      /**
1368       * thenCombine result completes exceptionally if either source cancelled
# Line 1298 | Line 1370 | public class CompletableFutureTest exten
1370      public void testThenCombine_sourceCancelled1() {
1371          for (ExecutionMode m : ExecutionMode.values())
1372          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1373 <        for (Integer v1 : new Integer[] { 1, null }) {
1374 <
1373 >        for (Integer v1 : new Integer[] { 1, null })
1374 >    {
1375          final CompletableFuture<Integer> f = new CompletableFuture<>();
1376          final CompletableFuture<Integer> g = new CompletableFuture<>();
1377          final SubtractFunction r = new SubtractFunction();
# Line 1313 | Line 1385 | public class CompletableFutureTest exten
1385          checkCancelled(f);
1386          assertEquals(0, r.invocationCount);
1387          checkCompletedNormally(g, v1);
1388 <        }
1317 <    }
1388 >    }}
1389  
1390      public void testThenCombine_sourceCancelled2() {
1391          for (ExecutionMode m : ExecutionMode.values())
1392          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1393 <        for (Integer v1 : new Integer[] { 1, null }) {
1394 <
1393 >        for (Integer v1 : new Integer[] { 1, null })
1394 >    {
1395          final CompletableFuture<Integer> f = new CompletableFuture<>();
1396          final CompletableFuture<Integer> g = new CompletableFuture<>();
1397          final SubtractFunction r = new SubtractFunction();
# Line 1334 | Line 1405 | public class CompletableFutureTest exten
1405          checkCancelled(g);
1406          assertEquals(0, r.invocationCount);
1407          checkCompletedNormally(f, v1);
1408 <        }
1338 <    }
1408 >    }}
1409  
1410      public void testThenCombine_sourceCancelled3() {
1411          for (ExecutionMode m : ExecutionMode.values())
1412          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1413 <        for (Integer v1 : new Integer[] { 1, null }) {
1414 <
1413 >        for (Integer v1 : new Integer[] { 1, null })
1414 >    {
1415          final CompletableFuture<Integer> f = new CompletableFuture<>();
1416          final CompletableFuture<Integer> g = new CompletableFuture<>();
1417          final SubtractFunction r = new SubtractFunction();
# Line 1354 | Line 1424 | public class CompletableFutureTest exten
1424          checkCancelled(g);
1425          assertEquals(0, r.invocationCount);
1426          checkCompletedNormally(f, v1);
1427 <        }
1358 <    }
1427 >    }}
1428  
1429      public void testThenCombine_sourceCancelled4() {
1430          for (ExecutionMode m : ExecutionMode.values())
1431          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1432 <        for (Integer v1 : new Integer[] { 1, null }) {
1433 <
1432 >        for (Integer v1 : new Integer[] { 1, null })
1433 >    {
1434          final CompletableFuture<Integer> f = new CompletableFuture<>();
1435          final CompletableFuture<Integer> g = new CompletableFuture<>();
1436          final SubtractFunction r = new SubtractFunction();
# Line 1374 | Line 1443 | public class CompletableFutureTest exten
1443          checkCancelled(f);
1444          assertEquals(0, r.invocationCount);
1445          checkCompletedNormally(g, v1);
1446 <        }
1378 <    }
1446 >    }}
1447  
1448      /**
1449       * thenAcceptBoth result completes normally after normal
# Line 1384 | Line 1452 | public class CompletableFutureTest exten
1452      public void testThenAcceptBoth_normalCompletion1() {
1453          for (ExecutionMode m : ExecutionMode.values())
1454          for (Integer v1 : new Integer[] { 1, null })
1455 <        for (Integer v2 : new Integer[] { 2, null }) {
1456 <
1455 >        for (Integer v2 : new Integer[] { 2, null })
1456 >    {
1457          final CompletableFuture<Integer> f = new CompletableFuture<>();
1458          final CompletableFuture<Integer> g = new CompletableFuture<>();
1459          final SubtractAction r = new SubtractAction();
# Line 1400 | Line 1468 | public class CompletableFutureTest exten
1468          assertEquals(subtract(v1, v2), r.value);
1469          checkCompletedNormally(f, v1);
1470          checkCompletedNormally(g, v2);
1471 <        }
1404 <    }
1471 >    }}
1472  
1473      public void testThenAcceptBoth_normalCompletion2() {
1474          for (ExecutionMode m : ExecutionMode.values())
1475          for (Integer v1 : new Integer[] { 1, null })
1476 <        for (Integer v2 : new Integer[] { 2, null }) {
1477 <
1476 >        for (Integer v2 : new Integer[] { 2, null })
1477 >    {
1478          final CompletableFuture<Integer> f = new CompletableFuture<>();
1479          final CompletableFuture<Integer> g = new CompletableFuture<>();
1480          final SubtractAction r = new SubtractAction();
# Line 1422 | Line 1489 | public class CompletableFutureTest exten
1489          assertEquals(subtract(v1, v2), r.value);
1490          checkCompletedNormally(f, v1);
1491          checkCompletedNormally(g, v2);
1492 <        }
1426 <    }
1492 >    }}
1493  
1494      public void testThenAcceptBoth_normalCompletion3() {
1495          for (ExecutionMode m : ExecutionMode.values())
1496          for (Integer v1 : new Integer[] { 1, null })
1497 <        for (Integer v2 : new Integer[] { 2, null }) {
1498 <
1497 >        for (Integer v2 : new Integer[] { 2, null })
1498 >    {
1499          final CompletableFuture<Integer> f = new CompletableFuture<>();
1500          final CompletableFuture<Integer> g = new CompletableFuture<>();
1501          final SubtractAction r = new SubtractAction();
# Line 1442 | Line 1508 | public class CompletableFutureTest exten
1508          assertEquals(subtract(v1, v2), r.value);
1509          checkCompletedNormally(f, v1);
1510          checkCompletedNormally(g, v2);
1511 <        }
1446 <    }
1511 >    }}
1512  
1513      public void testThenAcceptBoth_normalCompletion4() {
1514          for (ExecutionMode m : ExecutionMode.values())
1515          for (Integer v1 : new Integer[] { 1, null })
1516 <        for (Integer v2 : new Integer[] { 2, null }) {
1517 <
1516 >        for (Integer v2 : new Integer[] { 2, null })
1517 >    {
1518          final CompletableFuture<Integer> f = new CompletableFuture<>();
1519          final CompletableFuture<Integer> g = new CompletableFuture<>();
1520          final SubtractAction r = new SubtractAction();
# Line 1462 | Line 1527 | public class CompletableFutureTest exten
1527          assertEquals(subtract(v1, v2), r.value);
1528          checkCompletedNormally(f, v1);
1529          checkCompletedNormally(g, v2);
1530 <        }
1466 <    }
1530 >    }}
1531  
1532      /**
1533       * thenAcceptBoth result completes exceptionally after exceptional
# Line 1471 | Line 1535 | public class CompletableFutureTest exten
1535       */
1536      public void testThenAcceptBoth_exceptionalCompletion1() {
1537          for (ExecutionMode m : ExecutionMode.values())
1538 <        for (Integer v1 : new Integer[] { 1, null }) {
1539 <
1538 >        for (Integer v1 : new Integer[] { 1, null })
1539 >    {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541          final CompletableFuture<Integer> g = new CompletableFuture<>();
1542          final SubtractAction r = new SubtractAction();
# Line 1487 | Line 1551 | public class CompletableFutureTest exten
1551          checkCompletedWithWrappedCFException(f, ex);
1552          assertEquals(0, r.invocationCount);
1553          checkCompletedNormally(g, v1);
1554 <        }
1491 <    }
1554 >    }}
1555  
1556      public void testThenAcceptBoth_exceptionalCompletion2() {
1557          for (ExecutionMode m : ExecutionMode.values())
1558 <        for (Integer v1 : new Integer[] { 1, null }) {
1559 <
1558 >        for (Integer v1 : new Integer[] { 1, null })
1559 >    {
1560          final CompletableFuture<Integer> f = new CompletableFuture<>();
1561          final CompletableFuture<Integer> g = new CompletableFuture<>();
1562          final SubtractAction r = new SubtractAction();
# Line 1508 | Line 1571 | public class CompletableFutureTest exten
1571          checkCompletedWithWrappedCFException(g, ex);
1572          assertEquals(0, r.invocationCount);
1573          checkCompletedNormally(f, v1);
1574 <        }
1512 <    }
1574 >    }}
1575  
1576      public void testThenAcceptBoth_exceptionalCompletion3() {
1577          for (ExecutionMode m : ExecutionMode.values())
1578 <        for (Integer v1 : new Integer[] { 1, null }) {
1579 <
1578 >        for (Integer v1 : new Integer[] { 1, null })
1579 >    {
1580          final CompletableFuture<Integer> f = new CompletableFuture<>();
1581          final CompletableFuture<Integer> g = new CompletableFuture<>();
1582          final SubtractAction r = new SubtractAction();
# Line 1528 | Line 1590 | public class CompletableFutureTest exten
1590          checkCompletedWithWrappedCFException(g, ex);
1591          assertEquals(0, r.invocationCount);
1592          checkCompletedNormally(f, v1);
1593 <        }
1532 <    }
1593 >    }}
1594  
1595      public void testThenAcceptBoth_exceptionalCompletion4() {
1596          for (ExecutionMode m : ExecutionMode.values())
1597 <        for (Integer v1 : new Integer[] { 1, null }) {
1598 <
1597 >        for (Integer v1 : new Integer[] { 1, null })
1598 >    {
1599          final CompletableFuture<Integer> f = new CompletableFuture<>();
1600          final CompletableFuture<Integer> g = new CompletableFuture<>();
1601          final SubtractAction r = new SubtractAction();
# Line 1548 | Line 1609 | public class CompletableFutureTest exten
1609          checkCompletedWithWrappedCFException(f, ex);
1610          assertEquals(0, r.invocationCount);
1611          checkCompletedNormally(g, v1);
1612 <        }
1552 <    }
1612 >    }}
1613  
1614      /**
1615       * thenAcceptBoth result completes exceptionally if action does
# Line 1557 | Line 1617 | public class CompletableFutureTest exten
1617      public void testThenAcceptBoth_actionFailed1() {
1618          for (ExecutionMode m : ExecutionMode.values())
1619          for (Integer v1 : new Integer[] { 1, null })
1620 <        for (Integer v2 : new Integer[] { 2, null }) {
1621 <
1620 >        for (Integer v2 : new Integer[] { 2, null })
1621 >    {
1622          final CompletableFuture<Integer> f = new CompletableFuture<>();
1623          final CompletableFuture<Integer> g = new CompletableFuture<>();
1624          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1571 | Line 1631 | public class CompletableFutureTest exten
1631          checkCompletedWithWrappedCFException(h);
1632          checkCompletedNormally(f, v1);
1633          checkCompletedNormally(g, v2);
1634 <        }
1575 <    }
1634 >    }}
1635  
1636      public void testThenAcceptBoth_actionFailed2() {
1637          for (ExecutionMode m : ExecutionMode.values())
1638          for (Integer v1 : new Integer[] { 1, null })
1639 <        for (Integer v2 : new Integer[] { 2, null }) {
1640 <
1639 >        for (Integer v2 : new Integer[] { 2, null })
1640 >    {
1641          final CompletableFuture<Integer> f = new CompletableFuture<>();
1642          final CompletableFuture<Integer> g = new CompletableFuture<>();
1643          final FailingBiConsumer r = new FailingBiConsumer();
# Line 1591 | Line 1650 | public class CompletableFutureTest exten
1650          checkCompletedWithWrappedCFException(h);
1651          checkCompletedNormally(f, v1);
1652          checkCompletedNormally(g, v2);
1653 <        }
1595 <    }
1653 >    }}
1654  
1655      /**
1656       * thenAcceptBoth result completes exceptionally if either source cancelled
# Line 1600 | Line 1658 | public class CompletableFutureTest exten
1658      public void testThenAcceptBoth_sourceCancelled1() {
1659          for (ExecutionMode m : ExecutionMode.values())
1660          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1661 <        for (Integer v1 : new Integer[] { 1, null }) {
1662 <
1661 >        for (Integer v1 : new Integer[] { 1, null })
1662 >    {
1663          final CompletableFuture<Integer> f = new CompletableFuture<>();
1664          final CompletableFuture<Integer> g = new CompletableFuture<>();
1665          final SubtractAction r = new SubtractAction();
# Line 1615 | Line 1673 | public class CompletableFutureTest exten
1673          checkCancelled(f);
1674          assertEquals(0, r.invocationCount);
1675          checkCompletedNormally(g, v1);
1676 <        }
1619 <    }
1676 >    }}
1677  
1678      public void testThenAcceptBoth_sourceCancelled2() {
1679          for (ExecutionMode m : ExecutionMode.values())
1680          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1681 <        for (Integer v1 : new Integer[] { 1, null }) {
1682 <
1681 >        for (Integer v1 : new Integer[] { 1, null })
1682 >    {
1683          final CompletableFuture<Integer> f = new CompletableFuture<>();
1684          final CompletableFuture<Integer> g = new CompletableFuture<>();
1685          final SubtractAction r = new SubtractAction();
# Line 1636 | Line 1693 | public class CompletableFutureTest exten
1693          checkCancelled(g);
1694          assertEquals(0, r.invocationCount);
1695          checkCompletedNormally(f, v1);
1696 <        }
1640 <    }
1696 >    }}
1697  
1698      public void testThenAcceptBoth_sourceCancelled3() {
1699          for (ExecutionMode m : ExecutionMode.values())
1700          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1701 <        for (Integer v1 : new Integer[] { 1, null }) {
1702 <
1701 >        for (Integer v1 : new Integer[] { 1, null })
1702 >    {
1703          final CompletableFuture<Integer> f = new CompletableFuture<>();
1704          final CompletableFuture<Integer> g = new CompletableFuture<>();
1705          final SubtractAction r = new SubtractAction();
# Line 1656 | Line 1712 | public class CompletableFutureTest exten
1712          checkCancelled(g);
1713          assertEquals(0, r.invocationCount);
1714          checkCompletedNormally(f, v1);
1715 <        }
1660 <    }
1715 >    }}
1716  
1717      public void testThenAcceptBoth_sourceCancelled4() {
1718          for (ExecutionMode m : ExecutionMode.values())
1719          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1720 <        for (Integer v1 : new Integer[] { 1, null }) {
1721 <
1720 >        for (Integer v1 : new Integer[] { 1, null })
1721 >    {
1722          final CompletableFuture<Integer> f = new CompletableFuture<>();
1723          final CompletableFuture<Integer> g = new CompletableFuture<>();
1724          final SubtractAction r = new SubtractAction();
# Line 1676 | Line 1731 | public class CompletableFutureTest exten
1731          checkCancelled(f);
1732          assertEquals(0, r.invocationCount);
1733          checkCompletedNormally(g, v1);
1734 <        }
1680 <    }
1734 >    }}
1735  
1736      /**
1737       * runAfterBoth result completes normally after normal
# Line 1686 | Line 1740 | public class CompletableFutureTest exten
1740      public void testRunAfterBoth_normalCompletion1() {
1741          for (ExecutionMode m : ExecutionMode.values())
1742          for (Integer v1 : new Integer[] { 1, null })
1743 <        for (Integer v2 : new Integer[] { 2, null }) {
1744 <
1743 >        for (Integer v2 : new Integer[] { 2, null })
1744 >    {
1745          final CompletableFuture<Integer> f = new CompletableFuture<>();
1746          final CompletableFuture<Integer> g = new CompletableFuture<>();
1747          final Noop r = new Noop();
# Line 1702 | Line 1756 | public class CompletableFutureTest exten
1756          assertEquals(1, r.invocationCount);
1757          checkCompletedNormally(f, v1);
1758          checkCompletedNormally(g, v2);
1759 <        }
1706 <    }
1759 >    }}
1760  
1761      public void testRunAfterBoth_normalCompletion2() {
1762          for (ExecutionMode m : ExecutionMode.values())
1763          for (Integer v1 : new Integer[] { 1, null })
1764 <        for (Integer v2 : new Integer[] { 2, null }) {
1765 <
1764 >        for (Integer v2 : new Integer[] { 2, null })
1765 >    {
1766          final CompletableFuture<Integer> f = new CompletableFuture<>();
1767          final CompletableFuture<Integer> g = new CompletableFuture<>();
1768          final Noop r = new Noop();
# Line 1724 | Line 1777 | public class CompletableFutureTest exten
1777          assertEquals(1, r.invocationCount);
1778          checkCompletedNormally(f, v1);
1779          checkCompletedNormally(g, v2);
1780 <        }
1728 <    }
1780 >    }}
1781  
1782      public void testRunAfterBoth_normalCompletion3() {
1783          for (ExecutionMode m : ExecutionMode.values())
1784          for (Integer v1 : new Integer[] { 1, null })
1785 <        for (Integer v2 : new Integer[] { 2, null }) {
1786 <
1785 >        for (Integer v2 : new Integer[] { 2, null })
1786 >    {
1787          final CompletableFuture<Integer> f = new CompletableFuture<>();
1788          final CompletableFuture<Integer> g = new CompletableFuture<>();
1789          final Noop r = new Noop();
# Line 1744 | Line 1796 | public class CompletableFutureTest exten
1796          assertEquals(1, r.invocationCount);
1797          checkCompletedNormally(f, v1);
1798          checkCompletedNormally(g, v2);
1799 <        }
1748 <    }
1799 >    }}
1800  
1801      public void testRunAfterBoth_normalCompletion4() {
1802          for (ExecutionMode m : ExecutionMode.values())
1803          for (Integer v1 : new Integer[] { 1, null })
1804 <        for (Integer v2 : new Integer[] { 2, null }) {
1805 <
1804 >        for (Integer v2 : new Integer[] { 2, null })
1805 >    {
1806          final CompletableFuture<Integer> f = new CompletableFuture<>();
1807          final CompletableFuture<Integer> g = new CompletableFuture<>();
1808          final Noop r = new Noop();
# Line 1764 | Line 1815 | public class CompletableFutureTest exten
1815          assertEquals(1, r.invocationCount);
1816          checkCompletedNormally(f, v1);
1817          checkCompletedNormally(g, v2);
1818 <        }
1768 <    }
1818 >    }}
1819  
1820      /**
1821       * runAfterBoth result completes exceptionally after exceptional
# Line 1773 | Line 1823 | public class CompletableFutureTest exten
1823       */
1824      public void testRunAfterBoth_exceptionalCompletion1() {
1825          for (ExecutionMode m : ExecutionMode.values())
1826 <        for (Integer v1 : new Integer[] { 1, null }) {
1827 <
1826 >        for (Integer v1 : new Integer[] { 1, null })
1827 >    {
1828          final CompletableFuture<Integer> f = new CompletableFuture<>();
1829          final CompletableFuture<Integer> g = new CompletableFuture<>();
1830          final Noop r = new Noop();
# Line 1789 | Line 1839 | public class CompletableFutureTest exten
1839          checkCompletedWithWrappedCFException(f, ex);
1840          assertEquals(0, r.invocationCount);
1841          checkCompletedNormally(g, v1);
1842 <        }
1793 <    }
1842 >    }}
1843  
1844      public void testRunAfterBoth_exceptionalCompletion2() {
1845          for (ExecutionMode m : ExecutionMode.values())
1846 <        for (Integer v1 : new Integer[] { 1, null }) {
1847 <
1846 >        for (Integer v1 : new Integer[] { 1, null })
1847 >    {
1848          final CompletableFuture<Integer> f = new CompletableFuture<>();
1849          final CompletableFuture<Integer> g = new CompletableFuture<>();
1850          final Noop r = new Noop();
# Line 1810 | Line 1859 | public class CompletableFutureTest exten
1859          checkCompletedWithWrappedCFException(g, ex);
1860          assertEquals(0, r.invocationCount);
1861          checkCompletedNormally(f, v1);
1862 <        }
1814 <    }
1862 >    }}
1863  
1864      public void testRunAfterBoth_exceptionalCompletion3() {
1865          for (ExecutionMode m : ExecutionMode.values())
1866 <        for (Integer v1 : new Integer[] { 1, null }) {
1867 <
1866 >        for (Integer v1 : new Integer[] { 1, null })
1867 >    {
1868          final CompletableFuture<Integer> f = new CompletableFuture<>();
1869          final CompletableFuture<Integer> g = new CompletableFuture<>();
1870          final Noop r = new Noop();
# Line 1830 | Line 1878 | public class CompletableFutureTest exten
1878          checkCompletedWithWrappedCFException(g, ex);
1879          assertEquals(0, r.invocationCount);
1880          checkCompletedNormally(f, v1);
1881 <        }
1834 <    }
1881 >    }}
1882  
1883      public void testRunAfterBoth_exceptionalCompletion4() {
1884          for (ExecutionMode m : ExecutionMode.values())
1885 <        for (Integer v1 : new Integer[] { 1, null }) {
1886 <
1885 >        for (Integer v1 : new Integer[] { 1, null })
1886 >    {
1887          final CompletableFuture<Integer> f = new CompletableFuture<>();
1888          final CompletableFuture<Integer> g = new CompletableFuture<>();
1889          final Noop r = new Noop();
# Line 1850 | Line 1897 | public class CompletableFutureTest exten
1897          checkCompletedWithWrappedCFException(f, ex);
1898          assertEquals(0, r.invocationCount);
1899          checkCompletedNormally(g, v1);
1900 <        }
1854 <    }
1900 >    }}
1901  
1902      /**
1903       * runAfterBoth result completes exceptionally if action does
# Line 1859 | Line 1905 | public class CompletableFutureTest exten
1905      public void testRunAfterBoth_actionFailed1() {
1906          for (ExecutionMode m : ExecutionMode.values())
1907          for (Integer v1 : new Integer[] { 1, null })
1908 <        for (Integer v2 : new Integer[] { 2, null }) {
1909 <
1908 >        for (Integer v2 : new Integer[] { 2, null })
1909 >    {
1910          final CompletableFuture<Integer> f = new CompletableFuture<>();
1911          final CompletableFuture<Integer> g = new CompletableFuture<>();
1912 <        final FailingNoop r = new FailingNoop();
1912 >        final FailingRunnable r = new FailingRunnable();
1913          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1914  
1915          f.complete(v1);
# Line 1873 | Line 1919 | public class CompletableFutureTest exten
1919          checkCompletedWithWrappedCFException(h);
1920          checkCompletedNormally(f, v1);
1921          checkCompletedNormally(g, v2);
1922 <        }
1877 <    }
1922 >    }}
1923  
1924      public void testRunAfterBoth_actionFailed2() {
1925          for (ExecutionMode m : ExecutionMode.values())
1926          for (Integer v1 : new Integer[] { 1, null })
1927 <        for (Integer v2 : new Integer[] { 2, null }) {
1928 <
1927 >        for (Integer v2 : new Integer[] { 2, null })
1928 >    {
1929          final CompletableFuture<Integer> f = new CompletableFuture<>();
1930          final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 <        final FailingNoop r = new FailingNoop();
1931 >        final FailingRunnable r = new FailingRunnable();
1932          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1933  
1934          g.complete(v2);
# Line 1893 | Line 1938 | public class CompletableFutureTest exten
1938          checkCompletedWithWrappedCFException(h);
1939          checkCompletedNormally(f, v1);
1940          checkCompletedNormally(g, v2);
1941 <        }
1897 <    }
1941 >    }}
1942  
1943      /**
1944       * runAfterBoth result completes exceptionally if either source cancelled
# Line 1902 | Line 1946 | public class CompletableFutureTest exten
1946      public void testRunAfterBoth_sourceCancelled1() {
1947          for (ExecutionMode m : ExecutionMode.values())
1948          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1949 <        for (Integer v1 : new Integer[] { 1, null }) {
1950 <
1949 >        for (Integer v1 : new Integer[] { 1, null })
1950 >    {
1951          final CompletableFuture<Integer> f = new CompletableFuture<>();
1952          final CompletableFuture<Integer> g = new CompletableFuture<>();
1953          final Noop r = new Noop();
# Line 1917 | Line 1961 | public class CompletableFutureTest exten
1961          checkCancelled(f);
1962          assertEquals(0, r.invocationCount);
1963          checkCompletedNormally(g, v1);
1964 <        }
1921 <    }
1964 >    }}
1965  
1966      public void testRunAfterBoth_sourceCancelled2() {
1967          for (ExecutionMode m : ExecutionMode.values())
1968          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1969 <        for (Integer v1 : new Integer[] { 1, null }) {
1970 <
1969 >        for (Integer v1 : new Integer[] { 1, null })
1970 >    {
1971          final CompletableFuture<Integer> f = new CompletableFuture<>();
1972          final CompletableFuture<Integer> g = new CompletableFuture<>();
1973          final Noop r = new Noop();
# Line 1938 | Line 1981 | public class CompletableFutureTest exten
1981          checkCancelled(g);
1982          assertEquals(0, r.invocationCount);
1983          checkCompletedNormally(f, v1);
1984 <        }
1942 <    }
1984 >    }}
1985  
1986      public void testRunAfterBoth_sourceCancelled3() {
1987          for (ExecutionMode m : ExecutionMode.values())
1988          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1989 <        for (Integer v1 : new Integer[] { 1, null }) {
1990 <
1989 >        for (Integer v1 : new Integer[] { 1, null })
1990 >    {
1991          final CompletableFuture<Integer> f = new CompletableFuture<>();
1992          final CompletableFuture<Integer> g = new CompletableFuture<>();
1993          final Noop r = new Noop();
# Line 1958 | Line 2000 | public class CompletableFutureTest exten
2000          checkCancelled(g);
2001          assertEquals(0, r.invocationCount);
2002          checkCompletedNormally(f, v1);
2003 <        }
1962 <    }
2003 >    }}
2004  
2005      public void testRunAfterBoth_sourceCancelled4() {
2006          for (ExecutionMode m : ExecutionMode.values())
2007          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2008 <        for (Integer v1 : new Integer[] { 1, null }) {
2009 <
2008 >        for (Integer v1 : new Integer[] { 1, null })
2009 >    {
2010          final CompletableFuture<Integer> f = new CompletableFuture<>();
2011          final CompletableFuture<Integer> g = new CompletableFuture<>();
2012          final Noop r = new Noop();
# Line 1978 | Line 2019 | public class CompletableFutureTest exten
2019          checkCancelled(f);
2020          assertEquals(0, r.invocationCount);
2021          checkCompletedNormally(g, v1);
2022 <        }
1982 <    }
2022 >    }}
2023  
2024      /**
2025       * applyToEither result completes normally after normal completion
# Line 1988 | Line 2028 | public class CompletableFutureTest exten
2028      public void testApplyToEither_normalCompletion1() {
2029          for (ExecutionMode m : ExecutionMode.values())
2030          for (Integer v1 : new Integer[] { 1, null })
2031 <        for (Integer v2 : new Integer[] { 2, null }) {
2032 <
2031 >        for (Integer v2 : new Integer[] { 2, null })
2032 >    {
2033          final CompletableFuture<Integer> f = new CompletableFuture<>();
2034          final CompletableFuture<Integer> g = new CompletableFuture<>();
2035          final IncFunction r = new IncFunction();
# Line 2002 | Line 2042 | public class CompletableFutureTest exten
2042          checkCompletedNormally(f, v1);
2043          checkCompletedNormally(g, v2);
2044          checkCompletedNormally(h, inc(v1));
2045 <        }
2006 <    }
2045 >    }}
2046  
2047      public void testApplyToEither_normalCompletion2() {
2048          for (ExecutionMode m : ExecutionMode.values())
2049          for (Integer v1 : new Integer[] { 1, null })
2050 <        for (Integer v2 : new Integer[] { 2, null }) {
2051 <
2050 >        for (Integer v2 : new Integer[] { 2, null })
2051 >    {
2052          final CompletableFuture<Integer> f = new CompletableFuture<>();
2053          final CompletableFuture<Integer> g = new CompletableFuture<>();
2054          final IncFunction r = new IncFunction();
# Line 2022 | Line 2061 | public class CompletableFutureTest exten
2061          checkCompletedNormally(f, v1);
2062          checkCompletedNormally(g, v2);
2063          checkCompletedNormally(h, inc(v2));
2064 <        }
2065 <    }
2064 >        }}
2065 >
2066      public void testApplyToEither_normalCompletion3() {
2067          for (ExecutionMode m : ExecutionMode.values())
2068          for (Integer v1 : new Integer[] { 1, null })
2069 <        for (Integer v2 : new Integer[] { 2, null }) {
2070 <
2069 >        for (Integer v2 : new Integer[] { 2, null })
2070 >    {
2071          final CompletableFuture<Integer> f = new CompletableFuture<>();
2072          final CompletableFuture<Integer> g = new CompletableFuture<>();
2073          final IncFunction r = new IncFunction();
# Line 2044 | Line 2083 | public class CompletableFutureTest exten
2083          assertTrue(Objects.equals(h.join(), inc(v1)) ||
2084                     Objects.equals(h.join(), inc(v2)));
2085          assertEquals(1, r.invocationCount);
2086 <        }
2048 <    }
2086 >    }}
2087  
2088      /**
2089       * applyToEither result completes exceptionally after exceptional
# Line 2053 | Line 2091 | public class CompletableFutureTest exten
2091       */
2092      public void testApplyToEither_exceptionalCompletion1() {
2093          for (ExecutionMode m : ExecutionMode.values())
2094 <        for (Integer v1 : new Integer[] { 1, null }) {
2095 <
2094 >        for (Integer v1 : new Integer[] { 1, null })
2095 >    {
2096          final CompletableFuture<Integer> f = new CompletableFuture<>();
2097          final CompletableFuture<Integer> g = new CompletableFuture<>();
2098          final IncFunction r = new IncFunction();
# Line 2069 | Line 2107 | public class CompletableFutureTest exten
2107          checkCompletedNormally(g, v1);
2108          checkCompletedWithWrappedCFException(f, ex);
2109          checkCompletedWithWrappedCFException(h, ex);
2110 <        }
2073 <    }
2110 >    }}
2111  
2112      public void testApplyToEither_exceptionalCompletion2() {
2113          for (ExecutionMode m : ExecutionMode.values())
2114 <        for (Integer v1 : new Integer[] { 1, null }) {
2115 <
2114 >        for (Integer v1 : new Integer[] { 1, null })
2115 >    {
2116          final CompletableFuture<Integer> f = new CompletableFuture<>();
2117          final CompletableFuture<Integer> g = new CompletableFuture<>();
2118          final IncFunction r = new IncFunction();
# Line 2090 | Line 2127 | public class CompletableFutureTest exten
2127          checkCompletedNormally(f, v1);
2128          checkCompletedWithWrappedCFException(g, ex);
2129          checkCompletedWithWrappedCFException(h, ex);
2130 <        }
2094 <    }
2130 >    }}
2131  
2132      public void testApplyToEither_exceptionalCompletion3() {
2133          for (ExecutionMode m : ExecutionMode.values())
2134 <        for (Integer v1 : new Integer[] { 1, null }) {
2135 <
2134 >        for (Integer v1 : new Integer[] { 1, null })
2135 >    {
2136          final CompletableFuture<Integer> f = new CompletableFuture<>();
2137          final CompletableFuture<Integer> g = new CompletableFuture<>();
2138          final IncFunction r = new IncFunction();
# Line 2118 | Line 2154 | public class CompletableFutureTest exten
2154  
2155          checkCompletedWithWrappedCFException(g, ex);
2156          checkCompletedNormally(f, v1);
2157 <        }
2122 <    }
2157 >    }}
2158  
2159      public void testApplyToEither_exceptionalCompletion4() {
2160          for (ExecutionMode m : ExecutionMode.values())
2161 <        for (Integer v1 : new Integer[] { 1, null }) {
2162 <
2161 >        for (Integer v1 : new Integer[] { 1, null })
2162 >    {
2163          final CompletableFuture<Integer> f = new CompletableFuture<>();
2164          final CompletableFuture<Integer> g = new CompletableFuture<>();
2165          final IncFunction r = new IncFunction();
# Line 2146 | Line 2181 | public class CompletableFutureTest exten
2181  
2182          checkCompletedWithWrappedCFException(f, ex);
2183          checkCompletedNormally(g, v1);
2184 <        }
2150 <    }
2184 >    }}
2185  
2186      /**
2187       * applyToEither result completes exceptionally if action does
# Line 2155 | Line 2189 | public class CompletableFutureTest exten
2189      public void testApplyToEither_actionFailed1() {
2190          for (ExecutionMode m : ExecutionMode.values())
2191          for (Integer v1 : new Integer[] { 1, null })
2192 <        for (Integer v2 : new Integer[] { 2, null }) {
2193 <
2192 >        for (Integer v2 : new Integer[] { 2, null })
2193 >    {
2194          final CompletableFuture<Integer> f = new CompletableFuture<>();
2195          final CompletableFuture<Integer> g = new CompletableFuture<>();
2196          final FailingFunction r = new FailingFunction();
# Line 2167 | Line 2201 | public class CompletableFutureTest exten
2201          g.complete(v2);
2202          checkCompletedNormally(f, v1);
2203          checkCompletedNormally(g, v2);
2204 <        }
2171 <    }
2204 >    }}
2205  
2206      public void testApplyToEither_actionFailed2() {
2207          for (ExecutionMode m : ExecutionMode.values())
2208          for (Integer v1 : new Integer[] { 1, null })
2209 <        for (Integer v2 : new Integer[] { 2, null }) {
2210 <
2209 >        for (Integer v2 : new Integer[] { 2, null })
2210 >    {
2211          final CompletableFuture<Integer> f = new CompletableFuture<>();
2212          final CompletableFuture<Integer> g = new CompletableFuture<>();
2213          final FailingFunction r = new FailingFunction();
# Line 2185 | Line 2218 | public class CompletableFutureTest exten
2218          f.complete(v1);
2219          checkCompletedNormally(f, v1);
2220          checkCompletedNormally(g, v2);
2221 <        }
2189 <    }
2221 >    }}
2222  
2223      /**
2224       * applyToEither result completes exceptionally if either source cancelled
# Line 2194 | Line 2226 | public class CompletableFutureTest exten
2226      public void testApplyToEither_sourceCancelled1() {
2227          for (ExecutionMode m : ExecutionMode.values())
2228          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2229 <        for (Integer v1 : new Integer[] { 1, null }) {
2230 <
2229 >        for (Integer v1 : new Integer[] { 1, null })
2230 >    {
2231          final CompletableFuture<Integer> f = new CompletableFuture<>();
2232          final CompletableFuture<Integer> g = new CompletableFuture<>();
2233          final IncFunction r = new IncFunction();
# Line 2209 | Line 2241 | public class CompletableFutureTest exten
2241          assertEquals(0, r.invocationCount);
2242          checkCompletedNormally(g, v1);
2243          checkCompletedWithWrappedCancellationException(h);
2244 <        }
2213 <    }
2244 >    }}
2245  
2246      public void testApplyToEither_sourceCancelled2() {
2247          for (ExecutionMode m : ExecutionMode.values())
2248          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2249 <        for (Integer v1 : new Integer[] { 1, null }) {
2250 <
2249 >        for (Integer v1 : new Integer[] { 1, null })
2250 >    {
2251          final CompletableFuture<Integer> f = new CompletableFuture<>();
2252          final CompletableFuture<Integer> g = new CompletableFuture<>();
2253          final IncFunction r = new IncFunction();
# Line 2230 | Line 2261 | public class CompletableFutureTest exten
2261          assertEquals(0, r.invocationCount);
2262          checkCompletedNormally(f, v1);
2263          checkCompletedWithWrappedCancellationException(h);
2264 <        }
2234 <    }
2264 >    }}
2265  
2266      public void testApplyToEither_sourceCancelled3() {
2267          for (ExecutionMode m : ExecutionMode.values())
2268          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2269 <        for (Integer v1 : new Integer[] { 1, null }) {
2270 <
2269 >        for (Integer v1 : new Integer[] { 1, null })
2270 >    {
2271          final CompletableFuture<Integer> f = new CompletableFuture<>();
2272          final CompletableFuture<Integer> g = new CompletableFuture<>();
2273          final IncFunction r = new IncFunction();
# Line 2258 | Line 2288 | public class CompletableFutureTest exten
2288  
2289          checkCancelled(g);
2290          checkCompletedNormally(f, v1);
2291 <        }
2262 <    }
2291 >    }}
2292  
2293      public void testApplyToEither_sourceCancelled4() {
2294          for (ExecutionMode m : ExecutionMode.values())
2295          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2296 <        for (Integer v1 : new Integer[] { 1, null }) {
2297 <
2296 >        for (Integer v1 : new Integer[] { 1, null })
2297 >    {
2298          final CompletableFuture<Integer> f = new CompletableFuture<>();
2299          final CompletableFuture<Integer> g = new CompletableFuture<>();
2300          final IncFunction r = new IncFunction();
# Line 2286 | Line 2315 | public class CompletableFutureTest exten
2315  
2316          checkCancelled(f);
2317          checkCompletedNormally(g, v1);
2318 <        }
2290 <    }
2318 >    }}
2319  
2320      /**
2321       * acceptEither result completes normally after normal completion
# Line 2296 | Line 2324 | public class CompletableFutureTest exten
2324      public void testAcceptEither_normalCompletion1() {
2325          for (ExecutionMode m : ExecutionMode.values())
2326          for (Integer v1 : new Integer[] { 1, null })
2327 <        for (Integer v2 : new Integer[] { 2, null }) {
2328 <
2327 >        for (Integer v2 : new Integer[] { 2, null })
2328 >    {
2329          final CompletableFuture<Integer> f = new CompletableFuture<>();
2330          final CompletableFuture<Integer> g = new CompletableFuture<>();
2331          final IncAction r = new IncAction();
# Line 2311 | Line 2339 | public class CompletableFutureTest exten
2339          checkCompletedNormally(f, v1);
2340          checkCompletedNormally(g, v2);
2341          checkCompletedNormally(h, null);
2342 <        }
2315 <    }
2342 >    }}
2343  
2344      public void testAcceptEither_normalCompletion2() {
2345          for (ExecutionMode m : ExecutionMode.values())
2346          for (Integer v1 : new Integer[] { 1, null })
2347 <        for (Integer v2 : new Integer[] { 2, null }) {
2348 <
2347 >        for (Integer v2 : new Integer[] { 2, null })
2348 >    {
2349          final CompletableFuture<Integer> f = new CompletableFuture<>();
2350          final CompletableFuture<Integer> g = new CompletableFuture<>();
2351          final IncAction r = new IncAction();
# Line 2332 | Line 2359 | public class CompletableFutureTest exten
2359          checkCompletedNormally(f, v1);
2360          checkCompletedNormally(g, v2);
2361          checkCompletedNormally(h, null);
2362 <        }
2363 <    }
2362 >    }}
2363 >
2364      public void testAcceptEither_normalCompletion3() {
2365          for (ExecutionMode m : ExecutionMode.values())
2366          for (Integer v1 : new Integer[] { 1, null })
2367 <        for (Integer v2 : new Integer[] { 2, null }) {
2368 <
2367 >        for (Integer v2 : new Integer[] { 2, null })
2368 >    {
2369          final CompletableFuture<Integer> f = new CompletableFuture<>();
2370          final CompletableFuture<Integer> g = new CompletableFuture<>();
2371          final IncAction r = new IncAction();
# Line 2354 | Line 2381 | public class CompletableFutureTest exten
2381          // unspecified behavior
2382          assertTrue(Objects.equals(r.value, inc(v1)) ||
2383                     Objects.equals(r.value, inc(v2)));
2384 <        }
2358 <    }
2384 >    }}
2385  
2386      /**
2387       * acceptEither result completes exceptionally after exceptional
# Line 2363 | Line 2389 | public class CompletableFutureTest exten
2389       */
2390      public void testAcceptEither_exceptionalCompletion1() {
2391          for (ExecutionMode m : ExecutionMode.values())
2392 <        for (Integer v1 : new Integer[] { 1, null }) {
2393 <
2392 >        for (Integer v1 : new Integer[] { 1, null })
2393 >    {
2394          final CompletableFuture<Integer> f = new CompletableFuture<>();
2395          final CompletableFuture<Integer> g = new CompletableFuture<>();
2396          final IncAction r = new IncAction();
# Line 2379 | Line 2405 | public class CompletableFutureTest exten
2405          checkCompletedNormally(g, v1);
2406          checkCompletedWithWrappedCFException(f, ex);
2407          checkCompletedWithWrappedCFException(h, ex);
2408 <        }
2383 <    }
2408 >    }}
2409  
2410      public void testAcceptEither_exceptionalCompletion2() {
2411          for (ExecutionMode m : ExecutionMode.values())
2412 <        for (Integer v1 : new Integer[] { 1, null }) {
2413 <
2412 >        for (Integer v1 : new Integer[] { 1, null })
2413 >    {
2414          final CompletableFuture<Integer> f = new CompletableFuture<>();
2415          final CompletableFuture<Integer> g = new CompletableFuture<>();
2416          final IncAction r = new IncAction();
# Line 2400 | Line 2425 | public class CompletableFutureTest exten
2425          checkCompletedNormally(f, v1);
2426          checkCompletedWithWrappedCFException(g, ex);
2427          checkCompletedWithWrappedCFException(h, ex);
2428 <        }
2404 <    }
2428 >    }}
2429  
2430      public void testAcceptEither_exceptionalCompletion3() {
2431          for (ExecutionMode m : ExecutionMode.values())
2432 <        for (Integer v1 : new Integer[] { 1, null }) {
2433 <
2432 >        for (Integer v1 : new Integer[] { 1, null })
2433 >    {
2434          final CompletableFuture<Integer> f = new CompletableFuture<>();
2435          final CompletableFuture<Integer> g = new CompletableFuture<>();
2436          final IncAction r = new IncAction();
# Line 2429 | Line 2453 | public class CompletableFutureTest exten
2453  
2454          checkCompletedWithWrappedCFException(g, ex);
2455          checkCompletedNormally(f, v1);
2456 <        }
2433 <    }
2456 >    }}
2457  
2458      public void testAcceptEither_exceptionalCompletion4() {
2459          for (ExecutionMode m : ExecutionMode.values())
2460 <        for (Integer v1 : new Integer[] { 1, null }) {
2461 <
2460 >        for (Integer v1 : new Integer[] { 1, null })
2461 >    {
2462          final CompletableFuture<Integer> f = new CompletableFuture<>();
2463          final CompletableFuture<Integer> g = new CompletableFuture<>();
2464          final IncAction r = new IncAction();
# Line 2458 | Line 2481 | public class CompletableFutureTest exten
2481  
2482          checkCompletedWithWrappedCFException(f, ex);
2483          checkCompletedNormally(g, v1);
2484 <        }
2462 <    }
2484 >    }}
2485  
2486      /**
2487       * acceptEither result completes exceptionally if action does
# Line 2467 | Line 2489 | public class CompletableFutureTest exten
2489      public void testAcceptEither_actionFailed1() {
2490          for (ExecutionMode m : ExecutionMode.values())
2491          for (Integer v1 : new Integer[] { 1, null })
2492 <        for (Integer v2 : new Integer[] { 2, null }) {
2493 <
2492 >        for (Integer v2 : new Integer[] { 2, null })
2493 >    {
2494          final CompletableFuture<Integer> f = new CompletableFuture<>();
2495          final CompletableFuture<Integer> g = new CompletableFuture<>();
2496          final FailingConsumer r = new FailingConsumer();
# Line 2479 | Line 2501 | public class CompletableFutureTest exten
2501          g.complete(v2);
2502          checkCompletedNormally(f, v1);
2503          checkCompletedNormally(g, v2);
2504 <        }
2483 <    }
2504 >    }}
2505  
2506      public void testAcceptEither_actionFailed2() {
2507          for (ExecutionMode m : ExecutionMode.values())
2508          for (Integer v1 : new Integer[] { 1, null })
2509 <        for (Integer v2 : new Integer[] { 2, null }) {
2510 <
2509 >        for (Integer v2 : new Integer[] { 2, null })
2510 >    {
2511          final CompletableFuture<Integer> f = new CompletableFuture<>();
2512          final CompletableFuture<Integer> g = new CompletableFuture<>();
2513          final FailingConsumer r = new FailingConsumer();
# Line 2497 | Line 2518 | public class CompletableFutureTest exten
2518          f.complete(v1);
2519          checkCompletedNormally(f, v1);
2520          checkCompletedNormally(g, v2);
2521 <        }
2501 <    }
2521 >    }}
2522  
2523      /**
2524       * acceptEither result completes exceptionally if either source cancelled
# Line 2506 | Line 2526 | public class CompletableFutureTest exten
2526      public void testAcceptEither_sourceCancelled1() {
2527          for (ExecutionMode m : ExecutionMode.values())
2528          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2529 <        for (Integer v1 : new Integer[] { 1, null }) {
2530 <
2529 >        for (Integer v1 : new Integer[] { 1, null })
2530 >    {
2531          final CompletableFuture<Integer> f = new CompletableFuture<>();
2532          final CompletableFuture<Integer> g = new CompletableFuture<>();
2533          final IncAction r = new IncAction();
# Line 2521 | Line 2541 | public class CompletableFutureTest exten
2541          assertEquals(0, r.invocationCount);
2542          checkCompletedNormally(g, v1);
2543          checkCompletedWithWrappedCancellationException(h);
2544 <        }
2525 <    }
2544 >    }}
2545  
2546      public void testAcceptEither_sourceCancelled2() {
2547          for (ExecutionMode m : ExecutionMode.values())
2548          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2549 <        for (Integer v1 : new Integer[] { 1, null }) {
2550 <
2549 >        for (Integer v1 : new Integer[] { 1, null })
2550 >    {
2551          final CompletableFuture<Integer> f = new CompletableFuture<>();
2552          final CompletableFuture<Integer> g = new CompletableFuture<>();
2553          final IncAction r = new IncAction();
# Line 2542 | Line 2561 | public class CompletableFutureTest exten
2561          assertEquals(0, r.invocationCount);
2562          checkCompletedNormally(f, v1);
2563          checkCompletedWithWrappedCancellationException(h);
2564 <        }
2546 <    }
2564 >    }}
2565  
2566      public void testAcceptEither_sourceCancelled3() {
2567          for (ExecutionMode m : ExecutionMode.values())
2568          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2569 <        for (Integer v1 : new Integer[] { 1, null }) {
2570 <
2569 >        for (Integer v1 : new Integer[] { 1, null })
2570 >    {
2571          final CompletableFuture<Integer> f = new CompletableFuture<>();
2572          final CompletableFuture<Integer> g = new CompletableFuture<>();
2573          final IncAction r = new IncAction();
# Line 2571 | Line 2589 | public class CompletableFutureTest exten
2589  
2590          checkCancelled(g);
2591          checkCompletedNormally(f, v1);
2592 <        }
2575 <    }
2592 >    }}
2593  
2594      public void testAcceptEither_sourceCancelled4() {
2595          for (ExecutionMode m : ExecutionMode.values())
2596          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2597 <        for (Integer v1 : new Integer[] { 1, null }) {
2598 <
2597 >        for (Integer v1 : new Integer[] { 1, null })
2598 >    {
2599          final CompletableFuture<Integer> f = new CompletableFuture<>();
2600          final CompletableFuture<Integer> g = new CompletableFuture<>();
2601          final IncAction r = new IncAction();
# Line 2600 | Line 2617 | public class CompletableFutureTest exten
2617  
2618          checkCancelled(f);
2619          checkCompletedNormally(g, v1);
2620 <        }
2604 <    }
2620 >    }}
2621  
2622      /**
2623       * runAfterEither result completes normally after normal completion
# Line 2610 | Line 2626 | public class CompletableFutureTest exten
2626      public void testRunAfterEither_normalCompletion1() {
2627          for (ExecutionMode m : ExecutionMode.values())
2628          for (Integer v1 : new Integer[] { 1, null })
2629 <        for (Integer v2 : new Integer[] { 2, null }) {
2630 <
2629 >        for (Integer v2 : new Integer[] { 2, null })
2630 >    {
2631          final CompletableFuture<Integer> f = new CompletableFuture<>();
2632          final CompletableFuture<Integer> g = new CompletableFuture<>();
2633          final Noop r = new Noop();
# Line 2626 | Line 2642 | public class CompletableFutureTest exten
2642          checkCompletedNormally(g, v2);
2643          checkCompletedNormally(h, null);
2644          assertEquals(1, r.invocationCount);
2645 <        }
2630 <    }
2645 >    }}
2646  
2647      public void testRunAfterEither_normalCompletion2() {
2648          for (ExecutionMode m : ExecutionMode.values())
2649          for (Integer v1 : new Integer[] { 1, null })
2650 <        for (Integer v2 : new Integer[] { 2, null }) {
2651 <
2650 >        for (Integer v2 : new Integer[] { 2, null })
2651 >    {
2652          final CompletableFuture<Integer> f = new CompletableFuture<>();
2653          final CompletableFuture<Integer> g = new CompletableFuture<>();
2654          final Noop r = new Noop();
# Line 2648 | Line 2663 | public class CompletableFutureTest exten
2663          checkCompletedNormally(g, v2);
2664          checkCompletedNormally(h, null);
2665          assertEquals(1, r.invocationCount);
2666 <        }
2667 <    }
2666 >        }}
2667 >
2668      public void testRunAfterEither_normalCompletion3() {
2669          for (ExecutionMode m : ExecutionMode.values())
2670          for (Integer v1 : new Integer[] { 1, null })
2671 <        for (Integer v2 : new Integer[] { 2, null }) {
2672 <
2671 >        for (Integer v2 : new Integer[] { 2, null })
2672 >    {
2673          final CompletableFuture<Integer> f = new CompletableFuture<>();
2674          final CompletableFuture<Integer> g = new CompletableFuture<>();
2675          final Noop r = new Noop();
# Line 2667 | Line 2682 | public class CompletableFutureTest exten
2682          checkCompletedNormally(f, v1);
2683          checkCompletedNormally(g, v2);
2684          assertEquals(1, r.invocationCount);
2685 <        }
2671 <    }
2685 >    }}
2686  
2687      /**
2688       * runAfterEither result completes exceptionally after exceptional
# Line 2676 | Line 2690 | public class CompletableFutureTest exten
2690       */
2691      public void testRunAfterEither_exceptionalCompletion1() {
2692          for (ExecutionMode m : ExecutionMode.values())
2693 <        for (Integer v1 : new Integer[] { 1, null }) {
2694 <
2693 >        for (Integer v1 : new Integer[] { 1, null })
2694 >    {
2695          final CompletableFuture<Integer> f = new CompletableFuture<>();
2696          final CompletableFuture<Integer> g = new CompletableFuture<>();
2697          final Noop r = new Noop();
# Line 2692 | Line 2706 | public class CompletableFutureTest exten
2706          checkCompletedNormally(g, v1);
2707          checkCompletedWithWrappedCFException(f, ex);
2708          checkCompletedWithWrappedCFException(h, ex);
2709 <        }
2696 <    }
2709 >    }}
2710  
2711      public void testRunAfterEither_exceptionalCompletion2() {
2712          for (ExecutionMode m : ExecutionMode.values())
2713 <        for (Integer v1 : new Integer[] { 1, null }) {
2714 <
2713 >        for (Integer v1 : new Integer[] { 1, null })
2714 >    {
2715          final CompletableFuture<Integer> f = new CompletableFuture<>();
2716          final CompletableFuture<Integer> g = new CompletableFuture<>();
2717          final Noop r = new Noop();
# Line 2713 | Line 2726 | public class CompletableFutureTest exten
2726          checkCompletedNormally(f, v1);
2727          checkCompletedWithWrappedCFException(g, ex);
2728          checkCompletedWithWrappedCFException(h, ex);
2729 <        }
2717 <    }
2729 >    }}
2730  
2731      public void testRunAfterEither_exceptionalCompletion3() {
2732          for (ExecutionMode m : ExecutionMode.values())
2733 <        for (Integer v1 : new Integer[] { 1, null }) {
2734 <
2733 >        for (Integer v1 : new Integer[] { 1, null })
2734 >    {
2735          final CompletableFuture<Integer> f = new CompletableFuture<>();
2736          final CompletableFuture<Integer> g = new CompletableFuture<>();
2737          final Noop r = new Noop();
# Line 2741 | Line 2753 | public class CompletableFutureTest exten
2753  
2754          checkCompletedWithWrappedCFException(g, ex);
2755          checkCompletedNormally(f, v1);
2756 <        }
2745 <    }
2756 >    }}
2757  
2758      public void testRunAfterEither_exceptionalCompletion4() {
2759          for (ExecutionMode m : ExecutionMode.values())
2760 <        for (Integer v1 : new Integer[] { 1, null }) {
2761 <
2760 >        for (Integer v1 : new Integer[] { 1, null })
2761 >    {
2762          final CompletableFuture<Integer> f = new CompletableFuture<>();
2763          final CompletableFuture<Integer> g = new CompletableFuture<>();
2764          final Noop r = new Noop();
# Line 2769 | Line 2780 | public class CompletableFutureTest exten
2780  
2781          checkCompletedWithWrappedCFException(f, ex);
2782          checkCompletedNormally(g, v1);
2783 <        }
2773 <    }
2783 >    }}
2784  
2785      /**
2786       * runAfterEither result completes exceptionally if action does
# Line 2778 | Line 2788 | public class CompletableFutureTest exten
2788      public void testRunAfterEither_actionFailed1() {
2789          for (ExecutionMode m : ExecutionMode.values())
2790          for (Integer v1 : new Integer[] { 1, null })
2791 <        for (Integer v2 : new Integer[] { 2, null }) {
2792 <
2791 >        for (Integer v2 : new Integer[] { 2, null })
2792 >    {
2793          final CompletableFuture<Integer> f = new CompletableFuture<>();
2794          final CompletableFuture<Integer> g = new CompletableFuture<>();
2795 <        final FailingNoop r = new FailingNoop();
2795 >        final FailingRunnable r = new FailingRunnable();
2796          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2797  
2798          f.complete(v1);
# Line 2790 | Line 2800 | public class CompletableFutureTest exten
2800          g.complete(v2);
2801          checkCompletedNormally(f, v1);
2802          checkCompletedNormally(g, v2);
2803 <        }
2794 <    }
2803 >    }}
2804  
2805      public void testRunAfterEither_actionFailed2() {
2806          for (ExecutionMode m : ExecutionMode.values())
2807          for (Integer v1 : new Integer[] { 1, null })
2808 <        for (Integer v2 : new Integer[] { 2, null }) {
2809 <
2808 >        for (Integer v2 : new Integer[] { 2, null })
2809 >    {
2810          final CompletableFuture<Integer> f = new CompletableFuture<>();
2811          final CompletableFuture<Integer> g = new CompletableFuture<>();
2812 <        final FailingNoop r = new FailingNoop();
2812 >        final FailingRunnable r = new FailingRunnable();
2813          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2814  
2815          g.complete(v2);
# Line 2808 | Line 2817 | public class CompletableFutureTest exten
2817          f.complete(v1);
2818          checkCompletedNormally(f, v1);
2819          checkCompletedNormally(g, v2);
2820 <        }
2812 <    }
2820 >    }}
2821  
2822      /**
2823       * runAfterEither result completes exceptionally if either source cancelled
# Line 2817 | Line 2825 | public class CompletableFutureTest exten
2825      public void testRunAfterEither_sourceCancelled1() {
2826          for (ExecutionMode m : ExecutionMode.values())
2827          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2828 <        for (Integer v1 : new Integer[] { 1, null }) {
2829 <
2828 >        for (Integer v1 : new Integer[] { 1, null })
2829 >    {
2830          final CompletableFuture<Integer> f = new CompletableFuture<>();
2831          final CompletableFuture<Integer> g = new CompletableFuture<>();
2832          final Noop r = new Noop();
# Line 2832 | Line 2840 | public class CompletableFutureTest exten
2840          assertEquals(0, r.invocationCount);
2841          checkCompletedNormally(g, v1);
2842          checkCompletedWithWrappedCancellationException(h);
2843 <        }
2836 <    }
2843 >    }}
2844  
2845      public void testRunAfterEither_sourceCancelled2() {
2846          for (ExecutionMode m : ExecutionMode.values())
2847          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2848 <        for (Integer v1 : new Integer[] { 1, null }) {
2849 <
2848 >        for (Integer v1 : new Integer[] { 1, null })
2849 >    {
2850          final CompletableFuture<Integer> f = new CompletableFuture<>();
2851          final CompletableFuture<Integer> g = new CompletableFuture<>();
2852          final Noop r = new Noop();
# Line 2853 | Line 2860 | public class CompletableFutureTest exten
2860          assertEquals(0, r.invocationCount);
2861          checkCompletedNormally(f, v1);
2862          checkCompletedWithWrappedCancellationException(h);
2863 <        }
2857 <    }
2863 >    }}
2864  
2865      public void testRunAfterEither_sourceCancelled3() {
2866          for (ExecutionMode m : ExecutionMode.values())
2867          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2868 <        for (Integer v1 : new Integer[] { 1, null }) {
2869 <
2868 >        for (Integer v1 : new Integer[] { 1, null })
2869 >    {
2870          final CompletableFuture<Integer> f = new CompletableFuture<>();
2871          final CompletableFuture<Integer> g = new CompletableFuture<>();
2872          final Noop r = new Noop();
# Line 2881 | Line 2887 | public class CompletableFutureTest exten
2887  
2888          checkCancelled(g);
2889          checkCompletedNormally(f, v1);
2890 <        }
2885 <    }
2890 >    }}
2891  
2892      public void testRunAfterEither_sourceCancelled4() {
2893          for (ExecutionMode m : ExecutionMode.values())
2894          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2895 <        for (Integer v1 : new Integer[] { 1, null }) {
2896 <
2895 >        for (Integer v1 : new Integer[] { 1, null })
2896 >    {
2897          final CompletableFuture<Integer> f = new CompletableFuture<>();
2898          final CompletableFuture<Integer> g = new CompletableFuture<>();
2899          final Noop r = new Noop();
# Line 2909 | Line 2914 | public class CompletableFutureTest exten
2914  
2915          checkCancelled(f);
2916          checkCompletedNormally(g, v1);
2917 <        }
2913 <    }
2917 >    }}
2918  
2919      /**
2920       * thenCompose result completes normally after normal completion of source
2921       */
2922 <    public void testThenCompose_normalCompletion1() {
2922 >    public void testThenCompose_normalCompletion() {
2923          for (ExecutionMode m : ExecutionMode.values())
2924 <        for (Integer v1 : new Integer[] { 1, null }) {
2925 <
2924 >        for (boolean createIncomplete : new boolean[] { true, false })
2925 >        for (Integer v1 : new Integer[] { 1, null })
2926 >    {
2927          final CompletableFuture<Integer> f = new CompletableFuture<>();
2928          final CompletableFutureInc r = new CompletableFutureInc();
2929 +        if (!createIncomplete) f.complete(v1);
2930          final CompletableFuture<Integer> g = f.thenCompose(r);
2931 <        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 }) {
2931 >        if (createIncomplete) f.complete(v1);
2932  
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);
2933          checkCompletedNormally(g, inc(v1));
2934          checkCompletedNormally(f, v1);
2935          assertEquals(1, r.invocationCount);
2936 <        }
2944 <    }
2936 >    }}
2937  
2938      /**
2939       * thenCompose result completes exceptionally after exceptional
2940       * completion of source
2941       */
2942 <    public void testThenCompose_exceptionalCompletion1() {
2943 <        for (ExecutionMode m : ExecutionMode.values()) {
2944 <
2942 >    public void testThenCompose_exceptionalCompletion() {
2943 >        for (ExecutionMode m : ExecutionMode.values())
2944 >        for (boolean createIncomplete : new boolean[] { true, false })
2945 >    {
2946          final CFException ex = new CFException();
2947          final CompletableFutureInc r = new CompletableFutureInc();
2948          final CompletableFuture<Integer> f = new CompletableFuture<>();
2949 +        if (!createIncomplete) f.completeExceptionally(ex);
2950          final CompletableFuture<Integer> g = f.thenCompose(r);
2951 <        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()) {
2951 >        if (createIncomplete) f.completeExceptionally(ex);
2952  
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);
2953          checkCompletedWithWrappedCFException(g, ex);
2954          checkCompletedWithWrappedCFException(f, ex);
2955 <        }
2956 <    }
2955 >        assertEquals(0, r.invocationCount);
2956 >    }}
2957  
2958      /**
2959       * thenCompose result completes exceptionally if action does
2960       */
2961 <    public void testThenCompose_actionFailed1() {
2961 >    public void testThenCompose_actionFailed() {
2962          for (ExecutionMode m : ExecutionMode.values())
2963 <        for (Integer v1 : new Integer[] { 1, null }) {
2964 <
2963 >        for (boolean createIncomplete : new boolean[] { true, false })
2964 >        for (Integer v1 : new Integer[] { 1, null })
2965 >    {
2966          final CompletableFuture<Integer> f = new CompletableFuture<>();
2967          final FailingCompletableFutureFunction r
2968              = new FailingCompletableFutureFunction();
2969 +        if (!createIncomplete) f.complete(v1);
2970          final CompletableFuture<Integer> g = f.thenCompose(r);
2971 <        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 }) {
2971 >        if (createIncomplete) f.complete(v1);
2972  
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);
2973          checkCompletedWithWrappedCFException(g);
2974          checkCompletedNormally(f, v1);
2975 <        }
3005 <    }
2975 >    }}
2976  
2977      /**
2978       * thenCompose result completes exceptionally if source cancelled
2979       */
2980 <    public void testThenCompose_sourceCancelled1() {
2980 >    public void testThenCompose_sourceCancelled() {
2981          for (ExecutionMode m : ExecutionMode.values())
2982 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2983 <
2982 >        for (boolean createIncomplete : new boolean[] { true, false })
2983 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2984 >    {
2985          final CompletableFuture<Integer> f = new CompletableFuture<>();
2986          final CompletableFutureInc r = new CompletableFutureInc();
2987 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2988          final CompletableFuture<Integer> g = f.thenCompose(r);
2989 <        assertTrue(f.cancel(mayInterruptIfRunning));
2990 <        checkCompletedWithWrappedCancellationException(g);
2991 <        checkCancelled(f);
2989 >        if (createIncomplete) {
2990 >            checkIncomplete(g);
2991 >            assertTrue(f.cancel(mayInterruptIfRunning));
2992          }
3021    }
3022
3023    public void testThenCompose_sourceCancelled2() {
3024        for (ExecutionMode m : ExecutionMode.values())
3025        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2993  
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);
2994          checkCompletedWithWrappedCancellationException(g);
2995          checkCancelled(f);
2996 <        }
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 <    }
2996 >    }}
2997  
2998      // other static methods
2999  
# Line 3607 | Line 3275 | public class CompletableFutureTest exten
3275      public void testWhenComplete_actionFailed() {
3276          for (boolean createIncomplete : new boolean[] { true, false })
3277          for (ExecutionMode m : ExecutionMode.values())
3278 <        for (Integer v1 : new Integer[] { 1, null }) {
3279 <
3278 >        for (Integer v1 : new Integer[] { 1, null })
3279 >    {
3280          final AtomicInteger a = new AtomicInteger(0);
3281          final CFException ex = new CFException();
3282          final CompletableFuture<Integer> f = new CompletableFuture<>();
# Line 3625 | Line 3293 | public class CompletableFutureTest exten
3293          checkCompletedNormally(f, v1);
3294          checkCompletedWithWrappedCFException(g, ex);
3295          assertEquals(1, a.get());
3296 <        }
3629 <    }
3296 >    }}
3297  
3298      /**
3299       * If a whenComplete action throws an exception when triggered by
# Line 3636 | Line 3303 | public class CompletableFutureTest exten
3303      public void testWhenComplete_actionFailedSourceFailed() {
3304          for (boolean createIncomplete : new boolean[] { true, false })
3305          for (ExecutionMode m : ExecutionMode.values())
3306 <        for (Integer v1 : new Integer[] { 1, null }) {
3307 <
3306 >        for (Integer v1 : new Integer[] { 1, null })
3307 >    {
3308          final AtomicInteger a = new AtomicInteger(0);
3309          final CFException ex1 = new CFException();
3310          final CFException ex2 = new CFException();
# Line 3657 | Line 3324 | public class CompletableFutureTest exten
3324          checkCompletedWithWrappedCFException(f, ex1);
3325          checkCompletedWithWrappedCFException(g, ex1);
3326          assertEquals(1, a.get());
3327 <        }
3661 <    }
3327 >    }}
3328  
3329   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines