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.23 by jsr166, Tue Apr 9 07:50:55 2013 UTC vs.
Revision 1.134 by jsr166, Sun Nov 15 19:55:38 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines