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.63 by jsr166, Fri Jun 6 16:54:16 2014 UTC vs.
Revision 1.88 by jsr166, Mon Jun 16 21:23: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 360 | Line 413 | public class CompletableFutureTest exten
413          return (x == null) ? null : x + 1;
414      }
415  
416 <    class IncAction extends CheckedIntegerAction
416 >    class NoopConsumer extends CheckedIntegerAction
417          implements Consumer<Integer>
418      {
419 <        IncAction(ExecutionMode m) { super(m); }
419 >        NoopConsumer(ExecutionMode m) { super(m); }
420          public void accept(Integer x) {
421              invoked();
422 <            value = inc(x);
422 >            value = x;
423          }
424      }
425  
# 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 1249 | Line 1444 | public class CompletableFutureTest exten
1444          for (Integer v1 : new Integer[] { 1, null })
1445      {
1446          final CompletableFuture<Integer> f = new CompletableFuture<>();
1447 <        final IncAction r = new IncAction(m);
1448 <        if (!createIncomplete) f.complete(v1);
1447 >        final NoopConsumer r = new NoopConsumer(m);
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);
1456 +        r.assertValue(v1);
1457          checkCompletedNormally(f, v1);
1262        r.assertInvoked();
1263        r.assertValue(inc(v1));
1458      }}
1459  
1460      /**
# Line 1273 | Line 1467 | public class CompletableFutureTest exten
1467      {
1468          final CFException ex = new CFException();
1469          final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        final IncAction r = new IncAction(m);
1470 >        final NoopConsumer r = new NoopConsumer(m);
1471          if (!createIncomplete) f.completeExceptionally(ex);
1472          final CompletableFuture<Void> g = m.thenAccept(f, r);
1473          if (createIncomplete) {
# Line 1281 | 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 1295 | Line 1489 | public class CompletableFutureTest exten
1489          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490      {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final IncAction r = new IncAction(m);
1492 >        final NoopConsumer r = new NoopConsumer(m);
1493          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1494          final CompletableFuture<Void> g = m.thenAccept(f, r);
1495          if (createIncomplete) {
# Line 1335 | Line 1529 | public class CompletableFutureTest exten
1529       */
1530      public void testThenCombine_normalCompletion() {
1531          for (ExecutionMode m : ExecutionMode.values())
1338        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);
1360        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())
1369        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 })
1399        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 1430 | Line 1662 | public class CompletableFutureTest exten
1662      {
1663          final CompletableFuture<Integer> f = new CompletableFuture<>();
1664          final CompletableFuture<Integer> g = new CompletableFuture<>();
1665 <        final FailingBiFunction r = new FailingBiFunction(m);
1666 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1667 <
1668 <        if (fFirst) {
1669 <            f.complete(v1);
1670 <            g.complete(v2);
1671 <        } else {
1672 <            g.complete(v2);
1673 <            f.complete(v1);
1674 <        }
1665 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1666 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1667 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1668 >
1669 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1670 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1671 >        final Integer w1 =  fFirst ? v1 : v2;
1672 >        final Integer w2 = !fFirst ? v1 : v2;
1673 >
1674 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1675 >        assertTrue(fst.complete(w1));
1676 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1677 >        assertTrue(snd.complete(w2));
1678 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1679  
1680 <        checkCompletedWithWrappedCFException(h);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedWithWrappedCFException(h3);
1683 >        r1.assertInvoked();
1684 >        r2.assertInvoked();
1685 >        r3.assertInvoked();
1686          checkCompletedNormally(f, v1);
1687          checkCompletedNormally(g, v2);
1688      }}
# Line 1452 | Line 1693 | public class CompletableFutureTest exten
1693       */
1694      public void testThenAcceptBoth_normalCompletion() {
1695          for (ExecutionMode m : ExecutionMode.values())
1455        for (boolean createIncomplete : new boolean[] { true, false })
1696          for (boolean fFirst : new boolean[] { true, false })
1697          for (Integer v1 : new Integer[] { 1, null })
1698          for (Integer v2 : new Integer[] { 2, null })
1699      {
1700          final CompletableFuture<Integer> f = new CompletableFuture<>();
1701          final CompletableFuture<Integer> g = new CompletableFuture<>();
1702 <        final SubtractAction r = new SubtractAction(m);
1703 <
1704 <        if (fFirst) f.complete(v1); else g.complete(v2);
1705 <        if (!createIncomplete)
1706 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1707 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1708 <        if (createIncomplete) {
1709 <            checkIncomplete(h);
1710 <            r.assertNotInvoked();
1711 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1712 <        }
1702 >        final SubtractAction r1 = new SubtractAction(m);
1703 >        final SubtractAction r2 = new SubtractAction(m);
1704 >        final SubtractAction r3 = new SubtractAction(m);
1705 >
1706 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1707 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1708 >        final Integer w1 =  fFirst ? v1 : v2;
1709 >        final Integer w2 = !fFirst ? v1 : v2;
1710 >
1711 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1712 >        assertTrue(fst.complete(w1));
1713 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1714 >        checkIncomplete(h1);
1715 >        checkIncomplete(h2);
1716 >        r1.assertNotInvoked();
1717 >        r2.assertNotInvoked();
1718 >        assertTrue(snd.complete(w2));
1719 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1720  
1721 <        checkCompletedNormally(h, null);
1722 <        r.assertValue(subtract(v1, v2));
1721 >        checkCompletedNormally(h1, null);
1722 >        checkCompletedNormally(h2, null);
1723 >        checkCompletedNormally(h3, null);
1724 >        r1.assertValue(subtract(v1, v2));
1725 >        r2.assertValue(subtract(v1, v2));
1726 >        r3.assertValue(subtract(v1, v2));
1727          checkCompletedNormally(f, v1);
1728          checkCompletedNormally(g, v2);
1729      }}
# Line 1481 | Line 1732 | public class CompletableFutureTest exten
1732       * thenAcceptBoth result completes exceptionally after exceptional
1733       * completion of either source
1734       */
1735 <    public void testThenAcceptBoth_exceptionalCompletion() {
1735 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1736          for (ExecutionMode m : ExecutionMode.values())
1486        for (boolean createIncomplete : new boolean[] { true, false })
1737          for (boolean fFirst : new boolean[] { true, false })
1738 +        for (boolean failFirst : new boolean[] { true, false })
1739          for (Integer v1 : new Integer[] { 1, null })
1740      {
1741          final CompletableFuture<Integer> f = new CompletableFuture<>();
1742          final CompletableFuture<Integer> g = new CompletableFuture<>();
1743          final CFException ex = new CFException();
1744 <        final SubtractAction r = new SubtractAction(m);
1745 <
1746 <        (fFirst ? f : g).complete(v1);
1747 <        if (!createIncomplete)
1748 <            (!fFirst ? f : g).completeExceptionally(ex);
1749 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1750 <        if (createIncomplete) {
1751 <            checkIncomplete(h);
1752 <            (!fFirst ? f : g).completeExceptionally(ex);
1753 <        }
1754 <
1755 <        checkCompletedWithWrappedCFException(h, ex);
1756 <        r.assertNotInvoked();
1757 <        checkCompletedNormally(fFirst ? f : g, v1);
1758 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1744 >        final SubtractAction r1 = new SubtractAction(m);
1745 >        final SubtractAction r2 = new SubtractAction(m);
1746 >        final SubtractAction r3 = new SubtractAction(m);
1747 >
1748 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1749 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1750 >        final Callable<Boolean> complete1 = failFirst ?
1751 >            () -> fst.completeExceptionally(ex) :
1752 >            () -> fst.complete(v1);
1753 >        final Callable<Boolean> complete2 = failFirst ?
1754 >            () -> snd.complete(v1) :
1755 >            () -> snd.completeExceptionally(ex);
1756 >
1757 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1758 >        assertTrue(complete1.call());
1759 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1760 >        checkIncomplete(h1);
1761 >        checkIncomplete(h2);
1762 >        assertTrue(complete2.call());
1763 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1764 >
1765 >        checkCompletedWithWrappedException(h1, ex);
1766 >        checkCompletedWithWrappedException(h2, ex);
1767 >        checkCompletedWithWrappedException(h3, ex);
1768 >        r1.assertNotInvoked();
1769 >        r2.assertNotInvoked();
1770 >        r3.assertNotInvoked();
1771 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1772 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1773      }}
1774  
1775      /**
1776       * thenAcceptBoth result completes exceptionally if either source cancelled
1777       */
1778 <    public void testThenAcceptBoth_sourceCancelled() {
1778 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1779          for (ExecutionMode m : ExecutionMode.values())
1780          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1516        for (boolean createIncomplete : new boolean[] { true, false })
1781          for (boolean fFirst : new boolean[] { true, false })
1782 +        for (boolean failFirst : new boolean[] { true, false })
1783          for (Integer v1 : new Integer[] { 1, null })
1784      {
1785          final CompletableFuture<Integer> f = new CompletableFuture<>();
1786          final CompletableFuture<Integer> g = new CompletableFuture<>();
1787 <        final SubtractAction r = new SubtractAction(m);
1787 >        final SubtractAction r1 = new SubtractAction(m);
1788 >        final SubtractAction r2 = new SubtractAction(m);
1789 >        final SubtractAction r3 = new SubtractAction(m);
1790  
1791 <        (fFirst ? f : g).complete(v1);
1792 <        if (!createIncomplete)
1793 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1794 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1795 <        if (createIncomplete) {
1796 <            checkIncomplete(h);
1797 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1798 <        }
1791 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1792 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1793 >        final Callable<Boolean> complete1 = failFirst ?
1794 >            () -> fst.cancel(mayInterruptIfRunning) :
1795 >            () -> fst.complete(v1);
1796 >        final Callable<Boolean> complete2 = failFirst ?
1797 >            () -> snd.complete(v1) :
1798 >            () -> snd.cancel(mayInterruptIfRunning);
1799  
1800 <        checkCompletedWithWrappedCancellationException(h);
1801 <        checkCancelled(!fFirst ? f : g);
1802 <        r.assertNotInvoked();
1803 <        checkCompletedNormally(fFirst ? f : g, v1);
1800 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1801 >        assertTrue(complete1.call());
1802 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1803 >        checkIncomplete(h1);
1804 >        checkIncomplete(h2);
1805 >        assertTrue(complete2.call());
1806 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1807 >
1808 >        checkCompletedWithWrappedCancellationException(h1);
1809 >        checkCompletedWithWrappedCancellationException(h2);
1810 >        checkCompletedWithWrappedCancellationException(h3);
1811 >        r1.assertNotInvoked();
1812 >        r2.assertNotInvoked();
1813 >        r3.assertNotInvoked();
1814 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1815 >        checkCancelled(failFirst ? fst : snd);
1816      }}
1817  
1818      /**
# Line 1547 | Line 1826 | public class CompletableFutureTest exten
1826      {
1827          final CompletableFuture<Integer> f = new CompletableFuture<>();
1828          final CompletableFuture<Integer> g = new CompletableFuture<>();
1829 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1830 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1831 <
1832 <        if (fFirst) {
1833 <            f.complete(v1);
1834 <            g.complete(v2);
1835 <        } else {
1836 <            g.complete(v2);
1837 <            f.complete(v1);
1838 <        }
1829 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1830 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1831 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1832 >
1833 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1834 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1835 >        final Integer w1 =  fFirst ? v1 : v2;
1836 >        final Integer w2 = !fFirst ? v1 : v2;
1837 >
1838 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1839 >        assertTrue(fst.complete(w1));
1840 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1841 >        assertTrue(snd.complete(w2));
1842 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1843  
1844 <        checkCompletedWithWrappedCFException(h);
1844 >        checkCompletedWithWrappedCFException(h1);
1845 >        checkCompletedWithWrappedCFException(h2);
1846 >        checkCompletedWithWrappedCFException(h3);
1847 >        r1.assertInvoked();
1848 >        r2.assertInvoked();
1849 >        r3.assertInvoked();
1850          checkCompletedNormally(f, v1);
1851          checkCompletedNormally(g, v2);
1852      }}
# Line 1569 | Line 1857 | public class CompletableFutureTest exten
1857       */
1858      public void testRunAfterBoth_normalCompletion() {
1859          for (ExecutionMode m : ExecutionMode.values())
1572        for (boolean createIncomplete : new boolean[] { true, false })
1860          for (boolean fFirst : new boolean[] { true, false })
1861          for (Integer v1 : new Integer[] { 1, null })
1862          for (Integer v2 : new Integer[] { 2, null })
1863      {
1864          final CompletableFuture<Integer> f = new CompletableFuture<>();
1865          final CompletableFuture<Integer> g = new CompletableFuture<>();
1866 <        final Noop r = new Noop(m);
1867 <
1868 <        if (fFirst) f.complete(v1); else g.complete(v2);
1869 <        if (!createIncomplete)
1870 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1871 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1872 <        if (createIncomplete) {
1873 <            checkIncomplete(h);
1874 <            r.assertNotInvoked();
1875 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1876 <        }
1866 >        final Noop r1 = new Noop(m);
1867 >        final Noop r2 = new Noop(m);
1868 >        final Noop r3 = new Noop(m);
1869 >
1870 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1871 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1872 >        final Integer w1 =  fFirst ? v1 : v2;
1873 >        final Integer w2 = !fFirst ? v1 : v2;
1874 >
1875 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1876 >        assertTrue(fst.complete(w1));
1877 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1878 >        checkIncomplete(h1);
1879 >        checkIncomplete(h2);
1880 >        r1.assertNotInvoked();
1881 >        r2.assertNotInvoked();
1882 >        assertTrue(snd.complete(w2));
1883 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1884  
1885 <        checkCompletedNormally(h, null);
1886 <        r.assertInvoked();
1885 >        checkCompletedNormally(h1, null);
1886 >        checkCompletedNormally(h2, null);
1887 >        checkCompletedNormally(h3, null);
1888 >        r1.assertInvoked();
1889 >        r2.assertInvoked();
1890 >        r3.assertInvoked();
1891          checkCompletedNormally(f, v1);
1892          checkCompletedNormally(g, v2);
1893      }}
# Line 1598 | Line 1896 | public class CompletableFutureTest exten
1896       * runAfterBoth result completes exceptionally after exceptional
1897       * completion of either source
1898       */
1899 <    public void testRunAfterBoth_exceptionalCompletion() {
1899 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1900          for (ExecutionMode m : ExecutionMode.values())
1603        for (boolean createIncomplete : new boolean[] { true, false })
1901          for (boolean fFirst : new boolean[] { true, false })
1902 +        for (boolean failFirst : new boolean[] { true, false })
1903          for (Integer v1 : new Integer[] { 1, null })
1904      {
1905          final CompletableFuture<Integer> f = new CompletableFuture<>();
1906          final CompletableFuture<Integer> g = new CompletableFuture<>();
1907          final CFException ex = new CFException();
1908 <        final Noop r = new Noop(m);
1909 <
1910 <        (fFirst ? f : g).complete(v1);
1911 <        if (!createIncomplete)
1912 <            (!fFirst ? f : g).completeExceptionally(ex);
1913 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1914 <        if (createIncomplete) {
1915 <            checkIncomplete(h);
1916 <            (!fFirst ? f : g).completeExceptionally(ex);
1917 <        }
1918 <
1919 <        checkCompletedWithWrappedCFException(h, ex);
1920 <        r.assertNotInvoked();
1921 <        checkCompletedNormally(fFirst ? f : g, v1);
1922 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1908 >        final Noop r1 = new Noop(m);
1909 >        final Noop r2 = new Noop(m);
1910 >        final Noop r3 = new Noop(m);
1911 >
1912 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1913 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1914 >        final Callable<Boolean> complete1 = failFirst ?
1915 >            () -> fst.completeExceptionally(ex) :
1916 >            () -> fst.complete(v1);
1917 >        final Callable<Boolean> complete2 = failFirst ?
1918 >            () -> snd.complete(v1) :
1919 >            () -> snd.completeExceptionally(ex);
1920 >
1921 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1922 >        assertTrue(complete1.call());
1923 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1924 >        checkIncomplete(h1);
1925 >        checkIncomplete(h2);
1926 >        assertTrue(complete2.call());
1927 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1928 >
1929 >        checkCompletedWithWrappedException(h1, ex);
1930 >        checkCompletedWithWrappedException(h2, ex);
1931 >        checkCompletedWithWrappedException(h3, ex);
1932 >        r1.assertNotInvoked();
1933 >        r2.assertNotInvoked();
1934 >        r3.assertNotInvoked();
1935 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1936 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1937      }}
1938  
1939      /**
1940       * runAfterBoth result completes exceptionally if either source cancelled
1941       */
1942 <    public void testRunAfterBoth_sourceCancelled() {
1942 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1943          for (ExecutionMode m : ExecutionMode.values())
1944          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1633        for (boolean createIncomplete : new boolean[] { true, false })
1945          for (boolean fFirst : new boolean[] { true, false })
1946 +        for (boolean failFirst : new boolean[] { true, false })
1947          for (Integer v1 : new Integer[] { 1, null })
1948      {
1949          final CompletableFuture<Integer> f = new CompletableFuture<>();
1950          final CompletableFuture<Integer> g = new CompletableFuture<>();
1951 <        final Noop r = new Noop(m);
1951 >        final Noop r1 = new Noop(m);
1952 >        final Noop r2 = new Noop(m);
1953 >        final Noop r3 = new Noop(m);
1954  
1955 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1956 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1957 +        final Callable<Boolean> complete1 = failFirst ?
1958 +            () -> fst.cancel(mayInterruptIfRunning) :
1959 +            () -> fst.complete(v1);
1960 +        final Callable<Boolean> complete2 = failFirst ?
1961 +            () -> snd.complete(v1) :
1962 +            () -> snd.cancel(mayInterruptIfRunning);
1963  
1964 <        (fFirst ? f : g).complete(v1);
1965 <        if (!createIncomplete)
1966 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1967 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1968 <        if (createIncomplete) {
1969 <            checkIncomplete(h);
1970 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1649 <        }
1964 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1965 >        assertTrue(complete1.call());
1966 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1967 >        checkIncomplete(h1);
1968 >        checkIncomplete(h2);
1969 >        assertTrue(complete2.call());
1970 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1971  
1972 <        checkCompletedWithWrappedCancellationException(h);
1973 <        checkCancelled(!fFirst ? f : g);
1974 <        r.assertNotInvoked();
1975 <        checkCompletedNormally(fFirst ? f : g, v1);
1972 >        checkCompletedWithWrappedCancellationException(h1);
1973 >        checkCompletedWithWrappedCancellationException(h2);
1974 >        checkCompletedWithWrappedCancellationException(h3);
1975 >        r1.assertNotInvoked();
1976 >        r2.assertNotInvoked();
1977 >        r3.assertNotInvoked();
1978 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1979 >        checkCancelled(failFirst ? fst : snd);
1980      }}
1981  
1982      /**
# Line 1667 | Line 1992 | public class CompletableFutureTest exten
1992          final CompletableFuture<Integer> g = new CompletableFuture<>();
1993          final FailingRunnable r1 = new FailingRunnable(m);
1994          final FailingRunnable r2 = new FailingRunnable(m);
1995 +        final FailingRunnable r3 = new FailingRunnable(m);
1996  
1997 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1998 <        if (fFirst) {
1999 <            f.complete(v1);
2000 <            g.complete(v2);
2001 <        } else {
2002 <            g.complete(v2);
2003 <            f.complete(v1);
2004 <        }
2005 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1997 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1998 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1999 >        final Integer w1 =  fFirst ? v1 : v2;
2000 >        final Integer w2 = !fFirst ? v1 : v2;
2001 >
2002 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2003 >        assertTrue(fst.complete(w1));
2004 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2005 >        assertTrue(snd.complete(w2));
2006 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2007  
2008          checkCompletedWithWrappedCFException(h1);
2009          checkCompletedWithWrappedCFException(h2);
2010 +        checkCompletedWithWrappedCFException(h3);
2011 +        r1.assertInvoked();
2012 +        r2.assertInvoked();
2013 +        r3.assertInvoked();
2014          checkCompletedNormally(f, v1);
2015          checkCompletedNormally(g, v2);
2016      }}
# Line 1753 | Line 2084 | public class CompletableFutureTest exten
2084          rs[0].assertNotInvoked();
2085          rs[1].assertNotInvoked();
2086          f.completeExceptionally(ex);
2087 <        checkCompletedWithWrappedCFException(h0, ex);
2088 <        checkCompletedWithWrappedCFException(h1, ex);
2087 >        checkCompletedWithWrappedException(h0, ex);
2088 >        checkCompletedWithWrappedException(h1, ex);
2089          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2090          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2091 <        checkCompletedWithWrappedCFException(h2, ex);
2092 <        checkCompletedWithWrappedCFException(h3, ex);
2091 >        checkCompletedWithWrappedException(h2, ex);
2092 >        checkCompletedWithWrappedException(h3, ex);
2093          g.complete(v1);
2094  
2095          // unspecified behavior - both source completions available
# Line 1766 | Line 2097 | public class CompletableFutureTest exten
2097          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2098          try {
2099              assertEquals(inc(v1), h4.join());
2100 <            rs[4].assertInvoked();
2100 >            rs[4].assertValue(inc(v1));
2101          } catch (CompletionException ok) {
2102 <            checkCompletedWithWrappedCFException(h4, ex);
2102 >            checkCompletedWithWrappedException(h4, ex);
2103              rs[4].assertNotInvoked();
2104          }
2105          try {
2106              assertEquals(inc(v1), h5.join());
2107 <            rs[5].assertInvoked();
2107 >            rs[5].assertValue(inc(v1));
2108          } catch (CompletionException ok) {
2109 <            checkCompletedWithWrappedCFException(h5, ex);
2109 >            checkCompletedWithWrappedException(h5, ex);
2110              rs[5].assertNotInvoked();
2111          }
2112  
2113 <        checkCompletedWithWrappedCFException(f, ex);
2113 >        checkCompletedExceptionally(f, ex);
2114          checkCompletedNormally(g, v1);
2115 <        checkCompletedWithWrappedCFException(h0, ex);
2116 <        checkCompletedWithWrappedCFException(h1, ex);
2117 <        checkCompletedWithWrappedCFException(h2, ex);
2118 <        checkCompletedWithWrappedCFException(h3, ex);
2119 <        checkCompletedWithWrappedCFException(h4, ex);
2115 >        checkCompletedWithWrappedException(h0, ex);
2116 >        checkCompletedWithWrappedException(h1, ex);
2117 >        checkCompletedWithWrappedException(h2, ex);
2118 >        checkCompletedWithWrappedException(h3, ex);
2119 >        checkCompletedWithWrappedException(h4, ex);
2120          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2121      }}
2122  
2123 +    public void testApplyToEither_exceptionalCompletion2() {
2124 +        for (ExecutionMode m : ExecutionMode.values())
2125 +        for (boolean fFirst : new boolean[] { true, false })
2126 +        for (Integer v1 : new Integer[] { 1, null })
2127 +    {
2128 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2129 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2130 +        final CFException ex = new CFException();
2131 +        final IncFunction[] rs = new IncFunction[6];
2132 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2133 +
2134 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2135 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2136 +        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2137 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2138 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2139 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2140 +
2141 +        // unspecified behavior - both source completions available
2142 +        try {
2143 +            assertEquals(inc(v1), h0.join());
2144 +            rs[0].assertValue(inc(v1));
2145 +        } catch (CompletionException ok) {
2146 +            checkCompletedWithWrappedException(h0, ex);
2147 +            rs[0].assertNotInvoked();
2148 +        }
2149 +        try {
2150 +            assertEquals(inc(v1), h1.join());
2151 +            rs[1].assertValue(inc(v1));
2152 +        } catch (CompletionException ok) {
2153 +            checkCompletedWithWrappedException(h1, ex);
2154 +            rs[1].assertNotInvoked();
2155 +        }
2156 +        try {
2157 +            assertEquals(inc(v1), h2.join());
2158 +            rs[2].assertValue(inc(v1));
2159 +        } catch (CompletionException ok) {
2160 +            checkCompletedWithWrappedException(h2, ex);
2161 +            rs[2].assertNotInvoked();
2162 +        }
2163 +        try {
2164 +            assertEquals(inc(v1), h3.join());
2165 +            rs[3].assertValue(inc(v1));
2166 +        } catch (CompletionException ok) {
2167 +            checkCompletedWithWrappedException(h3, ex);
2168 +            rs[3].assertNotInvoked();
2169 +        }
2170 +
2171 +        checkCompletedNormally(f, v1);
2172 +        checkCompletedExceptionally(g, ex);
2173 +    }}
2174 +
2175      /**
2176       * applyToEither result completes exceptionally if either source cancelled
2177       */
# Line 1822 | Line 2205 | public class CompletableFutureTest exten
2205          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2206          try {
2207              assertEquals(inc(v1), h4.join());
2208 <            rs[4].assertInvoked();
2208 >            rs[4].assertValue(inc(v1));
2209          } catch (CompletionException ok) {
2210              checkCompletedWithWrappedCancellationException(h4);
2211              rs[4].assertNotInvoked();
2212          }
2213          try {
2214              assertEquals(inc(v1), h5.join());
2215 <            rs[5].assertInvoked();
2215 >            rs[5].assertValue(inc(v1));
2216          } catch (CompletionException ok) {
2217              checkCompletedWithWrappedCancellationException(h5);
2218              rs[5].assertNotInvoked();
# Line 1844 | Line 2227 | public class CompletableFutureTest exten
2227          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2228      }}
2229  
2230 +    public void testApplyToEither_sourceCancelled2() {
2231 +        for (ExecutionMode m : ExecutionMode.values())
2232 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2233 +        for (boolean fFirst : new boolean[] { true, false })
2234 +        for (Integer v1 : new Integer[] { 1, null })
2235 +    {
2236 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2237 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2238 +        final IncFunction[] rs = new IncFunction[6];
2239 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2240 +
2241 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2242 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2243 +        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2244 +        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2245 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2246 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2247 +
2248 +        // unspecified behavior - both source completions available
2249 +        try {
2250 +            assertEquals(inc(v1), h0.join());
2251 +            rs[0].assertValue(inc(v1));
2252 +        } catch (CompletionException ok) {
2253 +            checkCompletedWithWrappedCancellationException(h0);
2254 +            rs[0].assertNotInvoked();
2255 +        }
2256 +        try {
2257 +            assertEquals(inc(v1), h1.join());
2258 +            rs[1].assertValue(inc(v1));
2259 +        } catch (CompletionException ok) {
2260 +            checkCompletedWithWrappedCancellationException(h1);
2261 +            rs[1].assertNotInvoked();
2262 +        }
2263 +        try {
2264 +            assertEquals(inc(v1), h2.join());
2265 +            rs[2].assertValue(inc(v1));
2266 +        } catch (CompletionException ok) {
2267 +            checkCompletedWithWrappedCancellationException(h2);
2268 +            rs[2].assertNotInvoked();
2269 +        }
2270 +        try {
2271 +            assertEquals(inc(v1), h3.join());
2272 +            rs[3].assertValue(inc(v1));
2273 +        } catch (CompletionException ok) {
2274 +            checkCompletedWithWrappedCancellationException(h3);
2275 +            rs[3].assertNotInvoked();
2276 +        }
2277 +
2278 +        checkCompletedNormally(f, v1);
2279 +        checkCancelled(g);
2280 +    }}
2281 +
2282      /**
2283       * applyToEither result completes exceptionally if action does
2284       */
# Line 1896 | Line 2331 | public class CompletableFutureTest exten
2331      {
2332          final CompletableFuture<Integer> f = new CompletableFuture<>();
2333          final CompletableFuture<Integer> g = new CompletableFuture<>();
2334 <        final IncAction[] rs = new IncAction[6];
2335 <        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
2334 >        final NoopConsumer[] rs = new NoopConsumer[6];
2335 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2336  
2337          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2338          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
# Line 1908 | Line 2343 | public class CompletableFutureTest exten
2343          f.complete(v1);
2344          checkCompletedNormally(h0, null);
2345          checkCompletedNormally(h1, null);
2346 <        rs[0].assertValue(inc(v1));
2347 <        rs[1].assertValue(inc(v1));
2346 >        rs[0].assertValue(v1);
2347 >        rs[1].assertValue(v1);
2348          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2349          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2350          checkCompletedNormally(h2, null);
2351          checkCompletedNormally(h3, null);
2352 <        rs[2].assertValue(inc(v1));
2353 <        rs[3].assertValue(inc(v1));
2352 >        rs[2].assertValue(v1);
2353 >        rs[3].assertValue(v1);
2354          g.complete(v2);
2355  
2356          // unspecified behavior - both source completions available
# Line 1923 | Line 2358 | public class CompletableFutureTest exten
2358          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2359          checkCompletedNormally(h4, null);
2360          checkCompletedNormally(h5, null);
2361 <        assertTrue(Objects.equals(inc(v1), rs[4].value) ||
2362 <                   Objects.equals(inc(v2), rs[4].value));
2363 <        assertTrue(Objects.equals(inc(v1), rs[5].value) ||
2364 <                   Objects.equals(inc(v2), rs[5].value));
2361 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2362 >                   Objects.equals(v2, rs[4].value));
2363 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2364 >                   Objects.equals(v2, rs[5].value));
2365  
2366          checkCompletedNormally(f, v1);
2367          checkCompletedNormally(g, v2);
# Line 1934 | Line 2369 | public class CompletableFutureTest exten
2369          checkCompletedNormally(h1, null);
2370          checkCompletedNormally(h2, null);
2371          checkCompletedNormally(h3, null);
2372 <        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2372 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2373      }}
2374  
2375      /**
# Line 1948 | Line 2383 | public class CompletableFutureTest exten
2383          final CompletableFuture<Integer> f = new CompletableFuture<>();
2384          final CompletableFuture<Integer> g = new CompletableFuture<>();
2385          final CFException ex = new CFException();
2386 <        final IncAction[] rs = new IncAction[6];
2387 <        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
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]);
# Line 1958 | Line 2393 | public class CompletableFutureTest exten
2393          rs[0].assertNotInvoked();
2394          rs[1].assertNotInvoked();
2395          f.completeExceptionally(ex);
2396 <        checkCompletedWithWrappedCFException(h0, ex);
2397 <        checkCompletedWithWrappedCFException(h1, ex);
2396 >        checkCompletedWithWrappedException(h0, ex);
2397 >        checkCompletedWithWrappedException(h1, ex);
2398          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2399          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2400 <        checkCompletedWithWrappedCFException(h2, ex);
2401 <        checkCompletedWithWrappedCFException(h3, ex);
2400 >        checkCompletedWithWrappedException(h2, ex);
2401 >        checkCompletedWithWrappedException(h3, ex);
2402  
2403          g.complete(v1);
2404  
# Line 1972 | Line 2407 | public class CompletableFutureTest exten
2407          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2408          try {
2409              assertNull(h4.join());
2410 <            rs[4].assertValue(inc(v1));
2410 >            rs[4].assertValue(v1);
2411          } catch (CompletionException ok) {
2412 <            checkCompletedWithWrappedCFException(h4, ex);
2412 >            checkCompletedWithWrappedException(h4, ex);
2413              rs[4].assertNotInvoked();
2414          }
2415          try {
2416              assertNull(h5.join());
2417 <            rs[5].assertValue(inc(v1));
2417 >            rs[5].assertValue(v1);
2418          } catch (CompletionException ok) {
2419 <            checkCompletedWithWrappedCFException(h5, ex);
2419 >            checkCompletedWithWrappedException(h5, ex);
2420              rs[5].assertNotInvoked();
2421          }
2422  
2423 <        checkCompletedWithWrappedCFException(f, ex);
2423 >        checkCompletedExceptionally(f, ex);
2424          checkCompletedNormally(g, v1);
2425 <        checkCompletedWithWrappedCFException(h0, ex);
2426 <        checkCompletedWithWrappedCFException(h1, ex);
2427 <        checkCompletedWithWrappedCFException(h2, ex);
2428 <        checkCompletedWithWrappedCFException(h3, ex);
2429 <        checkCompletedWithWrappedCFException(h4, ex);
2425 >        checkCompletedWithWrappedException(h0, ex);
2426 >        checkCompletedWithWrappedException(h1, ex);
2427 >        checkCompletedWithWrappedException(h2, ex);
2428 >        checkCompletedWithWrappedException(h3, ex);
2429 >        checkCompletedWithWrappedException(h4, ex);
2430          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2431      }}
2432  
2433 +    public void testAcceptEither_exceptionalCompletion2() {
2434 +        for (ExecutionMode m : ExecutionMode.values())
2435 +        for (boolean fFirst : new boolean[] { true, false })
2436 +        for (Integer v1 : new Integer[] { 1, null })
2437 +    {
2438 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2439 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2440 +        final CFException ex = new CFException();
2441 +        final NoopConsumer[] rs = new NoopConsumer[6];
2442 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2443 +
2444 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2445 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2446 +        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2447 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2448 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2449 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2450 +
2451 +        // unspecified behavior - both source completions available
2452 +        try {
2453 +            assertEquals(null, h0.join());
2454 +            rs[0].assertValue(v1);
2455 +        } catch (CompletionException ok) {
2456 +            checkCompletedWithWrappedException(h0, ex);
2457 +            rs[0].assertNotInvoked();
2458 +        }
2459 +        try {
2460 +            assertEquals(null, h1.join());
2461 +            rs[1].assertValue(v1);
2462 +        } catch (CompletionException ok) {
2463 +            checkCompletedWithWrappedException(h1, ex);
2464 +            rs[1].assertNotInvoked();
2465 +        }
2466 +        try {
2467 +            assertEquals(null, h2.join());
2468 +            rs[2].assertValue(v1);
2469 +        } catch (CompletionException ok) {
2470 +            checkCompletedWithWrappedException(h2, ex);
2471 +            rs[2].assertNotInvoked();
2472 +        }
2473 +        try {
2474 +            assertEquals(null, h3.join());
2475 +            rs[3].assertValue(v1);
2476 +        } catch (CompletionException ok) {
2477 +            checkCompletedWithWrappedException(h3, ex);
2478 +            rs[3].assertNotInvoked();
2479 +        }
2480 +
2481 +        checkCompletedNormally(f, v1);
2482 +        checkCompletedExceptionally(g, ex);
2483 +    }}
2484 +
2485      /**
2486       * acceptEither result completes exceptionally if either source cancelled
2487       */
# Line 2005 | Line 2492 | public class CompletableFutureTest exten
2492      {
2493          final CompletableFuture<Integer> f = new CompletableFuture<>();
2494          final CompletableFuture<Integer> g = new CompletableFuture<>();
2495 <        final IncAction[] rs = new IncAction[6];
2496 <        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
2495 >        final NoopConsumer[] rs = new NoopConsumer[6];
2496 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2497  
2498          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2499          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
# Line 2029 | Line 2516 | public class CompletableFutureTest exten
2516          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2517          try {
2518              assertNull(h4.join());
2519 <            rs[4].assertValue(inc(v1));
2519 >            rs[4].assertValue(v1);
2520          } catch (CompletionException ok) {
2521              checkCompletedWithWrappedCancellationException(h4);
2522              rs[4].assertNotInvoked();
2523          }
2524          try {
2525              assertNull(h5.join());
2526 <            rs[5].assertValue(inc(v1));
2526 >            rs[5].assertValue(v1);
2527          } catch (CompletionException ok) {
2528              checkCompletedWithWrappedCancellationException(h5);
2529              rs[5].assertNotInvoked();
# Line 2096 | Line 2583 | public class CompletableFutureTest exten
2583       * runAfterEither result completes normally after normal completion
2584       * of either source
2585       */
2586 <    public void testRunAfterEither_normalCompletion1() {
2586 >    public void testRunAfterEither_normalCompletion() {
2587          for (ExecutionMode m : ExecutionMode.values())
2588          for (Integer v1 : new Integer[] { 1, null })
2589          for (Integer v2 : new Integer[] { 2, null })
2590      {
2591          final CompletableFuture<Integer> f = new CompletableFuture<>();
2592          final CompletableFuture<Integer> g = new CompletableFuture<>();
2593 <        final Noop r = new Noop(m);
2594 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2593 >        final Noop[] rs = new Noop[6];
2594 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2595  
2596 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2597 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2598 +        checkIncomplete(h0);
2599 +        checkIncomplete(h1);
2600 +        rs[0].assertNotInvoked();
2601 +        rs[1].assertNotInvoked();
2602          f.complete(v1);
2603 <        checkCompletedNormally(h, null);
2604 <        r.assertInvoked();
2605 <        g.complete(v2);
2606 <
2607 <        checkCompletedNormally(f, v1);
2608 <        checkCompletedNormally(g, v2);
2609 <        checkCompletedNormally(h, null);
2610 <        r.assertInvoked();
2611 <    }}
2612 <
2120 <    public void testRunAfterEither_normalCompletion2() {
2121 <        for (ExecutionMode m : ExecutionMode.values())
2122 <        for (Integer v1 : new Integer[] { 1, null })
2123 <        for (Integer v2 : new Integer[] { 2, null })
2124 <    {
2125 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2126 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2127 <        final Noop r = new Noop(m);
2128 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2603 >        checkCompletedNormally(h0, null);
2604 >        checkCompletedNormally(h1, null);
2605 >        rs[0].assertInvoked();
2606 >        rs[1].assertInvoked();
2607 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2608 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2609 >        checkCompletedNormally(h2, null);
2610 >        checkCompletedNormally(h3, null);
2611 >        rs[2].assertInvoked();
2612 >        rs[3].assertInvoked();
2613  
2614          g.complete(v2);
2131        checkCompletedNormally(h, null);
2132        r.assertInvoked();
2133        f.complete(v1);
2615  
2616 <        checkCompletedNormally(f, v1);
2617 <        checkCompletedNormally(g, v2);
2137 <        checkCompletedNormally(h, null);
2138 <        r.assertInvoked();
2139 <        }}
2616 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2617 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2618  
2141    public void testRunAfterEither_normalCompletion3() {
2142        for (ExecutionMode m : ExecutionMode.values())
2143        for (Integer v1 : new Integer[] { 1, null })
2144        for (Integer v2 : new Integer[] { 2, null })
2145    {
2146        final CompletableFuture<Integer> f = new CompletableFuture<>();
2147        final CompletableFuture<Integer> g = new CompletableFuture<>();
2148        final Noop r = new Noop(m);
2149
2150        f.complete(v1);
2151        g.complete(v2);
2152        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2153
2154        checkCompletedNormally(h, null);
2619          checkCompletedNormally(f, v1);
2620          checkCompletedNormally(g, v2);
2621 <        r.assertInvoked();
2621 >        checkCompletedNormally(h0, null);
2622 >        checkCompletedNormally(h1, null);
2623 >        checkCompletedNormally(h2, null);
2624 >        checkCompletedNormally(h3, null);
2625 >        checkCompletedNormally(h4, null);
2626 >        checkCompletedNormally(h5, null);
2627 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2628      }}
2629  
2630      /**
2631       * runAfterEither result completes exceptionally after exceptional
2632       * completion of either source
2633       */
2634 <    public void testRunAfterEither_exceptionalCompletion1() {
2165 <        for (ExecutionMode m : ExecutionMode.values())
2166 <        for (Integer v1 : new Integer[] { 1, null })
2167 <    {
2168 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2169 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2170 <        final Noop r = new Noop(m);
2171 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2172 <        final CFException ex = new CFException();
2173 <
2174 <        f.completeExceptionally(ex);
2175 <        checkCompletedWithWrappedCFException(h, ex);
2176 <        g.complete(v1);
2177 <
2178 <        r.assertNotInvoked();
2179 <        checkCompletedNormally(g, v1);
2180 <        checkCompletedWithWrappedCFException(f, ex);
2181 <        checkCompletedWithWrappedCFException(h, ex);
2182 <    }}
2183 <
2184 <    public void testRunAfterEither_exceptionalCompletion2() {
2634 >    public void testRunAfterEither_exceptionalCompletion() {
2635          for (ExecutionMode m : ExecutionMode.values())
2636          for (Integer v1 : new Integer[] { 1, null })
2637      {
2638          final CompletableFuture<Integer> f = new CompletableFuture<>();
2639          final CompletableFuture<Integer> g = new CompletableFuture<>();
2190        final Noop r = new Noop(m);
2191        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 <        g.completeExceptionally(ex);
2645 <        checkCompletedWithWrappedCFException(h, ex);
2646 <        f.complete(v1);
2647 <
2648 <        r.assertNotInvoked();
2649 <        checkCompletedNormally(f, v1);
2650 <        checkCompletedWithWrappedCFException(g, ex);
2651 <        checkCompletedWithWrappedCFException(h, ex);
2652 <    }}
2653 <
2654 <    public void testRunAfterEither_exceptionalCompletion3() {
2655 <        for (ExecutionMode m : ExecutionMode.values())
2656 <        for (Integer v1 : new Integer[] { 1, null })
2207 <    {
2208 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2209 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2210 <        final Noop r = new Noop(m);
2211 <        final CFException ex = new CFException();
2644 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2645 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2646 >        checkIncomplete(h0);
2647 >        checkIncomplete(h1);
2648 >        rs[0].assertNotInvoked();
2649 >        rs[1].assertNotInvoked();
2650 >        assertTrue(f.completeExceptionally(ex));
2651 >        checkCompletedWithWrappedException(h0, ex);
2652 >        checkCompletedWithWrappedException(h1, ex);
2653 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2654 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2655 >        checkCompletedWithWrappedException(h2, ex);
2656 >        checkCompletedWithWrappedException(h3, ex);
2657  
2658 <        g.completeExceptionally(ex);
2214 <        f.complete(v1);
2215 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2658 >        assertTrue(g.complete(v1));
2659  
2660 <        // unspecified behavior
2661 <        Integer v;
2660 >        // unspecified behavior - both source completions available
2661 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2662 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2663          try {
2664 <            assertNull(h.join());
2665 <            r.assertInvoked();
2664 >            assertNull(h4.join());
2665 >            rs[4].assertInvoked();
2666          } catch (CompletionException ok) {
2667 <            checkCompletedWithWrappedCFException(h, ex);
2668 <            r.assertNotInvoked();
2667 >            checkCompletedWithWrappedException(h4, ex);
2668 >            rs[4].assertNotInvoked();
2669          }
2226
2227        checkCompletedWithWrappedCFException(g, ex);
2228        checkCompletedNormally(f, v1);
2229    }}
2230
2231    public void testRunAfterEither_exceptionalCompletion4() {
2232        for (ExecutionMode m : ExecutionMode.values())
2233        for (Integer v1 : new Integer[] { 1, null })
2234    {
2235        final CompletableFuture<Integer> f = new CompletableFuture<>();
2236        final CompletableFuture<Integer> g = new CompletableFuture<>();
2237        final Noop r = new Noop(m);
2238        final CFException ex = new CFException();
2239
2240        f.completeExceptionally(ex);
2241        g.complete(v1);
2242        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2243
2244        // unspecified behavior
2245        Integer v;
2670          try {
2671 <            assertNull(h.join());
2672 <            r.assertInvoked();
2671 >            assertNull(h5.join());
2672 >            rs[5].assertInvoked();
2673          } catch (CompletionException ok) {
2674 <            checkCompletedWithWrappedCFException(h, ex);
2675 <            r.assertNotInvoked();
2674 >            checkCompletedWithWrappedException(h5, ex);
2675 >            rs[5].assertNotInvoked();
2676          }
2677  
2678 <        checkCompletedWithWrappedCFException(f, ex);
2678 >        checkCompletedExceptionally(f, ex);
2679          checkCompletedNormally(g, v1);
2680 +        checkCompletedWithWrappedException(h0, ex);
2681 +        checkCompletedWithWrappedException(h1, ex);
2682 +        checkCompletedWithWrappedException(h2, ex);
2683 +        checkCompletedWithWrappedException(h3, ex);
2684 +        checkCompletedWithWrappedException(h4, ex);
2685 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2686      }}
2687  
2688 <    /**
2259 <     * runAfterEither result completes exceptionally if action does
2260 <     */
2261 <    public void testRunAfterEither_actionFailed1() {
2688 >    public void testRunAfterEither_exceptionalCompletion2() {
2689          for (ExecutionMode m : ExecutionMode.values())
2690 +        for (boolean fFirst : new boolean[] { true, false })
2691          for (Integer v1 : new Integer[] { 1, null })
2264        for (Integer v2 : new Integer[] { 2, null })
2692      {
2693          final CompletableFuture<Integer> f = new CompletableFuture<>();
2694          final CompletableFuture<Integer> g = new CompletableFuture<>();
2695 <        final FailingRunnable r = new FailingRunnable(m);
2696 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2695 >        final CFException ex = new CFException();
2696 >        final Noop[] rs = new Noop[6];
2697 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2698  
2699 <        f.complete(v1);
2700 <        checkCompletedWithWrappedCFException(h);
2701 <        g.complete(v2);
2702 <        checkCompletedNormally(f, v1);
2703 <        checkCompletedNormally(g, v2);
2704 <    }}
2699 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2700 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2701 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2702 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2703 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2704 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2705  
2706 <    public void testRunAfterEither_actionFailed2() {
2707 <        for (ExecutionMode m : ExecutionMode.values())
2708 <        for (Integer v1 : new Integer[] { 1, null })
2709 <        for (Integer v2 : new Integer[] { 2, null })
2710 <    {
2711 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2712 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2713 <        final FailingRunnable r = new FailingRunnable(m);
2714 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2706 >        // unspecified behavior - both source completions available
2707 >        try {
2708 >            assertEquals(null, h0.join());
2709 >            rs[0].assertInvoked();
2710 >        } catch (CompletionException ok) {
2711 >            checkCompletedWithWrappedException(h0, ex);
2712 >            rs[0].assertNotInvoked();
2713 >        }
2714 >        try {
2715 >            assertEquals(null, h1.join());
2716 >            rs[1].assertInvoked();
2717 >        } catch (CompletionException ok) {
2718 >            checkCompletedWithWrappedException(h1, ex);
2719 >            rs[1].assertNotInvoked();
2720 >        }
2721 >        try {
2722 >            assertEquals(null, h2.join());
2723 >            rs[2].assertInvoked();
2724 >        } catch (CompletionException ok) {
2725 >            checkCompletedWithWrappedException(h2, ex);
2726 >            rs[2].assertNotInvoked();
2727 >        }
2728 >        try {
2729 >            assertEquals(null, h3.join());
2730 >            rs[3].assertInvoked();
2731 >        } catch (CompletionException ok) {
2732 >            checkCompletedWithWrappedException(h3, ex);
2733 >            rs[3].assertNotInvoked();
2734 >        }
2735  
2288        g.complete(v2);
2289        checkCompletedWithWrappedCFException(h);
2290        f.complete(v1);
2736          checkCompletedNormally(f, v1);
2737 <        checkCompletedNormally(g, v2);
2737 >        checkCompletedExceptionally(g, ex);
2738      }}
2739  
2740      /**
2741       * runAfterEither result completes exceptionally if either source cancelled
2742       */
2743 <    public void testRunAfterEither_sourceCancelled1() {
2299 <        for (ExecutionMode m : ExecutionMode.values())
2300 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2301 <        for (Integer v1 : new Integer[] { 1, null })
2302 <    {
2303 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2304 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2305 <        final Noop r = new Noop(m);
2306 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2307 <
2308 <        assertTrue(f.cancel(mayInterruptIfRunning));
2309 <        checkCompletedWithWrappedCancellationException(h);
2310 <        g.complete(v1);
2311 <
2312 <        checkCancelled(f);
2313 <        r.assertNotInvoked();
2314 <        checkCompletedNormally(g, v1);
2315 <        checkCompletedWithWrappedCancellationException(h);
2316 <    }}
2317 <
2318 <    public void testRunAfterEither_sourceCancelled2() {
2743 >    public void testRunAfterEither_sourceCancelled() {
2744          for (ExecutionMode m : ExecutionMode.values())
2745          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2746          for (Integer v1 : new Integer[] { 1, null })
2747      {
2748          final CompletableFuture<Integer> f = new CompletableFuture<>();
2749          final CompletableFuture<Integer> g = new CompletableFuture<>();
2750 <        final Noop r = new Noop(m);
2751 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2327 <
2328 <        assertTrue(g.cancel(mayInterruptIfRunning));
2329 <        checkCompletedWithWrappedCancellationException(h);
2330 <        f.complete(v1);
2750 >        final Noop[] rs = new Noop[6];
2751 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2752  
2753 <        checkCancelled(g);
2754 <        r.assertNotInvoked();
2755 <        checkCompletedNormally(f, v1);
2756 <        checkCompletedWithWrappedCancellationException(h);
2757 <    }}
2758 <
2759 <    public void testRunAfterEither_sourceCancelled3() {
2760 <        for (ExecutionMode m : ExecutionMode.values())
2761 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2762 <        for (Integer v1 : new Integer[] { 1, null })
2763 <    {
2764 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2765 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2345 <        final Noop r = new Noop(m);
2753 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2754 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2755 >        checkIncomplete(h0);
2756 >        checkIncomplete(h1);
2757 >        rs[0].assertNotInvoked();
2758 >        rs[1].assertNotInvoked();
2759 >        f.cancel(mayInterruptIfRunning);
2760 >        checkCompletedWithWrappedCancellationException(h0);
2761 >        checkCompletedWithWrappedCancellationException(h1);
2762 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2763 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2764 >        checkCompletedWithWrappedCancellationException(h2);
2765 >        checkCompletedWithWrappedCancellationException(h3);
2766  
2767 <        assertTrue(g.cancel(mayInterruptIfRunning));
2348 <        f.complete(v1);
2349 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2767 >        assertTrue(g.complete(v1));
2768  
2769 <        // unspecified behavior
2770 <        Integer v;
2769 >        // unspecified behavior - both source completions available
2770 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2771 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2772          try {
2773 <            assertNull(h.join());
2774 <            r.assertInvoked();
2773 >            assertNull(h4.join());
2774 >            rs[4].assertInvoked();
2775          } catch (CompletionException ok) {
2776 <            checkCompletedWithWrappedCancellationException(h);
2777 <            r.assertNotInvoked();
2776 >            checkCompletedWithWrappedCancellationException(h4);
2777 >            rs[4].assertNotInvoked();
2778 >        }
2779 >        try {
2780 >            assertNull(h5.join());
2781 >            rs[5].assertInvoked();
2782 >        } catch (CompletionException ok) {
2783 >            checkCompletedWithWrappedCancellationException(h5);
2784 >            rs[5].assertNotInvoked();
2785          }
2786  
2787 <        checkCancelled(g);
2788 <        checkCompletedNormally(f, v1);
2787 >        checkCancelled(f);
2788 >        checkCompletedNormally(g, v1);
2789 >        checkCompletedWithWrappedCancellationException(h0);
2790 >        checkCompletedWithWrappedCancellationException(h1);
2791 >        checkCompletedWithWrappedCancellationException(h2);
2792 >        checkCompletedWithWrappedCancellationException(h3);
2793 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2794      }}
2795  
2796 <    public void testRunAfterEither_sourceCancelled4() {
2796 >    /**
2797 >     * runAfterEither result completes exceptionally if action does
2798 >     */
2799 >    public void testRunAfterEither_actionFailed() {
2800          for (ExecutionMode m : ExecutionMode.values())
2367        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2801          for (Integer v1 : new Integer[] { 1, null })
2802 +        for (Integer v2 : new Integer[] { 2, null })
2803      {
2804          final CompletableFuture<Integer> f = new CompletableFuture<>();
2805          final CompletableFuture<Integer> g = new CompletableFuture<>();
2806 <        final Noop r = new Noop(m);
2807 <
2374 <        assertTrue(f.cancel(mayInterruptIfRunning));
2375 <        g.complete(v1);
2376 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2806 >        final FailingRunnable[] rs = new FailingRunnable[6];
2807 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2808  
2809 <        // unspecified behavior
2810 <        Integer v;
2811 <        try {
2812 <            assertNull(h.join());
2813 <            r.assertInvoked();
2814 <        } catch (CompletionException ok) {
2815 <            checkCompletedWithWrappedCancellationException(h);
2816 <            r.assertNotInvoked();
2817 <        }
2809 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2810 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2811 >        assertTrue(f.complete(v1));
2812 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2813 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2814 >        checkCompletedWithWrappedCFException(h0);
2815 >        checkCompletedWithWrappedCFException(h1);
2816 >        checkCompletedWithWrappedCFException(h2);
2817 >        checkCompletedWithWrappedCFException(h3);
2818 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2819 >        assertTrue(g.complete(v2));
2820 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2821 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2822 >        checkCompletedWithWrappedCFException(h4);
2823 >        checkCompletedWithWrappedCFException(h5);
2824  
2825 <        checkCancelled(f);
2826 <        checkCompletedNormally(g, v1);
2825 >        checkCompletedNormally(f, v1);
2826 >        checkCompletedNormally(g, v2);
2827 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2828      }}
2829  
2830      /**
# Line 2399 | Line 2837 | public class CompletableFutureTest exten
2837      {
2838          final CompletableFuture<Integer> f = new CompletableFuture<>();
2839          final CompletableFutureInc r = new CompletableFutureInc(m);
2840 <        if (!createIncomplete) f.complete(v1);
2840 >        if (!createIncomplete) assertTrue(f.complete(v1));
2841          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2842 <        if (createIncomplete) f.complete(v1);
2842 >        if (createIncomplete) assertTrue(f.complete(v1));
2843  
2844          checkCompletedNormally(g, inc(v1));
2845          checkCompletedNormally(f, v1);
2846 <        r.assertInvoked();
2846 >        r.assertValue(v1);
2847      }}
2848  
2849      /**
# Line 2423 | Line 2861 | public class CompletableFutureTest exten
2861          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2862          if (createIncomplete) f.completeExceptionally(ex);
2863  
2864 <        checkCompletedWithWrappedCFException(g, ex);
2865 <        checkCompletedWithWrappedCFException(f, ex);
2864 >        checkCompletedWithWrappedException(g, ex);
2865 >        checkCompletedExceptionally(f, ex);
2866          r.assertNotInvoked();
2867      }}
2868  
# Line 2439 | Line 2877 | public class CompletableFutureTest exten
2877          final CompletableFuture<Integer> f = new CompletableFuture<>();
2878          final FailingCompletableFutureFunction r
2879              = new FailingCompletableFutureFunction(m);
2880 <        if (!createIncomplete) f.complete(v1);
2880 >        if (!createIncomplete) assertTrue(f.complete(v1));
2881          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2882 <        if (createIncomplete) f.complete(v1);
2882 >        if (createIncomplete) assertTrue(f.complete(v1));
2883  
2884          checkCompletedWithWrappedCFException(g);
2885          checkCompletedNormally(f, v1);
# Line 2484 | Line 2922 | public class CompletableFutureTest exten
2922       * when all components complete normally
2923       */
2924      public void testAllOf_normal() throws Exception {
2925 <        for (int k = 1; k < 20; ++k) {
2925 >        for (int k = 1; k < 10; k++) {
2926              CompletableFuture<Integer>[] fs
2927                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2928 <            for (int i = 0; i < k; ++i)
2928 >            for (int i = 0; i < k; i++)
2929                  fs[i] = new CompletableFuture<>();
2930              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2931 <            for (int i = 0; i < k; ++i) {
2931 >            for (int i = 0; i < k; i++) {
2932                  checkIncomplete(f);
2933                  checkIncomplete(CompletableFuture.allOf(fs));
2934                  fs[i].complete(one);
# Line 2501 | Line 2939 | public class CompletableFutureTest exten
2939      }
2940  
2941      public void testAllOf_backwards() throws Exception {
2942 <        for (int k = 1; k < 20; ++k) {
2942 >        for (int k = 1; k < 10; k++) {
2943              CompletableFuture<Integer>[] fs
2944                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2945 <            for (int i = 0; i < k; ++i)
2945 >            for (int i = 0; i < k; i++)
2946                  fs[i] = new CompletableFuture<>();
2947              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2948              for (int i = k - 1; i >= 0; i--) {
# Line 2517 | Line 2955 | public class CompletableFutureTest exten
2955          }
2956      }
2957  
2958 +    public void testAllOf_exceptional() throws Exception {
2959 +        for (int k = 1; k < 10; k++) {
2960 +            CompletableFuture<Integer>[] fs
2961 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2962 +            CFException ex = new CFException();
2963 +            for (int i = 0; i < k; i++)
2964 +                fs[i] = new CompletableFuture<>();
2965 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2966 +            for (int i = 0; i < k; i++) {
2967 +                checkIncomplete(f);
2968 +                checkIncomplete(CompletableFuture.allOf(fs));
2969 +                if (i != k/2) {
2970 +                    fs[i].complete(i);
2971 +                    checkCompletedNormally(fs[i], i);
2972 +                } else {
2973 +                    fs[i].completeExceptionally(ex);
2974 +                    checkCompletedExceptionally(fs[i], ex);
2975 +                }
2976 +            }
2977 +            checkCompletedWithWrappedException(f, ex);
2978 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
2979 +        }
2980 +    }
2981 +
2982      /**
2983       * anyOf(no component futures) returns an incomplete future
2984       */
2985      public void testAnyOf_empty() throws Exception {
2986 +        for (Integer v1 : new Integer[] { 1, null })
2987 +    {
2988          CompletableFuture<Object> f = CompletableFuture.anyOf();
2989          checkIncomplete(f);
2990 <    }
2990 >
2991 >        f.complete(v1);
2992 >        checkCompletedNormally(f, v1);
2993 >    }}
2994  
2995      /**
2996       * anyOf returns a future completed normally with a value when
2997       * a component future does
2998       */
2999      public void testAnyOf_normal() throws Exception {
3000 <        for (int k = 0; k < 10; ++k) {
3000 >        for (int k = 0; k < 10; k++) {
3001              CompletableFuture[] fs = new CompletableFuture[k];
3002 <            for (int i = 0; i < k; ++i)
3002 >            for (int i = 0; i < k; i++)
3003                  fs[i] = new CompletableFuture<>();
3004              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3005              checkIncomplete(f);
3006 <            for (int i = 0; i < k; ++i) {
3007 <                fs[i].complete(one);
3008 <                checkCompletedNormally(f, one);
3009 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3006 >            for (int i = 0; i < k; i++) {
3007 >                fs[i].complete(i);
3008 >                checkCompletedNormally(f, 0);
3009 >                int x = (int) CompletableFuture.anyOf(fs).join();
3010 >                assertTrue(0 <= x && x <= i);
3011 >            }
3012 >        }
3013 >    }
3014 >    public void testAnyOf_normal_backwards() throws Exception {
3015 >        for (int k = 0; k < 10; k++) {
3016 >            CompletableFuture[] fs = new CompletableFuture[k];
3017 >            for (int i = 0; i < k; i++)
3018 >                fs[i] = new CompletableFuture<>();
3019 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3020 >            checkIncomplete(f);
3021 >            for (int i = k - 1; i >= 0; i--) {
3022 >                fs[i].complete(i);
3023 >                checkCompletedNormally(f, k - 1);
3024 >                int x = (int) CompletableFuture.anyOf(fs).join();
3025 >                assertTrue(i <= x && x <= k - 1);
3026              }
3027          }
3028      }
# Line 2548 | Line 3031 | public class CompletableFutureTest exten
3031       * anyOf result completes exceptionally when any component does.
3032       */
3033      public void testAnyOf_exceptional() throws Exception {
3034 <        for (int k = 0; k < 10; ++k) {
3034 >        for (int k = 0; k < 10; k++) {
3035 >            CompletableFuture[] fs = new CompletableFuture[k];
3036 >            CFException[] exs = new CFException[k];
3037 >            for (int i = 0; i < k; i++) {
3038 >                fs[i] = new CompletableFuture<>();
3039 >                exs[i] = new CFException();
3040 >            }
3041 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3042 >            checkIncomplete(f);
3043 >            for (int i = 0; i < k; i++) {
3044 >                fs[i].completeExceptionally(exs[i]);
3045 >                checkCompletedWithWrappedException(f, exs[0]);
3046 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3047 >            }
3048 >        }
3049 >    }
3050 >
3051 >    public void testAnyOf_exceptional_backwards() throws Exception {
3052 >        for (int k = 0; k < 10; k++) {
3053              CompletableFuture[] fs = new CompletableFuture[k];
3054 <            for (int i = 0; i < k; ++i)
3054 >            CFException[] exs = new CFException[k];
3055 >            for (int i = 0; i < k; i++) {
3056                  fs[i] = new CompletableFuture<>();
3057 +                exs[i] = new CFException();
3058 +            }
3059              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3060              checkIncomplete(f);
3061 <            for (int i = 0; i < k; ++i) {
3062 <                fs[i].completeExceptionally(new CFException());
3063 <                checkCompletedWithWrappedCFException(f);
3061 >            for (int i = k - 1; i >= 0; i--) {
3062 >                fs[i].completeExceptionally(exs[i]);
3063 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3064                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3065              }
3066          }
# Line 2680 | Line 3184 | public class CompletableFutureTest exten
3184          assertSame(f, f.toCompletableFuture());
3185      }
3186  
3187 <    /**
2684 <     * whenComplete action executes on normal completion, propagating
2685 <     * source result.
2686 <     */
2687 <    public void testWhenComplete_normalCompletion1() {
2688 <        for (ExecutionMode m : ExecutionMode.values())
2689 <        for (boolean createIncomplete : new boolean[] { true, false })
2690 <        for (Integer v1 : new Integer[] { 1, null })
2691 <    {
2692 <        final AtomicInteger a = new AtomicInteger(0);
2693 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2694 <        if (!createIncomplete) f.complete(v1);
2695 <        final CompletableFuture<Integer> g = m.whenComplete
2696 <            (f,
2697 <             (Integer x, Throwable t) -> {
2698 <                threadAssertSame(x, v1);
2699 <                threadAssertNull(t);
2700 <                a.getAndIncrement();
2701 <            });
2702 <        if (createIncomplete) f.complete(v1);
3187 >    //--- tests of implementation details; not part of official tck ---
3188  
3189 <        checkCompletedNormally(g, v1);
3190 <        checkCompletedNormally(f, v1);
3191 <        assertEquals(1, a.get());
3192 <    }}
3189 >    Object resultOf(CompletableFuture<?> f) {
3190 >        try {
3191 >            java.lang.reflect.Field resultField
3192 >                = CompletableFuture.class.getDeclaredField("result");
3193 >            resultField.setAccessible(true);
3194 >            return resultField.get(f);
3195 >        } catch (Throwable t) { throw new AssertionError(t); }
3196 >    }
3197  
3198 <    /**
3199 <     * whenComplete action executes on exceptional completion, propagating
2711 <     * source result.
2712 <     */
2713 <    public void testWhenComplete_exceptionalCompletion() {
3198 >    public void testExceptionPropagationReusesResultObject() {
3199 >        if (!testImplementationDetails) return;
3200          for (ExecutionMode m : ExecutionMode.values())
2715        for (boolean createIncomplete : new boolean[] { true, false })
2716        for (Integer v1 : new Integer[] { 1, null })
3201      {
2718        final AtomicInteger a = new AtomicInteger(0);
3202          final CFException ex = new CFException();
3203 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3204 <        if (!createIncomplete) f.completeExceptionally(ex);
2722 <        final CompletableFuture<Integer> g = m.whenComplete
2723 <            (f,
2724 <             (Integer x, Throwable t) -> {
2725 <                threadAssertNull(x);
2726 <                threadAssertSame(t, ex);
2727 <                a.getAndIncrement();
2728 <            });
2729 <        if (createIncomplete) f.completeExceptionally(ex);
2730 <        checkCompletedWithWrappedCFException(f, ex);
2731 <        checkCompletedWithWrappedCFException(g, ex);
2732 <        assertEquals(1, a.get());
2733 <    }}
3203 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3204 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3205  
3206 <    /**
3207 <     * whenComplete action executes on cancelled source, propagating
2737 <     * CancellationException.
2738 <     */
2739 <    public void testWhenComplete_sourceCancelled() {
2740 <        for (ExecutionMode m : ExecutionMode.values())
2741 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2742 <        for (boolean createIncomplete : new boolean[] { true, false })
2743 <    {
2744 <        final AtomicInteger a = new AtomicInteger(0);
2745 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2746 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2747 <        final CompletableFuture<Integer> g = m.whenComplete
2748 <            (f,
2749 <             (Integer x, Throwable t) -> {
2750 <                threadAssertNull(x);
2751 <                threadAssertTrue(t instanceof CancellationException);
2752 <                a.getAndIncrement();
2753 <            });
2754 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3206 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> dependentFactories
3207 >            = new ArrayList<>();
3208  
3209 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3210 <        checkCompletedWithWrappedCancellationException(g);
3211 <        checkCancelled(f);
2759 <        assertEquals(1, a.get());
2760 <    }}
3209 >        dependentFactories.add((y) -> m.thenRun(y, new Noop(m)));
3210 >        dependentFactories.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3211 >        dependentFactories.add((y) -> m.thenApply(y, new IncFunction(m)));
3212  
3213 <    /**
3214 <     * If a whenComplete action throws an exception when triggered by
3215 <     * a normal completion, it completes exceptionally
2765 <     */
2766 <    public void testWhenComplete_actionFailed() {
2767 <        for (boolean createIncomplete : new boolean[] { true, false })
2768 <        for (ExecutionMode m : ExecutionMode.values())
2769 <        for (Integer v1 : new Integer[] { 1, null })
2770 <    {
2771 <        final AtomicInteger a = new AtomicInteger(0);
2772 <        final CFException ex = new CFException();
2773 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2774 <        if (!createIncomplete) f.complete(v1);
2775 <        final CompletableFuture<Integer> g = m.whenComplete
2776 <            (f,
2777 <             (Integer x, Throwable t) -> {
2778 <                threadAssertSame(x, v1);
2779 <                threadAssertNull(t);
2780 <                a.getAndIncrement();
2781 <                throw ex;
2782 <            });
2783 <        if (createIncomplete) f.complete(v1);
2784 <        checkCompletedNormally(f, v1);
2785 <        checkCompletedWithWrappedCFException(g, ex);
2786 <        assertEquals(1, a.get());
2787 <    }}
3213 >        dependentFactories.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3214 >        dependentFactories.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3215 >        dependentFactories.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3216  
3217 <    /**
3218 <     * If a whenComplete action throws an exception when triggered by
3219 <     * a source completion that also throws an exception, the source
2792 <     * exception takes precedence.
2793 <     */
2794 <    public void testWhenComplete_actionFailedSourceFailed() {
2795 <        for (boolean createIncomplete : new boolean[] { true, false })
2796 <        for (ExecutionMode m : ExecutionMode.values())
2797 <        for (Integer v1 : new Integer[] { 1, null })
2798 <    {
2799 <        final AtomicInteger a = new AtomicInteger(0);
2800 <        final CFException ex1 = new CFException();
2801 <        final CFException ex2 = new CFException();
2802 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3217 >        dependentFactories.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3218 >        dependentFactories.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3219 >        dependentFactories.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3220  
3221 <        if (!createIncomplete) f.completeExceptionally(ex1);
2805 <        final CompletableFuture<Integer> g = m.whenComplete
2806 <            (f,
2807 <             (Integer x, Throwable t) -> {
2808 <                threadAssertSame(t, ex1);
2809 <                threadAssertNull(x);
2810 <                a.getAndIncrement();
2811 <                throw ex2;
2812 <            });
2813 <        if (createIncomplete) f.completeExceptionally(ex1);
3221 >        dependentFactories.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3222  
3223 <        checkCompletedWithWrappedCFException(f, ex1);
3224 <        checkCompletedWithWrappedCFException(g, ex1);
3225 <        assertEquals(1, a.get());
3223 >        dependentFactories.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3224 >
3225 >        dependentFactories.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3226 >        dependentFactories.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3227 >
3228 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3229 >                 dependentFactory : dependentFactories) {
3230 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3231 >            f.completeExceptionally(ex);
3232 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3233 >            checkCompletedWithWrappedException(src, ex);
3234 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3235 >            checkCompletedWithWrappedException(dep, ex);
3236 >            assertSame(resultOf(src), resultOf(dep));
3237 >        }
3238 >
3239 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3240 >                 dependentFactory : dependentFactories) {
3241 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3242 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3243 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3244 >            f.completeExceptionally(ex);
3245 >            checkCompletedWithWrappedException(src, ex);
3246 >            checkCompletedWithWrappedException(dep, ex);
3247 >            assertSame(resultOf(src), resultOf(dep));
3248 >        }
3249 >
3250 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3251 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3252 >                 dependentFactory : dependentFactories) {
3253 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3254 >            f.cancel(mayInterruptIfRunning);
3255 >            checkCancelled(f);
3256 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3257 >            checkCompletedWithWrappedCancellationException(src);
3258 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3259 >            checkCompletedWithWrappedCancellationException(dep);
3260 >            assertSame(resultOf(src), resultOf(dep));
3261 >        }
3262 >
3263 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3264 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3265 >                 dependentFactory : dependentFactories) {
3266 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3267 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3268 >            CompletableFuture<?> dep = dependentFactory.apply(src);
3269 >            f.cancel(mayInterruptIfRunning);
3270 >            checkCancelled(f);
3271 >            checkCompletedWithWrappedCancellationException(src);
3272 >            checkCompletedWithWrappedCancellationException(dep);
3273 >            assertSame(resultOf(src), resultOf(dep));
3274 >        }
3275      }}
3276  
3277   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines