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

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.70 by jsr166, Fri Jun 6 19:48:38 2014 UTC vs.
Revision 1.90 by jsr166, Tue Jun 17 18:09:28 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[] rs = new FailingRunnable[6];
1368 +        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369 +
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          final FailingRunnable r = new FailingRunnable(m);
1374 <        if (!createIncomplete) f.complete(v1);
1375 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1376 <        if (createIncomplete) {
1377 <            checkIncomplete(g);
1148 <            f.complete(v1);
1149 <        }
1374 >        assertTrue(f.complete(v1));
1375 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1376 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1377 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1378  
1379 <        checkCompletedWithWrappedCFException(g);
1379 >        checkCompletedWithWrappedCFException(h0);
1380 >        checkCompletedWithWrappedCFException(h1);
1381 >        checkCompletedWithWrappedCFException(h2);
1382 >        checkCompletedWithWrappedCFException(h3);
1383 >        checkCompletedWithWrappedCFException(h4);
1384 >        checkCompletedWithWrappedCFException(h5);
1385          checkCompletedNormally(f, v1);
1386      }}
1387  
# Line 1162 | Line 1395 | public class CompletableFutureTest exten
1395      {
1396          final CompletableFuture<Integer> f = new CompletableFuture<>();
1397          final IncFunction r = new IncFunction(m);
1398 <        if (!createIncomplete) f.complete(v1);
1398 >        if (!createIncomplete) assertTrue(f.complete(v1));
1399          final CompletableFuture<Integer> g = m.thenApply(f, r);
1400          if (createIncomplete) {
1401              checkIncomplete(g);
1402 <            f.complete(v1);
1402 >            assertTrue(f.complete(v1));
1403          }
1404  
1405          checkCompletedNormally(g, inc(v1));
# Line 1192 | Line 1425 | public class CompletableFutureTest exten
1425              f.completeExceptionally(ex);
1426          }
1427  
1428 <        checkCompletedWithWrappedCFException(g, ex);
1429 <        checkCompletedWithWrappedCFException(f, ex);
1428 >        checkCompletedWithWrappedException(g, ex);
1429 >        checkCompletedExceptionally(f, ex);
1430          r.assertNotInvoked();
1431      }}
1432  
# Line 1229 | Line 1462 | public class CompletableFutureTest exten
1462      {
1463          final CompletableFuture<Integer> f = new CompletableFuture<>();
1464          final FailingFunction r = new FailingFunction(m);
1465 <        if (!createIncomplete) f.complete(v1);
1465 >        if (!createIncomplete) assertTrue(f.complete(v1));
1466          final CompletableFuture<Integer> g = m.thenApply(f, r);
1467          if (createIncomplete) {
1468              checkIncomplete(g);
1469 <            f.complete(v1);
1469 >            assertTrue(f.complete(v1));
1470          }
1471  
1472          checkCompletedWithWrappedCFException(g);
# Line 1250 | Line 1483 | public class CompletableFutureTest exten
1483      {
1484          final CompletableFuture<Integer> f = new CompletableFuture<>();
1485          final NoopConsumer r = new NoopConsumer(m);
1486 <        if (!createIncomplete) f.complete(v1);
1486 >        if (!createIncomplete) assertTrue(f.complete(v1));
1487          final CompletableFuture<Void> g = m.thenAccept(f, r);
1488          if (createIncomplete) {
1489              checkIncomplete(g);
1490 <            f.complete(v1);
1490 >            assertTrue(f.complete(v1));
1491          }
1492  
1493          checkCompletedNormally(g, null);
# Line 1280 | Line 1513 | public class CompletableFutureTest exten
1513              f.completeExceptionally(ex);
1514          }
1515  
1516 <        checkCompletedWithWrappedCFException(g, ex);
1517 <        checkCompletedWithWrappedCFException(f, ex);
1516 >        checkCompletedWithWrappedException(g, ex);
1517 >        checkCompletedExceptionally(f, ex);
1518          r.assertNotInvoked();
1519      }}
1520  
# Line 1334 | Line 1567 | public class CompletableFutureTest exten
1567       */
1568      public void testThenCombine_normalCompletion() {
1569          for (ExecutionMode m : ExecutionMode.values())
1337        for (boolean createIncomplete : new boolean[] { true, false })
1570          for (boolean fFirst : new boolean[] { true, false })
1571          for (Integer v1 : new Integer[] { 1, null })
1572          for (Integer v2 : new Integer[] { 2, null })
1573      {
1574          final CompletableFuture<Integer> f = new CompletableFuture<>();
1575          final CompletableFuture<Integer> g = new CompletableFuture<>();
1576 <        final SubtractFunction r = new SubtractFunction(m);
1577 <
1578 <        if (fFirst) f.complete(v1); else g.complete(v2);
1579 <        if (!createIncomplete)
1580 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1581 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1582 <        if (createIncomplete) {
1583 <            checkIncomplete(h);
1584 <            r.assertNotInvoked();
1585 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1586 <        }
1587 <
1588 <        checkCompletedNormally(h, subtract(v1, v2));
1576 >        final SubtractFunction r1 = new SubtractFunction(m);
1577 >        final SubtractFunction r2 = new SubtractFunction(m);
1578 >        final SubtractFunction r3 = new SubtractFunction(m);
1579 >
1580 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1581 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1582 >        final Integer w1 =  fFirst ? v1 : v2;
1583 >        final Integer w2 = !fFirst ? v1 : v2;
1584 >
1585 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1586 >        assertTrue(fst.complete(w1));
1587 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1588 >        checkIncomplete(h1);
1589 >        checkIncomplete(h2);
1590 >        r1.assertNotInvoked();
1591 >        r2.assertNotInvoked();
1592 >        assertTrue(snd.complete(w2));
1593 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1594 >
1595 >        checkCompletedNormally(h1, subtract(v1, v2));
1596 >        checkCompletedNormally(h2, subtract(v1, v2));
1597 >        checkCompletedNormally(h3, subtract(v1, v2));
1598 >        r1.assertValue(subtract(v1, v2));
1599 >        r2.assertValue(subtract(v1, v2));
1600 >        r3.assertValue(subtract(v1, v2));
1601          checkCompletedNormally(f, v1);
1602          checkCompletedNormally(g, v2);
1359        r.assertValue(subtract(v1, v2));
1603      }}
1604  
1605      /**
1606       * thenCombine result completes exceptionally after exceptional
1607       * completion of either source
1608       */
1609 <    public void testThenCombine_exceptionalCompletion() {
1609 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1610          for (ExecutionMode m : ExecutionMode.values())
1368        for (boolean createIncomplete : new boolean[] { true, false })
1611          for (boolean fFirst : new boolean[] { true, false })
1612 +        for (boolean failFirst : new boolean[] { true, false })
1613          for (Integer v1 : new Integer[] { 1, null })
1614      {
1615          final CompletableFuture<Integer> f = new CompletableFuture<>();
1616          final CompletableFuture<Integer> g = new CompletableFuture<>();
1617          final CFException ex = new CFException();
1618 <        final SubtractFunction r = new SubtractFunction(m);
1619 <
1620 <        (fFirst ? f : g).complete(v1);
1621 <        if (!createIncomplete)
1622 <            (!fFirst ? f : g).completeExceptionally(ex);
1623 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1624 <        if (createIncomplete) {
1625 <            checkIncomplete(h);
1626 <            (!fFirst ? f : g).completeExceptionally(ex);
1627 <        }
1628 <
1629 <        checkCompletedWithWrappedCFException(h, ex);
1630 <        r.assertNotInvoked();
1631 <        checkCompletedNormally(fFirst ? f : g, v1);
1632 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1618 >        final SubtractFunction r1 = new SubtractFunction(m);
1619 >        final SubtractFunction r2 = new SubtractFunction(m);
1620 >        final SubtractFunction r3 = new SubtractFunction(m);
1621 >
1622 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1623 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1624 >        final Callable<Boolean> complete1 = failFirst ?
1625 >            () -> fst.completeExceptionally(ex) :
1626 >            () -> fst.complete(v1);
1627 >        final Callable<Boolean> complete2 = failFirst ?
1628 >            () -> snd.complete(v1) :
1629 >            () -> snd.completeExceptionally(ex);
1630 >
1631 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1632 >        assertTrue(complete1.call());
1633 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1634 >        checkIncomplete(h1);
1635 >        checkIncomplete(h2);
1636 >        assertTrue(complete2.call());
1637 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1638 >
1639 >        checkCompletedWithWrappedException(h1, ex);
1640 >        checkCompletedWithWrappedException(h2, ex);
1641 >        checkCompletedWithWrappedException(h3, ex);
1642 >        r1.assertNotInvoked();
1643 >        r2.assertNotInvoked();
1644 >        r3.assertNotInvoked();
1645 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1646 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1647      }}
1648  
1649      /**
1650       * thenCombine result completes exceptionally if either source cancelled
1651       */
1652 <    public void testThenCombine_sourceCancelled() {
1652 >    public void testThenCombine_sourceCancelled() throws Throwable {
1653          for (ExecutionMode m : ExecutionMode.values())
1654          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398        for (boolean createIncomplete : new boolean[] { true, false })
1655          for (boolean fFirst : new boolean[] { true, false })
1656 +        for (boolean failFirst : new boolean[] { true, false })
1657          for (Integer v1 : new Integer[] { 1, null })
1658      {
1659          final CompletableFuture<Integer> f = new CompletableFuture<>();
1660          final CompletableFuture<Integer> g = new CompletableFuture<>();
1661 <        final SubtractFunction r = new SubtractFunction(m);
1661 >        final SubtractFunction r1 = new SubtractFunction(m);
1662 >        final SubtractFunction r2 = new SubtractFunction(m);
1663 >        final SubtractFunction r3 = new SubtractFunction(m);
1664  
1665 <        (fFirst ? f : g).complete(v1);
1666 <        if (!createIncomplete)
1667 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1668 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1669 <        if (createIncomplete) {
1670 <            checkIncomplete(h);
1671 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1672 <        }
1665 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1666 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1667 >        final Callable<Boolean> complete1 = failFirst ?
1668 >            () -> fst.cancel(mayInterruptIfRunning) :
1669 >            () -> fst.complete(v1);
1670 >        final Callable<Boolean> complete2 = failFirst ?
1671 >            () -> snd.complete(v1) :
1672 >            () -> snd.cancel(mayInterruptIfRunning);
1673  
1674 <        checkCompletedWithWrappedCancellationException(h);
1675 <        checkCancelled(!fFirst ? f : g);
1676 <        r.assertNotInvoked();
1677 <        checkCompletedNormally(fFirst ? f : g, v1);
1674 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1675 >        assertTrue(complete1.call());
1676 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1677 >        checkIncomplete(h1);
1678 >        checkIncomplete(h2);
1679 >        assertTrue(complete2.call());
1680 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1681 >
1682 >        checkCompletedWithWrappedCancellationException(h1);
1683 >        checkCompletedWithWrappedCancellationException(h2);
1684 >        checkCompletedWithWrappedCancellationException(h3);
1685 >        r1.assertNotInvoked();
1686 >        r2.assertNotInvoked();
1687 >        r3.assertNotInvoked();
1688 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1689 >        checkCancelled(failFirst ? fst : snd);
1690      }}
1691  
1692      /**
# Line 1429 | Line 1700 | public class CompletableFutureTest exten
1700      {
1701          final CompletableFuture<Integer> f = new CompletableFuture<>();
1702          final CompletableFuture<Integer> g = new CompletableFuture<>();
1703 <        final FailingBiFunction r = new FailingBiFunction(m);
1704 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1703 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1704 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1705 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1706 >
1707 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1708 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1709 >        final Integer w1 =  fFirst ? v1 : v2;
1710 >        final Integer w2 = !fFirst ? v1 : v2;
1711 >
1712 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1713 >        assertTrue(fst.complete(w1));
1714 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1715 >        assertTrue(snd.complete(w2));
1716 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1717  
1718 <        if (fFirst) {
1719 <            f.complete(v1);
1720 <            g.complete(v2);
1721 <        } else {
1722 <            g.complete(v2);
1723 <            f.complete(v1);
1441 <        }
1442 <
1443 <        checkCompletedWithWrappedCFException(h);
1718 >        checkCompletedWithWrappedCFException(h1);
1719 >        checkCompletedWithWrappedCFException(h2);
1720 >        checkCompletedWithWrappedCFException(h3);
1721 >        r1.assertInvoked();
1722 >        r2.assertInvoked();
1723 >        r3.assertInvoked();
1724          checkCompletedNormally(f, v1);
1725          checkCompletedNormally(g, v2);
1726      }}
# Line 1451 | Line 1731 | public class CompletableFutureTest exten
1731       */
1732      public void testThenAcceptBoth_normalCompletion() {
1733          for (ExecutionMode m : ExecutionMode.values())
1454        for (boolean createIncomplete : new boolean[] { true, false })
1734          for (boolean fFirst : new boolean[] { true, false })
1735          for (Integer v1 : new Integer[] { 1, null })
1736          for (Integer v2 : new Integer[] { 2, null })
1737      {
1738          final CompletableFuture<Integer> f = new CompletableFuture<>();
1739          final CompletableFuture<Integer> g = new CompletableFuture<>();
1740 <        final SubtractAction r = new SubtractAction(m);
1741 <
1742 <        if (fFirst) f.complete(v1); else g.complete(v2);
1743 <        if (!createIncomplete)
1744 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1745 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1746 <        if (createIncomplete) {
1747 <            checkIncomplete(h);
1748 <            r.assertNotInvoked();
1749 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1750 <        }
1740 >        final SubtractAction r1 = new SubtractAction(m);
1741 >        final SubtractAction r2 = new SubtractAction(m);
1742 >        final SubtractAction r3 = new SubtractAction(m);
1743 >
1744 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1745 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1746 >        final Integer w1 =  fFirst ? v1 : v2;
1747 >        final Integer w2 = !fFirst ? v1 : v2;
1748 >
1749 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1750 >        assertTrue(fst.complete(w1));
1751 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1752 >        checkIncomplete(h1);
1753 >        checkIncomplete(h2);
1754 >        r1.assertNotInvoked();
1755 >        r2.assertNotInvoked();
1756 >        assertTrue(snd.complete(w2));
1757 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1758  
1759 <        checkCompletedNormally(h, null);
1760 <        r.assertValue(subtract(v1, v2));
1759 >        checkCompletedNormally(h1, null);
1760 >        checkCompletedNormally(h2, null);
1761 >        checkCompletedNormally(h3, null);
1762 >        r1.assertValue(subtract(v1, v2));
1763 >        r2.assertValue(subtract(v1, v2));
1764 >        r3.assertValue(subtract(v1, v2));
1765          checkCompletedNormally(f, v1);
1766          checkCompletedNormally(g, v2);
1767      }}
# Line 1480 | Line 1770 | public class CompletableFutureTest exten
1770       * thenAcceptBoth result completes exceptionally after exceptional
1771       * completion of either source
1772       */
1773 <    public void testThenAcceptBoth_exceptionalCompletion() {
1773 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1774          for (ExecutionMode m : ExecutionMode.values())
1485        for (boolean createIncomplete : new boolean[] { true, false })
1775          for (boolean fFirst : new boolean[] { true, false })
1776 +        for (boolean failFirst : new boolean[] { true, false })
1777          for (Integer v1 : new Integer[] { 1, null })
1778      {
1779          final CompletableFuture<Integer> f = new CompletableFuture<>();
1780          final CompletableFuture<Integer> g = new CompletableFuture<>();
1781          final CFException ex = new CFException();
1782 <        final SubtractAction r = new SubtractAction(m);
1783 <
1784 <        (fFirst ? f : g).complete(v1);
1785 <        if (!createIncomplete)
1786 <            (!fFirst ? f : g).completeExceptionally(ex);
1787 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1788 <        if (createIncomplete) {
1789 <            checkIncomplete(h);
1790 <            (!fFirst ? f : g).completeExceptionally(ex);
1791 <        }
1792 <
1793 <        checkCompletedWithWrappedCFException(h, ex);
1794 <        r.assertNotInvoked();
1795 <        checkCompletedNormally(fFirst ? f : g, v1);
1796 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1782 >        final SubtractAction r1 = new SubtractAction(m);
1783 >        final SubtractAction r2 = new SubtractAction(m);
1784 >        final SubtractAction r3 = new SubtractAction(m);
1785 >
1786 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1787 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1788 >        final Callable<Boolean> complete1 = failFirst ?
1789 >            () -> fst.completeExceptionally(ex) :
1790 >            () -> fst.complete(v1);
1791 >        final Callable<Boolean> complete2 = failFirst ?
1792 >            () -> snd.complete(v1) :
1793 >            () -> snd.completeExceptionally(ex);
1794 >
1795 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1796 >        assertTrue(complete1.call());
1797 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1798 >        checkIncomplete(h1);
1799 >        checkIncomplete(h2);
1800 >        assertTrue(complete2.call());
1801 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1802 >
1803 >        checkCompletedWithWrappedException(h1, ex);
1804 >        checkCompletedWithWrappedException(h2, ex);
1805 >        checkCompletedWithWrappedException(h3, ex);
1806 >        r1.assertNotInvoked();
1807 >        r2.assertNotInvoked();
1808 >        r3.assertNotInvoked();
1809 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1810 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1811      }}
1812  
1813      /**
1814       * thenAcceptBoth result completes exceptionally if either source cancelled
1815       */
1816 <    public void testThenAcceptBoth_sourceCancelled() {
1816 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1817          for (ExecutionMode m : ExecutionMode.values())
1818          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515        for (boolean createIncomplete : new boolean[] { true, false })
1819          for (boolean fFirst : new boolean[] { true, false })
1820 +        for (boolean failFirst : new boolean[] { true, false })
1821          for (Integer v1 : new Integer[] { 1, null })
1822      {
1823          final CompletableFuture<Integer> f = new CompletableFuture<>();
1824          final CompletableFuture<Integer> g = new CompletableFuture<>();
1825 <        final SubtractAction r = new SubtractAction(m);
1825 >        final SubtractAction r1 = new SubtractAction(m);
1826 >        final SubtractAction r2 = new SubtractAction(m);
1827 >        final SubtractAction r3 = new SubtractAction(m);
1828  
1829 <        (fFirst ? f : g).complete(v1);
1830 <        if (!createIncomplete)
1831 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1832 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1833 <        if (createIncomplete) {
1834 <            checkIncomplete(h);
1835 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1836 <        }
1829 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1830 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1831 >        final Callable<Boolean> complete1 = failFirst ?
1832 >            () -> fst.cancel(mayInterruptIfRunning) :
1833 >            () -> fst.complete(v1);
1834 >        final Callable<Boolean> complete2 = failFirst ?
1835 >            () -> snd.complete(v1) :
1836 >            () -> snd.cancel(mayInterruptIfRunning);
1837  
1838 <        checkCompletedWithWrappedCancellationException(h);
1839 <        checkCancelled(!fFirst ? f : g);
1840 <        r.assertNotInvoked();
1841 <        checkCompletedNormally(fFirst ? f : g, v1);
1838 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1839 >        assertTrue(complete1.call());
1840 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1841 >        checkIncomplete(h1);
1842 >        checkIncomplete(h2);
1843 >        assertTrue(complete2.call());
1844 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1845 >
1846 >        checkCompletedWithWrappedCancellationException(h1);
1847 >        checkCompletedWithWrappedCancellationException(h2);
1848 >        checkCompletedWithWrappedCancellationException(h3);
1849 >        r1.assertNotInvoked();
1850 >        r2.assertNotInvoked();
1851 >        r3.assertNotInvoked();
1852 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1853 >        checkCancelled(failFirst ? fst : snd);
1854      }}
1855  
1856      /**
# Line 1546 | Line 1864 | public class CompletableFutureTest exten
1864      {
1865          final CompletableFuture<Integer> f = new CompletableFuture<>();
1866          final CompletableFuture<Integer> g = new CompletableFuture<>();
1867 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1868 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1867 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1868 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1869 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1870 >
1871 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1872 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1873 >        final Integer w1 =  fFirst ? v1 : v2;
1874 >        final Integer w2 = !fFirst ? v1 : v2;
1875 >
1876 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1877 >        assertTrue(fst.complete(w1));
1878 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1879 >        assertTrue(snd.complete(w2));
1880 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1881  
1882 <        if (fFirst) {
1883 <            f.complete(v1);
1884 <            g.complete(v2);
1885 <        } else {
1886 <            g.complete(v2);
1887 <            f.complete(v1);
1558 <        }
1559 <
1560 <        checkCompletedWithWrappedCFException(h);
1882 >        checkCompletedWithWrappedCFException(h1);
1883 >        checkCompletedWithWrappedCFException(h2);
1884 >        checkCompletedWithWrappedCFException(h3);
1885 >        r1.assertInvoked();
1886 >        r2.assertInvoked();
1887 >        r3.assertInvoked();
1888          checkCompletedNormally(f, v1);
1889          checkCompletedNormally(g, v2);
1890      }}
# Line 1568 | Line 1895 | public class CompletableFutureTest exten
1895       */
1896      public void testRunAfterBoth_normalCompletion() {
1897          for (ExecutionMode m : ExecutionMode.values())
1571        for (boolean createIncomplete : new boolean[] { true, false })
1898          for (boolean fFirst : new boolean[] { true, false })
1899          for (Integer v1 : new Integer[] { 1, null })
1900          for (Integer v2 : new Integer[] { 2, null })
1901      {
1902          final CompletableFuture<Integer> f = new CompletableFuture<>();
1903          final CompletableFuture<Integer> g = new CompletableFuture<>();
1904 <        final Noop r = new Noop(m);
1905 <
1906 <        if (fFirst) f.complete(v1); else g.complete(v2);
1907 <        if (!createIncomplete)
1908 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1909 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1910 <        if (createIncomplete) {
1911 <            checkIncomplete(h);
1912 <            r.assertNotInvoked();
1913 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1914 <        }
1904 >        final Noop r1 = new Noop(m);
1905 >        final Noop r2 = new Noop(m);
1906 >        final Noop r3 = new Noop(m);
1907 >
1908 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1909 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1910 >        final Integer w1 =  fFirst ? v1 : v2;
1911 >        final Integer w2 = !fFirst ? v1 : v2;
1912 >
1913 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1914 >        assertTrue(fst.complete(w1));
1915 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1916 >        checkIncomplete(h1);
1917 >        checkIncomplete(h2);
1918 >        r1.assertNotInvoked();
1919 >        r2.assertNotInvoked();
1920 >        assertTrue(snd.complete(w2));
1921 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1922  
1923 <        checkCompletedNormally(h, null);
1924 <        r.assertInvoked();
1923 >        checkCompletedNormally(h1, null);
1924 >        checkCompletedNormally(h2, null);
1925 >        checkCompletedNormally(h3, null);
1926 >        r1.assertInvoked();
1927 >        r2.assertInvoked();
1928 >        r3.assertInvoked();
1929          checkCompletedNormally(f, v1);
1930          checkCompletedNormally(g, v2);
1931      }}
# Line 1597 | Line 1934 | public class CompletableFutureTest exten
1934       * runAfterBoth result completes exceptionally after exceptional
1935       * completion of either source
1936       */
1937 <    public void testRunAfterBoth_exceptionalCompletion() {
1937 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1938          for (ExecutionMode m : ExecutionMode.values())
1602        for (boolean createIncomplete : new boolean[] { true, false })
1939          for (boolean fFirst : new boolean[] { true, false })
1940 +        for (boolean failFirst : new boolean[] { true, false })
1941          for (Integer v1 : new Integer[] { 1, null })
1942      {
1943          final CompletableFuture<Integer> f = new CompletableFuture<>();
1944          final CompletableFuture<Integer> g = new CompletableFuture<>();
1945          final CFException ex = new CFException();
1946 <        final Noop r = new Noop(m);
1947 <
1948 <        (fFirst ? f : g).complete(v1);
1949 <        if (!createIncomplete)
1950 <            (!fFirst ? f : g).completeExceptionally(ex);
1951 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1952 <        if (createIncomplete) {
1953 <            checkIncomplete(h);
1954 <            (!fFirst ? f : g).completeExceptionally(ex);
1955 <        }
1956 <
1957 <        checkCompletedWithWrappedCFException(h, ex);
1958 <        r.assertNotInvoked();
1959 <        checkCompletedNormally(fFirst ? f : g, v1);
1960 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1946 >        final Noop r1 = new Noop(m);
1947 >        final Noop r2 = new Noop(m);
1948 >        final Noop r3 = new Noop(m);
1949 >
1950 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1951 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1952 >        final Callable<Boolean> complete1 = failFirst ?
1953 >            () -> fst.completeExceptionally(ex) :
1954 >            () -> fst.complete(v1);
1955 >        final Callable<Boolean> complete2 = failFirst ?
1956 >            () -> snd.complete(v1) :
1957 >            () -> snd.completeExceptionally(ex);
1958 >
1959 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1960 >        assertTrue(complete1.call());
1961 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1962 >        checkIncomplete(h1);
1963 >        checkIncomplete(h2);
1964 >        assertTrue(complete2.call());
1965 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1966 >
1967 >        checkCompletedWithWrappedException(h1, ex);
1968 >        checkCompletedWithWrappedException(h2, ex);
1969 >        checkCompletedWithWrappedException(h3, ex);
1970 >        r1.assertNotInvoked();
1971 >        r2.assertNotInvoked();
1972 >        r3.assertNotInvoked();
1973 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1974 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1975      }}
1976  
1977      /**
1978       * runAfterBoth result completes exceptionally if either source cancelled
1979       */
1980 <    public void testRunAfterBoth_sourceCancelled() {
1980 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1981          for (ExecutionMode m : ExecutionMode.values())
1982          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632        for (boolean createIncomplete : new boolean[] { true, false })
1983          for (boolean fFirst : new boolean[] { true, false })
1984 +        for (boolean failFirst : new boolean[] { true, false })
1985          for (Integer v1 : new Integer[] { 1, null })
1986      {
1987          final CompletableFuture<Integer> f = new CompletableFuture<>();
1988          final CompletableFuture<Integer> g = new CompletableFuture<>();
1989 <        final Noop r = new Noop(m);
1989 >        final Noop r1 = new Noop(m);
1990 >        final Noop r2 = new Noop(m);
1991 >        final Noop r3 = new Noop(m);
1992  
1993 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1994 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1995 +        final Callable<Boolean> complete1 = failFirst ?
1996 +            () -> fst.cancel(mayInterruptIfRunning) :
1997 +            () -> fst.complete(v1);
1998 +        final Callable<Boolean> complete2 = failFirst ?
1999 +            () -> snd.complete(v1) :
2000 +            () -> snd.cancel(mayInterruptIfRunning);
2001  
2002 <        (fFirst ? f : g).complete(v1);
2003 <        if (!createIncomplete)
2004 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2005 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2006 <        if (createIncomplete) {
2007 <            checkIncomplete(h);
2008 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1648 <        }
2002 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2003 >        assertTrue(complete1.call());
2004 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2005 >        checkIncomplete(h1);
2006 >        checkIncomplete(h2);
2007 >        assertTrue(complete2.call());
2008 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2009  
2010 <        checkCompletedWithWrappedCancellationException(h);
2011 <        checkCancelled(!fFirst ? f : g);
2012 <        r.assertNotInvoked();
2013 <        checkCompletedNormally(fFirst ? f : g, v1);
2010 >        checkCompletedWithWrappedCancellationException(h1);
2011 >        checkCompletedWithWrappedCancellationException(h2);
2012 >        checkCompletedWithWrappedCancellationException(h3);
2013 >        r1.assertNotInvoked();
2014 >        r2.assertNotInvoked();
2015 >        r3.assertNotInvoked();
2016 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2017 >        checkCancelled(failFirst ? fst : snd);
2018      }}
2019  
2020      /**
# Line 1666 | Line 2030 | public class CompletableFutureTest exten
2030          final CompletableFuture<Integer> g = new CompletableFuture<>();
2031          final FailingRunnable r1 = new FailingRunnable(m);
2032          final FailingRunnable r2 = new FailingRunnable(m);
2033 +        final FailingRunnable r3 = new FailingRunnable(m);
2034  
2035 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2036 <        if (fFirst) {
2037 <            f.complete(v1);
2038 <            g.complete(v2);
2039 <        } else {
2040 <            g.complete(v2);
2041 <            f.complete(v1);
2042 <        }
2043 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2035 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2036 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2037 >        final Integer w1 =  fFirst ? v1 : v2;
2038 >        final Integer w2 = !fFirst ? v1 : v2;
2039 >
2040 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2041 >        assertTrue(fst.complete(w1));
2042 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2043 >        assertTrue(snd.complete(w2));
2044 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2045  
2046          checkCompletedWithWrappedCFException(h1);
2047          checkCompletedWithWrappedCFException(h2);
2048 +        checkCompletedWithWrappedCFException(h3);
2049 +        r1.assertInvoked();
2050 +        r2.assertInvoked();
2051 +        r3.assertInvoked();
2052          checkCompletedNormally(f, v1);
2053          checkCompletedNormally(g, v2);
2054      }}
# Line 1752 | Line 2122 | public class CompletableFutureTest exten
2122          rs[0].assertNotInvoked();
2123          rs[1].assertNotInvoked();
2124          f.completeExceptionally(ex);
2125 <        checkCompletedWithWrappedCFException(h0, ex);
2126 <        checkCompletedWithWrappedCFException(h1, ex);
2125 >        checkCompletedWithWrappedException(h0, ex);
2126 >        checkCompletedWithWrappedException(h1, ex);
2127          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2128          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2129 <        checkCompletedWithWrappedCFException(h2, ex);
2130 <        checkCompletedWithWrappedCFException(h3, ex);
2129 >        checkCompletedWithWrappedException(h2, ex);
2130 >        checkCompletedWithWrappedException(h3, ex);
2131          g.complete(v1);
2132  
2133          // unspecified behavior - both source completions available
# Line 1767 | Line 2137 | public class CompletableFutureTest exten
2137              assertEquals(inc(v1), h4.join());
2138              rs[4].assertValue(inc(v1));
2139          } catch (CompletionException ok) {
2140 <            checkCompletedWithWrappedCFException(h4, ex);
2140 >            checkCompletedWithWrappedException(h4, ex);
2141              rs[4].assertNotInvoked();
2142          }
2143          try {
2144              assertEquals(inc(v1), h5.join());
2145              rs[5].assertValue(inc(v1));
2146          } catch (CompletionException ok) {
2147 <            checkCompletedWithWrappedCFException(h5, ex);
2147 >            checkCompletedWithWrappedException(h5, ex);
2148              rs[5].assertNotInvoked();
2149          }
2150  
2151 <        checkCompletedWithWrappedCFException(f, ex);
2151 >        checkCompletedExceptionally(f, ex);
2152          checkCompletedNormally(g, v1);
2153 <        checkCompletedWithWrappedCFException(h0, ex);
2154 <        checkCompletedWithWrappedCFException(h1, ex);
2155 <        checkCompletedWithWrappedCFException(h2, ex);
2156 <        checkCompletedWithWrappedCFException(h3, ex);
2157 <        checkCompletedWithWrappedCFException(h4, ex);
2153 >        checkCompletedWithWrappedException(h0, ex);
2154 >        checkCompletedWithWrappedException(h1, ex);
2155 >        checkCompletedWithWrappedException(h2, ex);
2156 >        checkCompletedWithWrappedException(h3, ex);
2157 >        checkCompletedWithWrappedException(h4, ex);
2158          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2159      }}
2160  
# Line 1801 | Line 2171 | public class CompletableFutureTest exten
2171  
2172          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2173          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2174 <        if (fFirst) {
2175 <            f.complete(v1);
1806 <            g.completeExceptionally(ex);
1807 <        } else {
1808 <            g.completeExceptionally(ex);
1809 <            f.complete(v1);
1810 <        }
2174 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2175 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2176          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2177          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2178  
# Line 1816 | Line 2181 | public class CompletableFutureTest exten
2181              assertEquals(inc(v1), h0.join());
2182              rs[0].assertValue(inc(v1));
2183          } catch (CompletionException ok) {
2184 <            checkCompletedWithWrappedCFException(h0, ex);
2184 >            checkCompletedWithWrappedException(h0, ex);
2185              rs[0].assertNotInvoked();
2186          }
2187          try {
2188              assertEquals(inc(v1), h1.join());
2189              rs[1].assertValue(inc(v1));
2190          } catch (CompletionException ok) {
2191 <            checkCompletedWithWrappedCFException(h1, ex);
2191 >            checkCompletedWithWrappedException(h1, ex);
2192              rs[1].assertNotInvoked();
2193          }
2194          try {
2195              assertEquals(inc(v1), h2.join());
2196              rs[2].assertValue(inc(v1));
2197          } catch (CompletionException ok) {
2198 <            checkCompletedWithWrappedCFException(h2, ex);
2198 >            checkCompletedWithWrappedException(h2, ex);
2199              rs[2].assertNotInvoked();
2200          }
2201          try {
2202              assertEquals(inc(v1), h3.join());
2203              rs[3].assertValue(inc(v1));
2204          } catch (CompletionException ok) {
2205 <            checkCompletedWithWrappedCFException(h3, ex);
2205 >            checkCompletedWithWrappedException(h3, ex);
2206              rs[3].assertNotInvoked();
2207          }
2208  
2209          checkCompletedNormally(f, v1);
2210 <        checkCompletedWithWrappedCFException(g, ex);
2210 >        checkCompletedExceptionally(g, ex);
2211      }}
2212  
2213      /**
# Line 1913 | Line 2278 | public class CompletableFutureTest exten
2278  
2279          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2280          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2281 <        if (fFirst) {
2282 <            f.complete(v1);
1918 <            g.cancel(mayInterruptIfRunning);
1919 <        } else {
1920 <            g.cancel(mayInterruptIfRunning);
1921 <            f.complete(v1);
1922 <        }
2281 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2282 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2283          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2284          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2285  
# Line 2071 | Line 2431 | public class CompletableFutureTest exten
2431          rs[0].assertNotInvoked();
2432          rs[1].assertNotInvoked();
2433          f.completeExceptionally(ex);
2434 <        checkCompletedWithWrappedCFException(h0, ex);
2435 <        checkCompletedWithWrappedCFException(h1, ex);
2434 >        checkCompletedWithWrappedException(h0, ex);
2435 >        checkCompletedWithWrappedException(h1, ex);
2436          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2437          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2438 <        checkCompletedWithWrappedCFException(h2, ex);
2439 <        checkCompletedWithWrappedCFException(h3, ex);
2438 >        checkCompletedWithWrappedException(h2, ex);
2439 >        checkCompletedWithWrappedException(h3, ex);
2440  
2441          g.complete(v1);
2442  
# Line 2087 | Line 2447 | public class CompletableFutureTest exten
2447              assertNull(h4.join());
2448              rs[4].assertValue(v1);
2449          } catch (CompletionException ok) {
2450 <            checkCompletedWithWrappedCFException(h4, ex);
2450 >            checkCompletedWithWrappedException(h4, ex);
2451              rs[4].assertNotInvoked();
2452          }
2453          try {
2454              assertNull(h5.join());
2455              rs[5].assertValue(v1);
2456          } catch (CompletionException ok) {
2457 <            checkCompletedWithWrappedCFException(h5, ex);
2457 >            checkCompletedWithWrappedException(h5, ex);
2458              rs[5].assertNotInvoked();
2459          }
2460  
2461 <        checkCompletedWithWrappedCFException(f, ex);
2461 >        checkCompletedExceptionally(f, ex);
2462          checkCompletedNormally(g, v1);
2463 <        checkCompletedWithWrappedCFException(h0, ex);
2464 <        checkCompletedWithWrappedCFException(h1, ex);
2465 <        checkCompletedWithWrappedCFException(h2, ex);
2466 <        checkCompletedWithWrappedCFException(h3, ex);
2467 <        checkCompletedWithWrappedCFException(h4, ex);
2463 >        checkCompletedWithWrappedException(h0, ex);
2464 >        checkCompletedWithWrappedException(h1, ex);
2465 >        checkCompletedWithWrappedException(h2, ex);
2466 >        checkCompletedWithWrappedException(h3, ex);
2467 >        checkCompletedWithWrappedException(h4, ex);
2468          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2469      }}
2470  
# Line 2121 | Line 2481 | public class CompletableFutureTest exten
2481  
2482          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2483          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2484 <        if (fFirst) {
2485 <            f.complete(v1);
2126 <            g.completeExceptionally(ex);
2127 <        } else {
2128 <            g.completeExceptionally(ex);
2129 <            f.complete(v1);
2130 <        }
2484 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2485 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2486          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2487          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2488  
# Line 2136 | Line 2491 | public class CompletableFutureTest exten
2491              assertEquals(null, h0.join());
2492              rs[0].assertValue(v1);
2493          } catch (CompletionException ok) {
2494 <            checkCompletedWithWrappedCFException(h0, ex);
2494 >            checkCompletedWithWrappedException(h0, ex);
2495              rs[0].assertNotInvoked();
2496          }
2497          try {
2498              assertEquals(null, h1.join());
2499              rs[1].assertValue(v1);
2500          } catch (CompletionException ok) {
2501 <            checkCompletedWithWrappedCFException(h1, ex);
2501 >            checkCompletedWithWrappedException(h1, ex);
2502              rs[1].assertNotInvoked();
2503          }
2504          try {
2505              assertEquals(null, h2.join());
2506              rs[2].assertValue(v1);
2507          } catch (CompletionException ok) {
2508 <            checkCompletedWithWrappedCFException(h2, ex);
2508 >            checkCompletedWithWrappedException(h2, ex);
2509              rs[2].assertNotInvoked();
2510          }
2511          try {
2512              assertEquals(null, h3.join());
2513              rs[3].assertValue(v1);
2514          } catch (CompletionException ok) {
2515 <            checkCompletedWithWrappedCFException(h3, ex);
2515 >            checkCompletedWithWrappedException(h3, ex);
2516              rs[3].assertNotInvoked();
2517          }
2518  
2519          checkCompletedNormally(f, v1);
2520 <        checkCompletedWithWrappedCFException(g, ex);
2520 >        checkCompletedExceptionally(g, ex);
2521      }}
2522  
2523      /**
# Line 2330 | Line 2685 | public class CompletableFutureTest exten
2685          checkIncomplete(h1);
2686          rs[0].assertNotInvoked();
2687          rs[1].assertNotInvoked();
2688 <        f.completeExceptionally(ex);
2689 <        checkCompletedWithWrappedCFException(h0, ex);
2690 <        checkCompletedWithWrappedCFException(h1, ex);
2688 >        assertTrue(f.completeExceptionally(ex));
2689 >        checkCompletedWithWrappedException(h0, ex);
2690 >        checkCompletedWithWrappedException(h1, ex);
2691          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2692          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2693 <        checkCompletedWithWrappedCFException(h2, ex);
2694 <        checkCompletedWithWrappedCFException(h3, ex);
2693 >        checkCompletedWithWrappedException(h2, ex);
2694 >        checkCompletedWithWrappedException(h3, ex);
2695  
2696 <        g.complete(v1);
2696 >        assertTrue(g.complete(v1));
2697  
2698          // unspecified behavior - both source completions available
2699          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2347 | Line 2702 | public class CompletableFutureTest exten
2702              assertNull(h4.join());
2703              rs[4].assertInvoked();
2704          } catch (CompletionException ok) {
2705 <            checkCompletedWithWrappedCFException(h4, ex);
2705 >            checkCompletedWithWrappedException(h4, ex);
2706              rs[4].assertNotInvoked();
2707          }
2708          try {
2709              assertNull(h5.join());
2710              rs[5].assertInvoked();
2711          } catch (CompletionException ok) {
2712 <            checkCompletedWithWrappedCFException(h5, ex);
2712 >            checkCompletedWithWrappedException(h5, ex);
2713              rs[5].assertNotInvoked();
2714          }
2715  
2716 <        checkCompletedWithWrappedCFException(f, ex);
2716 >        checkCompletedExceptionally(f, ex);
2717          checkCompletedNormally(g, v1);
2718 <        checkCompletedWithWrappedCFException(h0, ex);
2719 <        checkCompletedWithWrappedCFException(h1, ex);
2720 <        checkCompletedWithWrappedCFException(h2, ex);
2721 <        checkCompletedWithWrappedCFException(h3, ex);
2722 <        checkCompletedWithWrappedCFException(h4, ex);
2718 >        checkCompletedWithWrappedException(h0, ex);
2719 >        checkCompletedWithWrappedException(h1, ex);
2720 >        checkCompletedWithWrappedException(h2, ex);
2721 >        checkCompletedWithWrappedException(h3, ex);
2722 >        checkCompletedWithWrappedException(h4, ex);
2723          for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2724      }}
2725  
# Line 2381 | Line 2736 | public class CompletableFutureTest exten
2736  
2737          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2738          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2739 <        if (fFirst) {
2740 <            f.complete(v1);
2386 <            g.completeExceptionally(ex);
2387 <        } else {
2388 <            g.completeExceptionally(ex);
2389 <            f.complete(v1);
2390 <        }
2739 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2740 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2741          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2742          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2743  
# Line 2396 | Line 2746 | public class CompletableFutureTest exten
2746              assertEquals(null, h0.join());
2747              rs[0].assertInvoked();
2748          } catch (CompletionException ok) {
2749 <            checkCompletedWithWrappedCFException(h0, ex);
2749 >            checkCompletedWithWrappedException(h0, ex);
2750              rs[0].assertNotInvoked();
2751          }
2752          try {
2753              assertEquals(null, h1.join());
2754              rs[1].assertInvoked();
2755          } catch (CompletionException ok) {
2756 <            checkCompletedWithWrappedCFException(h1, ex);
2756 >            checkCompletedWithWrappedException(h1, ex);
2757              rs[1].assertNotInvoked();
2758          }
2759          try {
2760              assertEquals(null, h2.join());
2761              rs[2].assertInvoked();
2762          } catch (CompletionException ok) {
2763 <            checkCompletedWithWrappedCFException(h2, ex);
2763 >            checkCompletedWithWrappedException(h2, ex);
2764              rs[2].assertNotInvoked();
2765          }
2766          try {
2767              assertEquals(null, h3.join());
2768              rs[3].assertInvoked();
2769          } catch (CompletionException ok) {
2770 <            checkCompletedWithWrappedCFException(h3, ex);
2770 >            checkCompletedWithWrappedException(h3, ex);
2771              rs[3].assertNotInvoked();
2772          }
2773  
2774          checkCompletedNormally(f, v1);
2775 <        checkCompletedWithWrappedCFException(g, ex);
2775 >        checkCompletedExceptionally(g, ex);
2776      }}
2777  
2778      /**
# Line 2452 | Line 2802 | public class CompletableFutureTest exten
2802          checkCompletedWithWrappedCancellationException(h2);
2803          checkCompletedWithWrappedCancellationException(h3);
2804  
2805 <        g.complete(v1);
2805 >        assertTrue(g.complete(v1));
2806  
2807          // unspecified behavior - both source completions available
2808          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2496 | Line 2846 | public class CompletableFutureTest exten
2846  
2847          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2848          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2849 <        f.complete(v1);
2849 >        assertTrue(f.complete(v1));
2850          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2851          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2852          checkCompletedWithWrappedCFException(h0);
# Line 2504 | Line 2854 | public class CompletableFutureTest exten
2854          checkCompletedWithWrappedCFException(h2);
2855          checkCompletedWithWrappedCFException(h3);
2856          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2857 <        g.complete(v2);
2857 >        assertTrue(g.complete(v2));
2858          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2859          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2860          checkCompletedWithWrappedCFException(h4);
# Line 2525 | Line 2875 | public class CompletableFutureTest exten
2875      {
2876          final CompletableFuture<Integer> f = new CompletableFuture<>();
2877          final CompletableFutureInc r = new CompletableFutureInc(m);
2878 <        if (!createIncomplete) f.complete(v1);
2878 >        if (!createIncomplete) assertTrue(f.complete(v1));
2879          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2880 <        if (createIncomplete) f.complete(v1);
2880 >        if (createIncomplete) assertTrue(f.complete(v1));
2881  
2882          checkCompletedNormally(g, inc(v1));
2883          checkCompletedNormally(f, v1);
# Line 2549 | Line 2899 | public class CompletableFutureTest exten
2899          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2900          if (createIncomplete) f.completeExceptionally(ex);
2901  
2902 <        checkCompletedWithWrappedCFException(g, ex);
2903 <        checkCompletedWithWrappedCFException(f, ex);
2902 >        checkCompletedWithWrappedException(g, ex);
2903 >        checkCompletedExceptionally(f, ex);
2904          r.assertNotInvoked();
2905      }}
2906  
# Line 2565 | Line 2915 | public class CompletableFutureTest exten
2915          final CompletableFuture<Integer> f = new CompletableFuture<>();
2916          final FailingCompletableFutureFunction r
2917              = new FailingCompletableFutureFunction(m);
2918 <        if (!createIncomplete) f.complete(v1);
2918 >        if (!createIncomplete) assertTrue(f.complete(v1));
2919          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2920 <        if (createIncomplete) f.complete(v1);
2920 >        if (createIncomplete) assertTrue(f.complete(v1));
2921  
2922          checkCompletedWithWrappedCFException(g);
2923          checkCompletedNormally(f, v1);
# Line 2610 | Line 2960 | public class CompletableFutureTest exten
2960       * when all components complete normally
2961       */
2962      public void testAllOf_normal() throws Exception {
2963 <        for (int k = 1; k < 20; ++k) {
2963 >        for (int k = 1; k < 10; k++) {
2964              CompletableFuture<Integer>[] fs
2965                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2966 <            for (int i = 0; i < k; ++i)
2966 >            for (int i = 0; i < k; i++)
2967                  fs[i] = new CompletableFuture<>();
2968              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2969 <            for (int i = 0; i < k; ++i) {
2969 >            for (int i = 0; i < k; i++) {
2970                  checkIncomplete(f);
2971                  checkIncomplete(CompletableFuture.allOf(fs));
2972                  fs[i].complete(one);
# Line 2627 | Line 2977 | public class CompletableFutureTest exten
2977      }
2978  
2979      public void testAllOf_backwards() throws Exception {
2980 <        for (int k = 1; k < 20; ++k) {
2980 >        for (int k = 1; k < 10; k++) {
2981              CompletableFuture<Integer>[] fs
2982                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2983 <            for (int i = 0; i < k; ++i)
2983 >            for (int i = 0; i < k; i++)
2984                  fs[i] = new CompletableFuture<>();
2985              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2986              for (int i = k - 1; i >= 0; i--) {
# Line 2643 | Line 2993 | public class CompletableFutureTest exten
2993          }
2994      }
2995  
2996 +    public void testAllOf_exceptional() throws Exception {
2997 +        for (int k = 1; k < 10; k++) {
2998 +            CompletableFuture<Integer>[] fs
2999 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3000 +            CFException ex = new CFException();
3001 +            for (int i = 0; i < k; i++)
3002 +                fs[i] = new CompletableFuture<>();
3003 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3004 +            for (int i = 0; i < k; i++) {
3005 +                checkIncomplete(f);
3006 +                checkIncomplete(CompletableFuture.allOf(fs));
3007 +                if (i != k/2) {
3008 +                    fs[i].complete(i);
3009 +                    checkCompletedNormally(fs[i], i);
3010 +                } else {
3011 +                    fs[i].completeExceptionally(ex);
3012 +                    checkCompletedExceptionally(fs[i], ex);
3013 +                }
3014 +            }
3015 +            checkCompletedWithWrappedException(f, ex);
3016 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3017 +        }
3018 +    }
3019 +
3020      /**
3021       * anyOf(no component futures) returns an incomplete future
3022       */
3023      public void testAnyOf_empty() throws Exception {
3024 +        for (Integer v1 : new Integer[] { 1, null })
3025 +    {
3026          CompletableFuture<Object> f = CompletableFuture.anyOf();
3027          checkIncomplete(f);
3028 <    }
3028 >
3029 >        f.complete(v1);
3030 >        checkCompletedNormally(f, v1);
3031 >    }}
3032  
3033      /**
3034       * anyOf returns a future completed normally with a value when
3035       * a component future does
3036       */
3037      public void testAnyOf_normal() throws Exception {
3038 <        for (int k = 0; k < 10; ++k) {
3038 >        for (int k = 0; k < 10; k++) {
3039              CompletableFuture[] fs = new CompletableFuture[k];
3040 <            for (int i = 0; i < k; ++i)
3040 >            for (int i = 0; i < k; i++)
3041                  fs[i] = new CompletableFuture<>();
3042              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3043              checkIncomplete(f);
3044 <            for (int i = 0; i < k; ++i) {
3045 <                fs[i].complete(one);
3046 <                checkCompletedNormally(f, one);
3047 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3044 >            for (int i = 0; i < k; i++) {
3045 >                fs[i].complete(i);
3046 >                checkCompletedNormally(f, 0);
3047 >                int x = (int) CompletableFuture.anyOf(fs).join();
3048 >                assertTrue(0 <= x && x <= i);
3049 >            }
3050 >        }
3051 >    }
3052 >    public void testAnyOf_normal_backwards() throws Exception {
3053 >        for (int k = 0; k < 10; k++) {
3054 >            CompletableFuture[] fs = new CompletableFuture[k];
3055 >            for (int i = 0; i < k; i++)
3056 >                fs[i] = new CompletableFuture<>();
3057 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3058 >            checkIncomplete(f);
3059 >            for (int i = k - 1; i >= 0; i--) {
3060 >                fs[i].complete(i);
3061 >                checkCompletedNormally(f, k - 1);
3062 >                int x = (int) CompletableFuture.anyOf(fs).join();
3063 >                assertTrue(i <= x && x <= k - 1);
3064              }
3065          }
3066      }
# Line 2674 | Line 3069 | public class CompletableFutureTest exten
3069       * anyOf result completes exceptionally when any component does.
3070       */
3071      public void testAnyOf_exceptional() throws Exception {
3072 <        for (int k = 0; k < 10; ++k) {
3072 >        for (int k = 0; k < 10; k++) {
3073              CompletableFuture[] fs = new CompletableFuture[k];
3074 <            for (int i = 0; i < k; ++i)
3074 >            CFException[] exs = new CFException[k];
3075 >            for (int i = 0; i < k; i++) {
3076                  fs[i] = new CompletableFuture<>();
3077 +                exs[i] = new CFException();
3078 +            }
3079 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3080 +            checkIncomplete(f);
3081 +            for (int i = 0; i < k; i++) {
3082 +                fs[i].completeExceptionally(exs[i]);
3083 +                checkCompletedWithWrappedException(f, exs[0]);
3084 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3085 +            }
3086 +        }
3087 +    }
3088 +
3089 +    public void testAnyOf_exceptional_backwards() throws Exception {
3090 +        for (int k = 0; k < 10; k++) {
3091 +            CompletableFuture[] fs = new CompletableFuture[k];
3092 +            CFException[] exs = new CFException[k];
3093 +            for (int i = 0; i < k; i++) {
3094 +                fs[i] = new CompletableFuture<>();
3095 +                exs[i] = new CFException();
3096 +            }
3097              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3098              checkIncomplete(f);
3099 <            for (int i = 0; i < k; ++i) {
3100 <                fs[i].completeExceptionally(new CFException());
3101 <                checkCompletedWithWrappedCFException(f);
3099 >            for (int i = k - 1; i >= 0; i--) {
3100 >                fs[i].completeExceptionally(exs[i]);
3101 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3102                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3103              }
3104          }
# Line 2806 | Line 3222 | public class CompletableFutureTest exten
3222          assertSame(f, f.toCompletableFuture());
3223      }
3224  
3225 <    /**
2810 <     * whenComplete action executes on normal completion, propagating
2811 <     * source result.
2812 <     */
2813 <    public void testWhenComplete_normalCompletion1() {
2814 <        for (ExecutionMode m : ExecutionMode.values())
2815 <        for (boolean createIncomplete : new boolean[] { true, false })
2816 <        for (Integer v1 : new Integer[] { 1, null })
2817 <    {
2818 <        final AtomicInteger a = new AtomicInteger(0);
2819 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2820 <        if (!createIncomplete) f.complete(v1);
2821 <        final CompletableFuture<Integer> g = m.whenComplete
2822 <            (f,
2823 <             (Integer x, Throwable t) -> {
2824 <                threadAssertSame(x, v1);
2825 <                threadAssertNull(t);
2826 <                a.getAndIncrement();
2827 <            });
2828 <        if (createIncomplete) f.complete(v1);
3225 >    //--- tests of implementation details; not part of official tck ---
3226  
3227 <        checkCompletedNormally(g, v1);
3228 <        checkCompletedNormally(f, v1);
3229 <        assertEquals(1, a.get());
3230 <    }}
3227 >    Object resultOf(CompletableFuture<?> f) {
3228 >        try {
3229 >            java.lang.reflect.Field resultField
3230 >                = CompletableFuture.class.getDeclaredField("result");
3231 >            resultField.setAccessible(true);
3232 >            return resultField.get(f);
3233 >        } catch (Throwable t) { throw new AssertionError(t); }
3234 >    }
3235  
3236 <    /**
3237 <     * whenComplete action executes on exceptional completion, propagating
2837 <     * source result.
2838 <     */
2839 <    public void testWhenComplete_exceptionalCompletion() {
3236 >    public void testExceptionPropagationReusesResultObject() {
3237 >        if (!testImplementationDetails) return;
3238          for (ExecutionMode m : ExecutionMode.values())
2841        for (boolean createIncomplete : new boolean[] { true, false })
2842        for (Integer v1 : new Integer[] { 1, null })
3239      {
2844        final AtomicInteger a = new AtomicInteger(0);
3240          final CFException ex = new CFException();
3241 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3242 <        if (!createIncomplete) f.completeExceptionally(ex);
2848 <        final CompletableFuture<Integer> g = m.whenComplete
2849 <            (f,
2850 <             (Integer x, Throwable t) -> {
2851 <                threadAssertNull(x);
2852 <                threadAssertSame(t, ex);
2853 <                a.getAndIncrement();
2854 <            });
2855 <        if (createIncomplete) f.completeExceptionally(ex);
2856 <        checkCompletedWithWrappedCFException(f, ex);
2857 <        checkCompletedWithWrappedCFException(g, ex);
2858 <        assertEquals(1, a.get());
2859 <    }}
3241 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3242 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3243  
3244 <    /**
3245 <     * whenComplete action executes on cancelled source, propagating
2863 <     * CancellationException.
2864 <     */
2865 <    public void testWhenComplete_sourceCancelled() {
2866 <        for (ExecutionMode m : ExecutionMode.values())
2867 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2868 <        for (boolean createIncomplete : new boolean[] { true, false })
2869 <    {
2870 <        final AtomicInteger a = new AtomicInteger(0);
2871 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2872 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2873 <        final CompletableFuture<Integer> g = m.whenComplete
2874 <            (f,
2875 <             (Integer x, Throwable t) -> {
2876 <                threadAssertNull(x);
2877 <                threadAssertTrue(t instanceof CancellationException);
2878 <                a.getAndIncrement();
2879 <            });
2880 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3244 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3245 >            = new ArrayList<>();
3246  
3247 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3248 <        checkCompletedWithWrappedCancellationException(g);
3249 <        checkCancelled(f);
2885 <        assertEquals(1, a.get());
2886 <    }}
3247 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3248 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3249 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3250  
3251 <    /**
3252 <     * If a whenComplete action throws an exception when triggered by
3253 <     * a normal completion, it completes exceptionally
2891 <     */
2892 <    public void testWhenComplete_actionFailed() {
2893 <        for (boolean createIncomplete : new boolean[] { true, false })
2894 <        for (ExecutionMode m : ExecutionMode.values())
2895 <        for (Integer v1 : new Integer[] { 1, null })
2896 <    {
2897 <        final AtomicInteger a = new AtomicInteger(0);
2898 <        final CFException ex = new CFException();
2899 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2900 <        if (!createIncomplete) f.complete(v1);
2901 <        final CompletableFuture<Integer> g = m.whenComplete
2902 <            (f,
2903 <             (Integer x, Throwable t) -> {
2904 <                threadAssertSame(x, v1);
2905 <                threadAssertNull(t);
2906 <                a.getAndIncrement();
2907 <                throw ex;
2908 <            });
2909 <        if (createIncomplete) f.complete(v1);
2910 <        checkCompletedNormally(f, v1);
2911 <        checkCompletedWithWrappedCFException(g, ex);
2912 <        assertEquals(1, a.get());
2913 <    }}
3251 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3252 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3253 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3254  
3255 <    /**
3256 <     * If a whenComplete action throws an exception when triggered by
3257 <     * a source completion that also throws an exception, the source
2918 <     * exception takes precedence.
2919 <     */
2920 <    public void testWhenComplete_actionFailedSourceFailed() {
2921 <        for (boolean createIncomplete : new boolean[] { true, false })
2922 <        for (ExecutionMode m : ExecutionMode.values())
2923 <        for (Integer v1 : new Integer[] { 1, null })
2924 <    {
2925 <        final AtomicInteger a = new AtomicInteger(0);
2926 <        final CFException ex1 = new CFException();
2927 <        final CFException ex2 = new CFException();
2928 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3255 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3256 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3257 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3258  
3259 <        if (!createIncomplete) f.completeExceptionally(ex1);
2931 <        final CompletableFuture<Integer> g = m.whenComplete
2932 <            (f,
2933 <             (Integer x, Throwable t) -> {
2934 <                threadAssertSame(t, ex1);
2935 <                threadAssertNull(x);
2936 <                a.getAndIncrement();
2937 <                throw ex2;
2938 <            });
2939 <        if (createIncomplete) f.completeExceptionally(ex1);
3259 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3260  
3261 <        checkCompletedWithWrappedCFException(f, ex1);
3262 <        checkCompletedWithWrappedCFException(g, ex1);
3263 <        assertEquals(1, a.get());
3261 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3262 >
3263 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3264 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3265 >
3266 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3267 >                 fun : funs) {
3268 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3269 >            f.completeExceptionally(ex);
3270 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3271 >            checkCompletedWithWrappedException(src, ex);
3272 >            CompletableFuture<?> dep = fun.apply(src);
3273 >            checkCompletedWithWrappedException(dep, ex);
3274 >            assertSame(resultOf(src), resultOf(dep));
3275 >        }
3276 >
3277 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3278 >                 fun : funs) {
3279 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3280 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3281 >            CompletableFuture<?> dep = fun.apply(src);
3282 >            f.completeExceptionally(ex);
3283 >            checkCompletedWithWrappedException(src, ex);
3284 >            checkCompletedWithWrappedException(dep, ex);
3285 >            assertSame(resultOf(src), resultOf(dep));
3286 >        }
3287 >
3288 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3289 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3290 >                 fun : funs) {
3291 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3292 >            f.cancel(mayInterruptIfRunning);
3293 >            checkCancelled(f);
3294 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3295 >            checkCompletedWithWrappedCancellationException(src);
3296 >            CompletableFuture<?> dep = fun.apply(src);
3297 >            checkCompletedWithWrappedCancellationException(dep);
3298 >            assertSame(resultOf(src), resultOf(dep));
3299 >        }
3300 >
3301 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3302 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3303 >                 fun : funs) {
3304 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3305 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3306 >            CompletableFuture<?> dep = fun.apply(src);
3307 >            f.cancel(mayInterruptIfRunning);
3308 >            checkCancelled(f);
3309 >            checkCompletedWithWrappedCancellationException(src);
3310 >            checkCompletedWithWrappedCancellationException(dep);
3311 >            assertSame(resultOf(src), resultOf(dep));
3312 >        }
3313      }}
3314  
3315   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines