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.74 by jsr166, Fri Jun 6 21:19:22 2014 UTC vs.
Revision 1.91 by jsr166, Tue Jun 17 20:34:18 2014 UTC

# Line 227 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 +        for (Integer v1 : new Integer[] { 1, null })
231 +    {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233          checkIncomplete(f);
234 <        f.complete(one);
235 <        checkCompletedNormally(f, one);
236 <    }
234 >        assertTrue(f.complete(v1));
235 >        assertFalse(f.complete(v1));
236 >        checkCompletedNormally(f, v1);
237 >    }}
238  
239      /**
240       * completeExceptionally completes exceptionally, as indicated by
# Line 250 | Line 253 | public class CompletableFutureTest exten
253       * methods isDone, isCancelled, join, get, and getNow
254       */
255      public void testCancel() {
256 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
257 +    {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260          assertTrue(f.cancel(true));
261 +        assertTrue(f.cancel(true));
262          checkCancelled(f);
263 <    }
263 >    }}
264  
265      /**
266       * obtrudeValue forces completion with given value
# Line 262 | Line 268 | public class CompletableFutureTest exten
268      public void testObtrudeValue() {
269          CompletableFuture<Integer> f = new CompletableFuture<>();
270          checkIncomplete(f);
271 <        f.complete(one);
271 >        assertTrue(f.complete(one));
272          checkCompletedNormally(f, one);
273          f.obtrudeValue(three);
274          checkCompletedNormally(f, three);
# Line 289 | Line 295 | public class CompletableFutureTest exten
295          CompletableFuture<Integer> f;
296  
297          f = new CompletableFuture<>();
298 <        f.complete(v1);
298 >        assertTrue(f.complete(v1));
299          for (int i = 0; i < 2; i++) {
300              f.obtrudeException(ex = new CFException());
301              checkCompletedExceptionally(f, ex);
# Line 309 | Line 315 | public class CompletableFutureTest exten
315          checkCompletedExceptionally(f, ex);
316          f.completeExceptionally(new CFException());
317          checkCompletedExceptionally(f, ex);
318 <        f.complete(v1);
318 >        assertFalse(f.complete(v1));
319          checkCompletedExceptionally(f, ex);
320      }}
321  
# Line 317 | Line 323 | public class CompletableFutureTest exten
323       * getNumberOfDependents returns number of dependent tasks
324       */
325      public void testGetNumberOfDependents() {
326 +        for (ExecutionMode m : ExecutionMode.values())
327 +        for (Integer v1 : new Integer[] { 1, null })
328 +    {
329          CompletableFuture<Integer> f = new CompletableFuture<>();
330          assertEquals(0, f.getNumberOfDependents());
331 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
331 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
332          assertEquals(1, f.getNumberOfDependents());
333          assertEquals(0, g.getNumberOfDependents());
334 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
334 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
335          assertEquals(2, f.getNumberOfDependents());
336 <        f.complete(1);
336 >        assertEquals(0, h.getNumberOfDependents());
337 >        assertTrue(f.complete(v1));
338          checkCompletedNormally(g, null);
339 +        checkCompletedNormally(h, null);
340          assertEquals(0, f.getNumberOfDependents());
341          assertEquals(0, g.getNumberOfDependents());
342 <    }
342 >        assertEquals(0, h.getNumberOfDependents());
343 >    }}
344  
345      /**
346       * toString indicates current completion state
# Line 339 | Line 351 | public class CompletableFutureTest exten
351          f = new CompletableFuture<String>();
352          assertTrue(f.toString().contains("[Not completed]"));
353  
354 <        f.complete("foo");
354 >        assertTrue(f.complete("foo"));
355          assertTrue(f.toString().contains("[Completed normally]"));
356  
357          f = new CompletableFuture<String>();
358 <        f.completeExceptionally(new IndexOutOfBoundsException());
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359          assertTrue(f.toString().contains("[Completed exceptionally]"));
360  
361 <        f = new CompletableFuture<String>();
362 <        f.cancel(true);
363 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
364 <
365 <        f = new CompletableFuture<String>();
354 <        f.cancel(false);
355 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
361 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
362 >            f = new CompletableFuture<String>();
363 >            assertTrue(f.cancel(mayInterruptIfRunning));
364 >            assertTrue(f.toString().contains("[Completed exceptionally]"));
365 >        }
366      }
367  
368      /**
# Line 529 | Line 539 | public class CompletableFutureTest exten
539              invoked();
540              value = x;
541              CompletableFuture<Integer> f = new CompletableFuture<>();
542 <            f.complete(inc(x));
542 >            assertTrue(f.complete(inc(x)));
543              return f;
544          }
545      }
# Line 837 | Line 847 | public class CompletableFutureTest exten
847      {
848          final AtomicInteger a = new AtomicInteger(0);
849          final CompletableFuture<Integer> f = new CompletableFuture<>();
850 <        if (!createIncomplete) f.complete(v1);
850 >        if (!createIncomplete) assertTrue(f.complete(v1));
851          final CompletableFuture<Integer> g = f.exceptionally
852              ((Throwable t) -> {
853                  // Should not be called
854                  a.getAndIncrement();
855                  throw new AssertionError();
856              });
857 <        if (createIncomplete) f.complete(v1);
857 >        if (createIncomplete) assertTrue(f.complete(v1));
858  
859          checkCompletedNormally(g, v1);
860          checkCompletedNormally(f, v1);
861          assertEquals(0, a.get());
862      }}
863  
854
864      /**
865       * exceptionally action completes with function value on source
866       * exception
# Line 900 | Line 909 | public class CompletableFutureTest exten
909      }}
910  
911      /**
912 +     * whenComplete action executes on normal completion, propagating
913 +     * source result.
914 +     */
915 +    public void testWhenComplete_normalCompletion1() {
916 +        for (ExecutionMode m : ExecutionMode.values())
917 +        for (boolean createIncomplete : new boolean[] { true, false })
918 +        for (Integer v1 : new Integer[] { 1, null })
919 +    {
920 +        final AtomicInteger a = new AtomicInteger(0);
921 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
922 +        if (!createIncomplete) assertTrue(f.complete(v1));
923 +        final CompletableFuture<Integer> g = m.whenComplete
924 +            (f,
925 +             (Integer x, Throwable t) -> {
926 +                m.checkExecutionMode();
927 +                threadAssertSame(x, v1);
928 +                threadAssertNull(t);
929 +                a.getAndIncrement();
930 +            });
931 +        if (createIncomplete) assertTrue(f.complete(v1));
932 +
933 +        checkCompletedNormally(g, v1);
934 +        checkCompletedNormally(f, v1);
935 +        assertEquals(1, a.get());
936 +    }}
937 +
938 +    /**
939 +     * whenComplete action executes on exceptional completion, propagating
940 +     * source result.
941 +     */
942 +    public void testWhenComplete_exceptionalCompletion() {
943 +        for (ExecutionMode m : ExecutionMode.values())
944 +        for (boolean createIncomplete : new boolean[] { true, false })
945 +        for (Integer v1 : new Integer[] { 1, null })
946 +    {
947 +        final AtomicInteger a = new AtomicInteger(0);
948 +        final CFException ex = new CFException();
949 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
950 +        if (!createIncomplete) f.completeExceptionally(ex);
951 +        final CompletableFuture<Integer> g = m.whenComplete
952 +            (f,
953 +             (Integer x, Throwable t) -> {
954 +                m.checkExecutionMode();
955 +                threadAssertNull(x);
956 +                threadAssertSame(t, ex);
957 +                a.getAndIncrement();
958 +            });
959 +        if (createIncomplete) f.completeExceptionally(ex);
960 +
961 +        checkCompletedWithWrappedException(g, ex);
962 +        checkCompletedExceptionally(f, ex);
963 +        assertEquals(1, a.get());
964 +    }}
965 +
966 +    /**
967 +     * whenComplete action executes on cancelled source, propagating
968 +     * CancellationException.
969 +     */
970 +    public void testWhenComplete_sourceCancelled() {
971 +        for (ExecutionMode m : ExecutionMode.values())
972 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
973 +        for (boolean createIncomplete : new boolean[] { true, false })
974 +    {
975 +        final AtomicInteger a = new AtomicInteger(0);
976 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978 +        final CompletableFuture<Integer> g = m.whenComplete
979 +            (f,
980 +             (Integer x, Throwable t) -> {
981 +                m.checkExecutionMode();
982 +                threadAssertNull(x);
983 +                threadAssertTrue(t instanceof CancellationException);
984 +                a.getAndIncrement();
985 +            });
986 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987 +
988 +        checkCompletedWithWrappedCancellationException(g);
989 +        checkCancelled(f);
990 +        assertEquals(1, a.get());
991 +    }}
992 +
993 +    /**
994 +     * If a whenComplete action throws an exception when triggered by
995 +     * a normal completion, it completes exceptionally
996 +     */
997 +    public void testWhenComplete_actionFailed() {
998 +        for (boolean createIncomplete : new boolean[] { true, false })
999 +        for (ExecutionMode m : ExecutionMode.values())
1000 +        for (Integer v1 : new Integer[] { 1, null })
1001 +    {
1002 +        final AtomicInteger a = new AtomicInteger(0);
1003 +        final CFException ex = new CFException();
1004 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1005 +        if (!createIncomplete) assertTrue(f.complete(v1));
1006 +        final CompletableFuture<Integer> g = m.whenComplete
1007 +            (f,
1008 +             (Integer x, Throwable t) -> {
1009 +                m.checkExecutionMode();
1010 +                threadAssertSame(x, v1);
1011 +                threadAssertNull(t);
1012 +                a.getAndIncrement();
1013 +                throw ex;
1014 +            });
1015 +        if (createIncomplete) assertTrue(f.complete(v1));
1016 +
1017 +        checkCompletedWithWrappedException(g, ex);
1018 +        checkCompletedNormally(f, v1);
1019 +        assertEquals(1, a.get());
1020 +    }}
1021 +
1022 +    /**
1023 +     * If a whenComplete action throws an exception when triggered by
1024 +     * a source completion that also throws an exception, the source
1025 +     * exception takes precedence.
1026 +     */
1027 +    public void testWhenComplete_actionFailedSourceFailed() {
1028 +        for (boolean createIncomplete : new boolean[] { true, false })
1029 +        for (ExecutionMode m : ExecutionMode.values())
1030 +        for (Integer v1 : new Integer[] { 1, null })
1031 +    {
1032 +        final AtomicInteger a = new AtomicInteger(0);
1033 +        final CFException ex1 = new CFException();
1034 +        final CFException ex2 = new CFException();
1035 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 +
1037 +        if (!createIncomplete) f.completeExceptionally(ex1);
1038 +        final CompletableFuture<Integer> g = m.whenComplete
1039 +            (f,
1040 +             (Integer x, Throwable t) -> {
1041 +                m.checkExecutionMode();
1042 +                threadAssertSame(t, ex1);
1043 +                threadAssertNull(x);
1044 +                a.getAndIncrement();
1045 +                throw ex2;
1046 +            });
1047 +        if (createIncomplete) f.completeExceptionally(ex1);
1048 +
1049 +        checkCompletedWithWrappedException(g, ex1);
1050 +        checkCompletedExceptionally(f, ex1);
1051 +        assertEquals(1, a.get());
1052 +    }}
1053 +
1054 +    /**
1055       * handle action completes normally with function value on normal
1056       * completion of source
1057       */
# Line 910 | Line 1062 | public class CompletableFutureTest exten
1062      {
1063          final CompletableFuture<Integer> f = new CompletableFuture<>();
1064          final AtomicInteger a = new AtomicInteger(0);
1065 <        if (!createIncomplete) f.complete(v1);
1065 >        if (!createIncomplete) assertTrue(f.complete(v1));
1066          final CompletableFuture<Integer> g = m.handle
1067              (f,
1068               (Integer x, Throwable t) -> {
# Line 920 | Line 1072 | public class CompletableFutureTest exten
1072                  a.getAndIncrement();
1073                  return inc(v1);
1074              });
1075 <        if (createIncomplete) f.complete(v1);
1075 >        if (createIncomplete) assertTrue(f.complete(v1));
1076  
1077          checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
# Line 1021 | Line 1173 | public class CompletableFutureTest exten
1173          final CompletableFuture<Integer> f = new CompletableFuture<>();
1174          final AtomicInteger a = new AtomicInteger(0);
1175          final CFException ex = new CFException();
1176 <        if (!createIncomplete) f.complete(v1);
1176 >        if (!createIncomplete) assertTrue(f.complete(v1));
1177          final CompletableFuture<Integer> g = m.handle
1178              (f,
1179               (Integer x, Throwable t) -> {
# Line 1031 | Line 1183 | public class CompletableFutureTest exten
1183                  a.getAndIncrement();
1184                  throw ex;
1185              });
1186 <        if (createIncomplete) f.complete(v1);
1186 >        if (createIncomplete) assertTrue(f.complete(v1));
1187  
1188          checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
# Line 1112 | Line 1264 | public class CompletableFutureTest exten
1264       */
1265      public void testThenRun_normalCompletion() {
1266          for (ExecutionMode m : ExecutionMode.values())
1115        for (boolean createIncomplete : new boolean[] { true, false })
1267          for (Integer v1 : new Integer[] { 1, null })
1268      {
1269          final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 <        final Noop r = new Noop(m);
1271 <        if (!createIncomplete) f.complete(v1);
1121 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1122 <        if (createIncomplete) {
1123 <            checkIncomplete(g);
1124 <            f.complete(v1);
1125 <        }
1270 >        final Noop[] rs = new Noop[6];
1271 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1272  
1273 <        checkCompletedNormally(g, null);
1273 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1274 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1275 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1276 >        checkIncomplete(h0);
1277 >        checkIncomplete(h1);
1278 >        checkIncomplete(h2);
1279 >        assertTrue(f.complete(v1));
1280 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1281 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1282 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1283 >
1284 >        checkCompletedNormally(h0, null);
1285 >        checkCompletedNormally(h1, null);
1286 >        checkCompletedNormally(h2, null);
1287 >        checkCompletedNormally(h3, null);
1288 >        checkCompletedNormally(h4, null);
1289 >        checkCompletedNormally(h5, null);
1290          checkCompletedNormally(f, v1);
1291 <        r.assertInvoked();
1291 >        for (Noop r : rs) r.assertInvoked();
1292      }}
1293  
1294      /**
# Line 1135 | Line 1297 | public class CompletableFutureTest exten
1297       */
1298      public void testThenRun_exceptionalCompletion() {
1299          for (ExecutionMode m : ExecutionMode.values())
1138        for (boolean createIncomplete : new boolean[] { true, false })
1300      {
1301          final CFException ex = new CFException();
1302          final CompletableFuture<Integer> f = new CompletableFuture<>();
1303 <        final Noop r = new Noop(m);
1304 <        if (!createIncomplete) f.completeExceptionally(ex);
1144 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1145 <        if (createIncomplete) {
1146 <            checkIncomplete(g);
1147 <            f.completeExceptionally(ex);
1148 <        }
1303 >        final Noop[] rs = new Noop[6];
1304 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1305  
1306 <        checkCompletedWithWrappedException(g, ex);
1306 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1307 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1308 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1309 >        checkIncomplete(h0);
1310 >        checkIncomplete(h1);
1311 >        checkIncomplete(h2);
1312 >        assertTrue(f.completeExceptionally(ex));
1313 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1314 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1315 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1316 >
1317 >        checkCompletedWithWrappedException(h0, ex);
1318 >        checkCompletedWithWrappedException(h1, ex);
1319 >        checkCompletedWithWrappedException(h2, ex);
1320 >        checkCompletedWithWrappedException(h3, ex);
1321 >        checkCompletedWithWrappedException(h4, ex);
1322 >        checkCompletedWithWrappedException(h5, ex);
1323          checkCompletedExceptionally(f, ex);
1324 <        r.assertNotInvoked();
1324 >        for (Noop r : rs) r.assertNotInvoked();
1325      }}
1326  
1327      /**
# Line 1157 | Line 1329 | public class CompletableFutureTest exten
1329       */
1330      public void testThenRun_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1160        for (boolean createIncomplete : new boolean[] { true, false })
1332          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333      {
1334          final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 <        final Noop r = new Noop(m);
1336 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1166 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1167 <        if (createIncomplete) {
1168 <            checkIncomplete(g);
1169 <            assertTrue(f.cancel(mayInterruptIfRunning));
1170 <        }
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337  
1338 <        checkCompletedWithWrappedCancellationException(g);
1338 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1339 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1340 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1341 >        checkIncomplete(h0);
1342 >        checkIncomplete(h1);
1343 >        checkIncomplete(h2);
1344 >        assertTrue(f.cancel(mayInterruptIfRunning));
1345 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1346 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1347 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1348 >
1349 >        checkCompletedWithWrappedCancellationException(h0);
1350 >        checkCompletedWithWrappedCancellationException(h1);
1351 >        checkCompletedWithWrappedCancellationException(h2);
1352 >        checkCompletedWithWrappedCancellationException(h3);
1353 >        checkCompletedWithWrappedCancellationException(h4);
1354 >        checkCompletedWithWrappedCancellationException(h5);
1355          checkCancelled(f);
1356 <        r.assertNotInvoked();
1356 >        for (Noop r : rs) r.assertNotInvoked();
1357      }}
1358  
1359      /**
# Line 1179 | Line 1361 | public class CompletableFutureTest exten
1361       */
1362      public void testThenRun_actionFailed() {
1363          for (ExecutionMode m : ExecutionMode.values())
1182        for (boolean createIncomplete : new boolean[] { true, false })
1364          for (Integer v1 : new Integer[] { 1, null })
1365      {
1366          final CompletableFuture<Integer> f = new CompletableFuture<>();
1367 <        final FailingRunnable r = new FailingRunnable(m);
1368 <        if (!createIncomplete) f.complete(v1);
1188 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1189 <        if (createIncomplete) {
1190 <            checkIncomplete(g);
1191 <            f.complete(v1);
1192 <        }
1367 >        final FailingRunnable[] rs = new FailingRunnable[6];
1368 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369  
1370 <        checkCompletedWithWrappedCFException(g);
1370 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1371 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1372 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1373 >        assertTrue(f.complete(v1));
1374 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1375 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1376 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1377 >
1378 >        checkCompletedWithWrappedCFException(h0);
1379 >        checkCompletedWithWrappedCFException(h1);
1380 >        checkCompletedWithWrappedCFException(h2);
1381 >        checkCompletedWithWrappedCFException(h3);
1382 >        checkCompletedWithWrappedCFException(h4);
1383 >        checkCompletedWithWrappedCFException(h5);
1384          checkCompletedNormally(f, v1);
1385      }}
1386  
# Line 1200 | Line 1389 | public class CompletableFutureTest exten
1389       */
1390      public void testThenApply_normalCompletion() {
1391          for (ExecutionMode m : ExecutionMode.values())
1203        for (boolean createIncomplete : new boolean[] { true, false })
1392          for (Integer v1 : new Integer[] { 1, null })
1393      {
1394          final CompletableFuture<Integer> f = new CompletableFuture<>();
1395 <        final IncFunction r = new IncFunction(m);
1396 <        if (!createIncomplete) f.complete(v1);
1209 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1210 <        if (createIncomplete) {
1211 <            checkIncomplete(g);
1212 <            f.complete(v1);
1213 <        }
1395 >        final IncFunction[] rs = new IncFunction[4];
1396 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1397  
1398 <        checkCompletedNormally(g, inc(v1));
1398 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1399 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1400 >        checkIncomplete(h0);
1401 >        checkIncomplete(h1);
1402 >        assertTrue(f.complete(v1));
1403 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1404 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1405 >
1406 >        checkCompletedNormally(h0, inc(v1));
1407 >        checkCompletedNormally(h1, inc(v1));
1408 >        checkCompletedNormally(h2, inc(v1));
1409 >        checkCompletedNormally(h3, inc(v1));
1410          checkCompletedNormally(f, v1);
1411 <        r.assertValue(inc(v1));
1411 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1412      }}
1413  
1414      /**
# Line 1223 | Line 1417 | public class CompletableFutureTest exten
1417       */
1418      public void testThenApply_exceptionalCompletion() {
1419          for (ExecutionMode m : ExecutionMode.values())
1226        for (boolean createIncomplete : new boolean[] { true, false })
1420      {
1421          final CFException ex = new CFException();
1422          final CompletableFuture<Integer> f = new CompletableFuture<>();
1423 <        final IncFunction r = new IncFunction(m);
1424 <        if (!createIncomplete) f.completeExceptionally(ex);
1232 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1233 <        if (createIncomplete) {
1234 <            checkIncomplete(g);
1235 <            f.completeExceptionally(ex);
1236 <        }
1423 >        final IncFunction[] rs = new IncFunction[4];
1424 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1425  
1426 <        checkCompletedWithWrappedException(g, ex);
1426 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1427 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1428 >        assertTrue(f.completeExceptionally(ex));
1429 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1430 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1431 >
1432 >        checkCompletedWithWrappedException(h0, ex);
1433 >        checkCompletedWithWrappedException(h1, ex);
1434 >        checkCompletedWithWrappedException(h2, ex);
1435 >        checkCompletedWithWrappedException(h3, ex);
1436          checkCompletedExceptionally(f, ex);
1437 <        r.assertNotInvoked();
1437 >        for (IncFunction r : rs) r.assertNotInvoked();
1438      }}
1439  
1440      /**
# Line 1245 | Line 1442 | public class CompletableFutureTest exten
1442       */
1443      public void testThenApply_sourceCancelled() {
1444          for (ExecutionMode m : ExecutionMode.values())
1248        for (boolean createIncomplete : new boolean[] { true, false })
1445          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1446      {
1447          final CompletableFuture<Integer> f = new CompletableFuture<>();
1448 <        final IncFunction r = new IncFunction(m);
1449 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1254 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1255 <        if (createIncomplete) {
1256 <            checkIncomplete(g);
1257 <            assertTrue(f.cancel(mayInterruptIfRunning));
1258 <        }
1448 >        final IncFunction[] rs = new IncFunction[4];
1449 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1450  
1451 <        checkCompletedWithWrappedCancellationException(g);
1451 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1452 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1453 >        assertTrue(f.cancel(mayInterruptIfRunning));
1454 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1455 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1456 >
1457 >        checkCompletedWithWrappedCancellationException(h0);
1458 >        checkCompletedWithWrappedCancellationException(h1);
1459 >        checkCompletedWithWrappedCancellationException(h2);
1460 >        checkCompletedWithWrappedCancellationException(h3);
1461          checkCancelled(f);
1462 <        r.assertNotInvoked();
1462 >        for (IncFunction r : rs) r.assertNotInvoked();
1463      }}
1464  
1465      /**
# Line 1267 | Line 1467 | public class CompletableFutureTest exten
1467       */
1468      public void testThenApply_actionFailed() {
1469          for (ExecutionMode m : ExecutionMode.values())
1270        for (boolean createIncomplete : new boolean[] { true, false })
1470          for (Integer v1 : new Integer[] { 1, null })
1471      {
1472          final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 <        final FailingFunction r = new FailingFunction(m);
1474 <        if (!createIncomplete) f.complete(v1);
1276 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1277 <        if (createIncomplete) {
1278 <            checkIncomplete(g);
1279 <            f.complete(v1);
1280 <        }
1473 >        final FailingFunction[] rs = new FailingFunction[4];
1474 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1475  
1476 <        checkCompletedWithWrappedCFException(g);
1476 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1477 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1478 >        assertTrue(f.complete(v1));
1479 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1480 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1481 >
1482 >        checkCompletedWithWrappedCFException(h0);
1483 >        checkCompletedWithWrappedCFException(h1);
1484 >        checkCompletedWithWrappedCFException(h2);
1485 >        checkCompletedWithWrappedCFException(h3);
1486          checkCompletedNormally(f, v1);
1487      }}
1488  
# Line 1293 | Line 1496 | public class CompletableFutureTest exten
1496      {
1497          final CompletableFuture<Integer> f = new CompletableFuture<>();
1498          final NoopConsumer r = new NoopConsumer(m);
1499 <        if (!createIncomplete) f.complete(v1);
1499 >        if (!createIncomplete) assertTrue(f.complete(v1));
1500          final CompletableFuture<Void> g = m.thenAccept(f, r);
1501          if (createIncomplete) {
1502              checkIncomplete(g);
1503 <            f.complete(v1);
1503 >            assertTrue(f.complete(v1));
1504          }
1505  
1506          checkCompletedNormally(g, null);
# Line 1377 | Line 1580 | public class CompletableFutureTest exten
1580       */
1581      public void testThenCombine_normalCompletion() {
1582          for (ExecutionMode m : ExecutionMode.values())
1380        for (boolean createIncomplete : new boolean[] { true, false })
1583          for (boolean fFirst : new boolean[] { true, false })
1584          for (Integer v1 : new Integer[] { 1, null })
1585          for (Integer v2 : new Integer[] { 2, null })
1586      {
1587          final CompletableFuture<Integer> f = new CompletableFuture<>();
1588          final CompletableFuture<Integer> g = new CompletableFuture<>();
1589 <        final SubtractFunction r = new SubtractFunction(m);
1590 <
1591 <        if (fFirst) f.complete(v1); else g.complete(v2);
1592 <        if (!createIncomplete)
1593 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1594 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1595 <        if (createIncomplete) {
1596 <            checkIncomplete(h);
1597 <            r.assertNotInvoked();
1598 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1599 <        }
1600 <
1601 <        checkCompletedNormally(h, subtract(v1, v2));
1589 >        final SubtractFunction r1 = new SubtractFunction(m);
1590 >        final SubtractFunction r2 = new SubtractFunction(m);
1591 >        final SubtractFunction r3 = new SubtractFunction(m);
1592 >
1593 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1594 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1595 >        final Integer w1 =  fFirst ? v1 : v2;
1596 >        final Integer w2 = !fFirst ? v1 : v2;
1597 >
1598 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1599 >        assertTrue(fst.complete(w1));
1600 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1601 >        checkIncomplete(h1);
1602 >        checkIncomplete(h2);
1603 >        r1.assertNotInvoked();
1604 >        r2.assertNotInvoked();
1605 >        assertTrue(snd.complete(w2));
1606 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1607 >
1608 >        checkCompletedNormally(h1, subtract(v1, v2));
1609 >        checkCompletedNormally(h2, subtract(v1, v2));
1610 >        checkCompletedNormally(h3, subtract(v1, v2));
1611 >        r1.assertValue(subtract(v1, v2));
1612 >        r2.assertValue(subtract(v1, v2));
1613 >        r3.assertValue(subtract(v1, v2));
1614          checkCompletedNormally(f, v1);
1615          checkCompletedNormally(g, v2);
1402        r.assertValue(subtract(v1, v2));
1616      }}
1617  
1618      /**
1619       * thenCombine result completes exceptionally after exceptional
1620       * completion of either source
1621       */
1622 <    public void testThenCombine_exceptionalCompletion() {
1622 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1623          for (ExecutionMode m : ExecutionMode.values())
1411        for (boolean createIncomplete : new boolean[] { true, false })
1624          for (boolean fFirst : new boolean[] { true, false })
1625 +        for (boolean failFirst : new boolean[] { true, false })
1626          for (Integer v1 : new Integer[] { 1, null })
1627      {
1628          final CompletableFuture<Integer> f = new CompletableFuture<>();
1629          final CompletableFuture<Integer> g = new CompletableFuture<>();
1630          final CFException ex = new CFException();
1631 <        final SubtractFunction r = new SubtractFunction(m);
1632 <
1633 <        (fFirst ? f : g).complete(v1);
1634 <        if (!createIncomplete)
1635 <            (!fFirst ? f : g).completeExceptionally(ex);
1636 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1637 <        if (createIncomplete) {
1638 <            checkIncomplete(h);
1639 <            (!fFirst ? f : g).completeExceptionally(ex);
1640 <        }
1631 >        final SubtractFunction r1 = new SubtractFunction(m);
1632 >        final SubtractFunction r2 = new SubtractFunction(m);
1633 >        final SubtractFunction r3 = new SubtractFunction(m);
1634 >
1635 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1636 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1637 >        final Callable<Boolean> complete1 = failFirst ?
1638 >            () -> fst.completeExceptionally(ex) :
1639 >            () -> fst.complete(v1);
1640 >        final Callable<Boolean> complete2 = failFirst ?
1641 >            () -> snd.complete(v1) :
1642 >            () -> snd.completeExceptionally(ex);
1643 >
1644 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1645 >        assertTrue(complete1.call());
1646 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1647 >        checkIncomplete(h1);
1648 >        checkIncomplete(h2);
1649 >        assertTrue(complete2.call());
1650 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1651  
1652 <        checkCompletedWithWrappedException(h, ex);
1653 <        r.assertNotInvoked();
1654 <        checkCompletedNormally(fFirst ? f : g, v1);
1655 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1652 >        checkCompletedWithWrappedException(h1, ex);
1653 >        checkCompletedWithWrappedException(h2, ex);
1654 >        checkCompletedWithWrappedException(h3, ex);
1655 >        r1.assertNotInvoked();
1656 >        r2.assertNotInvoked();
1657 >        r3.assertNotInvoked();
1658 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1659 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1660      }}
1661  
1662      /**
1663       * thenCombine result completes exceptionally if either source cancelled
1664       */
1665 <    public void testThenCombine_sourceCancelled() {
1665 >    public void testThenCombine_sourceCancelled() throws Throwable {
1666          for (ExecutionMode m : ExecutionMode.values())
1667          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1441        for (boolean createIncomplete : new boolean[] { true, false })
1668          for (boolean fFirst : new boolean[] { true, false })
1669 +        for (boolean failFirst : new boolean[] { true, false })
1670          for (Integer v1 : new Integer[] { 1, null })
1671      {
1672          final CompletableFuture<Integer> f = new CompletableFuture<>();
1673          final CompletableFuture<Integer> g = new CompletableFuture<>();
1674 <        final SubtractFunction r = new SubtractFunction(m);
1674 >        final SubtractFunction r1 = new SubtractFunction(m);
1675 >        final SubtractFunction r2 = new SubtractFunction(m);
1676 >        final SubtractFunction r3 = new SubtractFunction(m);
1677  
1678 <        (fFirst ? f : g).complete(v1);
1679 <        if (!createIncomplete)
1680 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1681 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1682 <        if (createIncomplete) {
1683 <            checkIncomplete(h);
1684 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1685 <        }
1678 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1679 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1680 >        final Callable<Boolean> complete1 = failFirst ?
1681 >            () -> fst.cancel(mayInterruptIfRunning) :
1682 >            () -> fst.complete(v1);
1683 >        final Callable<Boolean> complete2 = failFirst ?
1684 >            () -> snd.complete(v1) :
1685 >            () -> snd.cancel(mayInterruptIfRunning);
1686  
1687 <        checkCompletedWithWrappedCancellationException(h);
1688 <        checkCancelled(!fFirst ? f : g);
1689 <        r.assertNotInvoked();
1690 <        checkCompletedNormally(fFirst ? f : g, v1);
1687 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1688 >        assertTrue(complete1.call());
1689 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1690 >        checkIncomplete(h1);
1691 >        checkIncomplete(h2);
1692 >        assertTrue(complete2.call());
1693 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1694 >
1695 >        checkCompletedWithWrappedCancellationException(h1);
1696 >        checkCompletedWithWrappedCancellationException(h2);
1697 >        checkCompletedWithWrappedCancellationException(h3);
1698 >        r1.assertNotInvoked();
1699 >        r2.assertNotInvoked();
1700 >        r3.assertNotInvoked();
1701 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1702 >        checkCancelled(failFirst ? fst : snd);
1703      }}
1704  
1705      /**
# Line 1472 | Line 1713 | public class CompletableFutureTest exten
1713      {
1714          final CompletableFuture<Integer> f = new CompletableFuture<>();
1715          final CompletableFuture<Integer> g = new CompletableFuture<>();
1716 <        final FailingBiFunction r = new FailingBiFunction(m);
1717 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1716 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1717 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1718 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1719 >
1720 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1721 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1722 >        final Integer w1 =  fFirst ? v1 : v2;
1723 >        final Integer w2 = !fFirst ? v1 : v2;
1724 >
1725 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1726 >        assertTrue(fst.complete(w1));
1727 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1728 >        assertTrue(snd.complete(w2));
1729 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1730  
1731 <        if (fFirst) {
1732 <            f.complete(v1);
1733 <            g.complete(v2);
1734 <        } else {
1735 <            g.complete(v2);
1736 <            f.complete(v1);
1484 <        }
1485 <
1486 <        checkCompletedWithWrappedCFException(h);
1731 >        checkCompletedWithWrappedCFException(h1);
1732 >        checkCompletedWithWrappedCFException(h2);
1733 >        checkCompletedWithWrappedCFException(h3);
1734 >        r1.assertInvoked();
1735 >        r2.assertInvoked();
1736 >        r3.assertInvoked();
1737          checkCompletedNormally(f, v1);
1738          checkCompletedNormally(g, v2);
1739      }}
# Line 1494 | Line 1744 | public class CompletableFutureTest exten
1744       */
1745      public void testThenAcceptBoth_normalCompletion() {
1746          for (ExecutionMode m : ExecutionMode.values())
1497        for (boolean createIncomplete : new boolean[] { true, false })
1747          for (boolean fFirst : new boolean[] { true, false })
1748          for (Integer v1 : new Integer[] { 1, null })
1749          for (Integer v2 : new Integer[] { 2, null })
1750      {
1751          final CompletableFuture<Integer> f = new CompletableFuture<>();
1752          final CompletableFuture<Integer> g = new CompletableFuture<>();
1753 <        final SubtractAction r = new SubtractAction(m);
1754 <
1755 <        if (fFirst) f.complete(v1); else g.complete(v2);
1756 <        if (!createIncomplete)
1757 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1758 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1759 <        if (createIncomplete) {
1760 <            checkIncomplete(h);
1761 <            r.assertNotInvoked();
1762 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1763 <        }
1753 >        final SubtractAction r1 = new SubtractAction(m);
1754 >        final SubtractAction r2 = new SubtractAction(m);
1755 >        final SubtractAction r3 = new SubtractAction(m);
1756 >
1757 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1758 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1759 >        final Integer w1 =  fFirst ? v1 : v2;
1760 >        final Integer w2 = !fFirst ? v1 : v2;
1761 >
1762 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1763 >        assertTrue(fst.complete(w1));
1764 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1765 >        checkIncomplete(h1);
1766 >        checkIncomplete(h2);
1767 >        r1.assertNotInvoked();
1768 >        r2.assertNotInvoked();
1769 >        assertTrue(snd.complete(w2));
1770 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1771  
1772 <        checkCompletedNormally(h, null);
1773 <        r.assertValue(subtract(v1, v2));
1772 >        checkCompletedNormally(h1, null);
1773 >        checkCompletedNormally(h2, null);
1774 >        checkCompletedNormally(h3, null);
1775 >        r1.assertValue(subtract(v1, v2));
1776 >        r2.assertValue(subtract(v1, v2));
1777 >        r3.assertValue(subtract(v1, v2));
1778          checkCompletedNormally(f, v1);
1779          checkCompletedNormally(g, v2);
1780      }}
# Line 1523 | Line 1783 | public class CompletableFutureTest exten
1783       * thenAcceptBoth result completes exceptionally after exceptional
1784       * completion of either source
1785       */
1786 <    public void testThenAcceptBoth_exceptionalCompletion() {
1786 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1787          for (ExecutionMode m : ExecutionMode.values())
1528        for (boolean createIncomplete : new boolean[] { true, false })
1788          for (boolean fFirst : new boolean[] { true, false })
1789 +        for (boolean failFirst : new boolean[] { true, false })
1790          for (Integer v1 : new Integer[] { 1, null })
1791      {
1792          final CompletableFuture<Integer> f = new CompletableFuture<>();
1793          final CompletableFuture<Integer> g = new CompletableFuture<>();
1794          final CFException ex = new CFException();
1795 <        final SubtractAction r = new SubtractAction(m);
1796 <
1797 <        (fFirst ? f : g).complete(v1);
1798 <        if (!createIncomplete)
1799 <            (!fFirst ? f : g).completeExceptionally(ex);
1800 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1801 <        if (createIncomplete) {
1802 <            checkIncomplete(h);
1803 <            (!fFirst ? f : g).completeExceptionally(ex);
1804 <        }
1795 >        final SubtractAction r1 = new SubtractAction(m);
1796 >        final SubtractAction r2 = new SubtractAction(m);
1797 >        final SubtractAction r3 = new SubtractAction(m);
1798 >
1799 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1800 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1801 >        final Callable<Boolean> complete1 = failFirst ?
1802 >            () -> fst.completeExceptionally(ex) :
1803 >            () -> fst.complete(v1);
1804 >        final Callable<Boolean> complete2 = failFirst ?
1805 >            () -> snd.complete(v1) :
1806 >            () -> snd.completeExceptionally(ex);
1807 >
1808 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1809 >        assertTrue(complete1.call());
1810 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1811 >        checkIncomplete(h1);
1812 >        checkIncomplete(h2);
1813 >        assertTrue(complete2.call());
1814 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1815  
1816 <        checkCompletedWithWrappedException(h, ex);
1817 <        r.assertNotInvoked();
1818 <        checkCompletedNormally(fFirst ? f : g, v1);
1819 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1816 >        checkCompletedWithWrappedException(h1, ex);
1817 >        checkCompletedWithWrappedException(h2, ex);
1818 >        checkCompletedWithWrappedException(h3, ex);
1819 >        r1.assertNotInvoked();
1820 >        r2.assertNotInvoked();
1821 >        r3.assertNotInvoked();
1822 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1823 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1824      }}
1825  
1826      /**
1827       * thenAcceptBoth result completes exceptionally if either source cancelled
1828       */
1829 <    public void testThenAcceptBoth_sourceCancelled() {
1829 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1830          for (ExecutionMode m : ExecutionMode.values())
1831          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1558        for (boolean createIncomplete : new boolean[] { true, false })
1832          for (boolean fFirst : new boolean[] { true, false })
1833 +        for (boolean failFirst : new boolean[] { true, false })
1834          for (Integer v1 : new Integer[] { 1, null })
1835      {
1836          final CompletableFuture<Integer> f = new CompletableFuture<>();
1837          final CompletableFuture<Integer> g = new CompletableFuture<>();
1838 <        final SubtractAction r = new SubtractAction(m);
1838 >        final SubtractAction r1 = new SubtractAction(m);
1839 >        final SubtractAction r2 = new SubtractAction(m);
1840 >        final SubtractAction r3 = new SubtractAction(m);
1841  
1842 <        (fFirst ? f : g).complete(v1);
1843 <        if (!createIncomplete)
1844 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1845 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1846 <        if (createIncomplete) {
1847 <            checkIncomplete(h);
1848 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1849 <        }
1842 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1843 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1844 >        final Callable<Boolean> complete1 = failFirst ?
1845 >            () -> fst.cancel(mayInterruptIfRunning) :
1846 >            () -> fst.complete(v1);
1847 >        final Callable<Boolean> complete2 = failFirst ?
1848 >            () -> snd.complete(v1) :
1849 >            () -> snd.cancel(mayInterruptIfRunning);
1850  
1851 <        checkCompletedWithWrappedCancellationException(h);
1852 <        checkCancelled(!fFirst ? f : g);
1853 <        r.assertNotInvoked();
1854 <        checkCompletedNormally(fFirst ? f : g, v1);
1851 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1852 >        assertTrue(complete1.call());
1853 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1854 >        checkIncomplete(h1);
1855 >        checkIncomplete(h2);
1856 >        assertTrue(complete2.call());
1857 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1858 >
1859 >        checkCompletedWithWrappedCancellationException(h1);
1860 >        checkCompletedWithWrappedCancellationException(h2);
1861 >        checkCompletedWithWrappedCancellationException(h3);
1862 >        r1.assertNotInvoked();
1863 >        r2.assertNotInvoked();
1864 >        r3.assertNotInvoked();
1865 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1866 >        checkCancelled(failFirst ? fst : snd);
1867      }}
1868  
1869      /**
# Line 1589 | Line 1877 | public class CompletableFutureTest exten
1877      {
1878          final CompletableFuture<Integer> f = new CompletableFuture<>();
1879          final CompletableFuture<Integer> g = new CompletableFuture<>();
1880 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1881 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1882 <
1883 <        if (fFirst) {
1884 <            f.complete(v1);
1885 <            g.complete(v2);
1886 <        } else {
1887 <            g.complete(v2);
1888 <            f.complete(v1);
1889 <        }
1880 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1881 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1882 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1883 >
1884 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1885 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1886 >        final Integer w1 =  fFirst ? v1 : v2;
1887 >        final Integer w2 = !fFirst ? v1 : v2;
1888 >
1889 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1890 >        assertTrue(fst.complete(w1));
1891 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1892 >        assertTrue(snd.complete(w2));
1893 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1894  
1895 <        checkCompletedWithWrappedCFException(h);
1895 >        checkCompletedWithWrappedCFException(h1);
1896 >        checkCompletedWithWrappedCFException(h2);
1897 >        checkCompletedWithWrappedCFException(h3);
1898 >        r1.assertInvoked();
1899 >        r2.assertInvoked();
1900 >        r3.assertInvoked();
1901          checkCompletedNormally(f, v1);
1902          checkCompletedNormally(g, v2);
1903      }}
# Line 1611 | Line 1908 | public class CompletableFutureTest exten
1908       */
1909      public void testRunAfterBoth_normalCompletion() {
1910          for (ExecutionMode m : ExecutionMode.values())
1614        for (boolean createIncomplete : new boolean[] { true, false })
1911          for (boolean fFirst : new boolean[] { true, false })
1912          for (Integer v1 : new Integer[] { 1, null })
1913          for (Integer v2 : new Integer[] { 2, null })
1914      {
1915          final CompletableFuture<Integer> f = new CompletableFuture<>();
1916          final CompletableFuture<Integer> g = new CompletableFuture<>();
1917 <        final Noop r = new Noop(m);
1918 <
1919 <        if (fFirst) f.complete(v1); else g.complete(v2);
1920 <        if (!createIncomplete)
1921 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1922 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1923 <        if (createIncomplete) {
1924 <            checkIncomplete(h);
1925 <            r.assertNotInvoked();
1926 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1927 <        }
1917 >        final Noop r1 = new Noop(m);
1918 >        final Noop r2 = new Noop(m);
1919 >        final Noop r3 = new Noop(m);
1920 >
1921 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1922 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1923 >        final Integer w1 =  fFirst ? v1 : v2;
1924 >        final Integer w2 = !fFirst ? v1 : v2;
1925 >
1926 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1927 >        assertTrue(fst.complete(w1));
1928 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1929 >        checkIncomplete(h1);
1930 >        checkIncomplete(h2);
1931 >        r1.assertNotInvoked();
1932 >        r2.assertNotInvoked();
1933 >        assertTrue(snd.complete(w2));
1934 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1935  
1936 <        checkCompletedNormally(h, null);
1937 <        r.assertInvoked();
1936 >        checkCompletedNormally(h1, null);
1937 >        checkCompletedNormally(h2, null);
1938 >        checkCompletedNormally(h3, null);
1939 >        r1.assertInvoked();
1940 >        r2.assertInvoked();
1941 >        r3.assertInvoked();
1942          checkCompletedNormally(f, v1);
1943          checkCompletedNormally(g, v2);
1944      }}
# Line 1640 | Line 1947 | public class CompletableFutureTest exten
1947       * runAfterBoth result completes exceptionally after exceptional
1948       * completion of either source
1949       */
1950 <    public void testRunAfterBoth_exceptionalCompletion() {
1950 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1951          for (ExecutionMode m : ExecutionMode.values())
1645        for (boolean createIncomplete : new boolean[] { true, false })
1952          for (boolean fFirst : new boolean[] { true, false })
1953 +        for (boolean failFirst : new boolean[] { true, false })
1954          for (Integer v1 : new Integer[] { 1, null })
1955      {
1956          final CompletableFuture<Integer> f = new CompletableFuture<>();
1957          final CompletableFuture<Integer> g = new CompletableFuture<>();
1958          final CFException ex = new CFException();
1959 <        final Noop r = new Noop(m);
1960 <
1961 <        (fFirst ? f : g).complete(v1);
1962 <        if (!createIncomplete)
1963 <            (!fFirst ? f : g).completeExceptionally(ex);
1964 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1965 <        if (createIncomplete) {
1966 <            checkIncomplete(h);
1967 <            (!fFirst ? f : g).completeExceptionally(ex);
1968 <        }
1959 >        final Noop r1 = new Noop(m);
1960 >        final Noop r2 = new Noop(m);
1961 >        final Noop r3 = new Noop(m);
1962 >
1963 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1964 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1965 >        final Callable<Boolean> complete1 = failFirst ?
1966 >            () -> fst.completeExceptionally(ex) :
1967 >            () -> fst.complete(v1);
1968 >        final Callable<Boolean> complete2 = failFirst ?
1969 >            () -> snd.complete(v1) :
1970 >            () -> snd.completeExceptionally(ex);
1971 >
1972 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1973 >        assertTrue(complete1.call());
1974 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1975 >        checkIncomplete(h1);
1976 >        checkIncomplete(h2);
1977 >        assertTrue(complete2.call());
1978 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1979  
1980 <        checkCompletedWithWrappedException(h, ex);
1981 <        r.assertNotInvoked();
1982 <        checkCompletedNormally(fFirst ? f : g, v1);
1983 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1980 >        checkCompletedWithWrappedException(h1, ex);
1981 >        checkCompletedWithWrappedException(h2, ex);
1982 >        checkCompletedWithWrappedException(h3, ex);
1983 >        r1.assertNotInvoked();
1984 >        r2.assertNotInvoked();
1985 >        r3.assertNotInvoked();
1986 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1987 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1988      }}
1989  
1990      /**
1991       * runAfterBoth result completes exceptionally if either source cancelled
1992       */
1993 <    public void testRunAfterBoth_sourceCancelled() {
1993 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1994          for (ExecutionMode m : ExecutionMode.values())
1995          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1675        for (boolean createIncomplete : new boolean[] { true, false })
1996          for (boolean fFirst : new boolean[] { true, false })
1997 +        for (boolean failFirst : new boolean[] { true, false })
1998          for (Integer v1 : new Integer[] { 1, null })
1999      {
2000          final CompletableFuture<Integer> f = new CompletableFuture<>();
2001          final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 <        final Noop r = new Noop(m);
2002 >        final Noop r1 = new Noop(m);
2003 >        final Noop r2 = new Noop(m);
2004 >        final Noop r3 = new Noop(m);
2005  
2006 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2007 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2008 +        final Callable<Boolean> complete1 = failFirst ?
2009 +            () -> fst.cancel(mayInterruptIfRunning) :
2010 +            () -> fst.complete(v1);
2011 +        final Callable<Boolean> complete2 = failFirst ?
2012 +            () -> snd.complete(v1) :
2013 +            () -> snd.cancel(mayInterruptIfRunning);
2014  
2015 <        (fFirst ? f : g).complete(v1);
2016 <        if (!createIncomplete)
2017 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2018 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2019 <        if (createIncomplete) {
2020 <            checkIncomplete(h);
2021 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1691 <        }
2015 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2016 >        assertTrue(complete1.call());
2017 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2018 >        checkIncomplete(h1);
2019 >        checkIncomplete(h2);
2020 >        assertTrue(complete2.call());
2021 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2022  
2023 <        checkCompletedWithWrappedCancellationException(h);
2024 <        checkCancelled(!fFirst ? f : g);
2025 <        r.assertNotInvoked();
2026 <        checkCompletedNormally(fFirst ? f : g, v1);
2023 >        checkCompletedWithWrappedCancellationException(h1);
2024 >        checkCompletedWithWrappedCancellationException(h2);
2025 >        checkCompletedWithWrappedCancellationException(h3);
2026 >        r1.assertNotInvoked();
2027 >        r2.assertNotInvoked();
2028 >        r3.assertNotInvoked();
2029 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2030 >        checkCancelled(failFirst ? fst : snd);
2031      }}
2032  
2033      /**
# Line 1709 | Line 2043 | public class CompletableFutureTest exten
2043          final CompletableFuture<Integer> g = new CompletableFuture<>();
2044          final FailingRunnable r1 = new FailingRunnable(m);
2045          final FailingRunnable r2 = new FailingRunnable(m);
2046 +        final FailingRunnable r3 = new FailingRunnable(m);
2047  
2048 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2049 <        if (fFirst) {
2050 <            f.complete(v1);
2051 <            g.complete(v2);
2052 <        } else {
2053 <            g.complete(v2);
2054 <            f.complete(v1);
2055 <        }
2056 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2048 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2049 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2050 >        final Integer w1 =  fFirst ? v1 : v2;
2051 >        final Integer w2 = !fFirst ? v1 : v2;
2052 >
2053 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2054 >        assertTrue(fst.complete(w1));
2055 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2056 >        assertTrue(snd.complete(w2));
2057 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2058  
2059          checkCompletedWithWrappedCFException(h1);
2060          checkCompletedWithWrappedCFException(h2);
2061 +        checkCompletedWithWrappedCFException(h3);
2062 +        r1.assertInvoked();
2063 +        r2.assertInvoked();
2064 +        r3.assertInvoked();
2065          checkCompletedNormally(f, v1);
2066          checkCompletedNormally(g, v2);
2067      }}
# Line 1844 | Line 2184 | public class CompletableFutureTest exten
2184  
2185          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2186          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2187 <        if (fFirst) {
2188 <            f.complete(v1);
1849 <            g.completeExceptionally(ex);
1850 <        } else {
1851 <            g.completeExceptionally(ex);
1852 <            f.complete(v1);
1853 <        }
2187 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2188 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2189          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2190          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2191  
# Line 1956 | Line 2291 | public class CompletableFutureTest exten
2291  
2292          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2293          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2294 <        if (fFirst) {
2295 <            f.complete(v1);
1961 <            g.cancel(mayInterruptIfRunning);
1962 <        } else {
1963 <            g.cancel(mayInterruptIfRunning);
1964 <            f.complete(v1);
1965 <        }
2294 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2295 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2296          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2297          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2298  
# Line 2164 | Line 2494 | public class CompletableFutureTest exten
2494  
2495          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2496          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2497 <        if (fFirst) {
2498 <            f.complete(v1);
2169 <            g.completeExceptionally(ex);
2170 <        } else {
2171 <            g.completeExceptionally(ex);
2172 <            f.complete(v1);
2173 <        }
2497 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2498 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2499          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2500          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2501  
# Line 2373 | Line 2698 | public class CompletableFutureTest exten
2698          checkIncomplete(h1);
2699          rs[0].assertNotInvoked();
2700          rs[1].assertNotInvoked();
2701 <        f.completeExceptionally(ex);
2701 >        assertTrue(f.completeExceptionally(ex));
2702          checkCompletedWithWrappedException(h0, ex);
2703          checkCompletedWithWrappedException(h1, ex);
2704          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
# Line 2381 | Line 2706 | public class CompletableFutureTest exten
2706          checkCompletedWithWrappedException(h2, ex);
2707          checkCompletedWithWrappedException(h3, ex);
2708  
2709 <        g.complete(v1);
2709 >        assertTrue(g.complete(v1));
2710  
2711          // unspecified behavior - both source completions available
2712          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2424 | Line 2749 | public class CompletableFutureTest exten
2749  
2750          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2751          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2752 <        if (fFirst) {
2753 <            f.complete(v1);
2429 <            g.completeExceptionally(ex);
2430 <        } else {
2431 <            g.completeExceptionally(ex);
2432 <            f.complete(v1);
2433 <        }
2752 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2753 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2754          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2755          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2756  
# Line 2495 | Line 2815 | public class CompletableFutureTest exten
2815          checkCompletedWithWrappedCancellationException(h2);
2816          checkCompletedWithWrappedCancellationException(h3);
2817  
2818 <        g.complete(v1);
2818 >        assertTrue(g.complete(v1));
2819  
2820          // unspecified behavior - both source completions available
2821          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2539 | Line 2859 | public class CompletableFutureTest exten
2859  
2860          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2861          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2862 <        f.complete(v1);
2862 >        assertTrue(f.complete(v1));
2863          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2864          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2865          checkCompletedWithWrappedCFException(h0);
# Line 2547 | Line 2867 | public class CompletableFutureTest exten
2867          checkCompletedWithWrappedCFException(h2);
2868          checkCompletedWithWrappedCFException(h3);
2869          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2870 <        g.complete(v2);
2870 >        assertTrue(g.complete(v2));
2871          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2872          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2873          checkCompletedWithWrappedCFException(h4);
# Line 2568 | Line 2888 | public class CompletableFutureTest exten
2888      {
2889          final CompletableFuture<Integer> f = new CompletableFuture<>();
2890          final CompletableFutureInc r = new CompletableFutureInc(m);
2891 <        if (!createIncomplete) f.complete(v1);
2891 >        if (!createIncomplete) assertTrue(f.complete(v1));
2892          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2893 <        if (createIncomplete) f.complete(v1);
2893 >        if (createIncomplete) assertTrue(f.complete(v1));
2894  
2895          checkCompletedNormally(g, inc(v1));
2896          checkCompletedNormally(f, v1);
# Line 2608 | Line 2928 | public class CompletableFutureTest exten
2928          final CompletableFuture<Integer> f = new CompletableFuture<>();
2929          final FailingCompletableFutureFunction r
2930              = new FailingCompletableFutureFunction(m);
2931 <        if (!createIncomplete) f.complete(v1);
2931 >        if (!createIncomplete) assertTrue(f.complete(v1));
2932          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2933 <        if (createIncomplete) f.complete(v1);
2933 >        if (createIncomplete) assertTrue(f.complete(v1));
2934  
2935          checkCompletedWithWrappedCFException(g);
2936          checkCompletedNormally(f, v1);
# Line 2653 | Line 2973 | public class CompletableFutureTest exten
2973       * when all components complete normally
2974       */
2975      public void testAllOf_normal() throws Exception {
2976 <        for (int k = 1; k < 20; ++k) {
2976 >        for (int k = 1; k < 10; k++) {
2977              CompletableFuture<Integer>[] fs
2978                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2979 <            for (int i = 0; i < k; ++i)
2979 >            for (int i = 0; i < k; i++)
2980                  fs[i] = new CompletableFuture<>();
2981              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2982 <            for (int i = 0; i < k; ++i) {
2982 >            for (int i = 0; i < k; i++) {
2983                  checkIncomplete(f);
2984                  checkIncomplete(CompletableFuture.allOf(fs));
2985                  fs[i].complete(one);
# Line 2670 | Line 2990 | public class CompletableFutureTest exten
2990      }
2991  
2992      public void testAllOf_backwards() throws Exception {
2993 <        for (int k = 1; k < 20; ++k) {
2993 >        for (int k = 1; k < 10; k++) {
2994              CompletableFuture<Integer>[] fs
2995                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2996 <            for (int i = 0; i < k; ++i)
2996 >            for (int i = 0; i < k; i++)
2997                  fs[i] = new CompletableFuture<>();
2998              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2999              for (int i = k - 1; i >= 0; i--) {
# Line 2686 | Line 3006 | public class CompletableFutureTest exten
3006          }
3007      }
3008  
3009 +    public void testAllOf_exceptional() throws Exception {
3010 +        for (int k = 1; k < 10; k++) {
3011 +            CompletableFuture<Integer>[] fs
3012 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3013 +            CFException ex = new CFException();
3014 +            for (int i = 0; i < k; i++)
3015 +                fs[i] = new CompletableFuture<>();
3016 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3017 +            for (int i = 0; i < k; i++) {
3018 +                checkIncomplete(f);
3019 +                checkIncomplete(CompletableFuture.allOf(fs));
3020 +                if (i != k/2) {
3021 +                    fs[i].complete(i);
3022 +                    checkCompletedNormally(fs[i], i);
3023 +                } else {
3024 +                    fs[i].completeExceptionally(ex);
3025 +                    checkCompletedExceptionally(fs[i], ex);
3026 +                }
3027 +            }
3028 +            checkCompletedWithWrappedException(f, ex);
3029 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3030 +        }
3031 +    }
3032 +
3033      /**
3034       * anyOf(no component futures) returns an incomplete future
3035       */
3036      public void testAnyOf_empty() throws Exception {
3037 +        for (Integer v1 : new Integer[] { 1, null })
3038 +    {
3039          CompletableFuture<Object> f = CompletableFuture.anyOf();
3040          checkIncomplete(f);
3041 <    }
3041 >
3042 >        f.complete(v1);
3043 >        checkCompletedNormally(f, v1);
3044 >    }}
3045  
3046      /**
3047       * anyOf returns a future completed normally with a value when
3048       * a component future does
3049       */
3050      public void testAnyOf_normal() throws Exception {
3051 <        for (int k = 0; k < 10; ++k) {
3051 >        for (int k = 0; k < 10; k++) {
3052              CompletableFuture[] fs = new CompletableFuture[k];
3053 <            for (int i = 0; i < k; ++i)
3053 >            for (int i = 0; i < k; i++)
3054                  fs[i] = new CompletableFuture<>();
3055              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3056              checkIncomplete(f);
3057 <            for (int i = 0; i < k; ++i) {
3058 <                fs[i].complete(one);
3059 <                checkCompletedNormally(f, one);
3060 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3057 >            for (int i = 0; i < k; i++) {
3058 >                fs[i].complete(i);
3059 >                checkCompletedNormally(f, 0);
3060 >                int x = (int) CompletableFuture.anyOf(fs).join();
3061 >                assertTrue(0 <= x && x <= i);
3062 >            }
3063 >        }
3064 >    }
3065 >    public void testAnyOf_normal_backwards() throws Exception {
3066 >        for (int k = 0; k < 10; k++) {
3067 >            CompletableFuture[] fs = new CompletableFuture[k];
3068 >            for (int i = 0; i < k; i++)
3069 >                fs[i] = new CompletableFuture<>();
3070 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3071 >            checkIncomplete(f);
3072 >            for (int i = k - 1; i >= 0; i--) {
3073 >                fs[i].complete(i);
3074 >                checkCompletedNormally(f, k - 1);
3075 >                int x = (int) CompletableFuture.anyOf(fs).join();
3076 >                assertTrue(i <= x && x <= k - 1);
3077              }
3078          }
3079      }
# Line 2717 | Line 3082 | public class CompletableFutureTest exten
3082       * anyOf result completes exceptionally when any component does.
3083       */
3084      public void testAnyOf_exceptional() throws Exception {
3085 <        for (int k = 0; k < 10; ++k) {
3085 >        for (int k = 0; k < 10; k++) {
3086              CompletableFuture[] fs = new CompletableFuture[k];
3087 <            for (int i = 0; i < k; ++i)
3087 >            CFException[] exs = new CFException[k];
3088 >            for (int i = 0; i < k; i++) {
3089                  fs[i] = new CompletableFuture<>();
3090 +                exs[i] = new CFException();
3091 +            }
3092              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3093              checkIncomplete(f);
3094 <            for (int i = 0; i < k; ++i) {
3095 <                fs[i].completeExceptionally(new CFException());
3096 <                checkCompletedWithWrappedCFException(f);
3094 >            for (int i = 0; i < k; i++) {
3095 >                fs[i].completeExceptionally(exs[i]);
3096 >                checkCompletedWithWrappedException(f, exs[0]);
3097 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3098 >            }
3099 >        }
3100 >    }
3101 >
3102 >    public void testAnyOf_exceptional_backwards() throws Exception {
3103 >        for (int k = 0; k < 10; k++) {
3104 >            CompletableFuture[] fs = new CompletableFuture[k];
3105 >            CFException[] exs = new CFException[k];
3106 >            for (int i = 0; i < k; i++) {
3107 >                fs[i] = new CompletableFuture<>();
3108 >                exs[i] = new CFException();
3109 >            }
3110 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3111 >            checkIncomplete(f);
3112 >            for (int i = k - 1; i >= 0; i--) {
3113 >                fs[i].completeExceptionally(exs[i]);
3114 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3115                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3116              }
3117          }
# Line 2849 | Line 3235 | public class CompletableFutureTest exten
3235          assertSame(f, f.toCompletableFuture());
3236      }
3237  
3238 <    /**
2853 <     * whenComplete action executes on normal completion, propagating
2854 <     * source result.
2855 <     */
2856 <    public void testWhenComplete_normalCompletion1() {
2857 <        for (ExecutionMode m : ExecutionMode.values())
2858 <        for (boolean createIncomplete : new boolean[] { true, false })
2859 <        for (Integer v1 : new Integer[] { 1, null })
2860 <    {
2861 <        final AtomicInteger a = new AtomicInteger(0);
2862 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2863 <        if (!createIncomplete) f.complete(v1);
2864 <        final CompletableFuture<Integer> g = m.whenComplete
2865 <            (f,
2866 <             (Integer x, Throwable t) -> {
2867 <                m.checkExecutionMode();
2868 <                threadAssertSame(x, v1);
2869 <                threadAssertNull(t);
2870 <                a.getAndIncrement();
2871 <            });
2872 <        if (createIncomplete) f.complete(v1);
3238 >    //--- tests of implementation details; not part of official tck ---
3239  
3240 <        checkCompletedNormally(g, v1);
3241 <        checkCompletedNormally(f, v1);
3242 <        assertEquals(1, a.get());
3243 <    }}
3240 >    Object resultOf(CompletableFuture<?> f) {
3241 >        try {
3242 >            java.lang.reflect.Field resultField
3243 >                = CompletableFuture.class.getDeclaredField("result");
3244 >            resultField.setAccessible(true);
3245 >            return resultField.get(f);
3246 >        } catch (Throwable t) { throw new AssertionError(t); }
3247 >    }
3248  
3249 <    /**
3250 <     * whenComplete action executes on exceptional completion, propagating
2881 <     * source result.
2882 <     */
2883 <    public void testWhenComplete_exceptionalCompletion() {
3249 >    public void testExceptionPropagationReusesResultObject() {
3250 >        if (!testImplementationDetails) return;
3251          for (ExecutionMode m : ExecutionMode.values())
2885        for (boolean createIncomplete : new boolean[] { true, false })
2886        for (Integer v1 : new Integer[] { 1, null })
3252      {
2888        final AtomicInteger a = new AtomicInteger(0);
3253          final CFException ex = new CFException();
3254 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3255 <        if (!createIncomplete) f.completeExceptionally(ex);
2892 <        final CompletableFuture<Integer> g = m.whenComplete
2893 <            (f,
2894 <             (Integer x, Throwable t) -> {
2895 <                m.checkExecutionMode();
2896 <                threadAssertNull(x);
2897 <                threadAssertSame(t, ex);
2898 <                a.getAndIncrement();
2899 <            });
2900 <        if (createIncomplete) f.completeExceptionally(ex);
2901 <        checkCompletedExceptionally(f, ex);
2902 <        checkCompletedWithWrappedException(g, ex);
2903 <        assertEquals(1, a.get());
2904 <    }}
3254 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3255 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3256  
3257 <    /**
3258 <     * whenComplete action executes on cancelled source, propagating
2908 <     * CancellationException.
2909 <     */
2910 <    public void testWhenComplete_sourceCancelled() {
2911 <        for (ExecutionMode m : ExecutionMode.values())
2912 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2913 <        for (boolean createIncomplete : new boolean[] { true, false })
2914 <    {
2915 <        final AtomicInteger a = new AtomicInteger(0);
2916 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2917 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2918 <        final CompletableFuture<Integer> g = m.whenComplete
2919 <            (f,
2920 <             (Integer x, Throwable t) -> {
2921 <                m.checkExecutionMode();
2922 <                threadAssertNull(x);
2923 <                threadAssertTrue(t instanceof CancellationException);
2924 <                a.getAndIncrement();
2925 <            });
2926 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3257 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3258 >            = new ArrayList<>();
3259  
3260 <        checkCompletedWithWrappedCancellationException(g);
3261 <        checkCancelled(f);
3262 <        assertEquals(1, a.get());
2931 <    }}
3260 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3261 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3262 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3263  
3264 <    /**
3265 <     * If a whenComplete action throws an exception when triggered by
3266 <     * a normal completion, it completes exceptionally
2936 <     */
2937 <    public void testWhenComplete_actionFailed() {
2938 <        for (boolean createIncomplete : new boolean[] { true, false })
2939 <        for (ExecutionMode m : ExecutionMode.values())
2940 <        for (Integer v1 : new Integer[] { 1, null })
2941 <    {
2942 <        final AtomicInteger a = new AtomicInteger(0);
2943 <        final CFException ex = new CFException();
2944 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2945 <        if (!createIncomplete) f.complete(v1);
2946 <        final CompletableFuture<Integer> g = m.whenComplete
2947 <            (f,
2948 <             (Integer x, Throwable t) -> {
2949 <                m.checkExecutionMode();
2950 <                threadAssertSame(x, v1);
2951 <                threadAssertNull(t);
2952 <                a.getAndIncrement();
2953 <                throw ex;
2954 <            });
2955 <        if (createIncomplete) f.complete(v1);
2956 <        checkCompletedNormally(f, v1);
2957 <        checkCompletedWithWrappedException(g, ex);
2958 <        assertEquals(1, a.get());
2959 <    }}
3264 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3265 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3266 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3267  
3268 <    /**
3269 <     * If a whenComplete action throws an exception when triggered by
3270 <     * a source completion that also throws an exception, the source
2964 <     * exception takes precedence.
2965 <     */
2966 <    public void testWhenComplete_actionFailedSourceFailed() {
2967 <        for (boolean createIncomplete : new boolean[] { true, false })
2968 <        for (ExecutionMode m : ExecutionMode.values())
2969 <        for (Integer v1 : new Integer[] { 1, null })
2970 <    {
2971 <        final AtomicInteger a = new AtomicInteger(0);
2972 <        final CFException ex1 = new CFException();
2973 <        final CFException ex2 = new CFException();
2974 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3268 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3269 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3270 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3271  
3272 <        if (!createIncomplete) f.completeExceptionally(ex1);
2977 <        final CompletableFuture<Integer> g = m.whenComplete
2978 <            (f,
2979 <             (Integer x, Throwable t) -> {
2980 <                m.checkExecutionMode();
2981 <                threadAssertSame(t, ex1);
2982 <                threadAssertNull(x);
2983 <                a.getAndIncrement();
2984 <                throw ex2;
2985 <            });
2986 <        if (createIncomplete) f.completeExceptionally(ex1);
3272 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3273  
3274 <        checkCompletedExceptionally(f, ex1);
3275 <        checkCompletedWithWrappedException(g, ex1);
3276 <        assertEquals(1, a.get());
3274 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3275 >
3276 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3277 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3278 >
3279 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3280 >                 fun : funs) {
3281 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3282 >            f.completeExceptionally(ex);
3283 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3284 >            checkCompletedWithWrappedException(src, ex);
3285 >            CompletableFuture<?> dep = fun.apply(src);
3286 >            checkCompletedWithWrappedException(dep, ex);
3287 >            assertSame(resultOf(src), resultOf(dep));
3288 >        }
3289 >
3290 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3291 >                 fun : funs) {
3292 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3293 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3294 >            CompletableFuture<?> dep = fun.apply(src);
3295 >            f.completeExceptionally(ex);
3296 >            checkCompletedWithWrappedException(src, ex);
3297 >            checkCompletedWithWrappedException(dep, ex);
3298 >            assertSame(resultOf(src), resultOf(dep));
3299 >        }
3300 >
3301 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3302 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3303 >                 fun : funs) {
3304 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3305 >            f.cancel(mayInterruptIfRunning);
3306 >            checkCancelled(f);
3307 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3308 >            checkCompletedWithWrappedCancellationException(src);
3309 >            CompletableFuture<?> dep = fun.apply(src);
3310 >            checkCompletedWithWrappedCancellationException(dep);
3311 >            assertSame(resultOf(src), resultOf(dep));
3312 >        }
3313 >
3314 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3315 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3316 >                 fun : funs) {
3317 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3318 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3319 >            CompletableFuture<?> dep = fun.apply(src);
3320 >            f.cancel(mayInterruptIfRunning);
3321 >            checkCancelled(f);
3322 >            checkCompletedWithWrappedCancellationException(src);
3323 >            checkCompletedWithWrappedCancellationException(dep);
3324 >            assertSame(resultOf(src), resultOf(dep));
3325 >        }
3326      }}
3327  
3328   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines