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.30 by jsr166, Mon Jul 22 18:25:42 2013 UTC vs.
Revision 1.152 by jsr166, Sun Jun 26 19:03:27 2016 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 > import static java.util.concurrent.CompletableFuture.completedFuture;
11 > import static java.util.concurrent.CompletableFuture.failedFuture;
12 >
13 > import java.lang.reflect.Method;
14 > import java.lang.reflect.Modifier;
15 >
16 > import java.util.stream.Collectors;
17 > import java.util.stream.Stream;
18 >
19 > import java.util.ArrayList;
20 > import java.util.Arrays;
21 > import java.util.List;
22 > import java.util.Objects;
23 > import java.util.Set;
24   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
25   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
26   import java.util.concurrent.CompletableFuture;
27   import java.util.concurrent.CompletionException;
28 + import java.util.concurrent.CompletionStage;
29 + import java.util.concurrent.ExecutionException;
30 + import java.util.concurrent.Executor;
31 + import java.util.concurrent.ForkJoinPool;
32 + import java.util.concurrent.ForkJoinTask;
33 + import java.util.concurrent.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
35 + import java.util.concurrent.TimeUnit;
36   import java.util.concurrent.atomic.AtomicInteger;
37 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
22 < import static java.util.concurrent.TimeUnit.SECONDS;
23 < import java.util.*;
24 < import java.util.function.Supplier;
25 < import java.util.function.Consumer;
37 > import java.util.concurrent.atomic.AtomicReference;
38   import java.util.function.BiConsumer;
27 import java.util.function.Function;
39   import java.util.function.BiFunction;
40 + import java.util.function.Consumer;
41 + import java.util.function.Function;
42 + import java.util.function.Predicate;
43 + import java.util.function.Supplier;
44 +
45 + import junit.framework.AssertionFailedError;
46 + import junit.framework.Test;
47 + import junit.framework.TestSuite;
48  
49   public class CompletableFutureTest extends JSR166TestCase {
50  
51      public static void main(String[] args) {
52 <        junit.textui.TestRunner.run(suite());
52 >        main(suite(), args);
53      }
54      public static Test suite() {
55          return new TestSuite(CompletableFutureTest.class);
# Line 41 | Line 60 | public class CompletableFutureTest exten
60      void checkIncomplete(CompletableFuture<?> f) {
61          assertFalse(f.isDone());
62          assertFalse(f.isCancelled());
63 <        assertTrue(f.toString().contains("[Not completed]"));
63 >        assertTrue(f.toString().contains("Not completed"));
64          try {
65              assertNull(f.getNow(null));
66          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 54 | Line 73 | public class CompletableFutureTest exten
73      }
74  
75      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
76 <        try {
77 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
59 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
76 >        checkTimedGet(f, value);
77 >
78          try {
79              assertEquals(value, f.join());
80          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 72 | Line 90 | public class CompletableFutureTest exten
90          assertTrue(f.toString().contains("[Completed normally]"));
91      }
92  
93 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
93 >    /**
94 >     * Returns the "raw" internal exceptional completion of f,
95 >     * without any additional wrapping with CompletionException.
96 >     */
97 >    <U> Throwable exceptionalCompletion(CompletableFuture<U> f) {
98 >        // handle (and whenComplete) can distinguish between "direct"
99 >        // and "wrapped" exceptional completion
100 >        return f.handle((U u, Throwable t) -> t).join();
101 >    }
102 >
103 >    void checkCompletedExceptionally(CompletableFuture<?> f,
104 >                                     boolean wrapped,
105 >                                     Consumer<Throwable> checker) {
106 >        Throwable cause = exceptionalCompletion(f);
107 >        if (wrapped) {
108 >            assertTrue(cause instanceof CompletionException);
109 >            cause = cause.getCause();
110 >        }
111 >        checker.accept(cause);
112 >
113 >        long startTime = System.nanoTime();
114          try {
115              f.get(LONG_DELAY_MS, MILLISECONDS);
116              shouldThrow();
117          } catch (ExecutionException success) {
118 <            assertTrue(success.getCause() instanceof CFException);
118 >            assertSame(cause, success.getCause());
119          } catch (Throwable fail) { threadUnexpectedException(fail); }
120 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
121 +
122          try {
123              f.join();
124              shouldThrow();
125          } catch (CompletionException success) {
126 <            assertTrue(success.getCause() instanceof CFException);
127 <        }
126 >            assertSame(cause, success.getCause());
127 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
128 >
129          try {
130              f.getNow(null);
131              shouldThrow();
132          } catch (CompletionException success) {
133 <            assertTrue(success.getCause() instanceof CFException);
134 <        }
133 >            assertSame(cause, success.getCause());
134 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
135 >
136          try {
137              f.get();
138              shouldThrow();
139          } catch (ExecutionException success) {
140 <            assertTrue(success.getCause() instanceof CFException);
140 >            assertSame(cause, success.getCause());
141          } catch (Throwable fail) { threadUnexpectedException(fail); }
142 <        assertTrue(f.isDone());
142 >
143          assertFalse(f.isCancelled());
144 +        assertTrue(f.isDone());
145 +        assertTrue(f.isCompletedExceptionally());
146          assertTrue(f.toString().contains("[Completed exceptionally]"));
147      }
148  
149 +    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
150 +        checkCompletedExceptionally(f, true,
151 +            (t) -> assertTrue(t instanceof CFException));
152 +    }
153 +
154 +    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
155 +        checkCompletedExceptionally(f, true,
156 +            (t) -> assertTrue(t instanceof CancellationException));
157 +    }
158 +
159 +    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
160 +        checkCompletedExceptionally(f, false,
161 +            (t) -> assertTrue(t instanceof TimeoutException));
162 +    }
163 +
164 +    void checkCompletedWithWrappedException(CompletableFuture<?> f,
165 +                                            Throwable ex) {
166 +        checkCompletedExceptionally(f, true, (t) -> assertSame(t, ex));
167 +    }
168 +
169 +    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
170 +        checkCompletedExceptionally(f, false, (t) -> assertSame(t, ex));
171 +    }
172 +
173      void checkCancelled(CompletableFuture<?> f) {
174 +        long startTime = System.nanoTime();
175          try {
176              f.get(LONG_DELAY_MS, MILLISECONDS);
177              shouldThrow();
178          } catch (CancellationException success) {
179          } catch (Throwable fail) { threadUnexpectedException(fail); }
180 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
181 +
182          try {
183              f.join();
184              shouldThrow();
# Line 121 | Line 192 | public class CompletableFutureTest exten
192              shouldThrow();
193          } catch (CancellationException success) {
194          } catch (Throwable fail) { threadUnexpectedException(fail); }
124        assertTrue(f.isDone());
125        assertTrue(f.isCompletedExceptionally());
126        assertTrue(f.isCancelled());
127        assertTrue(f.toString().contains("[Completed exceptionally]"));
128    }
195  
196 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
197 <        try {
132 <            f.get(LONG_DELAY_MS, MILLISECONDS);
133 <            shouldThrow();
134 <        } catch (ExecutionException success) {
135 <            assertTrue(success.getCause() instanceof CancellationException);
136 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
137 <        try {
138 <            f.join();
139 <            shouldThrow();
140 <        } catch (CompletionException success) {
141 <            assertTrue(success.getCause() instanceof CancellationException);
142 <        }
143 <        try {
144 <            f.getNow(null);
145 <            shouldThrow();
146 <        } catch (CompletionException success) {
147 <            assertTrue(success.getCause() instanceof CancellationException);
148 <        }
149 <        try {
150 <            f.get();
151 <            shouldThrow();
152 <        } catch (ExecutionException success) {
153 <            assertTrue(success.getCause() instanceof CancellationException);
154 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
196 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
197 >
198          assertTrue(f.isDone());
156        assertFalse(f.isCancelled());
199          assertTrue(f.isCompletedExceptionally());
200 +        assertTrue(f.isCancelled());
201          assertTrue(f.toString().contains("[Completed exceptionally]"));
202      }
203  
# Line 172 | Line 215 | public class CompletableFutureTest exten
215       * isCancelled, join, get, and getNow
216       */
217      public void testComplete() {
218 +        for (Integer v1 : new Integer[] { 1, null })
219 +    {
220          CompletableFuture<Integer> f = new CompletableFuture<>();
221          checkIncomplete(f);
222 <        f.complete(one);
223 <        checkCompletedNormally(f, one);
224 <    }
222 >        assertTrue(f.complete(v1));
223 >        assertFalse(f.complete(v1));
224 >        checkCompletedNormally(f, v1);
225 >    }}
226  
227      /**
228       * completeExceptionally completes exceptionally, as indicated by
# Line 184 | Line 230 | public class CompletableFutureTest exten
230       */
231      public void testCompleteExceptionally() {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233 +        CFException ex = new CFException();
234          checkIncomplete(f);
235 <        f.completeExceptionally(new CFException());
236 <        checkCompletedWithWrappedCFException(f);
235 >        f.completeExceptionally(ex);
236 >        checkCompletedExceptionally(f, ex);
237      }
238  
239      /**
# Line 194 | Line 241 | public class CompletableFutureTest exten
241       * methods isDone, isCancelled, join, get, and getNow
242       */
243      public void testCancel() {
244 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
245 +    {
246          CompletableFuture<Integer> f = new CompletableFuture<>();
247          checkIncomplete(f);
248 <        assertTrue(f.cancel(true));
248 >        assertTrue(f.cancel(mayInterruptIfRunning));
249 >        assertTrue(f.cancel(mayInterruptIfRunning));
250 >        assertTrue(f.cancel(!mayInterruptIfRunning));
251          checkCancelled(f);
252 <    }
252 >    }}
253  
254      /**
255       * obtrudeValue forces completion with given value
# Line 206 | Line 257 | public class CompletableFutureTest exten
257      public void testObtrudeValue() {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260 <        f.complete(one);
260 >        assertTrue(f.complete(one));
261          checkCompletedNormally(f, one);
262          f.obtrudeValue(three);
263          checkCompletedNormally(f, three);
# Line 215 | Line 266 | public class CompletableFutureTest exten
266          f = new CompletableFuture<>();
267          f.obtrudeValue(three);
268          checkCompletedNormally(f, three);
269 +        f.obtrudeValue(null);
270 +        checkCompletedNormally(f, null);
271          f = new CompletableFuture<>();
272          f.completeExceptionally(new CFException());
273          f.obtrudeValue(four);
# Line 225 | Line 278 | public class CompletableFutureTest exten
278       * obtrudeException forces completion with given exception
279       */
280      public void testObtrudeException() {
281 <        CompletableFuture<Integer> f = new CompletableFuture<>();
282 <        checkIncomplete(f);
283 <        f.complete(one);
284 <        checkCompletedNormally(f, one);
285 <        f.obtrudeException(new CFException());
233 <        checkCompletedWithWrappedCFException(f);
281 >        for (Integer v1 : new Integer[] { 1, null })
282 >    {
283 >        CFException ex;
284 >        CompletableFuture<Integer> f;
285 >
286          f = new CompletableFuture<>();
287 <        f.obtrudeException(new CFException());
288 <        checkCompletedWithWrappedCFException(f);
287 >        assertTrue(f.complete(v1));
288 >        for (int i = 0; i < 2; i++) {
289 >            f.obtrudeException(ex = new CFException());
290 >            checkCompletedExceptionally(f, ex);
291 >        }
292 >
293          f = new CompletableFuture<>();
294 <        f.completeExceptionally(new CFException());
295 <        f.obtrudeValue(four);
296 <        checkCompletedNormally(f, four);
297 <        f.obtrudeException(new CFException());
298 <        checkCompletedWithWrappedCFException(f);
299 <    }
294 >        for (int i = 0; i < 2; i++) {
295 >            f.obtrudeException(ex = new CFException());
296 >            checkCompletedExceptionally(f, ex);
297 >        }
298 >
299 >        f = new CompletableFuture<>();
300 >        f.completeExceptionally(ex = new CFException());
301 >        f.obtrudeValue(v1);
302 >        checkCompletedNormally(f, v1);
303 >        f.obtrudeException(ex = new CFException());
304 >        checkCompletedExceptionally(f, ex);
305 >        f.completeExceptionally(new CFException());
306 >        checkCompletedExceptionally(f, ex);
307 >        assertFalse(f.complete(v1));
308 >        checkCompletedExceptionally(f, ex);
309 >    }}
310  
311      /**
312       * getNumberOfDependents returns number of dependent tasks
313       */
314      public void testGetNumberOfDependents() {
315 <        CompletableFuture<Integer> f = new CompletableFuture<>();
316 <        assertEquals(f.getNumberOfDependents(), 0);
317 <        CompletableFuture g = f.thenRun(new Noop());
318 <        assertEquals(f.getNumberOfDependents(), 1);
319 <        assertEquals(g.getNumberOfDependents(), 0);
320 <        CompletableFuture h = f.thenRun(new Noop());
321 <        assertEquals(f.getNumberOfDependents(), 2);
322 <        f.complete(1);
315 >        for (ExecutionMode m : ExecutionMode.values())
316 >        for (Integer v1 : new Integer[] { 1, null })
317 >    {
318 >        CompletableFuture<Integer> f = new CompletableFuture<>();
319 >        assertEquals(0, f.getNumberOfDependents());
320 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
321 >        assertEquals(1, f.getNumberOfDependents());
322 >        assertEquals(0, g.getNumberOfDependents());
323 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
324 >        assertEquals(2, f.getNumberOfDependents());
325 >        assertEquals(0, h.getNumberOfDependents());
326 >        assertTrue(f.complete(v1));
327          checkCompletedNormally(g, null);
328 <        assertEquals(f.getNumberOfDependents(), 0);
329 <        assertEquals(g.getNumberOfDependents(), 0);
330 <    }
328 >        checkCompletedNormally(h, null);
329 >        assertEquals(0, f.getNumberOfDependents());
330 >        assertEquals(0, g.getNumberOfDependents());
331 >        assertEquals(0, h.getNumberOfDependents());
332 >    }}
333  
334      /**
335       * toString indicates current completion state
# Line 268 | Line 340 | public class CompletableFutureTest exten
340          f = new CompletableFuture<String>();
341          assertTrue(f.toString().contains("[Not completed]"));
342  
343 <        f.complete("foo");
343 >        assertTrue(f.complete("foo"));
344          assertTrue(f.toString().contains("[Completed normally]"));
345  
346          f = new CompletableFuture<String>();
347 <        f.completeExceptionally(new IndexOutOfBoundsException());
347 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
348          assertTrue(f.toString().contains("[Completed exceptionally]"));
349 +
350 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
351 +            f = new CompletableFuture<String>();
352 +            assertTrue(f.cancel(mayInterruptIfRunning));
353 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
354 +        }
355      }
356  
357      /**
# Line 284 | Line 362 | public class CompletableFutureTest exten
362          checkCompletedNormally(f, "test");
363      }
364  
365 <    // Choose non-commutative actions for better coverage
365 >    abstract class CheckedAction {
366 >        int invocationCount = 0;
367 >        final ExecutionMode m;
368 >        CheckedAction(ExecutionMode m) { this.m = m; }
369 >        void invoked() {
370 >            m.checkExecutionMode();
371 >            assertEquals(0, invocationCount++);
372 >        }
373 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
374 >        void assertInvoked() { assertEquals(1, invocationCount); }
375 >    }
376 >
377 >    abstract class CheckedIntegerAction extends CheckedAction {
378 >        Integer value;
379 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
380 >        void assertValue(Integer expected) {
381 >            assertInvoked();
382 >            assertEquals(expected, value);
383 >        }
384 >    }
385 >
386 >    class IntegerSupplier extends CheckedAction
387 >        implements Supplier<Integer>
388 >    {
389 >        final Integer value;
390 >        IntegerSupplier(ExecutionMode m, Integer value) {
391 >            super(m);
392 >            this.value = value;
393 >        }
394 >        public Integer get() {
395 >            invoked();
396 >            return value;
397 >        }
398 >    }
399 >
400 >    // A function that handles and produces null values as well.
401 >    static Integer inc(Integer x) {
402 >        return (x == null) ? null : x + 1;
403 >    }
404 >
405 >    class NoopConsumer extends CheckedIntegerAction
406 >        implements Consumer<Integer>
407 >    {
408 >        NoopConsumer(ExecutionMode m) { super(m); }
409 >        public void accept(Integer x) {
410 >            invoked();
411 >            value = x;
412 >        }
413 >    }
414 >
415 >    class IncFunction extends CheckedIntegerAction
416 >        implements Function<Integer,Integer>
417 >    {
418 >        IncFunction(ExecutionMode m) { super(m); }
419 >        public Integer apply(Integer x) {
420 >            invoked();
421 >            return value = inc(x);
422 >        }
423 >    }
424  
425 <    static final Supplier<Integer> supplyOne =
426 <        () -> Integer.valueOf(1);
427 <    static final Function<Integer, Integer> inc =
428 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
429 <    static final BiFunction<Integer, Integer, Integer> subtract =
430 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
295 <    static final class IncAction implements Consumer<Integer> {
296 <        int value;
297 <        public void accept(Integer x) { value = x.intValue() + 1; }
425 >    // Choose non-commutative actions for better coverage
426 >    // A non-commutative function that handles and produces null values as well.
427 >    static Integer subtract(Integer x, Integer y) {
428 >        return (x == null && y == null) ? null :
429 >            ((x == null) ? 42 : x.intValue())
430 >            - ((y == null) ? 99 : y.intValue());
431      }
432 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
433 <        int value;
432 >
433 >    class SubtractAction extends CheckedIntegerAction
434 >        implements BiConsumer<Integer, Integer>
435 >    {
436 >        SubtractAction(ExecutionMode m) { super(m); }
437          public void accept(Integer x, Integer y) {
438 <            value = x.intValue() - y.intValue();
438 >            invoked();
439 >            value = subtract(x, y);
440          }
441      }
442 <    static final class Noop implements Runnable {
443 <        boolean ran;
444 <        public void run() { ran = true; }
442 >
443 >    class SubtractFunction extends CheckedIntegerAction
444 >        implements BiFunction<Integer, Integer, Integer>
445 >    {
446 >        SubtractFunction(ExecutionMode m) { super(m); }
447 >        public Integer apply(Integer x, Integer y) {
448 >            invoked();
449 >            return value = subtract(x, y);
450 >        }
451      }
452  
453 <    static final class FailingSupplier implements Supplier<Integer> {
454 <        boolean ran;
455 <        public Integer get() { ran = true; throw new CFException(); }
453 >    class Noop extends CheckedAction implements Runnable {
454 >        Noop(ExecutionMode m) { super(m); }
455 >        public void run() {
456 >            invoked();
457 >        }
458      }
459 <    static final class FailingConsumer implements Consumer<Integer> {
460 <        boolean ran;
461 <        public void accept(Integer x) { ran = true; throw new CFException(); }
459 >
460 >    class FailingSupplier extends CheckedAction
461 >        implements Supplier<Integer>
462 >    {
463 >        final CFException ex;
464 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
465 >        public Integer get() {
466 >            invoked();
467 >            throw ex;
468 >        }
469      }
470 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
471 <        boolean ran;
472 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
470 >
471 >    class FailingConsumer extends CheckedIntegerAction
472 >        implements Consumer<Integer>
473 >    {
474 >        final CFException ex;
475 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
476 >        public void accept(Integer x) {
477 >            invoked();
478 >            value = x;
479 >            throw ex;
480 >        }
481      }
482 <    static final class FailingFunction implements Function<Integer, Integer> {
483 <        boolean ran;
484 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
482 >
483 >    class FailingBiConsumer extends CheckedIntegerAction
484 >        implements BiConsumer<Integer, Integer>
485 >    {
486 >        final CFException ex;
487 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
488 >        public void accept(Integer x, Integer y) {
489 >            invoked();
490 >            value = subtract(x, y);
491 >            throw ex;
492 >        }
493      }
494 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
495 <        boolean ran;
496 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
494 >
495 >    class FailingFunction extends CheckedIntegerAction
496 >        implements Function<Integer, Integer>
497 >    {
498 >        final CFException ex;
499 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
500 >        public Integer apply(Integer x) {
501 >            invoked();
502 >            value = x;
503 >            throw ex;
504 >        }
505      }
506 <    static final class FailingNoop implements Runnable {
507 <        boolean ran;
508 <        public void run() { ran = true; throw new CFException(); }
506 >
507 >    class FailingBiFunction extends CheckedIntegerAction
508 >        implements BiFunction<Integer, Integer, Integer>
509 >    {
510 >        final CFException ex;
511 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
512 >        public Integer apply(Integer x, Integer y) {
513 >            invoked();
514 >            value = subtract(x, y);
515 >            throw ex;
516 >        }
517      }
518  
519 <    static final class CompletableFutureInc
520 <        implements Function<Integer, CompletableFuture<Integer>> {
521 <        boolean ran;
519 >    class FailingRunnable extends CheckedAction implements Runnable {
520 >        final CFException ex;
521 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
522 >        public void run() {
523 >            invoked();
524 >            throw ex;
525 >        }
526 >    }
527 >
528 >    class CompletableFutureInc extends CheckedIntegerAction
529 >        implements Function<Integer, CompletableFuture<Integer>>
530 >    {
531 >        CompletableFutureInc(ExecutionMode m) { super(m); }
532          public CompletableFuture<Integer> apply(Integer x) {
533 <            ran = true;
533 >            invoked();
534 >            value = x;
535              CompletableFuture<Integer> f = new CompletableFuture<>();
536 <            f.complete(Integer.valueOf(x.intValue() + 1));
536 >            assertTrue(f.complete(inc(x)));
537              return f;
538          }
539      }
540  
541 <    static final class FailingCompletableFutureFunction
542 <        implements Function<Integer, CompletableFuture<Integer>> {
543 <        boolean ran;
541 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
542 >        implements Function<Integer, CompletableFuture<Integer>>
543 >    {
544 >        final CFException ex;
545 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
546          public CompletableFuture<Integer> apply(Integer x) {
547 <            ran = true; throw new CFException();
547 >            invoked();
548 >            value = x;
549 >            throw ex;
550          }
551      }
552  
553      // Used for explicit executor tests
554      static final class ThreadExecutor implements Executor {
555 <        AtomicInteger count = new AtomicInteger(0);
555 >        final AtomicInteger count = new AtomicInteger(0);
556 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
557 >        static boolean startedCurrentThread() {
558 >            return Thread.currentThread().getThreadGroup() == tg;
559 >        }
560  
561          public void execute(Runnable r) {
562              count.getAndIncrement();
563 <            new Thread(r).start();
563 >            new Thread(tg, r).start();
564          }
565      }
566  
567 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
568 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
366 <    }
567 >    static final boolean defaultExecutorIsCommonPool
568 >        = ForkJoinPool.getCommonPoolParallelism() > 1;
569  
570 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
571 <        boolean ran;
572 <        public Integer apply(Integer x, Throwable t) {
573 <            ran = true;
574 <            return (t == null) ? two : three;
575 <        }
576 <    }
570 >    /**
571 >     * Permits the testing of parallel code for the 3 different
572 >     * execution modes without copy/pasting all the test methods.
573 >     */
574 >    enum ExecutionMode {
575 >        SYNC {
576 >            public void checkExecutionMode() {
577 >                assertFalse(ThreadExecutor.startedCurrentThread());
578 >                assertNull(ForkJoinTask.getPool());
579 >            }
580 >            public CompletableFuture<Void> runAsync(Runnable a) {
581 >                throw new UnsupportedOperationException();
582 >            }
583 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
584 >                throw new UnsupportedOperationException();
585 >            }
586 >            public <T> CompletableFuture<Void> thenRun
587 >                (CompletableFuture<T> f, Runnable a) {
588 >                return f.thenRun(a);
589 >            }
590 >            public <T> CompletableFuture<Void> thenAccept
591 >                (CompletableFuture<T> f, Consumer<? super T> a) {
592 >                return f.thenAccept(a);
593 >            }
594 >            public <T,U> CompletableFuture<U> thenApply
595 >                (CompletableFuture<T> f, Function<? super T,U> a) {
596 >                return f.thenApply(a);
597 >            }
598 >            public <T,U> CompletableFuture<U> thenCompose
599 >                (CompletableFuture<T> f,
600 >                 Function<? super T,? extends CompletionStage<U>> a) {
601 >                return f.thenCompose(a);
602 >            }
603 >            public <T,U> CompletableFuture<U> handle
604 >                (CompletableFuture<T> f,
605 >                 BiFunction<? super T,Throwable,? extends U> a) {
606 >                return f.handle(a);
607 >            }
608 >            public <T> CompletableFuture<T> whenComplete
609 >                (CompletableFuture<T> f,
610 >                 BiConsumer<? super T,? super Throwable> a) {
611 >                return f.whenComplete(a);
612 >            }
613 >            public <T,U> CompletableFuture<Void> runAfterBoth
614 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
615 >                return f.runAfterBoth(g, a);
616 >            }
617 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
618 >                (CompletableFuture<T> f,
619 >                 CompletionStage<? extends U> g,
620 >                 BiConsumer<? super T,? super U> a) {
621 >                return f.thenAcceptBoth(g, a);
622 >            }
623 >            public <T,U,V> CompletableFuture<V> thenCombine
624 >                (CompletableFuture<T> f,
625 >                 CompletionStage<? extends U> g,
626 >                 BiFunction<? super T,? super U,? extends V> a) {
627 >                return f.thenCombine(g, a);
628 >            }
629 >            public <T> CompletableFuture<Void> runAfterEither
630 >                (CompletableFuture<T> f,
631 >                 CompletionStage<?> g,
632 >                 java.lang.Runnable a) {
633 >                return f.runAfterEither(g, a);
634 >            }
635 >            public <T> CompletableFuture<Void> acceptEither
636 >                (CompletableFuture<T> f,
637 >                 CompletionStage<? extends T> g,
638 >                 Consumer<? super T> a) {
639 >                return f.acceptEither(g, a);
640 >            }
641 >            public <T,U> CompletableFuture<U> applyToEither
642 >                (CompletableFuture<T> f,
643 >                 CompletionStage<? extends T> g,
644 >                 Function<? super T,U> a) {
645 >                return f.applyToEither(g, a);
646 >            }
647 >        },
648 >
649 >        ASYNC {
650 >            public void checkExecutionMode() {
651 >                assertEquals(defaultExecutorIsCommonPool,
652 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
653 >            }
654 >            public CompletableFuture<Void> runAsync(Runnable a) {
655 >                return CompletableFuture.runAsync(a);
656 >            }
657 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
658 >                return CompletableFuture.supplyAsync(a);
659 >            }
660 >            public <T> CompletableFuture<Void> thenRun
661 >                (CompletableFuture<T> f, Runnable a) {
662 >                return f.thenRunAsync(a);
663 >            }
664 >            public <T> CompletableFuture<Void> thenAccept
665 >                (CompletableFuture<T> f, Consumer<? super T> a) {
666 >                return f.thenAcceptAsync(a);
667 >            }
668 >            public <T,U> CompletableFuture<U> thenApply
669 >                (CompletableFuture<T> f, Function<? super T,U> a) {
670 >                return f.thenApplyAsync(a);
671 >            }
672 >            public <T,U> CompletableFuture<U> thenCompose
673 >                (CompletableFuture<T> f,
674 >                 Function<? super T,? extends CompletionStage<U>> a) {
675 >                return f.thenComposeAsync(a);
676 >            }
677 >            public <T,U> CompletableFuture<U> handle
678 >                (CompletableFuture<T> f,
679 >                 BiFunction<? super T,Throwable,? extends U> a) {
680 >                return f.handleAsync(a);
681 >            }
682 >            public <T> CompletableFuture<T> whenComplete
683 >                (CompletableFuture<T> f,
684 >                 BiConsumer<? super T,? super Throwable> a) {
685 >                return f.whenCompleteAsync(a);
686 >            }
687 >            public <T,U> CompletableFuture<Void> runAfterBoth
688 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
689 >                return f.runAfterBothAsync(g, a);
690 >            }
691 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
692 >                (CompletableFuture<T> f,
693 >                 CompletionStage<? extends U> g,
694 >                 BiConsumer<? super T,? super U> a) {
695 >                return f.thenAcceptBothAsync(g, a);
696 >            }
697 >            public <T,U,V> CompletableFuture<V> thenCombine
698 >                (CompletableFuture<T> f,
699 >                 CompletionStage<? extends U> g,
700 >                 BiFunction<? super T,? super U,? extends V> a) {
701 >                return f.thenCombineAsync(g, a);
702 >            }
703 >            public <T> CompletableFuture<Void> runAfterEither
704 >                (CompletableFuture<T> f,
705 >                 CompletionStage<?> g,
706 >                 java.lang.Runnable a) {
707 >                return f.runAfterEitherAsync(g, a);
708 >            }
709 >            public <T> CompletableFuture<Void> acceptEither
710 >                (CompletableFuture<T> f,
711 >                 CompletionStage<? extends T> g,
712 >                 Consumer<? super T> a) {
713 >                return f.acceptEitherAsync(g, a);
714 >            }
715 >            public <T,U> CompletableFuture<U> applyToEither
716 >                (CompletableFuture<T> f,
717 >                 CompletionStage<? extends T> g,
718 >                 Function<? super T,U> a) {
719 >                return f.applyToEitherAsync(g, a);
720 >            }
721 >        },
722 >
723 >        EXECUTOR {
724 >            public void checkExecutionMode() {
725 >                assertTrue(ThreadExecutor.startedCurrentThread());
726 >            }
727 >            public CompletableFuture<Void> runAsync(Runnable a) {
728 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
729 >            }
730 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
731 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
732 >            }
733 >            public <T> CompletableFuture<Void> thenRun
734 >                (CompletableFuture<T> f, Runnable a) {
735 >                return f.thenRunAsync(a, new ThreadExecutor());
736 >            }
737 >            public <T> CompletableFuture<Void> thenAccept
738 >                (CompletableFuture<T> f, Consumer<? super T> a) {
739 >                return f.thenAcceptAsync(a, new ThreadExecutor());
740 >            }
741 >            public <T,U> CompletableFuture<U> thenApply
742 >                (CompletableFuture<T> f, Function<? super T,U> a) {
743 >                return f.thenApplyAsync(a, new ThreadExecutor());
744 >            }
745 >            public <T,U> CompletableFuture<U> thenCompose
746 >                (CompletableFuture<T> f,
747 >                 Function<? super T,? extends CompletionStage<U>> a) {
748 >                return f.thenComposeAsync(a, new ThreadExecutor());
749 >            }
750 >            public <T,U> CompletableFuture<U> handle
751 >                (CompletableFuture<T> f,
752 >                 BiFunction<? super T,Throwable,? extends U> a) {
753 >                return f.handleAsync(a, new ThreadExecutor());
754 >            }
755 >            public <T> CompletableFuture<T> whenComplete
756 >                (CompletableFuture<T> f,
757 >                 BiConsumer<? super T,? super Throwable> a) {
758 >                return f.whenCompleteAsync(a, new ThreadExecutor());
759 >            }
760 >            public <T,U> CompletableFuture<Void> runAfterBoth
761 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
762 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
763 >            }
764 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
765 >                (CompletableFuture<T> f,
766 >                 CompletionStage<? extends U> g,
767 >                 BiConsumer<? super T,? super U> a) {
768 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
769 >            }
770 >            public <T,U,V> CompletableFuture<V> thenCombine
771 >                (CompletableFuture<T> f,
772 >                 CompletionStage<? extends U> g,
773 >                 BiFunction<? super T,? super U,? extends V> a) {
774 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
775 >            }
776 >            public <T> CompletableFuture<Void> runAfterEither
777 >                (CompletableFuture<T> f,
778 >                 CompletionStage<?> g,
779 >                 java.lang.Runnable a) {
780 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
781 >            }
782 >            public <T> CompletableFuture<Void> acceptEither
783 >                (CompletableFuture<T> f,
784 >                 CompletionStage<? extends T> g,
785 >                 Consumer<? super T> a) {
786 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
787 >            }
788 >            public <T,U> CompletableFuture<U> applyToEither
789 >                (CompletableFuture<T> f,
790 >                 CompletionStage<? extends T> g,
791 >                 Function<? super T,U> a) {
792 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
793 >            }
794 >        };
795 >
796 >        public abstract void checkExecutionMode();
797 >        public abstract CompletableFuture<Void> runAsync(Runnable a);
798 >        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
799 >        public abstract <T> CompletableFuture<Void> thenRun
800 >            (CompletableFuture<T> f, Runnable a);
801 >        public abstract <T> CompletableFuture<Void> thenAccept
802 >            (CompletableFuture<T> f, Consumer<? super T> a);
803 >        public abstract <T,U> CompletableFuture<U> thenApply
804 >            (CompletableFuture<T> f, Function<? super T,U> a);
805 >        public abstract <T,U> CompletableFuture<U> thenCompose
806 >            (CompletableFuture<T> f,
807 >             Function<? super T,? extends CompletionStage<U>> a);
808 >        public abstract <T,U> CompletableFuture<U> handle
809 >            (CompletableFuture<T> f,
810 >             BiFunction<? super T,Throwable,? extends U> a);
811 >        public abstract <T> CompletableFuture<T> whenComplete
812 >            (CompletableFuture<T> f,
813 >             BiConsumer<? super T,? super Throwable> a);
814 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
815 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
816 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
817 >            (CompletableFuture<T> f,
818 >             CompletionStage<? extends U> g,
819 >             BiConsumer<? super T,? super U> a);
820 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
821 >            (CompletableFuture<T> f,
822 >             CompletionStage<? extends U> g,
823 >             BiFunction<? super T,? super U,? extends V> a);
824 >        public abstract <T> CompletableFuture<Void> runAfterEither
825 >            (CompletableFuture<T> f,
826 >             CompletionStage<?> g,
827 >             java.lang.Runnable a);
828 >        public abstract <T> CompletableFuture<Void> acceptEither
829 >            (CompletableFuture<T> f,
830 >             CompletionStage<? extends T> g,
831 >             Consumer<? super T> a);
832 >        public abstract <T,U> CompletableFuture<U> applyToEither
833 >            (CompletableFuture<T> f,
834 >             CompletionStage<? extends T> g,
835 >             Function<? super T,U> a);
836 >    }
837 >
838 >    /**
839 >     * exceptionally action is not invoked when source completes
840 >     * normally, and source result is propagated
841 >     */
842 >    public void testExceptionally_normalCompletion() {
843 >        for (boolean createIncomplete : new boolean[] { true, false })
844 >        for (Integer v1 : new Integer[] { 1, null })
845 >    {
846 >        final AtomicInteger a = new AtomicInteger(0);
847 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
848 >        if (!createIncomplete) assertTrue(f.complete(v1));
849 >        final CompletableFuture<Integer> g = f.exceptionally
850 >            ((Throwable t) -> {
851 >                a.getAndIncrement();
852 >                threadFail("should not be called");
853 >                return null;            // unreached
854 >            });
855 >        if (createIncomplete) assertTrue(f.complete(v1));
856 >
857 >        checkCompletedNormally(g, v1);
858 >        checkCompletedNormally(f, v1);
859 >        assertEquals(0, a.get());
860 >    }}
861  
862      /**
863       * exceptionally action completes with function value on source
864 <     * exception; otherwise with source value
864 >     * exception
865       */
866 <    public void testExceptionally() {
867 <        CompletableFuture<Integer> f = new CompletableFuture<>();
868 <        ExceptionToInteger r = new ExceptionToInteger();
869 <        CompletableFuture<Integer> g = f.exceptionally(r);
870 <        f.completeExceptionally(new CFException());
871 <        checkCompletedNormally(g, three);
866 >    public void testExceptionally_exceptionalCompletion() {
867 >        for (boolean createIncomplete : new boolean[] { true, false })
868 >        for (Integer v1 : new Integer[] { 1, null })
869 >    {
870 >        final AtomicInteger a = new AtomicInteger(0);
871 >        final CFException ex = new CFException();
872 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
873 >        if (!createIncomplete) f.completeExceptionally(ex);
874 >        final CompletableFuture<Integer> g = f.exceptionally
875 >            ((Throwable t) -> {
876 >                ExecutionMode.SYNC.checkExecutionMode();
877 >                threadAssertSame(t, ex);
878 >                a.getAndIncrement();
879 >                return v1;
880 >            });
881 >        if (createIncomplete) f.completeExceptionally(ex);
882 >
883 >        checkCompletedNormally(g, v1);
884 >        assertEquals(1, a.get());
885 >    }}
886 >
887 >    /**
888 >     * If an "exceptionally action" throws an exception, it completes
889 >     * exceptionally with that exception
890 >     */
891 >    public void testExceptionally_exceptionalCompletionActionFailed() {
892 >        for (boolean createIncomplete : new boolean[] { true, false })
893 >    {
894 >        final AtomicInteger a = new AtomicInteger(0);
895 >        final CFException ex1 = new CFException();
896 >        final CFException ex2 = new CFException();
897 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
898 >        if (!createIncomplete) f.completeExceptionally(ex1);
899 >        final CompletableFuture<Integer> g = f.exceptionally
900 >            ((Throwable t) -> {
901 >                ExecutionMode.SYNC.checkExecutionMode();
902 >                threadAssertSame(t, ex1);
903 >                a.getAndIncrement();
904 >                throw ex2;
905 >            });
906 >        if (createIncomplete) f.completeExceptionally(ex1);
907 >
908 >        checkCompletedWithWrappedException(g, ex2);
909 >        checkCompletedExceptionally(f, ex1);
910 >        assertEquals(1, a.get());
911 >    }}
912  
913 <        f = new CompletableFuture<>();
914 <        r = new ExceptionToInteger();
915 <        g = f.exceptionally(r);
916 <        f.complete(one);
917 <        checkCompletedNormally(g, one);
918 <    }
913 >    /**
914 >     * whenComplete action executes on normal completion, propagating
915 >     * source result.
916 >     */
917 >    public void testWhenComplete_normalCompletion() {
918 >        for (ExecutionMode m : ExecutionMode.values())
919 >        for (boolean createIncomplete : new boolean[] { true, false })
920 >        for (Integer v1 : new Integer[] { 1, null })
921 >    {
922 >        final AtomicInteger a = new AtomicInteger(0);
923 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
924 >        if (!createIncomplete) assertTrue(f.complete(v1));
925 >        final CompletableFuture<Integer> g = m.whenComplete
926 >            (f,
927 >             (Integer result, Throwable t) -> {
928 >                m.checkExecutionMode();
929 >                threadAssertSame(result, v1);
930 >                threadAssertNull(t);
931 >                a.getAndIncrement();
932 >            });
933 >        if (createIncomplete) assertTrue(f.complete(v1));
934 >
935 >        checkCompletedNormally(g, v1);
936 >        checkCompletedNormally(f, v1);
937 >        assertEquals(1, a.get());
938 >    }}
939  
940      /**
941 <     * handle action completes normally with function value on either
942 <     * normal or exceptional completion of source
941 >     * whenComplete action executes on exceptional completion, propagating
942 >     * source result.
943       */
944 <    public void testHandle() {
945 <        CompletableFuture<Integer> f, g;
946 <        IntegerHandler r;
944 >    public void testWhenComplete_exceptionalCompletion() {
945 >        for (ExecutionMode m : ExecutionMode.values())
946 >        for (boolean createIncomplete : new boolean[] { true, false })
947 >    {
948 >        final AtomicInteger a = new AtomicInteger(0);
949 >        final CFException ex = new CFException();
950 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
951 >        if (!createIncomplete) f.completeExceptionally(ex);
952 >        final CompletableFuture<Integer> g = m.whenComplete
953 >            (f,
954 >             (Integer result, Throwable t) -> {
955 >                m.checkExecutionMode();
956 >                threadAssertNull(result);
957 >                threadAssertSame(t, ex);
958 >                a.getAndIncrement();
959 >            });
960 >        if (createIncomplete) f.completeExceptionally(ex);
961 >
962 >        checkCompletedWithWrappedException(g, ex);
963 >        checkCompletedExceptionally(f, ex);
964 >        assertEquals(1, a.get());
965 >    }}
966 >
967 >    /**
968 >     * whenComplete action executes on cancelled source, propagating
969 >     * CancellationException.
970 >     */
971 >    public void testWhenComplete_sourceCancelled() {
972 >        for (ExecutionMode m : ExecutionMode.values())
973 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
974 >        for (boolean createIncomplete : new boolean[] { true, false })
975 >    {
976 >        final AtomicInteger a = new AtomicInteger(0);
977 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
978 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
979 >        final CompletableFuture<Integer> g = m.whenComplete
980 >            (f,
981 >             (Integer result, Throwable t) -> {
982 >                m.checkExecutionMode();
983 >                threadAssertNull(result);
984 >                threadAssertTrue(t instanceof CancellationException);
985 >                a.getAndIncrement();
986 >            });
987 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
988  
989 <        f = new CompletableFuture<>();
990 <        f.completeExceptionally(new CFException());
991 <        g = f.handle(r = new IntegerHandler());
992 <        assertTrue(r.ran);
406 <        checkCompletedNormally(g, three);
989 >        checkCompletedWithWrappedCancellationException(g);
990 >        checkCancelled(f);
991 >        assertEquals(1, a.get());
992 >    }}
993  
994 <        f = new CompletableFuture<>();
995 <        g = f.handle(r = new IntegerHandler());
996 <        assertFalse(r.ran);
997 <        f.completeExceptionally(new CFException());
998 <        checkCompletedNormally(g, three);
999 <        assertTrue(r.ran);
994 >    /**
995 >     * If a whenComplete action throws an exception when triggered by
996 >     * a normal completion, it completes exceptionally
997 >     */
998 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
999 >        for (boolean createIncomplete : new boolean[] { true, false })
1000 >        for (ExecutionMode m : ExecutionMode.values())
1001 >        for (Integer v1 : new Integer[] { 1, null })
1002 >    {
1003 >        final AtomicInteger a = new AtomicInteger(0);
1004 >        final CFException ex = new CFException();
1005 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1006 >        if (!createIncomplete) assertTrue(f.complete(v1));
1007 >        final CompletableFuture<Integer> g = m.whenComplete
1008 >            (f,
1009 >             (Integer result, Throwable t) -> {
1010 >                m.checkExecutionMode();
1011 >                threadAssertSame(result, v1);
1012 >                threadAssertNull(t);
1013 >                a.getAndIncrement();
1014 >                throw ex;
1015 >            });
1016 >        if (createIncomplete) assertTrue(f.complete(v1));
1017 >
1018 >        checkCompletedWithWrappedException(g, ex);
1019 >        checkCompletedNormally(f, v1);
1020 >        assertEquals(1, a.get());
1021 >    }}
1022  
1023 <        f = new CompletableFuture<>();
1024 <        f.complete(one);
1025 <        g = f.handle(r = new IntegerHandler());
1026 <        assertTrue(r.ran);
1027 <        checkCompletedNormally(g, two);
1023 >    /**
1024 >     * If a whenComplete action throws an exception when triggered by
1025 >     * a source completion that also throws an exception, the source
1026 >     * exception takes precedence (unlike handle)
1027 >     */
1028 >    public void testWhenComplete_sourceFailedActionFailed() {
1029 >        for (boolean createIncomplete : new boolean[] { true, false })
1030 >        for (ExecutionMode m : ExecutionMode.values())
1031 >    {
1032 >        final AtomicInteger a = new AtomicInteger(0);
1033 >        final CFException ex1 = new CFException();
1034 >        final CFException ex2 = new CFException();
1035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 >
1037 >        if (!createIncomplete) f.completeExceptionally(ex1);
1038 >        final CompletableFuture<Integer> g = m.whenComplete
1039 >            (f,
1040 >             (Integer result, Throwable t) -> {
1041 >                m.checkExecutionMode();
1042 >                threadAssertSame(t, ex1);
1043 >                threadAssertNull(result);
1044 >                a.getAndIncrement();
1045 >                throw ex2;
1046 >            });
1047 >        if (createIncomplete) f.completeExceptionally(ex1);
1048 >
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051 >        if (testImplementationDetails) {
1052 >            assertEquals(1, ex1.getSuppressed().length);
1053 >            assertSame(ex2, ex1.getSuppressed()[0]);
1054 >        }
1055 >        assertEquals(1, a.get());
1056 >    }}
1057  
1058 <        f = new CompletableFuture<>();
1059 <        g = f.handle(r = new IntegerHandler());
1060 <        assertFalse(r.ran);
1061 <        f.complete(one);
1062 <        assertTrue(r.ran);
1063 <        checkCompletedNormally(g, two);
1064 <    }
1058 >    /**
1059 >     * handle action completes normally with function value on normal
1060 >     * completion of source
1061 >     */
1062 >    public void testHandle_normalCompletion() {
1063 >        for (ExecutionMode m : ExecutionMode.values())
1064 >        for (boolean createIncomplete : new boolean[] { true, false })
1065 >        for (Integer v1 : new Integer[] { 1, null })
1066 >    {
1067 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1068 >        final AtomicInteger a = new AtomicInteger(0);
1069 >        if (!createIncomplete) assertTrue(f.complete(v1));
1070 >        final CompletableFuture<Integer> g = m.handle
1071 >            (f,
1072 >             (Integer result, Throwable t) -> {
1073 >                m.checkExecutionMode();
1074 >                threadAssertSame(result, v1);
1075 >                threadAssertNull(t);
1076 >                a.getAndIncrement();
1077 >                return inc(v1);
1078 >            });
1079 >        if (createIncomplete) assertTrue(f.complete(v1));
1080 >
1081 >        checkCompletedNormally(g, inc(v1));
1082 >        checkCompletedNormally(f, v1);
1083 >        assertEquals(1, a.get());
1084 >    }}
1085  
1086      /**
1087 <     * runAsync completes after running Runnable
1087 >     * handle action completes normally with function value on
1088 >     * exceptional completion of source
1089       */
1090 <    public void testRunAsync() {
1091 <        Noop r = new Noop();
1092 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1093 <        assertNull(f.join());
1094 <        assertTrue(r.ran);
1095 <        checkCompletedNormally(f, null);
1096 <    }
1090 >    public void testHandle_exceptionalCompletion() {
1091 >        for (ExecutionMode m : ExecutionMode.values())
1092 >        for (boolean createIncomplete : new boolean[] { true, false })
1093 >        for (Integer v1 : new Integer[] { 1, null })
1094 >    {
1095 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1096 >        final AtomicInteger a = new AtomicInteger(0);
1097 >        final CFException ex = new CFException();
1098 >        if (!createIncomplete) f.completeExceptionally(ex);
1099 >        final CompletableFuture<Integer> g = m.handle
1100 >            (f,
1101 >             (Integer result, Throwable t) -> {
1102 >                m.checkExecutionMode();
1103 >                threadAssertNull(result);
1104 >                threadAssertSame(t, ex);
1105 >                a.getAndIncrement();
1106 >                return v1;
1107 >            });
1108 >        if (createIncomplete) f.completeExceptionally(ex);
1109 >
1110 >        checkCompletedNormally(g, v1);
1111 >        checkCompletedExceptionally(f, ex);
1112 >        assertEquals(1, a.get());
1113 >    }}
1114 >
1115 >    /**
1116 >     * handle action completes normally with function value on
1117 >     * cancelled source
1118 >     */
1119 >    public void testHandle_sourceCancelled() {
1120 >        for (ExecutionMode m : ExecutionMode.values())
1121 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1122 >        for (boolean createIncomplete : new boolean[] { true, false })
1123 >        for (Integer v1 : new Integer[] { 1, null })
1124 >    {
1125 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1126 >        final AtomicInteger a = new AtomicInteger(0);
1127 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1128 >        final CompletableFuture<Integer> g = m.handle
1129 >            (f,
1130 >             (Integer result, Throwable t) -> {
1131 >                m.checkExecutionMode();
1132 >                threadAssertNull(result);
1133 >                threadAssertTrue(t instanceof CancellationException);
1134 >                a.getAndIncrement();
1135 >                return v1;
1136 >            });
1137 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1138 >
1139 >        checkCompletedNormally(g, v1);
1140 >        checkCancelled(f);
1141 >        assertEquals(1, a.get());
1142 >    }}
1143  
1144      /**
1145 <     * runAsync with executor completes after running Runnable
1145 >     * If a "handle action" throws an exception when triggered by
1146 >     * a normal completion, it completes exceptionally
1147       */
1148 <    public void testRunAsync2() {
1149 <        Noop r = new Noop();
1150 <        ThreadExecutor exec = new ThreadExecutor();
1151 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1148 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1149 >        for (ExecutionMode m : ExecutionMode.values())
1150 >        for (boolean createIncomplete : new boolean[] { true, false })
1151 >        for (Integer v1 : new Integer[] { 1, null })
1152 >    {
1153 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1154 >        final AtomicInteger a = new AtomicInteger(0);
1155 >        final CFException ex = new CFException();
1156 >        if (!createIncomplete) assertTrue(f.complete(v1));
1157 >        final CompletableFuture<Integer> g = m.handle
1158 >            (f,
1159 >             (Integer result, Throwable t) -> {
1160 >                m.checkExecutionMode();
1161 >                threadAssertSame(result, v1);
1162 >                threadAssertNull(t);
1163 >                a.getAndIncrement();
1164 >                throw ex;
1165 >            });
1166 >        if (createIncomplete) assertTrue(f.complete(v1));
1167 >
1168 >        checkCompletedWithWrappedException(g, ex);
1169 >        checkCompletedNormally(f, v1);
1170 >        assertEquals(1, a.get());
1171 >    }}
1172 >
1173 >    /**
1174 >     * If a "handle action" throws an exception when triggered by
1175 >     * a source completion that also throws an exception, the action
1176 >     * exception takes precedence (unlike whenComplete)
1177 >     */
1178 >    public void testHandle_sourceFailedActionFailed() {
1179 >        for (boolean createIncomplete : new boolean[] { true, false })
1180 >        for (ExecutionMode m : ExecutionMode.values())
1181 >    {
1182 >        final AtomicInteger a = new AtomicInteger(0);
1183 >        final CFException ex1 = new CFException();
1184 >        final CFException ex2 = new CFException();
1185 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1186 >
1187 >        if (!createIncomplete) f.completeExceptionally(ex1);
1188 >        final CompletableFuture<Integer> g = m.handle
1189 >            (f,
1190 >             (Integer result, Throwable t) -> {
1191 >                m.checkExecutionMode();
1192 >                threadAssertNull(result);
1193 >                threadAssertSame(ex1, t);
1194 >                a.getAndIncrement();
1195 >                throw ex2;
1196 >            });
1197 >        if (createIncomplete) f.completeExceptionally(ex1);
1198 >
1199 >        checkCompletedWithWrappedException(g, ex2);
1200 >        checkCompletedExceptionally(f, ex1);
1201 >        assertEquals(1, a.get());
1202 >    }}
1203 >
1204 >    /**
1205 >     * runAsync completes after running Runnable
1206 >     */
1207 >    public void testRunAsync_normalCompletion() {
1208 >        ExecutionMode[] executionModes = {
1209 >            ExecutionMode.ASYNC,
1210 >            ExecutionMode.EXECUTOR,
1211 >        };
1212 >        for (ExecutionMode m : executionModes)
1213 >    {
1214 >        final Noop r = new Noop(m);
1215 >        final CompletableFuture<Void> f = m.runAsync(r);
1216          assertNull(f.join());
448        assertTrue(r.ran);
1217          checkCompletedNormally(f, null);
1218 <        assertEquals(1, exec.count.get());
1219 <    }
1218 >        r.assertInvoked();
1219 >    }}
1220  
1221      /**
1222       * failing runAsync completes exceptionally after running Runnable
1223       */
1224 <    public void testRunAsync3() {
1225 <        FailingNoop r = new FailingNoop();
1226 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1227 <        checkCompletedWithWrappedCFException(f);
1228 <        assertTrue(r.ran);
1229 <    }
1224 >    public void testRunAsync_exceptionalCompletion() {
1225 >        ExecutionMode[] executionModes = {
1226 >            ExecutionMode.ASYNC,
1227 >            ExecutionMode.EXECUTOR,
1228 >        };
1229 >        for (ExecutionMode m : executionModes)
1230 >    {
1231 >        final FailingRunnable r = new FailingRunnable(m);
1232 >        final CompletableFuture<Void> f = m.runAsync(r);
1233 >        checkCompletedWithWrappedException(f, r.ex);
1234 >        r.assertInvoked();
1235 >    }}
1236  
1237      /**
1238       * supplyAsync completes with result of supplier
1239       */
1240 <    public void testSupplyAsync() {
1241 <        CompletableFuture<Integer> f;
1242 <        f = CompletableFuture.supplyAsync(supplyOne);
1243 <        assertEquals(f.join(), one);
1244 <        checkCompletedNormally(f, one);
1245 <    }
1246 <
1247 <    /**
1248 <     * supplyAsync with executor completes with result of supplier
1249 <     */
1250 <    public void testSupplyAsync2() {
1251 <        CompletableFuture<Integer> f;
1252 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1253 <        assertEquals(f.join(), one);
480 <        checkCompletedNormally(f, one);
481 <    }
1240 >    public void testSupplyAsync_normalCompletion() {
1241 >        ExecutionMode[] executionModes = {
1242 >            ExecutionMode.ASYNC,
1243 >            ExecutionMode.EXECUTOR,
1244 >        };
1245 >        for (ExecutionMode m : executionModes)
1246 >        for (Integer v1 : new Integer[] { 1, null })
1247 >    {
1248 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1249 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1250 >        assertSame(v1, f.join());
1251 >        checkCompletedNormally(f, v1);
1252 >        r.assertInvoked();
1253 >    }}
1254  
1255      /**
1256       * Failing supplyAsync completes exceptionally
1257       */
1258 <    public void testSupplyAsync3() {
1259 <        FailingSupplier r = new FailingSupplier();
1260 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1261 <        checkCompletedWithWrappedCFException(f);
1262 <        assertTrue(r.ran);
1263 <    }
1258 >    public void testSupplyAsync_exceptionalCompletion() {
1259 >        ExecutionMode[] executionModes = {
1260 >            ExecutionMode.ASYNC,
1261 >            ExecutionMode.EXECUTOR,
1262 >        };
1263 >        for (ExecutionMode m : executionModes)
1264 >    {
1265 >        FailingSupplier r = new FailingSupplier(m);
1266 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1267 >        checkCompletedWithWrappedException(f, r.ex);
1268 >        r.assertInvoked();
1269 >    }}
1270  
1271      // seq completion methods
1272  
1273      /**
1274       * thenRun result completes normally after normal completion of source
1275       */
1276 <    public void testThenRun() {
1277 <        CompletableFuture<Integer> f;
1278 <        CompletableFuture<Void> g;
1279 <        Noop r;
1280 <
1281 <        f = new CompletableFuture<>();
1282 <        g = f.thenRun(r = new Noop());
1283 <        f.complete(null);
1284 <        checkCompletedNormally(g, null);
1285 <        assertTrue(r.ran);
1286 <
1287 <        f = new CompletableFuture<>();
1288 <        f.complete(null);
1289 <        g = f.thenRun(r = new Noop());
1290 <        checkCompletedNormally(g, null);
1291 <        assertTrue(r.ran);
1292 <    }
1276 >    public void testThenRun_normalCompletion() {
1277 >        for (ExecutionMode m : ExecutionMode.values())
1278 >        for (Integer v1 : new Integer[] { 1, null })
1279 >    {
1280 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1281 >        final Noop[] rs = new Noop[6];
1282 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1283 >
1284 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1285 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1286 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1287 >        checkIncomplete(h0);
1288 >        checkIncomplete(h1);
1289 >        checkIncomplete(h2);
1290 >        assertTrue(f.complete(v1));
1291 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1292 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1293 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1294 >
1295 >        checkCompletedNormally(h0, null);
1296 >        checkCompletedNormally(h1, null);
1297 >        checkCompletedNormally(h2, null);
1298 >        checkCompletedNormally(h3, null);
1299 >        checkCompletedNormally(h4, null);
1300 >        checkCompletedNormally(h5, null);
1301 >        checkCompletedNormally(f, v1);
1302 >        for (Noop r : rs) r.assertInvoked();
1303 >    }}
1304  
1305      /**
1306       * thenRun result completes exceptionally after exceptional
1307       * completion of source
1308       */
1309 <    public void testThenRun2() {
1310 <        CompletableFuture<Integer> f;
1311 <        CompletableFuture<Void> g;
1312 <        Noop r;
1313 <
1314 <        f = new CompletableFuture<>();
1315 <        g = f.thenRun(r = new Noop());
1316 <        f.completeExceptionally(new CFException());
1317 <        checkCompletedWithWrappedCFException(g);
1318 <        assertFalse(r.ran);
1319 <
1320 <        f = new CompletableFuture<>();
1321 <        f.completeExceptionally(new CFException());
1322 <        g = f.thenRun(r = new Noop());
1323 <        checkCompletedWithWrappedCFException(g);
1324 <        assertFalse(r.ran);
1325 <    }
1309 >    public void testThenRun_exceptionalCompletion() {
1310 >        for (ExecutionMode m : ExecutionMode.values())
1311 >    {
1312 >        final CFException ex = new CFException();
1313 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1314 >        final Noop[] rs = new Noop[6];
1315 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1316 >
1317 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1318 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1319 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1320 >        checkIncomplete(h0);
1321 >        checkIncomplete(h1);
1322 >        checkIncomplete(h2);
1323 >        assertTrue(f.completeExceptionally(ex));
1324 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1325 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1326 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1327 >
1328 >        checkCompletedWithWrappedException(h0, ex);
1329 >        checkCompletedWithWrappedException(h1, ex);
1330 >        checkCompletedWithWrappedException(h2, ex);
1331 >        checkCompletedWithWrappedException(h3, ex);
1332 >        checkCompletedWithWrappedException(h4, ex);
1333 >        checkCompletedWithWrappedException(h5, ex);
1334 >        checkCompletedExceptionally(f, ex);
1335 >        for (Noop r : rs) r.assertNotInvoked();
1336 >    }}
1337  
1338      /**
1339 <     * thenRun result completes exceptionally if action does
1339 >     * thenRun result completes exceptionally if source cancelled
1340       */
1341 <    public void testThenRun3() {
1342 <        CompletableFuture<Integer> f;
1343 <        CompletableFuture<Void> g;
1344 <        FailingNoop r;
1345 <
1346 <        f = new CompletableFuture<>();
1347 <        g = f.thenRun(r = new FailingNoop());
1348 <        f.complete(null);
1349 <        checkCompletedWithWrappedCFException(g);
1350 <
1351 <        f = new CompletableFuture<>();
1352 <        f.complete(null);
1353 <        g = f.thenRun(r = new FailingNoop());
1354 <        checkCompletedWithWrappedCFException(g);
1355 <    }
1341 >    public void testThenRun_sourceCancelled() {
1342 >        for (ExecutionMode m : ExecutionMode.values())
1343 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1344 >    {
1345 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1346 >        final Noop[] rs = new Noop[6];
1347 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1348 >
1349 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1350 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1351 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1352 >        checkIncomplete(h0);
1353 >        checkIncomplete(h1);
1354 >        checkIncomplete(h2);
1355 >        assertTrue(f.cancel(mayInterruptIfRunning));
1356 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1357 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1358 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1359 >
1360 >        checkCompletedWithWrappedCancellationException(h0);
1361 >        checkCompletedWithWrappedCancellationException(h1);
1362 >        checkCompletedWithWrappedCancellationException(h2);
1363 >        checkCompletedWithWrappedCancellationException(h3);
1364 >        checkCompletedWithWrappedCancellationException(h4);
1365 >        checkCompletedWithWrappedCancellationException(h5);
1366 >        checkCancelled(f);
1367 >        for (Noop r : rs) r.assertNotInvoked();
1368 >    }}
1369  
1370      /**
1371 <     * thenRun result completes exceptionally if source cancelled
1371 >     * thenRun result completes exceptionally if action does
1372       */
1373 <    public void testThenRun4() {
1374 <        CompletableFuture<Integer> f;
1375 <        CompletableFuture<Void> g;
1376 <        Noop r;
1377 <
1378 <        f = new CompletableFuture<>();
1379 <        g = f.thenRun(r = new Noop());
1380 <        assertTrue(f.cancel(true));
1381 <        checkCompletedWithWrappedCancellationException(g);
1382 <
1383 <        f = new CompletableFuture<>();
1384 <        assertTrue(f.cancel(true));
1385 <        g = f.thenRun(r = new Noop());
1386 <        checkCompletedWithWrappedCancellationException(g);
1387 <    }
1373 >    public void testThenRun_actionFailed() {
1374 >        for (ExecutionMode m : ExecutionMode.values())
1375 >        for (Integer v1 : new Integer[] { 1, null })
1376 >    {
1377 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1378 >        final FailingRunnable[] rs = new FailingRunnable[6];
1379 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1380 >
1381 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1382 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1383 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1384 >        assertTrue(f.complete(v1));
1385 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1386 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1387 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1388 >
1389 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1390 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1391 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1392 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1393 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1394 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1395 >        checkCompletedNormally(f, v1);
1396 >    }}
1397  
1398      /**
1399       * thenApply result completes normally after normal completion of source
1400       */
1401 <    public void testThenApply() {
1402 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1403 <        CompletableFuture<Integer> g = f.thenApply(inc);
1404 <        f.complete(one);
1405 <        checkCompletedNormally(g, two);
1406 <    }
1401 >    public void testThenApply_normalCompletion() {
1402 >        for (ExecutionMode m : ExecutionMode.values())
1403 >        for (Integer v1 : new Integer[] { 1, null })
1404 >    {
1405 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1406 >        final IncFunction[] rs = new IncFunction[4];
1407 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1408 >
1409 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1410 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1411 >        checkIncomplete(h0);
1412 >        checkIncomplete(h1);
1413 >        assertTrue(f.complete(v1));
1414 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1415 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1416 >
1417 >        checkCompletedNormally(h0, inc(v1));
1418 >        checkCompletedNormally(h1, inc(v1));
1419 >        checkCompletedNormally(h2, inc(v1));
1420 >        checkCompletedNormally(h3, inc(v1));
1421 >        checkCompletedNormally(f, v1);
1422 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1423 >    }}
1424  
1425      /**
1426       * thenApply result completes exceptionally after exceptional
1427       * completion of source
1428       */
1429 <    public void testThenApply2() {
1430 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1431 <        CompletableFuture<Integer> g = f.thenApply(inc);
1432 <        f.completeExceptionally(new CFException());
1433 <        checkCompletedWithWrappedCFException(g);
1434 <    }
1429 >    public void testThenApply_exceptionalCompletion() {
1430 >        for (ExecutionMode m : ExecutionMode.values())
1431 >    {
1432 >        final CFException ex = new CFException();
1433 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1434 >        final IncFunction[] rs = new IncFunction[4];
1435 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1436 >
1437 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1438 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1439 >        assertTrue(f.completeExceptionally(ex));
1440 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1441 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1442 >
1443 >        checkCompletedWithWrappedException(h0, ex);
1444 >        checkCompletedWithWrappedException(h1, ex);
1445 >        checkCompletedWithWrappedException(h2, ex);
1446 >        checkCompletedWithWrappedException(h3, ex);
1447 >        checkCompletedExceptionally(f, ex);
1448 >        for (IncFunction r : rs) r.assertNotInvoked();
1449 >    }}
1450  
1451      /**
1452 <     * thenApply result completes exceptionally if action does
1452 >     * thenApply result completes exceptionally if source cancelled
1453       */
1454 <    public void testThenApply3() {
1455 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1456 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1457 <        f.complete(one);
1458 <        checkCompletedWithWrappedCFException(g);
1459 <    }
1454 >    public void testThenApply_sourceCancelled() {
1455 >        for (ExecutionMode m : ExecutionMode.values())
1456 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1457 >    {
1458 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1459 >        final IncFunction[] rs = new IncFunction[4];
1460 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1461 >
1462 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1463 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1464 >        assertTrue(f.cancel(mayInterruptIfRunning));
1465 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1466 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1467 >
1468 >        checkCompletedWithWrappedCancellationException(h0);
1469 >        checkCompletedWithWrappedCancellationException(h1);
1470 >        checkCompletedWithWrappedCancellationException(h2);
1471 >        checkCompletedWithWrappedCancellationException(h3);
1472 >        checkCancelled(f);
1473 >        for (IncFunction r : rs) r.assertNotInvoked();
1474 >    }}
1475  
1476      /**
1477 <     * thenApply result completes exceptionally if source cancelled
1477 >     * thenApply result completes exceptionally if action does
1478       */
1479 <    public void testThenApply4() {
1480 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1481 <        CompletableFuture<Integer> g = f.thenApply(inc);
1482 <        assertTrue(f.cancel(true));
1483 <        checkCompletedWithWrappedCancellationException(g);
1484 <    }
1479 >    public void testThenApply_actionFailed() {
1480 >        for (ExecutionMode m : ExecutionMode.values())
1481 >        for (Integer v1 : new Integer[] { 1, null })
1482 >    {
1483 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1484 >        final FailingFunction[] rs = new FailingFunction[4];
1485 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1486 >
1487 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1488 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1489 >        assertTrue(f.complete(v1));
1490 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1491 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1492 >
1493 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1494 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1495 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1496 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1497 >        checkCompletedNormally(f, v1);
1498 >    }}
1499  
1500      /**
1501       * thenAccept result completes normally after normal completion of source
1502       */
1503 <    public void testThenAccept() {
1504 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1505 <        IncAction r = new IncAction();
1506 <        CompletableFuture<Void> g = f.thenAccept(r);
1507 <        f.complete(one);
1508 <        checkCompletedNormally(g, null);
1509 <        assertEquals(r.value, 2);
1510 <    }
1503 >    public void testThenAccept_normalCompletion() {
1504 >        for (ExecutionMode m : ExecutionMode.values())
1505 >        for (Integer v1 : new Integer[] { 1, null })
1506 >    {
1507 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1508 >        final NoopConsumer[] rs = new NoopConsumer[4];
1509 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1510 >
1511 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1512 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1513 >        checkIncomplete(h0);
1514 >        checkIncomplete(h1);
1515 >        assertTrue(f.complete(v1));
1516 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1517 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1518 >
1519 >        checkCompletedNormally(h0, null);
1520 >        checkCompletedNormally(h1, null);
1521 >        checkCompletedNormally(h2, null);
1522 >        checkCompletedNormally(h3, null);
1523 >        checkCompletedNormally(f, v1);
1524 >        for (NoopConsumer r : rs) r.assertValue(v1);
1525 >    }}
1526  
1527      /**
1528       * thenAccept result completes exceptionally after exceptional
1529       * completion of source
1530       */
1531 <    public void testThenAccept2() {
1532 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1533 <        IncAction r = new IncAction();
1534 <        CompletableFuture<Void> g = f.thenAccept(r);
1535 <        f.completeExceptionally(new CFException());
1536 <        checkCompletedWithWrappedCFException(g);
1537 <    }
1531 >    public void testThenAccept_exceptionalCompletion() {
1532 >        for (ExecutionMode m : ExecutionMode.values())
1533 >    {
1534 >        final CFException ex = new CFException();
1535 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1536 >        final NoopConsumer[] rs = new NoopConsumer[4];
1537 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1538 >
1539 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1540 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1541 >        assertTrue(f.completeExceptionally(ex));
1542 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1543 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1544 >
1545 >        checkCompletedWithWrappedException(h0, ex);
1546 >        checkCompletedWithWrappedException(h1, ex);
1547 >        checkCompletedWithWrappedException(h2, ex);
1548 >        checkCompletedWithWrappedException(h3, ex);
1549 >        checkCompletedExceptionally(f, ex);
1550 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1551 >    }}
1552  
1553      /**
1554 <     * thenAccept result completes exceptionally if action does
1554 >     * thenAccept result completes exceptionally if source cancelled
1555       */
1556 <    public void testThenAccept3() {
1557 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1558 <        FailingConsumer r = new FailingConsumer();
1559 <        CompletableFuture<Void> g = f.thenAccept(r);
1560 <        f.complete(one);
1561 <        checkCompletedWithWrappedCFException(g);
1562 <        assertTrue(r.ran);
1563 <    }
1556 >    public void testThenAccept_sourceCancelled() {
1557 >        for (ExecutionMode m : ExecutionMode.values())
1558 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1559 >    {
1560 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1561 >        final NoopConsumer[] rs = new NoopConsumer[4];
1562 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1563 >
1564 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1565 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1566 >        assertTrue(f.cancel(mayInterruptIfRunning));
1567 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1568 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1569 >
1570 >        checkCompletedWithWrappedCancellationException(h0);
1571 >        checkCompletedWithWrappedCancellationException(h1);
1572 >        checkCompletedWithWrappedCancellationException(h2);
1573 >        checkCompletedWithWrappedCancellationException(h3);
1574 >        checkCancelled(f);
1575 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1576 >    }}
1577  
1578      /**
1579 <     * thenAccept result completes exceptionally if source cancelled
1579 >     * thenAccept result completes exceptionally if action does
1580       */
1581 <    public void testThenAccept4() {
1582 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1583 <        IncAction r = new IncAction();
1584 <        CompletableFuture<Void> g = f.thenAccept(r);
1585 <        assertTrue(f.cancel(true));
1586 <        checkCompletedWithWrappedCancellationException(g);
1587 <    }
1581 >    public void testThenAccept_actionFailed() {
1582 >        for (ExecutionMode m : ExecutionMode.values())
1583 >        for (Integer v1 : new Integer[] { 1, null })
1584 >    {
1585 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1586 >        final FailingConsumer[] rs = new FailingConsumer[4];
1587 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1588 >
1589 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1590 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1591 >        assertTrue(f.complete(v1));
1592 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1593 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1594 >
1595 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1596 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1597 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1598 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1599 >        checkCompletedNormally(f, v1);
1600 >    }}
1601  
1602      /**
1603       * thenCombine result completes normally after normal completion
1604       * of sources
1605       */
1606 <    public void testThenCombine() {
1607 <        CompletableFuture<Integer> f, g, h;
1608 <
1609 <        f = new CompletableFuture<>();
1610 <        g = new CompletableFuture<>();
1611 <        h = f.thenCombine(g, subtract);
1612 <        f.complete(3);
1613 <        checkIncomplete(h);
1614 <        g.complete(1);
1615 <        checkCompletedNormally(h, 2);
1616 <
1617 <        f = new CompletableFuture<>();
1618 <        g = new CompletableFuture<>();
1619 <        h = f.thenCombine(g, subtract);
1620 <        g.complete(1);
1621 <        checkIncomplete(h);
1622 <        f.complete(3);
1623 <        checkCompletedNormally(h, 2);
1624 <
1625 <        f = new CompletableFuture<>();
1626 <        g = new CompletableFuture<>();
1627 <        g.complete(1);
1628 <        f.complete(3);
1629 <        h = f.thenCombine(g, subtract);
1630 <        checkCompletedNormally(h, 2);
1631 <    }
1606 >    public void testThenCombine_normalCompletion() {
1607 >        for (ExecutionMode m : ExecutionMode.values())
1608 >        for (boolean fFirst : new boolean[] { true, false })
1609 >        for (Integer v1 : new Integer[] { 1, null })
1610 >        for (Integer v2 : new Integer[] { 2, null })
1611 >    {
1612 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1613 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1614 >        final SubtractFunction[] rs = new SubtractFunction[6];
1615 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1616 >
1617 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1618 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1619 >        final Integer w1 =  fFirst ? v1 : v2;
1620 >        final Integer w2 = !fFirst ? v1 : v2;
1621 >
1622 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1623 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1624 >        assertTrue(fst.complete(w1));
1625 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1626 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1627 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1628 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1629 >        checkCompletedNormally(h1, subtract(w1, w1));
1630 >        checkCompletedNormally(h3, subtract(w1, w1));
1631 >        rs[1].assertValue(subtract(w1, w1));
1632 >        rs[3].assertValue(subtract(w1, w1));
1633 >        assertTrue(snd.complete(w2));
1634 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1635 >
1636 >        checkCompletedNormally(h0, subtract(v1, v2));
1637 >        checkCompletedNormally(h2, subtract(v1, v2));
1638 >        checkCompletedNormally(h4, subtract(v1, v2));
1639 >        rs[0].assertValue(subtract(v1, v2));
1640 >        rs[2].assertValue(subtract(v1, v2));
1641 >        rs[4].assertValue(subtract(v1, v2));
1642 >
1643 >        checkCompletedNormally(f, v1);
1644 >        checkCompletedNormally(g, v2);
1645 >    }}
1646  
1647      /**
1648       * thenCombine result completes exceptionally after exceptional
1649       * completion of either source
1650       */
1651 <    public void testThenCombine2() {
1652 <        CompletableFuture<Integer> f, g, h;
1653 <
1654 <        f = new CompletableFuture<>();
1655 <        g = new CompletableFuture<>();
1656 <        h = f.thenCombine(g, subtract);
1657 <        f.completeExceptionally(new CFException());
1658 <        checkIncomplete(h);
1659 <        g.complete(1);
1660 <        checkCompletedWithWrappedCFException(h);
1661 <
1662 <        f = new CompletableFuture<>();
1663 <        g = new CompletableFuture<>();
1664 <        h = f.thenCombine(g, subtract);
1665 <        g.completeExceptionally(new CFException());
1666 <        checkIncomplete(h);
1667 <        f.complete(3);
1668 <        checkCompletedWithWrappedCFException(h);
1669 <
1670 <        f = new CompletableFuture<>();
1671 <        g = new CompletableFuture<>();
1672 <        f.complete(3);
1673 <        g.completeExceptionally(new CFException());
1674 <        h = f.thenCombine(g, subtract);
1675 <        checkCompletedWithWrappedCFException(h);
1676 <
1677 <        f = new CompletableFuture<>();
1678 <        g = new CompletableFuture<>();
1679 <        f.completeExceptionally(new CFException());
1680 <        g.complete(3);
1681 <        h = f.thenCombine(g, subtract);
1682 <        checkCompletedWithWrappedCFException(h);
1683 <    }
1651 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1652 >        for (ExecutionMode m : ExecutionMode.values())
1653 >        for (boolean fFirst : new boolean[] { true, false })
1654 >        for (boolean failFirst : new boolean[] { true, false })
1655 >        for (Integer v1 : new Integer[] { 1, null })
1656 >    {
1657 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1658 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1659 >        final CFException ex = new CFException();
1660 >        final SubtractFunction r1 = new SubtractFunction(m);
1661 >        final SubtractFunction r2 = new SubtractFunction(m);
1662 >        final SubtractFunction r3 = new SubtractFunction(m);
1663 >
1664 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1665 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1666 >        final Callable<Boolean> complete1 = failFirst ?
1667 >            () -> fst.completeExceptionally(ex) :
1668 >            () -> fst.complete(v1);
1669 >        final Callable<Boolean> complete2 = failFirst ?
1670 >            () -> snd.complete(v1) :
1671 >            () -> snd.completeExceptionally(ex);
1672 >
1673 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1674 >        assertTrue(complete1.call());
1675 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1676 >        checkIncomplete(h1);
1677 >        checkIncomplete(h2);
1678 >        assertTrue(complete2.call());
1679 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1680 >
1681 >        checkCompletedWithWrappedException(h1, ex);
1682 >        checkCompletedWithWrappedException(h2, ex);
1683 >        checkCompletedWithWrappedException(h3, ex);
1684 >        r1.assertNotInvoked();
1685 >        r2.assertNotInvoked();
1686 >        r3.assertNotInvoked();
1687 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1688 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1689 >    }}
1690  
1691      /**
1692 <     * thenCombine result completes exceptionally if action does
1692 >     * thenCombine result completes exceptionally if either source cancelled
1693       */
1694 <    public void testThenCombine3() {
1695 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1696 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1697 <        FailingBiFunction r = new FailingBiFunction();
1698 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1699 <        f.complete(one);
1700 <        checkIncomplete(g);
1701 <        assertFalse(r.ran);
1702 <        f2.complete(two);
1703 <        checkCompletedWithWrappedCFException(g);
1704 <        assertTrue(r.ran);
1705 <    }
1694 >    public void testThenCombine_sourceCancelled() throws Throwable {
1695 >        for (ExecutionMode m : ExecutionMode.values())
1696 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1697 >        for (boolean fFirst : new boolean[] { true, false })
1698 >        for (boolean failFirst : new boolean[] { true, false })
1699 >        for (Integer v1 : new Integer[] { 1, null })
1700 >    {
1701 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1702 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1703 >        final SubtractFunction r1 = new SubtractFunction(m);
1704 >        final SubtractFunction r2 = new SubtractFunction(m);
1705 >        final SubtractFunction r3 = new SubtractFunction(m);
1706 >
1707 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1708 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1709 >        final Callable<Boolean> complete1 = failFirst ?
1710 >            () -> fst.cancel(mayInterruptIfRunning) :
1711 >            () -> fst.complete(v1);
1712 >        final Callable<Boolean> complete2 = failFirst ?
1713 >            () -> snd.complete(v1) :
1714 >            () -> snd.cancel(mayInterruptIfRunning);
1715 >
1716 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1717 >        assertTrue(complete1.call());
1718 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1719 >        checkIncomplete(h1);
1720 >        checkIncomplete(h2);
1721 >        assertTrue(complete2.call());
1722 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1723 >
1724 >        checkCompletedWithWrappedCancellationException(h1);
1725 >        checkCompletedWithWrappedCancellationException(h2);
1726 >        checkCompletedWithWrappedCancellationException(h3);
1727 >        r1.assertNotInvoked();
1728 >        r2.assertNotInvoked();
1729 >        r3.assertNotInvoked();
1730 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1731 >        checkCancelled(failFirst ? fst : snd);
1732 >    }}
1733  
1734      /**
1735 <     * thenCombine result completes exceptionally if either source cancelled
1735 >     * thenCombine result completes exceptionally if action does
1736       */
1737 <    public void testThenCombine4() {
1738 <        CompletableFuture<Integer> f, g, h;
1739 <
1740 <        f = new CompletableFuture<>();
1741 <        g = new CompletableFuture<>();
1742 <        h = f.thenCombine(g, subtract);
1743 <        assertTrue(f.cancel(true));
1744 <        checkIncomplete(h);
1745 <        g.complete(1);
1746 <        checkCompletedWithWrappedCancellationException(h);
1747 <
1748 <        f = new CompletableFuture<>();
1749 <        g = new CompletableFuture<>();
1750 <        h = f.thenCombine(g, subtract);
1751 <        assertTrue(g.cancel(true));
1752 <        checkIncomplete(h);
1753 <        f.complete(3);
1754 <        checkCompletedWithWrappedCancellationException(h);
1755 <
1756 <        f = new CompletableFuture<>();
1757 <        g = new CompletableFuture<>();
1758 <        assertTrue(f.cancel(true));
1759 <        assertTrue(g.cancel(true));
1760 <        h = f.thenCombine(g, subtract);
1761 <        checkCompletedWithWrappedCancellationException(h);
1762 <    }
1737 >    public void testThenCombine_actionFailed() {
1738 >        for (ExecutionMode m : ExecutionMode.values())
1739 >        for (boolean fFirst : new boolean[] { true, false })
1740 >        for (Integer v1 : new Integer[] { 1, null })
1741 >        for (Integer v2 : new Integer[] { 2, null })
1742 >    {
1743 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1744 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1745 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1746 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1747 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1748 >
1749 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1750 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1751 >        final Integer w1 =  fFirst ? v1 : v2;
1752 >        final Integer w2 = !fFirst ? v1 : v2;
1753 >
1754 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1755 >        assertTrue(fst.complete(w1));
1756 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1757 >        assertTrue(snd.complete(w2));
1758 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1759 >
1760 >        checkCompletedWithWrappedException(h1, r1.ex);
1761 >        checkCompletedWithWrappedException(h2, r2.ex);
1762 >        checkCompletedWithWrappedException(h3, r3.ex);
1763 >        r1.assertInvoked();
1764 >        r2.assertInvoked();
1765 >        r3.assertInvoked();
1766 >        checkCompletedNormally(f, v1);
1767 >        checkCompletedNormally(g, v2);
1768 >    }}
1769  
1770      /**
1771       * thenAcceptBoth result completes normally after normal
1772       * completion of sources
1773       */
1774 <    public void testThenAcceptBoth() {
1775 <        CompletableFuture<Integer> f, g;
1776 <        CompletableFuture<Void> h;
1777 <        SubtractAction r;
1778 <
1779 <        f = new CompletableFuture<>();
1780 <        g = new CompletableFuture<>();
1781 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1782 <        f.complete(3);
1783 <        checkIncomplete(h);
1784 <        g.complete(1);
1785 <        checkCompletedNormally(h, null);
1786 <        assertEquals(r.value, 2);
1787 <
1788 <        f = new CompletableFuture<>();
1789 <        g = new CompletableFuture<>();
1790 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1791 <        g.complete(1);
1792 <        checkIncomplete(h);
1793 <        f.complete(3);
1794 <        checkCompletedNormally(h, null);
1795 <        assertEquals(r.value, 2);
1796 <
1797 <        f = new CompletableFuture<>();
1798 <        g = new CompletableFuture<>();
1799 <        g.complete(1);
1800 <        f.complete(3);
1801 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1802 <        checkCompletedNormally(h, null);
1803 <        assertEquals(r.value, 2);
1804 <    }
1774 >    public void testThenAcceptBoth_normalCompletion() {
1775 >        for (ExecutionMode m : ExecutionMode.values())
1776 >        for (boolean fFirst : new boolean[] { true, false })
1777 >        for (Integer v1 : new Integer[] { 1, null })
1778 >        for (Integer v2 : new Integer[] { 2, null })
1779 >    {
1780 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1781 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1782 >        final SubtractAction r1 = new SubtractAction(m);
1783 >        final SubtractAction r2 = new SubtractAction(m);
1784 >        final SubtractAction r3 = new SubtractAction(m);
1785 >
1786 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1787 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1788 >        final Integer w1 =  fFirst ? v1 : v2;
1789 >        final Integer w2 = !fFirst ? v1 : v2;
1790 >
1791 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1792 >        assertTrue(fst.complete(w1));
1793 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1794 >        checkIncomplete(h1);
1795 >        checkIncomplete(h2);
1796 >        r1.assertNotInvoked();
1797 >        r2.assertNotInvoked();
1798 >        assertTrue(snd.complete(w2));
1799 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1800 >
1801 >        checkCompletedNormally(h1, null);
1802 >        checkCompletedNormally(h2, null);
1803 >        checkCompletedNormally(h3, null);
1804 >        r1.assertValue(subtract(v1, v2));
1805 >        r2.assertValue(subtract(v1, v2));
1806 >        r3.assertValue(subtract(v1, v2));
1807 >        checkCompletedNormally(f, v1);
1808 >        checkCompletedNormally(g, v2);
1809 >    }}
1810  
1811      /**
1812       * thenAcceptBoth result completes exceptionally after exceptional
1813       * completion of either source
1814       */
1815 <    public void testThenAcceptBoth2() {
1816 <        CompletableFuture<Integer> f, g;
1817 <        CompletableFuture<Void> h;
1818 <        SubtractAction r;
1819 <
1820 <        f = new CompletableFuture<>();
1821 <        g = new CompletableFuture<>();
1822 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1823 <        f.completeExceptionally(new CFException());
1824 <        checkIncomplete(h);
1825 <        g.complete(1);
1826 <        checkCompletedWithWrappedCFException(h);
1827 <
1828 <        f = new CompletableFuture<>();
1829 <        g = new CompletableFuture<>();
1830 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1831 <        g.completeExceptionally(new CFException());
1832 <        checkIncomplete(h);
1833 <        f.complete(3);
1834 <        checkCompletedWithWrappedCFException(h);
1835 <
1836 <        f = new CompletableFuture<>();
1837 <        g = new CompletableFuture<>();
1838 <        f.complete(3);
1839 <        g.completeExceptionally(new CFException());
1840 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1841 <        checkCompletedWithWrappedCFException(h);
1842 <
1843 <        f = new CompletableFuture<>();
1844 <        g = new CompletableFuture<>();
1845 <        f.completeExceptionally(new CFException());
1846 <        g.complete(3);
1847 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1848 <        checkCompletedWithWrappedCFException(h);
1849 <    }
1815 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1816 >        for (ExecutionMode m : ExecutionMode.values())
1817 >        for (boolean fFirst : new boolean[] { true, false })
1818 >        for (boolean failFirst : new boolean[] { true, false })
1819 >        for (Integer v1 : new Integer[] { 1, null })
1820 >    {
1821 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1822 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1823 >        final CFException ex = new CFException();
1824 >        final SubtractAction r1 = new SubtractAction(m);
1825 >        final SubtractAction r2 = new SubtractAction(m);
1826 >        final SubtractAction r3 = new SubtractAction(m);
1827 >
1828 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1829 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1830 >        final Callable<Boolean> complete1 = failFirst ?
1831 >            () -> fst.completeExceptionally(ex) :
1832 >            () -> fst.complete(v1);
1833 >        final Callable<Boolean> complete2 = failFirst ?
1834 >            () -> snd.complete(v1) :
1835 >            () -> snd.completeExceptionally(ex);
1836 >
1837 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1838 >        assertTrue(complete1.call());
1839 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1840 >        checkIncomplete(h1);
1841 >        checkIncomplete(h2);
1842 >        assertTrue(complete2.call());
1843 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1844 >
1845 >        checkCompletedWithWrappedException(h1, ex);
1846 >        checkCompletedWithWrappedException(h2, ex);
1847 >        checkCompletedWithWrappedException(h3, ex);
1848 >        r1.assertNotInvoked();
1849 >        r2.assertNotInvoked();
1850 >        r3.assertNotInvoked();
1851 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1852 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1853 >    }}
1854  
1855      /**
1856 <     * thenAcceptBoth result completes exceptionally if action does
1856 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1857       */
1858 <    public void testThenAcceptBoth3() {
1859 <        CompletableFuture<Integer> f, g;
1860 <        CompletableFuture<Void> h;
1861 <        FailingBiConsumer r;
1862 <
1863 <        f = new CompletableFuture<>();
1864 <        g = new CompletableFuture<>();
1865 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1866 <        f.complete(3);
1867 <        checkIncomplete(h);
1868 <        g.complete(1);
1869 <        checkCompletedWithWrappedCFException(h);
1870 <
1871 <        f = new CompletableFuture<>();
1872 <        g = new CompletableFuture<>();
1873 <        f.complete(3);
1874 <        g.complete(1);
1875 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
1876 <        checkCompletedWithWrappedCFException(h);
1877 <    }
1858 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1859 >        for (ExecutionMode m : ExecutionMode.values())
1860 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1861 >        for (boolean fFirst : new boolean[] { true, false })
1862 >        for (boolean failFirst : new boolean[] { true, false })
1863 >        for (Integer v1 : new Integer[] { 1, null })
1864 >    {
1865 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1866 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1867 >        final SubtractAction r1 = new SubtractAction(m);
1868 >        final SubtractAction r2 = new SubtractAction(m);
1869 >        final SubtractAction r3 = new SubtractAction(m);
1870 >
1871 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1872 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1873 >        final Callable<Boolean> complete1 = failFirst ?
1874 >            () -> fst.cancel(mayInterruptIfRunning) :
1875 >            () -> fst.complete(v1);
1876 >        final Callable<Boolean> complete2 = failFirst ?
1877 >            () -> snd.complete(v1) :
1878 >            () -> snd.cancel(mayInterruptIfRunning);
1879 >
1880 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1881 >        assertTrue(complete1.call());
1882 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1883 >        checkIncomplete(h1);
1884 >        checkIncomplete(h2);
1885 >        assertTrue(complete2.call());
1886 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1887 >
1888 >        checkCompletedWithWrappedCancellationException(h1);
1889 >        checkCompletedWithWrappedCancellationException(h2);
1890 >        checkCompletedWithWrappedCancellationException(h3);
1891 >        r1.assertNotInvoked();
1892 >        r2.assertNotInvoked();
1893 >        r3.assertNotInvoked();
1894 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1895 >        checkCancelled(failFirst ? fst : snd);
1896 >    }}
1897  
1898      /**
1899 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1899 >     * thenAcceptBoth result completes exceptionally if action does
1900       */
1901 <    public void testThenAcceptBoth4() {
1902 <        CompletableFuture<Integer> f, g;
1903 <        CompletableFuture<Void> h;
1904 <        SubtractAction r;
1905 <
1906 <        f = new CompletableFuture<>();
1907 <        g = new CompletableFuture<>();
1908 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1909 <        assertTrue(f.cancel(true));
1910 <        checkIncomplete(h);
1911 <        g.complete(1);
1912 <        checkCompletedWithWrappedCancellationException(h);
1913 <
1914 <        f = new CompletableFuture<>();
1915 <        g = new CompletableFuture<>();
1916 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1917 <        assertTrue(g.cancel(true));
1918 <        checkIncomplete(h);
1919 <        f.complete(3);
1920 <        checkCompletedWithWrappedCancellationException(h);
1921 <
1922 <        f = new CompletableFuture<>();
1923 <        g = new CompletableFuture<>();
1924 <        f.complete(3);
1925 <        assertTrue(g.cancel(true));
1926 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
1927 <        checkCompletedWithWrappedCancellationException(h);
1928 <
1929 <        f = new CompletableFuture<>();
1930 <        g = new CompletableFuture<>();
1931 <        assertTrue(f.cancel(true));
1932 <        g.complete(3);
914 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
915 <        checkCompletedWithWrappedCancellationException(h);
916 <    }
1901 >    public void testThenAcceptBoth_actionFailed() {
1902 >        for (ExecutionMode m : ExecutionMode.values())
1903 >        for (boolean fFirst : new boolean[] { true, false })
1904 >        for (Integer v1 : new Integer[] { 1, null })
1905 >        for (Integer v2 : new Integer[] { 2, null })
1906 >    {
1907 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1908 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1909 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1910 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1911 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1912 >
1913 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1914 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1915 >        final Integer w1 =  fFirst ? v1 : v2;
1916 >        final Integer w2 = !fFirst ? v1 : v2;
1917 >
1918 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1919 >        assertTrue(fst.complete(w1));
1920 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1921 >        assertTrue(snd.complete(w2));
1922 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1923 >
1924 >        checkCompletedWithWrappedException(h1, r1.ex);
1925 >        checkCompletedWithWrappedException(h2, r2.ex);
1926 >        checkCompletedWithWrappedException(h3, r3.ex);
1927 >        r1.assertInvoked();
1928 >        r2.assertInvoked();
1929 >        r3.assertInvoked();
1930 >        checkCompletedNormally(f, v1);
1931 >        checkCompletedNormally(g, v2);
1932 >    }}
1933  
1934      /**
1935       * runAfterBoth result completes normally after normal
1936       * completion of sources
1937       */
1938 <    public void testRunAfterBoth() {
1939 <        CompletableFuture<Integer> f, g;
1940 <        CompletableFuture<Void> h;
1941 <        Noop r;
1942 <
1943 <        f = new CompletableFuture<>();
1944 <        g = new CompletableFuture<>();
1945 <        h = f.runAfterBoth(g, r = new Noop());
1946 <        f.complete(3);
1947 <        checkIncomplete(h);
1948 <        g.complete(1);
1949 <        checkCompletedNormally(h, null);
1950 <        assertTrue(r.ran);
1951 <
1952 <        f = new CompletableFuture<>();
1953 <        g = new CompletableFuture<>();
1954 <        h = f.runAfterBoth(g, r = new Noop());
1955 <        g.complete(1);
1956 <        checkIncomplete(h);
1957 <        f.complete(3);
1958 <        checkCompletedNormally(h, null);
1959 <        assertTrue(r.ran);
1960 <
1961 <        f = new CompletableFuture<>();
1962 <        g = new CompletableFuture<>();
1963 <        g.complete(1);
1964 <        f.complete(3);
1965 <        h = f.runAfterBoth(g, r = new Noop());
1966 <        checkCompletedNormally(h, null);
1967 <        assertTrue(r.ran);
1968 <    }
1938 >    public void testRunAfterBoth_normalCompletion() {
1939 >        for (ExecutionMode m : ExecutionMode.values())
1940 >        for (boolean fFirst : new boolean[] { true, false })
1941 >        for (Integer v1 : new Integer[] { 1, null })
1942 >        for (Integer v2 : new Integer[] { 2, null })
1943 >    {
1944 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1945 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1946 >        final Noop r1 = new Noop(m);
1947 >        final Noop r2 = new Noop(m);
1948 >        final Noop r3 = new Noop(m);
1949 >
1950 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1951 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1952 >        final Integer w1 =  fFirst ? v1 : v2;
1953 >        final Integer w2 = !fFirst ? v1 : v2;
1954 >
1955 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1956 >        assertTrue(fst.complete(w1));
1957 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1958 >        checkIncomplete(h1);
1959 >        checkIncomplete(h2);
1960 >        r1.assertNotInvoked();
1961 >        r2.assertNotInvoked();
1962 >        assertTrue(snd.complete(w2));
1963 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1964 >
1965 >        checkCompletedNormally(h1, null);
1966 >        checkCompletedNormally(h2, null);
1967 >        checkCompletedNormally(h3, null);
1968 >        r1.assertInvoked();
1969 >        r2.assertInvoked();
1970 >        r3.assertInvoked();
1971 >        checkCompletedNormally(f, v1);
1972 >        checkCompletedNormally(g, v2);
1973 >    }}
1974  
1975      /**
1976       * runAfterBoth result completes exceptionally after exceptional
1977       * completion of either source
1978       */
1979 <    public void testRunAfterBoth2() {
1980 <        CompletableFuture<Integer> f, g;
1981 <        CompletableFuture<Void> h;
1982 <        Noop r;
1983 <
1984 <        f = new CompletableFuture<>();
1985 <        g = new CompletableFuture<>();
1986 <        h = f.runAfterBoth(g, r = new Noop());
1987 <        f.completeExceptionally(new CFException());
1988 <        checkIncomplete(h);
1989 <        g.complete(1);
1990 <        checkCompletedWithWrappedCFException(h);
1991 <        assertFalse(r.ran);
1992 <
1993 <        f = new CompletableFuture<>();
1994 <        g = new CompletableFuture<>();
1995 <        h = f.runAfterBoth(g, r = new Noop());
1996 <        g.completeExceptionally(new CFException());
1997 <        checkIncomplete(h);
1998 <        f.complete(3);
1999 <        checkCompletedWithWrappedCFException(h);
2000 <        assertFalse(r.ran);
2001 <
2002 <        f = new CompletableFuture<>();
2003 <        g = new CompletableFuture<>();
2004 <        g.completeExceptionally(new CFException());
2005 <        f.complete(3);
2006 <        h = f.runAfterBoth(g, r = new Noop());
2007 <        checkCompletedWithWrappedCFException(h);
2008 <        assertFalse(r.ran);
2009 <
2010 <        f = new CompletableFuture<>();
2011 <        g = new CompletableFuture<>();
2012 <        f.completeExceptionally(new CFException());
2013 <        g.complete(1);
2014 <        h = f.runAfterBoth(g, r = new Noop());
2015 <        checkCompletedWithWrappedCFException(h);
2016 <        assertFalse(r.ran);
2017 <    }
1979 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1980 >        for (ExecutionMode m : ExecutionMode.values())
1981 >        for (boolean fFirst : new boolean[] { true, false })
1982 >        for (boolean failFirst : new boolean[] { true, false })
1983 >        for (Integer v1 : new Integer[] { 1, null })
1984 >    {
1985 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1986 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1987 >        final CFException ex = new CFException();
1988 >        final Noop r1 = new Noop(m);
1989 >        final Noop r2 = new Noop(m);
1990 >        final Noop r3 = new Noop(m);
1991 >
1992 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1993 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1994 >        final Callable<Boolean> complete1 = failFirst ?
1995 >            () -> fst.completeExceptionally(ex) :
1996 >            () -> fst.complete(v1);
1997 >        final Callable<Boolean> complete2 = failFirst ?
1998 >            () -> snd.complete(v1) :
1999 >            () -> snd.completeExceptionally(ex);
2000 >
2001 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2002 >        assertTrue(complete1.call());
2003 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2004 >        checkIncomplete(h1);
2005 >        checkIncomplete(h2);
2006 >        assertTrue(complete2.call());
2007 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2008 >
2009 >        checkCompletedWithWrappedException(h1, ex);
2010 >        checkCompletedWithWrappedException(h2, ex);
2011 >        checkCompletedWithWrappedException(h3, ex);
2012 >        r1.assertNotInvoked();
2013 >        r2.assertNotInvoked();
2014 >        r3.assertNotInvoked();
2015 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2016 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2017 >    }}
2018  
2019      /**
2020 <     * runAfterBoth result completes exceptionally if action does
2020 >     * runAfterBoth result completes exceptionally if either source cancelled
2021       */
2022 <    public void testRunAfterBoth3() {
2023 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2024 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2025 <        FailingNoop r = new FailingNoop();
2026 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
2027 <        f.complete(one);
2028 <        checkIncomplete(g);
2029 <        f2.complete(two);
2030 <        checkCompletedWithWrappedCFException(g);
2031 <    }
2022 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2023 >        for (ExecutionMode m : ExecutionMode.values())
2024 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2025 >        for (boolean fFirst : new boolean[] { true, false })
2026 >        for (boolean failFirst : new boolean[] { true, false })
2027 >        for (Integer v1 : new Integer[] { 1, null })
2028 >    {
2029 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2030 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2031 >        final Noop r1 = new Noop(m);
2032 >        final Noop r2 = new Noop(m);
2033 >        final Noop r3 = new Noop(m);
2034 >
2035 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2036 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2037 >        final Callable<Boolean> complete1 = failFirst ?
2038 >            () -> fst.cancel(mayInterruptIfRunning) :
2039 >            () -> fst.complete(v1);
2040 >        final Callable<Boolean> complete2 = failFirst ?
2041 >            () -> snd.complete(v1) :
2042 >            () -> snd.cancel(mayInterruptIfRunning);
2043 >
2044 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2045 >        assertTrue(complete1.call());
2046 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2047 >        checkIncomplete(h1);
2048 >        checkIncomplete(h2);
2049 >        assertTrue(complete2.call());
2050 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2051 >
2052 >        checkCompletedWithWrappedCancellationException(h1);
2053 >        checkCompletedWithWrappedCancellationException(h2);
2054 >        checkCompletedWithWrappedCancellationException(h3);
2055 >        r1.assertNotInvoked();
2056 >        r2.assertNotInvoked();
2057 >        r3.assertNotInvoked();
2058 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2059 >        checkCancelled(failFirst ? fst : snd);
2060 >    }}
2061  
2062      /**
2063 <     * runAfterBoth result completes exceptionally if either source cancelled
2063 >     * runAfterBoth result completes exceptionally if action does
2064       */
2065 <    public void testRunAfterBoth4() {
2066 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2067 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2068 <        Noop r = new Noop();
2069 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
2070 <        assertTrue(f.cancel(true));
2071 <        f2.complete(two);
2072 <        checkCompletedWithWrappedCancellationException(g);
2073 <        f = new CompletableFuture<>();
2074 <        f2 = new CompletableFuture<>();
2075 <        r = new Noop();
2076 <        g = f.runAfterBoth(f2, r);
2077 <        f.complete(one);
2078 <        assertTrue(f2.cancel(true));
2079 <        checkCompletedWithWrappedCancellationException(g);
2080 <    }
2065 >    public void testRunAfterBoth_actionFailed() {
2066 >        for (ExecutionMode m : ExecutionMode.values())
2067 >        for (boolean fFirst : new boolean[] { true, false })
2068 >        for (Integer v1 : new Integer[] { 1, null })
2069 >        for (Integer v2 : new Integer[] { 2, null })
2070 >    {
2071 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2072 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2073 >        final FailingRunnable r1 = new FailingRunnable(m);
2074 >        final FailingRunnable r2 = new FailingRunnable(m);
2075 >        final FailingRunnable r3 = new FailingRunnable(m);
2076 >
2077 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2078 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2079 >        final Integer w1 =  fFirst ? v1 : v2;
2080 >        final Integer w2 = !fFirst ? v1 : v2;
2081 >
2082 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2083 >        assertTrue(fst.complete(w1));
2084 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2085 >        assertTrue(snd.complete(w2));
2086 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2087 >
2088 >        checkCompletedWithWrappedException(h1, r1.ex);
2089 >        checkCompletedWithWrappedException(h2, r2.ex);
2090 >        checkCompletedWithWrappedException(h3, r3.ex);
2091 >        r1.assertInvoked();
2092 >        r2.assertInvoked();
2093 >        r3.assertInvoked();
2094 >        checkCompletedNormally(f, v1);
2095 >        checkCompletedNormally(g, v2);
2096 >    }}
2097  
2098      /**
2099       * applyToEither result completes normally after normal completion
2100       * of either source
2101       */
2102 <    public void testApplyToEither() {
2103 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2104 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2105 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2106 <        f.complete(one);
2107 <        checkCompletedNormally(g, two);
2108 <        f2.complete(one);
2109 <        checkCompletedNormally(g, two);
2110 <
2111 <        f = new CompletableFuture<>();
2112 <        f.complete(one);
2113 <        f2 = new CompletableFuture<>();
2114 <        g = f.applyToEither(f2, inc);
2115 <        checkCompletedNormally(g, two);
2116 <    }
2102 >    public void testApplyToEither_normalCompletion() {
2103 >        for (ExecutionMode m : ExecutionMode.values())
2104 >        for (Integer v1 : new Integer[] { 1, null })
2105 >        for (Integer v2 : new Integer[] { 2, null })
2106 >    {
2107 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2108 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2109 >        final IncFunction[] rs = new IncFunction[6];
2110 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2111 >
2112 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2113 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2114 >        checkIncomplete(h0);
2115 >        checkIncomplete(h1);
2116 >        rs[0].assertNotInvoked();
2117 >        rs[1].assertNotInvoked();
2118 >        f.complete(v1);
2119 >        checkCompletedNormally(h0, inc(v1));
2120 >        checkCompletedNormally(h1, inc(v1));
2121 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2122 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2123 >        checkCompletedNormally(h2, inc(v1));
2124 >        checkCompletedNormally(h3, inc(v1));
2125 >        g.complete(v2);
2126 >
2127 >        // unspecified behavior - both source completions available
2128 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2129 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2130 >        rs[4].assertValue(h4.join());
2131 >        rs[5].assertValue(h5.join());
2132 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2133 >                   Objects.equals(inc(v2), h4.join()));
2134 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2135 >                   Objects.equals(inc(v2), h5.join()));
2136 >
2137 >        checkCompletedNormally(f, v1);
2138 >        checkCompletedNormally(g, v2);
2139 >        checkCompletedNormally(h0, inc(v1));
2140 >        checkCompletedNormally(h1, inc(v1));
2141 >        checkCompletedNormally(h2, inc(v1));
2142 >        checkCompletedNormally(h3, inc(v1));
2143 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2144 >    }}
2145  
2146      /**
2147       * applyToEither result completes exceptionally after exceptional
2148       * completion of either source
2149       */
2150 <    public void testApplyToEither2() {
2151 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2152 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2153 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2154 <        f.completeExceptionally(new CFException());
2155 <        f2.complete(one);
2156 <        checkCompletedWithWrappedCFException(g);
2150 >    public void testApplyToEither_exceptionalCompletion() {
2151 >        for (ExecutionMode m : ExecutionMode.values())
2152 >        for (Integer v1 : new Integer[] { 1, null })
2153 >    {
2154 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2155 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2156 >        final CFException ex = new CFException();
2157 >        final IncFunction[] rs = new IncFunction[6];
2158 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2159 >
2160 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2161 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2162 >        checkIncomplete(h0);
2163 >        checkIncomplete(h1);
2164 >        rs[0].assertNotInvoked();
2165 >        rs[1].assertNotInvoked();
2166 >        f.completeExceptionally(ex);
2167 >        checkCompletedWithWrappedException(h0, ex);
2168 >        checkCompletedWithWrappedException(h1, ex);
2169 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2170 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2171 >        checkCompletedWithWrappedException(h2, ex);
2172 >        checkCompletedWithWrappedException(h3, ex);
2173 >        g.complete(v1);
2174 >
2175 >        // unspecified behavior - both source completions available
2176 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2177 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2178 >        try {
2179 >            assertEquals(inc(v1), h4.join());
2180 >            rs[4].assertValue(inc(v1));
2181 >        } catch (CompletionException ok) {
2182 >            checkCompletedWithWrappedException(h4, ex);
2183 >            rs[4].assertNotInvoked();
2184 >        }
2185 >        try {
2186 >            assertEquals(inc(v1), h5.join());
2187 >            rs[5].assertValue(inc(v1));
2188 >        } catch (CompletionException ok) {
2189 >            checkCompletedWithWrappedException(h5, ex);
2190 >            rs[5].assertNotInvoked();
2191 >        }
2192  
2193 <        f = new CompletableFuture<>();
2194 <        f2 = new CompletableFuture<>();
2195 <        f2.completeExceptionally(new CFException());
2196 <        g = f.applyToEither(f2, inc);
2197 <        checkCompletedWithWrappedCFException(g);
2198 <    }
2193 >        checkCompletedExceptionally(f, ex);
2194 >        checkCompletedNormally(g, v1);
2195 >        checkCompletedWithWrappedException(h0, ex);
2196 >        checkCompletedWithWrappedException(h1, ex);
2197 >        checkCompletedWithWrappedException(h2, ex);
2198 >        checkCompletedWithWrappedException(h3, ex);
2199 >        checkCompletedWithWrappedException(h4, ex);
2200 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2201 >    }}
2202 >
2203 >    public void testApplyToEither_exceptionalCompletion2() {
2204 >        for (ExecutionMode m : ExecutionMode.values())
2205 >        for (boolean fFirst : new boolean[] { true, false })
2206 >        for (Integer v1 : new Integer[] { 1, null })
2207 >    {
2208 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2209 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2210 >        final CFException ex = new CFException();
2211 >        final IncFunction[] rs = new IncFunction[6];
2212 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2213 >
2214 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2215 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2216 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2217 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2218 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2219 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2220 >
2221 >        // unspecified behavior - both source completions available
2222 >        try {
2223 >            assertEquals(inc(v1), h0.join());
2224 >            rs[0].assertValue(inc(v1));
2225 >        } catch (CompletionException ok) {
2226 >            checkCompletedWithWrappedException(h0, ex);
2227 >            rs[0].assertNotInvoked();
2228 >        }
2229 >        try {
2230 >            assertEquals(inc(v1), h1.join());
2231 >            rs[1].assertValue(inc(v1));
2232 >        } catch (CompletionException ok) {
2233 >            checkCompletedWithWrappedException(h1, ex);
2234 >            rs[1].assertNotInvoked();
2235 >        }
2236 >        try {
2237 >            assertEquals(inc(v1), h2.join());
2238 >            rs[2].assertValue(inc(v1));
2239 >        } catch (CompletionException ok) {
2240 >            checkCompletedWithWrappedException(h2, ex);
2241 >            rs[2].assertNotInvoked();
2242 >        }
2243 >        try {
2244 >            assertEquals(inc(v1), h3.join());
2245 >            rs[3].assertValue(inc(v1));
2246 >        } catch (CompletionException ok) {
2247 >            checkCompletedWithWrappedException(h3, ex);
2248 >            rs[3].assertNotInvoked();
2249 >        }
2250 >
2251 >        checkCompletedNormally(f, v1);
2252 >        checkCompletedExceptionally(g, ex);
2253 >    }}
2254  
2255      /**
2256 <     * applyToEither result completes exceptionally if action does
2256 >     * applyToEither result completes exceptionally if either source cancelled
2257       */
2258 <    public void testApplyToEither3() {
2259 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2260 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2261 <        FailingFunction r = new FailingFunction();
2262 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
2263 <        f2.complete(two);
2264 <        checkCompletedWithWrappedCFException(g);
2265 <    }
2258 >    public void testApplyToEither_sourceCancelled() {
2259 >        for (ExecutionMode m : ExecutionMode.values())
2260 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2261 >        for (Integer v1 : new Integer[] { 1, null })
2262 >    {
2263 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2264 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2265 >        final IncFunction[] rs = new IncFunction[6];
2266 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2267 >
2268 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2269 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2270 >        checkIncomplete(h0);
2271 >        checkIncomplete(h1);
2272 >        rs[0].assertNotInvoked();
2273 >        rs[1].assertNotInvoked();
2274 >        f.cancel(mayInterruptIfRunning);
2275 >        checkCompletedWithWrappedCancellationException(h0);
2276 >        checkCompletedWithWrappedCancellationException(h1);
2277 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2278 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2279 >        checkCompletedWithWrappedCancellationException(h2);
2280 >        checkCompletedWithWrappedCancellationException(h3);
2281 >        g.complete(v1);
2282 >
2283 >        // unspecified behavior - both source completions available
2284 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2285 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2286 >        try {
2287 >            assertEquals(inc(v1), h4.join());
2288 >            rs[4].assertValue(inc(v1));
2289 >        } catch (CompletionException ok) {
2290 >            checkCompletedWithWrappedCancellationException(h4);
2291 >            rs[4].assertNotInvoked();
2292 >        }
2293 >        try {
2294 >            assertEquals(inc(v1), h5.join());
2295 >            rs[5].assertValue(inc(v1));
2296 >        } catch (CompletionException ok) {
2297 >            checkCompletedWithWrappedCancellationException(h5);
2298 >            rs[5].assertNotInvoked();
2299 >        }
2300 >
2301 >        checkCancelled(f);
2302 >        checkCompletedNormally(g, v1);
2303 >        checkCompletedWithWrappedCancellationException(h0);
2304 >        checkCompletedWithWrappedCancellationException(h1);
2305 >        checkCompletedWithWrappedCancellationException(h2);
2306 >        checkCompletedWithWrappedCancellationException(h3);
2307 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2308 >    }}
2309 >
2310 >    public void testApplyToEither_sourceCancelled2() {
2311 >        for (ExecutionMode m : ExecutionMode.values())
2312 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2313 >        for (boolean fFirst : new boolean[] { true, false })
2314 >        for (Integer v1 : new Integer[] { 1, null })
2315 >    {
2316 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2317 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2318 >        final IncFunction[] rs = new IncFunction[6];
2319 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2320 >
2321 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2322 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2323 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2324 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2325 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2326 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2327 >
2328 >        // unspecified behavior - both source completions available
2329 >        try {
2330 >            assertEquals(inc(v1), h0.join());
2331 >            rs[0].assertValue(inc(v1));
2332 >        } catch (CompletionException ok) {
2333 >            checkCompletedWithWrappedCancellationException(h0);
2334 >            rs[0].assertNotInvoked();
2335 >        }
2336 >        try {
2337 >            assertEquals(inc(v1), h1.join());
2338 >            rs[1].assertValue(inc(v1));
2339 >        } catch (CompletionException ok) {
2340 >            checkCompletedWithWrappedCancellationException(h1);
2341 >            rs[1].assertNotInvoked();
2342 >        }
2343 >        try {
2344 >            assertEquals(inc(v1), h2.join());
2345 >            rs[2].assertValue(inc(v1));
2346 >        } catch (CompletionException ok) {
2347 >            checkCompletedWithWrappedCancellationException(h2);
2348 >            rs[2].assertNotInvoked();
2349 >        }
2350 >        try {
2351 >            assertEquals(inc(v1), h3.join());
2352 >            rs[3].assertValue(inc(v1));
2353 >        } catch (CompletionException ok) {
2354 >            checkCompletedWithWrappedCancellationException(h3);
2355 >            rs[3].assertNotInvoked();
2356 >        }
2357 >
2358 >        checkCompletedNormally(f, v1);
2359 >        checkCancelled(g);
2360 >    }}
2361  
2362      /**
2363 <     * applyToEither result completes exceptionally if either source cancelled
2363 >     * applyToEither result completes exceptionally if action does
2364       */
2365 <    public void testApplyToEither4() {
2366 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2367 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2368 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
2369 <        assertTrue(f.cancel(true));
2370 <        checkCompletedWithWrappedCancellationException(g);
2371 <        f = new CompletableFuture<>();
2372 <        f2 = new CompletableFuture<>();
2373 <        assertTrue(f2.cancel(true));
2374 <        checkCompletedWithWrappedCancellationException(g);
2375 <    }
2365 >    public void testApplyToEither_actionFailed() {
2366 >        for (ExecutionMode m : ExecutionMode.values())
2367 >        for (Integer v1 : new Integer[] { 1, null })
2368 >        for (Integer v2 : new Integer[] { 2, null })
2369 >    {
2370 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2371 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2372 >        final FailingFunction[] rs = new FailingFunction[6];
2373 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2374 >
2375 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2376 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2377 >        f.complete(v1);
2378 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2379 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2380 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2381 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2382 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2383 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2384 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2385 >
2386 >        g.complete(v2);
2387 >
2388 >        // unspecified behavior - both source completions available
2389 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2390 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2391 >
2392 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2393 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2394 >                   Objects.equals(v2, rs[4].value));
2395 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2396 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2397 >                   Objects.equals(v2, rs[5].value));
2398 >
2399 >        checkCompletedNormally(f, v1);
2400 >        checkCompletedNormally(g, v2);
2401 >    }}
2402  
2403      /**
2404       * acceptEither result completes normally after normal completion
2405       * of either source
2406       */
2407 <    public void testAcceptEither() {
2408 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2409 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2410 <        IncAction r = new IncAction();
2411 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2412 <        f.complete(one);
2413 <        checkCompletedNormally(g, null);
2414 <        f2.complete(one);
2415 <        checkCompletedNormally(g, null);
2416 <        assertEquals(r.value, 2);
2417 <
2418 <        r = new IncAction();
2419 <        f = new CompletableFuture<>();
2420 <        f.complete(one);
2421 <        f2 = new CompletableFuture<>();
2422 <        g = f.acceptEither(f2, r);
2423 <        checkCompletedNormally(g, null);
2424 <        assertEquals(r.value, 2);
2425 <    }
2407 >    public void testAcceptEither_normalCompletion() {
2408 >        for (ExecutionMode m : ExecutionMode.values())
2409 >        for (Integer v1 : new Integer[] { 1, null })
2410 >        for (Integer v2 : new Integer[] { 2, null })
2411 >    {
2412 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2413 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2414 >        final NoopConsumer[] rs = new NoopConsumer[6];
2415 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2416 >
2417 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2418 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2419 >        checkIncomplete(h0);
2420 >        checkIncomplete(h1);
2421 >        rs[0].assertNotInvoked();
2422 >        rs[1].assertNotInvoked();
2423 >        f.complete(v1);
2424 >        checkCompletedNormally(h0, null);
2425 >        checkCompletedNormally(h1, null);
2426 >        rs[0].assertValue(v1);
2427 >        rs[1].assertValue(v1);
2428 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2429 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2430 >        checkCompletedNormally(h2, null);
2431 >        checkCompletedNormally(h3, null);
2432 >        rs[2].assertValue(v1);
2433 >        rs[3].assertValue(v1);
2434 >        g.complete(v2);
2435 >
2436 >        // unspecified behavior - both source completions available
2437 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2438 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2439 >        checkCompletedNormally(h4, null);
2440 >        checkCompletedNormally(h5, null);
2441 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2442 >                   Objects.equals(v2, rs[4].value));
2443 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2444 >                   Objects.equals(v2, rs[5].value));
2445 >
2446 >        checkCompletedNormally(f, v1);
2447 >        checkCompletedNormally(g, v2);
2448 >        checkCompletedNormally(h0, null);
2449 >        checkCompletedNormally(h1, null);
2450 >        checkCompletedNormally(h2, null);
2451 >        checkCompletedNormally(h3, null);
2452 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2453 >    }}
2454  
2455      /**
2456       * acceptEither result completes exceptionally after exceptional
2457       * completion of either source
2458       */
2459 <    public void testAcceptEither2() {
2460 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2461 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2462 <        IncAction r = new IncAction();
2463 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2464 <        f.completeExceptionally(new CFException());
2465 <        f2.complete(one);
2466 <        checkCompletedWithWrappedCFException(g);
2459 >    public void testAcceptEither_exceptionalCompletion() {
2460 >        for (ExecutionMode m : ExecutionMode.values())
2461 >        for (Integer v1 : new Integer[] { 1, null })
2462 >    {
2463 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2464 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2465 >        final CFException ex = new CFException();
2466 >        final NoopConsumer[] rs = new NoopConsumer[6];
2467 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2468 >
2469 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2470 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2471 >        checkIncomplete(h0);
2472 >        checkIncomplete(h1);
2473 >        rs[0].assertNotInvoked();
2474 >        rs[1].assertNotInvoked();
2475 >        f.completeExceptionally(ex);
2476 >        checkCompletedWithWrappedException(h0, ex);
2477 >        checkCompletedWithWrappedException(h1, ex);
2478 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2479 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2480 >        checkCompletedWithWrappedException(h2, ex);
2481 >        checkCompletedWithWrappedException(h3, ex);
2482 >
2483 >        g.complete(v1);
2484 >
2485 >        // unspecified behavior - both source completions available
2486 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2487 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2488 >        try {
2489 >            assertNull(h4.join());
2490 >            rs[4].assertValue(v1);
2491 >        } catch (CompletionException ok) {
2492 >            checkCompletedWithWrappedException(h4, ex);
2493 >            rs[4].assertNotInvoked();
2494 >        }
2495 >        try {
2496 >            assertNull(h5.join());
2497 >            rs[5].assertValue(v1);
2498 >        } catch (CompletionException ok) {
2499 >            checkCompletedWithWrappedException(h5, ex);
2500 >            rs[5].assertNotInvoked();
2501 >        }
2502  
2503 <        r = new IncAction();
2504 <        f = new CompletableFuture<>();
2505 <        f2 = new CompletableFuture<>();
2506 <        f2.completeExceptionally(new CFException());
2507 <        g = f.acceptEither(f2, r);
2508 <        checkCompletedWithWrappedCFException(g);
2509 <    }
2503 >        checkCompletedExceptionally(f, ex);
2504 >        checkCompletedNormally(g, v1);
2505 >        checkCompletedWithWrappedException(h0, ex);
2506 >        checkCompletedWithWrappedException(h1, ex);
2507 >        checkCompletedWithWrappedException(h2, ex);
2508 >        checkCompletedWithWrappedException(h3, ex);
2509 >        checkCompletedWithWrappedException(h4, ex);
2510 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2511 >    }}
2512 >
2513 >    public void testAcceptEither_exceptionalCompletion2() {
2514 >        for (ExecutionMode m : ExecutionMode.values())
2515 >        for (boolean fFirst : new boolean[] { true, false })
2516 >        for (Integer v1 : new Integer[] { 1, null })
2517 >    {
2518 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2519 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2520 >        final CFException ex = new CFException();
2521 >        final NoopConsumer[] rs = new NoopConsumer[6];
2522 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2523 >
2524 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2525 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2526 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2527 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2528 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2529 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2530 >
2531 >        // unspecified behavior - both source completions available
2532 >        try {
2533 >            assertEquals(null, h0.join());
2534 >            rs[0].assertValue(v1);
2535 >        } catch (CompletionException ok) {
2536 >            checkCompletedWithWrappedException(h0, ex);
2537 >            rs[0].assertNotInvoked();
2538 >        }
2539 >        try {
2540 >            assertEquals(null, h1.join());
2541 >            rs[1].assertValue(v1);
2542 >        } catch (CompletionException ok) {
2543 >            checkCompletedWithWrappedException(h1, ex);
2544 >            rs[1].assertNotInvoked();
2545 >        }
2546 >        try {
2547 >            assertEquals(null, h2.join());
2548 >            rs[2].assertValue(v1);
2549 >        } catch (CompletionException ok) {
2550 >            checkCompletedWithWrappedException(h2, ex);
2551 >            rs[2].assertNotInvoked();
2552 >        }
2553 >        try {
2554 >            assertEquals(null, h3.join());
2555 >            rs[3].assertValue(v1);
2556 >        } catch (CompletionException ok) {
2557 >            checkCompletedWithWrappedException(h3, ex);
2558 >            rs[3].assertNotInvoked();
2559 >        }
2560 >
2561 >        checkCompletedNormally(f, v1);
2562 >        checkCompletedExceptionally(g, ex);
2563 >    }}
2564  
2565      /**
2566 <     * acceptEither result completes exceptionally if action does
2566 >     * acceptEither result completes exceptionally if either source cancelled
2567       */
2568 <    public void testAcceptEither3() {
2569 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2570 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2571 <        FailingConsumer r = new FailingConsumer();
2572 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2573 <        f2.complete(two);
2574 <        checkCompletedWithWrappedCFException(g);
2575 <    }
2568 >    public void testAcceptEither_sourceCancelled() {
2569 >        for (ExecutionMode m : ExecutionMode.values())
2570 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2571 >        for (Integer v1 : new Integer[] { 1, null })
2572 >    {
2573 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2574 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2575 >        final NoopConsumer[] rs = new NoopConsumer[6];
2576 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2577 >
2578 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2579 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2580 >        checkIncomplete(h0);
2581 >        checkIncomplete(h1);
2582 >        rs[0].assertNotInvoked();
2583 >        rs[1].assertNotInvoked();
2584 >        f.cancel(mayInterruptIfRunning);
2585 >        checkCompletedWithWrappedCancellationException(h0);
2586 >        checkCompletedWithWrappedCancellationException(h1);
2587 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2588 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2589 >        checkCompletedWithWrappedCancellationException(h2);
2590 >        checkCompletedWithWrappedCancellationException(h3);
2591 >
2592 >        g.complete(v1);
2593 >
2594 >        // unspecified behavior - both source completions available
2595 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2596 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2597 >        try {
2598 >            assertNull(h4.join());
2599 >            rs[4].assertValue(v1);
2600 >        } catch (CompletionException ok) {
2601 >            checkCompletedWithWrappedCancellationException(h4);
2602 >            rs[4].assertNotInvoked();
2603 >        }
2604 >        try {
2605 >            assertNull(h5.join());
2606 >            rs[5].assertValue(v1);
2607 >        } catch (CompletionException ok) {
2608 >            checkCompletedWithWrappedCancellationException(h5);
2609 >            rs[5].assertNotInvoked();
2610 >        }
2611 >
2612 >        checkCancelled(f);
2613 >        checkCompletedNormally(g, v1);
2614 >        checkCompletedWithWrappedCancellationException(h0);
2615 >        checkCompletedWithWrappedCancellationException(h1);
2616 >        checkCompletedWithWrappedCancellationException(h2);
2617 >        checkCompletedWithWrappedCancellationException(h3);
2618 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2619 >    }}
2620  
2621      /**
2622 <     * acceptEither result completes exceptionally if either source cancelled
2622 >     * acceptEither result completes exceptionally if action does
2623       */
2624 <    public void testAcceptEither4() {
2625 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2626 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2627 <        IncAction r = new IncAction();
2628 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
2629 <        assertTrue(f.cancel(true));
2630 <        checkCompletedWithWrappedCancellationException(g);
2631 <        f = new CompletableFuture<>();
2632 <        f2 = new CompletableFuture<>();
2633 <        assertTrue(f2.cancel(true));
2634 <        checkCompletedWithWrappedCancellationException(g);
2635 <    }
2624 >    public void testAcceptEither_actionFailed() {
2625 >        for (ExecutionMode m : ExecutionMode.values())
2626 >        for (Integer v1 : new Integer[] { 1, null })
2627 >        for (Integer v2 : new Integer[] { 2, null })
2628 >    {
2629 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2630 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2631 >        final FailingConsumer[] rs = new FailingConsumer[6];
2632 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2633 >
2634 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2635 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2636 >        f.complete(v1);
2637 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2638 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2639 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2640 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2641 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2642 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2643 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2644 >
2645 >        g.complete(v2);
2646 >
2647 >        // unspecified behavior - both source completions available
2648 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2649 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2650 >
2651 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2652 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2653 >                   Objects.equals(v2, rs[4].value));
2654 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2655 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2656 >                   Objects.equals(v2, rs[5].value));
2657 >
2658 >        checkCompletedNormally(f, v1);
2659 >        checkCompletedNormally(g, v2);
2660 >    }}
2661  
2662      /**
2663       * runAfterEither result completes normally after normal completion
2664       * of either source
2665       */
2666 <    public void testRunAfterEither() {
2667 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2668 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2669 <        Noop r = new Noop();
2670 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2671 <        f.complete(one);
2672 <        checkCompletedNormally(g, null);
2673 <        f2.complete(one);
2674 <        checkCompletedNormally(g, null);
2675 <        assertTrue(r.ran);
2676 <
2677 <        r = new Noop();
2678 <        f = new CompletableFuture<>();
2679 <        f.complete(one);
2680 <        f2 = new CompletableFuture<>();
2681 <        g = f.runAfterEither(f2, r);
2682 <        checkCompletedNormally(g, null);
2683 <        assertTrue(r.ran);
2684 <    }
2666 >    public void testRunAfterEither_normalCompletion() {
2667 >        for (ExecutionMode m : ExecutionMode.values())
2668 >        for (Integer v1 : new Integer[] { 1, null })
2669 >        for (Integer v2 : new Integer[] { 2, null })
2670 >    {
2671 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2672 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2673 >        final Noop[] rs = new Noop[6];
2674 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2675 >
2676 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2677 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2678 >        checkIncomplete(h0);
2679 >        checkIncomplete(h1);
2680 >        rs[0].assertNotInvoked();
2681 >        rs[1].assertNotInvoked();
2682 >        f.complete(v1);
2683 >        checkCompletedNormally(h0, null);
2684 >        checkCompletedNormally(h1, null);
2685 >        rs[0].assertInvoked();
2686 >        rs[1].assertInvoked();
2687 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2688 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2689 >        checkCompletedNormally(h2, null);
2690 >        checkCompletedNormally(h3, null);
2691 >        rs[2].assertInvoked();
2692 >        rs[3].assertInvoked();
2693 >
2694 >        g.complete(v2);
2695 >
2696 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2697 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2698 >
2699 >        checkCompletedNormally(f, v1);
2700 >        checkCompletedNormally(g, v2);
2701 >        checkCompletedNormally(h0, null);
2702 >        checkCompletedNormally(h1, null);
2703 >        checkCompletedNormally(h2, null);
2704 >        checkCompletedNormally(h3, null);
2705 >        checkCompletedNormally(h4, null);
2706 >        checkCompletedNormally(h5, null);
2707 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2708 >    }}
2709  
2710      /**
2711       * runAfterEither result completes exceptionally after exceptional
2712       * completion of either source
2713       */
2714 <    public void testRunAfterEither2() {
2715 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2716 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2717 <        Noop r = new Noop();
2718 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2719 <        f.completeExceptionally(new CFException());
2720 <        f2.complete(one);
2721 <        checkCompletedWithWrappedCFException(g);
2714 >    public void testRunAfterEither_exceptionalCompletion() {
2715 >        for (ExecutionMode m : ExecutionMode.values())
2716 >        for (Integer v1 : new Integer[] { 1, null })
2717 >    {
2718 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2719 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2720 >        final CFException ex = new CFException();
2721 >        final Noop[] rs = new Noop[6];
2722 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2723 >
2724 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2725 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2726 >        checkIncomplete(h0);
2727 >        checkIncomplete(h1);
2728 >        rs[0].assertNotInvoked();
2729 >        rs[1].assertNotInvoked();
2730 >        assertTrue(f.completeExceptionally(ex));
2731 >        checkCompletedWithWrappedException(h0, ex);
2732 >        checkCompletedWithWrappedException(h1, ex);
2733 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2734 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2735 >        checkCompletedWithWrappedException(h2, ex);
2736 >        checkCompletedWithWrappedException(h3, ex);
2737 >
2738 >        assertTrue(g.complete(v1));
2739 >
2740 >        // unspecified behavior - both source completions available
2741 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2742 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2743 >        try {
2744 >            assertNull(h4.join());
2745 >            rs[4].assertInvoked();
2746 >        } catch (CompletionException ok) {
2747 >            checkCompletedWithWrappedException(h4, ex);
2748 >            rs[4].assertNotInvoked();
2749 >        }
2750 >        try {
2751 >            assertNull(h5.join());
2752 >            rs[5].assertInvoked();
2753 >        } catch (CompletionException ok) {
2754 >            checkCompletedWithWrappedException(h5, ex);
2755 >            rs[5].assertNotInvoked();
2756 >        }
2757  
2758 <        r = new Noop();
2759 <        f = new CompletableFuture<>();
2760 <        f2 = new CompletableFuture<>();
2761 <        f2.completeExceptionally(new CFException());
2762 <        g = f.runAfterEither(f2, r);
2763 <        checkCompletedWithWrappedCFException(g);
2764 <    }
2758 >        checkCompletedExceptionally(f, ex);
2759 >        checkCompletedNormally(g, v1);
2760 >        checkCompletedWithWrappedException(h0, ex);
2761 >        checkCompletedWithWrappedException(h1, ex);
2762 >        checkCompletedWithWrappedException(h2, ex);
2763 >        checkCompletedWithWrappedException(h3, ex);
2764 >        checkCompletedWithWrappedException(h4, ex);
2765 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2766 >    }}
2767 >
2768 >    public void testRunAfterEither_exceptionalCompletion2() {
2769 >        for (ExecutionMode m : ExecutionMode.values())
2770 >        for (boolean fFirst : new boolean[] { true, false })
2771 >        for (Integer v1 : new Integer[] { 1, null })
2772 >    {
2773 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2774 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2775 >        final CFException ex = new CFException();
2776 >        final Noop[] rs = new Noop[6];
2777 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2778 >
2779 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2780 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2781 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2782 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2783 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2784 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2785 >
2786 >        // unspecified behavior - both source completions available
2787 >        try {
2788 >            assertEquals(null, h0.join());
2789 >            rs[0].assertInvoked();
2790 >        } catch (CompletionException ok) {
2791 >            checkCompletedWithWrappedException(h0, ex);
2792 >            rs[0].assertNotInvoked();
2793 >        }
2794 >        try {
2795 >            assertEquals(null, h1.join());
2796 >            rs[1].assertInvoked();
2797 >        } catch (CompletionException ok) {
2798 >            checkCompletedWithWrappedException(h1, ex);
2799 >            rs[1].assertNotInvoked();
2800 >        }
2801 >        try {
2802 >            assertEquals(null, h2.join());
2803 >            rs[2].assertInvoked();
2804 >        } catch (CompletionException ok) {
2805 >            checkCompletedWithWrappedException(h2, ex);
2806 >            rs[2].assertNotInvoked();
2807 >        }
2808 >        try {
2809 >            assertEquals(null, h3.join());
2810 >            rs[3].assertInvoked();
2811 >        } catch (CompletionException ok) {
2812 >            checkCompletedWithWrappedException(h3, ex);
2813 >            rs[3].assertNotInvoked();
2814 >        }
2815 >
2816 >        checkCompletedNormally(f, v1);
2817 >        checkCompletedExceptionally(g, ex);
2818 >    }}
2819  
2820      /**
2821 <     * runAfterEither result completes exceptionally if action does
2821 >     * runAfterEither result completes exceptionally if either source cancelled
2822       */
2823 <    public void testRunAfterEither3() {
2824 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2825 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2826 <        FailingNoop r = new FailingNoop();
2827 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2828 <        f2.complete(two);
2829 <        checkCompletedWithWrappedCFException(g);
2830 <    }
2823 >    public void testRunAfterEither_sourceCancelled() {
2824 >        for (ExecutionMode m : ExecutionMode.values())
2825 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2826 >        for (Integer v1 : new Integer[] { 1, null })
2827 >    {
2828 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2829 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2830 >        final Noop[] rs = new Noop[6];
2831 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2832 >
2833 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2834 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2835 >        checkIncomplete(h0);
2836 >        checkIncomplete(h1);
2837 >        rs[0].assertNotInvoked();
2838 >        rs[1].assertNotInvoked();
2839 >        f.cancel(mayInterruptIfRunning);
2840 >        checkCompletedWithWrappedCancellationException(h0);
2841 >        checkCompletedWithWrappedCancellationException(h1);
2842 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2843 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2844 >        checkCompletedWithWrappedCancellationException(h2);
2845 >        checkCompletedWithWrappedCancellationException(h3);
2846 >
2847 >        assertTrue(g.complete(v1));
2848 >
2849 >        // unspecified behavior - both source completions available
2850 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2851 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2852 >        try {
2853 >            assertNull(h4.join());
2854 >            rs[4].assertInvoked();
2855 >        } catch (CompletionException ok) {
2856 >            checkCompletedWithWrappedCancellationException(h4);
2857 >            rs[4].assertNotInvoked();
2858 >        }
2859 >        try {
2860 >            assertNull(h5.join());
2861 >            rs[5].assertInvoked();
2862 >        } catch (CompletionException ok) {
2863 >            checkCompletedWithWrappedCancellationException(h5);
2864 >            rs[5].assertNotInvoked();
2865 >        }
2866 >
2867 >        checkCancelled(f);
2868 >        checkCompletedNormally(g, v1);
2869 >        checkCompletedWithWrappedCancellationException(h0);
2870 >        checkCompletedWithWrappedCancellationException(h1);
2871 >        checkCompletedWithWrappedCancellationException(h2);
2872 >        checkCompletedWithWrappedCancellationException(h3);
2873 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2874 >    }}
2875  
2876      /**
2877 <     * runAfterEither result completes exceptionally if either source cancelled
2877 >     * runAfterEither result completes exceptionally if action does
2878       */
2879 <    public void testRunAfterEither4() {
2880 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2881 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2882 <        Noop r = new Noop();
2883 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2884 <        assertTrue(f.cancel(true));
2885 <        checkCompletedWithWrappedCancellationException(g);
2886 <        f = new CompletableFuture<>();
2887 <        f2 = new CompletableFuture<>();
2888 <        assertTrue(f2.cancel(true));
2889 <        checkCompletedWithWrappedCancellationException(g);
2890 <    }
2879 >    public void testRunAfterEither_actionFailed() {
2880 >        for (ExecutionMode m : ExecutionMode.values())
2881 >        for (Integer v1 : new Integer[] { 1, null })
2882 >        for (Integer v2 : new Integer[] { 2, null })
2883 >    {
2884 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2885 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2886 >        final FailingRunnable[] rs = new FailingRunnable[6];
2887 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2888 >
2889 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2890 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2891 >        assertTrue(f.complete(v1));
2892 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2893 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2894 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2895 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2896 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2897 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2898 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2899 >        assertTrue(g.complete(v2));
2900 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2901 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2902 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2903 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2904 >
2905 >        checkCompletedNormally(f, v1);
2906 >        checkCompletedNormally(g, v2);
2907 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2908 >    }}
2909  
2910      /**
2911       * thenCompose result completes normally after normal completion of source
2912       */
2913 <    public void testThenCompose() {
2914 <        CompletableFuture<Integer> f, g;
2915 <        CompletableFutureInc r;
2916 <
2917 <        f = new CompletableFuture<>();
2918 <        g = f.thenCompose(r = new CompletableFutureInc());
2919 <        f.complete(one);
2920 <        checkCompletedNormally(g, two);
2921 <        assertTrue(r.ran);
2922 <
2923 <        f = new CompletableFuture<>();
2924 <        f.complete(one);
2925 <        g = f.thenCompose(r = new CompletableFutureInc());
2926 <        checkCompletedNormally(g, two);
2927 <        assertTrue(r.ran);
1262 <    }
2913 >    public void testThenCompose_normalCompletion() {
2914 >        for (ExecutionMode m : ExecutionMode.values())
2915 >        for (boolean createIncomplete : new boolean[] { true, false })
2916 >        for (Integer v1 : new Integer[] { 1, null })
2917 >    {
2918 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2919 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2920 >        if (!createIncomplete) assertTrue(f.complete(v1));
2921 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2922 >        if (createIncomplete) assertTrue(f.complete(v1));
2923 >
2924 >        checkCompletedNormally(g, inc(v1));
2925 >        checkCompletedNormally(f, v1);
2926 >        r.assertValue(v1);
2927 >    }}
2928  
2929      /**
2930       * thenCompose result completes exceptionally after exceptional
2931       * completion of source
2932       */
2933 <    public void testThenCompose2() {
2934 <        CompletableFuture<Integer> f, g;
2935 <        CompletableFutureInc r;
2936 <
2937 <        f = new CompletableFuture<>();
2938 <        g = f.thenCompose(r = new CompletableFutureInc());
2939 <        f.completeExceptionally(new CFException());
2940 <        checkCompletedWithWrappedCFException(g);
2941 <
2942 <        f = new CompletableFuture<>();
2943 <        f.completeExceptionally(new CFException());
2944 <        g = f.thenCompose(r = new CompletableFutureInc());
2945 <        checkCompletedWithWrappedCFException(g);
2946 <    }
2933 >    public void testThenCompose_exceptionalCompletion() {
2934 >        for (ExecutionMode m : ExecutionMode.values())
2935 >        for (boolean createIncomplete : new boolean[] { true, false })
2936 >    {
2937 >        final CFException ex = new CFException();
2938 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2940 >        if (!createIncomplete) f.completeExceptionally(ex);
2941 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2942 >        if (createIncomplete) f.completeExceptionally(ex);
2943 >
2944 >        checkCompletedWithWrappedException(g, ex);
2945 >        checkCompletedExceptionally(f, ex);
2946 >        r.assertNotInvoked();
2947 >    }}
2948  
2949      /**
2950       * thenCompose result completes exceptionally if action does
2951       */
2952 <    public void testThenCompose3() {
2953 <        CompletableFuture<Integer> f, g;
2954 <        FailingCompletableFutureFunction r;
2955 <
2956 <        f = new CompletableFuture<>();
2957 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2958 <        f.complete(one);
2959 <        checkCompletedWithWrappedCFException(g);
2960 <
2961 <        f = new CompletableFuture<>();
2962 <        f.complete(one);
2963 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2964 <        checkCompletedWithWrappedCFException(g);
2965 <    }
2952 >    public void testThenCompose_actionFailed() {
2953 >        for (ExecutionMode m : ExecutionMode.values())
2954 >        for (boolean createIncomplete : new boolean[] { true, false })
2955 >        for (Integer v1 : new Integer[] { 1, null })
2956 >    {
2957 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2958 >        final FailingCompletableFutureFunction r
2959 >            = new FailingCompletableFutureFunction(m);
2960 >        if (!createIncomplete) assertTrue(f.complete(v1));
2961 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2962 >        if (createIncomplete) assertTrue(f.complete(v1));
2963 >
2964 >        checkCompletedWithWrappedException(g, r.ex);
2965 >        checkCompletedNormally(f, v1);
2966 >    }}
2967  
2968      /**
2969       * thenCompose result completes exceptionally if source cancelled
2970       */
2971 <    public void testThenCompose4() {
2972 <        CompletableFuture<Integer> f, g;
2973 <        CompletableFutureInc r;
2974 <
2975 <        f = new CompletableFuture<>();
2976 <        g = f.thenCompose(r = new CompletableFutureInc());
2977 <        assertTrue(f.cancel(true));
2978 <        checkCompletedWithWrappedCancellationException(g);
2971 >    public void testThenCompose_sourceCancelled() {
2972 >        for (ExecutionMode m : ExecutionMode.values())
2973 >        for (boolean createIncomplete : new boolean[] { true, false })
2974 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2975 >    {
2976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2977 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2978 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2979 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2980 >        if (createIncomplete) {
2981 >            checkIncomplete(g);
2982 >            assertTrue(f.cancel(mayInterruptIfRunning));
2983 >        }
2984  
1313        f = new CompletableFuture<>();
1314        assertTrue(f.cancel(true));
1315        g = f.thenCompose(r = new CompletableFutureInc());
2985          checkCompletedWithWrappedCancellationException(g);
2986 <    }
2987 <
1319 <    // asyncs
1320 <
1321 <    /**
1322 <     * thenRunAsync result completes normally after normal completion of source
1323 <     */
1324 <    public void testThenRunAsync() {
1325 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1326 <        Noop r = new Noop();
1327 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1328 <        f.complete(null);
1329 <        checkCompletedNormally(g, null);
1330 <
1331 <        // reordered version
1332 <        f = new CompletableFuture<>();
1333 <        f.complete(null);
1334 <        r = new Noop();
1335 <        g = f.thenRunAsync(r);
1336 <        checkCompletedNormally(g, null);
1337 <    }
2986 >        checkCancelled(f);
2987 >    }}
2988  
2989      /**
2990 <     * thenRunAsync result completes exceptionally after exceptional
1341 <     * completion of source
2990 >     * thenCompose result completes exceptionally if the result of the action does
2991       */
2992 <    public void testThenRunAsync2() {
2993 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2994 <        Noop r = new Noop();
2995 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2996 <        f.completeExceptionally(new CFException());
2997 <        try {
2998 <            g.join();
2999 <            shouldThrow();
3000 <        } catch (CompletionException success) {}
3001 <        checkCompletedWithWrappedCFException(g);
3002 <    }
2992 >    public void testThenCompose_actionReturnsFailingFuture() {
2993 >        for (ExecutionMode m : ExecutionMode.values())
2994 >        for (int order = 0; order < 6; order++)
2995 >        for (Integer v1 : new Integer[] { 1, null })
2996 >    {
2997 >        final CFException ex = new CFException();
2998 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2999 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3000 >        final CompletableFuture<Integer> h;
3001 >        // Test all permutations of orders
3002 >        switch (order) {
3003 >        case 0:
3004 >            assertTrue(f.complete(v1));
3005 >            assertTrue(g.completeExceptionally(ex));
3006 >            h = m.thenCompose(f, (x -> g));
3007 >            break;
3008 >        case 1:
3009 >            assertTrue(f.complete(v1));
3010 >            h = m.thenCompose(f, (x -> g));
3011 >            assertTrue(g.completeExceptionally(ex));
3012 >            break;
3013 >        case 2:
3014 >            assertTrue(g.completeExceptionally(ex));
3015 >            assertTrue(f.complete(v1));
3016 >            h = m.thenCompose(f, (x -> g));
3017 >            break;
3018 >        case 3:
3019 >            assertTrue(g.completeExceptionally(ex));
3020 >            h = m.thenCompose(f, (x -> g));
3021 >            assertTrue(f.complete(v1));
3022 >            break;
3023 >        case 4:
3024 >            h = m.thenCompose(f, (x -> g));
3025 >            assertTrue(f.complete(v1));
3026 >            assertTrue(g.completeExceptionally(ex));
3027 >            break;
3028 >        case 5:
3029 >            h = m.thenCompose(f, (x -> g));
3030 >            assertTrue(f.complete(v1));
3031 >            assertTrue(g.completeExceptionally(ex));
3032 >            break;
3033 >        default: throw new AssertionError();
3034 >        }
3035  
3036 <    /**
3037 <     * thenRunAsync result completes exceptionally if action does
3038 <     */
3039 <    public void testThenRunAsync3() {
1359 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1360 <        FailingNoop r = new FailingNoop();
1361 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1362 <        f.complete(null);
1363 <        checkCompletedWithWrappedCFException(g);
1364 <    }
3036 >        checkCompletedExceptionally(g, ex);
3037 >        checkCompletedWithWrappedException(h, ex);
3038 >        checkCompletedNormally(f, v1);
3039 >    }}
3040  
3041 <    /**
1367 <     * thenRunAsync result completes exceptionally if source cancelled
1368 <     */
1369 <    public void testThenRunAsync4() {
1370 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1371 <        Noop r = new Noop();
1372 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1373 <        assertTrue(f.cancel(true));
1374 <        checkCompletedWithWrappedCancellationException(g);
1375 <    }
3041 >    // other static methods
3042  
3043      /**
3044 <     * thenApplyAsync result completes normally after normal completion of source
3044 >     * allOf(no component futures) returns a future completed normally
3045 >     * with the value null
3046       */
3047 <    public void testThenApplyAsync() {
3048 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3049 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1383 <        f.complete(one);
1384 <        checkCompletedNormally(g, two);
3047 >    public void testAllOf_empty() throws Exception {
3048 >        CompletableFuture<Void> f = CompletableFuture.allOf();
3049 >        checkCompletedNormally(f, null);
3050      }
3051  
3052      /**
3053 <     * thenApplyAsync result completes exceptionally after exceptional
3054 <     * completion of source
3053 >     * allOf returns a future completed normally with the value null
3054 >     * when all components complete normally
3055       */
3056 <    public void testThenApplyAsync2() {
3057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3058 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3059 <        f.completeExceptionally(new CFException());
3060 <        checkCompletedWithWrappedCFException(g);
3056 >    public void testAllOf_normal() throws Exception {
3057 >        for (int k = 1; k < 10; k++) {
3058 >            CompletableFuture<Integer>[] fs
3059 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3060 >            for (int i = 0; i < k; i++)
3061 >                fs[i] = new CompletableFuture<>();
3062 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3063 >            for (int i = 0; i < k; i++) {
3064 >                checkIncomplete(f);
3065 >                checkIncomplete(CompletableFuture.allOf(fs));
3066 >                fs[i].complete(one);
3067 >            }
3068 >            checkCompletedNormally(f, null);
3069 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3070 >        }
3071      }
3072  
3073 <    /**
3074 <     * thenApplyAsync result completes exceptionally if action does
3075 <     */
3076 <    public void testThenApplyAsync3() {
3077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3078 <        FailingFunction r = new FailingFunction();
3079 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3080 <        f.complete(null);
3081 <        checkCompletedWithWrappedCFException(g);
3073 >    public void testAllOf_normal_backwards() throws Exception {
3074 >        for (int k = 1; k < 10; k++) {
3075 >            CompletableFuture<Integer>[] fs
3076 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3077 >            for (int i = 0; i < k; i++)
3078 >                fs[i] = new CompletableFuture<>();
3079 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3080 >            for (int i = k - 1; i >= 0; i--) {
3081 >                checkIncomplete(f);
3082 >                checkIncomplete(CompletableFuture.allOf(fs));
3083 >                fs[i].complete(one);
3084 >            }
3085 >            checkCompletedNormally(f, null);
3086 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3087 >        }
3088      }
3089  
3090 <    /**
3091 <     * thenApplyAsync result completes exceptionally if source cancelled
3092 <     */
3093 <    public void testThenApplyAsync4() {
3094 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3095 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3096 <        assertTrue(f.cancel(true));
3097 <        checkCompletedWithWrappedCancellationException(g);
3090 >    public void testAllOf_exceptional() throws Exception {
3091 >        for (int k = 1; k < 10; k++) {
3092 >            CompletableFuture<Integer>[] fs
3093 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3094 >            CFException ex = new CFException();
3095 >            for (int i = 0; i < k; i++)
3096 >                fs[i] = new CompletableFuture<>();
3097 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3098 >            for (int i = 0; i < k; i++) {
3099 >                checkIncomplete(f);
3100 >                checkIncomplete(CompletableFuture.allOf(fs));
3101 >                if (i != k / 2) {
3102 >                    fs[i].complete(i);
3103 >                    checkCompletedNormally(fs[i], i);
3104 >                } else {
3105 >                    fs[i].completeExceptionally(ex);
3106 >                    checkCompletedExceptionally(fs[i], ex);
3107 >                }
3108 >            }
3109 >            checkCompletedWithWrappedException(f, ex);
3110 >            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3111 >        }
3112      }
3113  
3114      /**
3115 <     * thenAcceptAsync result completes normally after normal
1421 <     * completion of source
3115 >     * anyOf(no component futures) returns an incomplete future
3116       */
3117 <    public void testThenAcceptAsync() {
3118 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3119 <        IncAction r = new IncAction();
3120 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3121 <        f.complete(one);
1428 <        checkCompletedNormally(g, null);
1429 <        assertEquals(r.value, 2);
1430 <    }
3117 >    public void testAnyOf_empty() throws Exception {
3118 >        for (Integer v1 : new Integer[] { 1, null })
3119 >    {
3120 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
3121 >        checkIncomplete(f);
3122  
3123 <    /**
3124 <     * thenAcceptAsync result completes exceptionally after exceptional
3125 <     * completion of source
1435 <     */
1436 <    public void testThenAcceptAsync2() {
1437 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1438 <        IncAction r = new IncAction();
1439 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1440 <        f.completeExceptionally(new CFException());
1441 <        checkCompletedWithWrappedCFException(g);
1442 <    }
3123 >        f.complete(v1);
3124 >        checkCompletedNormally(f, v1);
3125 >    }}
3126  
3127      /**
3128 <     * thenAcceptAsync result completes exceptionally if action does
3128 >     * anyOf returns a future completed normally with a value when
3129 >     * a component future does
3130       */
3131 <    public void testThenAcceptAsync3() {
3132 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3133 <        FailingConsumer r = new FailingConsumer();
3134 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3135 <        f.complete(null);
3136 <        checkCompletedWithWrappedCFException(g);
3131 >    public void testAnyOf_normal() throws Exception {
3132 >        for (int k = 0; k < 10; k++) {
3133 >            CompletableFuture[] fs = new CompletableFuture[k];
3134 >            for (int i = 0; i < k; i++)
3135 >                fs[i] = new CompletableFuture<>();
3136 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3137 >            checkIncomplete(f);
3138 >            for (int i = 0; i < k; i++) {
3139 >                fs[i].complete(i);
3140 >                checkCompletedNormally(f, 0);
3141 >                int x = (int) CompletableFuture.anyOf(fs).join();
3142 >                assertTrue(0 <= x && x <= i);
3143 >            }
3144 >        }
3145      }
3146 <
3147 <    /**
3148 <     * thenAcceptAsync result completes exceptionally if source cancelled
3149 <     */
3150 <    public void testThenAcceptAsync4() {
3151 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3152 <        IncAction r = new IncAction();
3153 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3154 <        assertTrue(f.cancel(true));
3155 <        checkCompletedWithWrappedCancellationException(g);
3146 >    public void testAnyOf_normal_backwards() throws Exception {
3147 >        for (int k = 0; k < 10; k++) {
3148 >            CompletableFuture[] fs = new CompletableFuture[k];
3149 >            for (int i = 0; i < k; i++)
3150 >                fs[i] = new CompletableFuture<>();
3151 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3152 >            checkIncomplete(f);
3153 >            for (int i = k - 1; i >= 0; i--) {
3154 >                fs[i].complete(i);
3155 >                checkCompletedNormally(f, k - 1);
3156 >                int x = (int) CompletableFuture.anyOf(fs).join();
3157 >                assertTrue(i <= x && x <= k - 1);
3158 >            }
3159 >        }
3160      }
3161  
3162      /**
3163 <     * thenCombineAsync result completes normally after normal
1468 <     * completion of sources
3163 >     * anyOf result completes exceptionally when any component does.
3164       */
3165 <    public void testThenCombineAsync() {
3166 <        CompletableFuture<Integer> f, g, h;
3167 <
3168 <        f = new CompletableFuture<>();
3169 <        g = new CompletableFuture<>();
3170 <        h = f.thenCombineAsync(g, subtract);
3171 <        f.complete(3);
3172 <        checkIncomplete(h);
3173 <        g.complete(1);
3174 <        checkCompletedNormally(h, 2);
3175 <
3176 <        f = new CompletableFuture<>();
3177 <        g = new CompletableFuture<>();
3178 <        h = f.thenCombineAsync(g, subtract);
3179 <        g.complete(1);
3180 <        checkIncomplete(h);
1486 <        f.complete(3);
1487 <        checkCompletedNormally(h, 2);
1488 <
1489 <        f = new CompletableFuture<>();
1490 <        g = new CompletableFuture<>();
1491 <        g.complete(1);
1492 <        f.complete(3);
1493 <        h = f.thenCombineAsync(g, subtract);
1494 <        checkCompletedNormally(h, 2);
3165 >    public void testAnyOf_exceptional() throws Exception {
3166 >        for (int k = 0; k < 10; k++) {
3167 >            CompletableFuture[] fs = new CompletableFuture[k];
3168 >            CFException[] exs = new CFException[k];
3169 >            for (int i = 0; i < k; i++) {
3170 >                fs[i] = new CompletableFuture<>();
3171 >                exs[i] = new CFException();
3172 >            }
3173 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3174 >            checkIncomplete(f);
3175 >            for (int i = 0; i < k; i++) {
3176 >                fs[i].completeExceptionally(exs[i]);
3177 >                checkCompletedWithWrappedException(f, exs[0]);
3178 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3179 >            }
3180 >        }
3181      }
3182  
3183 <    /**
3184 <     * thenCombineAsync result completes exceptionally after exceptional
3185 <     * completion of either source
3186 <     */
3187 <    public void testThenCombineAsync2() {
3188 <        CompletableFuture<Integer> f, g, h;
3189 <
3190 <        f = new CompletableFuture<>();
3191 <        g = new CompletableFuture<>();
3192 <        h = f.thenCombineAsync(g, subtract);
3193 <        f.completeExceptionally(new CFException());
3194 <        checkIncomplete(h);
3195 <        g.complete(1);
3196 <        checkCompletedWithWrappedCFException(h);
3197 <
3198 <        f = new CompletableFuture<>();
1513 <        g = new CompletableFuture<>();
1514 <        h = f.thenCombineAsync(g, subtract);
1515 <        g.completeExceptionally(new CFException());
1516 <        checkIncomplete(h);
1517 <        f.complete(3);
1518 <        checkCompletedWithWrappedCFException(h);
1519 <
1520 <        f = new CompletableFuture<>();
1521 <        g = new CompletableFuture<>();
1522 <        g.completeExceptionally(new CFException());
1523 <        f.complete(3);
1524 <        h = f.thenCombineAsync(g, subtract);
1525 <        checkCompletedWithWrappedCFException(h);
3183 >    public void testAnyOf_exceptional_backwards() throws Exception {
3184 >        for (int k = 0; k < 10; k++) {
3185 >            CompletableFuture[] fs = new CompletableFuture[k];
3186 >            CFException[] exs = new CFException[k];
3187 >            for (int i = 0; i < k; i++) {
3188 >                fs[i] = new CompletableFuture<>();
3189 >                exs[i] = new CFException();
3190 >            }
3191 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3192 >            checkIncomplete(f);
3193 >            for (int i = k - 1; i >= 0; i--) {
3194 >                fs[i].completeExceptionally(exs[i]);
3195 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3196 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3197 >            }
3198 >        }
3199      }
3200  
3201      /**
3202 <     * thenCombineAsync result completes exceptionally if action does
3202 >     * Completion methods throw NullPointerException with null arguments
3203       */
3204 <    public void testThenCombineAsync3() {
3204 >    public void testNPE() {
3205          CompletableFuture<Integer> f = new CompletableFuture<>();
3206 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3207 <        FailingBiFunction r = new FailingBiFunction();
3208 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1536 <        f.complete(one);
1537 <        checkIncomplete(g);
1538 <        assertFalse(r.ran);
1539 <        f2.complete(two);
1540 <        checkCompletedWithWrappedCFException(g);
1541 <        assertTrue(r.ran);
1542 <    }
1543 <
1544 <    /**
1545 <     * thenCombineAsync result completes exceptionally if either source cancelled
1546 <     */
1547 <    public void testThenCombineAsync4() {
1548 <        CompletableFuture<Integer> f, g, h;
1549 <
1550 <        f = new CompletableFuture<>();
1551 <        g = new CompletableFuture<>();
1552 <        h = f.thenCombineAsync(g, subtract);
1553 <        assertTrue(f.cancel(true));
1554 <        checkIncomplete(h);
1555 <        g.complete(1);
1556 <        checkCompletedWithWrappedCancellationException(h);
1557 <
1558 <        f = new CompletableFuture<>();
1559 <        g = new CompletableFuture<>();
1560 <        h = f.thenCombineAsync(g, subtract);
1561 <        assertTrue(g.cancel(true));
1562 <        checkIncomplete(h);
1563 <        f.complete(3);
1564 <        checkCompletedWithWrappedCancellationException(h);
1565 <
1566 <        f = new CompletableFuture<>();
1567 <        g = new CompletableFuture<>();
1568 <        g.complete(3);
1569 <        assertTrue(f.cancel(true));
1570 <        h = f.thenCombineAsync(g, subtract);
1571 <        checkCompletedWithWrappedCancellationException(h);
1572 <
1573 <        f = new CompletableFuture<>();
1574 <        g = new CompletableFuture<>();
1575 <        f.complete(3);
1576 <        assertTrue(g.cancel(true));
1577 <        h = f.thenCombineAsync(g, subtract);
1578 <        checkCompletedWithWrappedCancellationException(h);
1579 <    }
3206 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3207 >        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3208 >        ThreadExecutor exec = new ThreadExecutor();
3209  
3210 <    /**
3211 <     * thenAcceptBothAsync result completes normally after normal
3212 <     * completion of sources
3213 <     */
3214 <    public void testThenAcceptBothAsync() {
3215 <        CompletableFuture<Integer> f, g;
3216 <        CompletableFuture<Void> h;
3217 <        SubtractAction r;
3210 >        Runnable[] throwingActions = {
3211 >            () -> CompletableFuture.supplyAsync(null),
3212 >            () -> CompletableFuture.supplyAsync(null, exec),
3213 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3214 >
3215 >            () -> CompletableFuture.runAsync(null),
3216 >            () -> CompletableFuture.runAsync(null, exec),
3217 >            () -> CompletableFuture.runAsync(() -> {}, null),
3218 >
3219 >            () -> f.completeExceptionally(null),
3220 >
3221 >            () -> f.thenApply(null),
3222 >            () -> f.thenApplyAsync(null),
3223 >            () -> f.thenApplyAsync((x) -> x, null),
3224 >            () -> f.thenApplyAsync(null, exec),
3225 >
3226 >            () -> f.thenAccept(null),
3227 >            () -> f.thenAcceptAsync(null),
3228 >            () -> f.thenAcceptAsync((x) -> {} , null),
3229 >            () -> f.thenAcceptAsync(null, exec),
3230 >
3231 >            () -> f.thenRun(null),
3232 >            () -> f.thenRunAsync(null),
3233 >            () -> f.thenRunAsync(() -> {} , null),
3234 >            () -> f.thenRunAsync(null, exec),
3235 >
3236 >            () -> f.thenCombine(g, null),
3237 >            () -> f.thenCombineAsync(g, null),
3238 >            () -> f.thenCombineAsync(g, null, exec),
3239 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
3240 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
3241 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
3242 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
3243 >
3244 >            () -> f.thenAcceptBoth(g, null),
3245 >            () -> f.thenAcceptBothAsync(g, null),
3246 >            () -> f.thenAcceptBothAsync(g, null, exec),
3247 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
3248 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
3249 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
3250 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
3251 >
3252 >            () -> f.runAfterBoth(g, null),
3253 >            () -> f.runAfterBothAsync(g, null),
3254 >            () -> f.runAfterBothAsync(g, null, exec),
3255 >            () -> f.runAfterBoth(nullFuture, () -> {}),
3256 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
3257 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
3258 >            () -> f.runAfterBothAsync(g, () -> {}, null),
3259 >
3260 >            () -> f.applyToEither(g, null),
3261 >            () -> f.applyToEitherAsync(g, null),
3262 >            () -> f.applyToEitherAsync(g, null, exec),
3263 >            () -> f.applyToEither(nullFuture, (x) -> x),
3264 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3265 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3266 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
3267 >
3268 >            () -> f.acceptEither(g, null),
3269 >            () -> f.acceptEitherAsync(g, null),
3270 >            () -> f.acceptEitherAsync(g, null, exec),
3271 >            () -> f.acceptEither(nullFuture, (x) -> {}),
3272 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3273 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3274 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3275 >
3276 >            () -> f.runAfterEither(g, null),
3277 >            () -> f.runAfterEitherAsync(g, null),
3278 >            () -> f.runAfterEitherAsync(g, null, exec),
3279 >            () -> f.runAfterEither(nullFuture, () -> {}),
3280 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
3281 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
3282 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
3283 >
3284 >            () -> f.thenCompose(null),
3285 >            () -> f.thenComposeAsync(null),
3286 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3287 >            () -> f.thenComposeAsync(null, exec),
3288 >
3289 >            () -> f.exceptionally(null),
3290 >
3291 >            () -> f.handle(null),
3292 >
3293 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
3294 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
3295 >            () -> CompletableFuture.allOf(f, null),
3296 >            () -> CompletableFuture.allOf(null, f),
3297 >
3298 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
3299 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
3300 >            () -> CompletableFuture.anyOf(f, null),
3301 >            () -> CompletableFuture.anyOf(null, f),
3302 >
3303 >            () -> f.obtrudeException(null),
3304 >
3305 >            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3306 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3307 >            () -> CompletableFuture.delayedExecutor(1L, null),
3308  
3309 <        f = new CompletableFuture<>();
3310 <        g = new CompletableFuture<>();
1592 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1593 <        f.complete(3);
1594 <        checkIncomplete(h);
1595 <        g.complete(1);
1596 <        checkCompletedNormally(h, null);
1597 <        assertEquals(r.value, 2);
3309 >            () -> f.orTimeout(1L, null),
3310 >            () -> f.completeOnTimeout(42, 1L, null),
3311  
3312 <        f = new CompletableFuture<>();
3313 <        g = new CompletableFuture<>();
3314 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1602 <        g.complete(1);
1603 <        checkIncomplete(h);
1604 <        f.complete(3);
1605 <        checkCompletedNormally(h, null);
1606 <        assertEquals(r.value, 2);
3312 >            () -> CompletableFuture.failedFuture(null),
3313 >            () -> CompletableFuture.failedStage(null),
3314 >        };
3315  
3316 <        f = new CompletableFuture<>();
3317 <        g = new CompletableFuture<>();
1610 <        g.complete(1);
1611 <        f.complete(3);
1612 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1613 <        checkCompletedNormally(h, null);
1614 <        assertEquals(r.value, 2);
3316 >        assertThrows(NullPointerException.class, throwingActions);
3317 >        assertEquals(0, exec.count.get());
3318      }
3319  
3320      /**
3321 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1619 <     * completion of source
3321 >     * Test submissions to an executor that rejects all tasks.
3322       */
3323 <    public void testThenAcceptBothAsync2() {
3324 <        CompletableFuture<Integer> f, g;
3325 <        CompletableFuture<Void> h;
3326 <        SubtractAction r;
3323 >    public void testRejectingExecutor() {
3324 >        final RejectedExecutionException ex = new RejectedExecutionException();
3325 >        final Executor e = (Runnable r) -> { throw ex; };
3326 >
3327 >        for (Integer v : new Integer[] { 1, null }) {
3328 >
3329 >        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3330 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3331 >
3332 >        List<CompletableFuture<?>> futures = new ArrayList<>();
3333 >
3334 >        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3335 >        srcs.add(complete);
3336 >        srcs.add(incomplete);
3337 >
3338 >        for (CompletableFuture<Integer> src : srcs) {
3339 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3340 >            fs.add(src.thenRunAsync(() -> {}, e));
3341 >            fs.add(src.thenAcceptAsync((z) -> {}, e));
3342 >            fs.add(src.thenApplyAsync((z) -> z, e));
3343 >
3344 >            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3345 >            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3346 >            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3347 >
3348 >            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3349 >            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3350 >            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3351 >
3352 >            fs.add(src.thenComposeAsync((z) -> null, e));
3353 >            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3354 >            fs.add(src.handleAsync((z, t) -> null, e));
3355 >
3356 >            for (CompletableFuture<?> future : fs) {
3357 >                if (src.isDone())
3358 >                    checkCompletedWithWrappedException(future, ex);
3359 >                else
3360 >                    checkIncomplete(future);
3361 >            }
3362 >            futures.addAll(fs);
3363 >        }
3364  
3365 <        f = new CompletableFuture<>();
3366 <        g = new CompletableFuture<>();
1628 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1629 <        f.completeExceptionally(new CFException());
1630 <        checkIncomplete(h);
1631 <        g.complete(1);
1632 <        checkCompletedWithWrappedCFException(h);
3365 >        {
3366 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3367  
3368 <        f = new CompletableFuture<>();
3369 <        g = new CompletableFuture<>();
1636 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1637 <        g.completeExceptionally(new CFException());
1638 <        checkIncomplete(h);
1639 <        f.complete(3);
1640 <        checkCompletedWithWrappedCFException(h);
3368 >            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3369 >            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3370  
3371 <        f = new CompletableFuture<>();
3372 <        g = new CompletableFuture<>();
1644 <        f.complete(3);
1645 <        g.completeExceptionally(new CFException());
1646 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1647 <        checkCompletedWithWrappedCFException(h);
3371 >            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3372 >            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3373  
3374 <        f = new CompletableFuture<>();
3375 <        g = new CompletableFuture<>();
1651 <        f.completeExceptionally(new CFException());
1652 <        g.complete(3);
1653 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1654 <        checkCompletedWithWrappedCFException(h);
1655 <    }
3374 >            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3375 >            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3376  
3377 <    /**
3378 <     * thenAcceptBothAsync result completes exceptionally if action does
3379 <     */
3380 <    public void testThenAcceptBothAsync3() {
1661 <        CompletableFuture<Integer> f, g;
1662 <        CompletableFuture<Void> h;
1663 <        FailingBiConsumer r;
3377 >            for (CompletableFuture<?> future : fs)
3378 >                checkIncomplete(future);
3379 >            futures.addAll(fs);
3380 >        }
3381  
3382 <        f = new CompletableFuture<>();
3383 <        g = new CompletableFuture<>();
1667 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1668 <        f.complete(3);
1669 <        checkIncomplete(h);
1670 <        g.complete(1);
1671 <        checkCompletedWithWrappedCFException(h);
3382 >        {
3383 >            List<CompletableFuture<?>> fs = new ArrayList<>();
3384  
3385 <        f = new CompletableFuture<>();
3386 <        g = new CompletableFuture<>();
1675 <        f.complete(3);
1676 <        g.complete(1);
1677 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1678 <        checkCompletedWithWrappedCFException(h);
1679 <    }
3385 >            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3386 >            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3387  
3388 <    /**
3389 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1683 <     */
1684 <    public void testThenAcceptBothAsync4() {
1685 <        CompletableFuture<Integer> f, g;
1686 <        CompletableFuture<Void> h;
1687 <        SubtractAction r;
3388 >            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3389 >            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3390  
3391 <        f = new CompletableFuture<>();
3392 <        g = new CompletableFuture<>();
1691 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1692 <        assertTrue(f.cancel(true));
1693 <        checkIncomplete(h);
1694 <        g.complete(1);
1695 <        checkCompletedWithWrappedCancellationException(h);
3391 >            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3392 >            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3393  
3394 <        f = new CompletableFuture<>();
3395 <        g = new CompletableFuture<>();
3396 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
3397 <        assertTrue(g.cancel(true));
1701 <        checkIncomplete(h);
1702 <        f.complete(3);
1703 <        checkCompletedWithWrappedCancellationException(h);
3394 >            for (CompletableFuture<?> future : fs)
3395 >                checkCompletedWithWrappedException(future, ex);
3396 >            futures.addAll(fs);
3397 >        }
3398  
3399 <        f = new CompletableFuture<>();
1706 <        g = new CompletableFuture<>();
1707 <        f.complete(3);
1708 <        assertTrue(g.cancel(true));
1709 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1710 <        checkCompletedWithWrappedCancellationException(h);
3399 >        incomplete.complete(v);
3400  
3401 <        f = new CompletableFuture<>();
3402 <        g = new CompletableFuture<>();
3403 <        assertTrue(f.cancel(true));
1715 <        g.complete(3);
1716 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1717 <        checkCompletedWithWrappedCancellationException(h);
3401 >        for (CompletableFuture<?> future : futures)
3402 >            checkCompletedWithWrappedException(future, ex);
3403 >        }
3404      }
3405  
3406      /**
3407 <     * runAfterBothAsync result completes normally after normal
1722 <     * completion of sources
3407 >     * toCompletableFuture returns this CompletableFuture.
3408       */
3409 <    public void testRunAfterBothAsync() {
3409 >    public void testToCompletableFuture() {
3410          CompletableFuture<Integer> f = new CompletableFuture<>();
3411 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1727 <        Noop r = new Noop();
1728 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1729 <        f.complete(one);
1730 <        checkIncomplete(g);
1731 <        f2.complete(two);
1732 <        checkCompletedNormally(g, null);
1733 <        assertTrue(r.ran);
3411 >        assertSame(f, f.toCompletableFuture());
3412      }
3413  
3414 <    /**
1737 <     * runAfterBothAsync result completes exceptionally after exceptional
1738 <     * completion of source
1739 <     */
1740 <    public void testRunAfterBothAsync2() {
1741 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1742 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1743 <        Noop r = new Noop();
1744 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1745 <        f.completeExceptionally(new CFException());
1746 <        f2.complete(two);
1747 <        checkCompletedWithWrappedCFException(g);
1748 <
1749 <        r = new Noop();
1750 <        f = new CompletableFuture<>();
1751 <        f2 = new CompletableFuture<>();
1752 <        g = f.runAfterBothAsync(f2, r);
1753 <        f.complete(one);
1754 <        f2.completeExceptionally(new CFException());
1755 <        checkCompletedWithWrappedCFException(g);
1756 <    }
3414 >    // jdk9
3415  
3416      /**
3417 <     * runAfterBothAsync result completes exceptionally if action does
3417 >     * newIncompleteFuture returns an incomplete CompletableFuture
3418       */
3419 <    public void testRunAfterBothAsync3() {
3419 >    public void testNewIncompleteFuture() {
3420 >        for (Integer v1 : new Integer[] { 1, null })
3421 >    {
3422          CompletableFuture<Integer> f = new CompletableFuture<>();
3423 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3424 <        FailingNoop r = new FailingNoop();
1765 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1766 <        f.complete(one);
3423 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3424 >        checkIncomplete(f);
3425          checkIncomplete(g);
3426 <        f2.complete(two);
3427 <        checkCompletedWithWrappedCFException(g);
3428 <    }
3429 <
3430 <    /**
3431 <     * runAfterBothAsync result completes exceptionally if either source cancelled
3432 <     */
1775 <    public void testRunAfterBothAsync4() {
1776 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1777 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1778 <        Noop r = new Noop();
1779 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1780 <        assertTrue(f.cancel(true));
1781 <        f2.complete(two);
1782 <        checkCompletedWithWrappedCancellationException(g);
1783 <
1784 <        r = new Noop();
1785 <        f = new CompletableFuture<>();
1786 <        f2 = new CompletableFuture<>();
1787 <        g = f.runAfterBothAsync(f2, r);
1788 <        f.complete(one);
1789 <        assertTrue(f2.cancel(true));
1790 <        checkCompletedWithWrappedCancellationException(g);
1791 <    }
1792 <
1793 <    /**
1794 <     * applyToEitherAsync result completes normally after normal
1795 <     * completion of sources
1796 <     */
1797 <    public void testApplyToEitherAsync() {
1798 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1799 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1800 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1801 <        f.complete(one);
1802 <        checkCompletedNormally(g, two);
1803 <
1804 <        f = new CompletableFuture<>();
1805 <        f.complete(one);
1806 <        f2 = new CompletableFuture<>();
1807 <        g = f.applyToEitherAsync(f2, inc);
1808 <        checkCompletedNormally(g, two);
1809 <    }
1810 <
1811 <    /**
1812 <     * applyToEitherAsync result completes exceptionally after exceptional
1813 <     * completion of source
1814 <     */
1815 <    public void testApplyToEitherAsync2() {
1816 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1817 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1818 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1819 <        f.completeExceptionally(new CFException());
1820 <        checkCompletedWithWrappedCFException(g);
1821 <
1822 <        f = new CompletableFuture<>();
1823 <        f2 = new CompletableFuture<>();
1824 <        f2.completeExceptionally(new CFException());
1825 <        g = f.applyToEitherAsync(f2, inc);
1826 <        f.complete(one);
1827 <        checkCompletedWithWrappedCFException(g);
1828 <    }
1829 <
1830 <    /**
1831 <     * applyToEitherAsync result completes exceptionally if action does
1832 <     */
1833 <    public void testApplyToEitherAsync3() {
1834 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1835 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1836 <        FailingFunction r = new FailingFunction();
1837 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1838 <        f.complete(one);
1839 <        checkCompletedWithWrappedCFException(g);
1840 <    }
3426 >        f.complete(v1);
3427 >        checkCompletedNormally(f, v1);
3428 >        checkIncomplete(g);
3429 >        g.complete(v1);
3430 >        checkCompletedNormally(g, v1);
3431 >        assertSame(g.getClass(), CompletableFuture.class);
3432 >    }}
3433  
3434      /**
3435 <     * applyToEitherAsync result completes exceptionally if either source cancelled
3435 >     * completedStage returns a completed CompletionStage
3436       */
3437 <    public void testApplyToEitherAsync4() {
3438 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3439 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3440 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
3441 <        assertTrue(f.cancel(true));
3442 <        checkCompletedWithWrappedCancellationException(g);
3443 <
1852 <        f = new CompletableFuture<>();
1853 <        f2 = new CompletableFuture<>();
1854 <        assertTrue(f2.cancel(true));
1855 <        g = f.applyToEitherAsync(f2, inc);
1856 <        checkCompletedWithWrappedCancellationException(g);
3437 >    public void testCompletedStage() {
3438 >        AtomicInteger x = new AtomicInteger(0);
3439 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3440 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3441 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3442 >        assertEquals(x.get(), 1);
3443 >        assertNull(r.get());
3444      }
3445  
3446      /**
3447 <     * acceptEitherAsync result completes normally after normal
3448 <     * completion of sources
3447 >     * defaultExecutor by default returns the commonPool if
3448 >     * it supports more than one thread.
3449       */
3450 <    public void testAcceptEitherAsync() {
3450 >    public void testDefaultExecutor() {
3451          CompletableFuture<Integer> f = new CompletableFuture<>();
3452 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3453 <        IncAction r = new IncAction();
3454 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
3455 <        f.complete(one);
3456 <        checkCompletedNormally(g, null);
3457 <        assertEquals(r.value, 2);
1871 <
1872 <        r = new IncAction();
1873 <        f = new CompletableFuture<>();
1874 <        f.complete(one);
1875 <        f2 = new CompletableFuture<>();
1876 <        g = f.acceptEitherAsync(f2, r);
1877 <        checkCompletedNormally(g, null);
1878 <        assertEquals(r.value, 2);
3452 >        Executor e = f.defaultExecutor();
3453 >        Executor c = ForkJoinPool.commonPool();
3454 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3455 >            assertSame(e, c);
3456 >        else
3457 >            assertNotSame(e, c);
3458      }
3459  
3460      /**
3461 <     * acceptEitherAsync result completes exceptionally after exceptional
3462 <     * completion of source
3461 >     * failedFuture returns a CompletableFuture completed
3462 >     * exceptionally with the given Exception
3463       */
3464 <    public void testAcceptEitherAsync2() {
3465 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3466 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3467 <        IncAction r = new IncAction();
1889 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1890 <        f.completeExceptionally(new CFException());
1891 <        checkCompletedWithWrappedCFException(g);
1892 <
1893 <        r = new IncAction();
1894 <        f = new CompletableFuture<>();
1895 <        f2 = new CompletableFuture<>();
1896 <        f2.completeExceptionally(new CFException());
1897 <        g = f.acceptEitherAsync(f2, r);
1898 <        f.complete(one);
1899 <        checkCompletedWithWrappedCFException(g);
3464 >    public void testFailedFuture() {
3465 >        CFException ex = new CFException();
3466 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3467 >        checkCompletedExceptionally(f, ex);
3468      }
3469  
3470      /**
3471 <     * acceptEitherAsync result completes exceptionally if action does
3471 >     * failedFuture(null) throws NPE
3472       */
3473 <    public void testAcceptEitherAsync3() {
3474 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3475 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3476 <        FailingConsumer r = new FailingConsumer();
3477 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1910 <        f.complete(one);
1911 <        checkCompletedWithWrappedCFException(g);
3473 >    public void testFailedFuture_null() {
3474 >        try {
3475 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3476 >            shouldThrow();
3477 >        } catch (NullPointerException success) {}
3478      }
3479  
3480      /**
3481 <     * acceptEitherAsync result completes exceptionally if either
3482 <     * source cancelled
3481 >     * copy returns a CompletableFuture that is completed normally,
3482 >     * with the same value, when source is.
3483       */
3484 <    public void testAcceptEitherAsync4() {
3484 >    public void testCopy() {
3485          CompletableFuture<Integer> f = new CompletableFuture<>();
3486 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3487 <        IncAction r = new IncAction();
3488 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
3489 <        assertTrue(f.cancel(true));
3490 <        checkCompletedWithWrappedCancellationException(g);
3491 <
1926 <        r = new IncAction();
1927 <        f = new CompletableFuture<>();
1928 <        f2 = new CompletableFuture<>();
1929 <        assertTrue(f2.cancel(true));
1930 <        g = f.acceptEitherAsync(f2, r);
1931 <        checkCompletedWithWrappedCancellationException(g);
1932 <    }
1933 <
1934 <    /**
1935 <     * runAfterEitherAsync result completes normally after normal
1936 <     * completion of sources
1937 <     */
1938 <    public void testRunAfterEitherAsync() {
1939 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1940 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1941 <        Noop r = new Noop();
1942 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1943 <        f.complete(one);
1944 <        checkCompletedNormally(g, null);
1945 <        assertTrue(r.ran);
1946 <
1947 <        r = new Noop();
1948 <        f = new CompletableFuture<>();
1949 <        f.complete(one);
1950 <        f2 = new CompletableFuture<>();
1951 <        g = f.runAfterEitherAsync(f2, r);
1952 <        checkCompletedNormally(g, null);
1953 <        assertTrue(r.ran);
3486 >        CompletableFuture<Integer> g = f.copy();
3487 >        checkIncomplete(f);
3488 >        checkIncomplete(g);
3489 >        f.complete(1);
3490 >        checkCompletedNormally(f, 1);
3491 >        checkCompletedNormally(g, 1);
3492      }
3493  
3494      /**
3495 <     * runAfterEitherAsync result completes exceptionally after exceptional
3496 <     * completion of source
3495 >     * copy returns a CompletableFuture that is completed exceptionally
3496 >     * when source is.
3497       */
3498 <    public void testRunAfterEitherAsync2() {
3498 >    public void testCopy2() {
3499          CompletableFuture<Integer> f = new CompletableFuture<>();
3500 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3501 <        Noop r = new Noop();
3502 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
3503 <        f.completeExceptionally(new CFException());
3504 <        checkCompletedWithWrappedCFException(g);
3505 <
3506 <        r = new Noop();
1969 <        f = new CompletableFuture<>();
1970 <        f2 = new CompletableFuture<>();
1971 <        f2.completeExceptionally(new CFException());
1972 <        g = f.runAfterEitherAsync(f2, r);
1973 <        f.complete(one);
1974 <        checkCompletedWithWrappedCFException(g);
3500 >        CompletableFuture<Integer> g = f.copy();
3501 >        checkIncomplete(f);
3502 >        checkIncomplete(g);
3503 >        CFException ex = new CFException();
3504 >        f.completeExceptionally(ex);
3505 >        checkCompletedExceptionally(f, ex);
3506 >        checkCompletedWithWrappedException(g, ex);
3507      }
3508  
3509      /**
3510 <     * runAfterEitherAsync result completes exceptionally if action does
3510 >     * minimalCompletionStage returns a CompletableFuture that is
3511 >     * completed normally, with the same value, when source is.
3512       */
3513 <    public void testRunAfterEitherAsync3() {
3513 >    public void testMinimalCompletionStage() {
3514          CompletableFuture<Integer> f = new CompletableFuture<>();
3515 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3516 <        FailingNoop r = new FailingNoop();
3517 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
3518 <        f.complete(one);
3519 <        checkCompletedWithWrappedCFException(g);
3515 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3516 >        AtomicInteger x = new AtomicInteger(0);
3517 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3518 >        checkIncomplete(f);
3519 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3520 >        f.complete(1);
3521 >        checkCompletedNormally(f, 1);
3522 >        assertEquals(x.get(), 1);
3523 >        assertNull(r.get());
3524      }
3525  
3526      /**
3527 <     * runAfterEitherAsync result completes exceptionally if either
3528 <     * source cancelled
3527 >     * minimalCompletionStage returns a CompletableFuture that is
3528 >     * completed exceptionally when source is.
3529       */
3530 <    public void testRunAfterEitherAsync4() {
3530 >    public void testMinimalCompletionStage2() {
3531          CompletableFuture<Integer> f = new CompletableFuture<>();
3532 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3533 <        Noop r = new Noop();
3534 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
3535 <        assertTrue(f.cancel(true));
3536 <        checkCompletedWithWrappedCancellationException(g);
3537 <
3538 <        r = new Noop();
3539 <        f = new CompletableFuture<>();
3540 <        f2 = new CompletableFuture<>();
3541 <        assertTrue(f2.cancel(true));
2005 <        g = f.runAfterEitherAsync(f2, r);
2006 <        checkCompletedWithWrappedCancellationException(g);
2007 <    }
2008 <
2009 <    /**
2010 <     * thenComposeAsync result completes normally after normal
2011 <     * completion of source
2012 <     */
2013 <    public void testThenComposeAsync() {
2014 <        CompletableFuture<Integer> f, g;
2015 <        CompletableFutureInc r;
2016 <
2017 <        f = new CompletableFuture<>();
2018 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2019 <        f.complete(one);
2020 <        checkCompletedNormally(g, two);
2021 <
2022 <        f = new CompletableFuture<>();
2023 <        f.complete(one);
2024 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2025 <        checkCompletedNormally(g, two);
2026 <    }
2027 <
2028 <    /**
2029 <     * thenComposeAsync result completes exceptionally after
2030 <     * exceptional completion of source
2031 <     */
2032 <    public void testThenComposeAsync2() {
2033 <        CompletableFuture<Integer> f, g;
2034 <        CompletableFutureInc r;
2035 <
2036 <        f = new CompletableFuture<>();
2037 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2038 <        f.completeExceptionally(new CFException());
2039 <        checkCompletedWithWrappedCFException(g);
2040 <        assertFalse(r.ran);
2041 <
2042 <        f = new CompletableFuture<>();
2043 <        f.completeExceptionally(new CFException());
2044 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2045 <        checkCompletedWithWrappedCFException(g);
2046 <        assertFalse(r.ran);
3532 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3533 >        AtomicInteger x = new AtomicInteger(0);
3534 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3535 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3536 >        checkIncomplete(f);
3537 >        CFException ex = new CFException();
3538 >        f.completeExceptionally(ex);
3539 >        checkCompletedExceptionally(f, ex);
3540 >        assertEquals(x.get(), 0);
3541 >        assertEquals(r.get().getCause(), ex);
3542      }
3543  
3544      /**
3545 <     * thenComposeAsync result completes exceptionally if action does
3545 >     * failedStage returns a CompletionStage completed
3546 >     * exceptionally with the given Exception
3547       */
3548 <    public void testThenComposeAsync3() {
3549 <        CompletableFuture<Integer> f, g;
3550 <        FailingCompletableFutureFunction r;
3551 <
3552 <        f = new CompletableFuture<>();
3553 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
3554 <        f.complete(one);
3555 <        checkCompletedWithWrappedCFException(g);
2060 <
2061 <        f = new CompletableFuture<>();
2062 <        f.complete(one);
2063 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2064 <        checkCompletedWithWrappedCFException(g);
3548 >    public void testFailedStage() {
3549 >        CFException ex = new CFException();
3550 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3551 >        AtomicInteger x = new AtomicInteger(0);
3552 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3553 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3554 >        assertEquals(x.get(), 0);
3555 >        assertEquals(r.get(), ex);
3556      }
3557  
3558      /**
3559 <     * thenComposeAsync result completes exceptionally if source cancelled
3559 >     * completeAsync completes with value of given supplier
3560       */
3561 <    public void testThenComposeAsync4() {
3562 <        CompletableFuture<Integer> f, g;
3563 <        CompletableFutureInc r;
2073 <
2074 <        f = new CompletableFuture<>();
2075 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2076 <        assertTrue(f.cancel(true));
2077 <        checkCompletedWithWrappedCancellationException(g);
2078 <
2079 <        f = new CompletableFuture<>();
2080 <        assertTrue(f.cancel(true));
2081 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2082 <        checkCompletedWithWrappedCancellationException(g);
2083 <    }
2084 <
2085 <    // async with explicit executors
2086 <
2087 <    /**
2088 <     * thenRunAsync result completes normally after normal completion of source
2089 <     */
2090 <    public void testThenRunAsyncE() {
3561 >    public void testCompleteAsync() {
3562 >        for (Integer v1 : new Integer[] { 1, null })
3563 >    {
3564          CompletableFuture<Integer> f = new CompletableFuture<>();
3565 <        Noop r = new Noop();
3566 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3567 <        f.complete(null);
3568 <        checkCompletedNormally(g, null);
2096 <
2097 <        // reordered version
2098 <        f = new CompletableFuture<>();
2099 <        f.complete(null);
2100 <        r = new Noop();
2101 <        g = f.thenRunAsync(r, new ThreadExecutor());
2102 <        checkCompletedNormally(g, null);
2103 <    }
3565 >        f.completeAsync(() -> v1);
3566 >        f.join();
3567 >        checkCompletedNormally(f, v1);
3568 >    }}
3569  
3570      /**
3571 <     * thenRunAsync result completes exceptionally after exceptional
2107 <     * completion of source
3571 >     * completeAsync completes exceptionally if given supplier throws
3572       */
3573 <    public void testThenRunAsync2E() {
3573 >    public void testCompleteAsync2() {
3574          CompletableFuture<Integer> f = new CompletableFuture<>();
3575 <        Noop r = new Noop();
3576 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2113 <        f.completeExceptionally(new CFException());
3575 >        CFException ex = new CFException();
3576 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3577          try {
3578 <            g.join();
3578 >            f.join();
3579              shouldThrow();
3580          } catch (CompletionException success) {}
3581 <        checkCompletedWithWrappedCFException(g);
2119 <    }
2120 <
2121 <    /**
2122 <     * thenRunAsync result completes exceptionally if action does
2123 <     */
2124 <    public void testThenRunAsync3E() {
2125 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2126 <        FailingNoop r = new FailingNoop();
2127 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2128 <        f.complete(null);
2129 <        checkCompletedWithWrappedCFException(g);
3581 >        checkCompletedWithWrappedException(f, ex);
3582      }
3583  
3584      /**
3585 <     * thenRunAsync result completes exceptionally if source cancelled
3585 >     * completeAsync with given executor completes with value of given supplier
3586       */
3587 <    public void testThenRunAsync4E() {
3587 >    public void testCompleteAsync3() {
3588 >        for (Integer v1 : new Integer[] { 1, null })
3589 >    {
3590          CompletableFuture<Integer> f = new CompletableFuture<>();
3591 <        Noop r = new Noop();
3592 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3593 <        assertTrue(f.cancel(true));
3594 <        checkCompletedWithWrappedCancellationException(g);
3595 <    }
3591 >        ThreadExecutor executor = new ThreadExecutor();
3592 >        f.completeAsync(() -> v1, executor);
3593 >        assertSame(v1, f.join());
3594 >        checkCompletedNormally(f, v1);
3595 >        assertEquals(1, executor.count.get());
3596 >    }}
3597  
3598      /**
3599 <     * thenApplyAsync result completes normally after normal completion of source
3599 >     * completeAsync with given executor completes exceptionally if
3600 >     * given supplier throws
3601       */
3602 <    public void testThenApplyAsyncE() {
3602 >    public void testCompleteAsync4() {
3603          CompletableFuture<Integer> f = new CompletableFuture<>();
3604 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3605 <        f.complete(one);
3606 <        checkCompletedNormally(g, two);
3607 <    }
3608 <
3609 <    /**
3610 <     * thenApplyAsync result completes exceptionally after exceptional
3611 <     * completion of source
3612 <     */
2157 <    public void testThenApplyAsync2E() {
2158 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2159 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2160 <        f.completeExceptionally(new CFException());
2161 <        checkCompletedWithWrappedCFException(g);
3604 >        CFException ex = new CFException();
3605 >        ThreadExecutor executor = new ThreadExecutor();
3606 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3607 >        try {
3608 >            f.join();
3609 >            shouldThrow();
3610 >        } catch (CompletionException success) {}
3611 >        checkCompletedWithWrappedException(f, ex);
3612 >        assertEquals(1, executor.count.get());
3613      }
3614  
3615      /**
3616 <     * thenApplyAsync result completes exceptionally if action does
3616 >     * orTimeout completes with TimeoutException if not complete
3617       */
3618 <    public void testThenApplyAsync3E() {
3618 >    public void testOrTimeout_timesOut() {
3619 >        long timeoutMillis = timeoutMillis();
3620          CompletableFuture<Integer> f = new CompletableFuture<>();
3621 <        FailingFunction r = new FailingFunction();
3622 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3623 <        f.complete(null);
3624 <        checkCompletedWithWrappedCFException(g);
3621 >        long startTime = System.nanoTime();
3622 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3623 >        checkCompletedWithTimeoutException(f);
3624 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3625      }
3626  
3627      /**
3628 <     * thenApplyAsync result completes exceptionally if source cancelled
3628 >     * orTimeout completes normally if completed before timeout
3629       */
3630 <    public void testThenApplyAsync4E() {
3630 >    public void testOrTimeout_completed() {
3631 >        for (Integer v1 : new Integer[] { 1, null })
3632 >    {
3633          CompletableFuture<Integer> f = new CompletableFuture<>();
3634 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3635 <        assertTrue(f.cancel(true));
3636 <        checkCompletedWithWrappedCancellationException(g);
3637 <    }
3638 <
3639 <    /**
3640 <     * thenAcceptAsync result completes normally after normal
3641 <     * completion of source
3642 <     */
3643 <    public void testThenAcceptAsyncE() {
2190 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2191 <        IncAction r = new IncAction();
2192 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2193 <        f.complete(one);
2194 <        checkCompletedNormally(g, null);
2195 <        assertEquals(r.value, 2);
2196 <    }
3634 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3635 >        long startTime = System.nanoTime();
3636 >        f.complete(v1);
3637 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3638 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3639 >        g.complete(v1);
3640 >        checkCompletedNormally(f, v1);
3641 >        checkCompletedNormally(g, v1);
3642 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3643 >    }}
3644  
3645      /**
3646 <     * thenAcceptAsync result completes exceptionally after exceptional
2200 <     * completion of source
3646 >     * completeOnTimeout completes with given value if not complete
3647       */
3648 <    public void testThenAcceptAsync2E() {
3649 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3650 <        IncAction r = new IncAction();
2205 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2206 <        f.completeExceptionally(new CFException());
2207 <        checkCompletedWithWrappedCFException(g);
3648 >    public void testCompleteOnTimeout_timesOut() {
3649 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3650 >                       () -> testCompleteOnTimeout_timesOut(null));
3651      }
3652  
3653      /**
3654 <     * thenAcceptAsync result completes exceptionally if action does
3654 >     * completeOnTimeout completes with given value if not complete
3655       */
3656 <    public void testThenAcceptAsync3E() {
3656 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3657 >        long timeoutMillis = timeoutMillis();
3658          CompletableFuture<Integer> f = new CompletableFuture<>();
3659 <        FailingConsumer r = new FailingConsumer();
3660 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3661 <        f.complete(null);
3662 <        checkCompletedWithWrappedCFException(g);
3659 >        long startTime = System.nanoTime();
3660 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3661 >        assertSame(v, f.join());
3662 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3663 >        f.complete(99);         // should have no effect
3664 >        checkCompletedNormally(f, v);
3665      }
3666  
3667      /**
3668 <     * thenAcceptAsync result completes exceptionally if source cancelled
3668 >     * completeOnTimeout has no effect if completed within timeout
3669       */
3670 <    public void testThenAcceptAsync4E() {
3670 >    public void testCompleteOnTimeout_completed() {
3671 >        for (Integer v1 : new Integer[] { 1, null })
3672 >    {
3673          CompletableFuture<Integer> f = new CompletableFuture<>();
3674 <        IncAction r = new IncAction();
3675 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3676 <        assertTrue(f.cancel(true));
3677 <        checkCompletedWithWrappedCancellationException(g);
3678 <    }
3679 <
3680 <    /**
3681 <     * thenCombineAsync result completes normally after normal
3682 <     * completion of sources
3683 <     */
3684 <    public void testThenCombineAsyncE() {
3685 <        CompletableFuture<Integer> f, g, h;
3686 <        ThreadExecutor e = new ThreadExecutor();
3687 <        int count = 0;
3688 <
3689 <        f = new CompletableFuture<>();
3690 <        g = new CompletableFuture<>();
3691 <        h = f.thenCombineAsync(g, subtract, e);
3692 <        f.complete(3);
3693 <        checkIncomplete(h);
3694 <        g.complete(1);
3695 <        checkCompletedNormally(h, 2);
3696 <        assertEquals(++count, e.count.get());
3697 <
3698 <        f = new CompletableFuture<>();
3699 <        g = new CompletableFuture<>();
3700 <        h = f.thenCombineAsync(g, subtract, e);
3701 <        g.complete(1);
3702 <        checkIncomplete(h);
3703 <        f.complete(3);
3704 <        checkCompletedNormally(h, 2);
3705 <        assertEquals(++count, e.count.get());
3706 <
3707 <        f = new CompletableFuture<>();
3708 <        g = new CompletableFuture<>();
3709 <        g.complete(1);
3710 <        f.complete(3);
3711 <        h = f.thenCombineAsync(g, subtract, e);
2264 <        checkCompletedNormally(h, 2);
2265 <        assertEquals(++count, e.count.get());
2266 <    }
2267 <
2268 <    /**
2269 <     * thenCombineAsync result completes exceptionally after exceptional
2270 <     * completion of either source
2271 <     */
2272 <    public void testThenCombineAsync2E() {
2273 <        CompletableFuture<Integer> f, g, h;
2274 <        ThreadExecutor e = new ThreadExecutor();
2275 <        int count = 0;
2276 <
2277 <        f = new CompletableFuture<>();
2278 <        g = new CompletableFuture<>();
2279 <        h = f.thenCombineAsync(g, subtract, e);
2280 <        f.completeExceptionally(new CFException());
2281 <        checkIncomplete(h);
2282 <        g.complete(1);
2283 <        checkCompletedWithWrappedCFException(h);
3674 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3675 >        long startTime = System.nanoTime();
3676 >        f.complete(v1);
3677 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3678 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3679 >        g.complete(v1);
3680 >        checkCompletedNormally(f, v1);
3681 >        checkCompletedNormally(g, v1);
3682 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3683 >    }}
3684 >
3685 >    /**
3686 >     * delayedExecutor returns an executor that delays submission
3687 >     */
3688 >    public void testDelayedExecutor() {
3689 >        testInParallel(() -> testDelayedExecutor(null, null),
3690 >                       () -> testDelayedExecutor(null, 1),
3691 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3692 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3693 >    }
3694 >
3695 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3696 >        long timeoutMillis = timeoutMillis();
3697 >        // Use an "unreasonably long" long timeout to catch lingering threads
3698 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3699 >        final Executor delayer, longDelayer;
3700 >        if (executor == null) {
3701 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3702 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3703 >        } else {
3704 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3705 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3706 >        }
3707 >        long startTime = System.nanoTime();
3708 >        CompletableFuture<Integer> f =
3709 >            CompletableFuture.supplyAsync(() -> v, delayer);
3710 >        CompletableFuture<Integer> g =
3711 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3712  
3713 <        f = new CompletableFuture<>();
2286 <        g = new CompletableFuture<>();
2287 <        h = f.thenCombineAsync(g, subtract, e);
2288 <        g.completeExceptionally(new CFException());
2289 <        checkIncomplete(h);
2290 <        f.complete(3);
2291 <        checkCompletedWithWrappedCFException(h);
3713 >        assertNull(g.getNow(null));
3714  
3715 <        f = new CompletableFuture<>();
3716 <        g = new CompletableFuture<>();
3717 <        g.completeExceptionally(new CFException());
3718 <        h = f.thenCombineAsync(g, subtract, e);
2297 <        checkIncomplete(h);
2298 <        f.complete(3);
2299 <        checkCompletedWithWrappedCFException(h);
3715 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3716 >        long millisElapsed = millisElapsedSince(startTime);
3717 >        assertTrue(millisElapsed >= timeoutMillis);
3718 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3719  
3720 <        assertEquals(0, e.count.get());
2302 <    }
3720 >        checkCompletedNormally(f, v);
3721  
2304    /**
2305     * thenCombineAsync result completes exceptionally if action does
2306     */
2307    public void testThenCombineAsync3E() {
2308        CompletableFuture<Integer> f = new CompletableFuture<>();
2309        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2310        FailingBiFunction r = new FailingBiFunction();
2311        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2312        f.complete(one);
3722          checkIncomplete(g);
2314        assertFalse(r.ran);
2315        f2.complete(two);
2316        checkCompletedWithWrappedCFException(g);
2317        assertTrue(r.ran);
2318    }
2319
2320    /**
2321     * thenCombineAsync result completes exceptionally if either source cancelled
2322     */
2323    public void testThenCombineAsync4E() {
2324        CompletableFuture<Integer> f, g, h;
2325        ThreadExecutor e = new ThreadExecutor();
2326
2327        f = new CompletableFuture<>();
2328        g = new CompletableFuture<>();
2329        h = f.thenCombineAsync(g, subtract, e);
2330        assertTrue(f.cancel(true));
2331        checkIncomplete(h);
2332        g.complete(1);
2333        checkCompletedWithWrappedCancellationException(h);
2334
2335        f = new CompletableFuture<>();
2336        g = new CompletableFuture<>();
2337        h = f.thenCombineAsync(g, subtract, e);
2338        assertTrue(g.cancel(true));
2339        checkIncomplete(h);
2340        f.complete(3);
2341        checkCompletedWithWrappedCancellationException(h);
2342
2343        f = new CompletableFuture<>();
2344        g = new CompletableFuture<>();
2345        assertTrue(g.cancel(true));
2346        h = f.thenCombineAsync(g, subtract, e);
2347        checkIncomplete(h);
2348        f.complete(3);
2349        checkCompletedWithWrappedCancellationException(h);
2350
2351        f = new CompletableFuture<>();
2352        g = new CompletableFuture<>();
2353        assertTrue(f.cancel(true));
2354        assertTrue(g.cancel(true));
2355        h = f.thenCombineAsync(g, subtract, e);
2356        checkCompletedWithWrappedCancellationException(h);
2357
2358        assertEquals(0, e.count.get());
2359    }
2360
2361    /**
2362     * thenAcceptBothAsync result completes normally after normal
2363     * completion of sources
2364     */
2365    public void testThenAcceptBothAsyncE() {
2366        CompletableFuture<Integer> f, g;
2367        CompletableFuture<Void> h;
2368        SubtractAction r;
2369        ThreadExecutor e = new ThreadExecutor();
2370
2371        f = new CompletableFuture<>();
2372        g = new CompletableFuture<>();
2373        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2374        f.complete(3);
2375        checkIncomplete(h);
2376        g.complete(1);
2377        checkCompletedNormally(h, null);
2378        assertEquals(r.value, 2);
2379
2380        f = new CompletableFuture<>();
2381        g = new CompletableFuture<>();
2382        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2383        g.complete(1);
2384        checkIncomplete(h);
2385        f.complete(3);
2386        checkCompletedNormally(h, null);
2387        assertEquals(r.value, 2);
2388
2389        f = new CompletableFuture<>();
2390        g = new CompletableFuture<>();
2391        g.complete(1);
2392        f.complete(3);
2393        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2394        checkCompletedNormally(h, null);
2395        assertEquals(r.value, 2);
2396
2397        assertEquals(3, e.count.get());
2398    }
2399
2400    /**
2401     * thenAcceptBothAsync result completes exceptionally after exceptional
2402     * completion of source
2403     */
2404    public void testThenAcceptBothAsync2E() {
2405        CompletableFuture<Integer> f, g;
2406        CompletableFuture<Void> h;
2407        SubtractAction r;
2408        ThreadExecutor e = new ThreadExecutor();
2409
2410        f = new CompletableFuture<>();
2411        g = new CompletableFuture<>();
2412        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2413        f.completeExceptionally(new CFException());
2414        checkIncomplete(h);
2415        g.complete(1);
2416        checkCompletedWithWrappedCFException(h);
2417
2418        f = new CompletableFuture<>();
2419        g = new CompletableFuture<>();
2420        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2421        g.completeExceptionally(new CFException());
2422        checkIncomplete(h);
2423        f.complete(3);
2424        checkCompletedWithWrappedCFException(h);
2425
2426        f = new CompletableFuture<>();
2427        g = new CompletableFuture<>();
2428        f.complete(3);
2429        g.completeExceptionally(new CFException());
2430        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2431        checkCompletedWithWrappedCFException(h);
2432
2433        f = new CompletableFuture<>();
2434        g = new CompletableFuture<>();
2435        f.completeExceptionally(new CFException());
2436        g.complete(3);
2437        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2438        checkCompletedWithWrappedCFException(h);
2439
2440        assertEquals(0, e.count.get());
2441    }
2442
2443    /**
2444     * thenAcceptBothAsync result completes exceptionally if action does
2445     */
2446    public void testThenAcceptBothAsync3E() {
2447        CompletableFuture<Integer> f, g;
2448        CompletableFuture<Void> h;
2449        FailingBiConsumer r;
2450        ThreadExecutor e = new ThreadExecutor();
2451
2452        f = new CompletableFuture<>();
2453        g = new CompletableFuture<>();
2454        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2455        f.complete(3);
2456        checkIncomplete(h);
2457        g.complete(1);
2458        checkCompletedWithWrappedCFException(h);
2459
2460        f = new CompletableFuture<>();
2461        g = new CompletableFuture<>();
2462        f.complete(3);
2463        g.complete(1);
2464        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2465        checkCompletedWithWrappedCFException(h);
2466
2467        assertEquals(2, e.count.get());
2468    }
2469
2470    /**
2471     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2472     */
2473    public void testThenAcceptBothAsync4E() {
2474        CompletableFuture<Integer> f, g;
2475        CompletableFuture<Void> h;
2476        SubtractAction r;
2477        ThreadExecutor e = new ThreadExecutor();
2478
2479        f = new CompletableFuture<>();
2480        g = new CompletableFuture<>();
2481        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2482        assertTrue(f.cancel(true));
2483        checkIncomplete(h);
2484        g.complete(1);
2485        checkCompletedWithWrappedCancellationException(h);
2486
2487        f = new CompletableFuture<>();
2488        g = new CompletableFuture<>();
2489        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
3723          assertTrue(g.cancel(true));
2491        checkIncomplete(h);
2492        f.complete(3);
2493        checkCompletedWithWrappedCancellationException(h);
2494
2495        f = new CompletableFuture<>();
2496        g = new CompletableFuture<>();
2497        f.complete(3);
2498        assertTrue(g.cancel(true));
2499        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2500        checkCompletedWithWrappedCancellationException(h);
2501
2502        f = new CompletableFuture<>();
2503        g = new CompletableFuture<>();
2504        assertTrue(f.cancel(true));
2505        g.complete(3);
2506        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2507        checkCompletedWithWrappedCancellationException(h);
2508
2509        assertEquals(0, e.count.get());
2510    }
2511
2512    /**
2513     * runAfterBothAsync result completes normally after normal
2514     * completion of sources
2515     */
2516    public void testRunAfterBothAsyncE() {
2517        CompletableFuture<Integer> f = new CompletableFuture<>();
2518        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2519        Noop r = new Noop();
2520        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2521        f.complete(one);
2522        checkIncomplete(g);
2523        f2.complete(two);
2524        checkCompletedNormally(g, null);
2525        assertTrue(r.ran);
2526    }
2527
2528    /**
2529     * runAfterBothAsync result completes exceptionally after exceptional
2530     * completion of source
2531     */
2532    public void testRunAfterBothAsync2E() {
2533        CompletableFuture<Integer> f = new CompletableFuture<>();
2534        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2535        Noop r = new Noop();
2536        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2537        f.completeExceptionally(new CFException());
2538        f2.complete(two);
2539        checkCompletedWithWrappedCFException(g);
2540
2541        r = new Noop();
2542        f = new CompletableFuture<>();
2543        f2 = new CompletableFuture<>();
2544        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2545        f.complete(one);
2546        f2.completeExceptionally(new CFException());
2547        checkCompletedWithWrappedCFException(g);
2548    }
2549
2550    /**
2551     * runAfterBothAsync result completes exceptionally if action does
2552     */
2553    public void testRunAfterBothAsync3E() {
2554        CompletableFuture<Integer> f = new CompletableFuture<>();
2555        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2556        FailingNoop r = new FailingNoop();
2557        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2558        f.complete(one);
2559        checkIncomplete(g);
2560        f2.complete(two);
2561        checkCompletedWithWrappedCFException(g);
2562    }
2563
2564    /**
2565     * runAfterBothAsync result completes exceptionally if either source cancelled
2566     */
2567    public void testRunAfterBothAsync4E() {
2568        CompletableFuture<Integer> f = new CompletableFuture<>();
2569        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2570        Noop r = new Noop();
2571        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2572        assertTrue(f.cancel(true));
2573        f2.complete(two);
2574        checkCompletedWithWrappedCancellationException(g);
2575
2576        r = new Noop();
2577        f = new CompletableFuture<>();
2578        f2 = new CompletableFuture<>();
2579        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2580        f.complete(one);
2581        assertTrue(f2.cancel(true));
2582        checkCompletedWithWrappedCancellationException(g);
2583    }
2584
2585    /**
2586     * applyToEitherAsync result completes normally after normal
2587     * completion of sources
2588     */
2589    public void testApplyToEitherAsyncE() {
2590        CompletableFuture<Integer> f = new CompletableFuture<>();
2591        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2592        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2593        f.complete(one);
2594        checkCompletedNormally(g, two);
2595
2596        f = new CompletableFuture<>();
2597        f.complete(one);
2598        f2 = new CompletableFuture<>();
2599        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2600        checkCompletedNormally(g, two);
2601    }
2602
2603    /**
2604     * applyToEitherAsync result completes exceptionally after exceptional
2605     * completion of source
2606     */
2607    public void testApplyToEitherAsync2E() {
2608        CompletableFuture<Integer> f = new CompletableFuture<>();
2609        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2610        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2611        f.completeExceptionally(new CFException());
2612        checkCompletedWithWrappedCFException(g);
2613
2614        f = new CompletableFuture<>();
2615        f2 = new CompletableFuture<>();
2616        f2.completeExceptionally(new CFException());
2617        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2618        f.complete(one);
2619        checkCompletedWithWrappedCFException(g);
2620    }
2621
2622    /**
2623     * applyToEitherAsync result completes exceptionally if action does
2624     */
2625    public void testApplyToEitherAsync3E() {
2626        CompletableFuture<Integer> f = new CompletableFuture<>();
2627        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2628        FailingFunction r = new FailingFunction();
2629        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2630        f.complete(one);
2631        checkCompletedWithWrappedCFException(g);
2632    }
2633
2634    /**
2635     * applyToEitherAsync result completes exceptionally if either source cancelled
2636     */
2637    public void testApplyToEitherAsync4E() {
2638        CompletableFuture<Integer> f = new CompletableFuture<>();
2639        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2640        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2641        assertTrue(f.cancel(true));
2642        checkCompletedWithWrappedCancellationException(g);
2643
2644        f = new CompletableFuture<>();
2645        f2 = new CompletableFuture<>();
2646        assertTrue(f2.cancel(true));
2647        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2648        checkCompletedWithWrappedCancellationException(g);
2649    }
2650
2651    /**
2652     * acceptEitherAsync result completes normally after normal
2653     * completion of sources
2654     */
2655    public void testAcceptEitherAsyncE() {
2656        CompletableFuture<Integer> f = new CompletableFuture<>();
2657        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2658        IncAction r = new IncAction();
2659        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2660        f.complete(one);
2661        checkCompletedNormally(g, null);
2662        assertEquals(r.value, 2);
2663
2664        r = new IncAction();
2665        f = new CompletableFuture<>();
2666        f.complete(one);
2667        f2 = new CompletableFuture<>();
2668        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2669        checkCompletedNormally(g, null);
2670        assertEquals(r.value, 2);
3724      }
3725  
3726 <    /**
2674 <     * acceptEitherAsync result completes exceptionally after exceptional
2675 <     * completion of source
2676 <     */
2677 <    public void testAcceptEitherAsync2E() {
2678 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2679 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2680 <        IncAction r = new IncAction();
2681 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2682 <        f.completeExceptionally(new CFException());
2683 <        checkCompletedWithWrappedCFException(g);
3726 >    //--- tests of implementation details; not part of official tck ---
3727  
3728 <        r = new IncAction();
3729 <        f = new CompletableFuture<>();
3730 <        f2 = new CompletableFuture<>();
3731 <        f2.completeExceptionally(new CFException());
3732 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
3733 <        f.complete(one);
3734 <        checkCompletedWithWrappedCFException(g);
3735 <    }
3736 <
2694 <    /**
2695 <     * acceptEitherAsync result completes exceptionally if action does
2696 <     */
2697 <    public void testAcceptEitherAsync3E() {
2698 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2699 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2700 <        FailingConsumer r = new FailingConsumer();
2701 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2702 <        f.complete(one);
2703 <        checkCompletedWithWrappedCFException(g);
2704 <    }
2705 <
2706 <    /**
2707 <     * acceptEitherAsync result completes exceptionally if either
2708 <     * source cancelled
2709 <     */
2710 <    public void testAcceptEitherAsync4E() {
2711 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2712 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2713 <        IncAction r = new IncAction();
2714 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2715 <        assertTrue(f.cancel(true));
2716 <        checkCompletedWithWrappedCancellationException(g);
2717 <
2718 <        r = new IncAction();
2719 <        f = new CompletableFuture<>();
2720 <        f2 = new CompletableFuture<>();
2721 <        assertTrue(f2.cancel(true));
2722 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2723 <        checkCompletedWithWrappedCancellationException(g);
2724 <    }
2725 <
2726 <    /**
2727 <     * runAfterEitherAsync result completes normally after normal
2728 <     * completion of sources
2729 <     */
2730 <    public void testRunAfterEitherAsyncE() {
2731 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2732 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2733 <        Noop r = new Noop();
2734 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2735 <        f.complete(one);
2736 <        checkCompletedNormally(g, null);
2737 <        assertTrue(r.ran);
2738 <
2739 <        r = new Noop();
2740 <        f = new CompletableFuture<>();
2741 <        f.complete(one);
2742 <        f2 = new CompletableFuture<>();
2743 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2744 <        checkCompletedNormally(g, null);
2745 <        assertTrue(r.ran);
2746 <    }
2747 <
2748 <    /**
2749 <     * runAfterEitherAsync result completes exceptionally after exceptional
2750 <     * completion of source
2751 <     */
2752 <    public void testRunAfterEitherAsync2E() {
2753 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2754 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2755 <        Noop r = new Noop();
2756 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2757 <        f.completeExceptionally(new CFException());
2758 <        checkCompletedWithWrappedCFException(g);
2759 <
2760 <        r = new Noop();
2761 <        f = new CompletableFuture<>();
2762 <        f2 = new CompletableFuture<>();
2763 <        f2.completeExceptionally(new CFException());
2764 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2765 <        f.complete(one);
2766 <        checkCompletedWithWrappedCFException(g);
2767 <    }
2768 <
2769 <    /**
2770 <     * runAfterEitherAsync result completes exceptionally if action does
2771 <     */
2772 <    public void testRunAfterEitherAsync3E() {
2773 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2774 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2775 <        FailingNoop r = new FailingNoop();
2776 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2777 <        f.complete(one);
2778 <        checkCompletedWithWrappedCFException(g);
2779 <    }
2780 <
2781 <    /**
2782 <     * runAfterEitherAsync result completes exceptionally if either
2783 <     * source cancelled
2784 <     */
2785 <    public void testRunAfterEitherAsync4E() {
2786 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2787 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2788 <        Noop r = new Noop();
2789 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2790 <        assertTrue(f.cancel(true));
2791 <        checkCompletedWithWrappedCancellationException(g);
2792 <
2793 <        r = new Noop();
2794 <        f = new CompletableFuture<>();
2795 <        f2 = new CompletableFuture<>();
2796 <        assertTrue(f2.cancel(true));
2797 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2798 <        checkCompletedWithWrappedCancellationException(g);
2799 <    }
3728 >    Object resultOf(CompletableFuture<?> f) {
3729 >        SecurityManager sm = System.getSecurityManager();
3730 >        if (sm != null) {
3731 >            try {
3732 >                System.setSecurityManager(null);
3733 >            } catch (SecurityException giveUp) {
3734 >                return "Reflection not available";
3735 >            }
3736 >        }
3737  
3738 <    /**
3739 <     * thenComposeAsync result completes normally after normal
3740 <     * completion of source
3741 <     */
3742 <    public void testThenComposeAsyncE() {
3743 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3744 <        CompletableFutureInc r = new CompletableFutureInc();
3745 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3746 <        f.complete(one);
3747 <        checkCompletedNormally(g, two);
3738 >        try {
3739 >            java.lang.reflect.Field resultField
3740 >                = CompletableFuture.class.getDeclaredField("result");
3741 >            resultField.setAccessible(true);
3742 >            return resultField.get(f);
3743 >        } catch (Throwable t) {
3744 >            throw new AssertionError(t);
3745 >        } finally {
3746 >            if (sm != null) System.setSecurityManager(sm);
3747 >        }
3748      }
3749  
3750 <    /**
3751 <     * thenComposeAsync result completes exceptionally after
3752 <     * exceptional completion of source
3753 <     */
3754 <    public void testThenComposeAsync2E() {
3755 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3756 <        CompletableFutureInc r = new CompletableFutureInc();
3757 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3758 <        f.completeExceptionally(new CFException());
3759 <        checkCompletedWithWrappedCFException(g);
3760 <    }
3750 >    public void testExceptionPropagationReusesResultObject() {
3751 >        if (!testImplementationDetails) return;
3752 >        for (ExecutionMode m : ExecutionMode.values())
3753 >    {
3754 >        final CFException ex = new CFException();
3755 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3756 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3757 >
3758 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3759 >            = new ArrayList<>();
3760 >
3761 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3762 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3763 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3764 >
3765 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3766 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3767 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3768 >
3769 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3770 >        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3771 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3772 >        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3773 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3774 >        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3775 >
3776 >        funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3777 >
3778 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3779 >
3780 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3781 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3782 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3783 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3784 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3785 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3786  
3787 <    /**
3788 <     * thenComposeAsync result completes exceptionally if action does
3789 <     */
3790 <    public void testThenComposeAsync3E() {
3791 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3792 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3793 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3794 <        f.complete(one);
3795 <        checkCompletedWithWrappedCFException(g);
3796 <    }
3787 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3788 >                 fun : funs) {
3789 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3790 >            f.completeExceptionally(ex);
3791 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3792 >            checkCompletedWithWrappedException(src, ex);
3793 >            CompletableFuture<?> dep = fun.apply(src);
3794 >            checkCompletedWithWrappedException(dep, ex);
3795 >            assertSame(resultOf(src), resultOf(dep));
3796 >        }
3797  
3798 <    /**
3799 <     * thenComposeAsync result completes exceptionally if source cancelled
3800 <     */
3801 <    public void testThenComposeAsync4E() {
3802 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3803 <        CompletableFutureInc r = new CompletableFutureInc();
3804 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3805 <        assertTrue(f.cancel(true));
3806 <        checkCompletedWithWrappedCancellationException(g);
3807 <    }
3798 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3799 >                 fun : funs) {
3800 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3801 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3802 >            CompletableFuture<?> dep = fun.apply(src);
3803 >            f.completeExceptionally(ex);
3804 >            checkCompletedWithWrappedException(src, ex);
3805 >            checkCompletedWithWrappedException(dep, ex);
3806 >            assertSame(resultOf(src), resultOf(dep));
3807 >        }
3808  
3809 <    // other static methods
3809 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3810 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3811 >                 fun : funs) {
3812 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3813 >            f.cancel(mayInterruptIfRunning);
3814 >            checkCancelled(f);
3815 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3816 >            checkCompletedWithWrappedCancellationException(src);
3817 >            CompletableFuture<?> dep = fun.apply(src);
3818 >            checkCompletedWithWrappedCancellationException(dep);
3819 >            assertSame(resultOf(src), resultOf(dep));
3820 >        }
3821  
3822 <    /**
3823 <     * allOf(no component futures) returns a future completed normally
3824 <     * with the value null
3825 <     */
3826 <    public void testAllOf_empty() throws Exception {
3827 <        CompletableFuture<Void> f = CompletableFuture.allOf();
3828 <        checkCompletedNormally(f, null);
3829 <    }
3822 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3823 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3824 >                 fun : funs) {
3825 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3826 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3827 >            CompletableFuture<?> dep = fun.apply(src);
3828 >            f.cancel(mayInterruptIfRunning);
3829 >            checkCancelled(f);
3830 >            checkCompletedWithWrappedCancellationException(src);
3831 >            checkCompletedWithWrappedCancellationException(dep);
3832 >            assertSame(resultOf(src), resultOf(dep));
3833 >        }
3834 >    }}
3835  
3836      /**
3837 <     * allOf returns a future completed normally with the value null
2860 <     * when all components complete normally
3837 >     * Minimal completion stages throw UOE for all non-CompletionStage methods
3838       */
3839 <    public void testAllOf_normal() throws Exception {
3840 <        for (int k = 1; k < 20; ++k) {
3841 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3842 <            for (int i = 0; i < k; ++i)
3843 <                fs[i] = new CompletableFuture<>();
3844 <            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3845 <            for (int i = 0; i < k; ++i) {
3846 <                checkIncomplete(f);
3847 <                checkIncomplete(CompletableFuture.allOf(fs));
3848 <                fs[i].complete(one);
3839 >    public void testMinimalCompletionStage_minimality() {
3840 >        if (!testImplementationDetails) return;
3841 >        Function<Method, String> toSignature =
3842 >            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3843 >        Predicate<Method> isNotStatic =
3844 >            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3845 >        List<Method> minimalMethods =
3846 >            Stream.of(Object.class, CompletionStage.class)
3847 >            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3848 >            .filter(isNotStatic)
3849 >            .collect(Collectors.toList());
3850 >        // Methods from CompletableFuture permitted NOT to throw UOE
3851 >        String[] signatureWhitelist = {
3852 >            "newIncompleteFuture[]",
3853 >            "defaultExecutor[]",
3854 >            "minimalCompletionStage[]",
3855 >            "copy[]",
3856 >        };
3857 >        Set<String> permittedMethodSignatures =
3858 >            Stream.concat(minimalMethods.stream().map(toSignature),
3859 >                          Stream.of(signatureWhitelist))
3860 >            .collect(Collectors.toSet());
3861 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3862 >            .filter(isNotStatic)
3863 >            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3864 >            .collect(Collectors.toList());
3865 >
3866 >        CompletionStage<Integer> minimalStage =
3867 >            new CompletableFuture<Integer>().minimalCompletionStage();
3868 >
3869 >        List<Method> bugs = new ArrayList<>();
3870 >        for (Method method : allMethods) {
3871 >            Class<?>[] parameterTypes = method.getParameterTypes();
3872 >            Object[] args = new Object[parameterTypes.length];
3873 >            // Manufacture boxed primitives for primitive params
3874 >            for (int i = 0; i < args.length; i++) {
3875 >                Class<?> type = parameterTypes[i];
3876 >                if (parameterTypes[i] == boolean.class)
3877 >                    args[i] = false;
3878 >                else if (parameterTypes[i] == int.class)
3879 >                    args[i] = 0;
3880 >                else if (parameterTypes[i] == long.class)
3881 >                    args[i] = 0L;
3882              }
3883 <            checkCompletedNormally(f, null);
3884 <            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3883 >            try {
3884 >                method.invoke(minimalStage, args);
3885 >                bugs.add(method);
3886 >            }
3887 >            catch (java.lang.reflect.InvocationTargetException expected) {
3888 >                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3889 >                    bugs.add(method);
3890 >                    // expected.getCause().printStackTrace();
3891 >                }
3892 >            }
3893 >            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3894          }
3895 +        if (!bugs.isEmpty())
3896 +            throw new Error("Methods did not throw UOE: " + bugs.toString());
3897      }
3898  
3899 <    /**
3900 <     * anyOf(no component futures) returns an incomplete future
3901 <     */
3902 <    public void testAnyOf_empty() throws Exception {
3903 <        CompletableFuture<Object> f = CompletableFuture.anyOf();
3904 <        checkIncomplete(f);
3905 <    }
3906 <
3907 <    /**
3908 <     * anyOf returns a future completed normally with a value when
3909 <     * a component future does
3910 <     */
3911 <    public void testAnyOf_normal() throws Exception {
3912 <        for (int k = 0; k < 10; ++k) {
3913 <            CompletableFuture[] fs = new CompletableFuture[k];
3914 <            for (int i = 0; i < k; ++i)
3915 <                fs[i] = new CompletableFuture<>();
2895 <            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2896 <            checkIncomplete(f);
2897 <            for (int i = 0; i < k; ++i) {
2898 <                fs[i].complete(one);
2899 <                checkCompletedNormally(f, one);
2900 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2901 <            }
3899 >    static class Monad {
3900 >        static class ZeroException extends RuntimeException {
3901 >            public ZeroException() { super("monadic zero"); }
3902 >        }
3903 >        // "return", "unit"
3904 >        static <T> CompletableFuture<T> unit(T value) {
3905 >            return completedFuture(value);
3906 >        }
3907 >        // monadic zero ?
3908 >        static <T> CompletableFuture<T> zero() {
3909 >            return failedFuture(new ZeroException());
3910 >        }
3911 >        // >=>
3912 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
3913 >            (Function<T, CompletableFuture<U>> f,
3914 >             Function<U, CompletableFuture<V>> g) {
3915 >            return (x) -> f.apply(x).thenCompose(g);
3916          }
2903    }
3917  
3918 <    /**
3919 <     * anyOf result completes exceptionally when any component does.
3920 <     */
3921 <    public void testAnyOf_exceptional() throws Exception {
3922 <        for (int k = 0; k < 10; ++k) {
3923 <            CompletableFuture[] fs = new CompletableFuture[k];
2911 <            for (int i = 0; i < k; ++i)
2912 <                fs[i] = new CompletableFuture<>();
2913 <            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2914 <            checkIncomplete(f);
2915 <            for (int i = 0; i < k; ++i) {
2916 <                fs[i].completeExceptionally(new CFException());
2917 <                checkCompletedWithWrappedCFException(f);
2918 <                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3918 >        static void assertZero(CompletableFuture<?> f) {
3919 >            try {
3920 >                f.getNow(null);
3921 >                throw new AssertionFailedError("should throw");
3922 >            } catch (CompletionException success) {
3923 >                assertTrue(success.getCause() instanceof ZeroException);
3924              }
3925          }
2921    }
2922
2923    /**
2924     * Completion methods throw NullPointerException with null arguments
2925     */
2926    public void testNPE() {
2927        CompletableFuture<Integer> f = new CompletableFuture<>();
2928        CompletableFuture<Integer> g = new CompletableFuture<>();
2929        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2930        CompletableFuture<?> h;
2931        ThreadExecutor exec = new ThreadExecutor();
2932
2933        Runnable[] throwingActions = {
2934            () -> { CompletableFuture.supplyAsync(null); },
2935            () -> { CompletableFuture.supplyAsync(null, exec); },
2936            () -> { CompletableFuture.supplyAsync(supplyOne, null); },
2937
2938            () -> { CompletableFuture.runAsync(null); },
2939            () -> { CompletableFuture.runAsync(null, exec); },
2940            () -> { CompletableFuture.runAsync(() -> {}, null); },
2941
2942            () -> { f.completeExceptionally(null); },
2943
2944            () -> { f.thenApply(null); },
2945            () -> { f.thenApplyAsync(null); },
2946            () -> { f.thenApplyAsync((x) -> x, null); },
2947            () -> { f.thenApplyAsync(null, exec); },
2948
2949            () -> { f.thenAccept(null); },
2950            () -> { f.thenAcceptAsync(null); },
2951            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2952            () -> { f.thenAcceptAsync(null, exec); },
2953
2954            () -> { f.thenRun(null); },
2955            () -> { f.thenRunAsync(null); },
2956            () -> { f.thenRunAsync(() -> { ; }, null); },
2957            () -> { f.thenRunAsync(null, exec); },
2958
2959            () -> { f.thenCombine(g, null); },
2960            () -> { f.thenCombineAsync(g, null); },
2961            () -> { f.thenCombineAsync(g, null, exec); },
2962            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2963            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2964            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2965            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2966
2967            () -> { f.thenAcceptBoth(g, null); },
2968            () -> { f.thenAcceptBothAsync(g, null); },
2969            () -> { f.thenAcceptBothAsync(g, null, exec); },
2970            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
2971            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
2972            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
2973            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
2974
2975            () -> { f.runAfterBoth(g, null); },
2976            () -> { f.runAfterBothAsync(g, null); },
2977            () -> { f.runAfterBothAsync(g, null, exec); },
2978            () -> { f.runAfterBoth(nullFuture, () -> {}); },
2979            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
2980            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
2981            () -> { f.runAfterBothAsync(g, () -> {}, null); },
2982
2983            () -> { f.applyToEither(g, null); },
2984            () -> { f.applyToEitherAsync(g, null); },
2985            () -> { f.applyToEitherAsync(g, null, exec); },
2986            () -> { f.applyToEither(nullFuture, (x) -> x); },
2987            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
2988            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
2989            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
2990
2991            () -> { f.acceptEither(g, null); },
2992            () -> { f.acceptEitherAsync(g, null); },
2993            () -> { f.acceptEitherAsync(g, null, exec); },
2994            () -> { f.acceptEither(nullFuture, (x) -> {}); },
2995            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
2996            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
2997            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
2998
2999            () -> { f.runAfterEither(g, null); },
3000            () -> { f.runAfterEitherAsync(g, null); },
3001            () -> { f.runAfterEitherAsync(g, null, exec); },
3002            () -> { f.runAfterEither(nullFuture, () -> {}); },
3003            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
3004            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
3005            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
3006
3007            () -> { f.thenCompose(null); },
3008            () -> { f.thenComposeAsync(null); },
3009            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
3010            () -> { f.thenComposeAsync(null, exec); },
3011
3012            () -> { f.exceptionally(null); },
3013
3014            () -> { f.handle(null); },
3015
3016            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
3017            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
3018            () -> { CompletableFuture.allOf(f, null); },
3019            () -> { CompletableFuture.allOf(null, f); },
3020
3021            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
3022            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
3023            () -> { CompletableFuture.anyOf(f, null); },
3024            () -> { CompletableFuture.anyOf(null, f); },
3025        };
3026
3027        assertThrows(NullPointerException.class, throwingActions);
3028        assertEquals(0, exec.count.get());
3029    }
3030
3031    /**
3032     * toCompletableFuture returns this CompletableFuture.
3033     */
3034    public void testToCompletableFuture() {
3035        CompletableFuture<Integer> f = new CompletableFuture<>();
3036        assertSame(f, f.toCompletableFuture());
3037    }
3038
3039    /**
3040     * whenComplete action executes on normal completion, propagating
3041     * source result.
3042     */
3043    public void testWhenComplete1() {
3044        final AtomicInteger a = new AtomicInteger();
3045        CompletableFuture<Integer> f = new CompletableFuture<>();
3046        CompletableFuture<Integer> g =
3047            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3048        f.complete(three);
3049        checkCompletedNormally(f, three);
3050        checkCompletedNormally(g, three);
3051        assertEquals(a.get(), 1);
3052    }
3053
3054    /**
3055     * whenComplete action executes on exceptional completion, propagating
3056     * source result.
3057     */
3058    public void testWhenComplete2() {
3059        final AtomicInteger a = new AtomicInteger();
3060        CompletableFuture<Integer> f = new CompletableFuture<>();
3061        CompletableFuture<Integer> g =
3062            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3063        f.completeExceptionally(new CFException());
3064        assertTrue(f.isCompletedExceptionally());
3065        assertTrue(g.isCompletedExceptionally());
3066        assertEquals(a.get(), 1);
3067    }
3068
3069    /**
3070     * If a whenComplete action throws an exception when triggered by
3071     * a normal completion, it completes exceptionally
3072     */
3073    public void testWhenComplete3() {
3074        CompletableFuture<Integer> f = new CompletableFuture<>();
3075        CompletableFuture<Integer> g =
3076            f.whenComplete((Integer x, Throwable t) ->
3077                           { throw new CFException(); } );
3078        f.complete(three);
3079        checkCompletedNormally(f, three);
3080        assertTrue(g.isCompletedExceptionally());
3081        checkCompletedWithWrappedCFException(g);
3082    }
3926  
3927 <    /**
3928 <     * whenCompleteAsync action executes on normal completion, propagating
3929 <     * source result.
3930 <     */
3931 <    public void testWhenCompleteAsync1() {
3932 <        final AtomicInteger a = new AtomicInteger();
3933 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3934 <        CompletableFuture<Integer> g =
3935 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3936 <        f.complete(three);
3937 <        checkCompletedNormally(f, three);
3938 <        checkCompletedNormally(g, three);
3939 <        assertEquals(a.get(), 1);
3940 <    }
3927 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
3928 >                                           CompletableFuture<T> g) {
3929 >            T fval = null, gval = null;
3930 >            Throwable fex = null, gex = null;
3931 >
3932 >            try { fval = f.get(); }
3933 >            catch (ExecutionException ex) { fex = ex.getCause(); }
3934 >            catch (Throwable ex) { fex = ex; }
3935 >
3936 >            try { gval = g.get(); }
3937 >            catch (ExecutionException ex) { gex = ex.getCause(); }
3938 >            catch (Throwable ex) { gex = ex; }
3939 >
3940 >            if (fex != null || gex != null)
3941 >                assertSame(fex.getClass(), gex.getClass());
3942 >            else
3943 >                assertEquals(fval, gval);
3944 >        }
3945  
3946 <    /**
3947 <     * whenCompleteAsync action executes on exceptional completion, propagating
3948 <     * source result.
3102 <     */
3103 <    public void testWhenCompleteAsync2() {
3104 <        final AtomicInteger a = new AtomicInteger();
3105 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3106 <        CompletableFuture<Integer> g =
3107 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3108 <        f.completeExceptionally(new CFException());
3109 <        checkCompletedWithWrappedCFException(f);
3110 <        checkCompletedWithWrappedCFException(g);
3111 <    }
3946 >        static class PlusFuture<T> extends CompletableFuture<T> {
3947 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
3948 >        }
3949  
3950 <    /**
3951 <     * If a whenCompleteAsync action throws an exception when
3952 <     * triggered by a normal completion, it completes exceptionally
3953 <     */
3954 <    public void testWhenCompleteAsync3() {
3955 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3956 <        CompletableFuture<Integer> g =
3957 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3958 <                           { throw new CFException(); } );
3959 <        f.complete(three);
3960 <        checkCompletedNormally(f, three);
3961 <        checkCompletedWithWrappedCFException(g);
3950 >        /** Implements "monadic plus". */
3951 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
3952 >                                             CompletableFuture<? extends T> g) {
3953 >            PlusFuture<T> plus = new PlusFuture<T>();
3954 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
3955 >                try {
3956 >                    if (ex == null) {
3957 >                        if (plus.complete(result))
3958 >                            if (plus.firstFailure.get() != null)
3959 >                                plus.firstFailure.set(null);
3960 >                    }
3961 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
3962 >                        if (plus.isDone())
3963 >                            plus.firstFailure.set(null);
3964 >                    }
3965 >                    else {
3966 >                        // first failure has precedence
3967 >                        Throwable first = plus.firstFailure.getAndSet(null);
3968 >
3969 >                        // may fail with "Self-suppression not permitted"
3970 >                        try { first.addSuppressed(ex); }
3971 >                        catch (Exception ignored) {}
3972 >
3973 >                        plus.completeExceptionally(first);
3974 >                    }
3975 >                } catch (Throwable unexpected) {
3976 >                    plus.completeExceptionally(unexpected);
3977 >                }
3978 >            };
3979 >            f.whenComplete(action);
3980 >            g.whenComplete(action);
3981 >            return plus;
3982 >        }
3983      }
3984  
3985      /**
3986 <     * whenCompleteAsync action executes on normal completion, propagating
3987 <     * source result.
3986 >     * CompletableFuture is an additive monad - sort of.
3987 >     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
3988       */
3989 <    public void testWhenCompleteAsync1e() {
3990 <        final AtomicInteger a = new AtomicInteger();
3991 <        ThreadExecutor exec = new ThreadExecutor();
3992 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3993 <        CompletableFuture<Integer> g =
3994 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3995 <                                exec);
3996 <        f.complete(three);
3997 <        checkCompletedNormally(f, three);
3998 <        checkCompletedNormally(g, three);
3999 <        assertEquals(a.get(), 1);
4000 <    }
4001 <
4002 <    /**
4003 <     * whenCompleteAsync action executes on exceptional completion, propagating
4004 <     * source result.
4005 <     */
4006 <    public void testWhenCompleteAsync2e() {
4007 <        final AtomicInteger a = new AtomicInteger();
4008 <        ThreadExecutor exec = new ThreadExecutor();
4009 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4010 <        CompletableFuture<Integer> g =
4011 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
4012 <                                exec);
4013 <        f.completeExceptionally(new CFException());
4014 <        checkCompletedWithWrappedCFException(f);
4015 <        checkCompletedWithWrappedCFException(g);
4016 <    }
3989 >    public void testAdditiveMonad() throws Throwable {
3990 >        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
3991 >        CompletableFuture<Long> zero = Monad.zero();
3992 >
3993 >        // Some mutually non-commutative functions
3994 >        Function<Long, CompletableFuture<Long>> triple
3995 >            = (x) -> Monad.unit(3 * x);
3996 >        Function<Long, CompletableFuture<Long>> inc
3997 >            = (x) -> Monad.unit(x + 1);
3998 >
3999 >        // unit is a right identity: m >>= unit === m
4000 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4001 >                                 inc.apply(5L));
4002 >        // unit is a left identity: (unit x) >>= f === f x
4003 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4004 >                                 inc.apply(5L));
4005 >
4006 >        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4007 >        Monad.assertFutureEquals(
4008 >            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4009 >            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
4010 >
4011 >        // The case for CompletableFuture as an additive monad is weaker...
4012 >
4013 >        // zero is a monadic zero
4014 >        Monad.assertZero(zero);
4015 >
4016 >        // left zero: zero >>= f === zero
4017 >        Monad.assertZero(zero.thenCompose(inc));
4018 >        // right zero: f >>= (\x -> zero) === zero
4019 >        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
4020 >
4021 >        // f plus zero === f
4022 >        Monad.assertFutureEquals(Monad.unit(5L),
4023 >                                 Monad.plus(Monad.unit(5L), zero));
4024 >        // zero plus f === f
4025 >        Monad.assertFutureEquals(Monad.unit(5L),
4026 >                                 Monad.plus(zero, Monad.unit(5L)));
4027 >        // zero plus zero === zero
4028 >        Monad.assertZero(Monad.plus(zero, zero));
4029 >        {
4030 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4031 >                                                   Monad.unit(8L));
4032 >            // non-determinism
4033 >            assertTrue(f.get() == 5L || f.get() == 8L);
4034 >        }
4035  
4036 <    /**
4037 <     * If a whenCompleteAsync action throws an exception when triggered
4038 <     * by a normal completion, it completes exceptionally
4039 <     */
4040 <    public void testWhenCompleteAsync3e() {
4041 <        ThreadExecutor exec = new ThreadExecutor();
4042 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3167 <        CompletableFuture<Integer> g =
3168 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3169 <                                { throw new CFException(); },
3170 <                                exec);
3171 <        f.complete(three);
3172 <        checkCompletedNormally(f, three);
3173 <        checkCompletedWithWrappedCFException(g);
4036 >        CompletableFuture<Long> godot = new CompletableFuture<>();
4037 >        // f plus godot === f (doesn't wait for godot)
4038 >        Monad.assertFutureEquals(Monad.unit(5L),
4039 >                                 Monad.plus(Monad.unit(5L), godot));
4040 >        // godot plus f === f (doesn't wait for godot)
4041 >        Monad.assertFutureEquals(Monad.unit(5L),
4042 >                                 Monad.plus(godot, Monad.unit(5L)));
4043      }
4044  
4045      /**
4046 <     * handleAsync action completes normally with function value on
4047 <     * either normal or exceptional completion of source
4048 <     */
4049 <    public void testHandleAsync() {
4050 <        CompletableFuture<Integer> f, g;
4051 <        IntegerHandler r;
4052 <
4053 <        f = new CompletableFuture<>();
4054 <        g = f.handleAsync(r = new IntegerHandler());
4055 <        assertFalse(r.ran);
4056 <        f.completeExceptionally(new CFException());
4057 <        checkCompletedWithWrappedCFException(f);
4058 <        checkCompletedNormally(g, three);
4059 <        assertTrue(r.ran);
4060 <
4061 <        f = new CompletableFuture<>();
4062 <        g = f.handleAsync(r = new IntegerHandler());
4063 <        assertFalse(r.ran);
4064 <        f.completeExceptionally(new CFException());
4065 <        checkCompletedWithWrappedCFException(f);
4066 <        checkCompletedNormally(g, three);
4067 <        assertTrue(r.ran);
4068 <
4069 <        f = new CompletableFuture<>();
4070 <        g = f.handleAsync(r = new IntegerHandler());
4071 <        assertFalse(r.ran);
4072 <        f.complete(one);
4073 <        checkCompletedNormally(f, one);
4074 <        checkCompletedNormally(g, two);
3206 <        assertTrue(r.ran);
3207 <
3208 <        f = new CompletableFuture<>();
3209 <        g = f.handleAsync(r = new IntegerHandler());
3210 <        assertFalse(r.ran);
3211 <        f.complete(one);
3212 <        checkCompletedNormally(f, one);
3213 <        checkCompletedNormally(g, two);
3214 <        assertTrue(r.ran);
4046 >     * A single CompletableFuture with many dependents.
4047 >     * A demo of scalability - runtime is O(n).
4048 >     */
4049 >    public void testManyDependents() throws Throwable {
4050 >        final int n = 1_000;
4051 >        final CompletableFuture<Void> head = new CompletableFuture<>();
4052 >        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4053 >        final AtomicInteger count = new AtomicInteger(0);
4054 >        for (int i = 0; i < n; i++) {
4055 >            head.thenRun(() -> count.getAndIncrement());
4056 >            head.thenAccept((x) -> count.getAndIncrement());
4057 >            head.thenApply((x) -> count.getAndIncrement());
4058 >
4059 >            head.runAfterBoth(complete, () -> count.getAndIncrement());
4060 >            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4061 >            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4062 >            complete.runAfterBoth(head, () -> count.getAndIncrement());
4063 >            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4064 >            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4065 >
4066 >            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4067 >            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4068 >            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4069 >            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4070 >            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4071 >            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4072 >        }
4073 >        head.complete(null);
4074 >        assertEquals(5 * 3 * n, count.get());
4075      }
4076  
4077 <    /**
4078 <     * handleAsync action with Executor completes normally with
4079 <     * function value on either normal or exceptional completion of
4080 <     * source
4081 <     */
4082 <    public void testHandleAsync2() {
4083 <        CompletableFuture<Integer> f, g;
4084 <        ThreadExecutor exec = new ThreadExecutor();
4085 <        IntegerHandler r;
4086 <
4087 <        f = new CompletableFuture<>();
4088 <        g = f.handleAsync(r = new IntegerHandler(), exec);
4089 <        assertFalse(r.ran);
4090 <        f.completeExceptionally(new CFException());
4091 <        checkCompletedWithWrappedCFException(f);
4092 <        checkCompletedNormally(g, three);
4093 <        assertTrue(r.ran);
4094 <
4095 <        f = new CompletableFuture<>();
4096 <        g = f.handleAsync(r = new IntegerHandler(), exec);
4097 <        assertFalse(r.ran);
4098 <        f.completeExceptionally(new CFException());
4099 <        checkCompletedWithWrappedCFException(f);
3240 <        checkCompletedNormally(g, three);
3241 <        assertTrue(r.ran);
3242 <
3243 <        f = new CompletableFuture<>();
3244 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3245 <        assertFalse(r.ran);
3246 <        f.complete(one);
3247 <        checkCompletedNormally(f, one);
3248 <        checkCompletedNormally(g, two);
3249 <        assertTrue(r.ran);
3250 <
3251 <        f = new CompletableFuture<>();
3252 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3253 <        assertFalse(r.ran);
3254 <        f.complete(one);
3255 <        checkCompletedNormally(f, one);
3256 <        checkCompletedNormally(g, two);
3257 <        assertTrue(r.ran);
3258 <    }
4077 > //     static <U> U join(CompletionStage<U> stage) {
4078 > //         CompletableFuture<U> f = new CompletableFuture<>();
4079 > //         stage.whenComplete((v, ex) -> {
4080 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4081 > //         });
4082 > //         return f.join();
4083 > //     }
4084 >
4085 > //     static <U> boolean isDone(CompletionStage<U> stage) {
4086 > //         CompletableFuture<U> f = new CompletableFuture<>();
4087 > //         stage.whenComplete((v, ex) -> {
4088 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4089 > //         });
4090 > //         return f.isDone();
4091 > //     }
4092 >
4093 > //     static <U> U join2(CompletionStage<U> stage) {
4094 > //         return stage.toCompletableFuture().copy().join();
4095 > //     }
4096 >
4097 > //     static <U> boolean isDone2(CompletionStage<U> stage) {
4098 > //         return stage.toCompletableFuture().copy().isDone();
4099 > //     }
4100  
4101   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines