ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.64 by jsr166, Fri Jun 6 17:08:48 2014 UTC vs.
Revision 1.92 by jsr166, Tue Jun 17 20:50:01 2014 UTC

# Line 105 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
108 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 >                                                      Throwable ex) {
110          try {
111              f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
# Line 131 | Line 131 | public class CompletableFutureTest exten
131          } catch (ExecutionException success) {
132              assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 206 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 +        for (Integer v1 : new Integer[] { 1, null })
231 +    {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233          checkIncomplete(f);
234 <        f.complete(one);
235 <        checkCompletedNormally(f, one);
236 <    }
234 >        assertTrue(f.complete(v1));
235 >        assertFalse(f.complete(v1));
236 >        checkCompletedNormally(f, v1);
237 >    }}
238  
239      /**
240       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 242 | public class CompletableFutureTest exten
242       */
243      public void testCompleteExceptionally() {
244          CompletableFuture<Integer> f = new CompletableFuture<>();
245 +        CFException ex = new CFException();
246          checkIncomplete(f);
247 <        f.completeExceptionally(new CFException());
248 <        checkCompletedWithWrappedCFException(f);
247 >        f.completeExceptionally(ex);
248 >        checkCompletedExceptionally(f, ex);
249      }
250  
251      /**
# Line 228 | Line 253 | public class CompletableFutureTest exten
253       * methods isDone, isCancelled, join, get, and getNow
254       */
255      public void testCancel() {
256 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
257 +    {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260          assertTrue(f.cancel(true));
261 +        assertTrue(f.cancel(true));
262          checkCancelled(f);
263 <    }
263 >    }}
264  
265      /**
266       * obtrudeValue forces completion with given value
# Line 240 | Line 268 | public class CompletableFutureTest exten
268      public void testObtrudeValue() {
269          CompletableFuture<Integer> f = new CompletableFuture<>();
270          checkIncomplete(f);
271 <        f.complete(one);
271 >        assertTrue(f.complete(one));
272          checkCompletedNormally(f, one);
273          f.obtrudeValue(three);
274          checkCompletedNormally(f, three);
# Line 261 | Line 289 | public class CompletableFutureTest exten
289       * obtrudeException forces completion with given exception
290       */
291      public void testObtrudeException() {
292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
293 <        checkIncomplete(f);
294 <        f.complete(one);
295 <        checkCompletedNormally(f, one);
296 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
292 >        for (Integer v1 : new Integer[] { 1, null })
293 >    {
294 >        CFException ex;
295 >        CompletableFuture<Integer> f;
296 >
297          f = new CompletableFuture<>();
298 <        f.obtrudeException(new CFException());
299 <        checkCompletedWithWrappedCFException(f);
298 >        assertTrue(f.complete(v1));
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304 >        f = new CompletableFuture<>();
305 >        for (int i = 0; i < 2; i++) {
306 >            f.obtrudeException(ex = new CFException());
307 >            checkCompletedExceptionally(f, ex);
308 >        }
309 >
310          f = new CompletableFuture<>();
311 +        f.completeExceptionally(ex = new CFException());
312 +        f.obtrudeValue(v1);
313 +        checkCompletedNormally(f, v1);
314 +        f.obtrudeException(ex = new CFException());
315 +        checkCompletedExceptionally(f, ex);
316          f.completeExceptionally(new CFException());
317 <        f.obtrudeValue(four);
318 <        checkCompletedNormally(f, four);
319 <        f.obtrudeException(new CFException());
320 <        checkCompletedWithWrappedCFException(f);
279 <    }
317 >        checkCompletedExceptionally(f, ex);
318 >        assertFalse(f.complete(v1));
319 >        checkCompletedExceptionally(f, ex);
320 >    }}
321  
322      /**
323       * getNumberOfDependents returns number of dependent tasks
324       */
325      public void testGetNumberOfDependents() {
326 +        for (ExecutionMode m : ExecutionMode.values())
327 +        for (Integer v1 : new Integer[] { 1, null })
328 +    {
329          CompletableFuture<Integer> f = new CompletableFuture<>();
330          assertEquals(0, f.getNumberOfDependents());
331 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
331 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
332          assertEquals(1, f.getNumberOfDependents());
333          assertEquals(0, g.getNumberOfDependents());
334 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
334 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
335          assertEquals(2, f.getNumberOfDependents());
336 <        f.complete(1);
336 >        assertEquals(0, h.getNumberOfDependents());
337 >        assertTrue(f.complete(v1));
338          checkCompletedNormally(g, null);
339 +        checkCompletedNormally(h, null);
340          assertEquals(0, f.getNumberOfDependents());
341          assertEquals(0, g.getNumberOfDependents());
342 <    }
342 >        assertEquals(0, h.getNumberOfDependents());
343 >    }}
344  
345      /**
346       * toString indicates current completion state
# Line 304 | Line 351 | public class CompletableFutureTest exten
351          f = new CompletableFuture<String>();
352          assertTrue(f.toString().contains("[Not completed]"));
353  
354 <        f.complete("foo");
354 >        assertTrue(f.complete("foo"));
355          assertTrue(f.toString().contains("[Completed normally]"));
356  
357          f = new CompletableFuture<String>();
358 <        f.completeExceptionally(new IndexOutOfBoundsException());
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359          assertTrue(f.toString().contains("[Completed exceptionally]"));
360 +
361 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
362 +            f = new CompletableFuture<String>();
363 +            assertTrue(f.cancel(mayInterruptIfRunning));
364 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
365 +        }
366      }
367  
368      /**
# Line 486 | Line 539 | public class CompletableFutureTest exten
539              invoked();
540              value = x;
541              CompletableFuture<Integer> f = new CompletableFuture<>();
542 <            f.complete(inc(x));
542 >            assertTrue(f.complete(inc(x)));
543              return f;
544          }
545      }
# Line 794 | Line 847 | public class CompletableFutureTest exten
847      {
848          final AtomicInteger a = new AtomicInteger(0);
849          final CompletableFuture<Integer> f = new CompletableFuture<>();
850 <        if (!createIncomplete) f.complete(v1);
850 >        if (!createIncomplete) assertTrue(f.complete(v1));
851          final CompletableFuture<Integer> g = f.exceptionally
852              ((Throwable t) -> {
853                  // Should not be called
854                  a.getAndIncrement();
855                  throw new AssertionError();
856              });
857 <        if (createIncomplete) f.complete(v1);
857 >        if (createIncomplete) assertTrue(f.complete(v1));
858  
859          checkCompletedNormally(g, v1);
860          checkCompletedNormally(f, v1);
861          assertEquals(0, a.get());
862      }}
863  
811
864      /**
865       * exceptionally action completes with function value on source
866       * exception
# Line 852 | Line 904 | public class CompletableFutureTest exten
904              });
905          if (createIncomplete) f.completeExceptionally(ex1);
906  
907 <        checkCompletedWithWrappedCFException(g, ex2);
907 >        checkCompletedWithWrappedException(g, ex2);
908 >        assertEquals(1, a.get());
909 >    }}
910 >
911 >    /**
912 >     * whenComplete action executes on normal completion, propagating
913 >     * source result.
914 >     */
915 >    public void testWhenComplete_normalCompletion1() {
916 >        for (ExecutionMode m : ExecutionMode.values())
917 >        for (boolean createIncomplete : new boolean[] { true, false })
918 >        for (Integer v1 : new Integer[] { 1, null })
919 >    {
920 >        final AtomicInteger a = new AtomicInteger(0);
921 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
922 >        if (!createIncomplete) assertTrue(f.complete(v1));
923 >        final CompletableFuture<Integer> g = m.whenComplete
924 >            (f,
925 >             (Integer x, Throwable t) -> {
926 >                m.checkExecutionMode();
927 >                threadAssertSame(x, v1);
928 >                threadAssertNull(t);
929 >                a.getAndIncrement();
930 >            });
931 >        if (createIncomplete) assertTrue(f.complete(v1));
932 >
933 >        checkCompletedNormally(g, v1);
934 >        checkCompletedNormally(f, v1);
935 >        assertEquals(1, a.get());
936 >    }}
937 >
938 >    /**
939 >     * whenComplete action executes on exceptional completion, propagating
940 >     * source result.
941 >     */
942 >    public void testWhenComplete_exceptionalCompletion() {
943 >        for (ExecutionMode m : ExecutionMode.values())
944 >        for (boolean createIncomplete : new boolean[] { true, false })
945 >        for (Integer v1 : new Integer[] { 1, null })
946 >    {
947 >        final AtomicInteger a = new AtomicInteger(0);
948 >        final CFException ex = new CFException();
949 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
950 >        if (!createIncomplete) f.completeExceptionally(ex);
951 >        final CompletableFuture<Integer> g = m.whenComplete
952 >            (f,
953 >             (Integer x, Throwable t) -> {
954 >                m.checkExecutionMode();
955 >                threadAssertNull(x);
956 >                threadAssertSame(t, ex);
957 >                a.getAndIncrement();
958 >            });
959 >        if (createIncomplete) f.completeExceptionally(ex);
960 >
961 >        checkCompletedWithWrappedException(g, ex);
962 >        checkCompletedExceptionally(f, ex);
963 >        assertEquals(1, a.get());
964 >    }}
965 >
966 >    /**
967 >     * whenComplete action executes on cancelled source, propagating
968 >     * CancellationException.
969 >     */
970 >    public void testWhenComplete_sourceCancelled() {
971 >        for (ExecutionMode m : ExecutionMode.values())
972 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
973 >        for (boolean createIncomplete : new boolean[] { true, false })
974 >    {
975 >        final AtomicInteger a = new AtomicInteger(0);
976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978 >        final CompletableFuture<Integer> g = m.whenComplete
979 >            (f,
980 >             (Integer x, Throwable t) -> {
981 >                m.checkExecutionMode();
982 >                threadAssertNull(x);
983 >                threadAssertTrue(t instanceof CancellationException);
984 >                a.getAndIncrement();
985 >            });
986 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987 >
988 >        checkCompletedWithWrappedCancellationException(g);
989 >        checkCancelled(f);
990 >        assertEquals(1, a.get());
991 >    }}
992 >
993 >    /**
994 >     * If a whenComplete action throws an exception when triggered by
995 >     * a normal completion, it completes exceptionally
996 >     */
997 >    public void testWhenComplete_actionFailed() {
998 >        for (boolean createIncomplete : new boolean[] { true, false })
999 >        for (ExecutionMode m : ExecutionMode.values())
1000 >        for (Integer v1 : new Integer[] { 1, null })
1001 >    {
1002 >        final AtomicInteger a = new AtomicInteger(0);
1003 >        final CFException ex = new CFException();
1004 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1005 >        if (!createIncomplete) assertTrue(f.complete(v1));
1006 >        final CompletableFuture<Integer> g = m.whenComplete
1007 >            (f,
1008 >             (Integer x, Throwable t) -> {
1009 >                m.checkExecutionMode();
1010 >                threadAssertSame(x, v1);
1011 >                threadAssertNull(t);
1012 >                a.getAndIncrement();
1013 >                throw ex;
1014 >            });
1015 >        if (createIncomplete) assertTrue(f.complete(v1));
1016 >
1017 >        checkCompletedWithWrappedException(g, ex);
1018 >        checkCompletedNormally(f, v1);
1019 >        assertEquals(1, a.get());
1020 >    }}
1021 >
1022 >    /**
1023 >     * If a whenComplete action throws an exception when triggered by
1024 >     * a source completion that also throws an exception, the source
1025 >     * exception takes precedence.
1026 >     */
1027 >    public void testWhenComplete_actionFailedSourceFailed() {
1028 >        for (boolean createIncomplete : new boolean[] { true, false })
1029 >        for (ExecutionMode m : ExecutionMode.values())
1030 >        for (Integer v1 : new Integer[] { 1, null })
1031 >    {
1032 >        final AtomicInteger a = new AtomicInteger(0);
1033 >        final CFException ex1 = new CFException();
1034 >        final CFException ex2 = new CFException();
1035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 >
1037 >        if (!createIncomplete) f.completeExceptionally(ex1);
1038 >        final CompletableFuture<Integer> g = m.whenComplete
1039 >            (f,
1040 >             (Integer x, Throwable t) -> {
1041 >                m.checkExecutionMode();
1042 >                threadAssertSame(t, ex1);
1043 >                threadAssertNull(x);
1044 >                a.getAndIncrement();
1045 >                throw ex2;
1046 >            });
1047 >        if (createIncomplete) f.completeExceptionally(ex1);
1048 >
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051          assertEquals(1, a.get());
1052      }}
1053  
# Line 867 | Line 1062 | public class CompletableFutureTest exten
1062      {
1063          final CompletableFuture<Integer> f = new CompletableFuture<>();
1064          final AtomicInteger a = new AtomicInteger(0);
1065 <        if (!createIncomplete) f.complete(v1);
1065 >        if (!createIncomplete) assertTrue(f.complete(v1));
1066          final CompletableFuture<Integer> g = m.handle
1067              (f,
1068               (Integer x, Throwable t) -> {
# Line 877 | Line 1072 | public class CompletableFutureTest exten
1072                  a.getAndIncrement();
1073                  return inc(v1);
1074              });
1075 <        if (createIncomplete) f.complete(v1);
1075 >        if (createIncomplete) assertTrue(f.complete(v1));
1076  
1077          checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
# Line 909 | Line 1104 | public class CompletableFutureTest exten
1104          if (createIncomplete) f.completeExceptionally(ex);
1105  
1106          checkCompletedNormally(g, v1);
1107 <        checkCompletedWithWrappedCFException(f, ex);
1107 >        checkCompletedExceptionally(f, ex);
1108          assertEquals(1, a.get());
1109      }}
1110  
# Line 965 | Line 1160 | public class CompletableFutureTest exten
1160              });
1161          if (createIncomplete) f.completeExceptionally(ex1);
1162  
1163 <        checkCompletedWithWrappedCFException(g, ex2);
1164 <        checkCompletedWithWrappedCFException(f, ex1);
1163 >        checkCompletedWithWrappedException(g, ex2);
1164 >        checkCompletedExceptionally(f, ex1);
1165          assertEquals(1, a.get());
1166      }}
1167  
# Line 978 | Line 1173 | public class CompletableFutureTest exten
1173          final CompletableFuture<Integer> f = new CompletableFuture<>();
1174          final AtomicInteger a = new AtomicInteger(0);
1175          final CFException ex = new CFException();
1176 <        if (!createIncomplete) f.complete(v1);
1176 >        if (!createIncomplete) assertTrue(f.complete(v1));
1177          final CompletableFuture<Integer> g = m.handle
1178              (f,
1179               (Integer x, Throwable t) -> {
# Line 988 | Line 1183 | public class CompletableFutureTest exten
1183                  a.getAndIncrement();
1184                  throw ex;
1185              });
1186 <        if (createIncomplete) f.complete(v1);
1186 >        if (createIncomplete) assertTrue(f.complete(v1));
1187  
1188 <        checkCompletedWithWrappedCFException(g, ex);
1188 >        checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
1190          assertEquals(1, a.get());
1191      }}
# Line 1069 | Line 1264 | public class CompletableFutureTest exten
1264       */
1265      public void testThenRun_normalCompletion() {
1266          for (ExecutionMode m : ExecutionMode.values())
1072        for (boolean createIncomplete : new boolean[] { true, false })
1267          for (Integer v1 : new Integer[] { 1, null })
1268      {
1269          final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 <        final Noop r = new Noop(m);
1271 <        if (!createIncomplete) f.complete(v1);
1078 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1079 <        if (createIncomplete) {
1080 <            checkIncomplete(g);
1081 <            f.complete(v1);
1082 <        }
1270 >        final Noop[] rs = new Noop[6];
1271 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1272  
1273 <        checkCompletedNormally(g, null);
1273 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1274 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1275 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1276 >        checkIncomplete(h0);
1277 >        checkIncomplete(h1);
1278 >        checkIncomplete(h2);
1279 >        assertTrue(f.complete(v1));
1280 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1281 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1282 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1283 >
1284 >        checkCompletedNormally(h0, null);
1285 >        checkCompletedNormally(h1, null);
1286 >        checkCompletedNormally(h2, null);
1287 >        checkCompletedNormally(h3, null);
1288 >        checkCompletedNormally(h4, null);
1289 >        checkCompletedNormally(h5, null);
1290          checkCompletedNormally(f, v1);
1291 <        r.assertInvoked();
1291 >        for (Noop r : rs) r.assertInvoked();
1292      }}
1293  
1294      /**
# Line 1092 | Line 1297 | public class CompletableFutureTest exten
1297       */
1298      public void testThenRun_exceptionalCompletion() {
1299          for (ExecutionMode m : ExecutionMode.values())
1095        for (boolean createIncomplete : new boolean[] { true, false })
1300      {
1301          final CFException ex = new CFException();
1302          final CompletableFuture<Integer> f = new CompletableFuture<>();
1303 <        final Noop r = new Noop(m);
1304 <        if (!createIncomplete) f.completeExceptionally(ex);
1101 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1102 <        if (createIncomplete) {
1103 <            checkIncomplete(g);
1104 <            f.completeExceptionally(ex);
1105 <        }
1303 >        final Noop[] rs = new Noop[6];
1304 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1305  
1306 <        checkCompletedWithWrappedCFException(g, ex);
1307 <        checkCompletedWithWrappedCFException(f, ex);
1308 <        r.assertNotInvoked();
1306 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1307 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1308 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1309 >        checkIncomplete(h0);
1310 >        checkIncomplete(h1);
1311 >        checkIncomplete(h2);
1312 >        assertTrue(f.completeExceptionally(ex));
1313 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1314 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1315 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1316 >
1317 >        checkCompletedWithWrappedException(h0, ex);
1318 >        checkCompletedWithWrappedException(h1, ex);
1319 >        checkCompletedWithWrappedException(h2, ex);
1320 >        checkCompletedWithWrappedException(h3, ex);
1321 >        checkCompletedWithWrappedException(h4, ex);
1322 >        checkCompletedWithWrappedException(h5, ex);
1323 >        checkCompletedExceptionally(f, ex);
1324 >        for (Noop r : rs) r.assertNotInvoked();
1325      }}
1326  
1327      /**
# Line 1114 | Line 1329 | public class CompletableFutureTest exten
1329       */
1330      public void testThenRun_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1117        for (boolean createIncomplete : new boolean[] { true, false })
1332          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333      {
1334          final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 <        final Noop r = new Noop(m);
1336 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1124 <        if (createIncomplete) {
1125 <            checkIncomplete(g);
1126 <            assertTrue(f.cancel(mayInterruptIfRunning));
1127 <        }
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337  
1338 <        checkCompletedWithWrappedCancellationException(g);
1338 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1339 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1340 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1341 >        checkIncomplete(h0);
1342 >        checkIncomplete(h1);
1343 >        checkIncomplete(h2);
1344 >        assertTrue(f.cancel(mayInterruptIfRunning));
1345 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1346 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1347 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1348 >
1349 >        checkCompletedWithWrappedCancellationException(h0);
1350 >        checkCompletedWithWrappedCancellationException(h1);
1351 >        checkCompletedWithWrappedCancellationException(h2);
1352 >        checkCompletedWithWrappedCancellationException(h3);
1353 >        checkCompletedWithWrappedCancellationException(h4);
1354 >        checkCompletedWithWrappedCancellationException(h5);
1355          checkCancelled(f);
1356 <        r.assertNotInvoked();
1356 >        for (Noop r : rs) r.assertNotInvoked();
1357      }}
1358  
1359      /**
# Line 1136 | Line 1361 | public class CompletableFutureTest exten
1361       */
1362      public void testThenRun_actionFailed() {
1363          for (ExecutionMode m : ExecutionMode.values())
1139        for (boolean createIncomplete : new boolean[] { true, false })
1364          for (Integer v1 : new Integer[] { 1, null })
1365      {
1366          final CompletableFuture<Integer> f = new CompletableFuture<>();
1367 <        final FailingRunnable r = new FailingRunnable(m);
1368 <        if (!createIncomplete) f.complete(v1);
1145 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1146 <        if (createIncomplete) {
1147 <            checkIncomplete(g);
1148 <            f.complete(v1);
1149 <        }
1367 >        final FailingRunnable[] rs = new FailingRunnable[6];
1368 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369  
1370 <        checkCompletedWithWrappedCFException(g);
1370 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1371 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1372 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1373 >        assertTrue(f.complete(v1));
1374 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1375 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1376 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1377 >
1378 >        checkCompletedWithWrappedCFException(h0);
1379 >        checkCompletedWithWrappedCFException(h1);
1380 >        checkCompletedWithWrappedCFException(h2);
1381 >        checkCompletedWithWrappedCFException(h3);
1382 >        checkCompletedWithWrappedCFException(h4);
1383 >        checkCompletedWithWrappedCFException(h5);
1384          checkCompletedNormally(f, v1);
1385      }}
1386  
# Line 1157 | Line 1389 | public class CompletableFutureTest exten
1389       */
1390      public void testThenApply_normalCompletion() {
1391          for (ExecutionMode m : ExecutionMode.values())
1160        for (boolean createIncomplete : new boolean[] { true, false })
1392          for (Integer v1 : new Integer[] { 1, null })
1393      {
1394          final CompletableFuture<Integer> f = new CompletableFuture<>();
1395 <        final IncFunction r = new IncFunction(m);
1396 <        if (!createIncomplete) f.complete(v1);
1166 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1167 <        if (createIncomplete) {
1168 <            checkIncomplete(g);
1169 <            f.complete(v1);
1170 <        }
1395 >        final IncFunction[] rs = new IncFunction[4];
1396 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1397  
1398 <        checkCompletedNormally(g, inc(v1));
1398 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1399 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1400 >        checkIncomplete(h0);
1401 >        checkIncomplete(h1);
1402 >        assertTrue(f.complete(v1));
1403 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1404 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1405 >
1406 >        checkCompletedNormally(h0, inc(v1));
1407 >        checkCompletedNormally(h1, inc(v1));
1408 >        checkCompletedNormally(h2, inc(v1));
1409 >        checkCompletedNormally(h3, inc(v1));
1410          checkCompletedNormally(f, v1);
1411 <        r.assertInvoked();
1411 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1412      }}
1413  
1414      /**
# Line 1180 | Line 1417 | public class CompletableFutureTest exten
1417       */
1418      public void testThenApply_exceptionalCompletion() {
1419          for (ExecutionMode m : ExecutionMode.values())
1183        for (boolean createIncomplete : new boolean[] { true, false })
1420      {
1421          final CFException ex = new CFException();
1422          final CompletableFuture<Integer> f = new CompletableFuture<>();
1423 <        final IncFunction r = new IncFunction(m);
1424 <        if (!createIncomplete) f.completeExceptionally(ex);
1189 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1190 <        if (createIncomplete) {
1191 <            checkIncomplete(g);
1192 <            f.completeExceptionally(ex);
1193 <        }
1423 >        final IncFunction[] rs = new IncFunction[4];
1424 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1425  
1426 <        checkCompletedWithWrappedCFException(g, ex);
1427 <        checkCompletedWithWrappedCFException(f, ex);
1428 <        r.assertNotInvoked();
1426 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1427 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1428 >        assertTrue(f.completeExceptionally(ex));
1429 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1430 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1431 >
1432 >        checkCompletedWithWrappedException(h0, ex);
1433 >        checkCompletedWithWrappedException(h1, ex);
1434 >        checkCompletedWithWrappedException(h2, ex);
1435 >        checkCompletedWithWrappedException(h3, ex);
1436 >        checkCompletedExceptionally(f, ex);
1437 >        for (IncFunction r : rs) r.assertNotInvoked();
1438      }}
1439  
1440      /**
# Line 1202 | Line 1442 | public class CompletableFutureTest exten
1442       */
1443      public void testThenApply_sourceCancelled() {
1444          for (ExecutionMode m : ExecutionMode.values())
1205        for (boolean createIncomplete : new boolean[] { true, false })
1445          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1446      {
1447          final CompletableFuture<Integer> f = new CompletableFuture<>();
1448 <        final IncFunction r = new IncFunction(m);
1449 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212 <        if (createIncomplete) {
1213 <            checkIncomplete(g);
1214 <            assertTrue(f.cancel(mayInterruptIfRunning));
1215 <        }
1448 >        final IncFunction[] rs = new IncFunction[4];
1449 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1450  
1451 <        checkCompletedWithWrappedCancellationException(g);
1451 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1452 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1453 >        assertTrue(f.cancel(mayInterruptIfRunning));
1454 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1455 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1456 >
1457 >        checkCompletedWithWrappedCancellationException(h0);
1458 >        checkCompletedWithWrappedCancellationException(h1);
1459 >        checkCompletedWithWrappedCancellationException(h2);
1460 >        checkCompletedWithWrappedCancellationException(h3);
1461          checkCancelled(f);
1462 <        r.assertNotInvoked();
1462 >        for (IncFunction r : rs) r.assertNotInvoked();
1463      }}
1464  
1465      /**
# Line 1224 | Line 1467 | public class CompletableFutureTest exten
1467       */
1468      public void testThenApply_actionFailed() {
1469          for (ExecutionMode m : ExecutionMode.values())
1227        for (boolean createIncomplete : new boolean[] { true, false })
1470          for (Integer v1 : new Integer[] { 1, null })
1471      {
1472          final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 <        final FailingFunction r = new FailingFunction(m);
1474 <        if (!createIncomplete) f.complete(v1);
1233 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234 <        if (createIncomplete) {
1235 <            checkIncomplete(g);
1236 <            f.complete(v1);
1237 <        }
1473 >        final FailingFunction[] rs = new FailingFunction[4];
1474 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1475  
1476 <        checkCompletedWithWrappedCFException(g);
1476 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1477 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1478 >        assertTrue(f.complete(v1));
1479 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1480 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1481 >
1482 >        checkCompletedWithWrappedCFException(h0);
1483 >        checkCompletedWithWrappedCFException(h1);
1484 >        checkCompletedWithWrappedCFException(h2);
1485 >        checkCompletedWithWrappedCFException(h3);
1486          checkCompletedNormally(f, v1);
1487      }}
1488  
# Line 1245 | Line 1491 | public class CompletableFutureTest exten
1491       */
1492      public void testThenAccept_normalCompletion() {
1493          for (ExecutionMode m : ExecutionMode.values())
1248        for (boolean createIncomplete : new boolean[] { true, false })
1494          for (Integer v1 : new Integer[] { 1, null })
1495      {
1496          final CompletableFuture<Integer> f = new CompletableFuture<>();
1497 <        final NoopConsumer r = new NoopConsumer(m);
1498 <        if (!createIncomplete) f.complete(v1);
1254 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 <        if (createIncomplete) {
1256 <            checkIncomplete(g);
1257 <            f.complete(v1);
1258 <        }
1497 >        final NoopConsumer[] rs = new NoopConsumer[4];
1498 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1499  
1500 <        checkCompletedNormally(g, null);
1501 <        r.assertValue(v1);
1500 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1501 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1502 >        checkIncomplete(h0);
1503 >        checkIncomplete(h1);
1504 >        assertTrue(f.complete(v1));
1505 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1506 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1507 >
1508 >        checkCompletedNormally(h0, null);
1509 >        checkCompletedNormally(h1, null);
1510 >        checkCompletedNormally(h2, null);
1511 >        checkCompletedNormally(h3, null);
1512          checkCompletedNormally(f, v1);
1513 +        for (NoopConsumer r : rs) r.assertValue(v1);
1514      }}
1515  
1516      /**
# Line 1268 | Line 1519 | public class CompletableFutureTest exten
1519       */
1520      public void testThenAccept_exceptionalCompletion() {
1521          for (ExecutionMode m : ExecutionMode.values())
1271        for (boolean createIncomplete : new boolean[] { true, false })
1522      {
1523          final CFException ex = new CFException();
1524          final CompletableFuture<Integer> f = new CompletableFuture<>();
1525 <        final NoopConsumer r = new NoopConsumer(m);
1526 <        if (!createIncomplete) f.completeExceptionally(ex);
1277 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1278 <        if (createIncomplete) {
1279 <            checkIncomplete(g);
1280 <            f.completeExceptionally(ex);
1281 <        }
1525 >        final NoopConsumer[] rs = new NoopConsumer[4];
1526 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1527  
1528 <        checkCompletedWithWrappedCFException(g, ex);
1529 <        checkCompletedWithWrappedCFException(f, ex);
1530 <        r.assertNotInvoked();
1528 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1529 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1530 >        assertTrue(f.completeExceptionally(ex));
1531 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1532 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1533 >
1534 >        checkCompletedWithWrappedException(h0, ex);
1535 >        checkCompletedWithWrappedException(h1, ex);
1536 >        checkCompletedWithWrappedException(h2, ex);
1537 >        checkCompletedWithWrappedException(h3, ex);
1538 >        checkCompletedExceptionally(f, ex);
1539 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1540      }}
1541  
1542      /**
# Line 1290 | Line 1544 | public class CompletableFutureTest exten
1544       */
1545      public void testThenAccept_sourceCancelled() {
1546          for (ExecutionMode m : ExecutionMode.values())
1293        for (boolean createIncomplete : new boolean[] { true, false })
1547          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1548      {
1549          final CompletableFuture<Integer> f = new CompletableFuture<>();
1550 <        final NoopConsumer r = new NoopConsumer(m);
1551 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1300 <        if (createIncomplete) {
1301 <            checkIncomplete(g);
1302 <            assertTrue(f.cancel(mayInterruptIfRunning));
1303 <        }
1550 >        final NoopConsumer[] rs = new NoopConsumer[4];
1551 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1552  
1553 <        checkCompletedWithWrappedCancellationException(g);
1553 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1554 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1555 >        assertTrue(f.cancel(mayInterruptIfRunning));
1556 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1557 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1558 >
1559 >        checkCompletedWithWrappedCancellationException(h0);
1560 >        checkCompletedWithWrappedCancellationException(h1);
1561 >        checkCompletedWithWrappedCancellationException(h2);
1562 >        checkCompletedWithWrappedCancellationException(h3);
1563          checkCancelled(f);
1564 <        r.assertNotInvoked();
1564 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1565      }}
1566  
1567      /**
# Line 1312 | Line 1569 | public class CompletableFutureTest exten
1569       */
1570      public void testThenAccept_actionFailed() {
1571          for (ExecutionMode m : ExecutionMode.values())
1315        for (boolean createIncomplete : new boolean[] { true, false })
1572          for (Integer v1 : new Integer[] { 1, null })
1573      {
1574          final CompletableFuture<Integer> f = new CompletableFuture<>();
1575 <        final FailingConsumer r = new FailingConsumer(m);
1576 <        if (!createIncomplete) f.complete(v1);
1321 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1322 <        if (createIncomplete) {
1323 <            checkIncomplete(g);
1324 <            f.complete(v1);
1325 <        }
1575 >        final FailingConsumer[] rs = new FailingConsumer[4];
1576 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1577  
1578 <        checkCompletedWithWrappedCFException(g);
1578 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1579 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1580 >        assertTrue(f.complete(v1));
1581 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1582 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1583 >
1584 >        checkCompletedWithWrappedCFException(h0);
1585 >        checkCompletedWithWrappedCFException(h1);
1586 >        checkCompletedWithWrappedCFException(h2);
1587 >        checkCompletedWithWrappedCFException(h3);
1588          checkCompletedNormally(f, v1);
1589      }}
1590  
# Line 1334 | Line 1594 | public class CompletableFutureTest exten
1594       */
1595      public void testThenCombine_normalCompletion() {
1596          for (ExecutionMode m : ExecutionMode.values())
1337        for (boolean createIncomplete : new boolean[] { true, false })
1597          for (boolean fFirst : new boolean[] { true, false })
1598          for (Integer v1 : new Integer[] { 1, null })
1599          for (Integer v2 : new Integer[] { 2, null })
1600      {
1601          final CompletableFuture<Integer> f = new CompletableFuture<>();
1602          final CompletableFuture<Integer> g = new CompletableFuture<>();
1603 <        final SubtractFunction r = new SubtractFunction(m);
1604 <
1605 <        if (fFirst) f.complete(v1); else g.complete(v2);
1606 <        if (!createIncomplete)
1607 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1608 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1609 <        if (createIncomplete) {
1610 <            checkIncomplete(h);
1611 <            r.assertNotInvoked();
1612 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1613 <        }
1614 <
1615 <        checkCompletedNormally(h, subtract(v1, v2));
1603 >        final SubtractFunction r1 = new SubtractFunction(m);
1604 >        final SubtractFunction r2 = new SubtractFunction(m);
1605 >        final SubtractFunction r3 = new SubtractFunction(m);
1606 >
1607 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1608 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1609 >        final Integer w1 =  fFirst ? v1 : v2;
1610 >        final Integer w2 = !fFirst ? v1 : v2;
1611 >
1612 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1613 >        assertTrue(fst.complete(w1));
1614 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1615 >        checkIncomplete(h1);
1616 >        checkIncomplete(h2);
1617 >        r1.assertNotInvoked();
1618 >        r2.assertNotInvoked();
1619 >        assertTrue(snd.complete(w2));
1620 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1621 >
1622 >        checkCompletedNormally(h1, subtract(v1, v2));
1623 >        checkCompletedNormally(h2, subtract(v1, v2));
1624 >        checkCompletedNormally(h3, subtract(v1, v2));
1625 >        r1.assertValue(subtract(v1, v2));
1626 >        r2.assertValue(subtract(v1, v2));
1627 >        r3.assertValue(subtract(v1, v2));
1628          checkCompletedNormally(f, v1);
1629          checkCompletedNormally(g, v2);
1359        r.assertInvoked();
1630      }}
1631  
1632      /**
1633       * thenCombine result completes exceptionally after exceptional
1634       * completion of either source
1635       */
1636 <    public void testThenCombine_exceptionalCompletion() {
1636 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1637          for (ExecutionMode m : ExecutionMode.values())
1368        for (boolean createIncomplete : new boolean[] { true, false })
1638          for (boolean fFirst : new boolean[] { true, false })
1639 +        for (boolean failFirst : new boolean[] { true, false })
1640          for (Integer v1 : new Integer[] { 1, null })
1641      {
1642          final CompletableFuture<Integer> f = new CompletableFuture<>();
1643          final CompletableFuture<Integer> g = new CompletableFuture<>();
1644          final CFException ex = new CFException();
1645 <        final SubtractFunction r = new SubtractFunction(m);
1646 <
1647 <        (fFirst ? f : g).complete(v1);
1648 <        if (!createIncomplete)
1649 <            (!fFirst ? f : g).completeExceptionally(ex);
1650 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1651 <        if (createIncomplete) {
1652 <            checkIncomplete(h);
1653 <            (!fFirst ? f : g).completeExceptionally(ex);
1654 <        }
1655 <
1656 <        checkCompletedWithWrappedCFException(h, ex);
1657 <        r.assertNotInvoked();
1658 <        checkCompletedNormally(fFirst ? f : g, v1);
1659 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1645 >        final SubtractFunction r1 = new SubtractFunction(m);
1646 >        final SubtractFunction r2 = new SubtractFunction(m);
1647 >        final SubtractFunction r3 = new SubtractFunction(m);
1648 >
1649 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1650 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1651 >        final Callable<Boolean> complete1 = failFirst ?
1652 >            () -> fst.completeExceptionally(ex) :
1653 >            () -> fst.complete(v1);
1654 >        final Callable<Boolean> complete2 = failFirst ?
1655 >            () -> snd.complete(v1) :
1656 >            () -> snd.completeExceptionally(ex);
1657 >
1658 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1659 >        assertTrue(complete1.call());
1660 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1661 >        checkIncomplete(h1);
1662 >        checkIncomplete(h2);
1663 >        assertTrue(complete2.call());
1664 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1665 >
1666 >        checkCompletedWithWrappedException(h1, ex);
1667 >        checkCompletedWithWrappedException(h2, ex);
1668 >        checkCompletedWithWrappedException(h3, ex);
1669 >        r1.assertNotInvoked();
1670 >        r2.assertNotInvoked();
1671 >        r3.assertNotInvoked();
1672 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1673 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1674      }}
1675  
1676      /**
1677       * thenCombine result completes exceptionally if either source cancelled
1678       */
1679 <    public void testThenCombine_sourceCancelled() {
1679 >    public void testThenCombine_sourceCancelled() throws Throwable {
1680          for (ExecutionMode m : ExecutionMode.values())
1681          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398        for (boolean createIncomplete : new boolean[] { true, false })
1682          for (boolean fFirst : new boolean[] { true, false })
1683 +        for (boolean failFirst : new boolean[] { true, false })
1684          for (Integer v1 : new Integer[] { 1, null })
1685      {
1686          final CompletableFuture<Integer> f = new CompletableFuture<>();
1687          final CompletableFuture<Integer> g = new CompletableFuture<>();
1688 <        final SubtractFunction r = new SubtractFunction(m);
1688 >        final SubtractFunction r1 = new SubtractFunction(m);
1689 >        final SubtractFunction r2 = new SubtractFunction(m);
1690 >        final SubtractFunction r3 = new SubtractFunction(m);
1691  
1692 <        (fFirst ? f : g).complete(v1);
1693 <        if (!createIncomplete)
1694 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1695 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1696 <        if (createIncomplete) {
1697 <            checkIncomplete(h);
1698 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1699 <        }
1692 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1693 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1694 >        final Callable<Boolean> complete1 = failFirst ?
1695 >            () -> fst.cancel(mayInterruptIfRunning) :
1696 >            () -> fst.complete(v1);
1697 >        final Callable<Boolean> complete2 = failFirst ?
1698 >            () -> snd.complete(v1) :
1699 >            () -> snd.cancel(mayInterruptIfRunning);
1700  
1701 <        checkCompletedWithWrappedCancellationException(h);
1702 <        checkCancelled(!fFirst ? f : g);
1703 <        r.assertNotInvoked();
1704 <        checkCompletedNormally(fFirst ? f : g, v1);
1701 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1702 >        assertTrue(complete1.call());
1703 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1704 >        checkIncomplete(h1);
1705 >        checkIncomplete(h2);
1706 >        assertTrue(complete2.call());
1707 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1708 >
1709 >        checkCompletedWithWrappedCancellationException(h1);
1710 >        checkCompletedWithWrappedCancellationException(h2);
1711 >        checkCompletedWithWrappedCancellationException(h3);
1712 >        r1.assertNotInvoked();
1713 >        r2.assertNotInvoked();
1714 >        r3.assertNotInvoked();
1715 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1716 >        checkCancelled(failFirst ? fst : snd);
1717      }}
1718  
1719      /**
# Line 1429 | Line 1727 | public class CompletableFutureTest exten
1727      {
1728          final CompletableFuture<Integer> f = new CompletableFuture<>();
1729          final CompletableFuture<Integer> g = new CompletableFuture<>();
1730 <        final FailingBiFunction r = new FailingBiFunction(m);
1731 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1730 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1731 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1732 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1733 >
1734 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1735 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1736 >        final Integer w1 =  fFirst ? v1 : v2;
1737 >        final Integer w2 = !fFirst ? v1 : v2;
1738 >
1739 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1740 >        assertTrue(fst.complete(w1));
1741 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1742 >        assertTrue(snd.complete(w2));
1743 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1744  
1745 <        if (fFirst) {
1746 <            f.complete(v1);
1747 <            g.complete(v2);
1748 <        } else {
1749 <            g.complete(v2);
1750 <            f.complete(v1);
1441 <        }
1442 <
1443 <        checkCompletedWithWrappedCFException(h);
1745 >        checkCompletedWithWrappedCFException(h1);
1746 >        checkCompletedWithWrappedCFException(h2);
1747 >        checkCompletedWithWrappedCFException(h3);
1748 >        r1.assertInvoked();
1749 >        r2.assertInvoked();
1750 >        r3.assertInvoked();
1751          checkCompletedNormally(f, v1);
1752          checkCompletedNormally(g, v2);
1753      }}
# Line 1451 | Line 1758 | public class CompletableFutureTest exten
1758       */
1759      public void testThenAcceptBoth_normalCompletion() {
1760          for (ExecutionMode m : ExecutionMode.values())
1454        for (boolean createIncomplete : new boolean[] { true, false })
1761          for (boolean fFirst : new boolean[] { true, false })
1762          for (Integer v1 : new Integer[] { 1, null })
1763          for (Integer v2 : new Integer[] { 2, null })
1764      {
1765          final CompletableFuture<Integer> f = new CompletableFuture<>();
1766          final CompletableFuture<Integer> g = new CompletableFuture<>();
1767 <        final SubtractAction r = new SubtractAction(m);
1768 <
1769 <        if (fFirst) f.complete(v1); else g.complete(v2);
1770 <        if (!createIncomplete)
1771 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1772 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1773 <        if (createIncomplete) {
1774 <            checkIncomplete(h);
1775 <            r.assertNotInvoked();
1776 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1777 <        }
1767 >        final SubtractAction r1 = new SubtractAction(m);
1768 >        final SubtractAction r2 = new SubtractAction(m);
1769 >        final SubtractAction r3 = new SubtractAction(m);
1770 >
1771 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1772 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1773 >        final Integer w1 =  fFirst ? v1 : v2;
1774 >        final Integer w2 = !fFirst ? v1 : v2;
1775 >
1776 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1777 >        assertTrue(fst.complete(w1));
1778 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1779 >        checkIncomplete(h1);
1780 >        checkIncomplete(h2);
1781 >        r1.assertNotInvoked();
1782 >        r2.assertNotInvoked();
1783 >        assertTrue(snd.complete(w2));
1784 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1785  
1786 <        checkCompletedNormally(h, null);
1787 <        r.assertValue(subtract(v1, v2));
1786 >        checkCompletedNormally(h1, null);
1787 >        checkCompletedNormally(h2, null);
1788 >        checkCompletedNormally(h3, null);
1789 >        r1.assertValue(subtract(v1, v2));
1790 >        r2.assertValue(subtract(v1, v2));
1791 >        r3.assertValue(subtract(v1, v2));
1792          checkCompletedNormally(f, v1);
1793          checkCompletedNormally(g, v2);
1794      }}
# Line 1480 | Line 1797 | public class CompletableFutureTest exten
1797       * thenAcceptBoth result completes exceptionally after exceptional
1798       * completion of either source
1799       */
1800 <    public void testThenAcceptBoth_exceptionalCompletion() {
1800 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1801          for (ExecutionMode m : ExecutionMode.values())
1485        for (boolean createIncomplete : new boolean[] { true, false })
1802          for (boolean fFirst : new boolean[] { true, false })
1803 +        for (boolean failFirst : new boolean[] { true, false })
1804          for (Integer v1 : new Integer[] { 1, null })
1805      {
1806          final CompletableFuture<Integer> f = new CompletableFuture<>();
1807          final CompletableFuture<Integer> g = new CompletableFuture<>();
1808          final CFException ex = new CFException();
1809 <        final SubtractAction r = new SubtractAction(m);
1810 <
1811 <        (fFirst ? f : g).complete(v1);
1812 <        if (!createIncomplete)
1813 <            (!fFirst ? f : g).completeExceptionally(ex);
1814 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1815 <        if (createIncomplete) {
1816 <            checkIncomplete(h);
1817 <            (!fFirst ? f : g).completeExceptionally(ex);
1818 <        }
1819 <
1820 <        checkCompletedWithWrappedCFException(h, ex);
1821 <        r.assertNotInvoked();
1822 <        checkCompletedNormally(fFirst ? f : g, v1);
1823 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1809 >        final SubtractAction r1 = new SubtractAction(m);
1810 >        final SubtractAction r2 = new SubtractAction(m);
1811 >        final SubtractAction r3 = new SubtractAction(m);
1812 >
1813 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1814 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1815 >        final Callable<Boolean> complete1 = failFirst ?
1816 >            () -> fst.completeExceptionally(ex) :
1817 >            () -> fst.complete(v1);
1818 >        final Callable<Boolean> complete2 = failFirst ?
1819 >            () -> snd.complete(v1) :
1820 >            () -> snd.completeExceptionally(ex);
1821 >
1822 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1823 >        assertTrue(complete1.call());
1824 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1825 >        checkIncomplete(h1);
1826 >        checkIncomplete(h2);
1827 >        assertTrue(complete2.call());
1828 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1829 >
1830 >        checkCompletedWithWrappedException(h1, ex);
1831 >        checkCompletedWithWrappedException(h2, ex);
1832 >        checkCompletedWithWrappedException(h3, ex);
1833 >        r1.assertNotInvoked();
1834 >        r2.assertNotInvoked();
1835 >        r3.assertNotInvoked();
1836 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1837 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1838      }}
1839  
1840      /**
1841       * thenAcceptBoth result completes exceptionally if either source cancelled
1842       */
1843 <    public void testThenAcceptBoth_sourceCancelled() {
1843 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1844          for (ExecutionMode m : ExecutionMode.values())
1845          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515        for (boolean createIncomplete : new boolean[] { true, false })
1846          for (boolean fFirst : new boolean[] { true, false })
1847 +        for (boolean failFirst : new boolean[] { true, false })
1848          for (Integer v1 : new Integer[] { 1, null })
1849      {
1850          final CompletableFuture<Integer> f = new CompletableFuture<>();
1851          final CompletableFuture<Integer> g = new CompletableFuture<>();
1852 <        final SubtractAction r = new SubtractAction(m);
1852 >        final SubtractAction r1 = new SubtractAction(m);
1853 >        final SubtractAction r2 = new SubtractAction(m);
1854 >        final SubtractAction r3 = new SubtractAction(m);
1855  
1856 <        (fFirst ? f : g).complete(v1);
1857 <        if (!createIncomplete)
1858 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1859 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1860 <        if (createIncomplete) {
1861 <            checkIncomplete(h);
1862 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1863 <        }
1856 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1857 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1858 >        final Callable<Boolean> complete1 = failFirst ?
1859 >            () -> fst.cancel(mayInterruptIfRunning) :
1860 >            () -> fst.complete(v1);
1861 >        final Callable<Boolean> complete2 = failFirst ?
1862 >            () -> snd.complete(v1) :
1863 >            () -> snd.cancel(mayInterruptIfRunning);
1864  
1865 <        checkCompletedWithWrappedCancellationException(h);
1866 <        checkCancelled(!fFirst ? f : g);
1867 <        r.assertNotInvoked();
1868 <        checkCompletedNormally(fFirst ? f : g, v1);
1865 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1866 >        assertTrue(complete1.call());
1867 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1868 >        checkIncomplete(h1);
1869 >        checkIncomplete(h2);
1870 >        assertTrue(complete2.call());
1871 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1872 >
1873 >        checkCompletedWithWrappedCancellationException(h1);
1874 >        checkCompletedWithWrappedCancellationException(h2);
1875 >        checkCompletedWithWrappedCancellationException(h3);
1876 >        r1.assertNotInvoked();
1877 >        r2.assertNotInvoked();
1878 >        r3.assertNotInvoked();
1879 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1880 >        checkCancelled(failFirst ? fst : snd);
1881      }}
1882  
1883      /**
# Line 1546 | Line 1891 | public class CompletableFutureTest exten
1891      {
1892          final CompletableFuture<Integer> f = new CompletableFuture<>();
1893          final CompletableFuture<Integer> g = new CompletableFuture<>();
1894 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1895 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1894 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1895 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1896 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1897 >
1898 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1899 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1900 >        final Integer w1 =  fFirst ? v1 : v2;
1901 >        final Integer w2 = !fFirst ? v1 : v2;
1902 >
1903 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1904 >        assertTrue(fst.complete(w1));
1905 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1906 >        assertTrue(snd.complete(w2));
1907 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1908  
1909 <        if (fFirst) {
1910 <            f.complete(v1);
1911 <            g.complete(v2);
1912 <        } else {
1913 <            g.complete(v2);
1914 <            f.complete(v1);
1558 <        }
1559 <
1560 <        checkCompletedWithWrappedCFException(h);
1909 >        checkCompletedWithWrappedCFException(h1);
1910 >        checkCompletedWithWrappedCFException(h2);
1911 >        checkCompletedWithWrappedCFException(h3);
1912 >        r1.assertInvoked();
1913 >        r2.assertInvoked();
1914 >        r3.assertInvoked();
1915          checkCompletedNormally(f, v1);
1916          checkCompletedNormally(g, v2);
1917      }}
# Line 1568 | Line 1922 | public class CompletableFutureTest exten
1922       */
1923      public void testRunAfterBoth_normalCompletion() {
1924          for (ExecutionMode m : ExecutionMode.values())
1571        for (boolean createIncomplete : new boolean[] { true, false })
1925          for (boolean fFirst : new boolean[] { true, false })
1926          for (Integer v1 : new Integer[] { 1, null })
1927          for (Integer v2 : new Integer[] { 2, null })
1928      {
1929          final CompletableFuture<Integer> f = new CompletableFuture<>();
1930          final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 <        final Noop r = new Noop(m);
1932 <
1933 <        if (fFirst) f.complete(v1); else g.complete(v2);
1934 <        if (!createIncomplete)
1935 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1936 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1937 <        if (createIncomplete) {
1938 <            checkIncomplete(h);
1939 <            r.assertNotInvoked();
1940 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1941 <        }
1931 >        final Noop r1 = new Noop(m);
1932 >        final Noop r2 = new Noop(m);
1933 >        final Noop r3 = new Noop(m);
1934 >
1935 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1936 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1937 >        final Integer w1 =  fFirst ? v1 : v2;
1938 >        final Integer w2 = !fFirst ? v1 : v2;
1939 >
1940 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1941 >        assertTrue(fst.complete(w1));
1942 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1943 >        checkIncomplete(h1);
1944 >        checkIncomplete(h2);
1945 >        r1.assertNotInvoked();
1946 >        r2.assertNotInvoked();
1947 >        assertTrue(snd.complete(w2));
1948 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1949  
1950 <        checkCompletedNormally(h, null);
1951 <        r.assertInvoked();
1950 >        checkCompletedNormally(h1, null);
1951 >        checkCompletedNormally(h2, null);
1952 >        checkCompletedNormally(h3, null);
1953 >        r1.assertInvoked();
1954 >        r2.assertInvoked();
1955 >        r3.assertInvoked();
1956          checkCompletedNormally(f, v1);
1957          checkCompletedNormally(g, v2);
1958      }}
# Line 1597 | Line 1961 | public class CompletableFutureTest exten
1961       * runAfterBoth result completes exceptionally after exceptional
1962       * completion of either source
1963       */
1964 <    public void testRunAfterBoth_exceptionalCompletion() {
1964 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1965          for (ExecutionMode m : ExecutionMode.values())
1602        for (boolean createIncomplete : new boolean[] { true, false })
1966          for (boolean fFirst : new boolean[] { true, false })
1967 +        for (boolean failFirst : new boolean[] { true, false })
1968          for (Integer v1 : new Integer[] { 1, null })
1969      {
1970          final CompletableFuture<Integer> f = new CompletableFuture<>();
1971          final CompletableFuture<Integer> g = new CompletableFuture<>();
1972          final CFException ex = new CFException();
1973 <        final Noop r = new Noop(m);
1974 <
1975 <        (fFirst ? f : g).complete(v1);
1976 <        if (!createIncomplete)
1977 <            (!fFirst ? f : g).completeExceptionally(ex);
1978 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1979 <        if (createIncomplete) {
1980 <            checkIncomplete(h);
1981 <            (!fFirst ? f : g).completeExceptionally(ex);
1982 <        }
1983 <
1984 <        checkCompletedWithWrappedCFException(h, ex);
1985 <        r.assertNotInvoked();
1986 <        checkCompletedNormally(fFirst ? f : g, v1);
1987 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1973 >        final Noop r1 = new Noop(m);
1974 >        final Noop r2 = new Noop(m);
1975 >        final Noop r3 = new Noop(m);
1976 >
1977 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1978 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1979 >        final Callable<Boolean> complete1 = failFirst ?
1980 >            () -> fst.completeExceptionally(ex) :
1981 >            () -> fst.complete(v1);
1982 >        final Callable<Boolean> complete2 = failFirst ?
1983 >            () -> snd.complete(v1) :
1984 >            () -> snd.completeExceptionally(ex);
1985 >
1986 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1987 >        assertTrue(complete1.call());
1988 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1989 >        checkIncomplete(h1);
1990 >        checkIncomplete(h2);
1991 >        assertTrue(complete2.call());
1992 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1993 >
1994 >        checkCompletedWithWrappedException(h1, ex);
1995 >        checkCompletedWithWrappedException(h2, ex);
1996 >        checkCompletedWithWrappedException(h3, ex);
1997 >        r1.assertNotInvoked();
1998 >        r2.assertNotInvoked();
1999 >        r3.assertNotInvoked();
2000 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2001 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2002      }}
2003  
2004      /**
2005       * runAfterBoth result completes exceptionally if either source cancelled
2006       */
2007 <    public void testRunAfterBoth_sourceCancelled() {
2007 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2008          for (ExecutionMode m : ExecutionMode.values())
2009          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632        for (boolean createIncomplete : new boolean[] { true, false })
2010          for (boolean fFirst : new boolean[] { true, false })
2011 +        for (boolean failFirst : new boolean[] { true, false })
2012          for (Integer v1 : new Integer[] { 1, null })
2013      {
2014          final CompletableFuture<Integer> f = new CompletableFuture<>();
2015          final CompletableFuture<Integer> g = new CompletableFuture<>();
2016 <        final Noop r = new Noop(m);
2016 >        final Noop r1 = new Noop(m);
2017 >        final Noop r2 = new Noop(m);
2018 >        final Noop r3 = new Noop(m);
2019  
2020 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2021 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2022 +        final Callable<Boolean> complete1 = failFirst ?
2023 +            () -> fst.cancel(mayInterruptIfRunning) :
2024 +            () -> fst.complete(v1);
2025 +        final Callable<Boolean> complete2 = failFirst ?
2026 +            () -> snd.complete(v1) :
2027 +            () -> snd.cancel(mayInterruptIfRunning);
2028  
2029 <        (fFirst ? f : g).complete(v1);
2030 <        if (!createIncomplete)
2031 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2032 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2033 <        if (createIncomplete) {
2034 <            checkIncomplete(h);
2035 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1648 <        }
2029 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2030 >        assertTrue(complete1.call());
2031 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2032 >        checkIncomplete(h1);
2033 >        checkIncomplete(h2);
2034 >        assertTrue(complete2.call());
2035 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2036  
2037 <        checkCompletedWithWrappedCancellationException(h);
2038 <        checkCancelled(!fFirst ? f : g);
2039 <        r.assertNotInvoked();
2040 <        checkCompletedNormally(fFirst ? f : g, v1);
2037 >        checkCompletedWithWrappedCancellationException(h1);
2038 >        checkCompletedWithWrappedCancellationException(h2);
2039 >        checkCompletedWithWrappedCancellationException(h3);
2040 >        r1.assertNotInvoked();
2041 >        r2.assertNotInvoked();
2042 >        r3.assertNotInvoked();
2043 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2044 >        checkCancelled(failFirst ? fst : snd);
2045      }}
2046  
2047      /**
# Line 1666 | Line 2057 | public class CompletableFutureTest exten
2057          final CompletableFuture<Integer> g = new CompletableFuture<>();
2058          final FailingRunnable r1 = new FailingRunnable(m);
2059          final FailingRunnable r2 = new FailingRunnable(m);
2060 +        final FailingRunnable r3 = new FailingRunnable(m);
2061  
2062 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2063 <        if (fFirst) {
2064 <            f.complete(v1);
2065 <            g.complete(v2);
2066 <        } else {
2067 <            g.complete(v2);
2068 <            f.complete(v1);
2069 <        }
2070 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2062 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2063 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2064 >        final Integer w1 =  fFirst ? v1 : v2;
2065 >        final Integer w2 = !fFirst ? v1 : v2;
2066 >
2067 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2068 >        assertTrue(fst.complete(w1));
2069 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2070 >        assertTrue(snd.complete(w2));
2071 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2072  
2073          checkCompletedWithWrappedCFException(h1);
2074          checkCompletedWithWrappedCFException(h2);
2075 +        checkCompletedWithWrappedCFException(h3);
2076 +        r1.assertInvoked();
2077 +        r2.assertInvoked();
2078 +        r3.assertInvoked();
2079          checkCompletedNormally(f, v1);
2080          checkCompletedNormally(g, v2);
2081      }}
# Line 1752 | Line 2149 | public class CompletableFutureTest exten
2149          rs[0].assertNotInvoked();
2150          rs[1].assertNotInvoked();
2151          f.completeExceptionally(ex);
2152 <        checkCompletedWithWrappedCFException(h0, ex);
2153 <        checkCompletedWithWrappedCFException(h1, ex);
2152 >        checkCompletedWithWrappedException(h0, ex);
2153 >        checkCompletedWithWrappedException(h1, ex);
2154          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2155          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2156 <        checkCompletedWithWrappedCFException(h2, ex);
2157 <        checkCompletedWithWrappedCFException(h3, ex);
2156 >        checkCompletedWithWrappedException(h2, ex);
2157 >        checkCompletedWithWrappedException(h3, ex);
2158          g.complete(v1);
2159  
2160          // unspecified behavior - both source completions available
# Line 1765 | Line 2162 | public class CompletableFutureTest exten
2162          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2163          try {
2164              assertEquals(inc(v1), h4.join());
2165 <            rs[4].assertInvoked();
2165 >            rs[4].assertValue(inc(v1));
2166          } catch (CompletionException ok) {
2167 <            checkCompletedWithWrappedCFException(h4, ex);
2167 >            checkCompletedWithWrappedException(h4, ex);
2168              rs[4].assertNotInvoked();
2169          }
2170          try {
2171              assertEquals(inc(v1), h5.join());
2172 <            rs[5].assertInvoked();
2172 >            rs[5].assertValue(inc(v1));
2173          } catch (CompletionException ok) {
2174 <            checkCompletedWithWrappedCFException(h5, ex);
2174 >            checkCompletedWithWrappedException(h5, ex);
2175              rs[5].assertNotInvoked();
2176          }
2177  
2178 <        checkCompletedWithWrappedCFException(f, ex);
2178 >        checkCompletedExceptionally(f, ex);
2179          checkCompletedNormally(g, v1);
2180 <        checkCompletedWithWrappedCFException(h0, ex);
2181 <        checkCompletedWithWrappedCFException(h1, ex);
2182 <        checkCompletedWithWrappedCFException(h2, ex);
2183 <        checkCompletedWithWrappedCFException(h3, ex);
2184 <        checkCompletedWithWrappedCFException(h4, ex);
2180 >        checkCompletedWithWrappedException(h0, ex);
2181 >        checkCompletedWithWrappedException(h1, ex);
2182 >        checkCompletedWithWrappedException(h2, ex);
2183 >        checkCompletedWithWrappedException(h3, ex);
2184 >        checkCompletedWithWrappedException(h4, ex);
2185          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2186      }}
2187  
2188 +    public void testApplyToEither_exceptionalCompletion2() {
2189 +        for (ExecutionMode m : ExecutionMode.values())
2190 +        for (boolean fFirst : new boolean[] { true, false })
2191 +        for (Integer v1 : new Integer[] { 1, null })
2192 +    {
2193 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2194 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2195 +        final CFException ex = new CFException();
2196 +        final IncFunction[] rs = new IncFunction[6];
2197 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2198 +
2199 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2200 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2201 +        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2202 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2203 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2204 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2205 +
2206 +        // unspecified behavior - both source completions available
2207 +        try {
2208 +            assertEquals(inc(v1), h0.join());
2209 +            rs[0].assertValue(inc(v1));
2210 +        } catch (CompletionException ok) {
2211 +            checkCompletedWithWrappedException(h0, ex);
2212 +            rs[0].assertNotInvoked();
2213 +        }
2214 +        try {
2215 +            assertEquals(inc(v1), h1.join());
2216 +            rs[1].assertValue(inc(v1));
2217 +        } catch (CompletionException ok) {
2218 +            checkCompletedWithWrappedException(h1, ex);
2219 +            rs[1].assertNotInvoked();
2220 +        }
2221 +        try {
2222 +            assertEquals(inc(v1), h2.join());
2223 +            rs[2].assertValue(inc(v1));
2224 +        } catch (CompletionException ok) {
2225 +            checkCompletedWithWrappedException(h2, ex);
2226 +            rs[2].assertNotInvoked();
2227 +        }
2228 +        try {
2229 +            assertEquals(inc(v1), h3.join());
2230 +            rs[3].assertValue(inc(v1));
2231 +        } catch (CompletionException ok) {
2232 +            checkCompletedWithWrappedException(h3, ex);
2233 +            rs[3].assertNotInvoked();
2234 +        }
2235 +
2236 +        checkCompletedNormally(f, v1);
2237 +        checkCompletedExceptionally(g, ex);
2238 +    }}
2239 +
2240      /**
2241       * applyToEither result completes exceptionally if either source cancelled
2242       */
# Line 1821 | Line 2270 | public class CompletableFutureTest exten
2270          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2271          try {
2272              assertEquals(inc(v1), h4.join());
2273 <            rs[4].assertInvoked();
2273 >            rs[4].assertValue(inc(v1));
2274          } catch (CompletionException ok) {
2275              checkCompletedWithWrappedCancellationException(h4);
2276              rs[4].assertNotInvoked();
2277          }
2278          try {
2279              assertEquals(inc(v1), h5.join());
2280 <            rs[5].assertInvoked();
2280 >            rs[5].assertValue(inc(v1));
2281          } catch (CompletionException ok) {
2282              checkCompletedWithWrappedCancellationException(h5);
2283              rs[5].assertNotInvoked();
# Line 1843 | Line 2292 | public class CompletableFutureTest exten
2292          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2293      }}
2294  
2295 +    public void testApplyToEither_sourceCancelled2() {
2296 +        for (ExecutionMode m : ExecutionMode.values())
2297 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2298 +        for (boolean fFirst : new boolean[] { true, false })
2299 +        for (Integer v1 : new Integer[] { 1, null })
2300 +    {
2301 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2302 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2303 +        final IncFunction[] rs = new IncFunction[6];
2304 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2305 +
2306 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2307 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2308 +        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2309 +        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2310 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2311 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2312 +
2313 +        // unspecified behavior - both source completions available
2314 +        try {
2315 +            assertEquals(inc(v1), h0.join());
2316 +            rs[0].assertValue(inc(v1));
2317 +        } catch (CompletionException ok) {
2318 +            checkCompletedWithWrappedCancellationException(h0);
2319 +            rs[0].assertNotInvoked();
2320 +        }
2321 +        try {
2322 +            assertEquals(inc(v1), h1.join());
2323 +            rs[1].assertValue(inc(v1));
2324 +        } catch (CompletionException ok) {
2325 +            checkCompletedWithWrappedCancellationException(h1);
2326 +            rs[1].assertNotInvoked();
2327 +        }
2328 +        try {
2329 +            assertEquals(inc(v1), h2.join());
2330 +            rs[2].assertValue(inc(v1));
2331 +        } catch (CompletionException ok) {
2332 +            checkCompletedWithWrappedCancellationException(h2);
2333 +            rs[2].assertNotInvoked();
2334 +        }
2335 +        try {
2336 +            assertEquals(inc(v1), h3.join());
2337 +            rs[3].assertValue(inc(v1));
2338 +        } catch (CompletionException ok) {
2339 +            checkCompletedWithWrappedCancellationException(h3);
2340 +            rs[3].assertNotInvoked();
2341 +        }
2342 +
2343 +        checkCompletedNormally(f, v1);
2344 +        checkCancelled(g);
2345 +    }}
2346 +
2347      /**
2348       * applyToEither result completes exceptionally if action does
2349       */
# Line 1957 | Line 2458 | public class CompletableFutureTest exten
2458          rs[0].assertNotInvoked();
2459          rs[1].assertNotInvoked();
2460          f.completeExceptionally(ex);
2461 <        checkCompletedWithWrappedCFException(h0, ex);
2462 <        checkCompletedWithWrappedCFException(h1, ex);
2461 >        checkCompletedWithWrappedException(h0, ex);
2462 >        checkCompletedWithWrappedException(h1, ex);
2463          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2464          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2465 <        checkCompletedWithWrappedCFException(h2, ex);
2466 <        checkCompletedWithWrappedCFException(h3, ex);
2465 >        checkCompletedWithWrappedException(h2, ex);
2466 >        checkCompletedWithWrappedException(h3, ex);
2467  
2468          g.complete(v1);
2469  
# Line 1973 | Line 2474 | public class CompletableFutureTest exten
2474              assertNull(h4.join());
2475              rs[4].assertValue(v1);
2476          } catch (CompletionException ok) {
2477 <            checkCompletedWithWrappedCFException(h4, ex);
2477 >            checkCompletedWithWrappedException(h4, ex);
2478              rs[4].assertNotInvoked();
2479          }
2480          try {
2481              assertNull(h5.join());
2482              rs[5].assertValue(v1);
2483          } catch (CompletionException ok) {
2484 <            checkCompletedWithWrappedCFException(h5, ex);
2484 >            checkCompletedWithWrappedException(h5, ex);
2485              rs[5].assertNotInvoked();
2486          }
2487  
2488 <        checkCompletedWithWrappedCFException(f, ex);
2488 >        checkCompletedExceptionally(f, ex);
2489          checkCompletedNormally(g, v1);
2490 <        checkCompletedWithWrappedCFException(h0, ex);
2491 <        checkCompletedWithWrappedCFException(h1, ex);
2492 <        checkCompletedWithWrappedCFException(h2, ex);
2493 <        checkCompletedWithWrappedCFException(h3, ex);
2494 <        checkCompletedWithWrappedCFException(h4, ex);
2490 >        checkCompletedWithWrappedException(h0, ex);
2491 >        checkCompletedWithWrappedException(h1, ex);
2492 >        checkCompletedWithWrappedException(h2, ex);
2493 >        checkCompletedWithWrappedException(h3, ex);
2494 >        checkCompletedWithWrappedException(h4, ex);
2495          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2496      }}
2497  
2498 +    public void testAcceptEither_exceptionalCompletion2() {
2499 +        for (ExecutionMode m : ExecutionMode.values())
2500 +        for (boolean fFirst : new boolean[] { true, false })
2501 +        for (Integer v1 : new Integer[] { 1, null })
2502 +    {
2503 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2504 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
2505 +        final CFException ex = new CFException();
2506 +        final NoopConsumer[] rs = new NoopConsumer[6];
2507 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2508 +
2509 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2510 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2511 +        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2512 +        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2513 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2514 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2515 +
2516 +        // unspecified behavior - both source completions available
2517 +        try {
2518 +            assertEquals(null, h0.join());
2519 +            rs[0].assertValue(v1);
2520 +        } catch (CompletionException ok) {
2521 +            checkCompletedWithWrappedException(h0, ex);
2522 +            rs[0].assertNotInvoked();
2523 +        }
2524 +        try {
2525 +            assertEquals(null, h1.join());
2526 +            rs[1].assertValue(v1);
2527 +        } catch (CompletionException ok) {
2528 +            checkCompletedWithWrappedException(h1, ex);
2529 +            rs[1].assertNotInvoked();
2530 +        }
2531 +        try {
2532 +            assertEquals(null, h2.join());
2533 +            rs[2].assertValue(v1);
2534 +        } catch (CompletionException ok) {
2535 +            checkCompletedWithWrappedException(h2, ex);
2536 +            rs[2].assertNotInvoked();
2537 +        }
2538 +        try {
2539 +            assertEquals(null, h3.join());
2540 +            rs[3].assertValue(v1);
2541 +        } catch (CompletionException ok) {
2542 +            checkCompletedWithWrappedException(h3, ex);
2543 +            rs[3].assertNotInvoked();
2544 +        }
2545 +
2546 +        checkCompletedNormally(f, v1);
2547 +        checkCompletedExceptionally(g, ex);
2548 +    }}
2549 +
2550      /**
2551       * acceptEither result completes exceptionally if either source cancelled
2552       */
# Line 2095 | Line 2648 | public class CompletableFutureTest exten
2648       * runAfterEither result completes normally after normal completion
2649       * of either source
2650       */
2651 <    public void testRunAfterEither_normalCompletion1() {
2651 >    public void testRunAfterEither_normalCompletion() {
2652          for (ExecutionMode m : ExecutionMode.values())
2653          for (Integer v1 : new Integer[] { 1, null })
2654          for (Integer v2 : new Integer[] { 2, null })
2655      {
2656          final CompletableFuture<Integer> f = new CompletableFuture<>();
2657          final CompletableFuture<Integer> g = new CompletableFuture<>();
2658 <        final Noop r = new Noop(m);
2659 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2658 >        final Noop[] rs = new Noop[6];
2659 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2660  
2661 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2662 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2663 +        checkIncomplete(h0);
2664 +        checkIncomplete(h1);
2665 +        rs[0].assertNotInvoked();
2666 +        rs[1].assertNotInvoked();
2667          f.complete(v1);
2668 <        checkCompletedNormally(h, null);
2669 <        r.assertInvoked();
2670 <        g.complete(v2);
2671 <
2672 <        checkCompletedNormally(f, v1);
2673 <        checkCompletedNormally(g, v2);
2674 <        checkCompletedNormally(h, null);
2675 <        r.assertInvoked();
2676 <    }}
2677 <
2119 <    public void testRunAfterEither_normalCompletion2() {
2120 <        for (ExecutionMode m : ExecutionMode.values())
2121 <        for (Integer v1 : new Integer[] { 1, null })
2122 <        for (Integer v2 : new Integer[] { 2, null })
2123 <    {
2124 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2125 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2126 <        final Noop r = new Noop(m);
2127 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2668 >        checkCompletedNormally(h0, null);
2669 >        checkCompletedNormally(h1, null);
2670 >        rs[0].assertInvoked();
2671 >        rs[1].assertInvoked();
2672 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2673 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2674 >        checkCompletedNormally(h2, null);
2675 >        checkCompletedNormally(h3, null);
2676 >        rs[2].assertInvoked();
2677 >        rs[3].assertInvoked();
2678  
2679          g.complete(v2);
2130        checkCompletedNormally(h, null);
2131        r.assertInvoked();
2132        f.complete(v1);
2133
2134        checkCompletedNormally(f, v1);
2135        checkCompletedNormally(g, v2);
2136        checkCompletedNormally(h, null);
2137        r.assertInvoked();
2138        }}
2680  
2681 <    public void testRunAfterEither_normalCompletion3() {
2682 <        for (ExecutionMode m : ExecutionMode.values())
2142 <        for (Integer v1 : new Integer[] { 1, null })
2143 <        for (Integer v2 : new Integer[] { 2, null })
2144 <    {
2145 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2146 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2147 <        final Noop r = new Noop(m);
2681 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2682 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2683  
2149        f.complete(v1);
2150        g.complete(v2);
2151        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2152
2153        checkCompletedNormally(h, null);
2684          checkCompletedNormally(f, v1);
2685          checkCompletedNormally(g, v2);
2686 <        r.assertInvoked();
2686 >        checkCompletedNormally(h0, null);
2687 >        checkCompletedNormally(h1, null);
2688 >        checkCompletedNormally(h2, null);
2689 >        checkCompletedNormally(h3, null);
2690 >        checkCompletedNormally(h4, null);
2691 >        checkCompletedNormally(h5, null);
2692 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2693      }}
2694  
2695      /**
2696       * runAfterEither result completes exceptionally after exceptional
2697       * completion of either source
2698       */
2699 <    public void testRunAfterEither_exceptionalCompletion1() {
2164 <        for (ExecutionMode m : ExecutionMode.values())
2165 <        for (Integer v1 : new Integer[] { 1, null })
2166 <    {
2167 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2168 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2169 <        final Noop r = new Noop(m);
2170 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2171 <        final CFException ex = new CFException();
2172 <
2173 <        f.completeExceptionally(ex);
2174 <        checkCompletedWithWrappedCFException(h, ex);
2175 <        g.complete(v1);
2176 <
2177 <        r.assertNotInvoked();
2178 <        checkCompletedNormally(g, v1);
2179 <        checkCompletedWithWrappedCFException(f, ex);
2180 <        checkCompletedWithWrappedCFException(h, ex);
2181 <    }}
2182 <
2183 <    public void testRunAfterEither_exceptionalCompletion2() {
2699 >    public void testRunAfterEither_exceptionalCompletion() {
2700          for (ExecutionMode m : ExecutionMode.values())
2701          for (Integer v1 : new Integer[] { 1, null })
2702      {
2703          final CompletableFuture<Integer> f = new CompletableFuture<>();
2704          final CompletableFuture<Integer> g = new CompletableFuture<>();
2189        final Noop r = new Noop(m);
2190        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2705          final CFException ex = new CFException();
2706 +        final Noop[] rs = new Noop[6];
2707 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2708  
2709 <        g.completeExceptionally(ex);
2710 <        checkCompletedWithWrappedCFException(h, ex);
2711 <        f.complete(v1);
2712 <
2713 <        r.assertNotInvoked();
2714 <        checkCompletedNormally(f, v1);
2715 <        checkCompletedWithWrappedCFException(g, ex);
2716 <        checkCompletedWithWrappedCFException(h, ex);
2717 <    }}
2718 <
2719 <    public void testRunAfterEither_exceptionalCompletion3() {
2720 <        for (ExecutionMode m : ExecutionMode.values())
2721 <        for (Integer v1 : new Integer[] { 1, null })
2206 <    {
2207 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2208 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2209 <        final Noop r = new Noop(m);
2210 <        final CFException ex = new CFException();
2709 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2710 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2711 >        checkIncomplete(h0);
2712 >        checkIncomplete(h1);
2713 >        rs[0].assertNotInvoked();
2714 >        rs[1].assertNotInvoked();
2715 >        assertTrue(f.completeExceptionally(ex));
2716 >        checkCompletedWithWrappedException(h0, ex);
2717 >        checkCompletedWithWrappedException(h1, ex);
2718 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2719 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2720 >        checkCompletedWithWrappedException(h2, ex);
2721 >        checkCompletedWithWrappedException(h3, ex);
2722  
2723 <        g.completeExceptionally(ex);
2213 <        f.complete(v1);
2214 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2723 >        assertTrue(g.complete(v1));
2724  
2725 <        // unspecified behavior
2726 <        Integer v;
2725 >        // unspecified behavior - both source completions available
2726 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2727 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2728          try {
2729 <            assertNull(h.join());
2730 <            r.assertInvoked();
2729 >            assertNull(h4.join());
2730 >            rs[4].assertInvoked();
2731          } catch (CompletionException ok) {
2732 <            checkCompletedWithWrappedCFException(h, ex);
2733 <            r.assertNotInvoked();
2732 >            checkCompletedWithWrappedException(h4, ex);
2733 >            rs[4].assertNotInvoked();
2734          }
2225
2226        checkCompletedWithWrappedCFException(g, ex);
2227        checkCompletedNormally(f, v1);
2228    }}
2229
2230    public void testRunAfterEither_exceptionalCompletion4() {
2231        for (ExecutionMode m : ExecutionMode.values())
2232        for (Integer v1 : new Integer[] { 1, null })
2233    {
2234        final CompletableFuture<Integer> f = new CompletableFuture<>();
2235        final CompletableFuture<Integer> g = new CompletableFuture<>();
2236        final Noop r = new Noop(m);
2237        final CFException ex = new CFException();
2238
2239        f.completeExceptionally(ex);
2240        g.complete(v1);
2241        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2242
2243        // unspecified behavior
2244        Integer v;
2735          try {
2736 <            assertNull(h.join());
2737 <            r.assertInvoked();
2736 >            assertNull(h5.join());
2737 >            rs[5].assertInvoked();
2738          } catch (CompletionException ok) {
2739 <            checkCompletedWithWrappedCFException(h, ex);
2740 <            r.assertNotInvoked();
2739 >            checkCompletedWithWrappedException(h5, ex);
2740 >            rs[5].assertNotInvoked();
2741          }
2742  
2743 <        checkCompletedWithWrappedCFException(f, ex);
2743 >        checkCompletedExceptionally(f, ex);
2744          checkCompletedNormally(g, v1);
2745 +        checkCompletedWithWrappedException(h0, ex);
2746 +        checkCompletedWithWrappedException(h1, ex);
2747 +        checkCompletedWithWrappedException(h2, ex);
2748 +        checkCompletedWithWrappedException(h3, ex);
2749 +        checkCompletedWithWrappedException(h4, ex);
2750 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2751      }}
2752  
2753 <    /**
2258 <     * runAfterEither result completes exceptionally if action does
2259 <     */
2260 <    public void testRunAfterEither_actionFailed1() {
2753 >    public void testRunAfterEither_exceptionalCompletion2() {
2754          for (ExecutionMode m : ExecutionMode.values())
2755 +        for (boolean fFirst : new boolean[] { true, false })
2756          for (Integer v1 : new Integer[] { 1, null })
2263        for (Integer v2 : new Integer[] { 2, null })
2757      {
2758          final CompletableFuture<Integer> f = new CompletableFuture<>();
2759          final CompletableFuture<Integer> g = new CompletableFuture<>();
2760 <        final FailingRunnable r = new FailingRunnable(m);
2761 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2760 >        final CFException ex = new CFException();
2761 >        final Noop[] rs = new Noop[6];
2762 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2763  
2764 <        f.complete(v1);
2765 <        checkCompletedWithWrappedCFException(h);
2766 <        g.complete(v2);
2767 <        checkCompletedNormally(f, v1);
2768 <        checkCompletedNormally(g, v2);
2769 <    }}
2764 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2765 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2766 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2767 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2768 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2769 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2770  
2771 <    public void testRunAfterEither_actionFailed2() {
2772 <        for (ExecutionMode m : ExecutionMode.values())
2773 <        for (Integer v1 : new Integer[] { 1, null })
2774 <        for (Integer v2 : new Integer[] { 2, null })
2775 <    {
2776 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2777 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2778 <        final FailingRunnable r = new FailingRunnable(m);
2779 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2771 >        // unspecified behavior - both source completions available
2772 >        try {
2773 >            assertEquals(null, h0.join());
2774 >            rs[0].assertInvoked();
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedException(h0, ex);
2777 >            rs[0].assertNotInvoked();
2778 >        }
2779 >        try {
2780 >            assertEquals(null, h1.join());
2781 >            rs[1].assertInvoked();
2782 >        } catch (CompletionException ok) {
2783 >            checkCompletedWithWrappedException(h1, ex);
2784 >            rs[1].assertNotInvoked();
2785 >        }
2786 >        try {
2787 >            assertEquals(null, h2.join());
2788 >            rs[2].assertInvoked();
2789 >        } catch (CompletionException ok) {
2790 >            checkCompletedWithWrappedException(h2, ex);
2791 >            rs[2].assertNotInvoked();
2792 >        }
2793 >        try {
2794 >            assertEquals(null, h3.join());
2795 >            rs[3].assertInvoked();
2796 >        } catch (CompletionException ok) {
2797 >            checkCompletedWithWrappedException(h3, ex);
2798 >            rs[3].assertNotInvoked();
2799 >        }
2800  
2287        g.complete(v2);
2288        checkCompletedWithWrappedCFException(h);
2289        f.complete(v1);
2801          checkCompletedNormally(f, v1);
2802 <        checkCompletedNormally(g, v2);
2802 >        checkCompletedExceptionally(g, ex);
2803      }}
2804  
2805      /**
2806       * runAfterEither result completes exceptionally if either source cancelled
2807       */
2808 <    public void testRunAfterEither_sourceCancelled1() {
2808 >    public void testRunAfterEither_sourceCancelled() {
2809          for (ExecutionMode m : ExecutionMode.values())
2810          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2811          for (Integer v1 : new Integer[] { 1, null })
2812      {
2813          final CompletableFuture<Integer> f = new CompletableFuture<>();
2814          final CompletableFuture<Integer> g = new CompletableFuture<>();
2815 <        final Noop r = new Noop(m);
2816 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2306 <
2307 <        assertTrue(f.cancel(mayInterruptIfRunning));
2308 <        checkCompletedWithWrappedCancellationException(h);
2309 <        g.complete(v1);
2815 >        final Noop[] rs = new Noop[6];
2816 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2817  
2818 <        checkCancelled(f);
2819 <        r.assertNotInvoked();
2820 <        checkCompletedNormally(g, v1);
2821 <        checkCompletedWithWrappedCancellationException(h);
2822 <    }}
2823 <
2824 <    public void testRunAfterEither_sourceCancelled2() {
2825 <        for (ExecutionMode m : ExecutionMode.values())
2826 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2827 <        for (Integer v1 : new Integer[] { 1, null })
2828 <    {
2829 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2830 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 <        final Noop r = new Noop(m);
2325 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2326 <
2327 <        assertTrue(g.cancel(mayInterruptIfRunning));
2328 <        checkCompletedWithWrappedCancellationException(h);
2329 <        f.complete(v1);
2330 <
2331 <        checkCancelled(g);
2332 <        r.assertNotInvoked();
2333 <        checkCompletedNormally(f, v1);
2334 <        checkCompletedWithWrappedCancellationException(h);
2335 <    }}
2336 <
2337 <    public void testRunAfterEither_sourceCancelled3() {
2338 <        for (ExecutionMode m : ExecutionMode.values())
2339 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2340 <        for (Integer v1 : new Integer[] { 1, null })
2341 <    {
2342 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2343 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2344 <        final Noop r = new Noop(m);
2818 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2819 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2820 >        checkIncomplete(h0);
2821 >        checkIncomplete(h1);
2822 >        rs[0].assertNotInvoked();
2823 >        rs[1].assertNotInvoked();
2824 >        f.cancel(mayInterruptIfRunning);
2825 >        checkCompletedWithWrappedCancellationException(h0);
2826 >        checkCompletedWithWrappedCancellationException(h1);
2827 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2828 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2829 >        checkCompletedWithWrappedCancellationException(h2);
2830 >        checkCompletedWithWrappedCancellationException(h3);
2831  
2832 <        assertTrue(g.cancel(mayInterruptIfRunning));
2347 <        f.complete(v1);
2348 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2832 >        assertTrue(g.complete(v1));
2833  
2834 <        // unspecified behavior
2835 <        Integer v;
2834 >        // unspecified behavior - both source completions available
2835 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2836 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2837 >        try {
2838 >            assertNull(h4.join());
2839 >            rs[4].assertInvoked();
2840 >        } catch (CompletionException ok) {
2841 >            checkCompletedWithWrappedCancellationException(h4);
2842 >            rs[4].assertNotInvoked();
2843 >        }
2844          try {
2845 <            assertNull(h.join());
2846 <            r.assertInvoked();
2845 >            assertNull(h5.join());
2846 >            rs[5].assertInvoked();
2847          } catch (CompletionException ok) {
2848 <            checkCompletedWithWrappedCancellationException(h);
2849 <            r.assertNotInvoked();
2848 >            checkCompletedWithWrappedCancellationException(h5);
2849 >            rs[5].assertNotInvoked();
2850          }
2851  
2852 <        checkCancelled(g);
2853 <        checkCompletedNormally(f, v1);
2852 >        checkCancelled(f);
2853 >        checkCompletedNormally(g, v1);
2854 >        checkCompletedWithWrappedCancellationException(h0);
2855 >        checkCompletedWithWrappedCancellationException(h1);
2856 >        checkCompletedWithWrappedCancellationException(h2);
2857 >        checkCompletedWithWrappedCancellationException(h3);
2858 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2859      }}
2860  
2861 <    public void testRunAfterEither_sourceCancelled4() {
2861 >    /**
2862 >     * runAfterEither result completes exceptionally if action does
2863 >     */
2864 >    public void testRunAfterEither_actionFailed() {
2865          for (ExecutionMode m : ExecutionMode.values())
2366        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2866          for (Integer v1 : new Integer[] { 1, null })
2867 +        for (Integer v2 : new Integer[] { 2, null })
2868      {
2869          final CompletableFuture<Integer> f = new CompletableFuture<>();
2870          final CompletableFuture<Integer> g = new CompletableFuture<>();
2871 <        final Noop r = new Noop(m);
2871 >        final FailingRunnable[] rs = new FailingRunnable[6];
2872 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2873  
2874 <        assertTrue(f.cancel(mayInterruptIfRunning));
2875 <        g.complete(v1);
2876 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2877 <
2878 <        // unspecified behavior
2879 <        Integer v;
2880 <        try {
2881 <            assertNull(h.join());
2882 <            r.assertInvoked();
2883 <        } catch (CompletionException ok) {
2884 <            checkCompletedWithWrappedCancellationException(h);
2885 <            r.assertNotInvoked();
2886 <        }
2874 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2875 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2876 >        assertTrue(f.complete(v1));
2877 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2878 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2879 >        checkCompletedWithWrappedCFException(h0);
2880 >        checkCompletedWithWrappedCFException(h1);
2881 >        checkCompletedWithWrappedCFException(h2);
2882 >        checkCompletedWithWrappedCFException(h3);
2883 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2884 >        assertTrue(g.complete(v2));
2885 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2886 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2887 >        checkCompletedWithWrappedCFException(h4);
2888 >        checkCompletedWithWrappedCFException(h5);
2889  
2890 <        checkCancelled(f);
2891 <        checkCompletedNormally(g, v1);
2890 >        checkCompletedNormally(f, v1);
2891 >        checkCompletedNormally(g, v2);
2892 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2893      }}
2894  
2895      /**
# Line 2398 | Line 2902 | public class CompletableFutureTest exten
2902      {
2903          final CompletableFuture<Integer> f = new CompletableFuture<>();
2904          final CompletableFutureInc r = new CompletableFutureInc(m);
2905 <        if (!createIncomplete) f.complete(v1);
2905 >        if (!createIncomplete) assertTrue(f.complete(v1));
2906          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2907 <        if (createIncomplete) f.complete(v1);
2907 >        if (createIncomplete) assertTrue(f.complete(v1));
2908  
2909          checkCompletedNormally(g, inc(v1));
2910          checkCompletedNormally(f, v1);
2911 <        r.assertInvoked();
2911 >        r.assertValue(v1);
2912      }}
2913  
2914      /**
# Line 2422 | Line 2926 | public class CompletableFutureTest exten
2926          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2927          if (createIncomplete) f.completeExceptionally(ex);
2928  
2929 <        checkCompletedWithWrappedCFException(g, ex);
2930 <        checkCompletedWithWrappedCFException(f, ex);
2929 >        checkCompletedWithWrappedException(g, ex);
2930 >        checkCompletedExceptionally(f, ex);
2931          r.assertNotInvoked();
2932      }}
2933  
# Line 2438 | Line 2942 | public class CompletableFutureTest exten
2942          final CompletableFuture<Integer> f = new CompletableFuture<>();
2943          final FailingCompletableFutureFunction r
2944              = new FailingCompletableFutureFunction(m);
2945 <        if (!createIncomplete) f.complete(v1);
2945 >        if (!createIncomplete) assertTrue(f.complete(v1));
2946          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2947 <        if (createIncomplete) f.complete(v1);
2947 >        if (createIncomplete) assertTrue(f.complete(v1));
2948  
2949          checkCompletedWithWrappedCFException(g);
2950          checkCompletedNormally(f, v1);
# Line 2483 | Line 2987 | public class CompletableFutureTest exten
2987       * when all components complete normally
2988       */
2989      public void testAllOf_normal() throws Exception {
2990 <        for (int k = 1; k < 20; ++k) {
2990 >        for (int k = 1; k < 10; k++) {
2991              CompletableFuture<Integer>[] fs
2992                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2993 <            for (int i = 0; i < k; ++i)
2993 >            for (int i = 0; i < k; i++)
2994                  fs[i] = new CompletableFuture<>();
2995              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2996 <            for (int i = 0; i < k; ++i) {
2996 >            for (int i = 0; i < k; i++) {
2997                  checkIncomplete(f);
2998                  checkIncomplete(CompletableFuture.allOf(fs));
2999                  fs[i].complete(one);
# Line 2500 | Line 3004 | public class CompletableFutureTest exten
3004      }
3005  
3006      public void testAllOf_backwards() throws Exception {
3007 <        for (int k = 1; k < 20; ++k) {
3007 >        for (int k = 1; k < 10; k++) {
3008              CompletableFuture<Integer>[] fs
3009                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3010 <            for (int i = 0; i < k; ++i)
3010 >            for (int i = 0; i < k; i++)
3011                  fs[i] = new CompletableFuture<>();
3012              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3013              for (int i = k - 1; i >= 0; i--) {
# Line 2516 | Line 3020 | public class CompletableFutureTest exten
3020          }
3021      }
3022  
3023 +    public void testAllOf_exceptional() throws Exception {
3024 +        for (int k = 1; k < 10; k++) {
3025 +            CompletableFuture<Integer>[] fs
3026 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3027 +            CFException ex = new CFException();
3028 +            for (int i = 0; i < k; i++)
3029 +                fs[i] = new CompletableFuture<>();
3030 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3031 +            for (int i = 0; i < k; i++) {
3032 +                checkIncomplete(f);
3033 +                checkIncomplete(CompletableFuture.allOf(fs));
3034 +                if (i != k/2) {
3035 +                    fs[i].complete(i);
3036 +                    checkCompletedNormally(fs[i], i);
3037 +                } else {
3038 +                    fs[i].completeExceptionally(ex);
3039 +                    checkCompletedExceptionally(fs[i], ex);
3040 +                }
3041 +            }
3042 +            checkCompletedWithWrappedException(f, ex);
3043 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3044 +        }
3045 +    }
3046 +
3047      /**
3048       * anyOf(no component futures) returns an incomplete future
3049       */
3050      public void testAnyOf_empty() throws Exception {
3051 +        for (Integer v1 : new Integer[] { 1, null })
3052 +    {
3053          CompletableFuture<Object> f = CompletableFuture.anyOf();
3054          checkIncomplete(f);
3055 <    }
3055 >
3056 >        f.complete(v1);
3057 >        checkCompletedNormally(f, v1);
3058 >    }}
3059  
3060      /**
3061       * anyOf returns a future completed normally with a value when
3062       * a component future does
3063       */
3064      public void testAnyOf_normal() throws Exception {
3065 <        for (int k = 0; k < 10; ++k) {
3065 >        for (int k = 0; k < 10; k++) {
3066              CompletableFuture[] fs = new CompletableFuture[k];
3067 <            for (int i = 0; i < k; ++i)
3067 >            for (int i = 0; i < k; i++)
3068                  fs[i] = new CompletableFuture<>();
3069              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3070              checkIncomplete(f);
3071 <            for (int i = 0; i < k; ++i) {
3072 <                fs[i].complete(one);
3073 <                checkCompletedNormally(f, one);
3074 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3071 >            for (int i = 0; i < k; i++) {
3072 >                fs[i].complete(i);
3073 >                checkCompletedNormally(f, 0);
3074 >                int x = (int) CompletableFuture.anyOf(fs).join();
3075 >                assertTrue(0 <= x && x <= i);
3076 >            }
3077 >        }
3078 >    }
3079 >    public void testAnyOf_normal_backwards() throws Exception {
3080 >        for (int k = 0; k < 10; k++) {
3081 >            CompletableFuture[] fs = new CompletableFuture[k];
3082 >            for (int i = 0; i < k; i++)
3083 >                fs[i] = new CompletableFuture<>();
3084 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3085 >            checkIncomplete(f);
3086 >            for (int i = k - 1; i >= 0; i--) {
3087 >                fs[i].complete(i);
3088 >                checkCompletedNormally(f, k - 1);
3089 >                int x = (int) CompletableFuture.anyOf(fs).join();
3090 >                assertTrue(i <= x && x <= k - 1);
3091              }
3092          }
3093      }
# Line 2547 | Line 3096 | public class CompletableFutureTest exten
3096       * anyOf result completes exceptionally when any component does.
3097       */
3098      public void testAnyOf_exceptional() throws Exception {
3099 <        for (int k = 0; k < 10; ++k) {
3099 >        for (int k = 0; k < 10; k++) {
3100              CompletableFuture[] fs = new CompletableFuture[k];
3101 <            for (int i = 0; i < k; ++i)
3101 >            CFException[] exs = new CFException[k];
3102 >            for (int i = 0; i < k; i++) {
3103                  fs[i] = new CompletableFuture<>();
3104 +                exs[i] = new CFException();
3105 +            }
3106              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3107              checkIncomplete(f);
3108 <            for (int i = 0; i < k; ++i) {
3109 <                fs[i].completeExceptionally(new CFException());
3110 <                checkCompletedWithWrappedCFException(f);
3108 >            for (int i = 0; i < k; i++) {
3109 >                fs[i].completeExceptionally(exs[i]);
3110 >                checkCompletedWithWrappedException(f, exs[0]);
3111 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3112 >            }
3113 >        }
3114 >    }
3115 >
3116 >    public void testAnyOf_exceptional_backwards() throws Exception {
3117 >        for (int k = 0; k < 10; k++) {
3118 >            CompletableFuture[] fs = new CompletableFuture[k];
3119 >            CFException[] exs = new CFException[k];
3120 >            for (int i = 0; i < k; i++) {
3121 >                fs[i] = new CompletableFuture<>();
3122 >                exs[i] = new CFException();
3123 >            }
3124 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3125 >            checkIncomplete(f);
3126 >            for (int i = k - 1; i >= 0; i--) {
3127 >                fs[i].completeExceptionally(exs[i]);
3128 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3129                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3130              }
3131          }
# Line 2679 | Line 3249 | public class CompletableFutureTest exten
3249          assertSame(f, f.toCompletableFuture());
3250      }
3251  
3252 <    /**
2683 <     * whenComplete action executes on normal completion, propagating
2684 <     * source result.
2685 <     */
2686 <    public void testWhenComplete_normalCompletion1() {
2687 <        for (ExecutionMode m : ExecutionMode.values())
2688 <        for (boolean createIncomplete : new boolean[] { true, false })
2689 <        for (Integer v1 : new Integer[] { 1, null })
2690 <    {
2691 <        final AtomicInteger a = new AtomicInteger(0);
2692 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2693 <        if (!createIncomplete) f.complete(v1);
2694 <        final CompletableFuture<Integer> g = m.whenComplete
2695 <            (f,
2696 <             (Integer x, Throwable t) -> {
2697 <                threadAssertSame(x, v1);
2698 <                threadAssertNull(t);
2699 <                a.getAndIncrement();
2700 <            });
2701 <        if (createIncomplete) f.complete(v1);
3252 >    //--- tests of implementation details; not part of official tck ---
3253  
3254 <        checkCompletedNormally(g, v1);
3255 <        checkCompletedNormally(f, v1);
3256 <        assertEquals(1, a.get());
3257 <    }}
3254 >    Object resultOf(CompletableFuture<?> f) {
3255 >        try {
3256 >            java.lang.reflect.Field resultField
3257 >                = CompletableFuture.class.getDeclaredField("result");
3258 >            resultField.setAccessible(true);
3259 >            return resultField.get(f);
3260 >        } catch (Throwable t) { throw new AssertionError(t); }
3261 >    }
3262  
3263 <    /**
3264 <     * whenComplete action executes on exceptional completion, propagating
2710 <     * source result.
2711 <     */
2712 <    public void testWhenComplete_exceptionalCompletion() {
3263 >    public void testExceptionPropagationReusesResultObject() {
3264 >        if (!testImplementationDetails) return;
3265          for (ExecutionMode m : ExecutionMode.values())
2714        for (boolean createIncomplete : new boolean[] { true, false })
2715        for (Integer v1 : new Integer[] { 1, null })
3266      {
2717        final AtomicInteger a = new AtomicInteger(0);
3267          final CFException ex = new CFException();
3268 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3269 <        if (!createIncomplete) f.completeExceptionally(ex);
2721 <        final CompletableFuture<Integer> g = m.whenComplete
2722 <            (f,
2723 <             (Integer x, Throwable t) -> {
2724 <                threadAssertNull(x);
2725 <                threadAssertSame(t, ex);
2726 <                a.getAndIncrement();
2727 <            });
2728 <        if (createIncomplete) f.completeExceptionally(ex);
2729 <        checkCompletedWithWrappedCFException(f, ex);
2730 <        checkCompletedWithWrappedCFException(g, ex);
2731 <        assertEquals(1, a.get());
2732 <    }}
3268 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3269 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3270  
3271 <    /**
3272 <     * whenComplete action executes on cancelled source, propagating
2736 <     * CancellationException.
2737 <     */
2738 <    public void testWhenComplete_sourceCancelled() {
2739 <        for (ExecutionMode m : ExecutionMode.values())
2740 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2741 <        for (boolean createIncomplete : new boolean[] { true, false })
2742 <    {
2743 <        final AtomicInteger a = new AtomicInteger(0);
2744 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2745 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2746 <        final CompletableFuture<Integer> g = m.whenComplete
2747 <            (f,
2748 <             (Integer x, Throwable t) -> {
2749 <                threadAssertNull(x);
2750 <                threadAssertTrue(t instanceof CancellationException);
2751 <                a.getAndIncrement();
2752 <            });
2753 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3271 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3272 >            = new ArrayList<>();
3273  
3274 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3275 <        checkCompletedWithWrappedCancellationException(g);
3276 <        checkCancelled(f);
2758 <        assertEquals(1, a.get());
2759 <    }}
3274 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3275 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3276 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3277  
3278 <    /**
3279 <     * If a whenComplete action throws an exception when triggered by
3280 <     * a normal completion, it completes exceptionally
2764 <     */
2765 <    public void testWhenComplete_actionFailed() {
2766 <        for (boolean createIncomplete : new boolean[] { true, false })
2767 <        for (ExecutionMode m : ExecutionMode.values())
2768 <        for (Integer v1 : new Integer[] { 1, null })
2769 <    {
2770 <        final AtomicInteger a = new AtomicInteger(0);
2771 <        final CFException ex = new CFException();
2772 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2773 <        if (!createIncomplete) f.complete(v1);
2774 <        final CompletableFuture<Integer> g = m.whenComplete
2775 <            (f,
2776 <             (Integer x, Throwable t) -> {
2777 <                threadAssertSame(x, v1);
2778 <                threadAssertNull(t);
2779 <                a.getAndIncrement();
2780 <                throw ex;
2781 <            });
2782 <        if (createIncomplete) f.complete(v1);
2783 <        checkCompletedNormally(f, v1);
2784 <        checkCompletedWithWrappedCFException(g, ex);
2785 <        assertEquals(1, a.get());
2786 <    }}
3278 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3279 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3280 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3281  
3282 <    /**
3283 <     * If a whenComplete action throws an exception when triggered by
3284 <     * a source completion that also throws an exception, the source
2791 <     * exception takes precedence.
2792 <     */
2793 <    public void testWhenComplete_actionFailedSourceFailed() {
2794 <        for (boolean createIncomplete : new boolean[] { true, false })
2795 <        for (ExecutionMode m : ExecutionMode.values())
2796 <        for (Integer v1 : new Integer[] { 1, null })
2797 <    {
2798 <        final AtomicInteger a = new AtomicInteger(0);
2799 <        final CFException ex1 = new CFException();
2800 <        final CFException ex2 = new CFException();
2801 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3282 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3283 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3284 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3285  
3286 <        if (!createIncomplete) f.completeExceptionally(ex1);
2804 <        final CompletableFuture<Integer> g = m.whenComplete
2805 <            (f,
2806 <             (Integer x, Throwable t) -> {
2807 <                threadAssertSame(t, ex1);
2808 <                threadAssertNull(x);
2809 <                a.getAndIncrement();
2810 <                throw ex2;
2811 <            });
2812 <        if (createIncomplete) f.completeExceptionally(ex1);
3286 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3287  
3288 <        checkCompletedWithWrappedCFException(f, ex1);
3289 <        checkCompletedWithWrappedCFException(g, ex1);
3290 <        assertEquals(1, a.get());
3288 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3289 >
3290 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3291 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3292 >
3293 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3294 >                 fun : funs) {
3295 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3296 >            f.completeExceptionally(ex);
3297 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3298 >            checkCompletedWithWrappedException(src, ex);
3299 >            CompletableFuture<?> dep = fun.apply(src);
3300 >            checkCompletedWithWrappedException(dep, ex);
3301 >            assertSame(resultOf(src), resultOf(dep));
3302 >        }
3303 >
3304 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3305 >                 fun : funs) {
3306 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3307 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3308 >            CompletableFuture<?> dep = fun.apply(src);
3309 >            f.completeExceptionally(ex);
3310 >            checkCompletedWithWrappedException(src, ex);
3311 >            checkCompletedWithWrappedException(dep, ex);
3312 >            assertSame(resultOf(src), resultOf(dep));
3313 >        }
3314 >
3315 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3316 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3317 >                 fun : funs) {
3318 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3319 >            f.cancel(mayInterruptIfRunning);
3320 >            checkCancelled(f);
3321 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3322 >            checkCompletedWithWrappedCancellationException(src);
3323 >            CompletableFuture<?> dep = fun.apply(src);
3324 >            checkCompletedWithWrappedCancellationException(dep);
3325 >            assertSame(resultOf(src), resultOf(dep));
3326 >        }
3327 >
3328 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3329 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3330 >                 fun : funs) {
3331 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3332 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3333 >            CompletableFuture<?> dep = fun.apply(src);
3334 >            f.cancel(mayInterruptIfRunning);
3335 >            checkCancelled(f);
3336 >            checkCompletedWithWrappedCancellationException(src);
3337 >            checkCompletedWithWrappedCancellationException(dep);
3338 >            assertSame(resultOf(src), resultOf(dep));
3339 >        }
3340      }}
3341  
3342   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines