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.70 by jsr166, Fri Jun 6 19:48:38 2014 UTC vs.
Revision 1.86 by jsr166, Mon Jun 16 21:04:23 2014 UTC

# Line 105 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
108 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 >                                                      Throwable ex) {
110          try {
111              f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
# Line 131 | Line 131 | public class CompletableFutureTest exten
131          } catch (ExecutionException success) {
132              assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 206 | 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 218 | Line 242 | public class CompletableFutureTest exten
242       */
243      public void testCompleteExceptionally() {
244          CompletableFuture<Integer> f = new CompletableFuture<>();
245 +        CFException ex = new CFException();
246          checkIncomplete(f);
247 <        f.completeExceptionally(new CFException());
248 <        checkCompletedWithWrappedCFException(f);
247 >        f.completeExceptionally(ex);
248 >        checkCompletedExceptionally(f, ex);
249      }
250  
251      /**
# Line 228 | 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 240 | 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 261 | Line 289 | public class CompletableFutureTest exten
289       * obtrudeException forces completion with given exception
290       */
291      public void testObtrudeException() {
292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
293 <        checkIncomplete(f);
294 <        f.complete(one);
295 <        checkCompletedNormally(f, one);
296 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
292 >        for (Integer v1 : new Integer[] { 1, null })
293 >    {
294 >        CFException ex;
295 >        CompletableFuture<Integer> f;
296 >
297          f = new CompletableFuture<>();
298 <        f.obtrudeException(new CFException());
299 <        checkCompletedWithWrappedCFException(f);
298 >        assertTrue(f.complete(v1));
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304 >        f = new CompletableFuture<>();
305 >        for (int i = 0; i < 2; i++) {
306 >            f.obtrudeException(ex = new CFException());
307 >            checkCompletedExceptionally(f, ex);
308 >        }
309 >
310          f = new CompletableFuture<>();
311 +        f.completeExceptionally(ex = new CFException());
312 +        f.obtrudeValue(v1);
313 +        checkCompletedNormally(f, v1);
314 +        f.obtrudeException(ex = new CFException());
315 +        checkCompletedExceptionally(f, ex);
316          f.completeExceptionally(new CFException());
317 <        f.obtrudeValue(four);
318 <        checkCompletedNormally(f, four);
319 <        f.obtrudeException(new CFException());
320 <        checkCompletedWithWrappedCFException(f);
279 <    }
317 >        checkCompletedExceptionally(f, ex);
318 >        assertFalse(f.complete(v1));
319 >        checkCompletedExceptionally(f, ex);
320 >    }}
321  
322      /**
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 304 | 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 +        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 486 | 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 794 | 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  
811
864      /**
865       * exceptionally action completes with function value on source
866       * exception
# Line 852 | Line 904 | public class CompletableFutureTest exten
904              });
905          if (createIncomplete) f.completeExceptionally(ex1);
906  
907 <        checkCompletedWithWrappedCFException(g, ex2);
907 >        checkCompletedWithWrappedException(g, ex2);
908 >        assertEquals(1, a.get());
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  
# Line 867 | 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 877 | 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 909 | Line 1104 | public class CompletableFutureTest exten
1104          if (createIncomplete) f.completeExceptionally(ex);
1105  
1106          checkCompletedNormally(g, v1);
1107 <        checkCompletedWithWrappedCFException(f, ex);
1107 >        checkCompletedExceptionally(f, ex);
1108          assertEquals(1, a.get());
1109      }}
1110  
# Line 965 | Line 1160 | public class CompletableFutureTest exten
1160              });
1161          if (createIncomplete) f.completeExceptionally(ex1);
1162  
1163 <        checkCompletedWithWrappedCFException(g, ex2);
1164 <        checkCompletedWithWrappedCFException(f, ex1);
1163 >        checkCompletedWithWrappedException(g, ex2);
1164 >        checkCompletedExceptionally(f, ex1);
1165          assertEquals(1, a.get());
1166      }}
1167  
# Line 978 | 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 988 | 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 <        checkCompletedWithWrappedCFException(g, ex);
1188 >        checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
1190          assertEquals(1, a.get());
1191      }}
# Line 1074 | Line 1269 | public class CompletableFutureTest exten
1269      {
1270          final CompletableFuture<Integer> f = new CompletableFuture<>();
1271          final Noop r = new Noop(m);
1272 <        if (!createIncomplete) f.complete(v1);
1272 >        if (!createIncomplete) assertTrue(f.complete(v1));
1273          final CompletableFuture<Void> g = m.thenRun(f, r);
1274          if (createIncomplete) {
1275              checkIncomplete(g);
1276 <            f.complete(v1);
1276 >            assertTrue(f.complete(v1));
1277          }
1278  
1279          checkCompletedNormally(g, null);
# Line 1104 | Line 1299 | public class CompletableFutureTest exten
1299              f.completeExceptionally(ex);
1300          }
1301  
1302 <        checkCompletedWithWrappedCFException(g, ex);
1303 <        checkCompletedWithWrappedCFException(f, ex);
1302 >        checkCompletedWithWrappedException(g, ex);
1303 >        checkCompletedExceptionally(f, ex);
1304          r.assertNotInvoked();
1305      }}
1306  
# Line 1141 | Line 1336 | public class CompletableFutureTest exten
1336      {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338          final FailingRunnable r = new FailingRunnable(m);
1339 <        if (!createIncomplete) f.complete(v1);
1339 >        if (!createIncomplete) assertTrue(f.complete(v1));
1340          final CompletableFuture<Void> g = m.thenRun(f, r);
1341          if (createIncomplete) {
1342              checkIncomplete(g);
1343 <            f.complete(v1);
1343 >            assertTrue(f.complete(v1));
1344          }
1345  
1346          checkCompletedWithWrappedCFException(g);
# Line 1162 | Line 1357 | public class CompletableFutureTest exten
1357      {
1358          final CompletableFuture<Integer> f = new CompletableFuture<>();
1359          final IncFunction r = new IncFunction(m);
1360 <        if (!createIncomplete) f.complete(v1);
1360 >        if (!createIncomplete) assertTrue(f.complete(v1));
1361          final CompletableFuture<Integer> g = m.thenApply(f, r);
1362          if (createIncomplete) {
1363              checkIncomplete(g);
1364 <            f.complete(v1);
1364 >            assertTrue(f.complete(v1));
1365          }
1366  
1367          checkCompletedNormally(g, inc(v1));
# Line 1192 | Line 1387 | public class CompletableFutureTest exten
1387              f.completeExceptionally(ex);
1388          }
1389  
1390 <        checkCompletedWithWrappedCFException(g, ex);
1391 <        checkCompletedWithWrappedCFException(f, ex);
1390 >        checkCompletedWithWrappedException(g, ex);
1391 >        checkCompletedExceptionally(f, ex);
1392          r.assertNotInvoked();
1393      }}
1394  
# Line 1229 | Line 1424 | public class CompletableFutureTest exten
1424      {
1425          final CompletableFuture<Integer> f = new CompletableFuture<>();
1426          final FailingFunction r = new FailingFunction(m);
1427 <        if (!createIncomplete) f.complete(v1);
1427 >        if (!createIncomplete) assertTrue(f.complete(v1));
1428          final CompletableFuture<Integer> g = m.thenApply(f, r);
1429          if (createIncomplete) {
1430              checkIncomplete(g);
1431 <            f.complete(v1);
1431 >            assertTrue(f.complete(v1));
1432          }
1433  
1434          checkCompletedWithWrappedCFException(g);
# Line 1250 | Line 1445 | public class CompletableFutureTest exten
1445      {
1446          final CompletableFuture<Integer> f = new CompletableFuture<>();
1447          final NoopConsumer r = new NoopConsumer(m);
1448 <        if (!createIncomplete) f.complete(v1);
1448 >        if (!createIncomplete) assertTrue(f.complete(v1));
1449          final CompletableFuture<Void> g = m.thenAccept(f, r);
1450          if (createIncomplete) {
1451              checkIncomplete(g);
1452 <            f.complete(v1);
1452 >            assertTrue(f.complete(v1));
1453          }
1454  
1455          checkCompletedNormally(g, null);
# Line 1280 | Line 1475 | public class CompletableFutureTest exten
1475              f.completeExceptionally(ex);
1476          }
1477  
1478 <        checkCompletedWithWrappedCFException(g, ex);
1479 <        checkCompletedWithWrappedCFException(f, ex);
1478 >        checkCompletedWithWrappedException(g, ex);
1479 >        checkCompletedExceptionally(f, ex);
1480          r.assertNotInvoked();
1481      }}
1482  
# Line 1334 | Line 1529 | public class CompletableFutureTest exten
1529       */
1530      public void testThenCombine_normalCompletion() {
1531          for (ExecutionMode m : ExecutionMode.values())
1337        for (boolean createIncomplete : new boolean[] { true, false })
1532          for (boolean fFirst : new boolean[] { true, false })
1533          for (Integer v1 : new Integer[] { 1, null })
1534          for (Integer v2 : new Integer[] { 2, null })
1535      {
1536          final CompletableFuture<Integer> f = new CompletableFuture<>();
1537          final CompletableFuture<Integer> g = new CompletableFuture<>();
1538 <        final SubtractFunction r = new SubtractFunction(m);
1539 <
1540 <        if (fFirst) f.complete(v1); else g.complete(v2);
1541 <        if (!createIncomplete)
1542 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1543 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1544 <        if (createIncomplete) {
1545 <            checkIncomplete(h);
1546 <            r.assertNotInvoked();
1547 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1548 <        }
1549 <
1550 <        checkCompletedNormally(h, subtract(v1, v2));
1538 >        final SubtractFunction r1 = new SubtractFunction(m);
1539 >        final SubtractFunction r2 = new SubtractFunction(m);
1540 >        final SubtractFunction r3 = new SubtractFunction(m);
1541 >
1542 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1543 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1544 >        final Integer w1 =  fFirst ? v1 : v2;
1545 >        final Integer w2 = !fFirst ? v1 : v2;
1546 >
1547 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1548 >        assertTrue(fst.complete(w1));
1549 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1550 >        checkIncomplete(h1);
1551 >        checkIncomplete(h2);
1552 >        r1.assertNotInvoked();
1553 >        r2.assertNotInvoked();
1554 >        assertTrue(snd.complete(w2));
1555 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1556 >
1557 >        checkCompletedNormally(h1, subtract(v1, v2));
1558 >        checkCompletedNormally(h2, subtract(v1, v2));
1559 >        checkCompletedNormally(h3, subtract(v1, v2));
1560 >        r1.assertValue(subtract(v1, v2));
1561 >        r2.assertValue(subtract(v1, v2));
1562 >        r3.assertValue(subtract(v1, v2));
1563          checkCompletedNormally(f, v1);
1564          checkCompletedNormally(g, v2);
1359        r.assertValue(subtract(v1, v2));
1565      }}
1566  
1567      /**
1568       * thenCombine result completes exceptionally after exceptional
1569       * completion of either source
1570       */
1571 <    public void testThenCombine_exceptionalCompletion() {
1571 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1572          for (ExecutionMode m : ExecutionMode.values())
1368        for (boolean createIncomplete : new boolean[] { true, false })
1573          for (boolean fFirst : new boolean[] { true, false })
1574 +        for (boolean failFirst : new boolean[] { true, false })
1575          for (Integer v1 : new Integer[] { 1, null })
1576      {
1577          final CompletableFuture<Integer> f = new CompletableFuture<>();
1578          final CompletableFuture<Integer> g = new CompletableFuture<>();
1579          final CFException ex = new CFException();
1580 <        final SubtractFunction r = new SubtractFunction(m);
1581 <
1582 <        (fFirst ? f : g).complete(v1);
1583 <        if (!createIncomplete)
1584 <            (!fFirst ? f : g).completeExceptionally(ex);
1585 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1586 <        if (createIncomplete) {
1587 <            checkIncomplete(h);
1588 <            (!fFirst ? f : g).completeExceptionally(ex);
1589 <        }
1590 <
1591 <        checkCompletedWithWrappedCFException(h, ex);
1592 <        r.assertNotInvoked();
1593 <        checkCompletedNormally(fFirst ? f : g, v1);
1594 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1580 >        final SubtractFunction r1 = new SubtractFunction(m);
1581 >        final SubtractFunction r2 = new SubtractFunction(m);
1582 >        final SubtractFunction r3 = new SubtractFunction(m);
1583 >
1584 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1585 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1586 >        final Callable<Boolean> complete1 = failFirst ?
1587 >            () -> fst.completeExceptionally(ex) :
1588 >            () -> fst.complete(v1);
1589 >        final Callable<Boolean> complete2 = failFirst ?
1590 >            () -> snd.complete(v1) :
1591 >            () -> snd.completeExceptionally(ex);
1592 >
1593 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1594 >        assertTrue(complete1.call());
1595 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1596 >        checkIncomplete(h1);
1597 >        checkIncomplete(h2);
1598 >        assertTrue(complete2.call());
1599 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1600 >
1601 >        checkCompletedWithWrappedException(h1, ex);
1602 >        checkCompletedWithWrappedException(h2, ex);
1603 >        checkCompletedWithWrappedException(h3, ex);
1604 >        r1.assertNotInvoked();
1605 >        r2.assertNotInvoked();
1606 >        r3.assertNotInvoked();
1607 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1608 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1609      }}
1610  
1611      /**
1612       * thenCombine result completes exceptionally if either source cancelled
1613       */
1614 <    public void testThenCombine_sourceCancelled() {
1614 >    public void testThenCombine_sourceCancelled() throws Throwable {
1615          for (ExecutionMode m : ExecutionMode.values())
1616          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398        for (boolean createIncomplete : new boolean[] { true, false })
1617          for (boolean fFirst : new boolean[] { true, false })
1618 +        for (boolean failFirst : new boolean[] { true, false })
1619          for (Integer v1 : new Integer[] { 1, null })
1620      {
1621          final CompletableFuture<Integer> f = new CompletableFuture<>();
1622          final CompletableFuture<Integer> g = new CompletableFuture<>();
1623 <        final SubtractFunction r = new SubtractFunction(m);
1623 >        final SubtractFunction r1 = new SubtractFunction(m);
1624 >        final SubtractFunction r2 = new SubtractFunction(m);
1625 >        final SubtractFunction r3 = new SubtractFunction(m);
1626  
1627 <        (fFirst ? f : g).complete(v1);
1628 <        if (!createIncomplete)
1629 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1630 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1631 <        if (createIncomplete) {
1632 <            checkIncomplete(h);
1633 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1634 <        }
1627 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1628 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1629 >        final Callable<Boolean> complete1 = failFirst ?
1630 >            () -> fst.cancel(mayInterruptIfRunning) :
1631 >            () -> fst.complete(v1);
1632 >        final Callable<Boolean> complete2 = failFirst ?
1633 >            () -> snd.complete(v1) :
1634 >            () -> snd.cancel(mayInterruptIfRunning);
1635  
1636 <        checkCompletedWithWrappedCancellationException(h);
1637 <        checkCancelled(!fFirst ? f : g);
1638 <        r.assertNotInvoked();
1639 <        checkCompletedNormally(fFirst ? f : g, v1);
1636 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1637 >        assertTrue(complete1.call());
1638 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1639 >        checkIncomplete(h1);
1640 >        checkIncomplete(h2);
1641 >        assertTrue(complete2.call());
1642 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1643 >
1644 >        checkCompletedWithWrappedCancellationException(h1);
1645 >        checkCompletedWithWrappedCancellationException(h2);
1646 >        checkCompletedWithWrappedCancellationException(h3);
1647 >        r1.assertNotInvoked();
1648 >        r2.assertNotInvoked();
1649 >        r3.assertNotInvoked();
1650 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1651 >        checkCancelled(failFirst ? fst : snd);
1652      }}
1653  
1654      /**
# Line 1429 | Line 1662 | public class CompletableFutureTest exten
1662      {
1663          final CompletableFuture<Integer> f = new CompletableFuture<>();
1664          final CompletableFuture<Integer> g = new CompletableFuture<>();
1665 <        final FailingBiFunction r = new FailingBiFunction(m);
1666 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1667 <
1668 <        if (fFirst) {
1669 <            f.complete(v1);
1670 <            g.complete(v2);
1671 <        } else {
1672 <            g.complete(v2);
1673 <            f.complete(v1);
1674 <        }
1665 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1666 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1667 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1668 >
1669 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1670 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1671 >        final Integer w1 =  fFirst ? v1 : v2;
1672 >        final Integer w2 = !fFirst ? v1 : v2;
1673 >
1674 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1675 >        assertTrue(fst.complete(w1));
1676 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1677 >        assertTrue(snd.complete(w2));
1678 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1679  
1680 <        checkCompletedWithWrappedCFException(h);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedWithWrappedCFException(h3);
1683 >        r1.assertInvoked();
1684 >        r2.assertInvoked();
1685 >        r3.assertInvoked();
1686          checkCompletedNormally(f, v1);
1687          checkCompletedNormally(g, v2);
1688      }}
# Line 1451 | Line 1693 | public class CompletableFutureTest exten
1693       */
1694      public void testThenAcceptBoth_normalCompletion() {
1695          for (ExecutionMode m : ExecutionMode.values())
1454        for (boolean createIncomplete : new boolean[] { true, false })
1696          for (boolean fFirst : new boolean[] { true, false })
1697          for (Integer v1 : new Integer[] { 1, null })
1698          for (Integer v2 : new Integer[] { 2, null })
1699      {
1700          final CompletableFuture<Integer> f = new CompletableFuture<>();
1701          final CompletableFuture<Integer> g = new CompletableFuture<>();
1702 <        final SubtractAction r = new SubtractAction(m);
1703 <
1704 <        if (fFirst) f.complete(v1); else g.complete(v2);
1705 <        if (!createIncomplete)
1706 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1707 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1708 <        if (createIncomplete) {
1709 <            checkIncomplete(h);
1710 <            r.assertNotInvoked();
1711 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1712 <        }
1702 >        final SubtractAction r1 = new SubtractAction(m);
1703 >        final SubtractAction r2 = new SubtractAction(m);
1704 >        final SubtractAction r3 = new SubtractAction(m);
1705 >
1706 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1707 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1708 >        final Integer w1 =  fFirst ? v1 : v2;
1709 >        final Integer w2 = !fFirst ? v1 : v2;
1710 >
1711 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1712 >        assertTrue(fst.complete(w1));
1713 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1714 >        checkIncomplete(h1);
1715 >        checkIncomplete(h2);
1716 >        r1.assertNotInvoked();
1717 >        r2.assertNotInvoked();
1718 >        assertTrue(snd.complete(w2));
1719 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1720  
1721 <        checkCompletedNormally(h, null);
1722 <        r.assertValue(subtract(v1, v2));
1721 >        checkCompletedNormally(h1, null);
1722 >        checkCompletedNormally(h2, null);
1723 >        checkCompletedNormally(h3, null);
1724 >        r1.assertValue(subtract(v1, v2));
1725 >        r2.assertValue(subtract(v1, v2));
1726 >        r3.assertValue(subtract(v1, v2));
1727          checkCompletedNormally(f, v1);
1728          checkCompletedNormally(g, v2);
1729      }}
# Line 1480 | Line 1732 | public class CompletableFutureTest exten
1732       * thenAcceptBoth result completes exceptionally after exceptional
1733       * completion of either source
1734       */
1735 <    public void testThenAcceptBoth_exceptionalCompletion() {
1735 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1736          for (ExecutionMode m : ExecutionMode.values())
1485        for (boolean createIncomplete : new boolean[] { true, false })
1737          for (boolean fFirst : new boolean[] { true, false })
1738 +        for (boolean failFirst : new boolean[] { true, false })
1739          for (Integer v1 : new Integer[] { 1, null })
1740      {
1741          final CompletableFuture<Integer> f = new CompletableFuture<>();
1742          final CompletableFuture<Integer> g = new CompletableFuture<>();
1743          final CFException ex = new CFException();
1744 <        final SubtractAction r = new SubtractAction(m);
1745 <
1746 <        (fFirst ? f : g).complete(v1);
1747 <        if (!createIncomplete)
1748 <            (!fFirst ? f : g).completeExceptionally(ex);
1749 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1750 <        if (createIncomplete) {
1751 <            checkIncomplete(h);
1752 <            (!fFirst ? f : g).completeExceptionally(ex);
1753 <        }
1754 <
1755 <        checkCompletedWithWrappedCFException(h, ex);
1756 <        r.assertNotInvoked();
1757 <        checkCompletedNormally(fFirst ? f : g, v1);
1758 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1744 >        final SubtractAction r1 = new SubtractAction(m);
1745 >        final SubtractAction r2 = new SubtractAction(m);
1746 >        final SubtractAction r3 = new SubtractAction(m);
1747 >
1748 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1749 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1750 >        final Callable<Boolean> complete1 = failFirst ?
1751 >            () -> fst.completeExceptionally(ex) :
1752 >            () -> fst.complete(v1);
1753 >        final Callable<Boolean> complete2 = failFirst ?
1754 >            () -> snd.complete(v1) :
1755 >            () -> snd.completeExceptionally(ex);
1756 >
1757 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1758 >        assertTrue(complete1.call());
1759 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1760 >        checkIncomplete(h1);
1761 >        checkIncomplete(h2);
1762 >        assertTrue(complete2.call());
1763 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1764 >
1765 >        checkCompletedWithWrappedException(h1, ex);
1766 >        checkCompletedWithWrappedException(h2, ex);
1767 >        checkCompletedWithWrappedException(h3, ex);
1768 >        r1.assertNotInvoked();
1769 >        r2.assertNotInvoked();
1770 >        r3.assertNotInvoked();
1771 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1772 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1773      }}
1774  
1775      /**
1776       * thenAcceptBoth result completes exceptionally if either source cancelled
1777       */
1778 <    public void testThenAcceptBoth_sourceCancelled() {
1778 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1779          for (ExecutionMode m : ExecutionMode.values())
1780          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515        for (boolean createIncomplete : new boolean[] { true, false })
1781          for (boolean fFirst : new boolean[] { true, false })
1782 +        for (boolean failFirst : new boolean[] { true, false })
1783          for (Integer v1 : new Integer[] { 1, null })
1784      {
1785          final CompletableFuture<Integer> f = new CompletableFuture<>();
1786          final CompletableFuture<Integer> g = new CompletableFuture<>();
1787 <        final SubtractAction r = new SubtractAction(m);
1787 >        final SubtractAction r1 = new SubtractAction(m);
1788 >        final SubtractAction r2 = new SubtractAction(m);
1789 >        final SubtractAction r3 = new SubtractAction(m);
1790  
1791 <        (fFirst ? f : g).complete(v1);
1792 <        if (!createIncomplete)
1793 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1794 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1795 <        if (createIncomplete) {
1796 <            checkIncomplete(h);
1797 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1798 <        }
1791 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1792 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1793 >        final Callable<Boolean> complete1 = failFirst ?
1794 >            () -> fst.cancel(mayInterruptIfRunning) :
1795 >            () -> fst.complete(v1);
1796 >        final Callable<Boolean> complete2 = failFirst ?
1797 >            () -> snd.complete(v1) :
1798 >            () -> snd.cancel(mayInterruptIfRunning);
1799  
1800 <        checkCompletedWithWrappedCancellationException(h);
1801 <        checkCancelled(!fFirst ? f : g);
1802 <        r.assertNotInvoked();
1803 <        checkCompletedNormally(fFirst ? f : g, v1);
1800 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1801 >        assertTrue(complete1.call());
1802 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1803 >        checkIncomplete(h1);
1804 >        checkIncomplete(h2);
1805 >        assertTrue(complete2.call());
1806 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1807 >
1808 >        checkCompletedWithWrappedCancellationException(h1);
1809 >        checkCompletedWithWrappedCancellationException(h2);
1810 >        checkCompletedWithWrappedCancellationException(h3);
1811 >        r1.assertNotInvoked();
1812 >        r2.assertNotInvoked();
1813 >        r3.assertNotInvoked();
1814 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1815 >        checkCancelled(failFirst ? fst : snd);
1816      }}
1817  
1818      /**
# Line 1546 | Line 1826 | public class CompletableFutureTest exten
1826      {
1827          final CompletableFuture<Integer> f = new CompletableFuture<>();
1828          final CompletableFuture<Integer> g = new CompletableFuture<>();
1829 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1830 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1831 <
1832 <        if (fFirst) {
1833 <            f.complete(v1);
1834 <            g.complete(v2);
1835 <        } else {
1836 <            g.complete(v2);
1837 <            f.complete(v1);
1838 <        }
1829 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1830 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1831 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1832 >
1833 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1834 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1835 >        final Integer w1 =  fFirst ? v1 : v2;
1836 >        final Integer w2 = !fFirst ? v1 : v2;
1837 >
1838 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1839 >        assertTrue(fst.complete(w1));
1840 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1841 >        assertTrue(snd.complete(w2));
1842 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1843  
1844 <        checkCompletedWithWrappedCFException(h);
1844 >        checkCompletedWithWrappedCFException(h1);
1845 >        checkCompletedWithWrappedCFException(h2);
1846 >        checkCompletedWithWrappedCFException(h3);
1847 >        r1.assertInvoked();
1848 >        r2.assertInvoked();
1849 >        r3.assertInvoked();
1850          checkCompletedNormally(f, v1);
1851          checkCompletedNormally(g, v2);
1852      }}
# Line 1568 | Line 1857 | public class CompletableFutureTest exten
1857       */
1858      public void testRunAfterBoth_normalCompletion() {
1859          for (ExecutionMode m : ExecutionMode.values())
1571        for (boolean createIncomplete : new boolean[] { true, false })
1860          for (boolean fFirst : new boolean[] { true, false })
1861          for (Integer v1 : new Integer[] { 1, null })
1862          for (Integer v2 : new Integer[] { 2, null })
1863      {
1864          final CompletableFuture<Integer> f = new CompletableFuture<>();
1865          final CompletableFuture<Integer> g = new CompletableFuture<>();
1866 <        final Noop r = new Noop(m);
1867 <
1868 <        if (fFirst) f.complete(v1); else g.complete(v2);
1869 <        if (!createIncomplete)
1870 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1871 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1872 <        if (createIncomplete) {
1873 <            checkIncomplete(h);
1874 <            r.assertNotInvoked();
1875 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1876 <        }
1866 >        final Noop r1 = new Noop(m);
1867 >        final Noop r2 = new Noop(m);
1868 >        final Noop r3 = new Noop(m);
1869 >
1870 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1871 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1872 >        final Integer w1 =  fFirst ? v1 : v2;
1873 >        final Integer w2 = !fFirst ? v1 : v2;
1874 >
1875 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1876 >        assertTrue(fst.complete(w1));
1877 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1878 >        checkIncomplete(h1);
1879 >        checkIncomplete(h2);
1880 >        r1.assertNotInvoked();
1881 >        r2.assertNotInvoked();
1882 >        assertTrue(snd.complete(w2));
1883 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1884  
1885 <        checkCompletedNormally(h, null);
1886 <        r.assertInvoked();
1885 >        checkCompletedNormally(h1, null);
1886 >        checkCompletedNormally(h2, null);
1887 >        checkCompletedNormally(h3, null);
1888 >        r1.assertInvoked();
1889 >        r2.assertInvoked();
1890 >        r3.assertInvoked();
1891          checkCompletedNormally(f, v1);
1892          checkCompletedNormally(g, v2);
1893      }}
# Line 1597 | Line 1896 | public class CompletableFutureTest exten
1896       * runAfterBoth result completes exceptionally after exceptional
1897       * completion of either source
1898       */
1899 <    public void testRunAfterBoth_exceptionalCompletion() {
1899 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1900          for (ExecutionMode m : ExecutionMode.values())
1602        for (boolean createIncomplete : new boolean[] { true, false })
1901          for (boolean fFirst : new boolean[] { true, false })
1902 +        for (boolean failFirst : new boolean[] { true, false })
1903          for (Integer v1 : new Integer[] { 1, null })
1904      {
1905          final CompletableFuture<Integer> f = new CompletableFuture<>();
1906          final CompletableFuture<Integer> g = new CompletableFuture<>();
1907          final CFException ex = new CFException();
1908 <        final Noop r = new Noop(m);
1909 <
1910 <        (fFirst ? f : g).complete(v1);
1911 <        if (!createIncomplete)
1912 <            (!fFirst ? f : g).completeExceptionally(ex);
1913 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1914 <        if (createIncomplete) {
1915 <            checkIncomplete(h);
1916 <            (!fFirst ? f : g).completeExceptionally(ex);
1917 <        }
1918 <
1919 <        checkCompletedWithWrappedCFException(h, ex);
1920 <        r.assertNotInvoked();
1921 <        checkCompletedNormally(fFirst ? f : g, v1);
1922 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1908 >        final Noop r1 = new Noop(m);
1909 >        final Noop r2 = new Noop(m);
1910 >        final Noop r3 = new Noop(m);
1911 >
1912 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1913 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1914 >        final Callable<Boolean> complete1 = failFirst ?
1915 >            () -> fst.completeExceptionally(ex) :
1916 >            () -> fst.complete(v1);
1917 >        final Callable<Boolean> complete2 = failFirst ?
1918 >            () -> snd.complete(v1) :
1919 >            () -> snd.completeExceptionally(ex);
1920 >
1921 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1922 >        assertTrue(complete1.call());
1923 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1924 >        checkIncomplete(h1);
1925 >        checkIncomplete(h2);
1926 >        assertTrue(complete2.call());
1927 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1928 >
1929 >        checkCompletedWithWrappedException(h1, ex);
1930 >        checkCompletedWithWrappedException(h2, ex);
1931 >        checkCompletedWithWrappedException(h3, ex);
1932 >        r1.assertNotInvoked();
1933 >        r2.assertNotInvoked();
1934 >        r3.assertNotInvoked();
1935 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1936 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1937      }}
1938  
1939      /**
1940       * runAfterBoth result completes exceptionally if either source cancelled
1941       */
1942 <    public void testRunAfterBoth_sourceCancelled() {
1942 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1943          for (ExecutionMode m : ExecutionMode.values())
1944          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632        for (boolean createIncomplete : new boolean[] { true, false })
1945          for (boolean fFirst : new boolean[] { true, false })
1946 +        for (boolean failFirst : new boolean[] { true, false })
1947          for (Integer v1 : new Integer[] { 1, null })
1948      {
1949          final CompletableFuture<Integer> f = new CompletableFuture<>();
1950          final CompletableFuture<Integer> g = new CompletableFuture<>();
1951 <        final Noop r = new Noop(m);
1951 >        final Noop r1 = new Noop(m);
1952 >        final Noop r2 = new Noop(m);
1953 >        final Noop r3 = new Noop(m);
1954  
1955 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1956 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1957 +        final Callable<Boolean> complete1 = failFirst ?
1958 +            () -> fst.cancel(mayInterruptIfRunning) :
1959 +            () -> fst.complete(v1);
1960 +        final Callable<Boolean> complete2 = failFirst ?
1961 +            () -> snd.complete(v1) :
1962 +            () -> snd.cancel(mayInterruptIfRunning);
1963  
1964 <        (fFirst ? f : g).complete(v1);
1965 <        if (!createIncomplete)
1966 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1967 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1968 <        if (createIncomplete) {
1969 <            checkIncomplete(h);
1970 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1648 <        }
1964 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1965 >        assertTrue(complete1.call());
1966 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1967 >        checkIncomplete(h1);
1968 >        checkIncomplete(h2);
1969 >        assertTrue(complete2.call());
1970 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1971  
1972 <        checkCompletedWithWrappedCancellationException(h);
1973 <        checkCancelled(!fFirst ? f : g);
1974 <        r.assertNotInvoked();
1975 <        checkCompletedNormally(fFirst ? f : g, v1);
1972 >        checkCompletedWithWrappedCancellationException(h1);
1973 >        checkCompletedWithWrappedCancellationException(h2);
1974 >        checkCompletedWithWrappedCancellationException(h3);
1975 >        r1.assertNotInvoked();
1976 >        r2.assertNotInvoked();
1977 >        r3.assertNotInvoked();
1978 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1979 >        checkCancelled(failFirst ? fst : snd);
1980      }}
1981  
1982      /**
# Line 1666 | Line 1992 | public class CompletableFutureTest exten
1992          final CompletableFuture<Integer> g = new CompletableFuture<>();
1993          final FailingRunnable r1 = new FailingRunnable(m);
1994          final FailingRunnable r2 = new FailingRunnable(m);
1995 +        final FailingRunnable r3 = new FailingRunnable(m);
1996  
1997 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1998 <        if (fFirst) {
1999 <            f.complete(v1);
2000 <            g.complete(v2);
2001 <        } else {
2002 <            g.complete(v2);
2003 <            f.complete(v1);
2004 <        }
2005 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1997 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1998 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1999 >        final Integer w1 =  fFirst ? v1 : v2;
2000 >        final Integer w2 = !fFirst ? v1 : v2;
2001 >
2002 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2003 >        assertTrue(fst.complete(w1));
2004 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2005 >        assertTrue(snd.complete(w2));
2006 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2007  
2008          checkCompletedWithWrappedCFException(h1);
2009          checkCompletedWithWrappedCFException(h2);
2010 +        checkCompletedWithWrappedCFException(h3);
2011 +        r1.assertInvoked();
2012 +        r2.assertInvoked();
2013 +        r3.assertInvoked();
2014          checkCompletedNormally(f, v1);
2015          checkCompletedNormally(g, v2);
2016      }}
# Line 1752 | Line 2084 | public class CompletableFutureTest exten
2084          rs[0].assertNotInvoked();
2085          rs[1].assertNotInvoked();
2086          f.completeExceptionally(ex);
2087 <        checkCompletedWithWrappedCFException(h0, ex);
2088 <        checkCompletedWithWrappedCFException(h1, ex);
2087 >        checkCompletedWithWrappedException(h0, ex);
2088 >        checkCompletedWithWrappedException(h1, ex);
2089          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2090          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2091 <        checkCompletedWithWrappedCFException(h2, ex);
2092 <        checkCompletedWithWrappedCFException(h3, ex);
2091 >        checkCompletedWithWrappedException(h2, ex);
2092 >        checkCompletedWithWrappedException(h3, ex);
2093          g.complete(v1);
2094  
2095          // unspecified behavior - both source completions available
# Line 1767 | Line 2099 | public class CompletableFutureTest exten
2099              assertEquals(inc(v1), h4.join());
2100              rs[4].assertValue(inc(v1));
2101          } catch (CompletionException ok) {
2102 <            checkCompletedWithWrappedCFException(h4, ex);
2102 >            checkCompletedWithWrappedException(h4, ex);
2103              rs[4].assertNotInvoked();
2104          }
2105          try {
2106              assertEquals(inc(v1), h5.join());
2107              rs[5].assertValue(inc(v1));
2108          } catch (CompletionException ok) {
2109 <            checkCompletedWithWrappedCFException(h5, ex);
2109 >            checkCompletedWithWrappedException(h5, ex);
2110              rs[5].assertNotInvoked();
2111          }
2112  
2113 <        checkCompletedWithWrappedCFException(f, ex);
2113 >        checkCompletedExceptionally(f, ex);
2114          checkCompletedNormally(g, v1);
2115 <        checkCompletedWithWrappedCFException(h0, ex);
2116 <        checkCompletedWithWrappedCFException(h1, ex);
2117 <        checkCompletedWithWrappedCFException(h2, ex);
2118 <        checkCompletedWithWrappedCFException(h3, ex);
2119 <        checkCompletedWithWrappedCFException(h4, ex);
2115 >        checkCompletedWithWrappedException(h0, ex);
2116 >        checkCompletedWithWrappedException(h1, ex);
2117 >        checkCompletedWithWrappedException(h2, ex);
2118 >        checkCompletedWithWrappedException(h3, ex);
2119 >        checkCompletedWithWrappedException(h4, ex);
2120          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2121      }}
2122  
# Line 1801 | Line 2133 | public class CompletableFutureTest exten
2133  
2134          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2135          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2136 <        if (fFirst) {
2137 <            f.complete(v1);
1806 <            g.completeExceptionally(ex);
1807 <        } else {
1808 <            g.completeExceptionally(ex);
1809 <            f.complete(v1);
1810 <        }
2136 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2137 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2138          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2139          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2140  
# Line 1816 | Line 2143 | public class CompletableFutureTest exten
2143              assertEquals(inc(v1), h0.join());
2144              rs[0].assertValue(inc(v1));
2145          } catch (CompletionException ok) {
2146 <            checkCompletedWithWrappedCFException(h0, ex);
2146 >            checkCompletedWithWrappedException(h0, ex);
2147              rs[0].assertNotInvoked();
2148          }
2149          try {
2150              assertEquals(inc(v1), h1.join());
2151              rs[1].assertValue(inc(v1));
2152          } catch (CompletionException ok) {
2153 <            checkCompletedWithWrappedCFException(h1, ex);
2153 >            checkCompletedWithWrappedException(h1, ex);
2154              rs[1].assertNotInvoked();
2155          }
2156          try {
2157              assertEquals(inc(v1), h2.join());
2158              rs[2].assertValue(inc(v1));
2159          } catch (CompletionException ok) {
2160 <            checkCompletedWithWrappedCFException(h2, ex);
2160 >            checkCompletedWithWrappedException(h2, ex);
2161              rs[2].assertNotInvoked();
2162          }
2163          try {
2164              assertEquals(inc(v1), h3.join());
2165              rs[3].assertValue(inc(v1));
2166          } catch (CompletionException ok) {
2167 <            checkCompletedWithWrappedCFException(h3, ex);
2167 >            checkCompletedWithWrappedException(h3, ex);
2168              rs[3].assertNotInvoked();
2169          }
2170  
2171          checkCompletedNormally(f, v1);
2172 <        checkCompletedWithWrappedCFException(g, ex);
2172 >        checkCompletedExceptionally(g, ex);
2173      }}
2174  
2175      /**
# Line 1913 | Line 2240 | public class CompletableFutureTest exten
2240  
2241          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2242          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2243 <        if (fFirst) {
2244 <            f.complete(v1);
1918 <            g.cancel(mayInterruptIfRunning);
1919 <        } else {
1920 <            g.cancel(mayInterruptIfRunning);
1921 <            f.complete(v1);
1922 <        }
2243 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2244 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2245          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2246          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2247  
# Line 2071 | Line 2393 | public class CompletableFutureTest exten
2393          rs[0].assertNotInvoked();
2394          rs[1].assertNotInvoked();
2395          f.completeExceptionally(ex);
2396 <        checkCompletedWithWrappedCFException(h0, ex);
2397 <        checkCompletedWithWrappedCFException(h1, ex);
2396 >        checkCompletedWithWrappedException(h0, ex);
2397 >        checkCompletedWithWrappedException(h1, ex);
2398          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2399          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2400 <        checkCompletedWithWrappedCFException(h2, ex);
2401 <        checkCompletedWithWrappedCFException(h3, ex);
2400 >        checkCompletedWithWrappedException(h2, ex);
2401 >        checkCompletedWithWrappedException(h3, ex);
2402  
2403          g.complete(v1);
2404  
# Line 2087 | Line 2409 | public class CompletableFutureTest exten
2409              assertNull(h4.join());
2410              rs[4].assertValue(v1);
2411          } catch (CompletionException ok) {
2412 <            checkCompletedWithWrappedCFException(h4, ex);
2412 >            checkCompletedWithWrappedException(h4, ex);
2413              rs[4].assertNotInvoked();
2414          }
2415          try {
2416              assertNull(h5.join());
2417              rs[5].assertValue(v1);
2418          } catch (CompletionException ok) {
2419 <            checkCompletedWithWrappedCFException(h5, ex);
2419 >            checkCompletedWithWrappedException(h5, ex);
2420              rs[5].assertNotInvoked();
2421          }
2422  
2423 <        checkCompletedWithWrappedCFException(f, ex);
2423 >        checkCompletedExceptionally(f, ex);
2424          checkCompletedNormally(g, v1);
2425 <        checkCompletedWithWrappedCFException(h0, ex);
2426 <        checkCompletedWithWrappedCFException(h1, ex);
2427 <        checkCompletedWithWrappedCFException(h2, ex);
2428 <        checkCompletedWithWrappedCFException(h3, ex);
2429 <        checkCompletedWithWrappedCFException(h4, ex);
2425 >        checkCompletedWithWrappedException(h0, ex);
2426 >        checkCompletedWithWrappedException(h1, ex);
2427 >        checkCompletedWithWrappedException(h2, ex);
2428 >        checkCompletedWithWrappedException(h3, ex);
2429 >        checkCompletedWithWrappedException(h4, ex);
2430          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2431      }}
2432  
# Line 2121 | Line 2443 | public class CompletableFutureTest exten
2443  
2444          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2445          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2446 <        if (fFirst) {
2447 <            f.complete(v1);
2126 <            g.completeExceptionally(ex);
2127 <        } else {
2128 <            g.completeExceptionally(ex);
2129 <            f.complete(v1);
2130 <        }
2446 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2447 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2448          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2449          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2450  
# Line 2136 | Line 2453 | public class CompletableFutureTest exten
2453              assertEquals(null, h0.join());
2454              rs[0].assertValue(v1);
2455          } catch (CompletionException ok) {
2456 <            checkCompletedWithWrappedCFException(h0, ex);
2456 >            checkCompletedWithWrappedException(h0, ex);
2457              rs[0].assertNotInvoked();
2458          }
2459          try {
2460              assertEquals(null, h1.join());
2461              rs[1].assertValue(v1);
2462          } catch (CompletionException ok) {
2463 <            checkCompletedWithWrappedCFException(h1, ex);
2463 >            checkCompletedWithWrappedException(h1, ex);
2464              rs[1].assertNotInvoked();
2465          }
2466          try {
2467              assertEquals(null, h2.join());
2468              rs[2].assertValue(v1);
2469          } catch (CompletionException ok) {
2470 <            checkCompletedWithWrappedCFException(h2, ex);
2470 >            checkCompletedWithWrappedException(h2, ex);
2471              rs[2].assertNotInvoked();
2472          }
2473          try {
2474              assertEquals(null, h3.join());
2475              rs[3].assertValue(v1);
2476          } catch (CompletionException ok) {
2477 <            checkCompletedWithWrappedCFException(h3, ex);
2477 >            checkCompletedWithWrappedException(h3, ex);
2478              rs[3].assertNotInvoked();
2479          }
2480  
2481          checkCompletedNormally(f, v1);
2482 <        checkCompletedWithWrappedCFException(g, ex);
2482 >        checkCompletedExceptionally(g, ex);
2483      }}
2484  
2485      /**
# Line 2330 | Line 2647 | public class CompletableFutureTest exten
2647          checkIncomplete(h1);
2648          rs[0].assertNotInvoked();
2649          rs[1].assertNotInvoked();
2650 <        f.completeExceptionally(ex);
2651 <        checkCompletedWithWrappedCFException(h0, ex);
2652 <        checkCompletedWithWrappedCFException(h1, ex);
2650 >        assertTrue(f.completeExceptionally(ex));
2651 >        checkCompletedWithWrappedException(h0, ex);
2652 >        checkCompletedWithWrappedException(h1, ex);
2653          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2654          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2655 <        checkCompletedWithWrappedCFException(h2, ex);
2656 <        checkCompletedWithWrappedCFException(h3, ex);
2655 >        checkCompletedWithWrappedException(h2, ex);
2656 >        checkCompletedWithWrappedException(h3, ex);
2657  
2658 <        g.complete(v1);
2658 >        assertTrue(g.complete(v1));
2659  
2660          // unspecified behavior - both source completions available
2661          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2347 | Line 2664 | public class CompletableFutureTest exten
2664              assertNull(h4.join());
2665              rs[4].assertInvoked();
2666          } catch (CompletionException ok) {
2667 <            checkCompletedWithWrappedCFException(h4, ex);
2667 >            checkCompletedWithWrappedException(h4, ex);
2668              rs[4].assertNotInvoked();
2669          }
2670          try {
2671              assertNull(h5.join());
2672              rs[5].assertInvoked();
2673          } catch (CompletionException ok) {
2674 <            checkCompletedWithWrappedCFException(h5, ex);
2674 >            checkCompletedWithWrappedException(h5, ex);
2675              rs[5].assertNotInvoked();
2676          }
2677  
2678 <        checkCompletedWithWrappedCFException(f, ex);
2678 >        checkCompletedExceptionally(f, ex);
2679          checkCompletedNormally(g, v1);
2680 <        checkCompletedWithWrappedCFException(h0, ex);
2681 <        checkCompletedWithWrappedCFException(h1, ex);
2682 <        checkCompletedWithWrappedCFException(h2, ex);
2683 <        checkCompletedWithWrappedCFException(h3, ex);
2684 <        checkCompletedWithWrappedCFException(h4, ex);
2680 >        checkCompletedWithWrappedException(h0, ex);
2681 >        checkCompletedWithWrappedException(h1, ex);
2682 >        checkCompletedWithWrappedException(h2, ex);
2683 >        checkCompletedWithWrappedException(h3, ex);
2684 >        checkCompletedWithWrappedException(h4, ex);
2685          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2686      }}
2687  
# Line 2381 | Line 2698 | public class CompletableFutureTest exten
2698  
2699          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2700          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2701 <        if (fFirst) {
2702 <            f.complete(v1);
2386 <            g.completeExceptionally(ex);
2387 <        } else {
2388 <            g.completeExceptionally(ex);
2389 <            f.complete(v1);
2390 <        }
2701 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2702 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2703          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2704          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2705  
# Line 2396 | Line 2708 | public class CompletableFutureTest exten
2708              assertEquals(null, h0.join());
2709              rs[0].assertInvoked();
2710          } catch (CompletionException ok) {
2711 <            checkCompletedWithWrappedCFException(h0, ex);
2711 >            checkCompletedWithWrappedException(h0, ex);
2712              rs[0].assertNotInvoked();
2713          }
2714          try {
2715              assertEquals(null, h1.join());
2716              rs[1].assertInvoked();
2717          } catch (CompletionException ok) {
2718 <            checkCompletedWithWrappedCFException(h1, ex);
2718 >            checkCompletedWithWrappedException(h1, ex);
2719              rs[1].assertNotInvoked();
2720          }
2721          try {
2722              assertEquals(null, h2.join());
2723              rs[2].assertInvoked();
2724          } catch (CompletionException ok) {
2725 <            checkCompletedWithWrappedCFException(h2, ex);
2725 >            checkCompletedWithWrappedException(h2, ex);
2726              rs[2].assertNotInvoked();
2727          }
2728          try {
2729              assertEquals(null, h3.join());
2730              rs[3].assertInvoked();
2731          } catch (CompletionException ok) {
2732 <            checkCompletedWithWrappedCFException(h3, ex);
2732 >            checkCompletedWithWrappedException(h3, ex);
2733              rs[3].assertNotInvoked();
2734          }
2735  
2736          checkCompletedNormally(f, v1);
2737 <        checkCompletedWithWrappedCFException(g, ex);
2737 >        checkCompletedExceptionally(g, ex);
2738      }}
2739  
2740      /**
# Line 2452 | Line 2764 | public class CompletableFutureTest exten
2764          checkCompletedWithWrappedCancellationException(h2);
2765          checkCompletedWithWrappedCancellationException(h3);
2766  
2767 <        g.complete(v1);
2767 >        assertTrue(g.complete(v1));
2768  
2769          // unspecified behavior - both source completions available
2770          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2496 | Line 2808 | public class CompletableFutureTest exten
2808  
2809          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2810          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2811 <        f.complete(v1);
2811 >        assertTrue(f.complete(v1));
2812          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2813          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2814          checkCompletedWithWrappedCFException(h0);
# Line 2504 | Line 2816 | public class CompletableFutureTest exten
2816          checkCompletedWithWrappedCFException(h2);
2817          checkCompletedWithWrappedCFException(h3);
2818          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2819 <        g.complete(v2);
2819 >        assertTrue(g.complete(v2));
2820          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2821          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2822          checkCompletedWithWrappedCFException(h4);
# Line 2525 | Line 2837 | public class CompletableFutureTest exten
2837      {
2838          final CompletableFuture<Integer> f = new CompletableFuture<>();
2839          final CompletableFutureInc r = new CompletableFutureInc(m);
2840 <        if (!createIncomplete) f.complete(v1);
2840 >        if (!createIncomplete) assertTrue(f.complete(v1));
2841          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2842 <        if (createIncomplete) f.complete(v1);
2842 >        if (createIncomplete) assertTrue(f.complete(v1));
2843  
2844          checkCompletedNormally(g, inc(v1));
2845          checkCompletedNormally(f, v1);
# Line 2549 | Line 2861 | public class CompletableFutureTest exten
2861          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2862          if (createIncomplete) f.completeExceptionally(ex);
2863  
2864 <        checkCompletedWithWrappedCFException(g, ex);
2865 <        checkCompletedWithWrappedCFException(f, ex);
2864 >        checkCompletedWithWrappedException(g, ex);
2865 >        checkCompletedExceptionally(f, ex);
2866          r.assertNotInvoked();
2867      }}
2868  
# Line 2565 | Line 2877 | public class CompletableFutureTest exten
2877          final CompletableFuture<Integer> f = new CompletableFuture<>();
2878          final FailingCompletableFutureFunction r
2879              = new FailingCompletableFutureFunction(m);
2880 <        if (!createIncomplete) f.complete(v1);
2880 >        if (!createIncomplete) assertTrue(f.complete(v1));
2881          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2882 <        if (createIncomplete) f.complete(v1);
2882 >        if (createIncomplete) assertTrue(f.complete(v1));
2883  
2884          checkCompletedWithWrappedCFException(g);
2885          checkCompletedNormally(f, v1);
# Line 2610 | Line 2922 | public class CompletableFutureTest exten
2922       * when all components complete normally
2923       */
2924      public void testAllOf_normal() throws Exception {
2925 <        for (int k = 1; k < 20; ++k) {
2925 >        for (int k = 1; k < 20; k++) {
2926              CompletableFuture<Integer>[] fs
2927                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2928 <            for (int i = 0; i < k; ++i)
2928 >            for (int i = 0; i < k; i++)
2929                  fs[i] = new CompletableFuture<>();
2930              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2931 <            for (int i = 0; i < k; ++i) {
2931 >            for (int i = 0; i < k; i++) {
2932                  checkIncomplete(f);
2933                  checkIncomplete(CompletableFuture.allOf(fs));
2934                  fs[i].complete(one);
# Line 2627 | Line 2939 | public class CompletableFutureTest exten
2939      }
2940  
2941      public void testAllOf_backwards() throws Exception {
2942 <        for (int k = 1; k < 20; ++k) {
2942 >        for (int k = 1; k < 20; k++) {
2943              CompletableFuture<Integer>[] fs
2944                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2945 <            for (int i = 0; i < k; ++i)
2945 >            for (int i = 0; i < k; i++)
2946                  fs[i] = new CompletableFuture<>();
2947              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2948              for (int i = k - 1; i >= 0; i--) {
# Line 2647 | Line 2959 | public class CompletableFutureTest exten
2959       * anyOf(no component futures) returns an incomplete future
2960       */
2961      public void testAnyOf_empty() throws Exception {
2962 +        for (Integer v1 : new Integer[] { 1, null })
2963 +    {
2964          CompletableFuture<Object> f = CompletableFuture.anyOf();
2965          checkIncomplete(f);
2966 <    }
2966 >
2967 >        f.complete(v1);
2968 >        checkCompletedNormally(f, v1);
2969 >    }}
2970  
2971      /**
2972       * anyOf returns a future completed normally with a value when
2973       * a component future does
2974       */
2975      public void testAnyOf_normal() throws Exception {
2976 <        for (int k = 0; k < 10; ++k) {
2976 >        for (int k = 0; k < 10; k++) {
2977              CompletableFuture[] fs = new CompletableFuture[k];
2978 <            for (int i = 0; i < k; ++i)
2978 >            for (int i = 0; i < k; i++)
2979                  fs[i] = new CompletableFuture<>();
2980              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2981              checkIncomplete(f);
2982 <            for (int i = 0; i < k; ++i) {
2983 <                fs[i].complete(one);
2984 <                checkCompletedNormally(f, one);
2985 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2982 >            for (int i = 0; i < k; i++) {
2983 >                fs[i].complete(i);
2984 >                checkCompletedNormally(f, 0);
2985 >                int x = (int) CompletableFuture.anyOf(fs).join();
2986 >                assertTrue(0 <= x && x <= i);
2987 >            }
2988 >        }
2989 >    }
2990 >    public void testAnyOf_normal_backwards() throws Exception {
2991 >        for (int k = 0; k < 10; k++) {
2992 >            CompletableFuture[] fs = new CompletableFuture[k];
2993 >            for (int i = 0; i < k; i++)
2994 >                fs[i] = new CompletableFuture<>();
2995 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2996 >            checkIncomplete(f);
2997 >            for (int i = k - 1; i >= 0; i--) {
2998 >                fs[i].complete(i);
2999 >                checkCompletedNormally(f, k - 1);
3000 >                int x = (int) CompletableFuture.anyOf(fs).join();
3001 >                assertTrue(i <= x && x <= k - 1);
3002              }
3003          }
3004      }
# Line 2674 | Line 3007 | public class CompletableFutureTest exten
3007       * anyOf result completes exceptionally when any component does.
3008       */
3009      public void testAnyOf_exceptional() throws Exception {
3010 <        for (int k = 0; k < 10; ++k) {
3010 >        for (int k = 0; k < 10; k++) {
3011              CompletableFuture[] fs = new CompletableFuture[k];
3012 <            for (int i = 0; i < k; ++i)
3012 >            for (int i = 0; i < k; i++)
3013                  fs[i] = new CompletableFuture<>();
3014              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3015              checkIncomplete(f);
3016 <            for (int i = 0; i < k; ++i) {
3016 >            for (int i = 0; i < k; i++) {
3017                  fs[i].completeExceptionally(new CFException());
3018                  checkCompletedWithWrappedCFException(f);
3019                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
# Line 2806 | Line 3139 | public class CompletableFutureTest exten
3139          assertSame(f, f.toCompletableFuture());
3140      }
3141  
3142 <    /**
2810 <     * whenComplete action executes on normal completion, propagating
2811 <     * source result.
2812 <     */
2813 <    public void testWhenComplete_normalCompletion1() {
2814 <        for (ExecutionMode m : ExecutionMode.values())
2815 <        for (boolean createIncomplete : new boolean[] { true, false })
2816 <        for (Integer v1 : new Integer[] { 1, null })
2817 <    {
2818 <        final AtomicInteger a = new AtomicInteger(0);
2819 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2820 <        if (!createIncomplete) f.complete(v1);
2821 <        final CompletableFuture<Integer> g = m.whenComplete
2822 <            (f,
2823 <             (Integer x, Throwable t) -> {
2824 <                threadAssertSame(x, v1);
2825 <                threadAssertNull(t);
2826 <                a.getAndIncrement();
2827 <            });
2828 <        if (createIncomplete) f.complete(v1);
3142 >    //--- tests of implementation details; not part of official tck ---
3143  
3144 <        checkCompletedNormally(g, v1);
3145 <        checkCompletedNormally(f, v1);
3146 <        assertEquals(1, a.get());
3147 <    }}
3144 >    Object resultOf(CompletableFuture<?> f) {
3145 >        try {
3146 >            java.lang.reflect.Field resultField
3147 >                = CompletableFuture.class.getDeclaredField("result");
3148 >            resultField.setAccessible(true);
3149 >            return resultField.get(f);
3150 >        } catch (Throwable t) { throw new AssertionError(t); }
3151 >    }
3152  
3153 <    /**
3154 <     * whenComplete action executes on exceptional completion, propagating
2837 <     * source result.
2838 <     */
2839 <    public void testWhenComplete_exceptionalCompletion() {
3153 >    public void testExceptionPropagationReusesResultObject() {
3154 >        if (!testImplementationDetails) return;
3155          for (ExecutionMode m : ExecutionMode.values())
2841        for (boolean createIncomplete : new boolean[] { true, false })
2842        for (Integer v1 : new Integer[] { 1, null })
3156      {
2844        final AtomicInteger a = new AtomicInteger(0);
3157          final CFException ex = new CFException();
3158 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3159 <        if (!createIncomplete) f.completeExceptionally(ex);
2848 <        final CompletableFuture<Integer> g = m.whenComplete
2849 <            (f,
2850 <             (Integer x, Throwable t) -> {
2851 <                threadAssertNull(x);
2852 <                threadAssertSame(t, ex);
2853 <                a.getAndIncrement();
2854 <            });
2855 <        if (createIncomplete) f.completeExceptionally(ex);
2856 <        checkCompletedWithWrappedCFException(f, ex);
2857 <        checkCompletedWithWrappedCFException(g, ex);
2858 <        assertEquals(1, a.get());
2859 <    }}
3158 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3159 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3160  
3161 <    /**
3162 <     * whenComplete action executes on cancelled source, propagating
2863 <     * CancellationException.
2864 <     */
2865 <    public void testWhenComplete_sourceCancelled() {
2866 <        for (ExecutionMode m : ExecutionMode.values())
2867 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2868 <        for (boolean createIncomplete : new boolean[] { true, false })
2869 <    {
2870 <        final AtomicInteger a = new AtomicInteger(0);
2871 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2872 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2873 <        final CompletableFuture<Integer> g = m.whenComplete
2874 <            (f,
2875 <             (Integer x, Throwable t) -> {
2876 <                threadAssertNull(x);
2877 <                threadAssertTrue(t instanceof CancellationException);
2878 <                a.getAndIncrement();
2879 <            });
2880 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3161 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> dependentFactories
3162 >            = new ArrayList<>();
3163  
3164 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3165 <        checkCompletedWithWrappedCancellationException(g);
3166 <        checkCancelled(f);
2885 <        assertEquals(1, a.get());
2886 <    }}
3164 >        dependentFactories.add((y) -> m.thenRun(y, new Noop(m)));
3165 >        dependentFactories.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3166 >        dependentFactories.add((y) -> m.thenApply(y, new IncFunction(m)));
3167  
3168 <    /**
3169 <     * If a whenComplete action throws an exception when triggered by
3170 <     * a normal completion, it completes exceptionally
2891 <     */
2892 <    public void testWhenComplete_actionFailed() {
2893 <        for (boolean createIncomplete : new boolean[] { true, false })
2894 <        for (ExecutionMode m : ExecutionMode.values())
2895 <        for (Integer v1 : new Integer[] { 1, null })
2896 <    {
2897 <        final AtomicInteger a = new AtomicInteger(0);
2898 <        final CFException ex = new CFException();
2899 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2900 <        if (!createIncomplete) f.complete(v1);
2901 <        final CompletableFuture<Integer> g = m.whenComplete
2902 <            (f,
2903 <             (Integer x, Throwable t) -> {
2904 <                threadAssertSame(x, v1);
2905 <                threadAssertNull(t);
2906 <                a.getAndIncrement();
2907 <                throw ex;
2908 <            });
2909 <        if (createIncomplete) f.complete(v1);
2910 <        checkCompletedNormally(f, v1);
2911 <        checkCompletedWithWrappedCFException(g, ex);
2912 <        assertEquals(1, a.get());
2913 <    }}
3168 >        dependentFactories.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3169 >        dependentFactories.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3170 >        dependentFactories.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3171  
3172 <    /**
3173 <     * If a whenComplete action throws an exception when triggered by
3174 <     * a source completion that also throws an exception, the source
2918 <     * exception takes precedence.
2919 <     */
2920 <    public void testWhenComplete_actionFailedSourceFailed() {
2921 <        for (boolean createIncomplete : new boolean[] { true, false })
2922 <        for (ExecutionMode m : ExecutionMode.values())
2923 <        for (Integer v1 : new Integer[] { 1, null })
2924 <    {
2925 <        final AtomicInteger a = new AtomicInteger(0);
2926 <        final CFException ex1 = new CFException();
2927 <        final CFException ex2 = new CFException();
2928 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3172 >        dependentFactories.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3173 >        dependentFactories.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3174 >        dependentFactories.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3175  
3176 <        if (!createIncomplete) f.completeExceptionally(ex1);
2931 <        final CompletableFuture<Integer> g = m.whenComplete
2932 <            (f,
2933 <             (Integer x, Throwable t) -> {
2934 <                threadAssertSame(t, ex1);
2935 <                threadAssertNull(x);
2936 <                a.getAndIncrement();
2937 <                throw ex2;
2938 <            });
2939 <        if (createIncomplete) f.completeExceptionally(ex1);
3176 >        dependentFactories.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3177  
3178 <        checkCompletedWithWrappedCFException(f, ex1);
3179 <        checkCompletedWithWrappedCFException(g, ex1);
3180 <        assertEquals(1, a.get());
3178 >        dependentFactories.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3179 >
3180 >        dependentFactories.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3181 >        dependentFactories.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3182 >
3183 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3184 >                 dependentFactory : dependentFactories) {
3185 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3186 >            f.completeExceptionally(ex);
3187 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3188 >            checkCompletedWithWrappedException(src, ex);
3189 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3190 >            checkCompletedWithWrappedException(dep, ex);
3191 >            assertSame(resultOf(src), resultOf(dep));
3192 >        }
3193 >
3194 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3195 >                 dependentFactory : dependentFactories) {
3196 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3197 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3198 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3199 >            f.completeExceptionally(ex);
3200 >            checkCompletedWithWrappedException(src, ex);
3201 >            checkCompletedWithWrappedException(dep, ex);
3202 >            assertSame(resultOf(src), resultOf(dep));
3203 >        }
3204 >
3205 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3206 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3207 >                 dependentFactory : dependentFactories) {
3208 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3209 >            f.cancel(mayInterruptIfRunning);
3210 >            checkCancelled(f);
3211 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3212 >            checkCompletedWithWrappedCancellationException(src);
3213 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3214 >            checkCompletedWithWrappedCancellationException(dep);
3215 >            assertSame(resultOf(src), resultOf(dep));
3216 >        }
3217 >
3218 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3219 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3220 >                 dependentFactory : dependentFactories) {
3221 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3222 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3223 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3224 >            f.cancel(mayInterruptIfRunning);
3225 >            checkCancelled(f);
3226 >            checkCompletedWithWrappedCancellationException(src);
3227 >            checkCompletedWithWrappedCancellationException(dep);
3228 >            assertSame(resultOf(src), resultOf(dep));
3229 >        }
3230      }}
3231  
3232   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines