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.75 by jsr166, Sat Jun 7 21:14:42 2014 UTC vs.
Revision 1.99 by jsr166, Wed Jan 7 07:59:20 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 317 | Line 339 | public class CompletableFutureTest exten
339       * getNumberOfDependents returns number of dependent tasks
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());
347 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
347 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
348          assertEquals(1, f.getNumberOfDependents());
349          assertEquals(0, g.getNumberOfDependents());
350 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
350 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
351          assertEquals(2, f.getNumberOfDependents());
352 <        f.complete(1);
352 >        assertEquals(0, h.getNumberOfDependents());
353 >        assertTrue(f.complete(v1));
354          checkCompletedNormally(g, null);
355 +        checkCompletedNormally(h, null);
356          assertEquals(0, f.getNumberOfDependents());
357          assertEquals(0, g.getNumberOfDependents());
358 <    }
358 >        assertEquals(0, h.getNumberOfDependents());
359 >    }}
360  
361      /**
362       * toString indicates current completion state
# Line 339 | 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());
374 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
375          assertTrue(f.toString().contains("[Completed exceptionally]"));
376  
377 <        f = new CompletableFuture<String>();
378 <        f.cancel(true);
379 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
380 <
381 <        f = new CompletableFuture<String>();
354 <        f.cancel(false);
355 <        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 529 | Line 555 | public class CompletableFutureTest exten
555              invoked();
556              value = x;
557              CompletableFuture<Integer> f = new CompletableFuture<>();
558 <            f.complete(inc(x));
558 >            assertTrue(f.complete(inc(x)));
559              return f;
560          }
561      }
# Line 559 | Line 585 | public class CompletableFutureTest exten
585          }
586      }
587  
588 +    static final boolean defaultExecutorIsCommonPool
589 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
590 +
591      /**
592       * Permits the testing of parallel code for the 3 different
593       * execution modes without copy/pasting all the test methods.
594       */
595      enum ExecutionMode {
596 <        DEFAULT {
596 >        SYNC {
597              public void checkExecutionMode() {
598                  assertFalse(ThreadExecutor.startedCurrentThread());
599                  assertNull(ForkJoinTask.getPool());
# Line 640 | Line 669 | public class CompletableFutureTest exten
669  
670          ASYNC {
671              public void checkExecutionMode() {
672 <                assertSame(ForkJoinPool.commonPool(),
673 <                           ForkJoinTask.getPool());
672 >                assertEquals(defaultExecutorIsCommonPool,
673 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
674              }
675              public CompletableFuture<Void> runAsync(Runnable a) {
676                  return CompletableFuture.runAsync(a);
# Line 837 | Line 866 | public class CompletableFutureTest exten
866      {
867          final AtomicInteger a = new AtomicInteger(0);
868          final CompletableFuture<Integer> f = new CompletableFuture<>();
869 <        if (!createIncomplete) f.complete(v1);
869 >        if (!createIncomplete) assertTrue(f.complete(v1));
870          final CompletableFuture<Integer> g = f.exceptionally
871              ((Throwable t) -> {
872                  // Should not be called
873                  a.getAndIncrement();
874                  throw new AssertionError();
875              });
876 <        if (createIncomplete) f.complete(v1);
876 >        if (createIncomplete) assertTrue(f.complete(v1));
877  
878          checkCompletedNormally(g, v1);
879          checkCompletedNormally(f, v1);
# Line 865 | Line 894 | public class CompletableFutureTest exten
894          if (!createIncomplete) f.completeExceptionally(ex);
895          final CompletableFuture<Integer> g = f.exceptionally
896              ((Throwable t) -> {
897 <                ExecutionMode.DEFAULT.checkExecutionMode();
897 >                ExecutionMode.SYNC.checkExecutionMode();
898                  threadAssertSame(t, ex);
899                  a.getAndIncrement();
900                  return v1;
# Line 887 | Line 916 | public class CompletableFutureTest exten
916          if (!createIncomplete) f.completeExceptionally(ex1);
917          final CompletableFuture<Integer> g = f.exceptionally
918              ((Throwable t) -> {
919 <                ExecutionMode.DEFAULT.checkExecutionMode();
919 >                ExecutionMode.SYNC.checkExecutionMode();
920                  threadAssertSame(t, ex1);
921                  a.getAndIncrement();
922                  throw ex2;
# Line 909 | Line 938 | public class CompletableFutureTest exten
938      {
939          final AtomicInteger a = new AtomicInteger(0);
940          final CompletableFuture<Integer> f = new CompletableFuture<>();
941 <        if (!createIncomplete) f.complete(v1);
941 >        if (!createIncomplete) assertTrue(f.complete(v1));
942          final CompletableFuture<Integer> g = m.whenComplete
943              (f,
944               (Integer x, Throwable t) -> {
# Line 918 | Line 947 | public class CompletableFutureTest exten
947                  threadAssertNull(t);
948                  a.getAndIncrement();
949              });
950 <        if (createIncomplete) f.complete(v1);
950 >        if (createIncomplete) assertTrue(f.complete(v1));
951  
952          checkCompletedNormally(g, v1);
953          checkCompletedNormally(f, v1);
# Line 992 | Line 1021 | public class CompletableFutureTest exten
1021          final AtomicInteger a = new AtomicInteger(0);
1022          final CFException ex = new CFException();
1023          final CompletableFuture<Integer> f = new CompletableFuture<>();
1024 <        if (!createIncomplete) f.complete(v1);
1024 >        if (!createIncomplete) assertTrue(f.complete(v1));
1025          final CompletableFuture<Integer> g = m.whenComplete
1026              (f,
1027               (Integer x, Throwable t) -> {
# Line 1002 | Line 1031 | public class CompletableFutureTest exten
1031                  a.getAndIncrement();
1032                  throw ex;
1033              });
1034 <        if (createIncomplete) f.complete(v1);
1034 >        if (createIncomplete) assertTrue(f.complete(v1));
1035  
1036          checkCompletedWithWrappedException(g, ex);
1037          checkCompletedNormally(f, v1);
# Line 1052 | Line 1081 | public class CompletableFutureTest exten
1081      {
1082          final CompletableFuture<Integer> f = new CompletableFuture<>();
1083          final AtomicInteger a = new AtomicInteger(0);
1084 <        if (!createIncomplete) f.complete(v1);
1084 >        if (!createIncomplete) assertTrue(f.complete(v1));
1085          final CompletableFuture<Integer> g = m.handle
1086              (f,
1087               (Integer x, Throwable t) -> {
# Line 1062 | Line 1091 | public class CompletableFutureTest exten
1091                  a.getAndIncrement();
1092                  return inc(v1);
1093              });
1094 <        if (createIncomplete) f.complete(v1);
1094 >        if (createIncomplete) assertTrue(f.complete(v1));
1095  
1096          checkCompletedNormally(g, inc(v1));
1097          checkCompletedNormally(f, v1);
# Line 1163 | Line 1192 | public class CompletableFutureTest exten
1192          final CompletableFuture<Integer> f = new CompletableFuture<>();
1193          final AtomicInteger a = new AtomicInteger(0);
1194          final CFException ex = new CFException();
1195 <        if (!createIncomplete) f.complete(v1);
1195 >        if (!createIncomplete) assertTrue(f.complete(v1));
1196          final CompletableFuture<Integer> g = m.handle
1197              (f,
1198               (Integer x, Throwable t) -> {
# Line 1173 | Line 1202 | public class CompletableFutureTest exten
1202                  a.getAndIncrement();
1203                  throw ex;
1204              });
1205 <        if (createIncomplete) f.complete(v1);
1205 >        if (createIncomplete) assertTrue(f.complete(v1));
1206  
1207          checkCompletedWithWrappedException(g, ex);
1208          checkCompletedNormally(f, v1);
# Line 1254 | Line 1283 | public class CompletableFutureTest exten
1283       */
1284      public void testThenRun_normalCompletion() {
1285          for (ExecutionMode m : ExecutionMode.values())
1257        for (boolean createIncomplete : new boolean[] { true, false })
1286          for (Integer v1 : new Integer[] { 1, null })
1287      {
1288          final CompletableFuture<Integer> f = new CompletableFuture<>();
1289 <        final Noop r = new Noop(m);
1290 <        if (!createIncomplete) f.complete(v1);
1263 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1264 <        if (createIncomplete) {
1265 <            checkIncomplete(g);
1266 <            f.complete(v1);
1267 <        }
1289 >        final Noop[] rs = new Noop[6];
1290 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1291  
1292 <        checkCompletedNormally(g, null);
1292 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1293 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1294 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1295 >        checkIncomplete(h0);
1296 >        checkIncomplete(h1);
1297 >        checkIncomplete(h2);
1298 >        assertTrue(f.complete(v1));
1299 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1300 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1301 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1302 >
1303 >        checkCompletedNormally(h0, null);
1304 >        checkCompletedNormally(h1, null);
1305 >        checkCompletedNormally(h2, null);
1306 >        checkCompletedNormally(h3, null);
1307 >        checkCompletedNormally(h4, null);
1308 >        checkCompletedNormally(h5, null);
1309          checkCompletedNormally(f, v1);
1310 <        r.assertInvoked();
1310 >        for (Noop r : rs) r.assertInvoked();
1311      }}
1312  
1313      /**
# Line 1277 | Line 1316 | public class CompletableFutureTest exten
1316       */
1317      public void testThenRun_exceptionalCompletion() {
1318          for (ExecutionMode m : ExecutionMode.values())
1280        for (boolean createIncomplete : new boolean[] { true, false })
1319      {
1320          final CFException ex = new CFException();
1321          final CompletableFuture<Integer> f = new CompletableFuture<>();
1322 <        final Noop r = new Noop(m);
1323 <        if (!createIncomplete) f.completeExceptionally(ex);
1286 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1287 <        if (createIncomplete) {
1288 <            checkIncomplete(g);
1289 <            f.completeExceptionally(ex);
1290 <        }
1322 >        final Noop[] rs = new Noop[6];
1323 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1324  
1325 <        checkCompletedWithWrappedException(g, ex);
1325 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1326 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1327 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1328 >        checkIncomplete(h0);
1329 >        checkIncomplete(h1);
1330 >        checkIncomplete(h2);
1331 >        assertTrue(f.completeExceptionally(ex));
1332 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1333 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1334 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1335 >
1336 >        checkCompletedWithWrappedException(h0, ex);
1337 >        checkCompletedWithWrappedException(h1, ex);
1338 >        checkCompletedWithWrappedException(h2, ex);
1339 >        checkCompletedWithWrappedException(h3, ex);
1340 >        checkCompletedWithWrappedException(h4, ex);
1341 >        checkCompletedWithWrappedException(h5, ex);
1342          checkCompletedExceptionally(f, ex);
1343 <        r.assertNotInvoked();
1343 >        for (Noop r : rs) r.assertNotInvoked();
1344      }}
1345  
1346      /**
# Line 1299 | Line 1348 | public class CompletableFutureTest exten
1348       */
1349      public void testThenRun_sourceCancelled() {
1350          for (ExecutionMode m : ExecutionMode.values())
1302        for (boolean createIncomplete : new boolean[] { true, false })
1351          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1352      {
1353          final CompletableFuture<Integer> f = new CompletableFuture<>();
1354 <        final Noop r = new Noop(m);
1355 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1308 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1309 <        if (createIncomplete) {
1310 <            checkIncomplete(g);
1311 <            assertTrue(f.cancel(mayInterruptIfRunning));
1312 <        }
1354 >        final Noop[] rs = new Noop[6];
1355 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1356  
1357 <        checkCompletedWithWrappedCancellationException(g);
1357 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1358 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1359 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1360 >        checkIncomplete(h0);
1361 >        checkIncomplete(h1);
1362 >        checkIncomplete(h2);
1363 >        assertTrue(f.cancel(mayInterruptIfRunning));
1364 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1365 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1366 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1367 >
1368 >        checkCompletedWithWrappedCancellationException(h0);
1369 >        checkCompletedWithWrappedCancellationException(h1);
1370 >        checkCompletedWithWrappedCancellationException(h2);
1371 >        checkCompletedWithWrappedCancellationException(h3);
1372 >        checkCompletedWithWrappedCancellationException(h4);
1373 >        checkCompletedWithWrappedCancellationException(h5);
1374          checkCancelled(f);
1375 <        r.assertNotInvoked();
1375 >        for (Noop r : rs) r.assertNotInvoked();
1376      }}
1377  
1378      /**
# Line 1321 | Line 1380 | public class CompletableFutureTest exten
1380       */
1381      public void testThenRun_actionFailed() {
1382          for (ExecutionMode m : ExecutionMode.values())
1324        for (boolean createIncomplete : new boolean[] { true, false })
1383          for (Integer v1 : new Integer[] { 1, null })
1384      {
1385          final CompletableFuture<Integer> f = new CompletableFuture<>();
1386 <        final FailingRunnable r = new FailingRunnable(m);
1387 <        if (!createIncomplete) f.complete(v1);
1330 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1331 <        if (createIncomplete) {
1332 <            checkIncomplete(g);
1333 <            f.complete(v1);
1334 <        }
1386 >        final FailingRunnable[] rs = new FailingRunnable[6];
1387 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1388  
1389 <        checkCompletedWithWrappedCFException(g);
1389 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1390 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1391 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1392 >        assertTrue(f.complete(v1));
1393 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1394 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1395 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1396 >
1397 >        checkCompletedWithWrappedCFException(h0);
1398 >        checkCompletedWithWrappedCFException(h1);
1399 >        checkCompletedWithWrappedCFException(h2);
1400 >        checkCompletedWithWrappedCFException(h3);
1401 >        checkCompletedWithWrappedCFException(h4);
1402 >        checkCompletedWithWrappedCFException(h5);
1403          checkCompletedNormally(f, v1);
1404      }}
1405  
# Line 1342 | Line 1408 | public class CompletableFutureTest exten
1408       */
1409      public void testThenApply_normalCompletion() {
1410          for (ExecutionMode m : ExecutionMode.values())
1345        for (boolean createIncomplete : new boolean[] { true, false })
1411          for (Integer v1 : new Integer[] { 1, null })
1412      {
1413          final CompletableFuture<Integer> f = new CompletableFuture<>();
1414 <        final IncFunction r = new IncFunction(m);
1415 <        if (!createIncomplete) f.complete(v1);
1351 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1352 <        if (createIncomplete) {
1353 <            checkIncomplete(g);
1354 <            f.complete(v1);
1355 <        }
1414 >        final IncFunction[] rs = new IncFunction[4];
1415 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1416  
1417 <        checkCompletedNormally(g, inc(v1));
1417 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1418 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1419 >        checkIncomplete(h0);
1420 >        checkIncomplete(h1);
1421 >        assertTrue(f.complete(v1));
1422 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1423 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1424 >
1425 >        checkCompletedNormally(h0, inc(v1));
1426 >        checkCompletedNormally(h1, inc(v1));
1427 >        checkCompletedNormally(h2, inc(v1));
1428 >        checkCompletedNormally(h3, inc(v1));
1429          checkCompletedNormally(f, v1);
1430 <        r.assertValue(inc(v1));
1430 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1431      }}
1432  
1433      /**
# Line 1365 | Line 1436 | public class CompletableFutureTest exten
1436       */
1437      public void testThenApply_exceptionalCompletion() {
1438          for (ExecutionMode m : ExecutionMode.values())
1368        for (boolean createIncomplete : new boolean[] { true, false })
1439      {
1440          final CFException ex = new CFException();
1441          final CompletableFuture<Integer> f = new CompletableFuture<>();
1442 <        final IncFunction r = new IncFunction(m);
1443 <        if (!createIncomplete) f.completeExceptionally(ex);
1374 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1375 <        if (createIncomplete) {
1376 <            checkIncomplete(g);
1377 <            f.completeExceptionally(ex);
1378 <        }
1442 >        final IncFunction[] rs = new IncFunction[4];
1443 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1444  
1445 <        checkCompletedWithWrappedException(g, ex);
1445 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1446 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1447 >        assertTrue(f.completeExceptionally(ex));
1448 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1449 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1450 >
1451 >        checkCompletedWithWrappedException(h0, ex);
1452 >        checkCompletedWithWrappedException(h1, ex);
1453 >        checkCompletedWithWrappedException(h2, ex);
1454 >        checkCompletedWithWrappedException(h3, ex);
1455          checkCompletedExceptionally(f, ex);
1456 <        r.assertNotInvoked();
1456 >        for (IncFunction r : rs) r.assertNotInvoked();
1457      }}
1458  
1459      /**
# Line 1387 | Line 1461 | public class CompletableFutureTest exten
1461       */
1462      public void testThenApply_sourceCancelled() {
1463          for (ExecutionMode m : ExecutionMode.values())
1390        for (boolean createIncomplete : new boolean[] { true, false })
1464          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1465      {
1466          final CompletableFuture<Integer> f = new CompletableFuture<>();
1467 <        final IncFunction r = new IncFunction(m);
1468 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1396 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1397 <        if (createIncomplete) {
1398 <            checkIncomplete(g);
1399 <            assertTrue(f.cancel(mayInterruptIfRunning));
1400 <        }
1467 >        final IncFunction[] rs = new IncFunction[4];
1468 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1469  
1470 <        checkCompletedWithWrappedCancellationException(g);
1470 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1471 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1472 >        assertTrue(f.cancel(mayInterruptIfRunning));
1473 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1474 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1475 >
1476 >        checkCompletedWithWrappedCancellationException(h0);
1477 >        checkCompletedWithWrappedCancellationException(h1);
1478 >        checkCompletedWithWrappedCancellationException(h2);
1479 >        checkCompletedWithWrappedCancellationException(h3);
1480          checkCancelled(f);
1481 <        r.assertNotInvoked();
1481 >        for (IncFunction r : rs) r.assertNotInvoked();
1482      }}
1483  
1484      /**
# Line 1409 | Line 1486 | public class CompletableFutureTest exten
1486       */
1487      public void testThenApply_actionFailed() {
1488          for (ExecutionMode m : ExecutionMode.values())
1412        for (boolean createIncomplete : new boolean[] { true, false })
1489          for (Integer v1 : new Integer[] { 1, null })
1490      {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final FailingFunction r = new FailingFunction(m);
1493 <        if (!createIncomplete) f.complete(v1);
1418 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1419 <        if (createIncomplete) {
1420 <            checkIncomplete(g);
1421 <            f.complete(v1);
1422 <        }
1492 >        final FailingFunction[] rs = new FailingFunction[4];
1493 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1494  
1495 <        checkCompletedWithWrappedCFException(g);
1495 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1496 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1497 >        assertTrue(f.complete(v1));
1498 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1499 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1500 >
1501 >        checkCompletedWithWrappedCFException(h0);
1502 >        checkCompletedWithWrappedCFException(h1);
1503 >        checkCompletedWithWrappedCFException(h2);
1504 >        checkCompletedWithWrappedCFException(h3);
1505          checkCompletedNormally(f, v1);
1506      }}
1507  
# Line 1430 | Line 1510 | public class CompletableFutureTest exten
1510       */
1511      public void testThenAccept_normalCompletion() {
1512          for (ExecutionMode m : ExecutionMode.values())
1433        for (boolean createIncomplete : new boolean[] { true, false })
1513          for (Integer v1 : new Integer[] { 1, null })
1514      {
1515          final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 <        final NoopConsumer r = new NoopConsumer(m);
1517 <        if (!createIncomplete) f.complete(v1);
1439 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1440 <        if (createIncomplete) {
1441 <            checkIncomplete(g);
1442 <            f.complete(v1);
1443 <        }
1516 >        final NoopConsumer[] rs = new NoopConsumer[4];
1517 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1518  
1519 <        checkCompletedNormally(g, null);
1520 <        r.assertValue(v1);
1519 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1520 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1521 >        checkIncomplete(h0);
1522 >        checkIncomplete(h1);
1523 >        assertTrue(f.complete(v1));
1524 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1525 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1526 >
1527 >        checkCompletedNormally(h0, null);
1528 >        checkCompletedNormally(h1, null);
1529 >        checkCompletedNormally(h2, null);
1530 >        checkCompletedNormally(h3, null);
1531          checkCompletedNormally(f, v1);
1532 +        for (NoopConsumer r : rs) r.assertValue(v1);
1533      }}
1534  
1535      /**
# Line 1453 | Line 1538 | public class CompletableFutureTest exten
1538       */
1539      public void testThenAccept_exceptionalCompletion() {
1540          for (ExecutionMode m : ExecutionMode.values())
1456        for (boolean createIncomplete : new boolean[] { true, false })
1541      {
1542          final CFException ex = new CFException();
1543          final CompletableFuture<Integer> f = new CompletableFuture<>();
1544 <        final NoopConsumer r = new NoopConsumer(m);
1545 <        if (!createIncomplete) f.completeExceptionally(ex);
1462 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1463 <        if (createIncomplete) {
1464 <            checkIncomplete(g);
1465 <            f.completeExceptionally(ex);
1466 <        }
1544 >        final NoopConsumer[] rs = new NoopConsumer[4];
1545 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1546  
1547 <        checkCompletedWithWrappedException(g, ex);
1547 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1548 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1549 >        assertTrue(f.completeExceptionally(ex));
1550 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1551 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1552 >
1553 >        checkCompletedWithWrappedException(h0, ex);
1554 >        checkCompletedWithWrappedException(h1, ex);
1555 >        checkCompletedWithWrappedException(h2, ex);
1556 >        checkCompletedWithWrappedException(h3, ex);
1557          checkCompletedExceptionally(f, ex);
1558 <        r.assertNotInvoked();
1558 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1559      }}
1560  
1561      /**
# Line 1475 | Line 1563 | public class CompletableFutureTest exten
1563       */
1564      public void testThenAccept_sourceCancelled() {
1565          for (ExecutionMode m : ExecutionMode.values())
1478        for (boolean createIncomplete : new boolean[] { true, false })
1566          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1567      {
1568          final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final NoopConsumer r = new NoopConsumer(m);
1570 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1484 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1485 <        if (createIncomplete) {
1486 <            checkIncomplete(g);
1487 <            assertTrue(f.cancel(mayInterruptIfRunning));
1488 <        }
1569 >        final NoopConsumer[] rs = new NoopConsumer[4];
1570 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1571  
1572 <        checkCompletedWithWrappedCancellationException(g);
1572 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1573 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1574 >        assertTrue(f.cancel(mayInterruptIfRunning));
1575 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1576 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1577 >
1578 >        checkCompletedWithWrappedCancellationException(h0);
1579 >        checkCompletedWithWrappedCancellationException(h1);
1580 >        checkCompletedWithWrappedCancellationException(h2);
1581 >        checkCompletedWithWrappedCancellationException(h3);
1582          checkCancelled(f);
1583 <        r.assertNotInvoked();
1583 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1584      }}
1585  
1586      /**
# Line 1497 | Line 1588 | public class CompletableFutureTest exten
1588       */
1589      public void testThenAccept_actionFailed() {
1590          for (ExecutionMode m : ExecutionMode.values())
1500        for (boolean createIncomplete : new boolean[] { true, false })
1591          for (Integer v1 : new Integer[] { 1, null })
1592      {
1593          final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        final FailingConsumer r = new FailingConsumer(m);
1595 <        if (!createIncomplete) f.complete(v1);
1506 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1507 <        if (createIncomplete) {
1508 <            checkIncomplete(g);
1509 <            f.complete(v1);
1510 <        }
1594 >        final FailingConsumer[] rs = new FailingConsumer[4];
1595 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1596  
1597 <        checkCompletedWithWrappedCFException(g);
1597 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1598 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1599 >        assertTrue(f.complete(v1));
1600 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1601 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1602 >
1603 >        checkCompletedWithWrappedCFException(h0);
1604 >        checkCompletedWithWrappedCFException(h1);
1605 >        checkCompletedWithWrappedCFException(h2);
1606 >        checkCompletedWithWrappedCFException(h3);
1607          checkCompletedNormally(f, v1);
1608      }}
1609  
# Line 1519 | Line 1613 | public class CompletableFutureTest exten
1613       */
1614      public void testThenCombine_normalCompletion() {
1615          for (ExecutionMode m : ExecutionMode.values())
1522        for (boolean createIncomplete : new boolean[] { true, false })
1616          for (boolean fFirst : new boolean[] { true, false })
1617          for (Integer v1 : new Integer[] { 1, null })
1618          for (Integer v2 : new Integer[] { 2, null })
1619      {
1620          final CompletableFuture<Integer> f = new CompletableFuture<>();
1621          final CompletableFuture<Integer> g = new CompletableFuture<>();
1622 <        final SubtractFunction r = new SubtractFunction(m);
1622 >        final SubtractFunction[] rs = new SubtractFunction[6];
1623 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1624  
1625 <        if (fFirst) f.complete(v1); else g.complete(v2);
1626 <        if (!createIncomplete)
1627 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1628 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1629 <        if (createIncomplete) {
1630 <            checkIncomplete(h);
1631 <            r.assertNotInvoked();
1632 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1633 <        }
1625 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1626 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1627 >        final Integer w1 =  fFirst ? v1 : v2;
1628 >        final Integer w2 = !fFirst ? v1 : v2;
1629 >
1630 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1631 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1632 >        assertTrue(fst.complete(w1));
1633 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1634 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1635 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1636 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1637 >        checkCompletedNormally(h1, subtract(w1, w1));
1638 >        checkCompletedNormally(h3, subtract(w1, w1));
1639 >        rs[1].assertValue(subtract(w1, w1));
1640 >        rs[3].assertValue(subtract(w1, w1));
1641 >        assertTrue(snd.complete(w2));
1642 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1643 >
1644 >        checkCompletedNormally(h0, subtract(v1, v2));
1645 >        checkCompletedNormally(h2, subtract(v1, v2));
1646 >        checkCompletedNormally(h4, subtract(v1, v2));
1647 >        rs[0].assertValue(subtract(v1, v2));
1648 >        rs[2].assertValue(subtract(v1, v2));
1649 >        rs[4].assertValue(subtract(v1, v2));
1650  
1541        checkCompletedNormally(h, subtract(v1, v2));
1651          checkCompletedNormally(f, v1);
1652          checkCompletedNormally(g, v2);
1544        r.assertValue(subtract(v1, v2));
1653      }}
1654  
1655      /**
1656       * thenCombine result completes exceptionally after exceptional
1657       * completion of either source
1658       */
1659 <    public void testThenCombine_exceptionalCompletion() {
1659 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1660          for (ExecutionMode m : ExecutionMode.values())
1553        for (boolean createIncomplete : new boolean[] { true, false })
1661          for (boolean fFirst : new boolean[] { true, false })
1662 +        for (boolean failFirst : new boolean[] { true, false })
1663          for (Integer v1 : new Integer[] { 1, null })
1664      {
1665          final CompletableFuture<Integer> f = new CompletableFuture<>();
1666          final CompletableFuture<Integer> g = new CompletableFuture<>();
1667          final CFException ex = new CFException();
1668 <        final SubtractFunction r = new SubtractFunction(m);
1669 <
1670 <        (fFirst ? f : g).complete(v1);
1671 <        if (!createIncomplete)
1672 <            (!fFirst ? f : g).completeExceptionally(ex);
1673 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1674 <        if (createIncomplete) {
1675 <            checkIncomplete(h);
1676 <            (!fFirst ? f : g).completeExceptionally(ex);
1677 <        }
1668 >        final SubtractFunction r1 = new SubtractFunction(m);
1669 >        final SubtractFunction r2 = new SubtractFunction(m);
1670 >        final SubtractFunction r3 = new SubtractFunction(m);
1671 >
1672 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1673 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1674 >        final Callable<Boolean> complete1 = failFirst ?
1675 >            () -> fst.completeExceptionally(ex) :
1676 >            () -> fst.complete(v1);
1677 >        final Callable<Boolean> complete2 = failFirst ?
1678 >            () -> snd.complete(v1) :
1679 >            () -> snd.completeExceptionally(ex);
1680 >
1681 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1682 >        assertTrue(complete1.call());
1683 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1684 >        checkIncomplete(h1);
1685 >        checkIncomplete(h2);
1686 >        assertTrue(complete2.call());
1687 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1688  
1689 <        checkCompletedWithWrappedException(h, ex);
1690 <        r.assertNotInvoked();
1691 <        checkCompletedNormally(fFirst ? f : g, v1);
1692 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1689 >        checkCompletedWithWrappedException(h1, ex);
1690 >        checkCompletedWithWrappedException(h2, ex);
1691 >        checkCompletedWithWrappedException(h3, ex);
1692 >        r1.assertNotInvoked();
1693 >        r2.assertNotInvoked();
1694 >        r3.assertNotInvoked();
1695 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1696 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1697      }}
1698  
1699      /**
1700       * thenCombine result completes exceptionally if either source cancelled
1701       */
1702 <    public void testThenCombine_sourceCancelled() {
1702 >    public void testThenCombine_sourceCancelled() throws Throwable {
1703          for (ExecutionMode m : ExecutionMode.values())
1704          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1583        for (boolean createIncomplete : new boolean[] { true, false })
1705          for (boolean fFirst : new boolean[] { true, false })
1706 +        for (boolean failFirst : new boolean[] { true, false })
1707          for (Integer v1 : new Integer[] { 1, null })
1708      {
1709          final CompletableFuture<Integer> f = new CompletableFuture<>();
1710          final CompletableFuture<Integer> g = new CompletableFuture<>();
1711 <        final SubtractFunction r = new SubtractFunction(m);
1711 >        final SubtractFunction r1 = new SubtractFunction(m);
1712 >        final SubtractFunction r2 = new SubtractFunction(m);
1713 >        final SubtractFunction r3 = new SubtractFunction(m);
1714  
1715 <        (fFirst ? f : g).complete(v1);
1716 <        if (!createIncomplete)
1717 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1718 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1719 <        if (createIncomplete) {
1720 <            checkIncomplete(h);
1721 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1722 <        }
1715 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1716 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1717 >        final Callable<Boolean> complete1 = failFirst ?
1718 >            () -> fst.cancel(mayInterruptIfRunning) :
1719 >            () -> fst.complete(v1);
1720 >        final Callable<Boolean> complete2 = failFirst ?
1721 >            () -> snd.complete(v1) :
1722 >            () -> snd.cancel(mayInterruptIfRunning);
1723  
1724 <        checkCompletedWithWrappedCancellationException(h);
1725 <        checkCancelled(!fFirst ? f : g);
1726 <        r.assertNotInvoked();
1727 <        checkCompletedNormally(fFirst ? f : g, v1);
1724 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1725 >        assertTrue(complete1.call());
1726 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1727 >        checkIncomplete(h1);
1728 >        checkIncomplete(h2);
1729 >        assertTrue(complete2.call());
1730 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1731 >
1732 >        checkCompletedWithWrappedCancellationException(h1);
1733 >        checkCompletedWithWrappedCancellationException(h2);
1734 >        checkCompletedWithWrappedCancellationException(h3);
1735 >        r1.assertNotInvoked();
1736 >        r2.assertNotInvoked();
1737 >        r3.assertNotInvoked();
1738 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1739 >        checkCancelled(failFirst ? fst : snd);
1740      }}
1741  
1742      /**
# Line 1614 | Line 1750 | public class CompletableFutureTest exten
1750      {
1751          final CompletableFuture<Integer> f = new CompletableFuture<>();
1752          final CompletableFuture<Integer> g = new CompletableFuture<>();
1753 <        final FailingBiFunction r = new FailingBiFunction(m);
1754 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1755 <
1756 <        if (fFirst) {
1757 <            f.complete(v1);
1758 <            g.complete(v2);
1759 <        } else {
1760 <            g.complete(v2);
1761 <            f.complete(v1);
1762 <        }
1753 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1754 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1755 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1756 >
1757 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1758 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1759 >        final Integer w1 =  fFirst ? v1 : v2;
1760 >        final Integer w2 = !fFirst ? v1 : v2;
1761 >
1762 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1763 >        assertTrue(fst.complete(w1));
1764 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1765 >        assertTrue(snd.complete(w2));
1766 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1767  
1768 <        checkCompletedWithWrappedCFException(h);
1768 >        checkCompletedWithWrappedCFException(h1);
1769 >        checkCompletedWithWrappedCFException(h2);
1770 >        checkCompletedWithWrappedCFException(h3);
1771 >        r1.assertInvoked();
1772 >        r2.assertInvoked();
1773 >        r3.assertInvoked();
1774          checkCompletedNormally(f, v1);
1775          checkCompletedNormally(g, v2);
1776      }}
# Line 1636 | Line 1781 | public class CompletableFutureTest exten
1781       */
1782      public void testThenAcceptBoth_normalCompletion() {
1783          for (ExecutionMode m : ExecutionMode.values())
1639        for (boolean createIncomplete : new boolean[] { true, false })
1784          for (boolean fFirst : new boolean[] { true, false })
1785          for (Integer v1 : new Integer[] { 1, null })
1786          for (Integer v2 : new Integer[] { 2, null })
1787      {
1788          final CompletableFuture<Integer> f = new CompletableFuture<>();
1789          final CompletableFuture<Integer> g = new CompletableFuture<>();
1790 <        final SubtractAction r = new SubtractAction(m);
1791 <
1792 <        if (fFirst) f.complete(v1); else g.complete(v2);
1793 <        if (!createIncomplete)
1794 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1795 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1796 <        if (createIncomplete) {
1797 <            checkIncomplete(h);
1798 <            r.assertNotInvoked();
1799 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1800 <        }
1790 >        final SubtractAction r1 = new SubtractAction(m);
1791 >        final SubtractAction r2 = new SubtractAction(m);
1792 >        final SubtractAction r3 = new SubtractAction(m);
1793 >
1794 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1795 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1796 >        final Integer w1 =  fFirst ? v1 : v2;
1797 >        final Integer w2 = !fFirst ? v1 : v2;
1798 >
1799 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1800 >        assertTrue(fst.complete(w1));
1801 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1802 >        checkIncomplete(h1);
1803 >        checkIncomplete(h2);
1804 >        r1.assertNotInvoked();
1805 >        r2.assertNotInvoked();
1806 >        assertTrue(snd.complete(w2));
1807 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1808  
1809 <        checkCompletedNormally(h, null);
1810 <        r.assertValue(subtract(v1, v2));
1809 >        checkCompletedNormally(h1, null);
1810 >        checkCompletedNormally(h2, null);
1811 >        checkCompletedNormally(h3, null);
1812 >        r1.assertValue(subtract(v1, v2));
1813 >        r2.assertValue(subtract(v1, v2));
1814 >        r3.assertValue(subtract(v1, v2));
1815          checkCompletedNormally(f, v1);
1816          checkCompletedNormally(g, v2);
1817      }}
# Line 1665 | Line 1820 | public class CompletableFutureTest exten
1820       * thenAcceptBoth result completes exceptionally after exceptional
1821       * completion of either source
1822       */
1823 <    public void testThenAcceptBoth_exceptionalCompletion() {
1823 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1824          for (ExecutionMode m : ExecutionMode.values())
1670        for (boolean createIncomplete : new boolean[] { true, false })
1825          for (boolean fFirst : new boolean[] { true, false })
1826 +        for (boolean failFirst : new boolean[] { true, false })
1827          for (Integer v1 : new Integer[] { 1, null })
1828      {
1829          final CompletableFuture<Integer> f = new CompletableFuture<>();
1830          final CompletableFuture<Integer> g = new CompletableFuture<>();
1831          final CFException ex = new CFException();
1832 <        final SubtractAction r = new SubtractAction(m);
1833 <
1834 <        (fFirst ? f : g).complete(v1);
1835 <        if (!createIncomplete)
1836 <            (!fFirst ? f : g).completeExceptionally(ex);
1837 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1838 <        if (createIncomplete) {
1839 <            checkIncomplete(h);
1840 <            (!fFirst ? f : g).completeExceptionally(ex);
1841 <        }
1832 >        final SubtractAction r1 = new SubtractAction(m);
1833 >        final SubtractAction r2 = new SubtractAction(m);
1834 >        final SubtractAction r3 = new SubtractAction(m);
1835 >
1836 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1837 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1838 >        final Callable<Boolean> complete1 = failFirst ?
1839 >            () -> fst.completeExceptionally(ex) :
1840 >            () -> fst.complete(v1);
1841 >        final Callable<Boolean> complete2 = failFirst ?
1842 >            () -> snd.complete(v1) :
1843 >            () -> snd.completeExceptionally(ex);
1844 >
1845 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1846 >        assertTrue(complete1.call());
1847 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1848 >        checkIncomplete(h1);
1849 >        checkIncomplete(h2);
1850 >        assertTrue(complete2.call());
1851 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1852  
1853 <        checkCompletedWithWrappedException(h, ex);
1854 <        r.assertNotInvoked();
1855 <        checkCompletedNormally(fFirst ? f : g, v1);
1856 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1853 >        checkCompletedWithWrappedException(h1, ex);
1854 >        checkCompletedWithWrappedException(h2, ex);
1855 >        checkCompletedWithWrappedException(h3, ex);
1856 >        r1.assertNotInvoked();
1857 >        r2.assertNotInvoked();
1858 >        r3.assertNotInvoked();
1859 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1860 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1861      }}
1862  
1863      /**
1864       * thenAcceptBoth result completes exceptionally if either source cancelled
1865       */
1866 <    public void testThenAcceptBoth_sourceCancelled() {
1866 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1867          for (ExecutionMode m : ExecutionMode.values())
1868          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1700        for (boolean createIncomplete : new boolean[] { true, false })
1869          for (boolean fFirst : new boolean[] { true, false })
1870 +        for (boolean failFirst : new boolean[] { true, false })
1871          for (Integer v1 : new Integer[] { 1, null })
1872      {
1873          final CompletableFuture<Integer> f = new CompletableFuture<>();
1874          final CompletableFuture<Integer> g = new CompletableFuture<>();
1875 <        final SubtractAction r = new SubtractAction(m);
1875 >        final SubtractAction r1 = new SubtractAction(m);
1876 >        final SubtractAction r2 = new SubtractAction(m);
1877 >        final SubtractAction r3 = new SubtractAction(m);
1878  
1879 <        (fFirst ? f : g).complete(v1);
1880 <        if (!createIncomplete)
1881 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1882 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1883 <        if (createIncomplete) {
1884 <            checkIncomplete(h);
1885 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1886 <        }
1879 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1880 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1881 >        final Callable<Boolean> complete1 = failFirst ?
1882 >            () -> fst.cancel(mayInterruptIfRunning) :
1883 >            () -> fst.complete(v1);
1884 >        final Callable<Boolean> complete2 = failFirst ?
1885 >            () -> snd.complete(v1) :
1886 >            () -> snd.cancel(mayInterruptIfRunning);
1887  
1888 <        checkCompletedWithWrappedCancellationException(h);
1889 <        checkCancelled(!fFirst ? f : g);
1890 <        r.assertNotInvoked();
1891 <        checkCompletedNormally(fFirst ? f : g, v1);
1888 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1889 >        assertTrue(complete1.call());
1890 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1891 >        checkIncomplete(h1);
1892 >        checkIncomplete(h2);
1893 >        assertTrue(complete2.call());
1894 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1895 >
1896 >        checkCompletedWithWrappedCancellationException(h1);
1897 >        checkCompletedWithWrappedCancellationException(h2);
1898 >        checkCompletedWithWrappedCancellationException(h3);
1899 >        r1.assertNotInvoked();
1900 >        r2.assertNotInvoked();
1901 >        r3.assertNotInvoked();
1902 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1903 >        checkCancelled(failFirst ? fst : snd);
1904      }}
1905  
1906      /**
# Line 1731 | Line 1914 | public class CompletableFutureTest exten
1914      {
1915          final CompletableFuture<Integer> f = new CompletableFuture<>();
1916          final CompletableFuture<Integer> g = new CompletableFuture<>();
1917 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1918 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1919 <
1920 <        if (fFirst) {
1921 <            f.complete(v1);
1922 <            g.complete(v2);
1923 <        } else {
1924 <            g.complete(v2);
1925 <            f.complete(v1);
1926 <        }
1917 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1918 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1919 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1920 >
1921 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1922 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1923 >        final Integer w1 =  fFirst ? v1 : v2;
1924 >        final Integer w2 = !fFirst ? v1 : v2;
1925 >
1926 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1927 >        assertTrue(fst.complete(w1));
1928 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1929 >        assertTrue(snd.complete(w2));
1930 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1931  
1932 <        checkCompletedWithWrappedCFException(h);
1932 >        checkCompletedWithWrappedCFException(h1);
1933 >        checkCompletedWithWrappedCFException(h2);
1934 >        checkCompletedWithWrappedCFException(h3);
1935 >        r1.assertInvoked();
1936 >        r2.assertInvoked();
1937 >        r3.assertInvoked();
1938          checkCompletedNormally(f, v1);
1939          checkCompletedNormally(g, v2);
1940      }}
# Line 1753 | Line 1945 | public class CompletableFutureTest exten
1945       */
1946      public void testRunAfterBoth_normalCompletion() {
1947          for (ExecutionMode m : ExecutionMode.values())
1756        for (boolean createIncomplete : new boolean[] { true, false })
1948          for (boolean fFirst : new boolean[] { true, false })
1949          for (Integer v1 : new Integer[] { 1, null })
1950          for (Integer v2 : new Integer[] { 2, null })
1951      {
1952          final CompletableFuture<Integer> f = new CompletableFuture<>();
1953          final CompletableFuture<Integer> g = new CompletableFuture<>();
1954 <        final Noop r = new Noop(m);
1955 <
1956 <        if (fFirst) f.complete(v1); else g.complete(v2);
1957 <        if (!createIncomplete)
1958 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1959 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1960 <        if (createIncomplete) {
1961 <            checkIncomplete(h);
1962 <            r.assertNotInvoked();
1963 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1964 <        }
1954 >        final Noop r1 = new Noop(m);
1955 >        final Noop r2 = new Noop(m);
1956 >        final Noop r3 = new Noop(m);
1957 >
1958 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1959 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1960 >        final Integer w1 =  fFirst ? v1 : v2;
1961 >        final Integer w2 = !fFirst ? v1 : v2;
1962 >
1963 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1964 >        assertTrue(fst.complete(w1));
1965 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1966 >        checkIncomplete(h1);
1967 >        checkIncomplete(h2);
1968 >        r1.assertNotInvoked();
1969 >        r2.assertNotInvoked();
1970 >        assertTrue(snd.complete(w2));
1971 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1972  
1973 <        checkCompletedNormally(h, null);
1974 <        r.assertInvoked();
1973 >        checkCompletedNormally(h1, null);
1974 >        checkCompletedNormally(h2, null);
1975 >        checkCompletedNormally(h3, null);
1976 >        r1.assertInvoked();
1977 >        r2.assertInvoked();
1978 >        r3.assertInvoked();
1979          checkCompletedNormally(f, v1);
1980          checkCompletedNormally(g, v2);
1981      }}
# Line 1782 | Line 1984 | public class CompletableFutureTest exten
1984       * runAfterBoth result completes exceptionally after exceptional
1985       * completion of either source
1986       */
1987 <    public void testRunAfterBoth_exceptionalCompletion() {
1987 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1988          for (ExecutionMode m : ExecutionMode.values())
1787        for (boolean createIncomplete : new boolean[] { true, false })
1989          for (boolean fFirst : new boolean[] { true, false })
1990 +        for (boolean failFirst : new boolean[] { true, false })
1991          for (Integer v1 : new Integer[] { 1, null })
1992      {
1993          final CompletableFuture<Integer> f = new CompletableFuture<>();
1994          final CompletableFuture<Integer> g = new CompletableFuture<>();
1995          final CFException ex = new CFException();
1996 <        final Noop r = new Noop(m);
1997 <
1998 <        (fFirst ? f : g).complete(v1);
1999 <        if (!createIncomplete)
2000 <            (!fFirst ? f : g).completeExceptionally(ex);
2001 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2002 <        if (createIncomplete) {
2003 <            checkIncomplete(h);
2004 <            (!fFirst ? f : g).completeExceptionally(ex);
2005 <        }
1996 >        final Noop r1 = new Noop(m);
1997 >        final Noop r2 = new Noop(m);
1998 >        final Noop r3 = new Noop(m);
1999 >
2000 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2001 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2002 >        final Callable<Boolean> complete1 = failFirst ?
2003 >            () -> fst.completeExceptionally(ex) :
2004 >            () -> fst.complete(v1);
2005 >        final Callable<Boolean> complete2 = failFirst ?
2006 >            () -> snd.complete(v1) :
2007 >            () -> snd.completeExceptionally(ex);
2008 >
2009 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2010 >        assertTrue(complete1.call());
2011 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2012 >        checkIncomplete(h1);
2013 >        checkIncomplete(h2);
2014 >        assertTrue(complete2.call());
2015 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2016  
2017 <        checkCompletedWithWrappedException(h, ex);
2018 <        r.assertNotInvoked();
2019 <        checkCompletedNormally(fFirst ? f : g, v1);
2020 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
2017 >        checkCompletedWithWrappedException(h1, ex);
2018 >        checkCompletedWithWrappedException(h2, ex);
2019 >        checkCompletedWithWrappedException(h3, ex);
2020 >        r1.assertNotInvoked();
2021 >        r2.assertNotInvoked();
2022 >        r3.assertNotInvoked();
2023 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2024 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2025      }}
2026  
2027      /**
2028       * runAfterBoth result completes exceptionally if either source cancelled
2029       */
2030 <    public void testRunAfterBoth_sourceCancelled() {
2030 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2031          for (ExecutionMode m : ExecutionMode.values())
2032          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1817        for (boolean createIncomplete : new boolean[] { true, false })
2033          for (boolean fFirst : new boolean[] { true, false })
2034 +        for (boolean failFirst : new boolean[] { true, false })
2035          for (Integer v1 : new Integer[] { 1, null })
2036      {
2037          final CompletableFuture<Integer> f = new CompletableFuture<>();
2038          final CompletableFuture<Integer> g = new CompletableFuture<>();
2039 <        final Noop r = new Noop(m);
2039 >        final Noop r1 = new Noop(m);
2040 >        final Noop r2 = new Noop(m);
2041 >        final Noop r3 = new Noop(m);
2042  
2043 <        (fFirst ? f : g).complete(v1);
2044 <        if (!createIncomplete)
2045 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2046 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2047 <        if (createIncomplete) {
2048 <            checkIncomplete(h);
2049 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2050 <        }
2043 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2044 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2045 >        final Callable<Boolean> complete1 = failFirst ?
2046 >            () -> fst.cancel(mayInterruptIfRunning) :
2047 >            () -> fst.complete(v1);
2048 >        final Callable<Boolean> complete2 = failFirst ?
2049 >            () -> snd.complete(v1) :
2050 >            () -> snd.cancel(mayInterruptIfRunning);
2051  
2052 <        checkCompletedWithWrappedCancellationException(h);
2053 <        checkCancelled(!fFirst ? f : g);
2054 <        r.assertNotInvoked();
2055 <        checkCompletedNormally(fFirst ? f : g, v1);
2052 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2053 >        assertTrue(complete1.call());
2054 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2055 >        checkIncomplete(h1);
2056 >        checkIncomplete(h2);
2057 >        assertTrue(complete2.call());
2058 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2059 >
2060 >        checkCompletedWithWrappedCancellationException(h1);
2061 >        checkCompletedWithWrappedCancellationException(h2);
2062 >        checkCompletedWithWrappedCancellationException(h3);
2063 >        r1.assertNotInvoked();
2064 >        r2.assertNotInvoked();
2065 >        r3.assertNotInvoked();
2066 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2067 >        checkCancelled(failFirst ? fst : snd);
2068      }}
2069  
2070      /**
# Line 1850 | Line 2080 | public class CompletableFutureTest exten
2080          final CompletableFuture<Integer> g = new CompletableFuture<>();
2081          final FailingRunnable r1 = new FailingRunnable(m);
2082          final FailingRunnable r2 = new FailingRunnable(m);
2083 +        final FailingRunnable r3 = new FailingRunnable(m);
2084  
2085 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2086 <        if (fFirst) {
2087 <            f.complete(v1);
2088 <            g.complete(v2);
2089 <        } else {
2090 <            g.complete(v2);
2091 <            f.complete(v1);
2092 <        }
2093 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2085 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2086 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2087 >        final Integer w1 =  fFirst ? v1 : v2;
2088 >        final Integer w2 = !fFirst ? v1 : v2;
2089 >
2090 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2091 >        assertTrue(fst.complete(w1));
2092 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2093 >        assertTrue(snd.complete(w2));
2094 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2095  
2096          checkCompletedWithWrappedCFException(h1);
2097          checkCompletedWithWrappedCFException(h2);
2098 +        checkCompletedWithWrappedCFException(h3);
2099 +        r1.assertInvoked();
2100 +        r2.assertInvoked();
2101 +        r3.assertInvoked();
2102          checkCompletedNormally(f, v1);
2103          checkCompletedNormally(g, v2);
2104      }}
# Line 1985 | Line 2221 | public class CompletableFutureTest exten
2221  
2222          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2223          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2224 <        if (fFirst) {
2225 <            f.complete(v1);
1990 <            g.completeExceptionally(ex);
1991 <        } else {
1992 <            g.completeExceptionally(ex);
1993 <            f.complete(v1);
1994 <        }
2224 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2225 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2226          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2227          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2228  
# Line 2097 | Line 2328 | public class CompletableFutureTest exten
2328  
2329          final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2330          final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2331 <        if (fFirst) {
2332 <            f.complete(v1);
2102 <            g.cancel(mayInterruptIfRunning);
2103 <        } else {
2104 <            g.cancel(mayInterruptIfRunning);
2105 <            f.complete(v1);
2106 <        }
2331 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2332 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2333          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2334          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2335  
# Line 2305 | Line 2531 | public class CompletableFutureTest exten
2531  
2532          final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2533          final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2534 <        if (fFirst) {
2535 <            f.complete(v1);
2310 <            g.completeExceptionally(ex);
2311 <        } else {
2312 <            g.completeExceptionally(ex);
2313 <            f.complete(v1);
2314 <        }
2534 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2535 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2536          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2537          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2538  
# Line 2514 | Line 2735 | public class CompletableFutureTest exten
2735          checkIncomplete(h1);
2736          rs[0].assertNotInvoked();
2737          rs[1].assertNotInvoked();
2738 <        f.completeExceptionally(ex);
2738 >        assertTrue(f.completeExceptionally(ex));
2739          checkCompletedWithWrappedException(h0, ex);
2740          checkCompletedWithWrappedException(h1, ex);
2741          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
# Line 2522 | Line 2743 | public class CompletableFutureTest exten
2743          checkCompletedWithWrappedException(h2, ex);
2744          checkCompletedWithWrappedException(h3, ex);
2745  
2746 <        g.complete(v1);
2746 >        assertTrue(g.complete(v1));
2747  
2748          // unspecified behavior - both source completions available
2749          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2565 | Line 2786 | public class CompletableFutureTest exten
2786  
2787          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2788          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2789 <        if (fFirst) {
2790 <            f.complete(v1);
2570 <            g.completeExceptionally(ex);
2571 <        } else {
2572 <            g.completeExceptionally(ex);
2573 <            f.complete(v1);
2574 <        }
2789 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2790 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2791          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2792          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2793  
# Line 2636 | Line 2852 | public class CompletableFutureTest exten
2852          checkCompletedWithWrappedCancellationException(h2);
2853          checkCompletedWithWrappedCancellationException(h3);
2854  
2855 <        g.complete(v1);
2855 >        assertTrue(g.complete(v1));
2856  
2857          // unspecified behavior - both source completions available
2858          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
# Line 2680 | Line 2896 | public class CompletableFutureTest exten
2896  
2897          final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2898          final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2899 <        f.complete(v1);
2899 >        assertTrue(f.complete(v1));
2900          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2901          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2902          checkCompletedWithWrappedCFException(h0);
# Line 2688 | Line 2904 | public class CompletableFutureTest exten
2904          checkCompletedWithWrappedCFException(h2);
2905          checkCompletedWithWrappedCFException(h3);
2906          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2907 <        g.complete(v2);
2907 >        assertTrue(g.complete(v2));
2908          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2909          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2910          checkCompletedWithWrappedCFException(h4);
# Line 2709 | Line 2925 | public class CompletableFutureTest exten
2925      {
2926          final CompletableFuture<Integer> f = new CompletableFuture<>();
2927          final CompletableFutureInc r = new CompletableFutureInc(m);
2928 <        if (!createIncomplete) f.complete(v1);
2928 >        if (!createIncomplete) assertTrue(f.complete(v1));
2929          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2930 <        if (createIncomplete) f.complete(v1);
2930 >        if (createIncomplete) assertTrue(f.complete(v1));
2931  
2932          checkCompletedNormally(g, inc(v1));
2933          checkCompletedNormally(f, v1);
# Line 2749 | Line 2965 | public class CompletableFutureTest exten
2965          final CompletableFuture<Integer> f = new CompletableFuture<>();
2966          final FailingCompletableFutureFunction r
2967              = new FailingCompletableFutureFunction(m);
2968 <        if (!createIncomplete) f.complete(v1);
2968 >        if (!createIncomplete) assertTrue(f.complete(v1));
2969          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2970 <        if (createIncomplete) f.complete(v1);
2970 >        if (createIncomplete) assertTrue(f.complete(v1));
2971  
2972          checkCompletedWithWrappedCFException(g);
2973          checkCompletedNormally(f, v1);
# Line 2778 | Line 2994 | public class CompletableFutureTest exten
2994          checkCancelled(f);
2995      }}
2996  
2997 +    /**
2998 +     * thenCompose result completes exceptionally if the result of the action does
2999 +     */
3000 +    public void testThenCompose_actionReturnsFailingFuture() {
3001 +        for (ExecutionMode m : ExecutionMode.values())
3002 +        for (int order = 0; order < 6; order++)
3003 +        for (Integer v1 : new Integer[] { 1, null })
3004 +    {
3005 +        final CFException ex = new CFException();
3006 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3007 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3008 +        final CompletableFuture<Integer> h;
3009 +        // Test all permutations of orders
3010 +        switch (order) {
3011 +        case 0:
3012 +            assertTrue(f.complete(v1));
3013 +            assertTrue(g.completeExceptionally(ex));
3014 +            h = m.thenCompose(f, (x -> g));
3015 +            break;
3016 +        case 1:
3017 +            assertTrue(f.complete(v1));
3018 +            h = m.thenCompose(f, (x -> g));
3019 +            assertTrue(g.completeExceptionally(ex));
3020 +            break;
3021 +        case 2:
3022 +            assertTrue(g.completeExceptionally(ex));
3023 +            assertTrue(f.complete(v1));
3024 +            h = m.thenCompose(f, (x -> g));
3025 +            break;
3026 +        case 3:
3027 +            assertTrue(g.completeExceptionally(ex));
3028 +            h = m.thenCompose(f, (x -> g));
3029 +            assertTrue(f.complete(v1));
3030 +            break;
3031 +        case 4:
3032 +            h = m.thenCompose(f, (x -> g));
3033 +            assertTrue(f.complete(v1));
3034 +            assertTrue(g.completeExceptionally(ex));
3035 +            break;
3036 +        case 5:
3037 +            h = m.thenCompose(f, (x -> g));
3038 +            assertTrue(f.complete(v1));
3039 +            assertTrue(g.completeExceptionally(ex));
3040 +            break;
3041 +        default: throw new AssertionError();
3042 +        }
3043 +
3044 +        checkCompletedExceptionally(g, ex);
3045 +        checkCompletedWithWrappedException(h, ex);
3046 +        checkCompletedNormally(f, v1);
3047 +    }}
3048 +
3049      // other static methods
3050  
3051      /**
# Line 2794 | Line 3062 | public class CompletableFutureTest exten
3062       * when all components complete normally
3063       */
3064      public void testAllOf_normal() throws Exception {
3065 <        for (int k = 1; k < 20; ++k) {
3065 >        for (int k = 1; k < 10; k++) {
3066              CompletableFuture<Integer>[] fs
3067                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3068 <            for (int i = 0; i < k; ++i)
3068 >            for (int i = 0; i < k; i++)
3069                  fs[i] = new CompletableFuture<>();
3070              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3071 <            for (int i = 0; i < k; ++i) {
3071 >            for (int i = 0; i < k; i++) {
3072                  checkIncomplete(f);
3073                  checkIncomplete(CompletableFuture.allOf(fs));
3074                  fs[i].complete(one);
# Line 2811 | Line 3079 | public class CompletableFutureTest exten
3079      }
3080  
3081      public void testAllOf_backwards() throws Exception {
3082 <        for (int k = 1; k < 20; ++k) {
3082 >        for (int k = 1; k < 10; k++) {
3083              CompletableFuture<Integer>[] fs
3084                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3085 <            for (int i = 0; i < k; ++i)
3085 >            for (int i = 0; i < k; i++)
3086                  fs[i] = new CompletableFuture<>();
3087              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3088              for (int i = k - 1; i >= 0; i--) {
# Line 2827 | Line 3095 | public class CompletableFutureTest exten
3095          }
3096      }
3097  
3098 +    public void testAllOf_exceptional() throws Exception {
3099 +        for (int k = 1; k < 10; k++) {
3100 +            CompletableFuture<Integer>[] fs
3101 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3102 +            CFException ex = new CFException();
3103 +            for (int i = 0; i < k; i++)
3104 +                fs[i] = new CompletableFuture<>();
3105 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3106 +            for (int i = 0; i < k; i++) {
3107 +                checkIncomplete(f);
3108 +                checkIncomplete(CompletableFuture.allOf(fs));
3109 +                if (i != k/2) {
3110 +                    fs[i].complete(i);
3111 +                    checkCompletedNormally(fs[i], i);
3112 +                } else {
3113 +                    fs[i].completeExceptionally(ex);
3114 +                    checkCompletedExceptionally(fs[i], ex);
3115 +                }
3116 +            }
3117 +            checkCompletedWithWrappedException(f, ex);
3118 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3119 +        }
3120 +    }
3121 +
3122      /**
3123       * anyOf(no component futures) returns an incomplete future
3124       */
3125      public void testAnyOf_empty() throws Exception {
3126 +        for (Integer v1 : new Integer[] { 1, null })
3127 +    {
3128          CompletableFuture<Object> f = CompletableFuture.anyOf();
3129          checkIncomplete(f);
3130 <    }
3130 >
3131 >        f.complete(v1);
3132 >        checkCompletedNormally(f, v1);
3133 >    }}
3134  
3135      /**
3136       * anyOf returns a future completed normally with a value when
3137       * a component future does
3138       */
3139      public void testAnyOf_normal() throws Exception {
3140 <        for (int k = 0; k < 10; ++k) {
3140 >        for (int k = 0; k < 10; k++) {
3141              CompletableFuture[] fs = new CompletableFuture[k];
3142 <            for (int i = 0; i < k; ++i)
3142 >            for (int i = 0; i < k; i++)
3143                  fs[i] = new CompletableFuture<>();
3144              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3145              checkIncomplete(f);
3146 <            for (int i = 0; i < k; ++i) {
3147 <                fs[i].complete(one);
3148 <                checkCompletedNormally(f, one);
3149 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3146 >            for (int i = 0; i < k; i++) {
3147 >                fs[i].complete(i);
3148 >                checkCompletedNormally(f, 0);
3149 >                int x = (int) CompletableFuture.anyOf(fs).join();
3150 >                assertTrue(0 <= x && x <= i);
3151 >            }
3152 >        }
3153 >    }
3154 >    public void testAnyOf_normal_backwards() throws Exception {
3155 >        for (int k = 0; k < 10; k++) {
3156 >            CompletableFuture[] fs = new CompletableFuture[k];
3157 >            for (int i = 0; i < k; i++)
3158 >                fs[i] = new CompletableFuture<>();
3159 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3160 >            checkIncomplete(f);
3161 >            for (int i = k - 1; i >= 0; i--) {
3162 >                fs[i].complete(i);
3163 >                checkCompletedNormally(f, k - 1);
3164 >                int x = (int) CompletableFuture.anyOf(fs).join();
3165 >                assertTrue(i <= x && x <= k - 1);
3166              }
3167          }
3168      }
# Line 2858 | Line 3171 | public class CompletableFutureTest exten
3171       * anyOf result completes exceptionally when any component does.
3172       */
3173      public void testAnyOf_exceptional() throws Exception {
3174 <        for (int k = 0; k < 10; ++k) {
3174 >        for (int k = 0; k < 10; k++) {
3175 >            CompletableFuture[] fs = new CompletableFuture[k];
3176 >            CFException[] exs = new CFException[k];
3177 >            for (int i = 0; i < k; i++) {
3178 >                fs[i] = new CompletableFuture<>();
3179 >                exs[i] = new CFException();
3180 >            }
3181 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3182 >            checkIncomplete(f);
3183 >            for (int i = 0; i < k; i++) {
3184 >                fs[i].completeExceptionally(exs[i]);
3185 >                checkCompletedWithWrappedException(f, exs[0]);
3186 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3187 >            }
3188 >        }
3189 >    }
3190 >
3191 >    public void testAnyOf_exceptional_backwards() throws Exception {
3192 >        for (int k = 0; k < 10; k++) {
3193              CompletableFuture[] fs = new CompletableFuture[k];
3194 <            for (int i = 0; i < k; ++i)
3194 >            CFException[] exs = new CFException[k];
3195 >            for (int i = 0; i < k; i++) {
3196                  fs[i] = new CompletableFuture<>();
3197 +                exs[i] = new CFException();
3198 +            }
3199              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3200              checkIncomplete(f);
3201 <            for (int i = 0; i < k; ++i) {
3202 <                fs[i].completeExceptionally(new CFException());
3203 <                checkCompletedWithWrappedCFException(f);
3201 >            for (int i = k - 1; i >= 0; i--) {
3202 >                fs[i].completeExceptionally(exs[i]);
3203 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3204                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3205              }
3206          }
# Line 2885 | Line 3219 | public class CompletableFutureTest exten
3219          Runnable[] throwingActions = {
3220              () -> CompletableFuture.supplyAsync(null),
3221              () -> CompletableFuture.supplyAsync(null, exec),
3222 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3222 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3223  
3224              () -> CompletableFuture.runAsync(null),
3225              () -> CompletableFuture.runAsync(null, exec),
# Line 2990 | Line 3324 | public class CompletableFutureTest exten
3324          assertSame(f, f.toCompletableFuture());
3325      }
3326  
3327 +    //--- tests of implementation details; not part of official tck ---
3328 +
3329 +    Object resultOf(CompletableFuture<?> f) {
3330 +        try {
3331 +            java.lang.reflect.Field resultField
3332 +                = CompletableFuture.class.getDeclaredField("result");
3333 +            resultField.setAccessible(true);
3334 +            return resultField.get(f);
3335 +        } catch (Throwable t) { throw new AssertionError(t); }
3336 +    }
3337 +
3338 +    public void testExceptionPropagationReusesResultObject() {
3339 +        if (!testImplementationDetails) return;
3340 +        for (ExecutionMode m : ExecutionMode.values())
3341 +    {
3342 +        final CFException ex = new CFException();
3343 +        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3344 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3345 +
3346 +        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3347 +            = new ArrayList<>();
3348 +
3349 +        funs.add((y) -> m.thenRun(y, new Noop(m)));
3350 +        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3351 +        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3352 +
3353 +        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3354 +        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3355 +        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3356 +
3357 +        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3358 +        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3359 +        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3360 +
3361 +        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3362 +
3363 +        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3364 +
3365 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3366 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3367 +
3368 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3369 +                 fun : funs) {
3370 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3371 +            f.completeExceptionally(ex);
3372 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3373 +            checkCompletedWithWrappedException(src, ex);
3374 +            CompletableFuture<?> dep = fun.apply(src);
3375 +            checkCompletedWithWrappedException(dep, ex);
3376 +            assertSame(resultOf(src), resultOf(dep));
3377 +        }
3378 +
3379 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3380 +                 fun : funs) {
3381 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3382 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3383 +            CompletableFuture<?> dep = fun.apply(src);
3384 +            f.completeExceptionally(ex);
3385 +            checkCompletedWithWrappedException(src, ex);
3386 +            checkCompletedWithWrappedException(dep, ex);
3387 +            assertSame(resultOf(src), resultOf(dep));
3388 +        }
3389 +
3390 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3391 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3392 +                 fun : funs) {
3393 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3394 +            f.cancel(mayInterruptIfRunning);
3395 +            checkCancelled(f);
3396 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3397 +            checkCompletedWithWrappedCancellationException(src);
3398 +            CompletableFuture<?> dep = fun.apply(src);
3399 +            checkCompletedWithWrappedCancellationException(dep);
3400 +            assertSame(resultOf(src), resultOf(dep));
3401 +        }
3402 +
3403 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3404 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3405 +                 fun : funs) {
3406 +            CompletableFuture<Integer> f = new CompletableFuture<>();
3407 +            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3408 +            CompletableFuture<?> dep = fun.apply(src);
3409 +            f.cancel(mayInterruptIfRunning);
3410 +            checkCancelled(f);
3411 +            checkCompletedWithWrappedCancellationException(src);
3412 +            checkCompletedWithWrappedCancellationException(dep);
3413 +            assertSame(resultOf(src), resultOf(dep));
3414 +        }
3415 +    }}
3416 +
3417   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines