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.76 by jsr166, Sat Jun 7 21:45:13 2014 UTC vs.
Revision 1.100 by jsr166, Thu Jan 15 18:34:19 2015 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 >
11 > import java.util.ArrayList;
12 > import java.util.List;
13 > import java.util.Objects;
14   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
15   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
16   import java.util.concurrent.CompletableFuture;
17   import java.util.concurrent.CompletionException;
18   import java.util.concurrent.CompletionStage;
19 + import java.util.concurrent.ExecutionException;
20 + import java.util.concurrent.Executor;
21   import java.util.concurrent.ForkJoinPool;
22   import java.util.concurrent.ForkJoinTask;
23   import java.util.concurrent.TimeoutException;
24   import java.util.concurrent.atomic.AtomicInteger;
24 import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 import static java.util.concurrent.TimeUnit.SECONDS;
26 import java.util.*;
27 import java.util.function.Supplier;
28 import java.util.function.Consumer;
25   import java.util.function.BiConsumer;
30 import java.util.function.Function;
26   import java.util.function.BiFunction;
27 + import java.util.function.Consumer;
28 + import java.util.function.Function;
29 + import java.util.function.Supplier;
30 +
31 + import junit.framework.Test;
32 + import junit.framework.TestSuite;
33  
34   public class CompletableFutureTest extends JSR166TestCase {
35  
# Line 57 | Line 58 | public class CompletableFutureTest exten
58      }
59  
60      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
61 <        try {
62 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
61 >        checkTimedGet(f, value);
62 >
63          try {
64              assertEquals(value, f.join());
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 76 | Line 76 | public class CompletableFutureTest exten
76      }
77  
78      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
79 +        long startTime = System.nanoTime();
80 +        long timeoutMillis = LONG_DELAY_MS;
81          try {
82 <            f.get(LONG_DELAY_MS, MILLISECONDS);
82 >            f.get(timeoutMillis, MILLISECONDS);
83              shouldThrow();
84          } catch (ExecutionException success) {
85              assertTrue(success.getCause() instanceof CFException);
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
88 +
89          try {
90              f.join();
91              shouldThrow();
# Line 107 | Line 111 | public class CompletableFutureTest exten
111  
112      <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
113                                                        Throwable ex) {
114 +        long startTime = System.nanoTime();
115 +        long timeoutMillis = LONG_DELAY_MS;
116          try {
117 <            f.get(LONG_DELAY_MS, MILLISECONDS);
117 >            f.get(timeoutMillis, MILLISECONDS);
118              shouldThrow();
119          } catch (ExecutionException success) {
120              assertSame(ex, success.getCause());
121          } catch (Throwable fail) { threadUnexpectedException(fail); }
122 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
123 +
124          try {
125              f.join();
126              shouldThrow();
# Line 158 | Line 166 | public class CompletableFutureTest exten
166      }
167  
168      void checkCancelled(CompletableFuture<?> f) {
169 +        long startTime = System.nanoTime();
170 +        long timeoutMillis = LONG_DELAY_MS;
171          try {
172 <            f.get(LONG_DELAY_MS, MILLISECONDS);
172 >            f.get(timeoutMillis, MILLISECONDS);
173              shouldThrow();
174          } catch (CancellationException success) {
175          } catch (Throwable fail) { threadUnexpectedException(fail); }
176 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
177 +
178          try {
179              f.join();
180              shouldThrow();
# Line 183 | Line 195 | public class CompletableFutureTest exten
195      }
196  
197      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
198 +        long startTime = System.nanoTime();
199 +        long timeoutMillis = LONG_DELAY_MS;
200          try {
201 <            f.get(LONG_DELAY_MS, MILLISECONDS);
201 >            f.get(timeoutMillis, MILLISECONDS);
202              shouldThrow();
203          } catch (ExecutionException success) {
204              assertTrue(success.getCause() instanceof CancellationException);
205          } catch (Throwable fail) { threadUnexpectedException(fail); }
206 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
207 +
208          try {
209              f.join();
210              shouldThrow();
# Line 227 | Line 243 | public class CompletableFutureTest exten
243       * isCancelled, join, get, and getNow
244       */
245      public void testComplete() {
246 +        for (Integer v1 : new Integer[] { 1, null })
247 +    {
248          CompletableFuture<Integer> f = new CompletableFuture<>();
249          checkIncomplete(f);
250 <        f.complete(one);
251 <        checkCompletedNormally(f, one);
252 <    }
250 >        assertTrue(f.complete(v1));
251 >        assertFalse(f.complete(v1));
252 >        checkCompletedNormally(f, v1);
253 >    }}
254  
255      /**
256       * completeExceptionally completes exceptionally, as indicated by
# Line 250 | Line 269 | public class CompletableFutureTest exten
269       * methods isDone, isCancelled, join, get, and getNow
270       */
271      public void testCancel() {
272 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
273 +    {
274          CompletableFuture<Integer> f = new CompletableFuture<>();
275          checkIncomplete(f);
276          assertTrue(f.cancel(true));
277 +        assertTrue(f.cancel(true));
278          checkCancelled(f);
279 <    }
279 >    }}
280  
281      /**
282       * obtrudeValue forces completion with given value
# Line 262 | Line 284 | public class CompletableFutureTest exten
284      public void testObtrudeValue() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286          checkIncomplete(f);
287 <        f.complete(one);
287 >        assertTrue(f.complete(one));
288          checkCompletedNormally(f, one);
289          f.obtrudeValue(three);
290          checkCompletedNormally(f, three);
# Line 289 | Line 311 | public class CompletableFutureTest exten
311          CompletableFuture<Integer> f;
312  
313          f = new CompletableFuture<>();
314 <        f.complete(v1);
314 >        assertTrue(f.complete(v1));
315          for (int i = 0; i < 2; i++) {
316              f.obtrudeException(ex = new CFException());
317              checkCompletedExceptionally(f, ex);
# Line 309 | Line 331 | public class CompletableFutureTest exten
331          checkCompletedExceptionally(f, ex);
332          f.completeExceptionally(new CFException());
333          checkCompletedExceptionally(f, ex);
334 <        f.complete(v1);
334 >        assertFalse(f.complete(v1));
335          checkCompletedExceptionally(f, ex);
336      }}
337  
# Line 318 | Line 340 | public class CompletableFutureTest exten
340       */
341      public void testGetNumberOfDependents() {
342          for (ExecutionMode m : ExecutionMode.values())
343 +        for (Integer v1 : new Integer[] { 1, null })
344      {
345          CompletableFuture<Integer> f = new CompletableFuture<>();
346          assertEquals(0, f.getNumberOfDependents());
# Line 327 | Line 350 | public class CompletableFutureTest exten
350          final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
351          assertEquals(2, f.getNumberOfDependents());
352          assertEquals(0, h.getNumberOfDependents());
353 <        f.complete(1);
353 >        assertTrue(f.complete(v1));
354          checkCompletedNormally(g, null);
355          checkCompletedNormally(h, null);
356          assertEquals(0, f.getNumberOfDependents());
# Line 344 | Line 367 | public class CompletableFutureTest exten
367          f = new CompletableFuture<String>();
368          assertTrue(f.toString().contains("[Not completed]"));
369  
370 <        f.complete("foo");
370 >        assertTrue(f.complete("foo"));
371          assertTrue(f.toString().contains("[Completed normally]"));
372  
373          f = new CompletableFuture<String>();
374 <        f.completeExceptionally(new IndexOutOfBoundsException());
352 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
353 <
354 <        f = new CompletableFuture<String>();
355 <        f.cancel(true);
374 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
375          assertTrue(f.toString().contains("[Completed exceptionally]"));
376  
377 <        f = new CompletableFuture<String>();
378 <        f.cancel(false);
379 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
377 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
378 >            f = new CompletableFuture<String>();
379 >            assertTrue(f.cancel(mayInterruptIfRunning));
380 >            assertTrue(f.toString().contains("[Completed exceptionally]"));
381 >        }
382      }
383  
384      /**
# Line 525 | Line 546 | public class CompletableFutureTest exten
546          }
547      }
548  
528
549      class CompletableFutureInc extends CheckedIntegerAction
550          implements Function<Integer, CompletableFuture<Integer>>
551      {
# Line 534 | Line 554 | public class CompletableFutureTest exten
554              invoked();
555              value = x;
556              CompletableFuture<Integer> f = new CompletableFuture<>();
557 <            f.complete(inc(x));
557 >            assertTrue(f.complete(inc(x)));
558              return f;
559          }
560      }
# Line 564 | Line 584 | public class CompletableFutureTest exten
584          }
585      }
586  
587 +    static final boolean defaultExecutorIsCommonPool
588 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
589 +
590      /**
591       * Permits the testing of parallel code for the 3 different
592       * execution modes without copy/pasting all the test methods.
593       */
594      enum ExecutionMode {
595 <        DEFAULT {
595 >        SYNC {
596              public void checkExecutionMode() {
597                  assertFalse(ThreadExecutor.startedCurrentThread());
598                  assertNull(ForkJoinTask.getPool());
# Line 645 | Line 668 | public class CompletableFutureTest exten
668  
669          ASYNC {
670              public void checkExecutionMode() {
671 <                assertSame(ForkJoinPool.commonPool(),
672 <                           ForkJoinTask.getPool());
671 >                assertEquals(defaultExecutorIsCommonPool,
672 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
673              }
674              public CompletableFuture<Void> runAsync(Runnable a) {
675                  return CompletableFuture.runAsync(a);
# Line 842 | Line 865 | public class CompletableFutureTest exten
865      {
866          final AtomicInteger a = new AtomicInteger(0);
867          final CompletableFuture<Integer> f = new CompletableFuture<>();
868 <        if (!createIncomplete) f.complete(v1);
868 >        if (!createIncomplete) assertTrue(f.complete(v1));
869          final CompletableFuture<Integer> g = f.exceptionally
870              ((Throwable t) -> {
871                  // Should not be called
872                  a.getAndIncrement();
873                  throw new AssertionError();
874              });
875 <        if (createIncomplete) f.complete(v1);
875 >        if (createIncomplete) assertTrue(f.complete(v1));
876  
877          checkCompletedNormally(g, v1);
878          checkCompletedNormally(f, v1);
# Line 870 | Line 893 | public class CompletableFutureTest exten
893          if (!createIncomplete) f.completeExceptionally(ex);
894          final CompletableFuture<Integer> g = f.exceptionally
895              ((Throwable t) -> {
896 <                ExecutionMode.DEFAULT.checkExecutionMode();
896 >                ExecutionMode.SYNC.checkExecutionMode();
897                  threadAssertSame(t, ex);
898                  a.getAndIncrement();
899                  return v1;
# Line 892 | Line 915 | public class CompletableFutureTest exten
915          if (!createIncomplete) f.completeExceptionally(ex1);
916          final CompletableFuture<Integer> g = f.exceptionally
917              ((Throwable t) -> {
918 <                ExecutionMode.DEFAULT.checkExecutionMode();
918 >                ExecutionMode.SYNC.checkExecutionMode();
919                  threadAssertSame(t, ex1);
920                  a.getAndIncrement();
921                  throw ex2;
# Line 914 | Line 937 | public class CompletableFutureTest exten
937      {
938          final AtomicInteger a = new AtomicInteger(0);
939          final CompletableFuture<Integer> f = new CompletableFuture<>();
940 <        if (!createIncomplete) f.complete(v1);
940 >        if (!createIncomplete) assertTrue(f.complete(v1));
941          final CompletableFuture<Integer> g = m.whenComplete
942              (f,
943               (Integer x, Throwable t) -> {
# Line 923 | Line 946 | public class CompletableFutureTest exten
946                  threadAssertNull(t);
947                  a.getAndIncrement();
948              });
949 <        if (createIncomplete) f.complete(v1);
949 >        if (createIncomplete) assertTrue(f.complete(v1));
950  
951          checkCompletedNormally(g, v1);
952          checkCompletedNormally(f, v1);
# Line 997 | Line 1020 | public class CompletableFutureTest exten
1020          final AtomicInteger a = new AtomicInteger(0);
1021          final CFException ex = new CFException();
1022          final CompletableFuture<Integer> f = new CompletableFuture<>();
1023 <        if (!createIncomplete) f.complete(v1);
1023 >        if (!createIncomplete) assertTrue(f.complete(v1));
1024          final CompletableFuture<Integer> g = m.whenComplete
1025              (f,
1026               (Integer x, Throwable t) -> {
# Line 1007 | Line 1030 | public class CompletableFutureTest exten
1030                  a.getAndIncrement();
1031                  throw ex;
1032              });
1033 <        if (createIncomplete) f.complete(v1);
1033 >        if (createIncomplete) assertTrue(f.complete(v1));
1034  
1035          checkCompletedWithWrappedException(g, ex);
1036          checkCompletedNormally(f, v1);
# Line 1057 | Line 1080 | public class CompletableFutureTest exten
1080      {
1081          final CompletableFuture<Integer> f = new CompletableFuture<>();
1082          final AtomicInteger a = new AtomicInteger(0);
1083 <        if (!createIncomplete) f.complete(v1);
1083 >        if (!createIncomplete) assertTrue(f.complete(v1));
1084          final CompletableFuture<Integer> g = m.handle
1085              (f,
1086               (Integer x, Throwable t) -> {
# Line 1067 | Line 1090 | public class CompletableFutureTest exten
1090                  a.getAndIncrement();
1091                  return inc(v1);
1092              });
1093 <        if (createIncomplete) f.complete(v1);
1093 >        if (createIncomplete) assertTrue(f.complete(v1));
1094  
1095          checkCompletedNormally(g, inc(v1));
1096          checkCompletedNormally(f, v1);
# Line 1168 | Line 1191 | public class CompletableFutureTest exten
1191          final CompletableFuture<Integer> f = new CompletableFuture<>();
1192          final AtomicInteger a = new AtomicInteger(0);
1193          final CFException ex = new CFException();
1194 <        if (!createIncomplete) f.complete(v1);
1194 >        if (!createIncomplete) assertTrue(f.complete(v1));
1195          final CompletableFuture<Integer> g = m.handle
1196              (f,
1197               (Integer x, Throwable t) -> {
# Line 1178 | Line 1201 | public class CompletableFutureTest exten
1201                  a.getAndIncrement();
1202                  throw ex;
1203              });
1204 <        if (createIncomplete) f.complete(v1);
1204 >        if (createIncomplete) assertTrue(f.complete(v1));
1205  
1206          checkCompletedWithWrappedException(g, ex);
1207          checkCompletedNormally(f, v1);
# Line 1259 | Line 1282 | public class CompletableFutureTest exten
1282       */
1283      public void testThenRun_normalCompletion() {
1284          for (ExecutionMode m : ExecutionMode.values())
1262        for (boolean createIncomplete : new boolean[] { true, false })
1285          for (Integer v1 : new Integer[] { 1, null })
1286      {
1287          final CompletableFuture<Integer> f = new CompletableFuture<>();
1288 <        final Noop r = new Noop(m);
1289 <        if (!createIncomplete) f.complete(v1);
1268 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1269 <        if (createIncomplete) {
1270 <            checkIncomplete(g);
1271 <            f.complete(v1);
1272 <        }
1288 >        final Noop[] rs = new Noop[6];
1289 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1290  
1291 <        checkCompletedNormally(g, null);
1291 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1292 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1293 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1294 >        checkIncomplete(h0);
1295 >        checkIncomplete(h1);
1296 >        checkIncomplete(h2);
1297 >        assertTrue(f.complete(v1));
1298 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1299 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1300 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1301 >
1302 >        checkCompletedNormally(h0, null);
1303 >        checkCompletedNormally(h1, null);
1304 >        checkCompletedNormally(h2, null);
1305 >        checkCompletedNormally(h3, null);
1306 >        checkCompletedNormally(h4, null);
1307 >        checkCompletedNormally(h5, null);
1308          checkCompletedNormally(f, v1);
1309 <        r.assertInvoked();
1309 >        for (Noop r : rs) r.assertInvoked();
1310      }}
1311  
1312      /**
# Line 1282 | Line 1315 | public class CompletableFutureTest exten
1315       */
1316      public void testThenRun_exceptionalCompletion() {
1317          for (ExecutionMode m : ExecutionMode.values())
1285        for (boolean createIncomplete : new boolean[] { true, false })
1318      {
1319          final CFException ex = new CFException();
1320          final CompletableFuture<Integer> f = new CompletableFuture<>();
1321 <        final Noop r = new Noop(m);
1322 <        if (!createIncomplete) f.completeExceptionally(ex);
1291 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1292 <        if (createIncomplete) {
1293 <            checkIncomplete(g);
1294 <            f.completeExceptionally(ex);
1295 <        }
1321 >        final Noop[] rs = new Noop[6];
1322 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1323  
1324 <        checkCompletedWithWrappedException(g, ex);
1324 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1325 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1326 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1327 >        checkIncomplete(h0);
1328 >        checkIncomplete(h1);
1329 >        checkIncomplete(h2);
1330 >        assertTrue(f.completeExceptionally(ex));
1331 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1332 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1333 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1334 >
1335 >        checkCompletedWithWrappedException(h0, ex);
1336 >        checkCompletedWithWrappedException(h1, ex);
1337 >        checkCompletedWithWrappedException(h2, ex);
1338 >        checkCompletedWithWrappedException(h3, ex);
1339 >        checkCompletedWithWrappedException(h4, ex);
1340 >        checkCompletedWithWrappedException(h5, ex);
1341          checkCompletedExceptionally(f, ex);
1342 <        r.assertNotInvoked();
1342 >        for (Noop r : rs) r.assertNotInvoked();
1343      }}
1344  
1345      /**
# Line 1304 | Line 1347 | public class CompletableFutureTest exten
1347       */
1348      public void testThenRun_sourceCancelled() {
1349          for (ExecutionMode m : ExecutionMode.values())
1307        for (boolean createIncomplete : new boolean[] { true, false })
1350          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1351      {
1352          final CompletableFuture<Integer> f = new CompletableFuture<>();
1353 <        final Noop r = new Noop(m);
1354 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1313 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1314 <        if (createIncomplete) {
1315 <            checkIncomplete(g);
1316 <            assertTrue(f.cancel(mayInterruptIfRunning));
1317 <        }
1353 >        final Noop[] rs = new Noop[6];
1354 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1355  
1356 <        checkCompletedWithWrappedCancellationException(g);
1356 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1357 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1358 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1359 >        checkIncomplete(h0);
1360 >        checkIncomplete(h1);
1361 >        checkIncomplete(h2);
1362 >        assertTrue(f.cancel(mayInterruptIfRunning));
1363 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1364 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1365 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1366 >
1367 >        checkCompletedWithWrappedCancellationException(h0);
1368 >        checkCompletedWithWrappedCancellationException(h1);
1369 >        checkCompletedWithWrappedCancellationException(h2);
1370 >        checkCompletedWithWrappedCancellationException(h3);
1371 >        checkCompletedWithWrappedCancellationException(h4);
1372 >        checkCompletedWithWrappedCancellationException(h5);
1373          checkCancelled(f);
1374 <        r.assertNotInvoked();
1374 >        for (Noop r : rs) r.assertNotInvoked();
1375      }}
1376  
1377      /**
# Line 1326 | Line 1379 | public class CompletableFutureTest exten
1379       */
1380      public void testThenRun_actionFailed() {
1381          for (ExecutionMode m : ExecutionMode.values())
1329        for (boolean createIncomplete : new boolean[] { true, false })
1382          for (Integer v1 : new Integer[] { 1, null })
1383      {
1384          final CompletableFuture<Integer> f = new CompletableFuture<>();
1385 <        final FailingRunnable r = new FailingRunnable(m);
1386 <        if (!createIncomplete) f.complete(v1);
1335 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1336 <        if (createIncomplete) {
1337 <            checkIncomplete(g);
1338 <            f.complete(v1);
1339 <        }
1385 >        final FailingRunnable[] rs = new FailingRunnable[6];
1386 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1387  
1388 <        checkCompletedWithWrappedCFException(g);
1388 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1389 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1390 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1391 >        assertTrue(f.complete(v1));
1392 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1393 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1394 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1395 >
1396 >        checkCompletedWithWrappedCFException(h0);
1397 >        checkCompletedWithWrappedCFException(h1);
1398 >        checkCompletedWithWrappedCFException(h2);
1399 >        checkCompletedWithWrappedCFException(h3);
1400 >        checkCompletedWithWrappedCFException(h4);
1401 >        checkCompletedWithWrappedCFException(h5);
1402          checkCompletedNormally(f, v1);
1403      }}
1404  
# Line 1347 | Line 1407 | public class CompletableFutureTest exten
1407       */
1408      public void testThenApply_normalCompletion() {
1409          for (ExecutionMode m : ExecutionMode.values())
1350        for (boolean createIncomplete : new boolean[] { true, false })
1410          for (Integer v1 : new Integer[] { 1, null })
1411      {
1412          final CompletableFuture<Integer> f = new CompletableFuture<>();
1413 <        final IncFunction r = new IncFunction(m);
1414 <        if (!createIncomplete) f.complete(v1);
1356 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1357 <        if (createIncomplete) {
1358 <            checkIncomplete(g);
1359 <            f.complete(v1);
1360 <        }
1413 >        final IncFunction[] rs = new IncFunction[4];
1414 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1415  
1416 <        checkCompletedNormally(g, inc(v1));
1416 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1417 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1418 >        checkIncomplete(h0);
1419 >        checkIncomplete(h1);
1420 >        assertTrue(f.complete(v1));
1421 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1422 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1423 >
1424 >        checkCompletedNormally(h0, inc(v1));
1425 >        checkCompletedNormally(h1, inc(v1));
1426 >        checkCompletedNormally(h2, inc(v1));
1427 >        checkCompletedNormally(h3, inc(v1));
1428          checkCompletedNormally(f, v1);
1429 <        r.assertValue(inc(v1));
1429 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1430      }}
1431  
1432      /**
# Line 1370 | Line 1435 | public class CompletableFutureTest exten
1435       */
1436      public void testThenApply_exceptionalCompletion() {
1437          for (ExecutionMode m : ExecutionMode.values())
1373        for (boolean createIncomplete : new boolean[] { true, false })
1438      {
1439          final CFException ex = new CFException();
1440          final CompletableFuture<Integer> f = new CompletableFuture<>();
1441 <        final IncFunction r = new IncFunction(m);
1442 <        if (!createIncomplete) f.completeExceptionally(ex);
1379 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1380 <        if (createIncomplete) {
1381 <            checkIncomplete(g);
1382 <            f.completeExceptionally(ex);
1383 <        }
1441 >        final IncFunction[] rs = new IncFunction[4];
1442 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1443  
1444 <        checkCompletedWithWrappedException(g, ex);
1444 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1445 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1446 >        assertTrue(f.completeExceptionally(ex));
1447 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1448 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1449 >
1450 >        checkCompletedWithWrappedException(h0, ex);
1451 >        checkCompletedWithWrappedException(h1, ex);
1452 >        checkCompletedWithWrappedException(h2, ex);
1453 >        checkCompletedWithWrappedException(h3, ex);
1454          checkCompletedExceptionally(f, ex);
1455 <        r.assertNotInvoked();
1455 >        for (IncFunction r : rs) r.assertNotInvoked();
1456      }}
1457  
1458      /**
# Line 1392 | Line 1460 | public class CompletableFutureTest exten
1460       */
1461      public void testThenApply_sourceCancelled() {
1462          for (ExecutionMode m : ExecutionMode.values())
1395        for (boolean createIncomplete : new boolean[] { true, false })
1463          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1464      {
1465          final CompletableFuture<Integer> f = new CompletableFuture<>();
1466 <        final IncFunction r = new IncFunction(m);
1467 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1401 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1402 <        if (createIncomplete) {
1403 <            checkIncomplete(g);
1404 <            assertTrue(f.cancel(mayInterruptIfRunning));
1405 <        }
1466 >        final IncFunction[] rs = new IncFunction[4];
1467 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1468  
1469 <        checkCompletedWithWrappedCancellationException(g);
1469 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1470 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1471 >        assertTrue(f.cancel(mayInterruptIfRunning));
1472 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1473 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1474 >
1475 >        checkCompletedWithWrappedCancellationException(h0);
1476 >        checkCompletedWithWrappedCancellationException(h1);
1477 >        checkCompletedWithWrappedCancellationException(h2);
1478 >        checkCompletedWithWrappedCancellationException(h3);
1479          checkCancelled(f);
1480 <        r.assertNotInvoked();
1480 >        for (IncFunction r : rs) r.assertNotInvoked();
1481      }}
1482  
1483      /**
# Line 1414 | Line 1485 | public class CompletableFutureTest exten
1485       */
1486      public void testThenApply_actionFailed() {
1487          for (ExecutionMode m : ExecutionMode.values())
1417        for (boolean createIncomplete : new boolean[] { true, false })
1488          for (Integer v1 : new Integer[] { 1, null })
1489      {
1490          final CompletableFuture<Integer> f = new CompletableFuture<>();
1491 <        final FailingFunction r = new FailingFunction(m);
1492 <        if (!createIncomplete) f.complete(v1);
1423 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1424 <        if (createIncomplete) {
1425 <            checkIncomplete(g);
1426 <            f.complete(v1);
1427 <        }
1491 >        final FailingFunction[] rs = new FailingFunction[4];
1492 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1493  
1494 <        checkCompletedWithWrappedCFException(g);
1494 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1495 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1496 >        assertTrue(f.complete(v1));
1497 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1498 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1499 >
1500 >        checkCompletedWithWrappedCFException(h0);
1501 >        checkCompletedWithWrappedCFException(h1);
1502 >        checkCompletedWithWrappedCFException(h2);
1503 >        checkCompletedWithWrappedCFException(h3);
1504          checkCompletedNormally(f, v1);
1505      }}
1506  
# Line 1435 | Line 1509 | public class CompletableFutureTest exten
1509       */
1510      public void testThenAccept_normalCompletion() {
1511          for (ExecutionMode m : ExecutionMode.values())
1438        for (boolean createIncomplete : new boolean[] { true, false })
1512          for (Integer v1 : new Integer[] { 1, null })
1513      {
1514          final CompletableFuture<Integer> f = new CompletableFuture<>();
1515 <        final NoopConsumer r = new NoopConsumer(m);
1516 <        if (!createIncomplete) f.complete(v1);
1444 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1445 <        if (createIncomplete) {
1446 <            checkIncomplete(g);
1447 <            f.complete(v1);
1448 <        }
1515 >        final NoopConsumer[] rs = new NoopConsumer[4];
1516 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1517  
1518 <        checkCompletedNormally(g, null);
1519 <        r.assertValue(v1);
1518 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1519 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1520 >        checkIncomplete(h0);
1521 >        checkIncomplete(h1);
1522 >        assertTrue(f.complete(v1));
1523 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1524 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1525 >
1526 >        checkCompletedNormally(h0, null);
1527 >        checkCompletedNormally(h1, null);
1528 >        checkCompletedNormally(h2, null);
1529 >        checkCompletedNormally(h3, null);
1530          checkCompletedNormally(f, v1);
1531 +        for (NoopConsumer r : rs) r.assertValue(v1);
1532      }}
1533  
1534      /**
# Line 1458 | Line 1537 | public class CompletableFutureTest exten
1537       */
1538      public void testThenAccept_exceptionalCompletion() {
1539          for (ExecutionMode m : ExecutionMode.values())
1461        for (boolean createIncomplete : new boolean[] { true, false })
1540      {
1541          final CFException ex = new CFException();
1542          final CompletableFuture<Integer> f = new CompletableFuture<>();
1543 <        final NoopConsumer r = new NoopConsumer(m);
1544 <        if (!createIncomplete) f.completeExceptionally(ex);
1467 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1468 <        if (createIncomplete) {
1469 <            checkIncomplete(g);
1470 <            f.completeExceptionally(ex);
1471 <        }
1543 >        final NoopConsumer[] rs = new NoopConsumer[4];
1544 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1545  
1546 <        checkCompletedWithWrappedException(g, ex);
1546 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1547 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1548 >        assertTrue(f.completeExceptionally(ex));
1549 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1550 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1551 >
1552 >        checkCompletedWithWrappedException(h0, ex);
1553 >        checkCompletedWithWrappedException(h1, ex);
1554 >        checkCompletedWithWrappedException(h2, ex);
1555 >        checkCompletedWithWrappedException(h3, ex);
1556          checkCompletedExceptionally(f, ex);
1557 <        r.assertNotInvoked();
1557 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1558      }}
1559  
1560      /**
# Line 1480 | Line 1562 | public class CompletableFutureTest exten
1562       */
1563      public void testThenAccept_sourceCancelled() {
1564          for (ExecutionMode m : ExecutionMode.values())
1483        for (boolean createIncomplete : new boolean[] { true, false })
1565          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1566      {
1567          final CompletableFuture<Integer> f = new CompletableFuture<>();
1568 <        final NoopConsumer r = new NoopConsumer(m);
1569 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1489 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1490 <        if (createIncomplete) {
1491 <            checkIncomplete(g);
1492 <            assertTrue(f.cancel(mayInterruptIfRunning));
1493 <        }
1568 >        final NoopConsumer[] rs = new NoopConsumer[4];
1569 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1570  
1571 <        checkCompletedWithWrappedCancellationException(g);
1571 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1572 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1573 >        assertTrue(f.cancel(mayInterruptIfRunning));
1574 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1575 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1576 >
1577 >        checkCompletedWithWrappedCancellationException(h0);
1578 >        checkCompletedWithWrappedCancellationException(h1);
1579 >        checkCompletedWithWrappedCancellationException(h2);
1580 >        checkCompletedWithWrappedCancellationException(h3);
1581          checkCancelled(f);
1582 <        r.assertNotInvoked();
1582 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1583      }}
1584  
1585      /**
# Line 1502 | Line 1587 | public class CompletableFutureTest exten
1587       */
1588      public void testThenAccept_actionFailed() {
1589          for (ExecutionMode m : ExecutionMode.values())
1505        for (boolean createIncomplete : new boolean[] { true, false })
1590          for (Integer v1 : new Integer[] { 1, null })
1591      {
1592          final CompletableFuture<Integer> f = new CompletableFuture<>();
1593 <        final FailingConsumer r = new FailingConsumer(m);
1594 <        if (!createIncomplete) f.complete(v1);
1511 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1512 <        if (createIncomplete) {
1513 <            checkIncomplete(g);
1514 <            f.complete(v1);
1515 <        }
1593 >        final FailingConsumer[] rs = new FailingConsumer[4];
1594 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1595  
1596 <        checkCompletedWithWrappedCFException(g);
1596 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1597 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1598 >        assertTrue(f.complete(v1));
1599 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1600 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1601 >
1602 >        checkCompletedWithWrappedCFException(h0);
1603 >        checkCompletedWithWrappedCFException(h1);
1604 >        checkCompletedWithWrappedCFException(h2);
1605 >        checkCompletedWithWrappedCFException(h3);
1606          checkCompletedNormally(f, v1);
1607      }}
1608  
# Line 1524 | Line 1612 | public class CompletableFutureTest exten
1612       */
1613      public void testThenCombine_normalCompletion() {
1614          for (ExecutionMode m : ExecutionMode.values())
1527        for (boolean createIncomplete : new boolean[] { true, false })
1615          for (boolean fFirst : new boolean[] { true, false })
1616          for (Integer v1 : new Integer[] { 1, null })
1617          for (Integer v2 : new Integer[] { 2, null })
1618      {
1619          final CompletableFuture<Integer> f = new CompletableFuture<>();
1620          final CompletableFuture<Integer> g = new CompletableFuture<>();
1621 <        final SubtractFunction r = new SubtractFunction(m);
1621 >        final SubtractFunction[] rs = new SubtractFunction[6];
1622 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1623  
1624 <        if (fFirst) f.complete(v1); else g.complete(v2);
1625 <        if (!createIncomplete)
1626 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1627 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1628 <        if (createIncomplete) {
1629 <            checkIncomplete(h);
1630 <            r.assertNotInvoked();
1631 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1632 <        }
1624 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1625 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1626 >        final Integer w1 =  fFirst ? v1 : v2;
1627 >        final Integer w2 = !fFirst ? v1 : v2;
1628 >
1629 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1630 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1631 >        assertTrue(fst.complete(w1));
1632 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1633 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1634 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1635 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1636 >        checkCompletedNormally(h1, subtract(w1, w1));
1637 >        checkCompletedNormally(h3, subtract(w1, w1));
1638 >        rs[1].assertValue(subtract(w1, w1));
1639 >        rs[3].assertValue(subtract(w1, w1));
1640 >        assertTrue(snd.complete(w2));
1641 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1642 >
1643 >        checkCompletedNormally(h0, subtract(v1, v2));
1644 >        checkCompletedNormally(h2, subtract(v1, v2));
1645 >        checkCompletedNormally(h4, subtract(v1, v2));
1646 >        rs[0].assertValue(subtract(v1, v2));
1647 >        rs[2].assertValue(subtract(v1, v2));
1648 >        rs[4].assertValue(subtract(v1, v2));
1649  
1546        checkCompletedNormally(h, subtract(v1, v2));
1650          checkCompletedNormally(f, v1);
1651          checkCompletedNormally(g, v2);
1549        r.assertValue(subtract(v1, v2));
1652      }}
1653  
1654      /**
1655       * thenCombine result completes exceptionally after exceptional
1656       * completion of either source
1657       */
1658 <    public void testThenCombine_exceptionalCompletion() {
1658 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1659          for (ExecutionMode m : ExecutionMode.values())
1558        for (boolean createIncomplete : new boolean[] { true, false })
1660          for (boolean fFirst : new boolean[] { true, false })
1661 +        for (boolean failFirst : new boolean[] { true, false })
1662          for (Integer v1 : new Integer[] { 1, null })
1663      {
1664          final CompletableFuture<Integer> f = new CompletableFuture<>();
1665          final CompletableFuture<Integer> g = new CompletableFuture<>();
1666          final CFException ex = new CFException();
1667 <        final SubtractFunction r = new SubtractFunction(m);
1668 <
1669 <        (fFirst ? f : g).complete(v1);
1670 <        if (!createIncomplete)
1671 <            (!fFirst ? f : g).completeExceptionally(ex);
1672 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1673 <        if (createIncomplete) {
1674 <            checkIncomplete(h);
1675 <            (!fFirst ? f : g).completeExceptionally(ex);
1676 <        }
1667 >        final SubtractFunction r1 = new SubtractFunction(m);
1668 >        final SubtractFunction r2 = new SubtractFunction(m);
1669 >        final SubtractFunction r3 = new SubtractFunction(m);
1670 >
1671 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1672 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1673 >        final Callable<Boolean> complete1 = failFirst ?
1674 >            () -> fst.completeExceptionally(ex) :
1675 >            () -> fst.complete(v1);
1676 >        final Callable<Boolean> complete2 = failFirst ?
1677 >            () -> snd.complete(v1) :
1678 >            () -> snd.completeExceptionally(ex);
1679 >
1680 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1681 >        assertTrue(complete1.call());
1682 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1683 >        checkIncomplete(h1);
1684 >        checkIncomplete(h2);
1685 >        assertTrue(complete2.call());
1686 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1687  
1688 <        checkCompletedWithWrappedException(h, ex);
1689 <        r.assertNotInvoked();
1690 <        checkCompletedNormally(fFirst ? f : g, v1);
1691 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1688 >        checkCompletedWithWrappedException(h1, ex);
1689 >        checkCompletedWithWrappedException(h2, ex);
1690 >        checkCompletedWithWrappedException(h3, ex);
1691 >        r1.assertNotInvoked();
1692 >        r2.assertNotInvoked();
1693 >        r3.assertNotInvoked();
1694 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1695 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1696      }}
1697  
1698      /**
1699       * thenCombine result completes exceptionally if either source cancelled
1700       */
1701 <    public void testThenCombine_sourceCancelled() {
1701 >    public void testThenCombine_sourceCancelled() throws Throwable {
1702          for (ExecutionMode m : ExecutionMode.values())
1703          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1588        for (boolean createIncomplete : new boolean[] { true, false })
1704          for (boolean fFirst : new boolean[] { true, false })
1705 +        for (boolean failFirst : new boolean[] { true, false })
1706          for (Integer v1 : new Integer[] { 1, null })
1707      {
1708          final CompletableFuture<Integer> f = new CompletableFuture<>();
1709          final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 <        final SubtractFunction r = new SubtractFunction(m);
1710 >        final SubtractFunction r1 = new SubtractFunction(m);
1711 >        final SubtractFunction r2 = new SubtractFunction(m);
1712 >        final SubtractFunction r3 = new SubtractFunction(m);
1713  
1714 <        (fFirst ? f : g).complete(v1);
1715 <        if (!createIncomplete)
1716 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1717 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1718 <        if (createIncomplete) {
1719 <            checkIncomplete(h);
1720 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1721 <        }
1714 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1715 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1716 >        final Callable<Boolean> complete1 = failFirst ?
1717 >            () -> fst.cancel(mayInterruptIfRunning) :
1718 >            () -> fst.complete(v1);
1719 >        final Callable<Boolean> complete2 = failFirst ?
1720 >            () -> snd.complete(v1) :
1721 >            () -> snd.cancel(mayInterruptIfRunning);
1722  
1723 <        checkCompletedWithWrappedCancellationException(h);
1724 <        checkCancelled(!fFirst ? f : g);
1725 <        r.assertNotInvoked();
1726 <        checkCompletedNormally(fFirst ? f : g, v1);
1723 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1724 >        assertTrue(complete1.call());
1725 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1726 >        checkIncomplete(h1);
1727 >        checkIncomplete(h2);
1728 >        assertTrue(complete2.call());
1729 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1730 >
1731 >        checkCompletedWithWrappedCancellationException(h1);
1732 >        checkCompletedWithWrappedCancellationException(h2);
1733 >        checkCompletedWithWrappedCancellationException(h3);
1734 >        r1.assertNotInvoked();
1735 >        r2.assertNotInvoked();
1736 >        r3.assertNotInvoked();
1737 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1738 >        checkCancelled(failFirst ? fst : snd);
1739      }}
1740  
1741      /**
# Line 1619 | Line 1749 | public class CompletableFutureTest exten
1749      {
1750          final CompletableFuture<Integer> f = new CompletableFuture<>();
1751          final CompletableFuture<Integer> g = new CompletableFuture<>();
1752 <        final FailingBiFunction r = new FailingBiFunction(m);
1753 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1752 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1753 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1754 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1755 >
1756 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1757 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1758 >        final Integer w1 =  fFirst ? v1 : v2;
1759 >        final Integer w2 = !fFirst ? v1 : v2;
1760 >
1761 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1762 >        assertTrue(fst.complete(w1));
1763 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1764 >        assertTrue(snd.complete(w2));
1765 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1766  
1767 <        if (fFirst) {
1768 <            f.complete(v1);
1769 <            g.complete(v2);
1770 <        } else {
1771 <            g.complete(v2);
1772 <            f.complete(v1);
1631 <        }
1632 <
1633 <        checkCompletedWithWrappedCFException(h);
1767 >        checkCompletedWithWrappedCFException(h1);
1768 >        checkCompletedWithWrappedCFException(h2);
1769 >        checkCompletedWithWrappedCFException(h3);
1770 >        r1.assertInvoked();
1771 >        r2.assertInvoked();
1772 >        r3.assertInvoked();
1773          checkCompletedNormally(f, v1);
1774          checkCompletedNormally(g, v2);
1775      }}
# Line 1641 | Line 1780 | public class CompletableFutureTest exten
1780       */
1781      public void testThenAcceptBoth_normalCompletion() {
1782          for (ExecutionMode m : ExecutionMode.values())
1644        for (boolean createIncomplete : new boolean[] { true, false })
1783          for (boolean fFirst : new boolean[] { true, false })
1784          for (Integer v1 : new Integer[] { 1, null })
1785          for (Integer v2 : new Integer[] { 2, null })
1786      {
1787          final CompletableFuture<Integer> f = new CompletableFuture<>();
1788          final CompletableFuture<Integer> g = new CompletableFuture<>();
1789 <        final SubtractAction r = new SubtractAction(m);
1790 <
1791 <        if (fFirst) f.complete(v1); else g.complete(v2);
1792 <        if (!createIncomplete)
1793 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1794 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1795 <        if (createIncomplete) {
1796 <            checkIncomplete(h);
1797 <            r.assertNotInvoked();
1798 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1799 <        }
1789 >        final SubtractAction r1 = new SubtractAction(m);
1790 >        final SubtractAction r2 = new SubtractAction(m);
1791 >        final SubtractAction r3 = new SubtractAction(m);
1792 >
1793 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1794 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1795 >        final Integer w1 =  fFirst ? v1 : v2;
1796 >        final Integer w2 = !fFirst ? v1 : v2;
1797 >
1798 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1799 >        assertTrue(fst.complete(w1));
1800 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1801 >        checkIncomplete(h1);
1802 >        checkIncomplete(h2);
1803 >        r1.assertNotInvoked();
1804 >        r2.assertNotInvoked();
1805 >        assertTrue(snd.complete(w2));
1806 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1807  
1808 <        checkCompletedNormally(h, null);
1809 <        r.assertValue(subtract(v1, v2));
1808 >        checkCompletedNormally(h1, null);
1809 >        checkCompletedNormally(h2, null);
1810 >        checkCompletedNormally(h3, null);
1811 >        r1.assertValue(subtract(v1, v2));
1812 >        r2.assertValue(subtract(v1, v2));
1813 >        r3.assertValue(subtract(v1, v2));
1814          checkCompletedNormally(f, v1);
1815          checkCompletedNormally(g, v2);
1816      }}
# Line 1670 | Line 1819 | public class CompletableFutureTest exten
1819       * thenAcceptBoth result completes exceptionally after exceptional
1820       * completion of either source
1821       */
1822 <    public void testThenAcceptBoth_exceptionalCompletion() {
1822 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1823          for (ExecutionMode m : ExecutionMode.values())
1675        for (boolean createIncomplete : new boolean[] { true, false })
1824          for (boolean fFirst : new boolean[] { true, false })
1825 +        for (boolean failFirst : new boolean[] { true, false })
1826          for (Integer v1 : new Integer[] { 1, null })
1827      {
1828          final CompletableFuture<Integer> f = new CompletableFuture<>();
1829          final CompletableFuture<Integer> g = new CompletableFuture<>();
1830          final CFException ex = new CFException();
1831 <        final SubtractAction r = new SubtractAction(m);
1832 <
1833 <        (fFirst ? f : g).complete(v1);
1834 <        if (!createIncomplete)
1835 <            (!fFirst ? f : g).completeExceptionally(ex);
1836 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1837 <        if (createIncomplete) {
1838 <            checkIncomplete(h);
1839 <            (!fFirst ? f : g).completeExceptionally(ex);
1840 <        }
1831 >        final SubtractAction r1 = new SubtractAction(m);
1832 >        final SubtractAction r2 = new SubtractAction(m);
1833 >        final SubtractAction r3 = new SubtractAction(m);
1834 >
1835 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1836 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1837 >        final Callable<Boolean> complete1 = failFirst ?
1838 >            () -> fst.completeExceptionally(ex) :
1839 >            () -> fst.complete(v1);
1840 >        final Callable<Boolean> complete2 = failFirst ?
1841 >            () -> snd.complete(v1) :
1842 >            () -> snd.completeExceptionally(ex);
1843 >
1844 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1845 >        assertTrue(complete1.call());
1846 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1847 >        checkIncomplete(h1);
1848 >        checkIncomplete(h2);
1849 >        assertTrue(complete2.call());
1850 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1851  
1852 <        checkCompletedWithWrappedException(h, ex);
1853 <        r.assertNotInvoked();
1854 <        checkCompletedNormally(fFirst ? f : g, v1);
1855 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1852 >        checkCompletedWithWrappedException(h1, ex);
1853 >        checkCompletedWithWrappedException(h2, ex);
1854 >        checkCompletedWithWrappedException(h3, ex);
1855 >        r1.assertNotInvoked();
1856 >        r2.assertNotInvoked();
1857 >        r3.assertNotInvoked();
1858 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1859 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1860      }}
1861  
1862      /**
1863       * thenAcceptBoth result completes exceptionally if either source cancelled
1864       */
1865 <    public void testThenAcceptBoth_sourceCancelled() {
1865 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1866          for (ExecutionMode m : ExecutionMode.values())
1867          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1705        for (boolean createIncomplete : new boolean[] { true, false })
1868          for (boolean fFirst : new boolean[] { true, false })
1869 +        for (boolean failFirst : new boolean[] { true, false })
1870          for (Integer v1 : new Integer[] { 1, null })
1871      {
1872          final CompletableFuture<Integer> f = new CompletableFuture<>();
1873          final CompletableFuture<Integer> g = new CompletableFuture<>();
1874 <        final SubtractAction r = new SubtractAction(m);
1874 >        final SubtractAction r1 = new SubtractAction(m);
1875 >        final SubtractAction r2 = new SubtractAction(m);
1876 >        final SubtractAction r3 = new SubtractAction(m);
1877  
1878 <        (fFirst ? f : g).complete(v1);
1879 <        if (!createIncomplete)
1880 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1881 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1882 <        if (createIncomplete) {
1883 <            checkIncomplete(h);
1884 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1885 <        }
1878 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1879 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1880 >        final Callable<Boolean> complete1 = failFirst ?
1881 >            () -> fst.cancel(mayInterruptIfRunning) :
1882 >            () -> fst.complete(v1);
1883 >        final Callable<Boolean> complete2 = failFirst ?
1884 >            () -> snd.complete(v1) :
1885 >            () -> snd.cancel(mayInterruptIfRunning);
1886  
1887 <        checkCompletedWithWrappedCancellationException(h);
1888 <        checkCancelled(!fFirst ? f : g);
1889 <        r.assertNotInvoked();
1890 <        checkCompletedNormally(fFirst ? f : g, v1);
1887 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1888 >        assertTrue(complete1.call());
1889 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1890 >        checkIncomplete(h1);
1891 >        checkIncomplete(h2);
1892 >        assertTrue(complete2.call());
1893 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1894 >
1895 >        checkCompletedWithWrappedCancellationException(h1);
1896 >        checkCompletedWithWrappedCancellationException(h2);
1897 >        checkCompletedWithWrappedCancellationException(h3);
1898 >        r1.assertNotInvoked();
1899 >        r2.assertNotInvoked();
1900 >        r3.assertNotInvoked();
1901 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1902 >        checkCancelled(failFirst ? fst : snd);
1903      }}
1904  
1905      /**
# Line 1736 | Line 1913 | public class CompletableFutureTest exten
1913      {
1914          final CompletableFuture<Integer> f = new CompletableFuture<>();
1915          final CompletableFuture<Integer> g = new CompletableFuture<>();
1916 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1917 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1916 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1917 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1918 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1919 >
1920 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1921 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1922 >        final Integer w1 =  fFirst ? v1 : v2;
1923 >        final Integer w2 = !fFirst ? v1 : v2;
1924 >
1925 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1926 >        assertTrue(fst.complete(w1));
1927 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1928 >        assertTrue(snd.complete(w2));
1929 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1930  
1931 <        if (fFirst) {
1932 <            f.complete(v1);
1933 <            g.complete(v2);
1934 <        } else {
1935 <            g.complete(v2);
1936 <            f.complete(v1);
1748 <        }
1749 <
1750 <        checkCompletedWithWrappedCFException(h);
1931 >        checkCompletedWithWrappedCFException(h1);
1932 >        checkCompletedWithWrappedCFException(h2);
1933 >        checkCompletedWithWrappedCFException(h3);
1934 >        r1.assertInvoked();
1935 >        r2.assertInvoked();
1936 >        r3.assertInvoked();
1937          checkCompletedNormally(f, v1);
1938          checkCompletedNormally(g, v2);
1939      }}
# Line 1758 | Line 1944 | public class CompletableFutureTest exten
1944       */
1945      public void testRunAfterBoth_normalCompletion() {
1946          for (ExecutionMode m : ExecutionMode.values())
1761        for (boolean createIncomplete : new boolean[] { true, false })
1947          for (boolean fFirst : new boolean[] { true, false })
1948          for (Integer v1 : new Integer[] { 1, null })
1949          for (Integer v2 : new Integer[] { 2, null })
1950      {
1951          final CompletableFuture<Integer> f = new CompletableFuture<>();
1952          final CompletableFuture<Integer> g = new CompletableFuture<>();
1953 <        final Noop r = new Noop(m);
1954 <
1955 <        if (fFirst) f.complete(v1); else g.complete(v2);
1956 <        if (!createIncomplete)
1957 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1958 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1959 <        if (createIncomplete) {
1960 <            checkIncomplete(h);
1961 <            r.assertNotInvoked();
1962 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1963 <        }
1953 >        final Noop r1 = new Noop(m);
1954 >        final Noop r2 = new Noop(m);
1955 >        final Noop r3 = new Noop(m);
1956 >
1957 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1958 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1959 >        final Integer w1 =  fFirst ? v1 : v2;
1960 >        final Integer w2 = !fFirst ? v1 : v2;
1961 >
1962 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1963 >        assertTrue(fst.complete(w1));
1964 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1965 >        checkIncomplete(h1);
1966 >        checkIncomplete(h2);
1967 >        r1.assertNotInvoked();
1968 >        r2.assertNotInvoked();
1969 >        assertTrue(snd.complete(w2));
1970 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1971  
1972 <        checkCompletedNormally(h, null);
1973 <        r.assertInvoked();
1972 >        checkCompletedNormally(h1, null);
1973 >        checkCompletedNormally(h2, null);
1974 >        checkCompletedNormally(h3, null);
1975 >        r1.assertInvoked();
1976 >        r2.assertInvoked();
1977 >        r3.assertInvoked();
1978          checkCompletedNormally(f, v1);
1979          checkCompletedNormally(g, v2);
1980      }}
# Line 1787 | Line 1983 | public class CompletableFutureTest exten
1983       * runAfterBoth result completes exceptionally after exceptional
1984       * completion of either source
1985       */
1986 <    public void testRunAfterBoth_exceptionalCompletion() {
1986 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1987          for (ExecutionMode m : ExecutionMode.values())
1792        for (boolean createIncomplete : new boolean[] { true, false })
1988          for (boolean fFirst : new boolean[] { true, false })
1989 +        for (boolean failFirst : new boolean[] { true, false })
1990          for (Integer v1 : new Integer[] { 1, null })
1991      {
1992          final CompletableFuture<Integer> f = new CompletableFuture<>();
1993          final CompletableFuture<Integer> g = new CompletableFuture<>();
1994          final CFException ex = new CFException();
1995 <        final Noop r = new Noop(m);
1996 <
1997 <        (fFirst ? f : g).complete(v1);
1998 <        if (!createIncomplete)
1999 <            (!fFirst ? f : g).completeExceptionally(ex);
2000 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2001 <        if (createIncomplete) {
2002 <            checkIncomplete(h);
2003 <            (!fFirst ? f : g).completeExceptionally(ex);
2004 <        }
1995 >        final Noop r1 = new Noop(m);
1996 >        final Noop r2 = new Noop(m);
1997 >        final Noop r3 = new Noop(m);
1998 >
1999 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2000 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2001 >        final Callable<Boolean> complete1 = failFirst ?
2002 >            () -> fst.completeExceptionally(ex) :
2003 >            () -> fst.complete(v1);
2004 >        final Callable<Boolean> complete2 = failFirst ?
2005 >            () -> snd.complete(v1) :
2006 >            () -> snd.completeExceptionally(ex);
2007 >
2008 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2009 >        assertTrue(complete1.call());
2010 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2011 >        checkIncomplete(h1);
2012 >        checkIncomplete(h2);
2013 >        assertTrue(complete2.call());
2014 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2015  
2016 <        checkCompletedWithWrappedException(h, ex);
2017 <        r.assertNotInvoked();
2018 <        checkCompletedNormally(fFirst ? f : g, v1);
2019 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
2016 >        checkCompletedWithWrappedException(h1, ex);
2017 >        checkCompletedWithWrappedException(h2, ex);
2018 >        checkCompletedWithWrappedException(h3, ex);
2019 >        r1.assertNotInvoked();
2020 >        r2.assertNotInvoked();
2021 >        r3.assertNotInvoked();
2022 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2023 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2024      }}
2025  
2026      /**
2027       * runAfterBoth result completes exceptionally if either source cancelled
2028       */
2029 <    public void testRunAfterBoth_sourceCancelled() {
2029 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2030          for (ExecutionMode m : ExecutionMode.values())
2031          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1822        for (boolean createIncomplete : new boolean[] { true, false })
2032          for (boolean fFirst : new boolean[] { true, false })
2033 +        for (boolean failFirst : new boolean[] { true, false })
2034          for (Integer v1 : new Integer[] { 1, null })
2035      {
2036          final CompletableFuture<Integer> f = new CompletableFuture<>();
2037          final CompletableFuture<Integer> g = new CompletableFuture<>();
2038 <        final Noop r = new Noop(m);
2038 >        final Noop r1 = new Noop(m);
2039 >        final Noop r2 = new Noop(m);
2040 >        final Noop r3 = new Noop(m);
2041  
2042 <        (fFirst ? f : g).complete(v1);
2043 <        if (!createIncomplete)
2044 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2045 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2046 <        if (createIncomplete) {
2047 <            checkIncomplete(h);
2048 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2049 <        }
2042 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2043 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2044 >        final Callable<Boolean> complete1 = failFirst ?
2045 >            () -> fst.cancel(mayInterruptIfRunning) :
2046 >            () -> fst.complete(v1);
2047 >        final Callable<Boolean> complete2 = failFirst ?
2048 >            () -> snd.complete(v1) :
2049 >            () -> snd.cancel(mayInterruptIfRunning);
2050  
2051 <        checkCompletedWithWrappedCancellationException(h);
2052 <        checkCancelled(!fFirst ? f : g);
2053 <        r.assertNotInvoked();
2054 <        checkCompletedNormally(fFirst ? f : g, v1);
2051 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2052 >        assertTrue(complete1.call());
2053 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2054 >        checkIncomplete(h1);
2055 >        checkIncomplete(h2);
2056 >        assertTrue(complete2.call());
2057 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2058 >
2059 >        checkCompletedWithWrappedCancellationException(h1);
2060 >        checkCompletedWithWrappedCancellationException(h2);
2061 >        checkCompletedWithWrappedCancellationException(h3);
2062 >        r1.assertNotInvoked();
2063 >        r2.assertNotInvoked();
2064 >        r3.assertNotInvoked();
2065 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2066 >        checkCancelled(failFirst ? fst : snd);
2067      }}
2068  
2069      /**
# Line 1855 | Line 2079 | public class CompletableFutureTest exten
2079          final CompletableFuture<Integer> g = new CompletableFuture<>();
2080          final FailingRunnable r1 = new FailingRunnable(m);
2081          final FailingRunnable r2 = new FailingRunnable(m);
2082 +        final FailingRunnable r3 = new FailingRunnable(m);
2083  
2084 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2085 <        if (fFirst) {
2086 <            f.complete(v1);
2087 <            g.complete(v2);
2088 <        } else {
2089 <            g.complete(v2);
2090 <            f.complete(v1);
2091 <        }
2092 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2084 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2085 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2086 >        final Integer w1 =  fFirst ? v1 : v2;
2087 >        final Integer w2 = !fFirst ? v1 : v2;
2088 >
2089 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2090 >        assertTrue(fst.complete(w1));
2091 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2092 >        assertTrue(snd.complete(w2));
2093 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2094  
2095          checkCompletedWithWrappedCFException(h1);
2096          checkCompletedWithWrappedCFException(h2);
2097 +        checkCompletedWithWrappedCFException(h3);
2098 +        r1.assertInvoked();
2099 +        r2.assertInvoked();
2100 +        r3.assertInvoked();
2101          checkCompletedNormally(f, v1);
2102          checkCompletedNormally(g, v2);
2103      }}
# Line 1990 | Line 2220 | public class CompletableFutureTest exten
2220  
2221          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2222          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2223 <        if (fFirst) {
2224 <            f.complete(v1);
1995 <            g.completeExceptionally(ex);
1996 <        } else {
1997 <            g.completeExceptionally(ex);
1998 <            f.complete(v1);
1999 <        }
2223 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2224 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2225          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2226          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2227  
# Line 2102 | Line 2327 | public class CompletableFutureTest exten
2327  
2328          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2329          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2330 <        if (fFirst) {
2331 <            f.complete(v1);
2107 <            g.cancel(mayInterruptIfRunning);
2108 <        } else {
2109 <            g.cancel(mayInterruptIfRunning);
2110 <            f.complete(v1);
2111 <        }
2330 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2331 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2332          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2333          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2334  
# Line 2310 | Line 2530 | public class CompletableFutureTest exten
2530  
2531          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2532          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2533 <        if (fFirst) {
2534 <            f.complete(v1);
2315 <            g.completeExceptionally(ex);
2316 <        } else {
2317 <            g.completeExceptionally(ex);
2318 <            f.complete(v1);
2319 <        }
2533 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2534 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2535          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2536          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2537  
# Line 2519 | Line 2734 | public class CompletableFutureTest exten
2734          checkIncomplete(h1);
2735          rs[0].assertNotInvoked();
2736          rs[1].assertNotInvoked();
2737 <        f.completeExceptionally(ex);
2737 >        assertTrue(f.completeExceptionally(ex));
2738          checkCompletedWithWrappedException(h0, ex);
2739          checkCompletedWithWrappedException(h1, ex);
2740          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
# Line 2527 | Line 2742 | public class CompletableFutureTest exten
2742          checkCompletedWithWrappedException(h2, ex);
2743          checkCompletedWithWrappedException(h3, ex);
2744  
2745 <        g.complete(v1);
2745 >        assertTrue(g.complete(v1));
2746  
2747          // unspecified behavior - both source completions available
2748          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2570 | Line 2785 | public class CompletableFutureTest exten
2785  
2786          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2787          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2788 <        if (fFirst) {
2789 <            f.complete(v1);
2575 <            g.completeExceptionally(ex);
2576 <        } else {
2577 <            g.completeExceptionally(ex);
2578 <            f.complete(v1);
2579 <        }
2788 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2789 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2790          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2791          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2792  
# Line 2641 | Line 2851 | public class CompletableFutureTest exten
2851          checkCompletedWithWrappedCancellationException(h2);
2852          checkCompletedWithWrappedCancellationException(h3);
2853  
2854 <        g.complete(v1);
2854 >        assertTrue(g.complete(v1));
2855  
2856          // unspecified behavior - both source completions available
2857          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2685 | Line 2895 | public class CompletableFutureTest exten
2895  
2896          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2897          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2898 <        f.complete(v1);
2898 >        assertTrue(f.complete(v1));
2899          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2900          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2901          checkCompletedWithWrappedCFException(h0);
# Line 2693 | Line 2903 | public class CompletableFutureTest exten
2903          checkCompletedWithWrappedCFException(h2);
2904          checkCompletedWithWrappedCFException(h3);
2905          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2906 <        g.complete(v2);
2906 >        assertTrue(g.complete(v2));
2907          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2908          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2909          checkCompletedWithWrappedCFException(h4);
# Line 2714 | Line 2924 | public class CompletableFutureTest exten
2924      {
2925          final CompletableFuture<Integer> f = new CompletableFuture<>();
2926          final CompletableFutureInc r = new CompletableFutureInc(m);
2927 <        if (!createIncomplete) f.complete(v1);
2927 >        if (!createIncomplete) assertTrue(f.complete(v1));
2928          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2929 <        if (createIncomplete) f.complete(v1);
2929 >        if (createIncomplete) assertTrue(f.complete(v1));
2930  
2931          checkCompletedNormally(g, inc(v1));
2932          checkCompletedNormally(f, v1);
# Line 2754 | Line 2964 | public class CompletableFutureTest exten
2964          final CompletableFuture<Integer> f = new CompletableFuture<>();
2965          final FailingCompletableFutureFunction r
2966              = new FailingCompletableFutureFunction(m);
2967 <        if (!createIncomplete) f.complete(v1);
2967 >        if (!createIncomplete) assertTrue(f.complete(v1));
2968          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2969 <        if (createIncomplete) f.complete(v1);
2969 >        if (createIncomplete) assertTrue(f.complete(v1));
2970  
2971          checkCompletedWithWrappedCFException(g);
2972          checkCompletedNormally(f, v1);
# Line 2783 | Line 2993 | public class CompletableFutureTest exten
2993          checkCancelled(f);
2994      }}
2995  
2996 +    /**
2997 +     * thenCompose result completes exceptionally if the result of the action does
2998 +     */
2999 +    public void testThenCompose_actionReturnsFailingFuture() {
3000 +        for (ExecutionMode m : ExecutionMode.values())
3001 +        for (int order = 0; order < 6; order++)
3002 +        for (Integer v1 : new Integer[] { 1, null })
3003 +    {
3004 +        final CFException ex = new CFException();
3005 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3006 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3007 +        final CompletableFuture<Integer> h;
3008 +        // Test all permutations of orders
3009 +        switch (order) {
3010 +        case 0:
3011 +            assertTrue(f.complete(v1));
3012 +            assertTrue(g.completeExceptionally(ex));
3013 +            h = m.thenCompose(f, (x -> g));
3014 +            break;
3015 +        case 1:
3016 +            assertTrue(f.complete(v1));
3017 +            h = m.thenCompose(f, (x -> g));
3018 +            assertTrue(g.completeExceptionally(ex));
3019 +            break;
3020 +        case 2:
3021 +            assertTrue(g.completeExceptionally(ex));
3022 +            assertTrue(f.complete(v1));
3023 +            h = m.thenCompose(f, (x -> g));
3024 +            break;
3025 +        case 3:
3026 +            assertTrue(g.completeExceptionally(ex));
3027 +            h = m.thenCompose(f, (x -> g));
3028 +            assertTrue(f.complete(v1));
3029 +            break;
3030 +        case 4:
3031 +            h = m.thenCompose(f, (x -> g));
3032 +            assertTrue(f.complete(v1));
3033 +            assertTrue(g.completeExceptionally(ex));
3034 +            break;
3035 +        case 5:
3036 +            h = m.thenCompose(f, (x -> g));
3037 +            assertTrue(f.complete(v1));
3038 +            assertTrue(g.completeExceptionally(ex));
3039 +            break;
3040 +        default: throw new AssertionError();
3041 +        }
3042 +
3043 +        checkCompletedExceptionally(g, ex);
3044 +        checkCompletedWithWrappedException(h, ex);
3045 +        checkCompletedNormally(f, v1);
3046 +    }}
3047 +
3048      // other static methods
3049  
3050      /**
# Line 2799 | Line 3061 | public class CompletableFutureTest exten
3061       * when all components complete normally
3062       */
3063      public void testAllOf_normal() throws Exception {
3064 <        for (int k = 1; k < 20; ++k) {
3064 >        for (int k = 1; k < 10; k++) {
3065              CompletableFuture<Integer>[] fs
3066                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3067 <            for (int i = 0; i < k; ++i)
3067 >            for (int i = 0; i < k; i++)
3068                  fs[i] = new CompletableFuture<>();
3069              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3070 <            for (int i = 0; i < k; ++i) {
3070 >            for (int i = 0; i < k; i++) {
3071                  checkIncomplete(f);
3072                  checkIncomplete(CompletableFuture.allOf(fs));
3073                  fs[i].complete(one);
# Line 2816 | Line 3078 | public class CompletableFutureTest exten
3078      }
3079  
3080      public void testAllOf_backwards() throws Exception {
3081 <        for (int k = 1; k < 20; ++k) {
3081 >        for (int k = 1; k < 10; k++) {
3082              CompletableFuture<Integer>[] fs
3083                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3084 <            for (int i = 0; i < k; ++i)
3084 >            for (int i = 0; i < k; i++)
3085                  fs[i] = new CompletableFuture<>();
3086              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3087              for (int i = k - 1; i >= 0; i--) {
# Line 2832 | Line 3094 | public class CompletableFutureTest exten
3094          }
3095      }
3096  
3097 +    public void testAllOf_exceptional() throws Exception {
3098 +        for (int k = 1; k < 10; k++) {
3099 +            CompletableFuture<Integer>[] fs
3100 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3101 +            CFException ex = new CFException();
3102 +            for (int i = 0; i < k; i++)
3103 +                fs[i] = new CompletableFuture<>();
3104 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3105 +            for (int i = 0; i < k; i++) {
3106 +                checkIncomplete(f);
3107 +                checkIncomplete(CompletableFuture.allOf(fs));
3108 +                if (i != k/2) {
3109 +                    fs[i].complete(i);
3110 +                    checkCompletedNormally(fs[i], i);
3111 +                } else {
3112 +                    fs[i].completeExceptionally(ex);
3113 +                    checkCompletedExceptionally(fs[i], ex);
3114 +                }
3115 +            }
3116 +            checkCompletedWithWrappedException(f, ex);
3117 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3118 +        }
3119 +    }
3120 +
3121      /**
3122       * anyOf(no component futures) returns an incomplete future
3123       */
3124      public void testAnyOf_empty() throws Exception {
3125 +        for (Integer v1 : new Integer[] { 1, null })
3126 +    {
3127          CompletableFuture<Object> f = CompletableFuture.anyOf();
3128          checkIncomplete(f);
3129 <    }
3129 >
3130 >        f.complete(v1);
3131 >        checkCompletedNormally(f, v1);
3132 >    }}
3133  
3134      /**
3135       * anyOf returns a future completed normally with a value when
3136       * a component future does
3137       */
3138      public void testAnyOf_normal() throws Exception {
3139 <        for (int k = 0; k < 10; ++k) {
3139 >        for (int k = 0; k < 10; k++) {
3140              CompletableFuture[] fs = new CompletableFuture[k];
3141 <            for (int i = 0; i < k; ++i)
3141 >            for (int i = 0; i < k; i++)
3142                  fs[i] = new CompletableFuture<>();
3143              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3144              checkIncomplete(f);
3145 <            for (int i = 0; i < k; ++i) {
3146 <                fs[i].complete(one);
3147 <                checkCompletedNormally(f, one);
3148 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3145 >            for (int i = 0; i < k; i++) {
3146 >                fs[i].complete(i);
3147 >                checkCompletedNormally(f, 0);
3148 >                int x = (int) CompletableFuture.anyOf(fs).join();
3149 >                assertTrue(0 <= x && x <= i);
3150 >            }
3151 >        }
3152 >    }
3153 >    public void testAnyOf_normal_backwards() throws Exception {
3154 >        for (int k = 0; k < 10; k++) {
3155 >            CompletableFuture[] fs = new CompletableFuture[k];
3156 >            for (int i = 0; i < k; i++)
3157 >                fs[i] = new CompletableFuture<>();
3158 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3159 >            checkIncomplete(f);
3160 >            for (int i = k - 1; i >= 0; i--) {
3161 >                fs[i].complete(i);
3162 >                checkCompletedNormally(f, k - 1);
3163 >                int x = (int) CompletableFuture.anyOf(fs).join();
3164 >                assertTrue(i <= x && x <= k - 1);
3165              }
3166          }
3167      }
# Line 2863 | Line 3170 | public class CompletableFutureTest exten
3170       * anyOf result completes exceptionally when any component does.
3171       */
3172      public void testAnyOf_exceptional() throws Exception {
3173 <        for (int k = 0; k < 10; ++k) {
3173 >        for (int k = 0; k < 10; k++) {
3174 >            CompletableFuture[] fs = new CompletableFuture[k];
3175 >            CFException[] exs = new CFException[k];
3176 >            for (int i = 0; i < k; i++) {
3177 >                fs[i] = new CompletableFuture<>();
3178 >                exs[i] = new CFException();
3179 >            }
3180 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3181 >            checkIncomplete(f);
3182 >            for (int i = 0; i < k; i++) {
3183 >                fs[i].completeExceptionally(exs[i]);
3184 >                checkCompletedWithWrappedException(f, exs[0]);
3185 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3186 >            }
3187 >        }
3188 >    }
3189 >
3190 >    public void testAnyOf_exceptional_backwards() throws Exception {
3191 >        for (int k = 0; k < 10; k++) {
3192              CompletableFuture[] fs = new CompletableFuture[k];
3193 <            for (int i = 0; i < k; ++i)
3193 >            CFException[] exs = new CFException[k];
3194 >            for (int i = 0; i < k; i++) {
3195                  fs[i] = new CompletableFuture<>();
3196 +                exs[i] = new CFException();
3197 +            }
3198              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3199              checkIncomplete(f);
3200 <            for (int i = 0; i < k; ++i) {
3201 <                fs[i].completeExceptionally(new CFException());
3202 <                checkCompletedWithWrappedCFException(f);
3200 >            for (int i = k - 1; i >= 0; i--) {
3201 >                fs[i].completeExceptionally(exs[i]);
3202 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3203                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3204              }
3205          }
# Line 2890 | Line 3218 | public class CompletableFutureTest exten
3218          Runnable[] throwingActions = {
3219              () -> CompletableFuture.supplyAsync(null),
3220              () -> CompletableFuture.supplyAsync(null, exec),
3221 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3221 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3222  
3223              () -> CompletableFuture.runAsync(null),
3224              () -> CompletableFuture.runAsync(null, exec),
# Line 2995 | Line 3323 | public class CompletableFutureTest exten
3323          assertSame(f, f.toCompletableFuture());
3324      }
3325  
3326 +    //--- tests of implementation details; not part of official tck ---
3327 +
3328 +    Object resultOf(CompletableFuture<?> f) {
3329 +        try {
3330 +            java.lang.reflect.Field resultField
3331 +                = CompletableFuture.class.getDeclaredField("result");
3332 +            resultField.setAccessible(true);
3333 +            return resultField.get(f);
3334 +        } catch (Throwable t) { throw new AssertionError(t); }
3335 +    }
3336 +
3337 +    public void testExceptionPropagationReusesResultObject() {
3338 +        if (!testImplementationDetails) return;
3339 +        for (ExecutionMode m : ExecutionMode.values())
3340 +    {
3341 +        final CFException ex = new CFException();
3342 +        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3343 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3344 +
3345 +        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3346 +            = new ArrayList<>();
3347 +
3348 +        funs.add((y) -> m.thenRun(y, new Noop(m)));
3349 +        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3350 +        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3351 +
3352 +        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3353 +        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3354 +        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3355 +
3356 +        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3357 +        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3358 +        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3359 +
3360 +        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3361 +
3362 +        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3363 +
3364 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3365 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3366 +
3367 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3368 +                 fun : funs) {
3369 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3370 +            f.completeExceptionally(ex);
3371 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3372 +            checkCompletedWithWrappedException(src, ex);
3373 +            CompletableFuture<?> dep = fun.apply(src);
3374 +            checkCompletedWithWrappedException(dep, ex);
3375 +            assertSame(resultOf(src), resultOf(dep));
3376 +        }
3377 +
3378 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3379 +                 fun : funs) {
3380 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3381 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3382 +            CompletableFuture<?> dep = fun.apply(src);
3383 +            f.completeExceptionally(ex);
3384 +            checkCompletedWithWrappedException(src, ex);
3385 +            checkCompletedWithWrappedException(dep, ex);
3386 +            assertSame(resultOf(src), resultOf(dep));
3387 +        }
3388 +
3389 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3390 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3391 +                 fun : funs) {
3392 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3393 +            f.cancel(mayInterruptIfRunning);
3394 +            checkCancelled(f);
3395 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3396 +            checkCompletedWithWrappedCancellationException(src);
3397 +            CompletableFuture<?> dep = fun.apply(src);
3398 +            checkCompletedWithWrappedCancellationException(dep);
3399 +            assertSame(resultOf(src), resultOf(dep));
3400 +        }
3401 +
3402 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3403 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3404 +                 fun : funs) {
3405 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3406 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3407 +            CompletableFuture<?> dep = fun.apply(src);
3408 +            f.cancel(mayInterruptIfRunning);
3409 +            checkCancelled(f);
3410 +            checkCompletedWithWrappedCancellationException(src);
3411 +            checkCompletedWithWrappedCancellationException(dep);
3412 +            assertSame(resultOf(src), resultOf(dep));
3413 +        }
3414 +    }}
3415 +
3416   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines