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.64 by jsr166, Fri Jun 6 17:08:48 2014 UTC vs.
Revision 1.80 by jsr166, Mon Jun 16 17:29:03 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));
1368          checkCompletedNormally(f, v1);
1369 <        r.assertInvoked();
1369 >        r.assertValue(inc(v1));
1370      }}
1371  
1372      /**
# 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.assertInvoked();
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);
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 <        if (fFirst) {
1681 <            f.complete(v1);
1682 <            g.complete(v2);
1438 <        } else {
1439 <            g.complete(v2);
1440 <            f.complete(v1);
1441 <        }
1442 <
1443 <        checkCompletedWithWrappedCFException(h);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedWithWrappedCFException(h3);
1683          checkCompletedNormally(f, v1);
1684          checkCompletedNormally(g, v2);
1685      }}
# Line 1451 | Line 1690 | public class CompletableFutureTest exten
1690       */
1691      public void testThenAcceptBoth_normalCompletion() {
1692          for (ExecutionMode m : ExecutionMode.values())
1454        for (boolean createIncomplete : new boolean[] { true, false })
1693          for (boolean fFirst : new boolean[] { true, false })
1694          for (Integer v1 : new Integer[] { 1, null })
1695          for (Integer v2 : new Integer[] { 2, null })
1696      {
1697          final CompletableFuture<Integer> f = new CompletableFuture<>();
1698          final CompletableFuture<Integer> g = new CompletableFuture<>();
1699 <        final SubtractAction r = new SubtractAction(m);
1700 <
1701 <        if (fFirst) f.complete(v1); else g.complete(v2);
1702 <        if (!createIncomplete)
1703 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1704 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1705 <        if (createIncomplete) {
1706 <            checkIncomplete(h);
1707 <            r.assertNotInvoked();
1708 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1709 <        }
1699 >        final SubtractAction r1 = new SubtractAction(m);
1700 >        final SubtractAction r2 = new SubtractAction(m);
1701 >        final SubtractAction r3 = new SubtractAction(m);
1702 >
1703 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1704 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1705 >        final Integer w1 =  fFirst ? v1 : v2;
1706 >        final Integer w2 = !fFirst ? v1 : v2;
1707 >
1708 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1709 >        assertTrue(fst.complete(w1));
1710 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1711 >        checkIncomplete(h1);
1712 >        checkIncomplete(h2);
1713 >        r1.assertNotInvoked();
1714 >        r2.assertNotInvoked();
1715 >        assertTrue(snd.complete(w2));
1716 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1717  
1718 <        checkCompletedNormally(h, null);
1719 <        r.assertValue(subtract(v1, v2));
1718 >        checkCompletedNormally(h1, null);
1719 >        checkCompletedNormally(h2, null);
1720 >        checkCompletedNormally(h3, null);
1721 >        r1.assertValue(subtract(v1, v2));
1722 >        r2.assertValue(subtract(v1, v2));
1723 >        r3.assertValue(subtract(v1, v2));
1724          checkCompletedNormally(f, v1);
1725          checkCompletedNormally(g, v2);
1726      }}
# Line 1480 | Line 1729 | public class CompletableFutureTest exten
1729       * thenAcceptBoth result completes exceptionally after exceptional
1730       * completion of either source
1731       */
1732 <    public void testThenAcceptBoth_exceptionalCompletion() {
1732 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1733          for (ExecutionMode m : ExecutionMode.values())
1485        for (boolean createIncomplete : new boolean[] { true, false })
1734          for (boolean fFirst : new boolean[] { true, false })
1735 +        for (boolean failFirst : new boolean[] { true, false })
1736          for (Integer v1 : new Integer[] { 1, null })
1737      {
1738          final CompletableFuture<Integer> f = new CompletableFuture<>();
1739          final CompletableFuture<Integer> g = new CompletableFuture<>();
1740          final CFException ex = new CFException();
1741 <        final SubtractAction r = new SubtractAction(m);
1742 <
1743 <        (fFirst ? f : g).complete(v1);
1744 <        if (!createIncomplete)
1745 <            (!fFirst ? f : g).completeExceptionally(ex);
1746 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1747 <        if (createIncomplete) {
1748 <            checkIncomplete(h);
1749 <            (!fFirst ? f : g).completeExceptionally(ex);
1750 <        }
1751 <
1752 <        checkCompletedWithWrappedCFException(h, ex);
1753 <        r.assertNotInvoked();
1754 <        checkCompletedNormally(fFirst ? f : g, v1);
1755 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1741 >        final SubtractAction r1 = new SubtractAction(m);
1742 >        final SubtractAction r2 = new SubtractAction(m);
1743 >        final SubtractAction r3 = new SubtractAction(m);
1744 >
1745 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1746 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1747 >        final Callable<Boolean> complete1 = failFirst ?
1748 >            () -> fst.completeExceptionally(ex) :
1749 >            () -> fst.complete(v1);
1750 >        final Callable<Boolean> complete2 = failFirst ?
1751 >            () -> snd.complete(v1) :
1752 >            () -> snd.completeExceptionally(ex);
1753 >
1754 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1755 >        assertTrue(complete1.call());
1756 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1757 >        checkIncomplete(h1);
1758 >        checkIncomplete(h2);
1759 >        assertTrue(complete2.call());
1760 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1761 >
1762 >        checkCompletedWithWrappedException(h1, ex);
1763 >        checkCompletedWithWrappedException(h2, ex);
1764 >        checkCompletedWithWrappedException(h3, ex);
1765 >        r1.assertNotInvoked();
1766 >        r2.assertNotInvoked();
1767 >        r3.assertNotInvoked();
1768 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1769 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1770      }}
1771  
1772      /**
1773       * thenAcceptBoth result completes exceptionally if either source cancelled
1774       */
1775 <    public void testThenAcceptBoth_sourceCancelled() {
1775 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1776          for (ExecutionMode m : ExecutionMode.values())
1777          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515        for (boolean createIncomplete : new boolean[] { true, false })
1778          for (boolean fFirst : new boolean[] { true, false })
1779 +        for (boolean failFirst : new boolean[] { true, false })
1780          for (Integer v1 : new Integer[] { 1, null })
1781      {
1782          final CompletableFuture<Integer> f = new CompletableFuture<>();
1783          final CompletableFuture<Integer> g = new CompletableFuture<>();
1784 <        final SubtractAction r = new SubtractAction(m);
1784 >        final SubtractAction r1 = new SubtractAction(m);
1785 >        final SubtractAction r2 = new SubtractAction(m);
1786 >        final SubtractAction r3 = new SubtractAction(m);
1787  
1788 <        (fFirst ? f : g).complete(v1);
1789 <        if (!createIncomplete)
1790 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1791 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1792 <        if (createIncomplete) {
1793 <            checkIncomplete(h);
1794 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1795 <        }
1788 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1789 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1790 >        final Callable<Boolean> complete1 = failFirst ?
1791 >            () -> fst.cancel(mayInterruptIfRunning) :
1792 >            () -> fst.complete(v1);
1793 >        final Callable<Boolean> complete2 = failFirst ?
1794 >            () -> snd.complete(v1) :
1795 >            () -> snd.cancel(mayInterruptIfRunning);
1796  
1797 <        checkCompletedWithWrappedCancellationException(h);
1798 <        checkCancelled(!fFirst ? f : g);
1799 <        r.assertNotInvoked();
1800 <        checkCompletedNormally(fFirst ? f : g, v1);
1797 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1798 >        assertTrue(complete1.call());
1799 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1800 >        checkIncomplete(h1);
1801 >        checkIncomplete(h2);
1802 >        assertTrue(complete2.call());
1803 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1804 >
1805 >        checkCompletedWithWrappedCancellationException(h1);
1806 >        checkCompletedWithWrappedCancellationException(h2);
1807 >        checkCompletedWithWrappedCancellationException(h3);
1808 >        r1.assertNotInvoked();
1809 >        r2.assertNotInvoked();
1810 >        r3.assertNotInvoked();
1811 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1812 >        checkCancelled(failFirst ? fst : snd);
1813      }}
1814  
1815      /**
# Line 1546 | Line 1823 | public class CompletableFutureTest exten
1823      {
1824          final CompletableFuture<Integer> f = new CompletableFuture<>();
1825          final CompletableFuture<Integer> g = new CompletableFuture<>();
1826 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1827 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1826 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1827 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1828 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1829 >
1830 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1831 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1832 >        final Integer w1 =  fFirst ? v1 : v2;
1833 >        final Integer w2 = !fFirst ? v1 : v2;
1834 >
1835 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1836 >        assertTrue(fst.complete(w1));
1837 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1838 >        assertTrue(snd.complete(w2));
1839 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1840  
1841 <        if (fFirst) {
1842 <            f.complete(v1);
1843 <            g.complete(v2);
1555 <        } else {
1556 <            g.complete(v2);
1557 <            f.complete(v1);
1558 <        }
1559 <
1560 <        checkCompletedWithWrappedCFException(h);
1841 >        checkCompletedWithWrappedCFException(h1);
1842 >        checkCompletedWithWrappedCFException(h2);
1843 >        checkCompletedWithWrappedCFException(h3);
1844          checkCompletedNormally(f, v1);
1845          checkCompletedNormally(g, v2);
1846      }}
# Line 1577 | Line 1860 | public class CompletableFutureTest exten
1860          final CompletableFuture<Integer> g = new CompletableFuture<>();
1861          final Noop r = new Noop(m);
1862  
1863 <        if (fFirst) f.complete(v1); else g.complete(v2);
1863 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1864          if (!createIncomplete)
1865 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1865 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1866          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1867          if (createIncomplete) {
1868              checkIncomplete(h);
1869              r.assertNotInvoked();
1870 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1870 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1871          }
1872  
1873          checkCompletedNormally(h, null);
# Line 1608 | Line 1891 | public class CompletableFutureTest exten
1891          final CFException ex = new CFException();
1892          final Noop r = new Noop(m);
1893  
1894 <        (fFirst ? f : g).complete(v1);
1894 >        assertTrue((fFirst ? f : g).complete(v1));
1895          if (!createIncomplete)
1896 <            (!fFirst ? f : g).completeExceptionally(ex);
1896 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1897          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1898          if (createIncomplete) {
1899              checkIncomplete(h);
1900 <            (!fFirst ? f : g).completeExceptionally(ex);
1900 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1901          }
1902  
1903 <        checkCompletedWithWrappedCFException(h, ex);
1903 >        checkCompletedWithWrappedException(h, ex);
1904          r.assertNotInvoked();
1905          checkCompletedNormally(fFirst ? f : g, v1);
1906 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1906 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1907      }}
1908  
1909      /**
# Line 1637 | Line 1920 | public class CompletableFutureTest exten
1920          final CompletableFuture<Integer> g = new CompletableFuture<>();
1921          final Noop r = new Noop(m);
1922  
1923 <
1641 <        (fFirst ? f : g).complete(v1);
1923 >        assertTrue((fFirst ? f : g).complete(v1));
1924          if (!createIncomplete)
1925              assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1926          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
# Line 1668 | Line 1950 | public class CompletableFutureTest exten
1950          final FailingRunnable r2 = new FailingRunnable(m);
1951  
1952          CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1953 <        if (fFirst) {
1954 <            f.complete(v1);
1673 <            g.complete(v2);
1674 <        } else {
1675 <            g.complete(v2);
1676 <            f.complete(v1);
1677 <        }
1953 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1954 >        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1955          CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1956  
1957          checkCompletedWithWrappedCFException(h1);
# Line 1752 | Line 2029 | public class CompletableFutureTest exten
2029          rs[0].assertNotInvoked();
2030          rs[1].assertNotInvoked();
2031          f.completeExceptionally(ex);
2032 <        checkCompletedWithWrappedCFException(h0, ex);
2033 <        checkCompletedWithWrappedCFException(h1, ex);
2032 >        checkCompletedWithWrappedException(h0, ex);
2033 >        checkCompletedWithWrappedException(h1, ex);
2034          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2035          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2036 <        checkCompletedWithWrappedCFException(h2, ex);
2037 <        checkCompletedWithWrappedCFException(h3, ex);
2036 >        checkCompletedWithWrappedException(h2, ex);
2037 >        checkCompletedWithWrappedException(h3, ex);
2038          g.complete(v1);
2039  
2040          // unspecified behavior - both source completions available
# Line 1765 | Line 2042 | public class CompletableFutureTest exten
2042          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2043          try {
2044              assertEquals(inc(v1), h4.join());
2045 <            rs[4].assertInvoked();
2045 >            rs[4].assertValue(inc(v1));
2046          } catch (CompletionException ok) {
2047 <            checkCompletedWithWrappedCFException(h4, ex);
2047 >            checkCompletedWithWrappedException(h4, ex);
2048              rs[4].assertNotInvoked();
2049          }
2050          try {
2051              assertEquals(inc(v1), h5.join());
2052 <            rs[5].assertInvoked();
2052 >            rs[5].assertValue(inc(v1));
2053          } catch (CompletionException ok) {
2054 <            checkCompletedWithWrappedCFException(h5, ex);
2054 >            checkCompletedWithWrappedException(h5, ex);
2055              rs[5].assertNotInvoked();
2056          }
2057  
2058 <        checkCompletedWithWrappedCFException(f, ex);
2058 >        checkCompletedExceptionally(f, ex);
2059          checkCompletedNormally(g, v1);
2060 <        checkCompletedWithWrappedCFException(h0, ex);
2061 <        checkCompletedWithWrappedCFException(h1, ex);
2062 <        checkCompletedWithWrappedCFException(h2, ex);
2063 <        checkCompletedWithWrappedCFException(h3, ex);
2064 <        checkCompletedWithWrappedCFException(h4, ex);
2060 >        checkCompletedWithWrappedException(h0, ex);
2061 >        checkCompletedWithWrappedException(h1, ex);
2062 >        checkCompletedWithWrappedException(h2, ex);
2063 >        checkCompletedWithWrappedException(h3, ex);
2064 >        checkCompletedWithWrappedException(h4, ex);
2065          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2066      }}
2067  
2068 +    public void testApplyToEither_exceptionalCompletion2() {
2069 +        for (ExecutionMode m : ExecutionMode.values())
2070 +        for (boolean fFirst : new boolean[] { true, false })
2071 +        for (Integer v1 : new Integer[] { 1, null })
2072 +    {
2073 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2074 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2075 +        final CFException ex = new CFException();
2076 +        final IncFunction[] rs = new IncFunction[6];
2077 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2078 +
2079 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2080 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2081 +        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2082 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2083 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2084 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2085 +
2086 +        // unspecified behavior - both source completions available
2087 +        try {
2088 +            assertEquals(inc(v1), h0.join());
2089 +            rs[0].assertValue(inc(v1));
2090 +        } catch (CompletionException ok) {
2091 +            checkCompletedWithWrappedException(h0, ex);
2092 +            rs[0].assertNotInvoked();
2093 +        }
2094 +        try {
2095 +            assertEquals(inc(v1), h1.join());
2096 +            rs[1].assertValue(inc(v1));
2097 +        } catch (CompletionException ok) {
2098 +            checkCompletedWithWrappedException(h1, ex);
2099 +            rs[1].assertNotInvoked();
2100 +        }
2101 +        try {
2102 +            assertEquals(inc(v1), h2.join());
2103 +            rs[2].assertValue(inc(v1));
2104 +        } catch (CompletionException ok) {
2105 +            checkCompletedWithWrappedException(h2, ex);
2106 +            rs[2].assertNotInvoked();
2107 +        }
2108 +        try {
2109 +            assertEquals(inc(v1), h3.join());
2110 +            rs[3].assertValue(inc(v1));
2111 +        } catch (CompletionException ok) {
2112 +            checkCompletedWithWrappedException(h3, ex);
2113 +            rs[3].assertNotInvoked();
2114 +        }
2115 +
2116 +        checkCompletedNormally(f, v1);
2117 +        checkCompletedExceptionally(g, ex);
2118 +    }}
2119 +
2120      /**
2121       * applyToEither result completes exceptionally if either source cancelled
2122       */
# Line 1821 | Line 2150 | public class CompletableFutureTest exten
2150          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2151          try {
2152              assertEquals(inc(v1), h4.join());
2153 <            rs[4].assertInvoked();
2153 >            rs[4].assertValue(inc(v1));
2154          } catch (CompletionException ok) {
2155              checkCompletedWithWrappedCancellationException(h4);
2156              rs[4].assertNotInvoked();
2157          }
2158          try {
2159              assertEquals(inc(v1), h5.join());
2160 <            rs[5].assertInvoked();
2160 >            rs[5].assertValue(inc(v1));
2161          } catch (CompletionException ok) {
2162              checkCompletedWithWrappedCancellationException(h5);
2163              rs[5].assertNotInvoked();
# Line 1843 | Line 2172 | public class CompletableFutureTest exten
2172          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2173      }}
2174  
2175 +    public void testApplyToEither_sourceCancelled2() {
2176 +        for (ExecutionMode m : ExecutionMode.values())
2177 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2178 +        for (boolean fFirst : new boolean[] { true, false })
2179 +        for (Integer v1 : new Integer[] { 1, null })
2180 +    {
2181 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2182 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2183 +        final IncFunction[] rs = new IncFunction[6];
2184 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2185 +
2186 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2187 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2188 +        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2189 +        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2190 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2191 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2192 +
2193 +        // unspecified behavior - both source completions available
2194 +        try {
2195 +            assertEquals(inc(v1), h0.join());
2196 +            rs[0].assertValue(inc(v1));
2197 +        } catch (CompletionException ok) {
2198 +            checkCompletedWithWrappedCancellationException(h0);
2199 +            rs[0].assertNotInvoked();
2200 +        }
2201 +        try {
2202 +            assertEquals(inc(v1), h1.join());
2203 +            rs[1].assertValue(inc(v1));
2204 +        } catch (CompletionException ok) {
2205 +            checkCompletedWithWrappedCancellationException(h1);
2206 +            rs[1].assertNotInvoked();
2207 +        }
2208 +        try {
2209 +            assertEquals(inc(v1), h2.join());
2210 +            rs[2].assertValue(inc(v1));
2211 +        } catch (CompletionException ok) {
2212 +            checkCompletedWithWrappedCancellationException(h2);
2213 +            rs[2].assertNotInvoked();
2214 +        }
2215 +        try {
2216 +            assertEquals(inc(v1), h3.join());
2217 +            rs[3].assertValue(inc(v1));
2218 +        } catch (CompletionException ok) {
2219 +            checkCompletedWithWrappedCancellationException(h3);
2220 +            rs[3].assertNotInvoked();
2221 +        }
2222 +
2223 +        checkCompletedNormally(f, v1);
2224 +        checkCancelled(g);
2225 +    }}
2226 +
2227      /**
2228       * applyToEither result completes exceptionally if action does
2229       */
# Line 1957 | Line 2338 | public class CompletableFutureTest exten
2338          rs[0].assertNotInvoked();
2339          rs[1].assertNotInvoked();
2340          f.completeExceptionally(ex);
2341 <        checkCompletedWithWrappedCFException(h0, ex);
2342 <        checkCompletedWithWrappedCFException(h1, ex);
2341 >        checkCompletedWithWrappedException(h0, ex);
2342 >        checkCompletedWithWrappedException(h1, ex);
2343          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2344          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2345 <        checkCompletedWithWrappedCFException(h2, ex);
2346 <        checkCompletedWithWrappedCFException(h3, ex);
2345 >        checkCompletedWithWrappedException(h2, ex);
2346 >        checkCompletedWithWrappedException(h3, ex);
2347  
2348          g.complete(v1);
2349  
# Line 1973 | Line 2354 | public class CompletableFutureTest exten
2354              assertNull(h4.join());
2355              rs[4].assertValue(v1);
2356          } catch (CompletionException ok) {
2357 <            checkCompletedWithWrappedCFException(h4, ex);
2357 >            checkCompletedWithWrappedException(h4, ex);
2358              rs[4].assertNotInvoked();
2359          }
2360          try {
2361              assertNull(h5.join());
2362              rs[5].assertValue(v1);
2363          } catch (CompletionException ok) {
2364 <            checkCompletedWithWrappedCFException(h5, ex);
2364 >            checkCompletedWithWrappedException(h5, ex);
2365              rs[5].assertNotInvoked();
2366          }
2367  
2368 <        checkCompletedWithWrappedCFException(f, ex);
2368 >        checkCompletedExceptionally(f, ex);
2369          checkCompletedNormally(g, v1);
2370 <        checkCompletedWithWrappedCFException(h0, ex);
2371 <        checkCompletedWithWrappedCFException(h1, ex);
2372 <        checkCompletedWithWrappedCFException(h2, ex);
2373 <        checkCompletedWithWrappedCFException(h3, ex);
2374 <        checkCompletedWithWrappedCFException(h4, ex);
2370 >        checkCompletedWithWrappedException(h0, ex);
2371 >        checkCompletedWithWrappedException(h1, ex);
2372 >        checkCompletedWithWrappedException(h2, ex);
2373 >        checkCompletedWithWrappedException(h3, ex);
2374 >        checkCompletedWithWrappedException(h4, ex);
2375          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2376      }}
2377  
2378 +    public void testAcceptEither_exceptionalCompletion2() {
2379 +        for (ExecutionMode m : ExecutionMode.values())
2380 +        for (boolean fFirst : new boolean[] { true, false })
2381 +        for (Integer v1 : new Integer[] { 1, null })
2382 +    {
2383 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2384 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2385 +        final CFException ex = new CFException();
2386 +        final NoopConsumer[] rs = new NoopConsumer[6];
2387 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2388 +
2389 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2390 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2391 +        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2392 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2393 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2394 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2395 +
2396 +        // unspecified behavior - both source completions available
2397 +        try {
2398 +            assertEquals(null, h0.join());
2399 +            rs[0].assertValue(v1);
2400 +        } catch (CompletionException ok) {
2401 +            checkCompletedWithWrappedException(h0, ex);
2402 +            rs[0].assertNotInvoked();
2403 +        }
2404 +        try {
2405 +            assertEquals(null, h1.join());
2406 +            rs[1].assertValue(v1);
2407 +        } catch (CompletionException ok) {
2408 +            checkCompletedWithWrappedException(h1, ex);
2409 +            rs[1].assertNotInvoked();
2410 +        }
2411 +        try {
2412 +            assertEquals(null, h2.join());
2413 +            rs[2].assertValue(v1);
2414 +        } catch (CompletionException ok) {
2415 +            checkCompletedWithWrappedException(h2, ex);
2416 +            rs[2].assertNotInvoked();
2417 +        }
2418 +        try {
2419 +            assertEquals(null, h3.join());
2420 +            rs[3].assertValue(v1);
2421 +        } catch (CompletionException ok) {
2422 +            checkCompletedWithWrappedException(h3, ex);
2423 +            rs[3].assertNotInvoked();
2424 +        }
2425 +
2426 +        checkCompletedNormally(f, v1);
2427 +        checkCompletedExceptionally(g, ex);
2428 +    }}
2429 +
2430      /**
2431       * acceptEither result completes exceptionally if either source cancelled
2432       */
# Line 2095 | Line 2528 | public class CompletableFutureTest exten
2528       * runAfterEither result completes normally after normal completion
2529       * of either source
2530       */
2531 <    public void testRunAfterEither_normalCompletion1() {
2531 >    public void testRunAfterEither_normalCompletion() {
2532          for (ExecutionMode m : ExecutionMode.values())
2533          for (Integer v1 : new Integer[] { 1, null })
2534          for (Integer v2 : new Integer[] { 2, null })
2535      {
2536          final CompletableFuture<Integer> f = new CompletableFuture<>();
2537          final CompletableFuture<Integer> g = new CompletableFuture<>();
2538 <        final Noop r = new Noop(m);
2539 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2538 >        final Noop[] rs = new Noop[6];
2539 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2540  
2541 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2542 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2543 +        checkIncomplete(h0);
2544 +        checkIncomplete(h1);
2545 +        rs[0].assertNotInvoked();
2546 +        rs[1].assertNotInvoked();
2547          f.complete(v1);
2548 <        checkCompletedNormally(h, null);
2549 <        r.assertInvoked();
2550 <        g.complete(v2);
2551 <
2552 <        checkCompletedNormally(f, v1);
2553 <        checkCompletedNormally(g, v2);
2554 <        checkCompletedNormally(h, null);
2555 <        r.assertInvoked();
2556 <    }}
2557 <
2119 <    public void testRunAfterEither_normalCompletion2() {
2120 <        for (ExecutionMode m : ExecutionMode.values())
2121 <        for (Integer v1 : new Integer[] { 1, null })
2122 <        for (Integer v2 : new Integer[] { 2, null })
2123 <    {
2124 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2125 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2126 <        final Noop r = new Noop(m);
2127 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2548 >        checkCompletedNormally(h0, null);
2549 >        checkCompletedNormally(h1, null);
2550 >        rs[0].assertInvoked();
2551 >        rs[1].assertInvoked();
2552 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2553 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2554 >        checkCompletedNormally(h2, null);
2555 >        checkCompletedNormally(h3, null);
2556 >        rs[2].assertInvoked();
2557 >        rs[3].assertInvoked();
2558  
2559          g.complete(v2);
2130        checkCompletedNormally(h, null);
2131        r.assertInvoked();
2132        f.complete(v1);
2560  
2561 <        checkCompletedNormally(f, v1);
2562 <        checkCompletedNormally(g, v2);
2136 <        checkCompletedNormally(h, null);
2137 <        r.assertInvoked();
2138 <        }}
2561 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2562 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2563  
2140    public void testRunAfterEither_normalCompletion3() {
2141        for (ExecutionMode m : ExecutionMode.values())
2142        for (Integer v1 : new Integer[] { 1, null })
2143        for (Integer v2 : new Integer[] { 2, null })
2144    {
2145        final CompletableFuture<Integer> f = new CompletableFuture<>();
2146        final CompletableFuture<Integer> g = new CompletableFuture<>();
2147        final Noop r = new Noop(m);
2148
2149        f.complete(v1);
2150        g.complete(v2);
2151        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2152
2153        checkCompletedNormally(h, null);
2564          checkCompletedNormally(f, v1);
2565          checkCompletedNormally(g, v2);
2566 <        r.assertInvoked();
2566 >        checkCompletedNormally(h0, null);
2567 >        checkCompletedNormally(h1, null);
2568 >        checkCompletedNormally(h2, null);
2569 >        checkCompletedNormally(h3, null);
2570 >        checkCompletedNormally(h4, null);
2571 >        checkCompletedNormally(h5, null);
2572 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2573      }}
2574  
2575      /**
2576       * runAfterEither result completes exceptionally after exceptional
2577       * completion of either source
2578       */
2579 <    public void testRunAfterEither_exceptionalCompletion1() {
2579 >    public void testRunAfterEither_exceptionalCompletion() {
2580          for (ExecutionMode m : ExecutionMode.values())
2581          for (Integer v1 : new Integer[] { 1, null })
2582      {
2583          final CompletableFuture<Integer> f = new CompletableFuture<>();
2584          final CompletableFuture<Integer> g = new CompletableFuture<>();
2169        final Noop r = new Noop(m);
2170        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2585          final CFException ex = new CFException();
2586 +        final Noop[] rs = new Noop[6];
2587 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2588  
2589 <        f.completeExceptionally(ex);
2590 <        checkCompletedWithWrappedCFException(h, ex);
2591 <        g.complete(v1);
2592 <
2593 <        r.assertNotInvoked();
2594 <        checkCompletedNormally(g, v1);
2595 <        checkCompletedWithWrappedCFException(f, ex);
2596 <        checkCompletedWithWrappedCFException(h, ex);
2597 <    }}
2598 <
2599 <    public void testRunAfterEither_exceptionalCompletion2() {
2600 <        for (ExecutionMode m : ExecutionMode.values())
2601 <        for (Integer v1 : new Integer[] { 1, null })
2186 <    {
2187 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2188 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2189 <        final Noop r = new Noop(m);
2190 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2191 <        final CFException ex = new CFException();
2192 <
2193 <        g.completeExceptionally(ex);
2194 <        checkCompletedWithWrappedCFException(h, ex);
2195 <        f.complete(v1);
2196 <
2197 <        r.assertNotInvoked();
2198 <        checkCompletedNormally(f, v1);
2199 <        checkCompletedWithWrappedCFException(g, ex);
2200 <        checkCompletedWithWrappedCFException(h, ex);
2201 <    }}
2202 <
2203 <    public void testRunAfterEither_exceptionalCompletion3() {
2204 <        for (ExecutionMode m : ExecutionMode.values())
2205 <        for (Integer v1 : new Integer[] { 1, null })
2206 <    {
2207 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2208 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2209 <        final Noop r = new Noop(m);
2210 <        final CFException ex = new CFException();
2589 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2590 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2591 >        checkIncomplete(h0);
2592 >        checkIncomplete(h1);
2593 >        rs[0].assertNotInvoked();
2594 >        rs[1].assertNotInvoked();
2595 >        assertTrue(f.completeExceptionally(ex));
2596 >        checkCompletedWithWrappedException(h0, ex);
2597 >        checkCompletedWithWrappedException(h1, ex);
2598 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2599 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2600 >        checkCompletedWithWrappedException(h2, ex);
2601 >        checkCompletedWithWrappedException(h3, ex);
2602  
2603 <        g.completeExceptionally(ex);
2213 <        f.complete(v1);
2214 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2603 >        assertTrue(g.complete(v1));
2604  
2605 <        // unspecified behavior
2606 <        Integer v;
2605 >        // unspecified behavior - both source completions available
2606 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2607 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2608          try {
2609 <            assertNull(h.join());
2610 <            r.assertInvoked();
2609 >            assertNull(h4.join());
2610 >            rs[4].assertInvoked();
2611          } catch (CompletionException ok) {
2612 <            checkCompletedWithWrappedCFException(h, ex);
2613 <            r.assertNotInvoked();
2612 >            checkCompletedWithWrappedException(h4, ex);
2613 >            rs[4].assertNotInvoked();
2614          }
2225
2226        checkCompletedWithWrappedCFException(g, ex);
2227        checkCompletedNormally(f, v1);
2228    }}
2229
2230    public void testRunAfterEither_exceptionalCompletion4() {
2231        for (ExecutionMode m : ExecutionMode.values())
2232        for (Integer v1 : new Integer[] { 1, null })
2233    {
2234        final CompletableFuture<Integer> f = new CompletableFuture<>();
2235        final CompletableFuture<Integer> g = new CompletableFuture<>();
2236        final Noop r = new Noop(m);
2237        final CFException ex = new CFException();
2238
2239        f.completeExceptionally(ex);
2240        g.complete(v1);
2241        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2242
2243        // unspecified behavior
2244        Integer v;
2615          try {
2616 <            assertNull(h.join());
2617 <            r.assertInvoked();
2616 >            assertNull(h5.join());
2617 >            rs[5].assertInvoked();
2618          } catch (CompletionException ok) {
2619 <            checkCompletedWithWrappedCFException(h, ex);
2620 <            r.assertNotInvoked();
2619 >            checkCompletedWithWrappedException(h5, ex);
2620 >            rs[5].assertNotInvoked();
2621          }
2622  
2623 <        checkCompletedWithWrappedCFException(f, ex);
2623 >        checkCompletedExceptionally(f, ex);
2624          checkCompletedNormally(g, v1);
2625 +        checkCompletedWithWrappedException(h0, ex);
2626 +        checkCompletedWithWrappedException(h1, ex);
2627 +        checkCompletedWithWrappedException(h2, ex);
2628 +        checkCompletedWithWrappedException(h3, ex);
2629 +        checkCompletedWithWrappedException(h4, ex);
2630 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2631      }}
2632  
2633 <    /**
2258 <     * runAfterEither result completes exceptionally if action does
2259 <     */
2260 <    public void testRunAfterEither_actionFailed1() {
2633 >    public void testRunAfterEither_exceptionalCompletion2() {
2634          for (ExecutionMode m : ExecutionMode.values())
2635 +        for (boolean fFirst : new boolean[] { true, false })
2636          for (Integer v1 : new Integer[] { 1, null })
2263        for (Integer v2 : new Integer[] { 2, null })
2637      {
2638          final CompletableFuture<Integer> f = new CompletableFuture<>();
2639          final CompletableFuture<Integer> g = new CompletableFuture<>();
2640 <        final FailingRunnable r = new FailingRunnable(m);
2641 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2640 >        final CFException ex = new CFException();
2641 >        final Noop[] rs = new Noop[6];
2642 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2643  
2644 <        f.complete(v1);
2645 <        checkCompletedWithWrappedCFException(h);
2646 <        g.complete(v2);
2647 <        checkCompletedNormally(f, v1);
2648 <        checkCompletedNormally(g, v2);
2649 <    }}
2644 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2645 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2646 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2647 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2648 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2649 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2650  
2651 <    public void testRunAfterEither_actionFailed2() {
2652 <        for (ExecutionMode m : ExecutionMode.values())
2653 <        for (Integer v1 : new Integer[] { 1, null })
2654 <        for (Integer v2 : new Integer[] { 2, null })
2655 <    {
2656 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2657 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2658 <        final FailingRunnable r = new FailingRunnable(m);
2659 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2651 >        // unspecified behavior - both source completions available
2652 >        try {
2653 >            assertEquals(null, h0.join());
2654 >            rs[0].assertInvoked();
2655 >        } catch (CompletionException ok) {
2656 >            checkCompletedWithWrappedException(h0, ex);
2657 >            rs[0].assertNotInvoked();
2658 >        }
2659 >        try {
2660 >            assertEquals(null, h1.join());
2661 >            rs[1].assertInvoked();
2662 >        } catch (CompletionException ok) {
2663 >            checkCompletedWithWrappedException(h1, ex);
2664 >            rs[1].assertNotInvoked();
2665 >        }
2666 >        try {
2667 >            assertEquals(null, h2.join());
2668 >            rs[2].assertInvoked();
2669 >        } catch (CompletionException ok) {
2670 >            checkCompletedWithWrappedException(h2, ex);
2671 >            rs[2].assertNotInvoked();
2672 >        }
2673 >        try {
2674 >            assertEquals(null, h3.join());
2675 >            rs[3].assertInvoked();
2676 >        } catch (CompletionException ok) {
2677 >            checkCompletedWithWrappedException(h3, ex);
2678 >            rs[3].assertNotInvoked();
2679 >        }
2680  
2287        g.complete(v2);
2288        checkCompletedWithWrappedCFException(h);
2289        f.complete(v1);
2681          checkCompletedNormally(f, v1);
2682 <        checkCompletedNormally(g, v2);
2682 >        checkCompletedExceptionally(g, ex);
2683      }}
2684  
2685      /**
2686       * runAfterEither result completes exceptionally if either source cancelled
2687       */
2688 <    public void testRunAfterEither_sourceCancelled1() {
2688 >    public void testRunAfterEither_sourceCancelled() {
2689          for (ExecutionMode m : ExecutionMode.values())
2690          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2691          for (Integer v1 : new Integer[] { 1, null })
2692      {
2693          final CompletableFuture<Integer> f = new CompletableFuture<>();
2694          final CompletableFuture<Integer> g = new CompletableFuture<>();
2695 <        final Noop r = new Noop(m);
2696 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2695 >        final Noop[] rs = new Noop[6];
2696 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2697  
2698 <        assertTrue(f.cancel(mayInterruptIfRunning));
2699 <        checkCompletedWithWrappedCancellationException(h);
2700 <        g.complete(v1);
2701 <
2702 <        checkCancelled(f);
2703 <        r.assertNotInvoked();
2704 <        checkCompletedNormally(g, v1);
2705 <        checkCompletedWithWrappedCancellationException(h);
2706 <    }}
2707 <
2708 <    public void testRunAfterEither_sourceCancelled2() {
2709 <        for (ExecutionMode m : ExecutionMode.values())
2710 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2320 <        for (Integer v1 : new Integer[] { 1, null })
2321 <    {
2322 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2323 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 <        final Noop r = new Noop(m);
2325 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2326 <
2327 <        assertTrue(g.cancel(mayInterruptIfRunning));
2328 <        checkCompletedWithWrappedCancellationException(h);
2329 <        f.complete(v1);
2330 <
2331 <        checkCancelled(g);
2332 <        r.assertNotInvoked();
2333 <        checkCompletedNormally(f, v1);
2334 <        checkCompletedWithWrappedCancellationException(h);
2335 <    }}
2336 <
2337 <    public void testRunAfterEither_sourceCancelled3() {
2338 <        for (ExecutionMode m : ExecutionMode.values())
2339 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2340 <        for (Integer v1 : new Integer[] { 1, null })
2341 <    {
2342 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2343 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2344 <        final Noop r = new Noop(m);
2698 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2699 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2700 >        checkIncomplete(h0);
2701 >        checkIncomplete(h1);
2702 >        rs[0].assertNotInvoked();
2703 >        rs[1].assertNotInvoked();
2704 >        f.cancel(mayInterruptIfRunning);
2705 >        checkCompletedWithWrappedCancellationException(h0);
2706 >        checkCompletedWithWrappedCancellationException(h1);
2707 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2708 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2709 >        checkCompletedWithWrappedCancellationException(h2);
2710 >        checkCompletedWithWrappedCancellationException(h3);
2711  
2712 <        assertTrue(g.cancel(mayInterruptIfRunning));
2347 <        f.complete(v1);
2348 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2712 >        assertTrue(g.complete(v1));
2713  
2714 <        // unspecified behavior
2715 <        Integer v;
2714 >        // unspecified behavior - both source completions available
2715 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2716 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2717          try {
2718 <            assertNull(h.join());
2719 <            r.assertInvoked();
2718 >            assertNull(h4.join());
2719 >            rs[4].assertInvoked();
2720          } catch (CompletionException ok) {
2721 <            checkCompletedWithWrappedCancellationException(h);
2722 <            r.assertNotInvoked();
2721 >            checkCompletedWithWrappedCancellationException(h4);
2722 >            rs[4].assertNotInvoked();
2723 >        }
2724 >        try {
2725 >            assertNull(h5.join());
2726 >            rs[5].assertInvoked();
2727 >        } catch (CompletionException ok) {
2728 >            checkCompletedWithWrappedCancellationException(h5);
2729 >            rs[5].assertNotInvoked();
2730          }
2731  
2732 <        checkCancelled(g);
2733 <        checkCompletedNormally(f, v1);
2732 >        checkCancelled(f);
2733 >        checkCompletedNormally(g, v1);
2734 >        checkCompletedWithWrappedCancellationException(h0);
2735 >        checkCompletedWithWrappedCancellationException(h1);
2736 >        checkCompletedWithWrappedCancellationException(h2);
2737 >        checkCompletedWithWrappedCancellationException(h3);
2738 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2739      }}
2740  
2741 <    public void testRunAfterEither_sourceCancelled4() {
2741 >    /**
2742 >     * runAfterEither result completes exceptionally if action does
2743 >     */
2744 >    public void testRunAfterEither_actionFailed() {
2745          for (ExecutionMode m : ExecutionMode.values())
2366        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2746          for (Integer v1 : new Integer[] { 1, null })
2747 +        for (Integer v2 : new Integer[] { 2, null })
2748      {
2749          final CompletableFuture<Integer> f = new CompletableFuture<>();
2750          final CompletableFuture<Integer> g = new CompletableFuture<>();
2751 <        final Noop r = new Noop(m);
2751 >        final FailingRunnable[] rs = new FailingRunnable[6];
2752 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2753  
2754 <        assertTrue(f.cancel(mayInterruptIfRunning));
2755 <        g.complete(v1);
2756 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2757 <
2758 <        // unspecified behavior
2759 <        Integer v;
2760 <        try {
2761 <            assertNull(h.join());
2762 <            r.assertInvoked();
2763 <        } catch (CompletionException ok) {
2764 <            checkCompletedWithWrappedCancellationException(h);
2765 <            r.assertNotInvoked();
2766 <        }
2754 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2755 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2756 >        assertTrue(f.complete(v1));
2757 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2758 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2759 >        checkCompletedWithWrappedCFException(h0);
2760 >        checkCompletedWithWrappedCFException(h1);
2761 >        checkCompletedWithWrappedCFException(h2);
2762 >        checkCompletedWithWrappedCFException(h3);
2763 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2764 >        assertTrue(g.complete(v2));
2765 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2766 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2767 >        checkCompletedWithWrappedCFException(h4);
2768 >        checkCompletedWithWrappedCFException(h5);
2769  
2770 <        checkCancelled(f);
2771 <        checkCompletedNormally(g, v1);
2770 >        checkCompletedNormally(f, v1);
2771 >        checkCompletedNormally(g, v2);
2772 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2773      }}
2774  
2775      /**
# Line 2398 | Line 2782 | public class CompletableFutureTest exten
2782      {
2783          final CompletableFuture<Integer> f = new CompletableFuture<>();
2784          final CompletableFutureInc r = new CompletableFutureInc(m);
2785 <        if (!createIncomplete) f.complete(v1);
2785 >        if (!createIncomplete) assertTrue(f.complete(v1));
2786          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2787 <        if (createIncomplete) f.complete(v1);
2787 >        if (createIncomplete) assertTrue(f.complete(v1));
2788  
2789          checkCompletedNormally(g, inc(v1));
2790          checkCompletedNormally(f, v1);
2791 <        r.assertInvoked();
2791 >        r.assertValue(v1);
2792      }}
2793  
2794      /**
# Line 2422 | Line 2806 | public class CompletableFutureTest exten
2806          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2807          if (createIncomplete) f.completeExceptionally(ex);
2808  
2809 <        checkCompletedWithWrappedCFException(g, ex);
2810 <        checkCompletedWithWrappedCFException(f, ex);
2809 >        checkCompletedWithWrappedException(g, ex);
2810 >        checkCompletedExceptionally(f, ex);
2811          r.assertNotInvoked();
2812      }}
2813  
# Line 2438 | Line 2822 | public class CompletableFutureTest exten
2822          final CompletableFuture<Integer> f = new CompletableFuture<>();
2823          final FailingCompletableFutureFunction r
2824              = new FailingCompletableFutureFunction(m);
2825 <        if (!createIncomplete) f.complete(v1);
2825 >        if (!createIncomplete) assertTrue(f.complete(v1));
2826          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2827 <        if (createIncomplete) f.complete(v1);
2827 >        if (createIncomplete) assertTrue(f.complete(v1));
2828  
2829          checkCompletedWithWrappedCFException(g);
2830          checkCompletedNormally(f, v1);
# Line 2679 | Line 3063 | public class CompletableFutureTest exten
3063          assertSame(f, f.toCompletableFuture());
3064      }
3065  
3066 <    /**
3067 <     * whenComplete action executes on normal completion, propagating
3068 <     * source result.
3069 <     */
3070 <    public void testWhenComplete_normalCompletion1() {
3071 <        for (ExecutionMode m : ExecutionMode.values())
3072 <        for (boolean createIncomplete : new boolean[] { true, false })
3073 <        for (Integer v1 : new Integer[] { 1, null })
3074 <    {
3075 <        final AtomicInteger a = new AtomicInteger(0);
3076 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3077 <        if (!createIncomplete) f.complete(v1);
3078 <        final CompletableFuture<Integer> g = m.whenComplete
3079 <            (f,
3080 <             (Integer x, Throwable t) -> {
3081 <                threadAssertSame(x, v1);
3082 <                threadAssertNull(t);
2699 <                a.getAndIncrement();
2700 <            });
2701 <        if (createIncomplete) f.complete(v1);
2702 <
2703 <        checkCompletedNormally(g, v1);
2704 <        checkCompletedNormally(f, v1);
2705 <        assertEquals(1, a.get());
2706 <    }}
2707 <
2708 <    /**
2709 <     * whenComplete action executes on exceptional completion, propagating
2710 <     * source result.
2711 <     */
2712 <    public void testWhenComplete_exceptionalCompletion() {
2713 <        for (ExecutionMode m : ExecutionMode.values())
2714 <        for (boolean createIncomplete : new boolean[] { true, false })
2715 <        for (Integer v1 : new Integer[] { 1, null })
2716 <    {
2717 <        final AtomicInteger a = new AtomicInteger(0);
2718 <        final CFException ex = new CFException();
2719 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2720 <        if (!createIncomplete) f.completeExceptionally(ex);
2721 <        final CompletableFuture<Integer> g = m.whenComplete
2722 <            (f,
2723 <             (Integer x, Throwable t) -> {
2724 <                threadAssertNull(x);
2725 <                threadAssertSame(t, ex);
2726 <                a.getAndIncrement();
2727 <            });
2728 <        if (createIncomplete) f.completeExceptionally(ex);
2729 <        checkCompletedWithWrappedCFException(f, ex);
2730 <        checkCompletedWithWrappedCFException(g, ex);
2731 <        assertEquals(1, a.get());
2732 <    }}
2733 <
2734 <    /**
2735 <     * whenComplete action executes on cancelled source, propagating
2736 <     * CancellationException.
2737 <     */
2738 <    public void testWhenComplete_sourceCancelled() {
2739 <        for (ExecutionMode m : ExecutionMode.values())
2740 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2741 <        for (boolean createIncomplete : new boolean[] { true, false })
2742 <    {
2743 <        final AtomicInteger a = new AtomicInteger(0);
2744 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2745 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2746 <        final CompletableFuture<Integer> g = m.whenComplete
2747 <            (f,
2748 <             (Integer x, Throwable t) -> {
2749 <                threadAssertNull(x);
2750 <                threadAssertTrue(t instanceof CancellationException);
2751 <                a.getAndIncrement();
2752 <            });
2753 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2754 <
2755 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2756 <        checkCompletedWithWrappedCancellationException(g);
2757 <        checkCancelled(f);
2758 <        assertEquals(1, a.get());
2759 <    }}
2760 <
2761 <    /**
2762 <     * If a whenComplete action throws an exception when triggered by
2763 <     * a normal completion, it completes exceptionally
2764 <     */
2765 <    public void testWhenComplete_actionFailed() {
2766 <        for (boolean createIncomplete : new boolean[] { true, false })
2767 <        for (ExecutionMode m : ExecutionMode.values())
2768 <        for (Integer v1 : new Integer[] { 1, null })
2769 <    {
2770 <        final AtomicInteger a = new AtomicInteger(0);
2771 <        final CFException ex = new CFException();
2772 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2773 <        if (!createIncomplete) f.complete(v1);
2774 <        final CompletableFuture<Integer> g = m.whenComplete
2775 <            (f,
2776 <             (Integer x, Throwable t) -> {
2777 <                threadAssertSame(x, v1);
2778 <                threadAssertNull(t);
2779 <                a.getAndIncrement();
2780 <                throw ex;
2781 <            });
2782 <        if (createIncomplete) f.complete(v1);
2783 <        checkCompletedNormally(f, v1);
2784 <        checkCompletedWithWrappedCFException(g, ex);
2785 <        assertEquals(1, a.get());
2786 <    }}
2787 <
2788 <    /**
2789 <     * If a whenComplete action throws an exception when triggered by
2790 <     * a source completion that also throws an exception, the source
2791 <     * exception takes precedence.
2792 <     */
2793 <    public void testWhenComplete_actionFailedSourceFailed() {
2794 <        for (boolean createIncomplete : new boolean[] { true, false })
2795 <        for (ExecutionMode m : ExecutionMode.values())
2796 <        for (Integer v1 : new Integer[] { 1, null })
2797 <    {
2798 <        final AtomicInteger a = new AtomicInteger(0);
2799 <        final CFException ex1 = new CFException();
2800 <        final CFException ex2 = new CFException();
2801 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2802 <
2803 <        if (!createIncomplete) f.completeExceptionally(ex1);
2804 <        final CompletableFuture<Integer> g = m.whenComplete
2805 <            (f,
2806 <             (Integer x, Throwable t) -> {
2807 <                threadAssertSame(t, ex1);
2808 <                threadAssertNull(x);
2809 <                a.getAndIncrement();
2810 <                throw ex2;
2811 <            });
2812 <        if (createIncomplete) f.completeExceptionally(ex1);
2813 <
2814 <        checkCompletedWithWrappedCFException(f, ex1);
2815 <        checkCompletedWithWrappedCFException(g, ex1);
2816 <        assertEquals(1, a.get());
2817 <    }}
3066 > //     public void testRunAfterEither_resultDeterminedAtTimeOfCreation() {
3067 > //         for (ExecutionMode m : ExecutionMode.values())
3068 > //         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3069 > //         for (Integer v1 : new Integer[] { 1, null })
3070 > //     {
3071 > //         final CompletableFuture<Integer> f = new CompletableFuture<>();
3072 > //         final CompletableFuture<Integer> g = new CompletableFuture<>();
3073 > //         final Noop[] rs = new Noop[2];
3074 > //         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
3075 > //         f.complete(v1);
3076 > //         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3077 > //         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3078 > //         assertTrue(g.cancel(mayInterruptIfRunning));
3079 > //         checkCompletedNormally(h0, null);
3080 > //         checkCompletedNormally(h1, null);
3081 > //         for (Noop r : rs) r.assertInvoked();
3082 > //     }}
3083  
3084   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines