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.33 by jsr166, Sun Jun 1 20:40:13 2014 UTC vs.
Revision 1.92 by jsr166, Tue Jun 17 20:50:01 2014 UTC

# Line 16 | Line 16 | import java.util.concurrent.ExecutionExc
16   import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19 + import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 102 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
108 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 >                                                      Throwable ex) {
110          try {
111              f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
# Line 128 | Line 131 | public class CompletableFutureTest exten
131          } catch (ExecutionException success) {
132              assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 203 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 +        for (Integer v1 : new Integer[] { 1, null })
231 +    {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233          checkIncomplete(f);
234 <        f.complete(one);
235 <        checkCompletedNormally(f, one);
236 <    }
234 >        assertTrue(f.complete(v1));
235 >        assertFalse(f.complete(v1));
236 >        checkCompletedNormally(f, v1);
237 >    }}
238  
239      /**
240       * completeExceptionally completes exceptionally, as indicated by
# Line 215 | Line 242 | public class CompletableFutureTest exten
242       */
243      public void testCompleteExceptionally() {
244          CompletableFuture<Integer> f = new CompletableFuture<>();
245 +        CFException ex = new CFException();
246          checkIncomplete(f);
247 <        f.completeExceptionally(new CFException());
248 <        checkCompletedWithWrappedCFException(f);
247 >        f.completeExceptionally(ex);
248 >        checkCompletedExceptionally(f, ex);
249      }
250  
251      /**
# Line 225 | Line 253 | public class CompletableFutureTest exten
253       * methods isDone, isCancelled, join, get, and getNow
254       */
255      public void testCancel() {
256 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
257 +    {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260          assertTrue(f.cancel(true));
261 +        assertTrue(f.cancel(true));
262          checkCancelled(f);
263 <    }
263 >    }}
264  
265      /**
266       * obtrudeValue forces completion with given value
# Line 237 | Line 268 | public class CompletableFutureTest exten
268      public void testObtrudeValue() {
269          CompletableFuture<Integer> f = new CompletableFuture<>();
270          checkIncomplete(f);
271 <        f.complete(one);
271 >        assertTrue(f.complete(one));
272          checkCompletedNormally(f, one);
273          f.obtrudeValue(three);
274          checkCompletedNormally(f, three);
# Line 246 | Line 277 | public class CompletableFutureTest exten
277          f = new CompletableFuture<>();
278          f.obtrudeValue(three);
279          checkCompletedNormally(f, three);
280 +        f.obtrudeValue(null);
281 +        checkCompletedNormally(f, null);
282          f = new CompletableFuture<>();
283          f.completeExceptionally(new CFException());
284          f.obtrudeValue(four);
# Line 256 | Line 289 | public class CompletableFutureTest exten
289       * obtrudeException forces completion with given exception
290       */
291      public void testObtrudeException() {
292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
293 <        checkIncomplete(f);
294 <        f.complete(one);
295 <        checkCompletedNormally(f, one);
296 <        f.obtrudeException(new CFException());
264 <        checkCompletedWithWrappedCFException(f);
292 >        for (Integer v1 : new Integer[] { 1, null })
293 >    {
294 >        CFException ex;
295 >        CompletableFuture<Integer> f;
296 >
297          f = new CompletableFuture<>();
298 <        f.obtrudeException(new CFException());
299 <        checkCompletedWithWrappedCFException(f);
298 >        assertTrue(f.complete(v1));
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304          f = new CompletableFuture<>();
305 +        for (int i = 0; i < 2; i++) {
306 +            f.obtrudeException(ex = new CFException());
307 +            checkCompletedExceptionally(f, ex);
308 +        }
309 +
310 +        f = new CompletableFuture<>();
311 +        f.completeExceptionally(ex = new CFException());
312 +        f.obtrudeValue(v1);
313 +        checkCompletedNormally(f, v1);
314 +        f.obtrudeException(ex = new CFException());
315 +        checkCompletedExceptionally(f, ex);
316          f.completeExceptionally(new CFException());
317 <        f.obtrudeValue(four);
318 <        checkCompletedNormally(f, four);
319 <        f.obtrudeException(new CFException());
320 <        checkCompletedWithWrappedCFException(f);
274 <    }
317 >        checkCompletedExceptionally(f, ex);
318 >        assertFalse(f.complete(v1));
319 >        checkCompletedExceptionally(f, ex);
320 >    }}
321  
322      /**
323       * getNumberOfDependents returns number of dependent tasks
324       */
325      public void testGetNumberOfDependents() {
326 +        for (ExecutionMode m : ExecutionMode.values())
327 +        for (Integer v1 : new Integer[] { 1, null })
328 +    {
329          CompletableFuture<Integer> f = new CompletableFuture<>();
330 <        assertEquals(f.getNumberOfDependents(), 0);
331 <        CompletableFuture g = f.thenRun(new Noop());
332 <        assertEquals(f.getNumberOfDependents(), 1);
333 <        assertEquals(g.getNumberOfDependents(), 0);
334 <        CompletableFuture h = f.thenRun(new Noop());
335 <        assertEquals(f.getNumberOfDependents(), 2);
336 <        f.complete(1);
330 >        assertEquals(0, f.getNumberOfDependents());
331 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
332 >        assertEquals(1, f.getNumberOfDependents());
333 >        assertEquals(0, g.getNumberOfDependents());
334 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
335 >        assertEquals(2, f.getNumberOfDependents());
336 >        assertEquals(0, h.getNumberOfDependents());
337 >        assertTrue(f.complete(v1));
338          checkCompletedNormally(g, null);
339 <        assertEquals(f.getNumberOfDependents(), 0);
340 <        assertEquals(g.getNumberOfDependents(), 0);
341 <    }
339 >        checkCompletedNormally(h, null);
340 >        assertEquals(0, f.getNumberOfDependents());
341 >        assertEquals(0, g.getNumberOfDependents());
342 >        assertEquals(0, h.getNumberOfDependents());
343 >    }}
344  
345      /**
346       * toString indicates current completion state
# Line 299 | Line 351 | public class CompletableFutureTest exten
351          f = new CompletableFuture<String>();
352          assertTrue(f.toString().contains("[Not completed]"));
353  
354 <        f.complete("foo");
354 >        assertTrue(f.complete("foo"));
355          assertTrue(f.toString().contains("[Completed normally]"));
356  
357          f = new CompletableFuture<String>();
358 <        f.completeExceptionally(new IndexOutOfBoundsException());
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359          assertTrue(f.toString().contains("[Completed exceptionally]"));
360 +
361 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
362 +            f = new CompletableFuture<String>();
363 +            assertTrue(f.cancel(mayInterruptIfRunning));
364 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
365 +        }
366      }
367  
368      /**
# Line 315 | Line 373 | public class CompletableFutureTest exten
373          checkCompletedNormally(f, "test");
374      }
375  
376 <    // Choose non-commutative actions for better coverage
377 <
378 <    static final Supplier<Integer> supplyOne =
379 <        () -> Integer.valueOf(1);
380 <    static final Function<Integer, Integer> inc =
381 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
382 <    static final BiFunction<Integer, Integer, Integer> subtract =
325 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
326 <    static final class IncAction implements Consumer<Integer> {
327 <        int value;
328 <        public void accept(Integer x) { value = x.intValue() + 1; }
329 <    }
330 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
331 <        int value;
332 <        public void accept(Integer x, Integer y) {
333 <            value = x.intValue() - y.intValue();
376 >    abstract class CheckedAction {
377 >        int invocationCount = 0;
378 >        final ExecutionMode m;
379 >        CheckedAction(ExecutionMode m) { this.m = m; }
380 >        void invoked() {
381 >            m.checkExecutionMode();
382 >            assertEquals(0, invocationCount++);
383          }
384 <    }
385 <    static final class Noop implements Runnable {
337 <        boolean ran;
338 <        public void run() { ran = true; }
384 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
385 >        void assertInvoked() { assertEquals(1, invocationCount); }
386      }
387  
388 <    static final class FailingSupplier implements Supplier<Integer> {
389 <        boolean ran;
390 <        public Integer get() { ran = true; throw new CFException(); }
391 <    }
392 <    static final class FailingConsumer implements Consumer<Integer> {
393 <        boolean ran;
347 <        public void accept(Integer x) { ran = true; throw new CFException(); }
348 <    }
349 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
350 <        boolean ran;
351 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
352 <    }
353 <    static final class FailingFunction implements Function<Integer, Integer> {
354 <        boolean ran;
355 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
356 <    }
357 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
358 <        boolean ran;
359 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
360 <    }
361 <    static final class FailingNoop implements Runnable {
362 <        boolean ran;
363 <        public void run() { ran = true; throw new CFException(); }
364 <    }
365 <
366 <    static final class CompletableFutureInc
367 <        implements Function<Integer, CompletableFuture<Integer>> {
368 <        boolean ran;
369 <        public CompletableFuture<Integer> apply(Integer x) {
370 <            ran = true;
371 <            CompletableFuture<Integer> f = new CompletableFuture<>();
372 <            f.complete(Integer.valueOf(x.intValue() + 1));
373 <            return f;
388 >    abstract class CheckedIntegerAction extends CheckedAction {
389 >        Integer value;
390 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
391 >        void assertValue(Integer expected) {
392 >            assertInvoked();
393 >            assertEquals(expected, value);
394          }
395      }
396  
397 <    static final class FailingCompletableFutureFunction
398 <        implements Function<Integer, CompletableFuture<Integer>> {
399 <        boolean ran;
400 <        public CompletableFuture<Integer> apply(Integer x) {
401 <            ran = true; throw new CFException();
397 >    class IntegerSupplier extends CheckedAction
398 >        implements Supplier<Integer>
399 >    {
400 >        final Integer value;
401 >        IntegerSupplier(ExecutionMode m, Integer value) {
402 >            super(m);
403 >            this.value = value;
404          }
405 <    }
406 <
407 <    // Used for explicit executor tests
386 <    static final class ThreadExecutor implements Executor {
387 <        AtomicInteger count = new AtomicInteger(0);
388 <
389 <        public void execute(Runnable r) {
390 <            count.getAndIncrement();
391 <            new Thread(r).start();
405 >        public Integer get() {
406 >            invoked();
407 >            return value;
408          }
409      }
410  
411 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
412 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
411 >    // A function that handles and produces null values as well.
412 >    static Integer inc(Integer x) {
413 >        return (x == null) ? null : x + 1;
414      }
415  
416 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
417 <        boolean ran;
418 <        public Integer apply(Integer x, Throwable t) {
419 <            ran = true;
420 <            return (t == null) ? two : three;
416 >    class NoopConsumer extends CheckedIntegerAction
417 >        implements Consumer<Integer>
418 >    {
419 >        NoopConsumer(ExecutionMode m) { super(m); }
420 >        public void accept(Integer x) {
421 >            invoked();
422 >            value = x;
423          }
424      }
425  
426 <    /**
427 <     * exceptionally action completes with function value on source
428 <     * exception; otherwise with source value
429 <     */
430 <    public void testExceptionally() {
431 <        CompletableFuture<Integer> f = new CompletableFuture<>();
432 <        ExceptionToInteger r = new ExceptionToInteger();
433 <        CompletableFuture<Integer> g = f.exceptionally(r);
415 <        f.completeExceptionally(new CFException());
416 <        checkCompletedNormally(g, three);
417 <
418 <        f = new CompletableFuture<>();
419 <        r = new ExceptionToInteger();
420 <        g = f.exceptionally(r);
421 <        f.complete(one);
422 <        checkCompletedNormally(g, one);
423 <    }
424 <
425 <    /**
426 <     * handle action completes normally with function value on either
427 <     * normal or exceptional completion of source
428 <     */
429 <    public void testHandle() {
430 <        CompletableFuture<Integer> f, g;
431 <        IntegerHandler r;
432 <
433 <        f = new CompletableFuture<>();
434 <        f.completeExceptionally(new CFException());
435 <        g = f.handle(r = new IntegerHandler());
436 <        assertTrue(r.ran);
437 <        checkCompletedNormally(g, three);
438 <
439 <        f = new CompletableFuture<>();
440 <        g = f.handle(r = new IntegerHandler());
441 <        assertFalse(r.ran);
442 <        f.completeExceptionally(new CFException());
443 <        checkCompletedNormally(g, three);
444 <        assertTrue(r.ran);
445 <
446 <        f = new CompletableFuture<>();
447 <        f.complete(one);
448 <        g = f.handle(r = new IntegerHandler());
449 <        assertTrue(r.ran);
450 <        checkCompletedNormally(g, two);
451 <
452 <        f = new CompletableFuture<>();
453 <        g = f.handle(r = new IntegerHandler());
454 <        assertFalse(r.ran);
455 <        f.complete(one);
456 <        assertTrue(r.ran);
457 <        checkCompletedNormally(g, two);
458 <    }
459 <
460 <    /**
461 <     * runAsync completes after running Runnable
462 <     */
463 <    public void testRunAsync() {
464 <        Noop r = new Noop();
465 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
466 <        assertNull(f.join());
467 <        assertTrue(r.ran);
468 <        checkCompletedNormally(f, null);
469 <    }
470 <
471 <    /**
472 <     * runAsync with executor completes after running Runnable
473 <     */
474 <    public void testRunAsync2() {
475 <        Noop r = new Noop();
476 <        ThreadExecutor exec = new ThreadExecutor();
477 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
478 <        assertNull(f.join());
479 <        assertTrue(r.ran);
480 <        checkCompletedNormally(f, null);
481 <        assertEquals(1, exec.count.get());
482 <    }
483 <
484 <    /**
485 <     * failing runAsync completes exceptionally after running Runnable
486 <     */
487 <    public void testRunAsync3() {
488 <        FailingNoop r = new FailingNoop();
489 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
490 <        checkCompletedWithWrappedCFException(f);
491 <        assertTrue(r.ran);
492 <    }
493 <
494 <    /**
495 <     * supplyAsync completes with result of supplier
496 <     */
497 <    public void testSupplyAsync() {
498 <        CompletableFuture<Integer> f;
499 <        f = CompletableFuture.supplyAsync(supplyOne);
500 <        assertEquals(f.join(), one);
501 <        checkCompletedNormally(f, one);
502 <    }
503 <
504 <    /**
505 <     * supplyAsync with executor completes with result of supplier
506 <     */
507 <    public void testSupplyAsync2() {
508 <        CompletableFuture<Integer> f;
509 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
510 <        assertEquals(f.join(), one);
511 <        checkCompletedNormally(f, one);
512 <    }
513 <
514 <    /**
515 <     * Failing supplyAsync completes exceptionally
516 <     */
517 <    public void testSupplyAsync3() {
518 <        FailingSupplier r = new FailingSupplier();
519 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
520 <        checkCompletedWithWrappedCFException(f);
521 <        assertTrue(r.ran);
522 <    }
523 <
524 <    // seq completion methods
525 <
526 <    /**
527 <     * thenRun result completes normally after normal completion of source
528 <     */
529 <    public void testThenRun() {
530 <        CompletableFuture<Integer> f;
531 <        CompletableFuture<Void> g;
532 <        Noop r;
533 <
534 <        f = new CompletableFuture<>();
535 <        g = f.thenRun(r = new Noop());
536 <        f.complete(null);
537 <        checkCompletedNormally(g, null);
538 <        assertTrue(r.ran);
539 <
540 <        f = new CompletableFuture<>();
541 <        f.complete(null);
542 <        g = f.thenRun(r = new Noop());
543 <        checkCompletedNormally(g, null);
544 <        assertTrue(r.ran);
545 <    }
546 <
547 <    /**
548 <     * thenRun result completes exceptionally after exceptional
549 <     * completion of source
550 <     */
551 <    public void testThenRun2() {
552 <        CompletableFuture<Integer> f;
553 <        CompletableFuture<Void> g;
554 <        Noop r;
555 <
556 <        f = new CompletableFuture<>();
557 <        g = f.thenRun(r = new Noop());
558 <        f.completeExceptionally(new CFException());
559 <        checkCompletedWithWrappedCFException(g);
560 <        assertFalse(r.ran);
561 <
562 <        f = new CompletableFuture<>();
563 <        f.completeExceptionally(new CFException());
564 <        g = f.thenRun(r = new Noop());
565 <        checkCompletedWithWrappedCFException(g);
566 <        assertFalse(r.ran);
567 <    }
568 <
569 <    /**
570 <     * thenRun result completes exceptionally if action does
571 <     */
572 <    public void testThenRun3() {
573 <        CompletableFuture<Integer> f;
574 <        CompletableFuture<Void> g;
575 <        FailingNoop r;
576 <
577 <        f = new CompletableFuture<>();
578 <        g = f.thenRun(r = new FailingNoop());
579 <        f.complete(null);
580 <        checkCompletedWithWrappedCFException(g);
581 <
582 <        f = new CompletableFuture<>();
583 <        f.complete(null);
584 <        g = f.thenRun(r = new FailingNoop());
585 <        checkCompletedWithWrappedCFException(g);
426 >    class IncFunction extends CheckedIntegerAction
427 >        implements Function<Integer,Integer>
428 >    {
429 >        IncFunction(ExecutionMode m) { super(m); }
430 >        public Integer apply(Integer x) {
431 >            invoked();
432 >            return value = inc(x);
433 >        }
434      }
435  
436 <    /**
437 <     * thenRun result completes exceptionally if source cancelled
438 <     */
439 <    public void testThenRun4() {
440 <        CompletableFuture<Integer> f;
441 <        CompletableFuture<Void> g;
594 <        Noop r;
595 <
596 <        f = new CompletableFuture<>();
597 <        g = f.thenRun(r = new Noop());
598 <        assertTrue(f.cancel(true));
599 <        checkCompletedWithWrappedCancellationException(g);
600 <
601 <        f = new CompletableFuture<>();
602 <        assertTrue(f.cancel(true));
603 <        g = f.thenRun(r = new Noop());
604 <        checkCompletedWithWrappedCancellationException(g);
436 >    // Choose non-commutative actions for better coverage
437 >    // A non-commutative function that handles and produces null values as well.
438 >    static Integer subtract(Integer x, Integer y) {
439 >        return (x == null && y == null) ? null :
440 >            ((x == null) ? 42 : x.intValue())
441 >            - ((y == null) ? 99 : y.intValue());
442      }
443  
444 <    /**
445 <     * thenApply result completes normally after normal completion of source
446 <     */
447 <    public void testThenApply() {
448 <        CompletableFuture<Integer> f = new CompletableFuture<>();
449 <        CompletableFuture<Integer> g = f.thenApply(inc);
450 <        f.complete(one);
451 <        checkCompletedNormally(g, two);
444 >    class SubtractAction extends CheckedIntegerAction
445 >        implements BiConsumer<Integer, Integer>
446 >    {
447 >        SubtractAction(ExecutionMode m) { super(m); }
448 >        public void accept(Integer x, Integer y) {
449 >            invoked();
450 >            value = subtract(x, y);
451 >        }
452      }
453  
454 <    /**
455 <     * thenApply result completes exceptionally after exceptional
456 <     * completion of source
457 <     */
458 <    public void testThenApply2() {
459 <        CompletableFuture<Integer> f = new CompletableFuture<>();
460 <        CompletableFuture<Integer> g = f.thenApply(inc);
461 <        f.completeExceptionally(new CFException());
625 <        checkCompletedWithWrappedCFException(g);
454 >    class SubtractFunction extends CheckedIntegerAction
455 >        implements BiFunction<Integer, Integer, Integer>
456 >    {
457 >        SubtractFunction(ExecutionMode m) { super(m); }
458 >        public Integer apply(Integer x, Integer y) {
459 >            invoked();
460 >            return value = subtract(x, y);
461 >        }
462      }
463  
464 <    /**
465 <     * thenApply result completes exceptionally if action does
466 <     */
467 <    public void testThenApply3() {
468 <        CompletableFuture<Integer> f = new CompletableFuture<>();
633 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
634 <        f.complete(one);
635 <        checkCompletedWithWrappedCFException(g);
464 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466 >        public void run() {
467 >            invoked();
468 >        }
469      }
470  
471 <    /**
472 <     * thenApply result completes exceptionally if source cancelled
473 <     */
474 <    public void testThenApply4() {
475 <        CompletableFuture<Integer> f = new CompletableFuture<>();
476 <        CompletableFuture<Integer> g = f.thenApply(inc);
477 <        assertTrue(f.cancel(true));
478 <        checkCompletedWithWrappedCancellationException(g);
471 >    class FailingSupplier extends CheckedAction
472 >        implements Supplier<Integer>
473 >    {
474 >        FailingSupplier(ExecutionMode m) { super(m); }
475 >        public Integer get() {
476 >            invoked();
477 >            throw new CFException();
478 >        }
479      }
480  
481 <    /**
482 <     * thenAccept result completes normally after normal completion of source
483 <     */
484 <    public void testThenAccept() {
485 <        CompletableFuture<Integer> f = new CompletableFuture<>();
486 <        IncAction r = new IncAction();
487 <        CompletableFuture<Void> g = f.thenAccept(r);
488 <        f.complete(one);
489 <        checkCompletedNormally(g, null);
657 <        assertEquals(r.value, 2);
481 >    class FailingConsumer extends CheckedIntegerAction
482 >        implements Consumer<Integer>
483 >    {
484 >        FailingConsumer(ExecutionMode m) { super(m); }
485 >        public void accept(Integer x) {
486 >            invoked();
487 >            value = x;
488 >            throw new CFException();
489 >        }
490      }
491  
492 <    /**
493 <     * thenAccept result completes exceptionally after exceptional
494 <     * completion of source
495 <     */
496 <    public void testThenAccept2() {
497 <        CompletableFuture<Integer> f = new CompletableFuture<>();
498 <        IncAction r = new IncAction();
499 <        CompletableFuture<Void> g = f.thenAccept(r);
500 <        f.completeExceptionally(new CFException());
669 <        checkCompletedWithWrappedCFException(g);
492 >    class FailingBiConsumer extends CheckedIntegerAction
493 >        implements BiConsumer<Integer, Integer>
494 >    {
495 >        FailingBiConsumer(ExecutionMode m) { super(m); }
496 >        public void accept(Integer x, Integer y) {
497 >            invoked();
498 >            value = subtract(x, y);
499 >            throw new CFException();
500 >        }
501      }
502  
503 <    /**
504 <     * thenAccept result completes exceptionally if action does
505 <     */
506 <    public void testThenAccept3() {
507 <        CompletableFuture<Integer> f = new CompletableFuture<>();
508 <        FailingConsumer r = new FailingConsumer();
509 <        CompletableFuture<Void> g = f.thenAccept(r);
510 <        f.complete(one);
511 <        checkCompletedWithWrappedCFException(g);
681 <        assertTrue(r.ran);
503 >    class FailingFunction extends CheckedIntegerAction
504 >        implements Function<Integer, Integer>
505 >    {
506 >        FailingFunction(ExecutionMode m) { super(m); }
507 >        public Integer apply(Integer x) {
508 >            invoked();
509 >            value = x;
510 >            throw new CFException();
511 >        }
512      }
513  
514 <    /**
515 <     * thenAccept result completes exceptionally if source cancelled
516 <     */
517 <    public void testThenAccept4() {
518 <        CompletableFuture<Integer> f = new CompletableFuture<>();
519 <        IncAction r = new IncAction();
520 <        CompletableFuture<Void> g = f.thenAccept(r);
521 <        assertTrue(f.cancel(true));
522 <        checkCompletedWithWrappedCancellationException(g);
514 >    class FailingBiFunction extends CheckedIntegerAction
515 >        implements BiFunction<Integer, Integer, Integer>
516 >    {
517 >        FailingBiFunction(ExecutionMode m) { super(m); }
518 >        public Integer apply(Integer x, Integer y) {
519 >            invoked();
520 >            value = subtract(x, y);
521 >            throw new CFException();
522 >        }
523      }
524  
525 <    /**
526 <     * thenCombine result completes normally after normal completion
527 <     * of sources
528 <     */
529 <    public void testThenCombine() {
530 <        CompletableFuture<Integer> f, g, h;
701 <
702 <        f = new CompletableFuture<>();
703 <        g = new CompletableFuture<>();
704 <        h = f.thenCombine(g, subtract);
705 <        f.complete(3);
706 <        checkIncomplete(h);
707 <        g.complete(1);
708 <        checkCompletedNormally(h, 2);
709 <
710 <        f = new CompletableFuture<>();
711 <        g = new CompletableFuture<>();
712 <        h = f.thenCombine(g, subtract);
713 <        g.complete(1);
714 <        checkIncomplete(h);
715 <        f.complete(3);
716 <        checkCompletedNormally(h, 2);
717 <
718 <        f = new CompletableFuture<>();
719 <        g = new CompletableFuture<>();
720 <        g.complete(1);
721 <        f.complete(3);
722 <        h = f.thenCombine(g, subtract);
723 <        checkCompletedNormally(h, 2);
525 >    class FailingRunnable extends CheckedAction implements Runnable {
526 >        FailingRunnable(ExecutionMode m) { super(m); }
527 >        public void run() {
528 >            invoked();
529 >            throw new CFException();
530 >        }
531      }
532  
726    /**
727     * thenCombine result completes exceptionally after exceptional
728     * completion of either source
729     */
730    public void testThenCombine2() {
731        CompletableFuture<Integer> f, g, h;
732
733        f = new CompletableFuture<>();
734        g = new CompletableFuture<>();
735        h = f.thenCombine(g, subtract);
736        f.completeExceptionally(new CFException());
737        checkIncomplete(h);
738        g.complete(1);
739        checkCompletedWithWrappedCFException(h);
740
741        f = new CompletableFuture<>();
742        g = new CompletableFuture<>();
743        h = f.thenCombine(g, subtract);
744        g.completeExceptionally(new CFException());
745        checkIncomplete(h);
746        f.complete(3);
747        checkCompletedWithWrappedCFException(h);
748
749        f = new CompletableFuture<>();
750        g = new CompletableFuture<>();
751        f.complete(3);
752        g.completeExceptionally(new CFException());
753        h = f.thenCombine(g, subtract);
754        checkCompletedWithWrappedCFException(h);
533  
534 <        f = new CompletableFuture<>();
535 <        g = new CompletableFuture<>();
536 <        f.completeExceptionally(new CFException());
537 <        g.complete(3);
538 <        h = f.thenCombine(g, subtract);
539 <        checkCompletedWithWrappedCFException(h);
540 <    }
541 <
542 <    /**
543 <     * thenCombine result completes exceptionally if action does
544 <     */
767 <    public void testThenCombine3() {
768 <        CompletableFuture<Integer> f = new CompletableFuture<>();
769 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
770 <        FailingBiFunction r = new FailingBiFunction();
771 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
772 <        f.complete(one);
773 <        checkIncomplete(g);
774 <        assertFalse(r.ran);
775 <        f2.complete(two);
776 <        checkCompletedWithWrappedCFException(g);
777 <        assertTrue(r.ran);
534 >    class CompletableFutureInc extends CheckedIntegerAction
535 >        implements Function<Integer, CompletableFuture<Integer>>
536 >    {
537 >        CompletableFutureInc(ExecutionMode m) { super(m); }
538 >        public CompletableFuture<Integer> apply(Integer x) {
539 >            invoked();
540 >            value = x;
541 >            CompletableFuture<Integer> f = new CompletableFuture<>();
542 >            assertTrue(f.complete(inc(x)));
543 >            return f;
544 >        }
545      }
546  
547 <    /**
548 <     * thenCombine result completes exceptionally if either source cancelled
549 <     */
550 <    public void testThenCombine4() {
551 <        CompletableFuture<Integer> f, g, h;
552 <
553 <        f = new CompletableFuture<>();
554 <        g = new CompletableFuture<>();
555 <        h = f.thenCombine(g, subtract);
789 <        assertTrue(f.cancel(true));
790 <        checkIncomplete(h);
791 <        g.complete(1);
792 <        checkCompletedWithWrappedCancellationException(h);
793 <
794 <        f = new CompletableFuture<>();
795 <        g = new CompletableFuture<>();
796 <        h = f.thenCombine(g, subtract);
797 <        assertTrue(g.cancel(true));
798 <        checkIncomplete(h);
799 <        f.complete(3);
800 <        checkCompletedWithWrappedCancellationException(h);
801 <
802 <        f = new CompletableFuture<>();
803 <        g = new CompletableFuture<>();
804 <        assertTrue(f.cancel(true));
805 <        assertTrue(g.cancel(true));
806 <        h = f.thenCombine(g, subtract);
807 <        checkCompletedWithWrappedCancellationException(h);
547 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
548 >        implements Function<Integer, CompletableFuture<Integer>>
549 >    {
550 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
551 >        public CompletableFuture<Integer> apply(Integer x) {
552 >            invoked();
553 >            value = x;
554 >            throw new CFException();
555 >        }
556      }
557  
558 <    /**
559 <     * thenAcceptBoth result completes normally after normal
560 <     * completion of sources
561 <     */
562 <    public void testThenAcceptBoth() {
563 <        CompletableFuture<Integer> f, g;
564 <        CompletableFuture<Void> h;
817 <        SubtractAction r;
818 <
819 <        f = new CompletableFuture<>();
820 <        g = new CompletableFuture<>();
821 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
822 <        f.complete(3);
823 <        checkIncomplete(h);
824 <        g.complete(1);
825 <        checkCompletedNormally(h, null);
826 <        assertEquals(r.value, 2);
827 <
828 <        f = new CompletableFuture<>();
829 <        g = new CompletableFuture<>();
830 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
831 <        g.complete(1);
832 <        checkIncomplete(h);
833 <        f.complete(3);
834 <        checkCompletedNormally(h, null);
835 <        assertEquals(r.value, 2);
558 >    // Used for explicit executor tests
559 >    static final class ThreadExecutor implements Executor {
560 >        final AtomicInteger count = new AtomicInteger(0);
561 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
562 >        static boolean startedCurrentThread() {
563 >            return Thread.currentThread().getThreadGroup() == tg;
564 >        }
565  
566 <        f = new CompletableFuture<>();
567 <        g = new CompletableFuture<>();
568 <        g.complete(1);
569 <        f.complete(3);
841 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
842 <        checkCompletedNormally(h, null);
843 <        assertEquals(r.value, 2);
566 >        public void execute(Runnable r) {
567 >            count.getAndIncrement();
568 >            new Thread(tg, r).start();
569 >        }
570      }
571  
572      /**
573 <     * thenAcceptBoth result completes exceptionally after exceptional
574 <     * completion of either source
573 >     * Permits the testing of parallel code for the 3 different
574 >     * execution modes without copy/pasting all the test methods.
575       */
576 <    public void testThenAcceptBoth2() {
577 <        CompletableFuture<Integer> f, g;
578 <        CompletableFuture<Void> h;
579 <        SubtractAction r;
580 <
581 <        f = new CompletableFuture<>();
582 <        g = new CompletableFuture<>();
583 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
584 <        f.completeExceptionally(new CFException());
585 <        checkIncomplete(h);
586 <        g.complete(1);
587 <        checkCompletedWithWrappedCFException(h);
588 <
589 <        f = new CompletableFuture<>();
590 <        g = new CompletableFuture<>();
591 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
592 <        g.completeExceptionally(new CFException());
593 <        checkIncomplete(h);
594 <        f.complete(3);
595 <        checkCompletedWithWrappedCFException(h);
596 <
597 <        f = new CompletableFuture<>();
598 <        g = new CompletableFuture<>();
599 <        f.complete(3);
600 <        g.completeExceptionally(new CFException());
601 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
602 <        checkCompletedWithWrappedCFException(h);
603 <
604 <        f = new CompletableFuture<>();
605 <        g = new CompletableFuture<>();
606 <        f.completeExceptionally(new CFException());
607 <        g.complete(3);
608 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
609 <        checkCompletedWithWrappedCFException(h);
610 <    }
576 >    enum ExecutionMode {
577 >        DEFAULT {
578 >            public void checkExecutionMode() {
579 >                assertFalse(ThreadExecutor.startedCurrentThread());
580 >                assertNull(ForkJoinTask.getPool());
581 >            }
582 >            public CompletableFuture<Void> runAsync(Runnable a) {
583 >                throw new UnsupportedOperationException();
584 >            }
585 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
586 >                throw new UnsupportedOperationException();
587 >            }
588 >            public <T> CompletableFuture<Void> thenRun
589 >                (CompletableFuture<T> f, Runnable a) {
590 >                return f.thenRun(a);
591 >            }
592 >            public <T> CompletableFuture<Void> thenAccept
593 >                (CompletableFuture<T> f, Consumer<? super T> a) {
594 >                return f.thenAccept(a);
595 >            }
596 >            public <T,U> CompletableFuture<U> thenApply
597 >                (CompletableFuture<T> f, Function<? super T,U> a) {
598 >                return f.thenApply(a);
599 >            }
600 >            public <T,U> CompletableFuture<U> thenCompose
601 >                (CompletableFuture<T> f,
602 >                 Function<? super T,? extends CompletionStage<U>> a) {
603 >                return f.thenCompose(a);
604 >            }
605 >            public <T,U> CompletableFuture<U> handle
606 >                (CompletableFuture<T> f,
607 >                 BiFunction<? super T,Throwable,? extends U> a) {
608 >                return f.handle(a);
609 >            }
610 >            public <T> CompletableFuture<T> whenComplete
611 >                (CompletableFuture<T> f,
612 >                 BiConsumer<? super T,? super Throwable> a) {
613 >                return f.whenComplete(a);
614 >            }
615 >            public <T,U> CompletableFuture<Void> runAfterBoth
616 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
617 >                return f.runAfterBoth(g, a);
618 >            }
619 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
620 >                (CompletableFuture<T> f,
621 >                 CompletionStage<? extends U> g,
622 >                 BiConsumer<? super T,? super U> a) {
623 >                return f.thenAcceptBoth(g, a);
624 >            }
625 >            public <T,U,V> CompletableFuture<V> thenCombine
626 >                (CompletableFuture<T> f,
627 >                 CompletionStage<? extends U> g,
628 >                 BiFunction<? super T,? super U,? extends V> a) {
629 >                return f.thenCombine(g, a);
630 >            }
631 >            public <T> CompletableFuture<Void> runAfterEither
632 >                (CompletableFuture<T> f,
633 >                 CompletionStage<?> g,
634 >                 java.lang.Runnable a) {
635 >                return f.runAfterEither(g, a);
636 >            }
637 >            public <T> CompletableFuture<Void> acceptEither
638 >                (CompletableFuture<T> f,
639 >                 CompletionStage<? extends T> g,
640 >                 Consumer<? super T> a) {
641 >                return f.acceptEither(g, a);
642 >            }
643 >            public <T,U> CompletableFuture<U> applyToEither
644 >                (CompletableFuture<T> f,
645 >                 CompletionStage<? extends T> g,
646 >                 Function<? super T,U> a) {
647 >                return f.applyToEither(g, a);
648 >            }
649 >        },
650  
651 <    /**
652 <     * thenAcceptBoth result completes exceptionally if action does
653 <     */
654 <    public void testThenAcceptBoth3() {
655 <        CompletableFuture<Integer> f, g;
656 <        CompletableFuture<Void> h;
657 <        FailingBiConsumer r;
651 >        ASYNC {
652 >            public void checkExecutionMode() {
653 >                assertSame(ForkJoinPool.commonPool(),
654 >                           ForkJoinTask.getPool());
655 >            }
656 >            public CompletableFuture<Void> runAsync(Runnable a) {
657 >                return CompletableFuture.runAsync(a);
658 >            }
659 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
660 >                return CompletableFuture.supplyAsync(a);
661 >            }
662 >            public <T> CompletableFuture<Void> thenRun
663 >                (CompletableFuture<T> f, Runnable a) {
664 >                return f.thenRunAsync(a);
665 >            }
666 >            public <T> CompletableFuture<Void> thenAccept
667 >                (CompletableFuture<T> f, Consumer<? super T> a) {
668 >                return f.thenAcceptAsync(a);
669 >            }
670 >            public <T,U> CompletableFuture<U> thenApply
671 >                (CompletableFuture<T> f, Function<? super T,U> a) {
672 >                return f.thenApplyAsync(a);
673 >            }
674 >            public <T,U> CompletableFuture<U> thenCompose
675 >                (CompletableFuture<T> f,
676 >                 Function<? super T,? extends CompletionStage<U>> a) {
677 >                return f.thenComposeAsync(a);
678 >            }
679 >            public <T,U> CompletableFuture<U> handle
680 >                (CompletableFuture<T> f,
681 >                 BiFunction<? super T,Throwable,? extends U> a) {
682 >                return f.handleAsync(a);
683 >            }
684 >            public <T> CompletableFuture<T> whenComplete
685 >                (CompletableFuture<T> f,
686 >                 BiConsumer<? super T,? super Throwable> a) {
687 >                return f.whenCompleteAsync(a);
688 >            }
689 >            public <T,U> CompletableFuture<Void> runAfterBoth
690 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
691 >                return f.runAfterBothAsync(g, a);
692 >            }
693 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
694 >                (CompletableFuture<T> f,
695 >                 CompletionStage<? extends U> g,
696 >                 BiConsumer<? super T,? super U> a) {
697 >                return f.thenAcceptBothAsync(g, a);
698 >            }
699 >            public <T,U,V> CompletableFuture<V> thenCombine
700 >                (CompletableFuture<T> f,
701 >                 CompletionStage<? extends U> g,
702 >                 BiFunction<? super T,? super U,? extends V> a) {
703 >                return f.thenCombineAsync(g, a);
704 >            }
705 >            public <T> CompletableFuture<Void> runAfterEither
706 >                (CompletableFuture<T> f,
707 >                 CompletionStage<?> g,
708 >                 java.lang.Runnable a) {
709 >                return f.runAfterEitherAsync(g, a);
710 >            }
711 >            public <T> CompletableFuture<Void> acceptEither
712 >                (CompletableFuture<T> f,
713 >                 CompletionStage<? extends T> g,
714 >                 Consumer<? super T> a) {
715 >                return f.acceptEitherAsync(g, a);
716 >            }
717 >            public <T,U> CompletableFuture<U> applyToEither
718 >                (CompletableFuture<T> f,
719 >                 CompletionStage<? extends T> g,
720 >                 Function<? super T,U> a) {
721 >                return f.applyToEitherAsync(g, a);
722 >            }
723 >        },
724  
725 <        f = new CompletableFuture<>();
726 <        g = new CompletableFuture<>();
727 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
728 <        f.complete(3);
729 <        checkIncomplete(h);
730 <        g.complete(1);
731 <        checkCompletedWithWrappedCFException(h);
725 >        EXECUTOR {
726 >            public void checkExecutionMode() {
727 >                assertTrue(ThreadExecutor.startedCurrentThread());
728 >            }
729 >            public CompletableFuture<Void> runAsync(Runnable a) {
730 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
731 >            }
732 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
733 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
734 >            }
735 >            public <T> CompletableFuture<Void> thenRun
736 >                (CompletableFuture<T> f, Runnable a) {
737 >                return f.thenRunAsync(a, new ThreadExecutor());
738 >            }
739 >            public <T> CompletableFuture<Void> thenAccept
740 >                (CompletableFuture<T> f, Consumer<? super T> a) {
741 >                return f.thenAcceptAsync(a, new ThreadExecutor());
742 >            }
743 >            public <T,U> CompletableFuture<U> thenApply
744 >                (CompletableFuture<T> f, Function<? super T,U> a) {
745 >                return f.thenApplyAsync(a, new ThreadExecutor());
746 >            }
747 >            public <T,U> CompletableFuture<U> thenCompose
748 >                (CompletableFuture<T> f,
749 >                 Function<? super T,? extends CompletionStage<U>> a) {
750 >                return f.thenComposeAsync(a, new ThreadExecutor());
751 >            }
752 >            public <T,U> CompletableFuture<U> handle
753 >                (CompletableFuture<T> f,
754 >                 BiFunction<? super T,Throwable,? extends U> a) {
755 >                return f.handleAsync(a, new ThreadExecutor());
756 >            }
757 >            public <T> CompletableFuture<T> whenComplete
758 >                (CompletableFuture<T> f,
759 >                 BiConsumer<? super T,? super Throwable> a) {
760 >                return f.whenCompleteAsync(a, new ThreadExecutor());
761 >            }
762 >            public <T,U> CompletableFuture<Void> runAfterBoth
763 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
764 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
765 >            }
766 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
767 >                (CompletableFuture<T> f,
768 >                 CompletionStage<? extends U> g,
769 >                 BiConsumer<? super T,? super U> a) {
770 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
771 >            }
772 >            public <T,U,V> CompletableFuture<V> thenCombine
773 >                (CompletableFuture<T> f,
774 >                 CompletionStage<? extends U> g,
775 >                 BiFunction<? super T,? super U,? extends V> a) {
776 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
777 >            }
778 >            public <T> CompletableFuture<Void> runAfterEither
779 >                (CompletableFuture<T> f,
780 >                 CompletionStage<?> g,
781 >                 java.lang.Runnable a) {
782 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
783 >            }
784 >            public <T> CompletableFuture<Void> acceptEither
785 >                (CompletableFuture<T> f,
786 >                 CompletionStage<? extends T> g,
787 >                 Consumer<? super T> a) {
788 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
789 >            }
790 >            public <T,U> CompletableFuture<U> applyToEither
791 >                (CompletableFuture<T> f,
792 >                 CompletionStage<? extends T> g,
793 >                 Function<? super T,U> a) {
794 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
795 >            }
796 >        };
797  
798 <        f = new CompletableFuture<>();
799 <        g = new CompletableFuture<>();
800 <        f.complete(3);
801 <        g.complete(1);
802 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
803 <        checkCompletedWithWrappedCFException(h);
798 >        public abstract void checkExecutionMode();
799 >        public abstract CompletableFuture<Void> runAsync(Runnable a);
800 >        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
801 >        public abstract <T> CompletableFuture<Void> thenRun
802 >            (CompletableFuture<T> f, Runnable a);
803 >        public abstract <T> CompletableFuture<Void> thenAccept
804 >            (CompletableFuture<T> f, Consumer<? super T> a);
805 >        public abstract <T,U> CompletableFuture<U> thenApply
806 >            (CompletableFuture<T> f, Function<? super T,U> a);
807 >        public abstract <T,U> CompletableFuture<U> thenCompose
808 >            (CompletableFuture<T> f,
809 >             Function<? super T,? extends CompletionStage<U>> a);
810 >        public abstract <T,U> CompletableFuture<U> handle
811 >            (CompletableFuture<T> f,
812 >             BiFunction<? super T,Throwable,? extends U> a);
813 >        public abstract <T> CompletableFuture<T> whenComplete
814 >            (CompletableFuture<T> f,
815 >             BiConsumer<? super T,? super Throwable> a);
816 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
817 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
818 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
819 >            (CompletableFuture<T> f,
820 >             CompletionStage<? extends U> g,
821 >             BiConsumer<? super T,? super U> a);
822 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
823 >            (CompletableFuture<T> f,
824 >             CompletionStage<? extends U> g,
825 >             BiFunction<? super T,? super U,? extends V> a);
826 >        public abstract <T> CompletableFuture<Void> runAfterEither
827 >            (CompletableFuture<T> f,
828 >             CompletionStage<?> g,
829 >             java.lang.Runnable a);
830 >        public abstract <T> CompletableFuture<Void> acceptEither
831 >            (CompletableFuture<T> f,
832 >             CompletionStage<? extends T> g,
833 >             Consumer<? super T> a);
834 >        public abstract <T,U> CompletableFuture<U> applyToEither
835 >            (CompletableFuture<T> f,
836 >             CompletionStage<? extends T> g,
837 >             Function<? super T,U> a);
838      }
839  
840      /**
841 <     * thenAcceptBoth result completes exceptionally if either source cancelled
841 >     * exceptionally action is not invoked when source completes
842 >     * normally, and source result is propagated
843       */
844 <    public void testThenAcceptBoth4() {
845 <        CompletableFuture<Integer> f, g;
846 <        CompletableFuture<Void> h;
847 <        SubtractAction r;
848 <
849 <        f = new CompletableFuture<>();
850 <        g = new CompletableFuture<>();
851 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
852 <        assertTrue(f.cancel(true));
853 <        checkIncomplete(h);
854 <        g.complete(1);
855 <        checkCompletedWithWrappedCancellationException(h);
856 <
857 <        f = new CompletableFuture<>();
927 <        g = new CompletableFuture<>();
928 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
929 <        assertTrue(g.cancel(true));
930 <        checkIncomplete(h);
931 <        f.complete(3);
932 <        checkCompletedWithWrappedCancellationException(h);
933 <
934 <        f = new CompletableFuture<>();
935 <        g = new CompletableFuture<>();
936 <        f.complete(3);
937 <        assertTrue(g.cancel(true));
938 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
939 <        checkCompletedWithWrappedCancellationException(h);
844 >    public void testExceptionally_normalCompletion() {
845 >        for (boolean createIncomplete : new boolean[] { true, false })
846 >        for (Integer v1 : new Integer[] { 1, null })
847 >    {
848 >        final AtomicInteger a = new AtomicInteger(0);
849 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
850 >        if (!createIncomplete) assertTrue(f.complete(v1));
851 >        final CompletableFuture<Integer> g = f.exceptionally
852 >            ((Throwable t) -> {
853 >                // Should not be called
854 >                a.getAndIncrement();
855 >                throw new AssertionError();
856 >            });
857 >        if (createIncomplete) assertTrue(f.complete(v1));
858  
859 <        f = new CompletableFuture<>();
860 <        g = new CompletableFuture<>();
861 <        assertTrue(f.cancel(true));
862 <        g.complete(3);
945 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
946 <        checkCompletedWithWrappedCancellationException(h);
947 <    }
859 >        checkCompletedNormally(g, v1);
860 >        checkCompletedNormally(f, v1);
861 >        assertEquals(0, a.get());
862 >    }}
863  
864      /**
865 <     * runAfterBoth result completes normally after normal
866 <     * completion of sources
865 >     * exceptionally action completes with function value on source
866 >     * exception
867       */
868 <    public void testRunAfterBoth_normalCompletion1() {
868 >    public void testExceptionally_exceptionalCompletion() {
869 >        for (boolean createIncomplete : new boolean[] { true, false })
870          for (Integer v1 : new Integer[] { 1, null })
871 <        for (Integer v2 : new Integer[] { 2, null }) {
872 <
871 >    {
872 >        final AtomicInteger a = new AtomicInteger(0);
873 >        final CFException ex = new CFException();
874          final CompletableFuture<Integer> f = new CompletableFuture<>();
875 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
876 <        final Noop r = new Noop();
877 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
875 >        if (!createIncomplete) f.completeExceptionally(ex);
876 >        final CompletableFuture<Integer> g = f.exceptionally
877 >            ((Throwable t) -> {
878 >                ExecutionMode.DEFAULT.checkExecutionMode();
879 >                threadAssertSame(t, ex);
880 >                a.getAndIncrement();
881 >                return v1;
882 >            });
883 >        if (createIncomplete) f.completeExceptionally(ex);
884  
885 <        f.complete(v1);
886 <        checkIncomplete(h);
887 <        assertFalse(r.ran);
965 <        g.complete(v2);
966 <
967 <        checkCompletedNormally(h, null);
968 <        assertTrue(r.ran);
969 <        checkCompletedNormally(f, v1);
970 <        checkCompletedNormally(g, v2);
971 <        }
972 <    }
885 >        checkCompletedNormally(g, v1);
886 >        assertEquals(1, a.get());
887 >    }}
888  
889 <    public void testRunAfterBoth_normalCompletion2() {
889 >    public void testExceptionally_exceptionalCompletionActionFailed() {
890 >        for (boolean createIncomplete : new boolean[] { true, false })
891          for (Integer v1 : new Integer[] { 1, null })
892 <        for (Integer v2 : new Integer[] { 2, null }) {
893 <
892 >    {
893 >        final AtomicInteger a = new AtomicInteger(0);
894 >        final CFException ex1 = new CFException();
895 >        final CFException ex2 = new CFException();
896          final CompletableFuture<Integer> f = new CompletableFuture<>();
897 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
898 <        final Noop r = new Noop();
899 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
900 <
901 <        g.complete(v2);
902 <        checkIncomplete(h);
903 <        assertFalse(r.ran);
904 <        f.complete(v1);
905 <
906 <        checkCompletedNormally(h, null);
907 <        assertTrue(r.ran);
908 <        checkCompletedNormally(f, v1);
909 <        checkCompletedNormally(g, v2);
992 <        }
993 <    }
897 >        if (!createIncomplete) f.completeExceptionally(ex1);
898 >        final CompletableFuture<Integer> g = f.exceptionally
899 >            ((Throwable t) -> {
900 >                ExecutionMode.DEFAULT.checkExecutionMode();
901 >                threadAssertSame(t, ex1);
902 >                a.getAndIncrement();
903 >                throw ex2;
904 >            });
905 >        if (createIncomplete) f.completeExceptionally(ex1);
906 >
907 >        checkCompletedWithWrappedException(g, ex2);
908 >        assertEquals(1, a.get());
909 >    }}
910  
911 <    public void testRunAfterBoth_normalCompletion3() {
911 >    /**
912 >     * whenComplete action executes on normal completion, propagating
913 >     * source result.
914 >     */
915 >    public void testWhenComplete_normalCompletion1() {
916 >        for (ExecutionMode m : ExecutionMode.values())
917 >        for (boolean createIncomplete : new boolean[] { true, false })
918          for (Integer v1 : new Integer[] { 1, null })
919 <        for (Integer v2 : new Integer[] { 2, null }) {
920 <
919 >    {
920 >        final AtomicInteger a = new AtomicInteger(0);
921          final CompletableFuture<Integer> f = new CompletableFuture<>();
922 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
923 <        final Noop r = new Noop();
922 >        if (!createIncomplete) assertTrue(f.complete(v1));
923 >        final CompletableFuture<Integer> g = m.whenComplete
924 >            (f,
925 >             (Integer x, Throwable t) -> {
926 >                m.checkExecutionMode();
927 >                threadAssertSame(x, v1);
928 >                threadAssertNull(t);
929 >                a.getAndIncrement();
930 >            });
931 >        if (createIncomplete) assertTrue(f.complete(v1));
932  
933 <        g.complete(v2);
1004 <        f.complete(v1);
1005 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1006 <
1007 <        checkCompletedNormally(h, null);
1008 <        assertTrue(r.ran);
933 >        checkCompletedNormally(g, v1);
934          checkCompletedNormally(f, v1);
935 <        checkCompletedNormally(g, v2);
936 <        }
1012 <    }
935 >        assertEquals(1, a.get());
936 >    }}
937  
938 <    public void testRunAfterBoth_normalCompletion4() {
938 >    /**
939 >     * whenComplete action executes on exceptional completion, propagating
940 >     * source result.
941 >     */
942 >    public void testWhenComplete_exceptionalCompletion() {
943 >        for (ExecutionMode m : ExecutionMode.values())
944 >        for (boolean createIncomplete : new boolean[] { true, false })
945          for (Integer v1 : new Integer[] { 1, null })
946 <        for (Integer v2 : new Integer[] { 2, null }) {
947 <
946 >    {
947 >        final AtomicInteger a = new AtomicInteger(0);
948 >        final CFException ex = new CFException();
949          final CompletableFuture<Integer> f = new CompletableFuture<>();
950 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
951 <        final Noop r = new Noop();
952 <
953 <        f.complete(v1);
954 <        g.complete(v2);
955 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
956 <
957 <        checkCompletedNormally(h, null);
958 <        assertTrue(r.ran);
959 <        checkCompletedNormally(f, v1);
960 <        checkCompletedNormally(g, v2);
961 <        }
962 <    }
950 >        if (!createIncomplete) f.completeExceptionally(ex);
951 >        final CompletableFuture<Integer> g = m.whenComplete
952 >            (f,
953 >             (Integer x, Throwable t) -> {
954 >                m.checkExecutionMode();
955 >                threadAssertNull(x);
956 >                threadAssertSame(t, ex);
957 >                a.getAndIncrement();
958 >            });
959 >        if (createIncomplete) f.completeExceptionally(ex);
960 >
961 >        checkCompletedWithWrappedException(g, ex);
962 >        checkCompletedExceptionally(f, ex);
963 >        assertEquals(1, a.get());
964 >    }}
965  
966      /**
967 <     * runAfterBoth result completes exceptionally after exceptional
968 <     * completion of either source
967 >     * whenComplete action executes on cancelled source, propagating
968 >     * CancellationException.
969       */
970 <    public void testRunAfterBoth_exceptionalCompletion1() {
971 <        for (Integer v1 : new Integer[] { 1, null }) {
972 <
970 >    public void testWhenComplete_sourceCancelled() {
971 >        for (ExecutionMode m : ExecutionMode.values())
972 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
973 >        for (boolean createIncomplete : new boolean[] { true, false })
974 >    {
975 >        final AtomicInteger a = new AtomicInteger(0);
976          final CompletableFuture<Integer> f = new CompletableFuture<>();
977 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
978 <        final Noop r = new Noop();
979 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
980 <        final CFException ex = new CFException();
981 <
982 <        f.completeExceptionally(ex);
983 <        checkIncomplete(h);
984 <        g.complete(v1);
977 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978 >        final CompletableFuture<Integer> g = m.whenComplete
979 >            (f,
980 >             (Integer x, Throwable t) -> {
981 >                m.checkExecutionMode();
982 >                threadAssertNull(x);
983 >                threadAssertTrue(t instanceof CancellationException);
984 >                a.getAndIncrement();
985 >            });
986 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987  
988 <        checkCompletedWithWrappedCFException(h, ex);
989 <        checkCompletedWithWrappedCFException(f, ex);
990 <        assertFalse(r.ran);
991 <        checkCompletedNormally(g, v1);
1054 <        }
1055 <    }
1056 <
1057 <    public void testRunAfterBoth_exceptionalCompletion2() {
1058 <        for (Integer v1 : new Integer[] { 1, null }) {
988 >        checkCompletedWithWrappedCancellationException(g);
989 >        checkCancelled(f);
990 >        assertEquals(1, a.get());
991 >    }}
992  
993 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
994 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
995 <        final Noop r = new Noop();
996 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
993 >    /**
994 >     * If a whenComplete action throws an exception when triggered by
995 >     * a normal completion, it completes exceptionally
996 >     */
997 >    public void testWhenComplete_actionFailed() {
998 >        for (boolean createIncomplete : new boolean[] { true, false })
999 >        for (ExecutionMode m : ExecutionMode.values())
1000 >        for (Integer v1 : new Integer[] { 1, null })
1001 >    {
1002 >        final AtomicInteger a = new AtomicInteger(0);
1003          final CFException ex = new CFException();
1065
1066        g.completeExceptionally(ex);
1067        checkIncomplete(h);
1068        f.complete(v1);
1069
1070        checkCompletedWithWrappedCFException(h, ex);
1071        checkCompletedWithWrappedCFException(g, ex);
1072        assertFalse(r.ran);
1073        checkCompletedNormally(f, v1);
1074        }
1075    }
1076
1077    public void testRunAfterBoth_exceptionalCompletion3() {
1078        for (Integer v1 : new Integer[] { 1, null }) {
1079
1004          final CompletableFuture<Integer> f = new CompletableFuture<>();
1005 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1006 <        final Noop r = new Noop();
1007 <        final CFException ex = new CFException();
1008 <
1009 <        g.completeExceptionally(ex);
1010 <        f.complete(v1);
1011 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1005 >        if (!createIncomplete) assertTrue(f.complete(v1));
1006 >        final CompletableFuture<Integer> g = m.whenComplete
1007 >            (f,
1008 >             (Integer x, Throwable t) -> {
1009 >                m.checkExecutionMode();
1010 >                threadAssertSame(x, v1);
1011 >                threadAssertNull(t);
1012 >                a.getAndIncrement();
1013 >                throw ex;
1014 >            });
1015 >        if (createIncomplete) assertTrue(f.complete(v1));
1016  
1017 <        checkCompletedWithWrappedCFException(h, ex);
1090 <        checkCompletedWithWrappedCFException(g, ex);
1091 <        assertFalse(r.ran);
1017 >        checkCompletedWithWrappedException(g, ex);
1018          checkCompletedNormally(f, v1);
1019 <        }
1020 <    }
1095 <
1096 <    public void testRunAfterBoth_exceptionalCompletion4() {
1097 <        for (Integer v1 : new Integer[] { 1, null }) {
1098 <
1099 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1100 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1101 <        final Noop r = new Noop();
1102 <        final CFException ex = new CFException();
1103 <
1104 <        f.completeExceptionally(ex);
1105 <        g.complete(v1);
1106 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1107 <
1108 <        checkCompletedWithWrappedCFException(h, ex);
1109 <        checkCompletedWithWrappedCFException(f, ex);
1110 <        assertFalse(r.ran);
1111 <        checkCompletedNormally(g, v1);
1112 <        }
1113 <    }
1019 >        assertEquals(1, a.get());
1020 >    }}
1021  
1022      /**
1023 <     * runAfterBoth result completes exceptionally if action does
1023 >     * If a whenComplete action throws an exception when triggered by
1024 >     * a source completion that also throws an exception, the source
1025 >     * exception takes precedence.
1026       */
1027 <    public void testRunAfterBoth_actionFailed1() {
1027 >    public void testWhenComplete_actionFailedSourceFailed() {
1028 >        for (boolean createIncomplete : new boolean[] { true, false })
1029 >        for (ExecutionMode m : ExecutionMode.values())
1030          for (Integer v1 : new Integer[] { 1, null })
1031 <        for (Integer v2 : new Integer[] { 2, null }) {
1032 <
1031 >    {
1032 >        final AtomicInteger a = new AtomicInteger(0);
1033 >        final CFException ex1 = new CFException();
1034 >        final CFException ex2 = new CFException();
1035          final CompletableFuture<Integer> f = new CompletableFuture<>();
1123        final CompletableFuture<Integer> g = new CompletableFuture<>();
1124        final FailingNoop r = new FailingNoop();
1125        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1036  
1037 <        f.complete(v1);
1038 <        checkIncomplete(h);
1039 <        g.complete(v2);
1040 <
1041 <        checkCompletedWithWrappedCFException(h);
1042 <        checkCompletedNormally(f, v1);
1043 <        checkCompletedNormally(g, v2);
1044 <        }
1045 <    }
1046 <
1047 <    public void testRunAfterBoth_actionFailed2() {
1037 >        if (!createIncomplete) f.completeExceptionally(ex1);
1038 >        final CompletableFuture<Integer> g = m.whenComplete
1039 >            (f,
1040 >             (Integer x, Throwable t) -> {
1041 >                m.checkExecutionMode();
1042 >                threadAssertSame(t, ex1);
1043 >                threadAssertNull(x);
1044 >                a.getAndIncrement();
1045 >                throw ex2;
1046 >            });
1047 >        if (createIncomplete) f.completeExceptionally(ex1);
1048 >
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051 >        assertEquals(1, a.get());
1052 >    }}
1053 >
1054 >    /**
1055 >     * handle action completes normally with function value on normal
1056 >     * completion of source
1057 >     */
1058 >    public void testHandle_normalCompletion() {
1059 >        for (ExecutionMode m : ExecutionMode.values())
1060 >        for (boolean createIncomplete : new boolean[] { true, false })
1061          for (Integer v1 : new Integer[] { 1, null })
1062 <        for (Integer v2 : new Integer[] { 2, null }) {
1140 <
1062 >    {
1063          final CompletableFuture<Integer> f = new CompletableFuture<>();
1064 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1065 <        final FailingNoop r = new FailingNoop();
1066 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1064 >        final AtomicInteger a = new AtomicInteger(0);
1065 >        if (!createIncomplete) assertTrue(f.complete(v1));
1066 >        final CompletableFuture<Integer> g = m.handle
1067 >            (f,
1068 >             (Integer x, Throwable t) -> {
1069 >                m.checkExecutionMode();
1070 >                threadAssertSame(x, v1);
1071 >                threadAssertNull(t);
1072 >                a.getAndIncrement();
1073 >                return inc(v1);
1074 >            });
1075 >        if (createIncomplete) assertTrue(f.complete(v1));
1076  
1077 <        g.complete(v2);
1147 <        checkIncomplete(h);
1148 <        f.complete(v1);
1149 <
1150 <        checkCompletedWithWrappedCFException(h);
1077 >        checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
1079 <        checkCompletedNormally(g, v2);
1080 <        }
1154 <    }
1079 >        assertEquals(1, a.get());
1080 >    }}
1081  
1082      /**
1083 <     * runAfterBoth result completes exceptionally if either source cancelled
1083 >     * handle action completes normally with function value on
1084 >     * exceptional completion of source
1085       */
1086 <    public void testRunAfterBoth_sourceCancelled1() {
1087 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1088 <        for (Integer v1 : new Integer[] { 1, null }) {
1089 <
1086 >    public void testHandle_exceptionalCompletion() {
1087 >        for (ExecutionMode m : ExecutionMode.values())
1088 >        for (boolean createIncomplete : new boolean[] { true, false })
1089 >        for (Integer v1 : new Integer[] { 1, null })
1090 >    {
1091          final CompletableFuture<Integer> f = new CompletableFuture<>();
1092 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1093 <        final Noop r = new Noop();
1094 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1095 <
1096 <        assertTrue(f.cancel(mayInterruptIfRunning));
1097 <        checkIncomplete(h);
1098 <        g.complete(v1);
1092 >        final AtomicInteger a = new AtomicInteger(0);
1093 >        final CFException ex = new CFException();
1094 >        if (!createIncomplete) f.completeExceptionally(ex);
1095 >        final CompletableFuture<Integer> g = m.handle
1096 >            (f,
1097 >             (Integer x, Throwable t) -> {
1098 >                m.checkExecutionMode();
1099 >                threadAssertNull(x);
1100 >                threadAssertSame(t, ex);
1101 >                a.getAndIncrement();
1102 >                return v1;
1103 >            });
1104 >        if (createIncomplete) f.completeExceptionally(ex);
1105  
1172        checkCompletedWithWrappedCancellationException(h);
1173        checkCancelled(f);
1174        assertFalse(r.ran);
1106          checkCompletedNormally(g, v1);
1107 <        }
1108 <    }
1109 <
1179 <    public void testRunAfterBoth_sourceCancelled2() {
1180 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1181 <        for (Integer v1 : new Integer[] { 1, null }) {
1182 <
1183 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1184 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1185 <        final Noop r = new Noop();
1186 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1187 <
1188 <        assertTrue(g.cancel(mayInterruptIfRunning));
1189 <        checkIncomplete(h);
1190 <        f.complete(v1);
1107 >        checkCompletedExceptionally(f, ex);
1108 >        assertEquals(1, a.get());
1109 >    }}
1110  
1111 <        checkCompletedWithWrappedCancellationException(h);
1112 <        checkCancelled(g);
1113 <        assertFalse(r.ran);
1114 <        checkCompletedNormally(f, v1);
1115 <        }
1116 <    }
1198 <
1199 <    public void testRunAfterBoth_sourceCancelled3() {
1200 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1201 <        for (Integer v1 : new Integer[] { 1, null }) {
1202 <
1203 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1204 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1205 <        final Noop r = new Noop();
1206 <
1207 <        assertTrue(g.cancel(mayInterruptIfRunning));
1208 <        f.complete(v1);
1209 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1210 <
1211 <        checkCompletedWithWrappedCancellationException(h);
1212 <        checkCancelled(g);
1213 <        assertFalse(r.ran);
1214 <        checkCompletedNormally(f, v1);
1215 <        }
1216 <    }
1217 <
1218 <    public void testRunAfterBoth_sourceCancelled4() {
1111 >    /**
1112 >     * handle action completes normally with function value on
1113 >     * cancelled source
1114 >     */
1115 >    public void testHandle_sourceCancelled() {
1116 >        for (ExecutionMode m : ExecutionMode.values())
1117          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1118 <        for (Integer v1 : new Integer[] { 1, null }) {
1119 <
1118 >        for (boolean createIncomplete : new boolean[] { true, false })
1119 >        for (Integer v1 : new Integer[] { 1, null })
1120 >    {
1121          final CompletableFuture<Integer> f = new CompletableFuture<>();
1122 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1123 <        final Noop r = new Noop();
1124 <
1125 <        assertTrue(f.cancel(mayInterruptIfRunning));
1126 <        g.complete(v1);
1127 <        final CompletableFuture<Void> h = f.runAfterBoth(g, r);
1122 >        final AtomicInteger a = new AtomicInteger(0);
1123 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1124 >        final CompletableFuture<Integer> g = m.handle
1125 >            (f,
1126 >             (Integer x, Throwable t) -> {
1127 >                m.checkExecutionMode();
1128 >                threadAssertNull(x);
1129 >                threadAssertTrue(t instanceof CancellationException);
1130 >                a.getAndIncrement();
1131 >                return v1;
1132 >            });
1133 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1134  
1230        checkCompletedWithWrappedCancellationException(h);
1231        checkCancelled(f);
1232        assertFalse(r.ran);
1135          checkCompletedNormally(g, v1);
1136 <        }
1137 <    }
1138 <
1237 <    /**
1238 <     * applyToEither result completes normally after normal completion
1239 <     * of either source
1240 <     */
1241 <    public void testApplyToEither() {
1242 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1243 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1244 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1245 <        f.complete(one);
1246 <        checkCompletedNormally(g, two);
1247 <        f2.complete(one);
1248 <        checkCompletedNormally(g, two);
1249 <
1250 <        f = new CompletableFuture<>();
1251 <        f.complete(one);
1252 <        f2 = new CompletableFuture<>();
1253 <        g = f.applyToEither(f2, inc);
1254 <        checkCompletedNormally(g, two);
1255 <    }
1256 <
1257 <    /**
1258 <     * applyToEither result completes exceptionally after exceptional
1259 <     * completion of either source
1260 <     */
1261 <    public void testApplyToEither2() {
1262 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1263 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1264 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1265 <        f.completeExceptionally(new CFException());
1266 <        f2.complete(one);
1267 <        checkCompletedWithWrappedCFException(g);
1268 <
1269 <        f = new CompletableFuture<>();
1270 <        f2 = new CompletableFuture<>();
1271 <        f2.completeExceptionally(new CFException());
1272 <        g = f.applyToEither(f2, inc);
1273 <        checkCompletedWithWrappedCFException(g);
1274 <    }
1275 <
1276 <    /**
1277 <     * applyToEither result completes exceptionally if action does
1278 <     */
1279 <    public void testApplyToEither3() {
1280 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1281 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1282 <        FailingFunction r = new FailingFunction();
1283 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1284 <        f2.complete(two);
1285 <        checkCompletedWithWrappedCFException(g);
1286 <    }
1287 <
1288 <    /**
1289 <     * applyToEither result completes exceptionally if either source cancelled
1290 <     */
1291 <    public void testApplyToEither4() {
1292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1293 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1294 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1295 <        assertTrue(f.cancel(true));
1296 <        checkCompletedWithWrappedCancellationException(g);
1297 <        f = new CompletableFuture<>();
1298 <        f2 = new CompletableFuture<>();
1299 <        assertTrue(f2.cancel(true));
1300 <        checkCompletedWithWrappedCancellationException(g);
1301 <    }
1302 <
1303 <    /**
1304 <     * acceptEither result completes normally after normal completion
1305 <     * of either source
1306 <     */
1307 <    public void testAcceptEither() {
1308 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1309 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1310 <        IncAction r = new IncAction();
1311 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1312 <        f.complete(one);
1313 <        checkCompletedNormally(g, null);
1314 <        f2.complete(one);
1315 <        checkCompletedNormally(g, null);
1316 <        assertEquals(r.value, 2);
1317 <
1318 <        r = new IncAction();
1319 <        f = new CompletableFuture<>();
1320 <        f.complete(one);
1321 <        f2 = new CompletableFuture<>();
1322 <        g = f.acceptEither(f2, r);
1323 <        checkCompletedNormally(g, null);
1324 <        assertEquals(r.value, 2);
1325 <    }
1326 <
1327 <    /**
1328 <     * acceptEither result completes exceptionally after exceptional
1329 <     * completion of either source
1330 <     */
1331 <    public void testAcceptEither2() {
1332 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1333 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1334 <        IncAction r = new IncAction();
1335 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1336 <        f.completeExceptionally(new CFException());
1337 <        f2.complete(one);
1338 <        checkCompletedWithWrappedCFException(g);
1339 <
1340 <        r = new IncAction();
1341 <        f = new CompletableFuture<>();
1342 <        f2 = new CompletableFuture<>();
1343 <        f2.completeExceptionally(new CFException());
1344 <        g = f.acceptEither(f2, r);
1345 <        checkCompletedWithWrappedCFException(g);
1346 <    }
1347 <
1348 <    /**
1349 <     * acceptEither result completes exceptionally if action does
1350 <     */
1351 <    public void testAcceptEither3() {
1352 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1353 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1354 <        FailingConsumer r = new FailingConsumer();
1355 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1356 <        f2.complete(two);
1357 <        checkCompletedWithWrappedCFException(g);
1358 <    }
1359 <
1360 <    /**
1361 <     * acceptEither result completes exceptionally if either source cancelled
1362 <     */
1363 <    public void testAcceptEither4() {
1364 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1365 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1366 <        IncAction r = new IncAction();
1367 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1368 <        assertTrue(f.cancel(true));
1369 <        checkCompletedWithWrappedCancellationException(g);
1370 <        f = new CompletableFuture<>();
1371 <        f2 = new CompletableFuture<>();
1372 <        assertTrue(f2.cancel(true));
1373 <        checkCompletedWithWrappedCancellationException(g);
1374 <    }
1375 <
1376 <    /**
1377 <     * runAfterEither result completes normally after normal completion
1378 <     * of either source
1379 <     */
1380 <    public void testRunAfterEither() {
1381 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1382 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1383 <        Noop r = new Noop();
1384 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1385 <        f.complete(one);
1386 <        checkCompletedNormally(g, null);
1387 <        f2.complete(one);
1388 <        checkCompletedNormally(g, null);
1389 <        assertTrue(r.ran);
1390 <
1391 <        r = new Noop();
1392 <        f = new CompletableFuture<>();
1393 <        f.complete(one);
1394 <        f2 = new CompletableFuture<>();
1395 <        g = f.runAfterEither(f2, r);
1396 <        checkCompletedNormally(g, null);
1397 <        assertTrue(r.ran);
1398 <    }
1399 <
1400 <    /**
1401 <     * runAfterEither result completes exceptionally after exceptional
1402 <     * completion of either source
1403 <     */
1404 <    public void testRunAfterEither2() {
1405 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1406 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1407 <        Noop r = new Noop();
1408 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1409 <        f.completeExceptionally(new CFException());
1410 <        f2.complete(one);
1411 <        checkCompletedWithWrappedCFException(g);
1412 <
1413 <        r = new Noop();
1414 <        f = new CompletableFuture<>();
1415 <        f2 = new CompletableFuture<>();
1416 <        f2.completeExceptionally(new CFException());
1417 <        g = f.runAfterEither(f2, r);
1418 <        checkCompletedWithWrappedCFException(g);
1419 <    }
1136 >        checkCancelled(f);
1137 >        assertEquals(1, a.get());
1138 >    }}
1139  
1140      /**
1141 <     * runAfterEither result completes exceptionally if action does
1141 >     * handle result completes exceptionally if action does
1142       */
1143 <    public void testRunAfterEither3() {
1144 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1145 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1146 <        FailingNoop r = new FailingNoop();
1147 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1148 <        f2.complete(two);
1149 <        checkCompletedWithWrappedCFException(g);
1150 <    }
1143 >    public void testHandle_sourceFailedActionFailed() {
1144 >        for (ExecutionMode m : ExecutionMode.values())
1145 >        for (boolean createIncomplete : new boolean[] { true, false })
1146 >    {
1147 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1148 >        final AtomicInteger a = new AtomicInteger(0);
1149 >        final CFException ex1 = new CFException();
1150 >        final CFException ex2 = new CFException();
1151 >        if (!createIncomplete) f.completeExceptionally(ex1);
1152 >        final CompletableFuture<Integer> g = m.handle
1153 >            (f,
1154 >             (Integer x, Throwable t) -> {
1155 >                m.checkExecutionMode();
1156 >                threadAssertNull(x);
1157 >                threadAssertSame(ex1, t);
1158 >                a.getAndIncrement();
1159 >                throw ex2;
1160 >            });
1161 >        if (createIncomplete) f.completeExceptionally(ex1);
1162 >
1163 >        checkCompletedWithWrappedException(g, ex2);
1164 >        checkCompletedExceptionally(f, ex1);
1165 >        assertEquals(1, a.get());
1166 >    }}
1167 >
1168 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1169 >        for (ExecutionMode m : ExecutionMode.values())
1170 >        for (boolean createIncomplete : new boolean[] { true, false })
1171 >        for (Integer v1 : new Integer[] { 1, null })
1172 >    {
1173 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1174 >        final AtomicInteger a = new AtomicInteger(0);
1175 >        final CFException ex = new CFException();
1176 >        if (!createIncomplete) assertTrue(f.complete(v1));
1177 >        final CompletableFuture<Integer> g = m.handle
1178 >            (f,
1179 >             (Integer x, Throwable t) -> {
1180 >                m.checkExecutionMode();
1181 >                threadAssertSame(x, v1);
1182 >                threadAssertNull(t);
1183 >                a.getAndIncrement();
1184 >                throw ex;
1185 >            });
1186 >        if (createIncomplete) assertTrue(f.complete(v1));
1187  
1188 <    /**
1189 <     * runAfterEither result completes exceptionally if either source cancelled
1190 <     */
1191 <    public void testRunAfterEither4() {
1437 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1438 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1439 <        Noop r = new Noop();
1440 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1441 <        assertTrue(f.cancel(true));
1442 <        checkCompletedWithWrappedCancellationException(g);
1443 <        f = new CompletableFuture<>();
1444 <        f2 = new CompletableFuture<>();
1445 <        assertTrue(f2.cancel(true));
1446 <        checkCompletedWithWrappedCancellationException(g);
1447 <    }
1188 >        checkCompletedWithWrappedException(g, ex);
1189 >        checkCompletedNormally(f, v1);
1190 >        assertEquals(1, a.get());
1191 >    }}
1192  
1193      /**
1194 <     * thenCompose result completes normally after normal completion of source
1194 >     * runAsync completes after running Runnable
1195       */
1196 <    public void testThenCompose() {
1197 <        CompletableFuture<Integer> f, g;
1198 <        CompletableFutureInc r;
1199 <
1200 <        f = new CompletableFuture<>();
1201 <        g = f.thenCompose(r = new CompletableFutureInc());
1202 <        f.complete(one);
1203 <        checkCompletedNormally(g, two);
1204 <        assertTrue(r.ran);
1205 <
1206 <        f = new CompletableFuture<>();
1207 <        f.complete(one);
1208 <        g = f.thenCompose(r = new CompletableFutureInc());
1465 <        checkCompletedNormally(g, two);
1466 <        assertTrue(r.ran);
1467 <    }
1196 >    public void testRunAsync_normalCompletion() {
1197 >        ExecutionMode[] executionModes = {
1198 >            ExecutionMode.ASYNC,
1199 >            ExecutionMode.EXECUTOR,
1200 >        };
1201 >        for (ExecutionMode m : executionModes)
1202 >    {
1203 >        final Noop r = new Noop(m);
1204 >        final CompletableFuture<Void> f = m.runAsync(r);
1205 >        assertNull(f.join());
1206 >        checkCompletedNormally(f, null);
1207 >        r.assertInvoked();
1208 >    }}
1209  
1210      /**
1211 <     * thenCompose result completes exceptionally after exceptional
1471 <     * completion of source
1211 >     * failing runAsync completes exceptionally after running Runnable
1212       */
1213 <    public void testThenCompose2() {
1214 <        CompletableFuture<Integer> f, g;
1215 <        CompletableFutureInc r;
1216 <
1217 <        f = new CompletableFuture<>();
1218 <        g = f.thenCompose(r = new CompletableFutureInc());
1219 <        f.completeExceptionally(new CFException());
1220 <        checkCompletedWithWrappedCFException(g);
1221 <
1222 <        f = new CompletableFuture<>();
1223 <        f.completeExceptionally(new CFException());
1224 <        g = f.thenCompose(r = new CompletableFutureInc());
1485 <        checkCompletedWithWrappedCFException(g);
1486 <    }
1213 >    public void testRunAsync_exceptionalCompletion() {
1214 >        ExecutionMode[] executionModes = {
1215 >            ExecutionMode.ASYNC,
1216 >            ExecutionMode.EXECUTOR,
1217 >        };
1218 >        for (ExecutionMode m : executionModes)
1219 >    {
1220 >        final FailingRunnable r = new FailingRunnable(m);
1221 >        final CompletableFuture<Void> f = m.runAsync(r);
1222 >        checkCompletedWithWrappedCFException(f);
1223 >        r.assertInvoked();
1224 >    }}
1225  
1226      /**
1227 <     * thenCompose result completes exceptionally if action does
1227 >     * supplyAsync completes with result of supplier
1228       */
1229 <    public void testThenCompose3() {
1230 <        CompletableFuture<Integer> f, g;
1231 <        FailingCompletableFutureFunction r;
1232 <
1233 <        f = new CompletableFuture<>();
1234 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1235 <        f.complete(one);
1236 <        checkCompletedWithWrappedCFException(g);
1237 <
1238 <        f = new CompletableFuture<>();
1239 <        f.complete(one);
1240 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1241 <        checkCompletedWithWrappedCFException(g);
1242 <    }
1229 >    public void testSupplyAsync_normalCompletion() {
1230 >        ExecutionMode[] executionModes = {
1231 >            ExecutionMode.ASYNC,
1232 >            ExecutionMode.EXECUTOR,
1233 >        };
1234 >        for (ExecutionMode m : executionModes)
1235 >        for (Integer v1 : new Integer[] { 1, null })
1236 >    {
1237 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1238 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1239 >        assertSame(v1, f.join());
1240 >        checkCompletedNormally(f, v1);
1241 >        r.assertInvoked();
1242 >    }}
1243  
1244      /**
1245 <     * thenCompose result completes exceptionally if source cancelled
1245 >     * Failing supplyAsync completes exceptionally
1246       */
1247 <    public void testThenCompose4() {
1248 <        CompletableFuture<Integer> f, g;
1249 <        CompletableFutureInc r;
1250 <
1251 <        f = new CompletableFuture<>();
1252 <        g = f.thenCompose(r = new CompletableFutureInc());
1253 <        assertTrue(f.cancel(true));
1254 <        checkCompletedWithWrappedCancellationException(g);
1255 <
1256 <        f = new CompletableFuture<>();
1257 <        assertTrue(f.cancel(true));
1258 <        g = f.thenCompose(r = new CompletableFutureInc());
1521 <        checkCompletedWithWrappedCancellationException(g);
1522 <    }
1247 >    public void testSupplyAsync_exceptionalCompletion() {
1248 >        ExecutionMode[] executionModes = {
1249 >            ExecutionMode.ASYNC,
1250 >            ExecutionMode.EXECUTOR,
1251 >        };
1252 >        for (ExecutionMode m : executionModes)
1253 >    {
1254 >        FailingSupplier r = new FailingSupplier(m);
1255 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1256 >        checkCompletedWithWrappedCFException(f);
1257 >        r.assertInvoked();
1258 >    }}
1259  
1260 <    // asyncs
1260 >    // seq completion methods
1261  
1262      /**
1263 <     * thenRunAsync result completes normally after normal completion of source
1263 >     * thenRun result completes normally after normal completion of source
1264       */
1265 <    public void testThenRunAsync() {
1266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1267 <        Noop r = new Noop();
1268 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1269 <        f.complete(null);
1270 <        checkCompletedNormally(g, null);
1265 >    public void testThenRun_normalCompletion() {
1266 >        for (ExecutionMode m : ExecutionMode.values())
1267 >        for (Integer v1 : new Integer[] { 1, null })
1268 >    {
1269 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 >        final Noop[] rs = new Noop[6];
1271 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1272  
1273 <        // reordered version
1274 <        f = new CompletableFuture<>();
1275 <        f.complete(null);
1276 <        r = new Noop();
1277 <        g = f.thenRunAsync(r);
1278 <        checkCompletedNormally(g, null);
1279 <    }
1273 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1274 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1275 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1276 >        checkIncomplete(h0);
1277 >        checkIncomplete(h1);
1278 >        checkIncomplete(h2);
1279 >        assertTrue(f.complete(v1));
1280 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1281 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1282 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1283 >
1284 >        checkCompletedNormally(h0, null);
1285 >        checkCompletedNormally(h1, null);
1286 >        checkCompletedNormally(h2, null);
1287 >        checkCompletedNormally(h3, null);
1288 >        checkCompletedNormally(h4, null);
1289 >        checkCompletedNormally(h5, null);
1290 >        checkCompletedNormally(f, v1);
1291 >        for (Noop r : rs) r.assertInvoked();
1292 >    }}
1293  
1294      /**
1295 <     * thenRunAsync result completes exceptionally after exceptional
1295 >     * thenRun result completes exceptionally after exceptional
1296       * completion of source
1297       */
1298 <    public void testThenRunAsync2() {
1299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1300 <        Noop r = new Noop();
1301 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1302 <        f.completeExceptionally(new CFException());
1303 <        try {
1304 <            g.join();
1555 <            shouldThrow();
1556 <        } catch (CompletionException success) {}
1557 <        checkCompletedWithWrappedCFException(g);
1558 <    }
1298 >    public void testThenRun_exceptionalCompletion() {
1299 >        for (ExecutionMode m : ExecutionMode.values())
1300 >    {
1301 >        final CFException ex = new CFException();
1302 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1303 >        final Noop[] rs = new Noop[6];
1304 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1305  
1306 <    /**
1307 <     * thenRunAsync result completes exceptionally if action does
1308 <     */
1309 <    public void testThenRunAsync3() {
1310 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1311 <        FailingNoop r = new FailingNoop();
1312 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1313 <        f.complete(null);
1314 <        checkCompletedWithWrappedCFException(g);
1315 <    }
1306 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1307 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1308 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1309 >        checkIncomplete(h0);
1310 >        checkIncomplete(h1);
1311 >        checkIncomplete(h2);
1312 >        assertTrue(f.completeExceptionally(ex));
1313 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1314 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1315 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1316 >
1317 >        checkCompletedWithWrappedException(h0, ex);
1318 >        checkCompletedWithWrappedException(h1, ex);
1319 >        checkCompletedWithWrappedException(h2, ex);
1320 >        checkCompletedWithWrappedException(h3, ex);
1321 >        checkCompletedWithWrappedException(h4, ex);
1322 >        checkCompletedWithWrappedException(h5, ex);
1323 >        checkCompletedExceptionally(f, ex);
1324 >        for (Noop r : rs) r.assertNotInvoked();
1325 >    }}
1326  
1327      /**
1328 <     * thenRunAsync result completes exceptionally if source cancelled
1328 >     * thenRun result completes exceptionally if source cancelled
1329       */
1330 <    public void testThenRunAsync4() {
1331 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1332 <        Noop r = new Noop();
1333 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1334 <        assertTrue(f.cancel(true));
1335 <        checkCompletedWithWrappedCancellationException(g);
1336 <    }
1330 >    public void testThenRun_sourceCancelled() {
1331 >        for (ExecutionMode m : ExecutionMode.values())
1332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 >    {
1334 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337  
1338 <    /**
1339 <     * thenApplyAsync result completes normally after normal completion of source
1340 <     */
1341 <    public void testThenApplyAsync() {
1342 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1343 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1344 <        f.complete(one);
1345 <        checkCompletedNormally(g, two);
1346 <    }
1338 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1339 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1340 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1341 >        checkIncomplete(h0);
1342 >        checkIncomplete(h1);
1343 >        checkIncomplete(h2);
1344 >        assertTrue(f.cancel(mayInterruptIfRunning));
1345 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1346 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1347 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1348 >
1349 >        checkCompletedWithWrappedCancellationException(h0);
1350 >        checkCompletedWithWrappedCancellationException(h1);
1351 >        checkCompletedWithWrappedCancellationException(h2);
1352 >        checkCompletedWithWrappedCancellationException(h3);
1353 >        checkCompletedWithWrappedCancellationException(h4);
1354 >        checkCompletedWithWrappedCancellationException(h5);
1355 >        checkCancelled(f);
1356 >        for (Noop r : rs) r.assertNotInvoked();
1357 >    }}
1358  
1359      /**
1360 <     * thenApplyAsync result completes exceptionally after exceptional
1594 <     * completion of source
1360 >     * thenRun result completes exceptionally if action does
1361       */
1362 <    public void testThenApplyAsync2() {
1363 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1364 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1365 <        f.completeExceptionally(new CFException());
1366 <        checkCompletedWithWrappedCFException(g);
1367 <    }
1362 >    public void testThenRun_actionFailed() {
1363 >        for (ExecutionMode m : ExecutionMode.values())
1364 >        for (Integer v1 : new Integer[] { 1, null })
1365 >    {
1366 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1367 >        final FailingRunnable[] rs = new FailingRunnable[6];
1368 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369  
1370 <    /**
1371 <     * thenApplyAsync result completes exceptionally if action does
1372 <     */
1373 <    public void testThenApplyAsync3() {
1374 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1375 <        FailingFunction r = new FailingFunction();
1376 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1377 <        f.complete(null);
1378 <        checkCompletedWithWrappedCFException(g);
1379 <    }
1370 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1371 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1372 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1373 >        assertTrue(f.complete(v1));
1374 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1375 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1376 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1377 >
1378 >        checkCompletedWithWrappedCFException(h0);
1379 >        checkCompletedWithWrappedCFException(h1);
1380 >        checkCompletedWithWrappedCFException(h2);
1381 >        checkCompletedWithWrappedCFException(h3);
1382 >        checkCompletedWithWrappedCFException(h4);
1383 >        checkCompletedWithWrappedCFException(h5);
1384 >        checkCompletedNormally(f, v1);
1385 >    }}
1386  
1387      /**
1388 <     * thenApplyAsync result completes exceptionally if source cancelled
1388 >     * thenApply result completes normally after normal completion of source
1389       */
1390 <    public void testThenApplyAsync4() {
1391 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1392 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1393 <        assertTrue(f.cancel(true));
1394 <        checkCompletedWithWrappedCancellationException(g);
1395 <    }
1390 >    public void testThenApply_normalCompletion() {
1391 >        for (ExecutionMode m : ExecutionMode.values())
1392 >        for (Integer v1 : new Integer[] { 1, null })
1393 >    {
1394 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1395 >        final IncFunction[] rs = new IncFunction[4];
1396 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1397  
1398 <    /**
1399 <     * thenAcceptAsync result completes normally after normal
1400 <     * completion of source
1401 <     */
1402 <    public void testThenAcceptAsync() {
1403 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1404 <        IncAction r = new IncAction();
1405 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1406 <        f.complete(one);
1407 <        checkCompletedNormally(g, null);
1408 <        assertEquals(r.value, 2);
1409 <    }
1398 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1399 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1400 >        checkIncomplete(h0);
1401 >        checkIncomplete(h1);
1402 >        assertTrue(f.complete(v1));
1403 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1404 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1405 >
1406 >        checkCompletedNormally(h0, inc(v1));
1407 >        checkCompletedNormally(h1, inc(v1));
1408 >        checkCompletedNormally(h2, inc(v1));
1409 >        checkCompletedNormally(h3, inc(v1));
1410 >        checkCompletedNormally(f, v1);
1411 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1412 >    }}
1413  
1414      /**
1415 <     * thenAcceptAsync result completes exceptionally after exceptional
1415 >     * thenApply result completes exceptionally after exceptional
1416       * completion of source
1417       */
1418 <    public void testThenAcceptAsync2() {
1419 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1420 <        IncAction r = new IncAction();
1421 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1422 <        f.completeExceptionally(new CFException());
1423 <        checkCompletedWithWrappedCFException(g);
1424 <    }
1648 <
1649 <    /**
1650 <     * thenAcceptAsync result completes exceptionally if action does
1651 <     */
1652 <    public void testThenAcceptAsync3() {
1653 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1654 <        FailingConsumer r = new FailingConsumer();
1655 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1656 <        f.complete(null);
1657 <        checkCompletedWithWrappedCFException(g);
1658 <    }
1659 <
1660 <    /**
1661 <     * thenAcceptAsync result completes exceptionally if source cancelled
1662 <     */
1663 <    public void testThenAcceptAsync4() {
1664 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1665 <        IncAction r = new IncAction();
1666 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1667 <        assertTrue(f.cancel(true));
1668 <        checkCompletedWithWrappedCancellationException(g);
1669 <    }
1670 <
1671 <    /**
1672 <     * thenCombineAsync result completes normally after normal
1673 <     * completion of sources
1674 <     */
1675 <    public void testThenCombineAsync() {
1676 <        CompletableFuture<Integer> f, g, h;
1677 <
1678 <        f = new CompletableFuture<>();
1679 <        g = new CompletableFuture<>();
1680 <        h = f.thenCombineAsync(g, subtract);
1681 <        f.complete(3);
1682 <        checkIncomplete(h);
1683 <        g.complete(1);
1684 <        checkCompletedNormally(h, 2);
1685 <
1686 <        f = new CompletableFuture<>();
1687 <        g = new CompletableFuture<>();
1688 <        h = f.thenCombineAsync(g, subtract);
1689 <        g.complete(1);
1690 <        checkIncomplete(h);
1691 <        f.complete(3);
1692 <        checkCompletedNormally(h, 2);
1418 >    public void testThenApply_exceptionalCompletion() {
1419 >        for (ExecutionMode m : ExecutionMode.values())
1420 >    {
1421 >        final CFException ex = new CFException();
1422 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1423 >        final IncFunction[] rs = new IncFunction[4];
1424 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1425  
1426 <        f = new CompletableFuture<>();
1427 <        g = new CompletableFuture<>();
1428 <        g.complete(1);
1429 <        f.complete(3);
1430 <        h = f.thenCombineAsync(g, subtract);
1431 <        checkCompletedNormally(h, 2);
1432 <    }
1426 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1427 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1428 >        assertTrue(f.completeExceptionally(ex));
1429 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1430 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1431 >
1432 >        checkCompletedWithWrappedException(h0, ex);
1433 >        checkCompletedWithWrappedException(h1, ex);
1434 >        checkCompletedWithWrappedException(h2, ex);
1435 >        checkCompletedWithWrappedException(h3, ex);
1436 >        checkCompletedExceptionally(f, ex);
1437 >        for (IncFunction r : rs) r.assertNotInvoked();
1438 >    }}
1439  
1440      /**
1441 <     * thenCombineAsync result completes exceptionally after exceptional
1704 <     * completion of either source
1441 >     * thenApply result completes exceptionally if source cancelled
1442       */
1443 <    public void testThenCombineAsync2() {
1444 <        CompletableFuture<Integer> f, g, h;
1445 <
1446 <        f = new CompletableFuture<>();
1447 <        g = new CompletableFuture<>();
1448 <        h = f.thenCombineAsync(g, subtract);
1449 <        f.completeExceptionally(new CFException());
1713 <        checkIncomplete(h);
1714 <        g.complete(1);
1715 <        checkCompletedWithWrappedCFException(h);
1716 <
1717 <        f = new CompletableFuture<>();
1718 <        g = new CompletableFuture<>();
1719 <        h = f.thenCombineAsync(g, subtract);
1720 <        g.completeExceptionally(new CFException());
1721 <        checkIncomplete(h);
1722 <        f.complete(3);
1723 <        checkCompletedWithWrappedCFException(h);
1443 >    public void testThenApply_sourceCancelled() {
1444 >        for (ExecutionMode m : ExecutionMode.values())
1445 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1446 >    {
1447 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1448 >        final IncFunction[] rs = new IncFunction[4];
1449 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1450  
1451 <        f = new CompletableFuture<>();
1452 <        g = new CompletableFuture<>();
1453 <        g.completeExceptionally(new CFException());
1454 <        f.complete(3);
1455 <        h = f.thenCombineAsync(g, subtract);
1730 <        checkCompletedWithWrappedCFException(h);
1731 <    }
1451 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1452 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1453 >        assertTrue(f.cancel(mayInterruptIfRunning));
1454 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1455 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1456  
1457 <    /**
1458 <     * thenCombineAsync result completes exceptionally if action does
1459 <     */
1460 <    public void testThenCombineAsync3() {
1461 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1462 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1463 <        FailingBiFunction r = new FailingBiFunction();
1740 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1741 <        f.complete(one);
1742 <        checkIncomplete(g);
1743 <        assertFalse(r.ran);
1744 <        f2.complete(two);
1745 <        checkCompletedWithWrappedCFException(g);
1746 <        assertTrue(r.ran);
1747 <    }
1457 >        checkCompletedWithWrappedCancellationException(h0);
1458 >        checkCompletedWithWrappedCancellationException(h1);
1459 >        checkCompletedWithWrappedCancellationException(h2);
1460 >        checkCompletedWithWrappedCancellationException(h3);
1461 >        checkCancelled(f);
1462 >        for (IncFunction r : rs) r.assertNotInvoked();
1463 >    }}
1464  
1465      /**
1466 <     * thenCombineAsync result completes exceptionally if either source cancelled
1466 >     * thenApply result completes exceptionally if action does
1467       */
1468 <    public void testThenCombineAsync4() {
1469 <        CompletableFuture<Integer> f, g, h;
1470 <
1471 <        f = new CompletableFuture<>();
1472 <        g = new CompletableFuture<>();
1473 <        h = f.thenCombineAsync(g, subtract);
1474 <        assertTrue(f.cancel(true));
1759 <        checkIncomplete(h);
1760 <        g.complete(1);
1761 <        checkCompletedWithWrappedCancellationException(h);
1762 <
1763 <        f = new CompletableFuture<>();
1764 <        g = new CompletableFuture<>();
1765 <        h = f.thenCombineAsync(g, subtract);
1766 <        assertTrue(g.cancel(true));
1767 <        checkIncomplete(h);
1768 <        f.complete(3);
1769 <        checkCompletedWithWrappedCancellationException(h);
1770 <
1771 <        f = new CompletableFuture<>();
1772 <        g = new CompletableFuture<>();
1773 <        g.complete(3);
1774 <        assertTrue(f.cancel(true));
1775 <        h = f.thenCombineAsync(g, subtract);
1776 <        checkCompletedWithWrappedCancellationException(h);
1468 >    public void testThenApply_actionFailed() {
1469 >        for (ExecutionMode m : ExecutionMode.values())
1470 >        for (Integer v1 : new Integer[] { 1, null })
1471 >    {
1472 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 >        final FailingFunction[] rs = new FailingFunction[4];
1474 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1475  
1476 <        f = new CompletableFuture<>();
1477 <        g = new CompletableFuture<>();
1478 <        f.complete(3);
1479 <        assertTrue(g.cancel(true));
1480 <        h = f.thenCombineAsync(g, subtract);
1481 <        checkCompletedWithWrappedCancellationException(h);
1482 <    }
1476 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1477 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1478 >        assertTrue(f.complete(v1));
1479 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1480 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1481 >
1482 >        checkCompletedWithWrappedCFException(h0);
1483 >        checkCompletedWithWrappedCFException(h1);
1484 >        checkCompletedWithWrappedCFException(h2);
1485 >        checkCompletedWithWrappedCFException(h3);
1486 >        checkCompletedNormally(f, v1);
1487 >    }}
1488  
1489      /**
1490 <     * thenAcceptBothAsync result completes normally after normal
1788 <     * completion of sources
1490 >     * thenAccept result completes normally after normal completion of source
1491       */
1492 <    public void testThenAcceptBothAsync() {
1493 <        CompletableFuture<Integer> f, g;
1494 <        CompletableFuture<Void> h;
1495 <        SubtractAction r;
1496 <
1497 <        f = new CompletableFuture<>();
1498 <        g = new CompletableFuture<>();
1797 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1798 <        f.complete(3);
1799 <        checkIncomplete(h);
1800 <        g.complete(1);
1801 <        checkCompletedNormally(h, null);
1802 <        assertEquals(r.value, 2);
1803 <
1804 <        f = new CompletableFuture<>();
1805 <        g = new CompletableFuture<>();
1806 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1807 <        g.complete(1);
1808 <        checkIncomplete(h);
1809 <        f.complete(3);
1810 <        checkCompletedNormally(h, null);
1811 <        assertEquals(r.value, 2);
1492 >    public void testThenAccept_normalCompletion() {
1493 >        for (ExecutionMode m : ExecutionMode.values())
1494 >        for (Integer v1 : new Integer[] { 1, null })
1495 >    {
1496 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1497 >        final NoopConsumer[] rs = new NoopConsumer[4];
1498 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1499  
1500 <        f = new CompletableFuture<>();
1501 <        g = new CompletableFuture<>();
1502 <        g.complete(1);
1503 <        f.complete(3);
1504 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1505 <        checkCompletedNormally(h, null);
1506 <        assertEquals(r.value, 2);
1507 <    }
1500 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1501 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1502 >        checkIncomplete(h0);
1503 >        checkIncomplete(h1);
1504 >        assertTrue(f.complete(v1));
1505 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1506 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1507 >
1508 >        checkCompletedNormally(h0, null);
1509 >        checkCompletedNormally(h1, null);
1510 >        checkCompletedNormally(h2, null);
1511 >        checkCompletedNormally(h3, null);
1512 >        checkCompletedNormally(f, v1);
1513 >        for (NoopConsumer r : rs) r.assertValue(v1);
1514 >    }}
1515  
1516      /**
1517 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1517 >     * thenAccept result completes exceptionally after exceptional
1518       * completion of source
1519       */
1520 <    public void testThenAcceptBothAsync2() {
1521 <        CompletableFuture<Integer> f, g;
1522 <        CompletableFuture<Void> h;
1523 <        SubtractAction r;
1524 <
1525 <        f = new CompletableFuture<>();
1526 <        g = new CompletableFuture<>();
1833 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1834 <        f.completeExceptionally(new CFException());
1835 <        checkIncomplete(h);
1836 <        g.complete(1);
1837 <        checkCompletedWithWrappedCFException(h);
1838 <
1839 <        f = new CompletableFuture<>();
1840 <        g = new CompletableFuture<>();
1841 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1842 <        g.completeExceptionally(new CFException());
1843 <        checkIncomplete(h);
1844 <        f.complete(3);
1845 <        checkCompletedWithWrappedCFException(h);
1846 <
1847 <        f = new CompletableFuture<>();
1848 <        g = new CompletableFuture<>();
1849 <        f.complete(3);
1850 <        g.completeExceptionally(new CFException());
1851 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1852 <        checkCompletedWithWrappedCFException(h);
1853 <
1854 <        f = new CompletableFuture<>();
1855 <        g = new CompletableFuture<>();
1856 <        f.completeExceptionally(new CFException());
1857 <        g.complete(3);
1858 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1859 <        checkCompletedWithWrappedCFException(h);
1860 <    }
1861 <
1862 <    /**
1863 <     * thenAcceptBothAsync result completes exceptionally if action does
1864 <     */
1865 <    public void testThenAcceptBothAsync3() {
1866 <        CompletableFuture<Integer> f, g;
1867 <        CompletableFuture<Void> h;
1868 <        FailingBiConsumer r;
1869 <
1870 <        f = new CompletableFuture<>();
1871 <        g = new CompletableFuture<>();
1872 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1873 <        f.complete(3);
1874 <        checkIncomplete(h);
1875 <        g.complete(1);
1876 <        checkCompletedWithWrappedCFException(h);
1877 <
1878 <        f = new CompletableFuture<>();
1879 <        g = new CompletableFuture<>();
1880 <        f.complete(3);
1881 <        g.complete(1);
1882 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1883 <        checkCompletedWithWrappedCFException(h);
1884 <    }
1885 <
1886 <    /**
1887 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1888 <     */
1889 <    public void testThenAcceptBothAsync4() {
1890 <        CompletableFuture<Integer> f, g;
1891 <        CompletableFuture<Void> h;
1892 <        SubtractAction r;
1893 <
1894 <        f = new CompletableFuture<>();
1895 <        g = new CompletableFuture<>();
1896 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1897 <        assertTrue(f.cancel(true));
1898 <        checkIncomplete(h);
1899 <        g.complete(1);
1900 <        checkCompletedWithWrappedCancellationException(h);
1901 <
1902 <        f = new CompletableFuture<>();
1903 <        g = new CompletableFuture<>();
1904 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1905 <        assertTrue(g.cancel(true));
1906 <        checkIncomplete(h);
1907 <        f.complete(3);
1908 <        checkCompletedWithWrappedCancellationException(h);
1909 <
1910 <        f = new CompletableFuture<>();
1911 <        g = new CompletableFuture<>();
1912 <        f.complete(3);
1913 <        assertTrue(g.cancel(true));
1914 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1915 <        checkCompletedWithWrappedCancellationException(h);
1916 <
1917 <        f = new CompletableFuture<>();
1918 <        g = new CompletableFuture<>();
1919 <        assertTrue(f.cancel(true));
1920 <        g.complete(3);
1921 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1922 <        checkCompletedWithWrappedCancellationException(h);
1923 <    }
1520 >    public void testThenAccept_exceptionalCompletion() {
1521 >        for (ExecutionMode m : ExecutionMode.values())
1522 >    {
1523 >        final CFException ex = new CFException();
1524 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1525 >        final NoopConsumer[] rs = new NoopConsumer[4];
1526 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1527  
1528 <    /**
1529 <     * runAfterBothAsync result completes normally after normal
1530 <     * completion of sources
1531 <     */
1532 <    public void testRunAfterBothAsync() {
1533 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1534 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1535 <        Noop r = new Noop();
1536 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1537 <        f.complete(one);
1538 <        checkIncomplete(g);
1539 <        f2.complete(two);
1540 <        checkCompletedNormally(g, null);
1938 <        assertTrue(r.ran);
1939 <    }
1528 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1529 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1530 >        assertTrue(f.completeExceptionally(ex));
1531 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1532 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1533 >
1534 >        checkCompletedWithWrappedException(h0, ex);
1535 >        checkCompletedWithWrappedException(h1, ex);
1536 >        checkCompletedWithWrappedException(h2, ex);
1537 >        checkCompletedWithWrappedException(h3, ex);
1538 >        checkCompletedExceptionally(f, ex);
1539 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1540 >    }}
1541  
1542      /**
1543 <     * runAfterBothAsync result completes exceptionally after exceptional
1943 <     * completion of source
1543 >     * thenAccept result completes exceptionally if source cancelled
1544       */
1545 <    public void testRunAfterBothAsync2() {
1546 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1547 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1548 <        Noop r = new Noop();
1549 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1550 <        f.completeExceptionally(new CFException());
1551 <        f2.complete(two);
1952 <        checkCompletedWithWrappedCFException(g);
1545 >    public void testThenAccept_sourceCancelled() {
1546 >        for (ExecutionMode m : ExecutionMode.values())
1547 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1548 >    {
1549 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1550 >        final NoopConsumer[] rs = new NoopConsumer[4];
1551 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1552  
1553 <        r = new Noop();
1554 <        f = new CompletableFuture<>();
1555 <        f2 = new CompletableFuture<>();
1556 <        g = f.runAfterBothAsync(f2, r);
1557 <        f.complete(one);
1959 <        f2.completeExceptionally(new CFException());
1960 <        checkCompletedWithWrappedCFException(g);
1961 <    }
1553 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1554 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1555 >        assertTrue(f.cancel(mayInterruptIfRunning));
1556 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1557 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1558  
1559 <    /**
1560 <     * runAfterBothAsync result completes exceptionally if action does
1561 <     */
1562 <    public void testRunAfterBothAsync3() {
1563 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1564 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1565 <        FailingNoop r = new FailingNoop();
1970 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1971 <        f.complete(one);
1972 <        checkIncomplete(g);
1973 <        f2.complete(two);
1974 <        checkCompletedWithWrappedCFException(g);
1975 <    }
1559 >        checkCompletedWithWrappedCancellationException(h0);
1560 >        checkCompletedWithWrappedCancellationException(h1);
1561 >        checkCompletedWithWrappedCancellationException(h2);
1562 >        checkCompletedWithWrappedCancellationException(h3);
1563 >        checkCancelled(f);
1564 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1565 >    }}
1566  
1567      /**
1568 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1568 >     * thenAccept result completes exceptionally if action does
1569       */
1570 <    public void testRunAfterBothAsync4() {
1571 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1572 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1573 <        Noop r = new Noop();
1574 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1575 <        assertTrue(f.cancel(true));
1576 <        f2.complete(two);
1987 <        checkCompletedWithWrappedCancellationException(g);
1570 >    public void testThenAccept_actionFailed() {
1571 >        for (ExecutionMode m : ExecutionMode.values())
1572 >        for (Integer v1 : new Integer[] { 1, null })
1573 >    {
1574 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1575 >        final FailingConsumer[] rs = new FailingConsumer[4];
1576 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1577  
1578 <        r = new Noop();
1579 <        f = new CompletableFuture<>();
1580 <        f2 = new CompletableFuture<>();
1581 <        g = f.runAfterBothAsync(f2, r);
1582 <        f.complete(one);
1583 <        assertTrue(f2.cancel(true));
1584 <        checkCompletedWithWrappedCancellationException(g);
1585 <    }
1578 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1579 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1580 >        assertTrue(f.complete(v1));
1581 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1582 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1583 >
1584 >        checkCompletedWithWrappedCFException(h0);
1585 >        checkCompletedWithWrappedCFException(h1);
1586 >        checkCompletedWithWrappedCFException(h2);
1587 >        checkCompletedWithWrappedCFException(h3);
1588 >        checkCompletedNormally(f, v1);
1589 >    }}
1590  
1591      /**
1592 <     * applyToEitherAsync result completes normally after normal
1593 <     * completion of sources
1592 >     * thenCombine result completes normally after normal completion
1593 >     * of sources
1594       */
1595 <    public void testApplyToEitherAsync() {
1596 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1597 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1598 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1599 <        f.complete(one);
1600 <        checkCompletedNormally(g, two);
1601 <
1602 <        f = new CompletableFuture<>();
1603 <        f.complete(one);
1604 <        f2 = new CompletableFuture<>();
1605 <        g = f.applyToEitherAsync(f2, inc);
1606 <        checkCompletedNormally(g, two);
1607 <    }
1595 >    public void testThenCombine_normalCompletion() {
1596 >        for (ExecutionMode m : ExecutionMode.values())
1597 >        for (boolean fFirst : new boolean[] { true, false })
1598 >        for (Integer v1 : new Integer[] { 1, null })
1599 >        for (Integer v2 : new Integer[] { 2, null })
1600 >    {
1601 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1602 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1603 >        final SubtractFunction r1 = new SubtractFunction(m);
1604 >        final SubtractFunction r2 = new SubtractFunction(m);
1605 >        final SubtractFunction r3 = new SubtractFunction(m);
1606 >
1607 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1608 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1609 >        final Integer w1 =  fFirst ? v1 : v2;
1610 >        final Integer w2 = !fFirst ? v1 : v2;
1611 >
1612 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1613 >        assertTrue(fst.complete(w1));
1614 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1615 >        checkIncomplete(h1);
1616 >        checkIncomplete(h2);
1617 >        r1.assertNotInvoked();
1618 >        r2.assertNotInvoked();
1619 >        assertTrue(snd.complete(w2));
1620 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1621 >
1622 >        checkCompletedNormally(h1, subtract(v1, v2));
1623 >        checkCompletedNormally(h2, subtract(v1, v2));
1624 >        checkCompletedNormally(h3, subtract(v1, v2));
1625 >        r1.assertValue(subtract(v1, v2));
1626 >        r2.assertValue(subtract(v1, v2));
1627 >        r3.assertValue(subtract(v1, v2));
1628 >        checkCompletedNormally(f, v1);
1629 >        checkCompletedNormally(g, v2);
1630 >    }}
1631  
1632      /**
1633 <     * applyToEitherAsync result completes exceptionally after exceptional
1634 <     * completion of source
1633 >     * thenCombine result completes exceptionally after exceptional
1634 >     * completion of either source
1635       */
1636 <    public void testApplyToEitherAsync2() {
1637 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1638 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1639 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1640 <        f.completeExceptionally(new CFException());
1641 <        checkCompletedWithWrappedCFException(g);
1642 <
1643 <        f = new CompletableFuture<>();
1644 <        f2 = new CompletableFuture<>();
1645 <        f2.completeExceptionally(new CFException());
1646 <        g = f.applyToEitherAsync(f2, inc);
1647 <        f.complete(one);
1648 <        checkCompletedWithWrappedCFException(g);
1649 <    }
1636 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1637 >        for (ExecutionMode m : ExecutionMode.values())
1638 >        for (boolean fFirst : new boolean[] { true, false })
1639 >        for (boolean failFirst : new boolean[] { true, false })
1640 >        for (Integer v1 : new Integer[] { 1, null })
1641 >    {
1642 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1643 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1644 >        final CFException ex = new CFException();
1645 >        final SubtractFunction r1 = new SubtractFunction(m);
1646 >        final SubtractFunction r2 = new SubtractFunction(m);
1647 >        final SubtractFunction r3 = new SubtractFunction(m);
1648 >
1649 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1650 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1651 >        final Callable<Boolean> complete1 = failFirst ?
1652 >            () -> fst.completeExceptionally(ex) :
1653 >            () -> fst.complete(v1);
1654 >        final Callable<Boolean> complete2 = failFirst ?
1655 >            () -> snd.complete(v1) :
1656 >            () -> snd.completeExceptionally(ex);
1657 >
1658 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1659 >        assertTrue(complete1.call());
1660 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1661 >        checkIncomplete(h1);
1662 >        checkIncomplete(h2);
1663 >        assertTrue(complete2.call());
1664 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1665 >
1666 >        checkCompletedWithWrappedException(h1, ex);
1667 >        checkCompletedWithWrappedException(h2, ex);
1668 >        checkCompletedWithWrappedException(h3, ex);
1669 >        r1.assertNotInvoked();
1670 >        r2.assertNotInvoked();
1671 >        r3.assertNotInvoked();
1672 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1673 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1674 >    }}
1675  
1676      /**
1677 <     * applyToEitherAsync result completes exceptionally if action does
1677 >     * thenCombine result completes exceptionally if either source cancelled
1678       */
1679 <    public void testApplyToEitherAsync3() {
1680 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1681 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1682 <        FailingFunction r = new FailingFunction();
1683 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1684 <        f.complete(one);
1685 <        checkCompletedWithWrappedCFException(g);
1686 <    }
1679 >    public void testThenCombine_sourceCancelled() throws Throwable {
1680 >        for (ExecutionMode m : ExecutionMode.values())
1681 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1682 >        for (boolean fFirst : new boolean[] { true, false })
1683 >        for (boolean failFirst : new boolean[] { true, false })
1684 >        for (Integer v1 : new Integer[] { 1, null })
1685 >    {
1686 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1687 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1688 >        final SubtractFunction r1 = new SubtractFunction(m);
1689 >        final SubtractFunction r2 = new SubtractFunction(m);
1690 >        final SubtractFunction r3 = new SubtractFunction(m);
1691 >
1692 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1693 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1694 >        final Callable<Boolean> complete1 = failFirst ?
1695 >            () -> fst.cancel(mayInterruptIfRunning) :
1696 >            () -> fst.complete(v1);
1697 >        final Callable<Boolean> complete2 = failFirst ?
1698 >            () -> snd.complete(v1) :
1699 >            () -> snd.cancel(mayInterruptIfRunning);
1700 >
1701 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1702 >        assertTrue(complete1.call());
1703 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1704 >        checkIncomplete(h1);
1705 >        checkIncomplete(h2);
1706 >        assertTrue(complete2.call());
1707 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1708 >
1709 >        checkCompletedWithWrappedCancellationException(h1);
1710 >        checkCompletedWithWrappedCancellationException(h2);
1711 >        checkCompletedWithWrappedCancellationException(h3);
1712 >        r1.assertNotInvoked();
1713 >        r2.assertNotInvoked();
1714 >        r3.assertNotInvoked();
1715 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1716 >        checkCancelled(failFirst ? fst : snd);
1717 >    }}
1718  
1719      /**
1720 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1720 >     * thenCombine result completes exceptionally if action does
1721       */
1722 <    public void testApplyToEitherAsync4() {
1723 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1724 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1725 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1726 <        assertTrue(f.cancel(true));
1727 <        checkCompletedWithWrappedCancellationException(g);
1728 <
1729 <        f = new CompletableFuture<>();
1730 <        f2 = new CompletableFuture<>();
1731 <        assertTrue(f2.cancel(true));
1732 <        g = f.applyToEitherAsync(f2, inc);
1733 <        checkCompletedWithWrappedCancellationException(g);
1734 <    }
1722 >    public void testThenCombine_actionFailed() {
1723 >        for (ExecutionMode m : ExecutionMode.values())
1724 >        for (boolean fFirst : new boolean[] { true, false })
1725 >        for (Integer v1 : new Integer[] { 1, null })
1726 >        for (Integer v2 : new Integer[] { 2, null })
1727 >    {
1728 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1729 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1730 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1731 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1732 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1733 >
1734 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1735 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1736 >        final Integer w1 =  fFirst ? v1 : v2;
1737 >        final Integer w2 = !fFirst ? v1 : v2;
1738 >
1739 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1740 >        assertTrue(fst.complete(w1));
1741 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1742 >        assertTrue(snd.complete(w2));
1743 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1744 >
1745 >        checkCompletedWithWrappedCFException(h1);
1746 >        checkCompletedWithWrappedCFException(h2);
1747 >        checkCompletedWithWrappedCFException(h3);
1748 >        r1.assertInvoked();
1749 >        r2.assertInvoked();
1750 >        r3.assertInvoked();
1751 >        checkCompletedNormally(f, v1);
1752 >        checkCompletedNormally(g, v2);
1753 >    }}
1754  
1755      /**
1756 <     * acceptEitherAsync result completes normally after normal
1756 >     * thenAcceptBoth result completes normally after normal
1757       * completion of sources
1758       */
1759 <    public void testAcceptEitherAsync() {
1760 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1761 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1762 <        IncAction r = new IncAction();
1763 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1764 <        f.complete(one);
1765 <        checkCompletedNormally(g, null);
1766 <        assertEquals(r.value, 2);
1767 <
1768 <        r = new IncAction();
1769 <        f = new CompletableFuture<>();
1770 <        f.complete(one);
1771 <        f2 = new CompletableFuture<>();
1772 <        g = f.acceptEitherAsync(f2, r);
1773 <        checkCompletedNormally(g, null);
1774 <        assertEquals(r.value, 2);
1775 <    }
1759 >    public void testThenAcceptBoth_normalCompletion() {
1760 >        for (ExecutionMode m : ExecutionMode.values())
1761 >        for (boolean fFirst : new boolean[] { true, false })
1762 >        for (Integer v1 : new Integer[] { 1, null })
1763 >        for (Integer v2 : new Integer[] { 2, null })
1764 >    {
1765 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1766 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1767 >        final SubtractAction r1 = new SubtractAction(m);
1768 >        final SubtractAction r2 = new SubtractAction(m);
1769 >        final SubtractAction r3 = new SubtractAction(m);
1770 >
1771 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1772 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1773 >        final Integer w1 =  fFirst ? v1 : v2;
1774 >        final Integer w2 = !fFirst ? v1 : v2;
1775 >
1776 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1777 >        assertTrue(fst.complete(w1));
1778 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1779 >        checkIncomplete(h1);
1780 >        checkIncomplete(h2);
1781 >        r1.assertNotInvoked();
1782 >        r2.assertNotInvoked();
1783 >        assertTrue(snd.complete(w2));
1784 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1785 >
1786 >        checkCompletedNormally(h1, null);
1787 >        checkCompletedNormally(h2, null);
1788 >        checkCompletedNormally(h3, null);
1789 >        r1.assertValue(subtract(v1, v2));
1790 >        r2.assertValue(subtract(v1, v2));
1791 >        r3.assertValue(subtract(v1, v2));
1792 >        checkCompletedNormally(f, v1);
1793 >        checkCompletedNormally(g, v2);
1794 >    }}
1795  
1796      /**
1797 <     * acceptEitherAsync result completes exceptionally after exceptional
1798 <     * completion of source
1797 >     * thenAcceptBoth result completes exceptionally after exceptional
1798 >     * completion of either source
1799       */
1800 <    public void testAcceptEitherAsync2() {
1801 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1802 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1803 <        IncAction r = new IncAction();
1804 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1805 <        f.completeExceptionally(new CFException());
1806 <        checkCompletedWithWrappedCFException(g);
1807 <
1808 <        r = new IncAction();
1809 <        f = new CompletableFuture<>();
1810 <        f2 = new CompletableFuture<>();
1811 <        f2.completeExceptionally(new CFException());
1812 <        g = f.acceptEitherAsync(f2, r);
1813 <        f.complete(one);
1814 <        checkCompletedWithWrappedCFException(g);
1815 <    }
1800 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1801 >        for (ExecutionMode m : ExecutionMode.values())
1802 >        for (boolean fFirst : new boolean[] { true, false })
1803 >        for (boolean failFirst : new boolean[] { true, false })
1804 >        for (Integer v1 : new Integer[] { 1, null })
1805 >    {
1806 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1807 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1808 >        final CFException ex = new CFException();
1809 >        final SubtractAction r1 = new SubtractAction(m);
1810 >        final SubtractAction r2 = new SubtractAction(m);
1811 >        final SubtractAction r3 = new SubtractAction(m);
1812 >
1813 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1814 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1815 >        final Callable<Boolean> complete1 = failFirst ?
1816 >            () -> fst.completeExceptionally(ex) :
1817 >            () -> fst.complete(v1);
1818 >        final Callable<Boolean> complete2 = failFirst ?
1819 >            () -> snd.complete(v1) :
1820 >            () -> snd.completeExceptionally(ex);
1821 >
1822 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1823 >        assertTrue(complete1.call());
1824 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1825 >        checkIncomplete(h1);
1826 >        checkIncomplete(h2);
1827 >        assertTrue(complete2.call());
1828 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1829 >
1830 >        checkCompletedWithWrappedException(h1, ex);
1831 >        checkCompletedWithWrappedException(h2, ex);
1832 >        checkCompletedWithWrappedException(h3, ex);
1833 >        r1.assertNotInvoked();
1834 >        r2.assertNotInvoked();
1835 >        r3.assertNotInvoked();
1836 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1837 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1838 >    }}
1839  
1840      /**
1841 <     * acceptEitherAsync result completes exceptionally if action does
1841 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1842       */
1843 <    public void testAcceptEitherAsync3() {
1844 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1845 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1846 <        FailingConsumer r = new FailingConsumer();
1847 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1848 <        f.complete(one);
1849 <        checkCompletedWithWrappedCFException(g);
1850 <    }
1843 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1844 >        for (ExecutionMode m : ExecutionMode.values())
1845 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1846 >        for (boolean fFirst : new boolean[] { true, false })
1847 >        for (boolean failFirst : new boolean[] { true, false })
1848 >        for (Integer v1 : new Integer[] { 1, null })
1849 >    {
1850 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1851 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1852 >        final SubtractAction r1 = new SubtractAction(m);
1853 >        final SubtractAction r2 = new SubtractAction(m);
1854 >        final SubtractAction r3 = new SubtractAction(m);
1855 >
1856 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1857 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1858 >        final Callable<Boolean> complete1 = failFirst ?
1859 >            () -> fst.cancel(mayInterruptIfRunning) :
1860 >            () -> fst.complete(v1);
1861 >        final Callable<Boolean> complete2 = failFirst ?
1862 >            () -> snd.complete(v1) :
1863 >            () -> snd.cancel(mayInterruptIfRunning);
1864 >
1865 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1866 >        assertTrue(complete1.call());
1867 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1868 >        checkIncomplete(h1);
1869 >        checkIncomplete(h2);
1870 >        assertTrue(complete2.call());
1871 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1872 >
1873 >        checkCompletedWithWrappedCancellationException(h1);
1874 >        checkCompletedWithWrappedCancellationException(h2);
1875 >        checkCompletedWithWrappedCancellationException(h3);
1876 >        r1.assertNotInvoked();
1877 >        r2.assertNotInvoked();
1878 >        r3.assertNotInvoked();
1879 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1880 >        checkCancelled(failFirst ? fst : snd);
1881 >    }}
1882  
1883      /**
1884 <     * acceptEitherAsync result completes exceptionally if either
2121 <     * source cancelled
1884 >     * thenAcceptBoth result completes exceptionally if action does
1885       */
1886 <    public void testAcceptEitherAsync4() {
1887 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1888 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1889 <        IncAction r = new IncAction();
1890 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1891 <        assertTrue(f.cancel(true));
1892 <        checkCompletedWithWrappedCancellationException(g);
1893 <
1894 <        r = new IncAction();
1895 <        f = new CompletableFuture<>();
1896 <        f2 = new CompletableFuture<>();
1897 <        assertTrue(f2.cancel(true));
1898 <        g = f.acceptEitherAsync(f2, r);
1899 <        checkCompletedWithWrappedCancellationException(g);
1900 <    }
1886 >    public void testThenAcceptBoth_actionFailed() {
1887 >        for (ExecutionMode m : ExecutionMode.values())
1888 >        for (boolean fFirst : new boolean[] { true, false })
1889 >        for (Integer v1 : new Integer[] { 1, null })
1890 >        for (Integer v2 : new Integer[] { 2, null })
1891 >    {
1892 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1893 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1894 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1895 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1896 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1897 >
1898 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1899 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1900 >        final Integer w1 =  fFirst ? v1 : v2;
1901 >        final Integer w2 = !fFirst ? v1 : v2;
1902 >
1903 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1904 >        assertTrue(fst.complete(w1));
1905 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1906 >        assertTrue(snd.complete(w2));
1907 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1908 >
1909 >        checkCompletedWithWrappedCFException(h1);
1910 >        checkCompletedWithWrappedCFException(h2);
1911 >        checkCompletedWithWrappedCFException(h3);
1912 >        r1.assertInvoked();
1913 >        r2.assertInvoked();
1914 >        r3.assertInvoked();
1915 >        checkCompletedNormally(f, v1);
1916 >        checkCompletedNormally(g, v2);
1917 >    }}
1918  
1919      /**
1920 <     * runAfterEitherAsync result completes normally after normal
1920 >     * runAfterBoth result completes normally after normal
1921       * completion of sources
1922       */
1923 <    public void testRunAfterEitherAsync() {
1924 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1925 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1926 <        Noop r = new Noop();
1927 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1928 <        f.complete(one);
1929 <        checkCompletedNormally(g, null);
1930 <        assertTrue(r.ran);
1931 <
1932 <        r = new Noop();
1933 <        f = new CompletableFuture<>();
1934 <        f.complete(one);
1935 <        f2 = new CompletableFuture<>();
1936 <        g = f.runAfterEitherAsync(f2, r);
1937 <        checkCompletedNormally(g, null);
1938 <        assertTrue(r.ran);
1939 <    }
1923 >    public void testRunAfterBoth_normalCompletion() {
1924 >        for (ExecutionMode m : ExecutionMode.values())
1925 >        for (boolean fFirst : new boolean[] { true, false })
1926 >        for (Integer v1 : new Integer[] { 1, null })
1927 >        for (Integer v2 : new Integer[] { 2, null })
1928 >    {
1929 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1930 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 >        final Noop r1 = new Noop(m);
1932 >        final Noop r2 = new Noop(m);
1933 >        final Noop r3 = new Noop(m);
1934 >
1935 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1936 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1937 >        final Integer w1 =  fFirst ? v1 : v2;
1938 >        final Integer w2 = !fFirst ? v1 : v2;
1939 >
1940 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1941 >        assertTrue(fst.complete(w1));
1942 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1943 >        checkIncomplete(h1);
1944 >        checkIncomplete(h2);
1945 >        r1.assertNotInvoked();
1946 >        r2.assertNotInvoked();
1947 >        assertTrue(snd.complete(w2));
1948 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1949 >
1950 >        checkCompletedNormally(h1, null);
1951 >        checkCompletedNormally(h2, null);
1952 >        checkCompletedNormally(h3, null);
1953 >        r1.assertInvoked();
1954 >        r2.assertInvoked();
1955 >        r3.assertInvoked();
1956 >        checkCompletedNormally(f, v1);
1957 >        checkCompletedNormally(g, v2);
1958 >    }}
1959  
1960      /**
1961 <     * runAfterEitherAsync result completes exceptionally after exceptional
1962 <     * completion of source
1961 >     * runAfterBoth result completes exceptionally after exceptional
1962 >     * completion of either source
1963       */
1964 <    public void testRunAfterEitherAsync2() {
1965 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1966 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1967 <        Noop r = new Noop();
1968 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1969 <        f.completeExceptionally(new CFException());
1970 <        checkCompletedWithWrappedCFException(g);
1971 <
1972 <        r = new Noop();
1973 <        f = new CompletableFuture<>();
1974 <        f2 = new CompletableFuture<>();
1975 <        f2.completeExceptionally(new CFException());
1976 <        g = f.runAfterEitherAsync(f2, r);
1977 <        f.complete(one);
1978 <        checkCompletedWithWrappedCFException(g);
1979 <    }
1964 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1965 >        for (ExecutionMode m : ExecutionMode.values())
1966 >        for (boolean fFirst : new boolean[] { true, false })
1967 >        for (boolean failFirst : new boolean[] { true, false })
1968 >        for (Integer v1 : new Integer[] { 1, null })
1969 >    {
1970 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1971 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1972 >        final CFException ex = new CFException();
1973 >        final Noop r1 = new Noop(m);
1974 >        final Noop r2 = new Noop(m);
1975 >        final Noop r3 = new Noop(m);
1976 >
1977 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1978 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1979 >        final Callable<Boolean> complete1 = failFirst ?
1980 >            () -> fst.completeExceptionally(ex) :
1981 >            () -> fst.complete(v1);
1982 >        final Callable<Boolean> complete2 = failFirst ?
1983 >            () -> snd.complete(v1) :
1984 >            () -> snd.completeExceptionally(ex);
1985 >
1986 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1987 >        assertTrue(complete1.call());
1988 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1989 >        checkIncomplete(h1);
1990 >        checkIncomplete(h2);
1991 >        assertTrue(complete2.call());
1992 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1993 >
1994 >        checkCompletedWithWrappedException(h1, ex);
1995 >        checkCompletedWithWrappedException(h2, ex);
1996 >        checkCompletedWithWrappedException(h3, ex);
1997 >        r1.assertNotInvoked();
1998 >        r2.assertNotInvoked();
1999 >        r3.assertNotInvoked();
2000 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2001 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2002 >    }}
2003  
2004      /**
2005 <     * runAfterEitherAsync result completes exceptionally if action does
2005 >     * runAfterBoth result completes exceptionally if either source cancelled
2006       */
2007 <    public void testRunAfterEitherAsync3() {
2008 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2009 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2010 <        FailingNoop r = new FailingNoop();
2011 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2012 <        f.complete(one);
2013 <        checkCompletedWithWrappedCFException(g);
2014 <    }
2007 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2008 >        for (ExecutionMode m : ExecutionMode.values())
2009 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2010 >        for (boolean fFirst : new boolean[] { true, false })
2011 >        for (boolean failFirst : new boolean[] { true, false })
2012 >        for (Integer v1 : new Integer[] { 1, null })
2013 >    {
2014 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2015 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2016 >        final Noop r1 = new Noop(m);
2017 >        final Noop r2 = new Noop(m);
2018 >        final Noop r3 = new Noop(m);
2019 >
2020 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2021 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2022 >        final Callable<Boolean> complete1 = failFirst ?
2023 >            () -> fst.cancel(mayInterruptIfRunning) :
2024 >            () -> fst.complete(v1);
2025 >        final Callable<Boolean> complete2 = failFirst ?
2026 >            () -> snd.complete(v1) :
2027 >            () -> snd.cancel(mayInterruptIfRunning);
2028 >
2029 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2030 >        assertTrue(complete1.call());
2031 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2032 >        checkIncomplete(h1);
2033 >        checkIncomplete(h2);
2034 >        assertTrue(complete2.call());
2035 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2036 >
2037 >        checkCompletedWithWrappedCancellationException(h1);
2038 >        checkCompletedWithWrappedCancellationException(h2);
2039 >        checkCompletedWithWrappedCancellationException(h3);
2040 >        r1.assertNotInvoked();
2041 >        r2.assertNotInvoked();
2042 >        r3.assertNotInvoked();
2043 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2044 >        checkCancelled(failFirst ? fst : snd);
2045 >    }}
2046  
2047      /**
2048 <     * runAfterEitherAsync result completes exceptionally if either
2196 <     * source cancelled
2048 >     * runAfterBoth result completes exceptionally if action does
2049       */
2050 <    public void testRunAfterEitherAsync4() {
2051 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2052 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2053 <        Noop r = new Noop();
2054 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2055 <        assertTrue(f.cancel(true));
2056 <        checkCompletedWithWrappedCancellationException(g);
2057 <
2058 <        r = new Noop();
2059 <        f = new CompletableFuture<>();
2060 <        f2 = new CompletableFuture<>();
2061 <        assertTrue(f2.cancel(true));
2062 <        g = f.runAfterEitherAsync(f2, r);
2063 <        checkCompletedWithWrappedCancellationException(g);
2064 <    }
2050 >    public void testRunAfterBoth_actionFailed() {
2051 >        for (ExecutionMode m : ExecutionMode.values())
2052 >        for (boolean fFirst : new boolean[] { true, false })
2053 >        for (Integer v1 : new Integer[] { 1, null })
2054 >        for (Integer v2 : new Integer[] { 2, null })
2055 >    {
2056 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2057 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2058 >        final FailingRunnable r1 = new FailingRunnable(m);
2059 >        final FailingRunnable r2 = new FailingRunnable(m);
2060 >        final FailingRunnable r3 = new FailingRunnable(m);
2061 >
2062 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2063 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2064 >        final Integer w1 =  fFirst ? v1 : v2;
2065 >        final Integer w2 = !fFirst ? v1 : v2;
2066 >
2067 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2068 >        assertTrue(fst.complete(w1));
2069 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2070 >        assertTrue(snd.complete(w2));
2071 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2072 >
2073 >        checkCompletedWithWrappedCFException(h1);
2074 >        checkCompletedWithWrappedCFException(h2);
2075 >        checkCompletedWithWrappedCFException(h3);
2076 >        r1.assertInvoked();
2077 >        r2.assertInvoked();
2078 >        r3.assertInvoked();
2079 >        checkCompletedNormally(f, v1);
2080 >        checkCompletedNormally(g, v2);
2081 >    }}
2082  
2083      /**
2084 <     * thenComposeAsync result completes normally after normal
2085 <     * completion of source
2084 >     * applyToEither result completes normally after normal completion
2085 >     * of either source
2086       */
2087 <    public void testThenComposeAsync() {
2088 <        CompletableFuture<Integer> f, g;
2089 <        CompletableFutureInc r;
2090 <
2091 <        f = new CompletableFuture<>();
2092 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2093 <        f.complete(one);
2094 <        checkCompletedNormally(g, two);
2095 <
2227 <        f = new CompletableFuture<>();
2228 <        f.complete(one);
2229 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2230 <        checkCompletedNormally(g, two);
2231 <    }
2087 >    public void testApplyToEither_normalCompletion() {
2088 >        for (ExecutionMode m : ExecutionMode.values())
2089 >        for (Integer v1 : new Integer[] { 1, null })
2090 >        for (Integer v2 : new Integer[] { 2, null })
2091 >    {
2092 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2093 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2094 >        final IncFunction[] rs = new IncFunction[6];
2095 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2096  
2097 <    /**
2098 <     * thenComposeAsync result completes exceptionally after
2099 <     * exceptional completion of source
2100 <     */
2101 <    public void testThenComposeAsync2() {
2102 <        CompletableFuture<Integer> f, g;
2103 <        CompletableFutureInc r;
2097 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2098 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2099 >        checkIncomplete(h0);
2100 >        checkIncomplete(h1);
2101 >        rs[0].assertNotInvoked();
2102 >        rs[1].assertNotInvoked();
2103 >        f.complete(v1);
2104 >        checkCompletedNormally(h0, inc(v1));
2105 >        checkCompletedNormally(h1, inc(v1));
2106 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2107 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2108 >        checkCompletedNormally(h2, inc(v1));
2109 >        checkCompletedNormally(h3, inc(v1));
2110 >        g.complete(v2);
2111  
2112 <        f = new CompletableFuture<>();
2113 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2114 <        f.completeExceptionally(new CFException());
2115 <        checkCompletedWithWrappedCFException(g);
2116 <        assertFalse(r.ran);
2112 >        // unspecified behavior - both source completions available
2113 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2114 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2115 >        rs[4].assertValue(h4.join());
2116 >        rs[5].assertValue(h5.join());
2117 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2118 >                   Objects.equals(inc(v2), h4.join()));
2119 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2120 >                   Objects.equals(inc(v2), h5.join()));
2121  
2122 <        f = new CompletableFuture<>();
2123 <        f.completeExceptionally(new CFException());
2124 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2125 <        checkCompletedWithWrappedCFException(g);
2126 <        assertFalse(r.ran);
2127 <    }
2122 >        checkCompletedNormally(f, v1);
2123 >        checkCompletedNormally(g, v2);
2124 >        checkCompletedNormally(h0, inc(v1));
2125 >        checkCompletedNormally(h1, inc(v1));
2126 >        checkCompletedNormally(h2, inc(v1));
2127 >        checkCompletedNormally(h3, inc(v1));
2128 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2129 >    }}
2130  
2131      /**
2132 <     * thenComposeAsync result completes exceptionally if action does
2132 >     * applyToEither result completes exceptionally after exceptional
2133 >     * completion of either source
2134       */
2135 <    public void testThenComposeAsync3() {
2136 <        CompletableFuture<Integer> f, g;
2137 <        FailingCompletableFutureFunction r;
2138 <
2139 <        f = new CompletableFuture<>();
2140 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2141 <        f.complete(one);
2142 <        checkCompletedWithWrappedCFException(g);
2135 >    public void testApplyToEither_exceptionalCompletion() {
2136 >        for (ExecutionMode m : ExecutionMode.values())
2137 >        for (Integer v1 : new Integer[] { 1, null })
2138 >    {
2139 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2140 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2141 >        final CFException ex = new CFException();
2142 >        final IncFunction[] rs = new IncFunction[6];
2143 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2144  
2145 <        f = new CompletableFuture<>();
2146 <        f.complete(one);
2147 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2148 <        checkCompletedWithWrappedCFException(g);
2149 <    }
2145 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2146 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2147 >        checkIncomplete(h0);
2148 >        checkIncomplete(h1);
2149 >        rs[0].assertNotInvoked();
2150 >        rs[1].assertNotInvoked();
2151 >        f.completeExceptionally(ex);
2152 >        checkCompletedWithWrappedException(h0, ex);
2153 >        checkCompletedWithWrappedException(h1, ex);
2154 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2155 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2156 >        checkCompletedWithWrappedException(h2, ex);
2157 >        checkCompletedWithWrappedException(h3, ex);
2158 >        g.complete(v1);
2159  
2160 <    /**
2161 <     * thenComposeAsync result completes exceptionally if source cancelled
2162 <     */
2163 <    public void testThenComposeAsync4() {
2164 <        CompletableFuture<Integer> f, g;
2165 <        CompletableFutureInc r;
2160 >        // unspecified behavior - both source completions available
2161 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2162 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2163 >        try {
2164 >            assertEquals(inc(v1), h4.join());
2165 >            rs[4].assertValue(inc(v1));
2166 >        } catch (CompletionException ok) {
2167 >            checkCompletedWithWrappedException(h4, ex);
2168 >            rs[4].assertNotInvoked();
2169 >        }
2170 >        try {
2171 >            assertEquals(inc(v1), h5.join());
2172 >            rs[5].assertValue(inc(v1));
2173 >        } catch (CompletionException ok) {
2174 >            checkCompletedWithWrappedException(h5, ex);
2175 >            rs[5].assertNotInvoked();
2176 >        }
2177  
2178 <        f = new CompletableFuture<>();
2179 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2180 <        assertTrue(f.cancel(true));
2181 <        checkCompletedWithWrappedCancellationException(g);
2178 >        checkCompletedExceptionally(f, ex);
2179 >        checkCompletedNormally(g, v1);
2180 >        checkCompletedWithWrappedException(h0, ex);
2181 >        checkCompletedWithWrappedException(h1, ex);
2182 >        checkCompletedWithWrappedException(h2, ex);
2183 >        checkCompletedWithWrappedException(h3, ex);
2184 >        checkCompletedWithWrappedException(h4, ex);
2185 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2186 >    }}
2187 >
2188 >    public void testApplyToEither_exceptionalCompletion2() {
2189 >        for (ExecutionMode m : ExecutionMode.values())
2190 >        for (boolean fFirst : new boolean[] { true, false })
2191 >        for (Integer v1 : new Integer[] { 1, null })
2192 >    {
2193 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2194 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2195 >        final CFException ex = new CFException();
2196 >        final IncFunction[] rs = new IncFunction[6];
2197 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2198  
2199 <        f = new CompletableFuture<>();
2200 <        assertTrue(f.cancel(true));
2201 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2202 <        checkCompletedWithWrappedCancellationException(g);
2203 <    }
2199 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2200 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2201 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2202 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2203 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2204 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2205 >
2206 >        // unspecified behavior - both source completions available
2207 >        try {
2208 >            assertEquals(inc(v1), h0.join());
2209 >            rs[0].assertValue(inc(v1));
2210 >        } catch (CompletionException ok) {
2211 >            checkCompletedWithWrappedException(h0, ex);
2212 >            rs[0].assertNotInvoked();
2213 >        }
2214 >        try {
2215 >            assertEquals(inc(v1), h1.join());
2216 >            rs[1].assertValue(inc(v1));
2217 >        } catch (CompletionException ok) {
2218 >            checkCompletedWithWrappedException(h1, ex);
2219 >            rs[1].assertNotInvoked();
2220 >        }
2221 >        try {
2222 >            assertEquals(inc(v1), h2.join());
2223 >            rs[2].assertValue(inc(v1));
2224 >        } catch (CompletionException ok) {
2225 >            checkCompletedWithWrappedException(h2, ex);
2226 >            rs[2].assertNotInvoked();
2227 >        }
2228 >        try {
2229 >            assertEquals(inc(v1), h3.join());
2230 >            rs[3].assertValue(inc(v1));
2231 >        } catch (CompletionException ok) {
2232 >            checkCompletedWithWrappedException(h3, ex);
2233 >            rs[3].assertNotInvoked();
2234 >        }
2235  
2236 <    // async with explicit executors
2236 >        checkCompletedNormally(f, v1);
2237 >        checkCompletedExceptionally(g, ex);
2238 >    }}
2239  
2240      /**
2241 <     * thenRunAsync result completes normally after normal completion of source
2241 >     * applyToEither result completes exceptionally if either source cancelled
2242       */
2243 <    public void testThenRunAsyncE() {
2244 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2245 <        Noop r = new Noop();
2246 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2247 <        f.complete(null);
2248 <        checkCompletedNormally(g, null);
2249 <
2250 <        // reordered version
2251 <        f = new CompletableFuture<>();
2304 <        f.complete(null);
2305 <        r = new Noop();
2306 <        g = f.thenRunAsync(r, new ThreadExecutor());
2307 <        checkCompletedNormally(g, null);
2308 <    }
2243 >    public void testApplyToEither_sourceCancelled() {
2244 >        for (ExecutionMode m : ExecutionMode.values())
2245 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2246 >        for (Integer v1 : new Integer[] { 1, null })
2247 >    {
2248 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2249 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2250 >        final IncFunction[] rs = new IncFunction[6];
2251 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2252  
2253 <    /**
2254 <     * thenRunAsync result completes exceptionally after exceptional
2255 <     * completion of source
2256 <     */
2257 <    public void testThenRunAsync2E() {
2258 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2259 <        Noop r = new Noop();
2260 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2261 <        f.completeExceptionally(new CFException());
2262 <        try {
2263 <            g.join();
2264 <            shouldThrow();
2265 <        } catch (CompletionException success) {}
2266 <        checkCompletedWithWrappedCFException(g);
2324 <    }
2253 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2254 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2255 >        checkIncomplete(h0);
2256 >        checkIncomplete(h1);
2257 >        rs[0].assertNotInvoked();
2258 >        rs[1].assertNotInvoked();
2259 >        f.cancel(mayInterruptIfRunning);
2260 >        checkCompletedWithWrappedCancellationException(h0);
2261 >        checkCompletedWithWrappedCancellationException(h1);
2262 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2263 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2264 >        checkCompletedWithWrappedCancellationException(h2);
2265 >        checkCompletedWithWrappedCancellationException(h3);
2266 >        g.complete(v1);
2267  
2268 <    /**
2269 <     * thenRunAsync result completes exceptionally if action does
2270 <     */
2271 <    public void testThenRunAsync3E() {
2272 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2273 <        FailingNoop r = new FailingNoop();
2274 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2275 <        f.complete(null);
2276 <        checkCompletedWithWrappedCFException(g);
2277 <    }
2268 >        // unspecified behavior - both source completions available
2269 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2270 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2271 >        try {
2272 >            assertEquals(inc(v1), h4.join());
2273 >            rs[4].assertValue(inc(v1));
2274 >        } catch (CompletionException ok) {
2275 >            checkCompletedWithWrappedCancellationException(h4);
2276 >            rs[4].assertNotInvoked();
2277 >        }
2278 >        try {
2279 >            assertEquals(inc(v1), h5.join());
2280 >            rs[5].assertValue(inc(v1));
2281 >        } catch (CompletionException ok) {
2282 >            checkCompletedWithWrappedCancellationException(h5);
2283 >            rs[5].assertNotInvoked();
2284 >        }
2285  
2286 <    /**
2287 <     * thenRunAsync result completes exceptionally if source cancelled
2288 <     */
2289 <    public void testThenRunAsync4E() {
2290 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2291 <        Noop r = new Noop();
2292 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2293 <        assertTrue(f.cancel(true));
2345 <        checkCompletedWithWrappedCancellationException(g);
2346 <    }
2286 >        checkCancelled(f);
2287 >        checkCompletedNormally(g, v1);
2288 >        checkCompletedWithWrappedCancellationException(h0);
2289 >        checkCompletedWithWrappedCancellationException(h1);
2290 >        checkCompletedWithWrappedCancellationException(h2);
2291 >        checkCompletedWithWrappedCancellationException(h3);
2292 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2293 >    }}
2294  
2295 <    /**
2296 <     * thenApplyAsync result completes normally after normal completion of source
2297 <     */
2298 <    public void testThenApplyAsyncE() {
2299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2300 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2301 <        f.complete(one);
2302 <        checkCompletedNormally(g, two);
2303 <    }
2295 >    public void testApplyToEither_sourceCancelled2() {
2296 >        for (ExecutionMode m : ExecutionMode.values())
2297 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2298 >        for (boolean fFirst : new boolean[] { true, false })
2299 >        for (Integer v1 : new Integer[] { 1, null })
2300 >    {
2301 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2302 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2303 >        final IncFunction[] rs = new IncFunction[6];
2304 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2305  
2306 <    /**
2307 <     * thenApplyAsync result completes exceptionally after exceptional
2308 <     * completion of source
2309 <     */
2310 <    public void testThenApplyAsync2E() {
2311 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2312 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2313 <        f.completeExceptionally(new CFException());
2314 <        checkCompletedWithWrappedCFException(g);
2315 <    }
2306 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2307 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2308 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2309 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2310 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2311 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2312 >
2313 >        // unspecified behavior - both source completions available
2314 >        try {
2315 >            assertEquals(inc(v1), h0.join());
2316 >            rs[0].assertValue(inc(v1));
2317 >        } catch (CompletionException ok) {
2318 >            checkCompletedWithWrappedCancellationException(h0);
2319 >            rs[0].assertNotInvoked();
2320 >        }
2321 >        try {
2322 >            assertEquals(inc(v1), h1.join());
2323 >            rs[1].assertValue(inc(v1));
2324 >        } catch (CompletionException ok) {
2325 >            checkCompletedWithWrappedCancellationException(h1);
2326 >            rs[1].assertNotInvoked();
2327 >        }
2328 >        try {
2329 >            assertEquals(inc(v1), h2.join());
2330 >            rs[2].assertValue(inc(v1));
2331 >        } catch (CompletionException ok) {
2332 >            checkCompletedWithWrappedCancellationException(h2);
2333 >            rs[2].assertNotInvoked();
2334 >        }
2335 >        try {
2336 >            assertEquals(inc(v1), h3.join());
2337 >            rs[3].assertValue(inc(v1));
2338 >        } catch (CompletionException ok) {
2339 >            checkCompletedWithWrappedCancellationException(h3);
2340 >            rs[3].assertNotInvoked();
2341 >        }
2342  
2343 <    /**
2344 <     * thenApplyAsync result completes exceptionally if action does
2345 <     */
2372 <    public void testThenApplyAsync3E() {
2373 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2374 <        FailingFunction r = new FailingFunction();
2375 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2376 <        f.complete(null);
2377 <        checkCompletedWithWrappedCFException(g);
2378 <    }
2343 >        checkCompletedNormally(f, v1);
2344 >        checkCancelled(g);
2345 >    }}
2346  
2347      /**
2348 <     * thenApplyAsync result completes exceptionally if source cancelled
2348 >     * applyToEither result completes exceptionally if action does
2349       */
2350 <    public void testThenApplyAsync4E() {
2351 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2352 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2353 <        assertTrue(f.cancel(true));
2354 <        checkCompletedWithWrappedCancellationException(g);
2355 <    }
2350 >    public void testApplyToEither_actionFailed() {
2351 >        for (ExecutionMode m : ExecutionMode.values())
2352 >        for (Integer v1 : new Integer[] { 1, null })
2353 >        for (Integer v2 : new Integer[] { 2, null })
2354 >    {
2355 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2356 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2357 >        final FailingFunction[] rs = new FailingFunction[6];
2358 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2359  
2360 <    /**
2361 <     * thenAcceptAsync result completes normally after normal
2362 <     * completion of source
2363 <     */
2364 <    public void testThenAcceptAsyncE() {
2365 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2366 <        IncAction r = new IncAction();
2367 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2368 <        f.complete(one);
2369 <        checkCompletedNormally(g, null);
2400 <        assertEquals(r.value, 2);
2401 <    }
2360 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2361 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2362 >        f.complete(v1);
2363 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2364 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2365 >        checkCompletedWithWrappedCFException(h0);
2366 >        checkCompletedWithWrappedCFException(h1);
2367 >        checkCompletedWithWrappedCFException(h2);
2368 >        checkCompletedWithWrappedCFException(h3);
2369 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2370  
2371 <    /**
2404 <     * thenAcceptAsync result completes exceptionally after exceptional
2405 <     * completion of source
2406 <     */
2407 <    public void testThenAcceptAsync2E() {
2408 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2409 <        IncAction r = new IncAction();
2410 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2411 <        f.completeExceptionally(new CFException());
2412 <        checkCompletedWithWrappedCFException(g);
2413 <    }
2371 >        g.complete(v2);
2372  
2373 <    /**
2374 <     * thenAcceptAsync result completes exceptionally if action does
2375 <     */
2376 <    public void testThenAcceptAsync3E() {
2377 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2378 <        FailingConsumer r = new FailingConsumer();
2379 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2380 <        f.complete(null);
2381 <        checkCompletedWithWrappedCFException(g);
2382 <    }
2373 >        // unspecified behavior - both source completions available
2374 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2375 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2376 >
2377 >        checkCompletedWithWrappedCFException(h4);
2378 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2379 >                   Objects.equals(v2, rs[4].value));
2380 >        checkCompletedWithWrappedCFException(h5);
2381 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2382 >                   Objects.equals(v2, rs[5].value));
2383  
2384 <    /**
2385 <     * thenAcceptAsync result completes exceptionally if source cancelled
2386 <     */
2429 <    public void testThenAcceptAsync4E() {
2430 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2431 <        IncAction r = new IncAction();
2432 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2433 <        assertTrue(f.cancel(true));
2434 <        checkCompletedWithWrappedCancellationException(g);
2435 <    }
2384 >        checkCompletedNormally(f, v1);
2385 >        checkCompletedNormally(g, v2);
2386 >    }}
2387  
2388      /**
2389 <     * thenCombineAsync result completes normally after normal
2390 <     * completion of sources
2389 >     * acceptEither result completes normally after normal completion
2390 >     * of either source
2391       */
2392 <    public void testThenCombineAsyncE() {
2393 <        CompletableFuture<Integer> f, g, h;
2394 <        ThreadExecutor e = new ThreadExecutor();
2395 <        int count = 0;
2392 >    public void testAcceptEither_normalCompletion() {
2393 >        for (ExecutionMode m : ExecutionMode.values())
2394 >        for (Integer v1 : new Integer[] { 1, null })
2395 >        for (Integer v2 : new Integer[] { 2, null })
2396 >    {
2397 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2398 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2399 >        final NoopConsumer[] rs = new NoopConsumer[6];
2400 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2401  
2402 <        f = new CompletableFuture<>();
2403 <        g = new CompletableFuture<>();
2404 <        h = f.thenCombineAsync(g, subtract, e);
2405 <        f.complete(3);
2406 <        checkIncomplete(h);
2407 <        g.complete(1);
2408 <        checkCompletedNormally(h, 2);
2409 <        assertEquals(++count, e.count.get());
2402 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2403 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2404 >        checkIncomplete(h0);
2405 >        checkIncomplete(h1);
2406 >        rs[0].assertNotInvoked();
2407 >        rs[1].assertNotInvoked();
2408 >        f.complete(v1);
2409 >        checkCompletedNormally(h0, null);
2410 >        checkCompletedNormally(h1, null);
2411 >        rs[0].assertValue(v1);
2412 >        rs[1].assertValue(v1);
2413 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2414 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2415 >        checkCompletedNormally(h2, null);
2416 >        checkCompletedNormally(h3, null);
2417 >        rs[2].assertValue(v1);
2418 >        rs[3].assertValue(v1);
2419 >        g.complete(v2);
2420  
2421 <        f = new CompletableFuture<>();
2422 <        g = new CompletableFuture<>();
2423 <        h = f.thenCombineAsync(g, subtract, e);
2424 <        g.complete(1);
2425 <        checkIncomplete(h);
2426 <        f.complete(3);
2427 <        checkCompletedNormally(h, 2);
2428 <        assertEquals(++count, e.count.get());
2421 >        // unspecified behavior - both source completions available
2422 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2423 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2424 >        checkCompletedNormally(h4, null);
2425 >        checkCompletedNormally(h5, null);
2426 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2427 >                   Objects.equals(v2, rs[4].value));
2428 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2429 >                   Objects.equals(v2, rs[5].value));
2430  
2431 <        f = new CompletableFuture<>();
2432 <        g = new CompletableFuture<>();
2433 <        g.complete(1);
2434 <        f.complete(3);
2435 <        h = f.thenCombineAsync(g, subtract, e);
2436 <        checkCompletedNormally(h, 2);
2437 <        assertEquals(++count, e.count.get());
2438 <    }
2431 >        checkCompletedNormally(f, v1);
2432 >        checkCompletedNormally(g, v2);
2433 >        checkCompletedNormally(h0, null);
2434 >        checkCompletedNormally(h1, null);
2435 >        checkCompletedNormally(h2, null);
2436 >        checkCompletedNormally(h3, null);
2437 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2438 >    }}
2439  
2440      /**
2441 <     * thenCombineAsync result completes exceptionally after exceptional
2441 >     * acceptEither result completes exceptionally after exceptional
2442       * completion of either source
2443       */
2444 <    public void testThenCombineAsync2E() {
2445 <        CompletableFuture<Integer> f, g, h;
2446 <        ThreadExecutor e = new ThreadExecutor();
2447 <        int count = 0;
2448 <
2449 <        f = new CompletableFuture<>();
2450 <        g = new CompletableFuture<>();
2451 <        h = f.thenCombineAsync(g, subtract, e);
2452 <        f.completeExceptionally(new CFException());
2486 <        checkIncomplete(h);
2487 <        g.complete(1);
2488 <        checkCompletedWithWrappedCFException(h);
2489 <
2490 <        f = new CompletableFuture<>();
2491 <        g = new CompletableFuture<>();
2492 <        h = f.thenCombineAsync(g, subtract, e);
2493 <        g.completeExceptionally(new CFException());
2494 <        checkIncomplete(h);
2495 <        f.complete(3);
2496 <        checkCompletedWithWrappedCFException(h);
2497 <
2498 <        f = new CompletableFuture<>();
2499 <        g = new CompletableFuture<>();
2500 <        g.completeExceptionally(new CFException());
2501 <        h = f.thenCombineAsync(g, subtract, e);
2502 <        checkIncomplete(h);
2503 <        f.complete(3);
2504 <        checkCompletedWithWrappedCFException(h);
2505 <
2506 <        assertEquals(0, e.count.get());
2507 <    }
2508 <
2509 <    /**
2510 <     * thenCombineAsync result completes exceptionally if action does
2511 <     */
2512 <    public void testThenCombineAsync3E() {
2513 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2514 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2515 <        FailingBiFunction r = new FailingBiFunction();
2516 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2517 <        f.complete(one);
2518 <        checkIncomplete(g);
2519 <        assertFalse(r.ran);
2520 <        f2.complete(two);
2521 <        checkCompletedWithWrappedCFException(g);
2522 <        assertTrue(r.ran);
2523 <    }
2524 <
2525 <    /**
2526 <     * thenCombineAsync result completes exceptionally if either source cancelled
2527 <     */
2528 <    public void testThenCombineAsync4E() {
2529 <        CompletableFuture<Integer> f, g, h;
2530 <        ThreadExecutor e = new ThreadExecutor();
2531 <
2532 <        f = new CompletableFuture<>();
2533 <        g = new CompletableFuture<>();
2534 <        h = f.thenCombineAsync(g, subtract, e);
2535 <        assertTrue(f.cancel(true));
2536 <        checkIncomplete(h);
2537 <        g.complete(1);
2538 <        checkCompletedWithWrappedCancellationException(h);
2539 <
2540 <        f = new CompletableFuture<>();
2541 <        g = new CompletableFuture<>();
2542 <        h = f.thenCombineAsync(g, subtract, e);
2543 <        assertTrue(g.cancel(true));
2544 <        checkIncomplete(h);
2545 <        f.complete(3);
2546 <        checkCompletedWithWrappedCancellationException(h);
2547 <
2548 <        f = new CompletableFuture<>();
2549 <        g = new CompletableFuture<>();
2550 <        assertTrue(g.cancel(true));
2551 <        h = f.thenCombineAsync(g, subtract, e);
2552 <        checkIncomplete(h);
2553 <        f.complete(3);
2554 <        checkCompletedWithWrappedCancellationException(h);
2555 <
2556 <        f = new CompletableFuture<>();
2557 <        g = new CompletableFuture<>();
2558 <        assertTrue(f.cancel(true));
2559 <        assertTrue(g.cancel(true));
2560 <        h = f.thenCombineAsync(g, subtract, e);
2561 <        checkCompletedWithWrappedCancellationException(h);
2444 >    public void testAcceptEither_exceptionalCompletion() {
2445 >        for (ExecutionMode m : ExecutionMode.values())
2446 >        for (Integer v1 : new Integer[] { 1, null })
2447 >    {
2448 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2449 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2450 >        final CFException ex = new CFException();
2451 >        final NoopConsumer[] rs = new NoopConsumer[6];
2452 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2453  
2454 <        assertEquals(0, e.count.get());
2455 <    }
2454 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2455 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2456 >        checkIncomplete(h0);
2457 >        checkIncomplete(h1);
2458 >        rs[0].assertNotInvoked();
2459 >        rs[1].assertNotInvoked();
2460 >        f.completeExceptionally(ex);
2461 >        checkCompletedWithWrappedException(h0, ex);
2462 >        checkCompletedWithWrappedException(h1, ex);
2463 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2464 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2465 >        checkCompletedWithWrappedException(h2, ex);
2466 >        checkCompletedWithWrappedException(h3, ex);
2467  
2468 <    /**
2567 <     * thenAcceptBothAsync result completes normally after normal
2568 <     * completion of sources
2569 <     */
2570 <    public void testThenAcceptBothAsyncE() {
2571 <        CompletableFuture<Integer> f, g;
2572 <        CompletableFuture<Void> h;
2573 <        SubtractAction r;
2574 <        ThreadExecutor e = new ThreadExecutor();
2468 >        g.complete(v1);
2469  
2470 <        f = new CompletableFuture<>();
2471 <        g = new CompletableFuture<>();
2472 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2473 <        f.complete(3);
2474 <        checkIncomplete(h);
2475 <        g.complete(1);
2476 <        checkCompletedNormally(h, null);
2477 <        assertEquals(r.value, 2);
2470 >        // unspecified behavior - both source completions available
2471 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2472 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2473 >        try {
2474 >            assertNull(h4.join());
2475 >            rs[4].assertValue(v1);
2476 >        } catch (CompletionException ok) {
2477 >            checkCompletedWithWrappedException(h4, ex);
2478 >            rs[4].assertNotInvoked();
2479 >        }
2480 >        try {
2481 >            assertNull(h5.join());
2482 >            rs[5].assertValue(v1);
2483 >        } catch (CompletionException ok) {
2484 >            checkCompletedWithWrappedException(h5, ex);
2485 >            rs[5].assertNotInvoked();
2486 >        }
2487  
2488 <        f = new CompletableFuture<>();
2489 <        g = new CompletableFuture<>();
2490 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2491 <        g.complete(1);
2492 <        checkIncomplete(h);
2493 <        f.complete(3);
2494 <        checkCompletedNormally(h, null);
2495 <        assertEquals(r.value, 2);
2488 >        checkCompletedExceptionally(f, ex);
2489 >        checkCompletedNormally(g, v1);
2490 >        checkCompletedWithWrappedException(h0, ex);
2491 >        checkCompletedWithWrappedException(h1, ex);
2492 >        checkCompletedWithWrappedException(h2, ex);
2493 >        checkCompletedWithWrappedException(h3, ex);
2494 >        checkCompletedWithWrappedException(h4, ex);
2495 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2496 >    }}
2497 >
2498 >    public void testAcceptEither_exceptionalCompletion2() {
2499 >        for (ExecutionMode m : ExecutionMode.values())
2500 >        for (boolean fFirst : new boolean[] { true, false })
2501 >        for (Integer v1 : new Integer[] { 1, null })
2502 >    {
2503 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2504 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2505 >        final CFException ex = new CFException();
2506 >        final NoopConsumer[] rs = new NoopConsumer[6];
2507 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2508  
2509 <        f = new CompletableFuture<>();
2510 <        g = new CompletableFuture<>();
2511 <        g.complete(1);
2512 <        f.complete(3);
2513 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2514 <        checkCompletedNormally(h, null);
2515 <        assertEquals(r.value, 2);
2509 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2510 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2511 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2512 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2513 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2514 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2515 >
2516 >        // unspecified behavior - both source completions available
2517 >        try {
2518 >            assertEquals(null, h0.join());
2519 >            rs[0].assertValue(v1);
2520 >        } catch (CompletionException ok) {
2521 >            checkCompletedWithWrappedException(h0, ex);
2522 >            rs[0].assertNotInvoked();
2523 >        }
2524 >        try {
2525 >            assertEquals(null, h1.join());
2526 >            rs[1].assertValue(v1);
2527 >        } catch (CompletionException ok) {
2528 >            checkCompletedWithWrappedException(h1, ex);
2529 >            rs[1].assertNotInvoked();
2530 >        }
2531 >        try {
2532 >            assertEquals(null, h2.join());
2533 >            rs[2].assertValue(v1);
2534 >        } catch (CompletionException ok) {
2535 >            checkCompletedWithWrappedException(h2, ex);
2536 >            rs[2].assertNotInvoked();
2537 >        }
2538 >        try {
2539 >            assertEquals(null, h3.join());
2540 >            rs[3].assertValue(v1);
2541 >        } catch (CompletionException ok) {
2542 >            checkCompletedWithWrappedException(h3, ex);
2543 >            rs[3].assertNotInvoked();
2544 >        }
2545  
2546 <        assertEquals(3, e.count.get());
2547 <    }
2546 >        checkCompletedNormally(f, v1);
2547 >        checkCompletedExceptionally(g, ex);
2548 >    }}
2549  
2550      /**
2551 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2607 <     * completion of source
2551 >     * acceptEither result completes exceptionally if either source cancelled
2552       */
2553 <    public void testThenAcceptBothAsync2E() {
2554 <        CompletableFuture<Integer> f, g;
2555 <        CompletableFuture<Void> h;
2556 <        SubtractAction r;
2557 <        ThreadExecutor e = new ThreadExecutor();
2558 <
2559 <        f = new CompletableFuture<>();
2560 <        g = new CompletableFuture<>();
2561 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2618 <        f.completeExceptionally(new CFException());
2619 <        checkIncomplete(h);
2620 <        g.complete(1);
2621 <        checkCompletedWithWrappedCFException(h);
2622 <
2623 <        f = new CompletableFuture<>();
2624 <        g = new CompletableFuture<>();
2625 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2626 <        g.completeExceptionally(new CFException());
2627 <        checkIncomplete(h);
2628 <        f.complete(3);
2629 <        checkCompletedWithWrappedCFException(h);
2630 <
2631 <        f = new CompletableFuture<>();
2632 <        g = new CompletableFuture<>();
2633 <        f.complete(3);
2634 <        g.completeExceptionally(new CFException());
2635 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2636 <        checkCompletedWithWrappedCFException(h);
2637 <
2638 <        f = new CompletableFuture<>();
2639 <        g = new CompletableFuture<>();
2640 <        f.completeExceptionally(new CFException());
2641 <        g.complete(3);
2642 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2643 <        checkCompletedWithWrappedCFException(h);
2553 >    public void testAcceptEither_sourceCancelled() {
2554 >        for (ExecutionMode m : ExecutionMode.values())
2555 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2556 >        for (Integer v1 : new Integer[] { 1, null })
2557 >    {
2558 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2559 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2560 >        final NoopConsumer[] rs = new NoopConsumer[6];
2561 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2562  
2563 <        assertEquals(0, e.count.get());
2564 <    }
2563 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2564 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2565 >        checkIncomplete(h0);
2566 >        checkIncomplete(h1);
2567 >        rs[0].assertNotInvoked();
2568 >        rs[1].assertNotInvoked();
2569 >        f.cancel(mayInterruptIfRunning);
2570 >        checkCompletedWithWrappedCancellationException(h0);
2571 >        checkCompletedWithWrappedCancellationException(h1);
2572 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2573 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2574 >        checkCompletedWithWrappedCancellationException(h2);
2575 >        checkCompletedWithWrappedCancellationException(h3);
2576  
2577 <    /**
2649 <     * thenAcceptBothAsync result completes exceptionally if action does
2650 <     */
2651 <    public void testThenAcceptBothAsync3E() {
2652 <        CompletableFuture<Integer> f, g;
2653 <        CompletableFuture<Void> h;
2654 <        FailingBiConsumer r;
2655 <        ThreadExecutor e = new ThreadExecutor();
2656 <
2657 <        f = new CompletableFuture<>();
2658 <        g = new CompletableFuture<>();
2659 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2660 <        f.complete(3);
2661 <        checkIncomplete(h);
2662 <        g.complete(1);
2663 <        checkCompletedWithWrappedCFException(h);
2577 >        g.complete(v1);
2578  
2579 <        f = new CompletableFuture<>();
2580 <        g = new CompletableFuture<>();
2581 <        f.complete(3);
2582 <        g.complete(1);
2583 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2584 <        checkCompletedWithWrappedCFException(h);
2579 >        // unspecified behavior - both source completions available
2580 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2581 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2582 >        try {
2583 >            assertNull(h4.join());
2584 >            rs[4].assertValue(v1);
2585 >        } catch (CompletionException ok) {
2586 >            checkCompletedWithWrappedCancellationException(h4);
2587 >            rs[4].assertNotInvoked();
2588 >        }
2589 >        try {
2590 >            assertNull(h5.join());
2591 >            rs[5].assertValue(v1);
2592 >        } catch (CompletionException ok) {
2593 >            checkCompletedWithWrappedCancellationException(h5);
2594 >            rs[5].assertNotInvoked();
2595 >        }
2596  
2597 <        assertEquals(2, e.count.get());
2598 <    }
2597 >        checkCancelled(f);
2598 >        checkCompletedNormally(g, v1);
2599 >        checkCompletedWithWrappedCancellationException(h0);
2600 >        checkCompletedWithWrappedCancellationException(h1);
2601 >        checkCompletedWithWrappedCancellationException(h2);
2602 >        checkCompletedWithWrappedCancellationException(h3);
2603 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2604 >    }}
2605  
2606      /**
2607 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2607 >     * acceptEither result completes exceptionally if action does
2608       */
2609 <    public void testThenAcceptBothAsync4E() {
2610 <        CompletableFuture<Integer> f, g;
2611 <        CompletableFuture<Void> h;
2612 <        SubtractAction r;
2613 <        ThreadExecutor e = new ThreadExecutor();
2614 <
2615 <        f = new CompletableFuture<>();
2616 <        g = new CompletableFuture<>();
2617 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2687 <        assertTrue(f.cancel(true));
2688 <        checkIncomplete(h);
2689 <        g.complete(1);
2690 <        checkCompletedWithWrappedCancellationException(h);
2691 <
2692 <        f = new CompletableFuture<>();
2693 <        g = new CompletableFuture<>();
2694 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2695 <        assertTrue(g.cancel(true));
2696 <        checkIncomplete(h);
2697 <        f.complete(3);
2698 <        checkCompletedWithWrappedCancellationException(h);
2699 <
2700 <        f = new CompletableFuture<>();
2701 <        g = new CompletableFuture<>();
2702 <        f.complete(3);
2703 <        assertTrue(g.cancel(true));
2704 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2705 <        checkCompletedWithWrappedCancellationException(h);
2706 <
2707 <        f = new CompletableFuture<>();
2708 <        g = new CompletableFuture<>();
2709 <        assertTrue(f.cancel(true));
2710 <        g.complete(3);
2711 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2712 <        checkCompletedWithWrappedCancellationException(h);
2609 >    public void testAcceptEither_actionFailed() {
2610 >        for (ExecutionMode m : ExecutionMode.values())
2611 >        for (Integer v1 : new Integer[] { 1, null })
2612 >        for (Integer v2 : new Integer[] { 2, null })
2613 >    {
2614 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2615 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2616 >        final FailingConsumer[] rs = new FailingConsumer[6];
2617 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2618  
2619 <        assertEquals(0, e.count.get());
2620 <    }
2619 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2620 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2621 >        f.complete(v1);
2622 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2623 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2624 >        checkCompletedWithWrappedCFException(h0);
2625 >        checkCompletedWithWrappedCFException(h1);
2626 >        checkCompletedWithWrappedCFException(h2);
2627 >        checkCompletedWithWrappedCFException(h3);
2628 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2629  
2630 <    /**
2718 <     * runAfterBothAsync result completes normally after normal
2719 <     * completion of sources
2720 <     */
2721 <    public void testRunAfterBothAsyncE() {
2722 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2723 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2724 <        Noop r = new Noop();
2725 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2726 <        f.complete(one);
2727 <        checkIncomplete(g);
2728 <        f2.complete(two);
2729 <        checkCompletedNormally(g, null);
2730 <        assertTrue(r.ran);
2731 <    }
2630 >        g.complete(v2);
2631  
2632 <    /**
2633 <     * runAfterBothAsync result completes exceptionally after exceptional
2634 <     * completion of source
2635 <     */
2636 <    public void testRunAfterBothAsync2E() {
2637 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2638 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2639 <        Noop r = new Noop();
2640 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2641 <        f.completeExceptionally(new CFException());
2743 <        f2.complete(two);
2744 <        checkCompletedWithWrappedCFException(g);
2632 >        // unspecified behavior - both source completions available
2633 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2634 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2635 >
2636 >        checkCompletedWithWrappedCFException(h4);
2637 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2638 >                   Objects.equals(v2, rs[4].value));
2639 >        checkCompletedWithWrappedCFException(h5);
2640 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2641 >                   Objects.equals(v2, rs[5].value));
2642  
2643 <        r = new Noop();
2644 <        f = new CompletableFuture<>();
2645 <        f2 = new CompletableFuture<>();
2749 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2750 <        f.complete(one);
2751 <        f2.completeExceptionally(new CFException());
2752 <        checkCompletedWithWrappedCFException(g);
2753 <    }
2643 >        checkCompletedNormally(f, v1);
2644 >        checkCompletedNormally(g, v2);
2645 >    }}
2646  
2647      /**
2648 <     * runAfterBothAsync result completes exceptionally if action does
2648 >     * runAfterEither result completes normally after normal completion
2649 >     * of either source
2650       */
2651 <    public void testRunAfterBothAsync3E() {
2652 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2653 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2654 <        FailingNoop r = new FailingNoop();
2655 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2656 <        f.complete(one);
2657 <        checkIncomplete(g);
2658 <        f2.complete(two);
2659 <        checkCompletedWithWrappedCFException(g);
2767 <    }
2651 >    public void testRunAfterEither_normalCompletion() {
2652 >        for (ExecutionMode m : ExecutionMode.values())
2653 >        for (Integer v1 : new Integer[] { 1, null })
2654 >        for (Integer v2 : new Integer[] { 2, null })
2655 >    {
2656 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2657 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2658 >        final Noop[] rs = new Noop[6];
2659 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2660  
2661 <    /**
2662 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2663 <     */
2664 <    public void testRunAfterBothAsync4E() {
2665 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2666 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2667 <        Noop r = new Noop();
2668 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2669 <        assertTrue(f.cancel(true));
2670 <        f2.complete(two);
2671 <        checkCompletedWithWrappedCancellationException(g);
2661 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2662 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2663 >        checkIncomplete(h0);
2664 >        checkIncomplete(h1);
2665 >        rs[0].assertNotInvoked();
2666 >        rs[1].assertNotInvoked();
2667 >        f.complete(v1);
2668 >        checkCompletedNormally(h0, null);
2669 >        checkCompletedNormally(h1, null);
2670 >        rs[0].assertInvoked();
2671 >        rs[1].assertInvoked();
2672 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2673 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2674 >        checkCompletedNormally(h2, null);
2675 >        checkCompletedNormally(h3, null);
2676 >        rs[2].assertInvoked();
2677 >        rs[3].assertInvoked();
2678  
2679 <        r = new Noop();
2782 <        f = new CompletableFuture<>();
2783 <        f2 = new CompletableFuture<>();
2784 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2785 <        f.complete(one);
2786 <        assertTrue(f2.cancel(true));
2787 <        checkCompletedWithWrappedCancellationException(g);
2788 <    }
2679 >        g.complete(v2);
2680  
2681 <    /**
2682 <     * applyToEitherAsync result completes normally after normal
2792 <     * completion of sources
2793 <     */
2794 <    public void testApplyToEitherAsyncE() {
2795 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2796 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2797 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2798 <        f.complete(one);
2799 <        checkCompletedNormally(g, two);
2681 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2682 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2683  
2684 <        f = new CompletableFuture<>();
2685 <        f.complete(one);
2686 <        f2 = new CompletableFuture<>();
2687 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2688 <        checkCompletedNormally(g, two);
2689 <    }
2684 >        checkCompletedNormally(f, v1);
2685 >        checkCompletedNormally(g, v2);
2686 >        checkCompletedNormally(h0, null);
2687 >        checkCompletedNormally(h1, null);
2688 >        checkCompletedNormally(h2, null);
2689 >        checkCompletedNormally(h3, null);
2690 >        checkCompletedNormally(h4, null);
2691 >        checkCompletedNormally(h5, null);
2692 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2693 >    }}
2694  
2695      /**
2696 <     * applyToEitherAsync result completes exceptionally after exceptional
2697 <     * completion of source
2696 >     * runAfterEither result completes exceptionally after exceptional
2697 >     * completion of either source
2698       */
2699 <    public void testApplyToEitherAsync2E() {
2700 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2701 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2702 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2703 <        f.completeExceptionally(new CFException());
2704 <        checkCompletedWithWrappedCFException(g);
2699 >    public void testRunAfterEither_exceptionalCompletion() {
2700 >        for (ExecutionMode m : ExecutionMode.values())
2701 >        for (Integer v1 : new Integer[] { 1, null })
2702 >    {
2703 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2704 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2705 >        final CFException ex = new CFException();
2706 >        final Noop[] rs = new Noop[6];
2707 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2708  
2709 <        f = new CompletableFuture<>();
2710 <        f2 = new CompletableFuture<>();
2711 <        f2.completeExceptionally(new CFException());
2712 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2713 <        f.complete(one);
2714 <        checkCompletedWithWrappedCFException(g);
2715 <    }
2709 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2710 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2711 >        checkIncomplete(h0);
2712 >        checkIncomplete(h1);
2713 >        rs[0].assertNotInvoked();
2714 >        rs[1].assertNotInvoked();
2715 >        assertTrue(f.completeExceptionally(ex));
2716 >        checkCompletedWithWrappedException(h0, ex);
2717 >        checkCompletedWithWrappedException(h1, ex);
2718 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2719 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2720 >        checkCompletedWithWrappedException(h2, ex);
2721 >        checkCompletedWithWrappedException(h3, ex);
2722 >
2723 >        assertTrue(g.complete(v1));
2724 >
2725 >        // unspecified behavior - both source completions available
2726 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2727 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2728 >        try {
2729 >            assertNull(h4.join());
2730 >            rs[4].assertInvoked();
2731 >        } catch (CompletionException ok) {
2732 >            checkCompletedWithWrappedException(h4, ex);
2733 >            rs[4].assertNotInvoked();
2734 >        }
2735 >        try {
2736 >            assertNull(h5.join());
2737 >            rs[5].assertInvoked();
2738 >        } catch (CompletionException ok) {
2739 >            checkCompletedWithWrappedException(h5, ex);
2740 >            rs[5].assertNotInvoked();
2741 >        }
2742  
2743 <    /**
2744 <     * applyToEitherAsync result completes exceptionally if action does
2745 <     */
2746 <    public void testApplyToEitherAsync3E() {
2747 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2748 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2749 <        FailingFunction r = new FailingFunction();
2750 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2751 <        f.complete(one);
2752 <        checkCompletedWithWrappedCFException(g);
2753 <    }
2743 >        checkCompletedExceptionally(f, ex);
2744 >        checkCompletedNormally(g, v1);
2745 >        checkCompletedWithWrappedException(h0, ex);
2746 >        checkCompletedWithWrappedException(h1, ex);
2747 >        checkCompletedWithWrappedException(h2, ex);
2748 >        checkCompletedWithWrappedException(h3, ex);
2749 >        checkCompletedWithWrappedException(h4, ex);
2750 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2751 >    }}
2752 >
2753 >    public void testRunAfterEither_exceptionalCompletion2() {
2754 >        for (ExecutionMode m : ExecutionMode.values())
2755 >        for (boolean fFirst : new boolean[] { true, false })
2756 >        for (Integer v1 : new Integer[] { 1, null })
2757 >    {
2758 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2759 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2760 >        final CFException ex = new CFException();
2761 >        final Noop[] rs = new Noop[6];
2762 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2763  
2764 <    /**
2765 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2766 <     */
2767 <    public void testApplyToEitherAsync4E() {
2768 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2769 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2770 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2771 <        assertTrue(f.cancel(true));
2772 <        checkCompletedWithWrappedCancellationException(g);
2764 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2765 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2766 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2767 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2768 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2769 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2770 >
2771 >        // unspecified behavior - both source completions available
2772 >        try {
2773 >            assertEquals(null, h0.join());
2774 >            rs[0].assertInvoked();
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedException(h0, ex);
2777 >            rs[0].assertNotInvoked();
2778 >        }
2779 >        try {
2780 >            assertEquals(null, h1.join());
2781 >            rs[1].assertInvoked();
2782 >        } catch (CompletionException ok) {
2783 >            checkCompletedWithWrappedException(h1, ex);
2784 >            rs[1].assertNotInvoked();
2785 >        }
2786 >        try {
2787 >            assertEquals(null, h2.join());
2788 >            rs[2].assertInvoked();
2789 >        } catch (CompletionException ok) {
2790 >            checkCompletedWithWrappedException(h2, ex);
2791 >            rs[2].assertNotInvoked();
2792 >        }
2793 >        try {
2794 >            assertEquals(null, h3.join());
2795 >            rs[3].assertInvoked();
2796 >        } catch (CompletionException ok) {
2797 >            checkCompletedWithWrappedException(h3, ex);
2798 >            rs[3].assertNotInvoked();
2799 >        }
2800  
2801 <        f = new CompletableFuture<>();
2802 <        f2 = new CompletableFuture<>();
2803 <        assertTrue(f2.cancel(true));
2852 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2853 <        checkCompletedWithWrappedCancellationException(g);
2854 <    }
2801 >        checkCompletedNormally(f, v1);
2802 >        checkCompletedExceptionally(g, ex);
2803 >    }}
2804  
2805      /**
2806 <     * acceptEitherAsync result completes normally after normal
2858 <     * completion of sources
2806 >     * runAfterEither result completes exceptionally if either source cancelled
2807       */
2808 <    public void testAcceptEitherAsyncE() {
2809 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2810 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2811 <        IncAction r = new IncAction();
2812 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2813 <        f.complete(one);
2814 <        checkCompletedNormally(g, null);
2815 <        assertEquals(r.value, 2);
2816 <
2869 <        r = new IncAction();
2870 <        f = new CompletableFuture<>();
2871 <        f.complete(one);
2872 <        f2 = new CompletableFuture<>();
2873 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2874 <        checkCompletedNormally(g, null);
2875 <        assertEquals(r.value, 2);
2876 <    }
2808 >    public void testRunAfterEither_sourceCancelled() {
2809 >        for (ExecutionMode m : ExecutionMode.values())
2810 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2811 >        for (Integer v1 : new Integer[] { 1, null })
2812 >    {
2813 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2814 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2815 >        final Noop[] rs = new Noop[6];
2816 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2817  
2818 <    /**
2819 <     * acceptEitherAsync result completes exceptionally after exceptional
2820 <     * completion of source
2821 <     */
2822 <    public void testAcceptEitherAsync2E() {
2823 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2824 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2825 <        IncAction r = new IncAction();
2826 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2827 <        f.completeExceptionally(new CFException());
2828 <        checkCompletedWithWrappedCFException(g);
2818 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2819 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2820 >        checkIncomplete(h0);
2821 >        checkIncomplete(h1);
2822 >        rs[0].assertNotInvoked();
2823 >        rs[1].assertNotInvoked();
2824 >        f.cancel(mayInterruptIfRunning);
2825 >        checkCompletedWithWrappedCancellationException(h0);
2826 >        checkCompletedWithWrappedCancellationException(h1);
2827 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2828 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2829 >        checkCompletedWithWrappedCancellationException(h2);
2830 >        checkCompletedWithWrappedCancellationException(h3);
2831 >
2832 >        assertTrue(g.complete(v1));
2833 >
2834 >        // unspecified behavior - both source completions available
2835 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2836 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2837 >        try {
2838 >            assertNull(h4.join());
2839 >            rs[4].assertInvoked();
2840 >        } catch (CompletionException ok) {
2841 >            checkCompletedWithWrappedCancellationException(h4);
2842 >            rs[4].assertNotInvoked();
2843 >        }
2844 >        try {
2845 >            assertNull(h5.join());
2846 >            rs[5].assertInvoked();
2847 >        } catch (CompletionException ok) {
2848 >            checkCompletedWithWrappedCancellationException(h5);
2849 >            rs[5].assertNotInvoked();
2850 >        }
2851  
2852 <        r = new IncAction();
2853 <        f = new CompletableFuture<>();
2854 <        f2 = new CompletableFuture<>();
2855 <        f2.completeExceptionally(new CFException());
2856 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2857 <        f.complete(one);
2858 <        checkCompletedWithWrappedCFException(g);
2859 <    }
2852 >        checkCancelled(f);
2853 >        checkCompletedNormally(g, v1);
2854 >        checkCompletedWithWrappedCancellationException(h0);
2855 >        checkCompletedWithWrappedCancellationException(h1);
2856 >        checkCompletedWithWrappedCancellationException(h2);
2857 >        checkCompletedWithWrappedCancellationException(h3);
2858 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2859 >    }}
2860  
2861      /**
2862 <     * acceptEitherAsync result completes exceptionally if action does
2862 >     * runAfterEither result completes exceptionally if action does
2863       */
2864 <    public void testAcceptEitherAsync3E() {
2865 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2866 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2867 <        FailingConsumer r = new FailingConsumer();
2868 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2869 <        f.complete(one);
2870 <        checkCompletedWithWrappedCFException(g);
2871 <    }
2864 >    public void testRunAfterEither_actionFailed() {
2865 >        for (ExecutionMode m : ExecutionMode.values())
2866 >        for (Integer v1 : new Integer[] { 1, null })
2867 >        for (Integer v2 : new Integer[] { 2, null })
2868 >    {
2869 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2870 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2871 >        final FailingRunnable[] rs = new FailingRunnable[6];
2872 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2873  
2874 <    /**
2875 <     * acceptEitherAsync result completes exceptionally if either
2876 <     * source cancelled
2877 <     */
2878 <    public void testAcceptEitherAsync4E() {
2879 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2880 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2881 <        IncAction r = new IncAction();
2882 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2883 <        assertTrue(f.cancel(true));
2884 <        checkCompletedWithWrappedCancellationException(g);
2874 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2875 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2876 >        assertTrue(f.complete(v1));
2877 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2878 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2879 >        checkCompletedWithWrappedCFException(h0);
2880 >        checkCompletedWithWrappedCFException(h1);
2881 >        checkCompletedWithWrappedCFException(h2);
2882 >        checkCompletedWithWrappedCFException(h3);
2883 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2884 >        assertTrue(g.complete(v2));
2885 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2886 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2887 >        checkCompletedWithWrappedCFException(h4);
2888 >        checkCompletedWithWrappedCFException(h5);
2889  
2890 <        r = new IncAction();
2891 <        f = new CompletableFuture<>();
2892 <        f2 = new CompletableFuture<>();
2893 <        assertTrue(f2.cancel(true));
2927 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2928 <        checkCompletedWithWrappedCancellationException(g);
2929 <    }
2890 >        checkCompletedNormally(f, v1);
2891 >        checkCompletedNormally(g, v2);
2892 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2893 >    }}
2894  
2895      /**
2896 <     * runAfterEitherAsync result completes normally after normal
2933 <     * completion of sources
2896 >     * thenCompose result completes normally after normal completion of source
2897       */
2898 <    public void testRunAfterEitherAsyncE() {
2899 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2900 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2901 <        Noop r = new Noop();
2902 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2903 <        f.complete(one);
2904 <        checkCompletedNormally(g, null);
2905 <        assertTrue(r.ran);
2898 >    public void testThenCompose_normalCompletion() {
2899 >        for (ExecutionMode m : ExecutionMode.values())
2900 >        for (boolean createIncomplete : new boolean[] { true, false })
2901 >        for (Integer v1 : new Integer[] { 1, null })
2902 >    {
2903 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2904 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2905 >        if (!createIncomplete) assertTrue(f.complete(v1));
2906 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2907 >        if (createIncomplete) assertTrue(f.complete(v1));
2908  
2909 <        r = new Noop();
2910 <        f = new CompletableFuture<>();
2911 <        f.complete(one);
2912 <        f2 = new CompletableFuture<>();
2948 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2949 <        checkCompletedNormally(g, null);
2950 <        assertTrue(r.ran);
2951 <    }
2909 >        checkCompletedNormally(g, inc(v1));
2910 >        checkCompletedNormally(f, v1);
2911 >        r.assertValue(v1);
2912 >    }}
2913  
2914      /**
2915 <     * runAfterEitherAsync result completes exceptionally after exceptional
2915 >     * thenCompose result completes exceptionally after exceptional
2916       * completion of source
2917       */
2918 <    public void testRunAfterEitherAsync2E() {
2919 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2920 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2921 <        Noop r = new Noop();
2922 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2923 <        f.completeExceptionally(new CFException());
2924 <        checkCompletedWithWrappedCFException(g);
2925 <
2926 <        r = new Noop();
2927 <        f = new CompletableFuture<>();
2928 <        f2 = new CompletableFuture<>();
2929 <        f2.completeExceptionally(new CFException());
2930 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2931 <        f.complete(one);
2932 <        checkCompletedWithWrappedCFException(g);
2972 <    }
2973 <
2974 <    /**
2975 <     * runAfterEitherAsync result completes exceptionally if action does
2976 <     */
2977 <    public void testRunAfterEitherAsync3E() {
2978 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2979 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2980 <        FailingNoop r = new FailingNoop();
2981 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2982 <        f.complete(one);
2983 <        checkCompletedWithWrappedCFException(g);
2984 <    }
2985 <
2986 <    /**
2987 <     * runAfterEitherAsync result completes exceptionally if either
2988 <     * source cancelled
2989 <     */
2990 <    public void testRunAfterEitherAsync4E() {
2991 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2992 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2993 <        Noop r = new Noop();
2994 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2995 <        assertTrue(f.cancel(true));
2996 <        checkCompletedWithWrappedCancellationException(g);
2997 <
2998 <        r = new Noop();
2999 <        f = new CompletableFuture<>();
3000 <        f2 = new CompletableFuture<>();
3001 <        assertTrue(f2.cancel(true));
3002 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3003 <        checkCompletedWithWrappedCancellationException(g);
3004 <    }
2918 >    public void testThenCompose_exceptionalCompletion() {
2919 >        for (ExecutionMode m : ExecutionMode.values())
2920 >        for (boolean createIncomplete : new boolean[] { true, false })
2921 >    {
2922 >        final CFException ex = new CFException();
2923 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2924 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2925 >        if (!createIncomplete) f.completeExceptionally(ex);
2926 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2927 >        if (createIncomplete) f.completeExceptionally(ex);
2928 >
2929 >        checkCompletedWithWrappedException(g, ex);
2930 >        checkCompletedExceptionally(f, ex);
2931 >        r.assertNotInvoked();
2932 >    }}
2933  
2934      /**
2935 <     * thenComposeAsync result completes normally after normal
3008 <     * completion of source
2935 >     * thenCompose result completes exceptionally if action does
2936       */
2937 <    public void testThenComposeAsyncE() {
2938 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2939 <        CompletableFutureInc r = new CompletableFutureInc();
2940 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2941 <        f.complete(one);
2942 <        checkCompletedNormally(g, two);
2943 <    }
2937 >    public void testThenCompose_actionFailed() {
2938 >        for (ExecutionMode m : ExecutionMode.values())
2939 >        for (boolean createIncomplete : new boolean[] { true, false })
2940 >        for (Integer v1 : new Integer[] { 1, null })
2941 >    {
2942 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2943 >        final FailingCompletableFutureFunction r
2944 >            = new FailingCompletableFutureFunction(m);
2945 >        if (!createIncomplete) assertTrue(f.complete(v1));
2946 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2947 >        if (createIncomplete) assertTrue(f.complete(v1));
2948  
3018    /**
3019     * thenComposeAsync result completes exceptionally after
3020     * exceptional completion of source
3021     */
3022    public void testThenComposeAsync2E() {
3023        CompletableFuture<Integer> f = new CompletableFuture<>();
3024        CompletableFutureInc r = new CompletableFutureInc();
3025        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3026        f.completeExceptionally(new CFException());
2949          checkCompletedWithWrappedCFException(g);
2950 <    }
2950 >        checkCompletedNormally(f, v1);
2951 >    }}
2952  
2953      /**
2954 <     * thenComposeAsync result completes exceptionally if action does
2954 >     * thenCompose result completes exceptionally if source cancelled
2955       */
2956 <    public void testThenComposeAsync3E() {
2957 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2958 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2959 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2960 <        f.complete(one);
2961 <        checkCompletedWithWrappedCFException(g);
2962 <    }
2956 >    public void testThenCompose_sourceCancelled() {
2957 >        for (ExecutionMode m : ExecutionMode.values())
2958 >        for (boolean createIncomplete : new boolean[] { true, false })
2959 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2960 >    {
2961 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2962 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2963 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2964 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2965 >        if (createIncomplete) {
2966 >            checkIncomplete(g);
2967 >            assertTrue(f.cancel(mayInterruptIfRunning));
2968 >        }
2969  
3041    /**
3042     * thenComposeAsync result completes exceptionally if source cancelled
3043     */
3044    public void testThenComposeAsync4E() {
3045        CompletableFuture<Integer> f = new CompletableFuture<>();
3046        CompletableFutureInc r = new CompletableFutureInc();
3047        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3048        assertTrue(f.cancel(true));
2970          checkCompletedWithWrappedCancellationException(g);
2971 <    }
2971 >        checkCancelled(f);
2972 >    }}
2973  
2974      // other static methods
2975  
# Line 3065 | Line 2987 | public class CompletableFutureTest exten
2987       * when all components complete normally
2988       */
2989      public void testAllOf_normal() throws Exception {
2990 <        for (int k = 1; k < 20; ++k) {
2991 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2992 <            for (int i = 0; i < k; ++i)
2990 >        for (int k = 1; k < 10; k++) {
2991 >            CompletableFuture<Integer>[] fs
2992 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2993 >            for (int i = 0; i < k; i++)
2994 >                fs[i] = new CompletableFuture<>();
2995 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2996 >            for (int i = 0; i < k; i++) {
2997 >                checkIncomplete(f);
2998 >                checkIncomplete(CompletableFuture.allOf(fs));
2999 >                fs[i].complete(one);
3000 >            }
3001 >            checkCompletedNormally(f, null);
3002 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3003 >        }
3004 >    }
3005 >
3006 >    public void testAllOf_backwards() throws Exception {
3007 >        for (int k = 1; k < 10; k++) {
3008 >            CompletableFuture<Integer>[] fs
3009 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3010 >            for (int i = 0; i < k; i++)
3011                  fs[i] = new CompletableFuture<>();
3012              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3013 <            for (int i = 0; i < k; ++i) {
3013 >            for (int i = k - 1; i >= 0; i--) {
3014                  checkIncomplete(f);
3015                  checkIncomplete(CompletableFuture.allOf(fs));
3016                  fs[i].complete(one);
# Line 3080 | Line 3020 | public class CompletableFutureTest exten
3020          }
3021      }
3022  
3023 +    public void testAllOf_exceptional() throws Exception {
3024 +        for (int k = 1; k < 10; k++) {
3025 +            CompletableFuture<Integer>[] fs
3026 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3027 +            CFException ex = new CFException();
3028 +            for (int i = 0; i < k; i++)
3029 +                fs[i] = new CompletableFuture<>();
3030 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3031 +            for (int i = 0; i < k; i++) {
3032 +                checkIncomplete(f);
3033 +                checkIncomplete(CompletableFuture.allOf(fs));
3034 +                if (i != k/2) {
3035 +                    fs[i].complete(i);
3036 +                    checkCompletedNormally(fs[i], i);
3037 +                } else {
3038 +                    fs[i].completeExceptionally(ex);
3039 +                    checkCompletedExceptionally(fs[i], ex);
3040 +                }
3041 +            }
3042 +            checkCompletedWithWrappedException(f, ex);
3043 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3044 +        }
3045 +    }
3046 +
3047      /**
3048       * anyOf(no component futures) returns an incomplete future
3049       */
3050      public void testAnyOf_empty() throws Exception {
3051 +        for (Integer v1 : new Integer[] { 1, null })
3052 +    {
3053          CompletableFuture<Object> f = CompletableFuture.anyOf();
3054          checkIncomplete(f);
3055 <    }
3055 >
3056 >        f.complete(v1);
3057 >        checkCompletedNormally(f, v1);
3058 >    }}
3059  
3060      /**
3061       * anyOf returns a future completed normally with a value when
3062       * a component future does
3063       */
3064      public void testAnyOf_normal() throws Exception {
3065 <        for (int k = 0; k < 10; ++k) {
3065 >        for (int k = 0; k < 10; k++) {
3066              CompletableFuture[] fs = new CompletableFuture[k];
3067 <            for (int i = 0; i < k; ++i)
3067 >            for (int i = 0; i < k; i++)
3068                  fs[i] = new CompletableFuture<>();
3069              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3070              checkIncomplete(f);
3071 <            for (int i = 0; i < k; ++i) {
3072 <                fs[i].complete(one);
3073 <                checkCompletedNormally(f, one);
3074 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3071 >            for (int i = 0; i < k; i++) {
3072 >                fs[i].complete(i);
3073 >                checkCompletedNormally(f, 0);
3074 >                int x = (int) CompletableFuture.anyOf(fs).join();
3075 >                assertTrue(0 <= x && x <= i);
3076 >            }
3077 >        }
3078 >    }
3079 >    public void testAnyOf_normal_backwards() throws Exception {
3080 >        for (int k = 0; k < 10; k++) {
3081 >            CompletableFuture[] fs = new CompletableFuture[k];
3082 >            for (int i = 0; i < k; i++)
3083 >                fs[i] = new CompletableFuture<>();
3084 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3085 >            checkIncomplete(f);
3086 >            for (int i = k - 1; i >= 0; i--) {
3087 >                fs[i].complete(i);
3088 >                checkCompletedNormally(f, k - 1);
3089 >                int x = (int) CompletableFuture.anyOf(fs).join();
3090 >                assertTrue(i <= x && x <= k - 1);
3091              }
3092          }
3093      }
# Line 3111 | Line 3096 | public class CompletableFutureTest exten
3096       * anyOf result completes exceptionally when any component does.
3097       */
3098      public void testAnyOf_exceptional() throws Exception {
3099 <        for (int k = 0; k < 10; ++k) {
3099 >        for (int k = 0; k < 10; k++) {
3100 >            CompletableFuture[] fs = new CompletableFuture[k];
3101 >            CFException[] exs = new CFException[k];
3102 >            for (int i = 0; i < k; i++) {
3103 >                fs[i] = new CompletableFuture<>();
3104 >                exs[i] = new CFException();
3105 >            }
3106 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3107 >            checkIncomplete(f);
3108 >            for (int i = 0; i < k; i++) {
3109 >                fs[i].completeExceptionally(exs[i]);
3110 >                checkCompletedWithWrappedException(f, exs[0]);
3111 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3112 >            }
3113 >        }
3114 >    }
3115 >
3116 >    public void testAnyOf_exceptional_backwards() throws Exception {
3117 >        for (int k = 0; k < 10; k++) {
3118              CompletableFuture[] fs = new CompletableFuture[k];
3119 <            for (int i = 0; i < k; ++i)
3119 >            CFException[] exs = new CFException[k];
3120 >            for (int i = 0; i < k; i++) {
3121                  fs[i] = new CompletableFuture<>();
3122 +                exs[i] = new CFException();
3123 +            }
3124              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3125              checkIncomplete(f);
3126 <            for (int i = 0; i < k; ++i) {
3127 <                fs[i].completeExceptionally(new CFException());
3128 <                checkCompletedWithWrappedCFException(f);
3126 >            for (int i = k - 1; i >= 0; i--) {
3127 >                fs[i].completeExceptionally(exs[i]);
3128 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3129                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3130              }
3131          }
# Line 3138 | Line 3144 | public class CompletableFutureTest exten
3144          Runnable[] throwingActions = {
3145              () -> CompletableFuture.supplyAsync(null),
3146              () -> CompletableFuture.supplyAsync(null, exec),
3147 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3147 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3148  
3149              () -> CompletableFuture.runAsync(null),
3150              () -> CompletableFuture.runAsync(null, exec),
# Line 3211 | Line 3217 | public class CompletableFutureTest exten
3217  
3218              () -> f.thenCompose(null),
3219              () -> f.thenComposeAsync(null),
3220 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3220 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3221              () -> f.thenComposeAsync(null, exec),
3222  
3223              () -> f.exceptionally(null),
# Line 3243 | Line 3249 | public class CompletableFutureTest exten
3249          assertSame(f, f.toCompletableFuture());
3250      }
3251  
3252 <    /**
3247 <     * whenComplete action executes on normal completion, propagating
3248 <     * source result.
3249 <     */
3250 <    public void testWhenComplete1() {
3251 <        final AtomicInteger a = new AtomicInteger();
3252 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3253 <        CompletableFuture<Integer> g =
3254 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3255 <        f.complete(three);
3256 <        checkCompletedNormally(f, three);
3257 <        checkCompletedNormally(g, three);
3258 <        assertEquals(a.get(), 1);
3259 <    }
3260 <
3261 <    /**
3262 <     * whenComplete action executes on exceptional completion, propagating
3263 <     * source result.
3264 <     */
3265 <    public void testWhenComplete2() {
3266 <        final AtomicInteger a = new AtomicInteger();
3267 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3268 <        CompletableFuture<Integer> g =
3269 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3270 <        f.completeExceptionally(new CFException());
3271 <        assertTrue(f.isCompletedExceptionally());
3272 <        assertTrue(g.isCompletedExceptionally());
3273 <        assertEquals(a.get(), 1);
3274 <    }
3275 <
3276 <    /**
3277 <     * If a whenComplete action throws an exception when triggered by
3278 <     * a normal completion, it completes exceptionally
3279 <     */
3280 <    public void testWhenComplete3() {
3281 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3282 <        CompletableFuture<Integer> g =
3283 <            f.whenComplete((Integer x, Throwable t) ->
3284 <                           { throw new CFException(); } );
3285 <        f.complete(three);
3286 <        checkCompletedNormally(f, three);
3287 <        assertTrue(g.isCompletedExceptionally());
3288 <        checkCompletedWithWrappedCFException(g);
3289 <    }
3290 <
3291 <    /**
3292 <     * whenCompleteAsync action executes on normal completion, propagating
3293 <     * source result.
3294 <     */
3295 <    public void testWhenCompleteAsync1() {
3296 <        final AtomicInteger a = new AtomicInteger();
3297 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3298 <        CompletableFuture<Integer> g =
3299 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3300 <        f.complete(three);
3301 <        checkCompletedNormally(f, three);
3302 <        checkCompletedNormally(g, three);
3303 <        assertEquals(a.get(), 1);
3304 <    }
3305 <
3306 <    /**
3307 <     * whenCompleteAsync action executes on exceptional completion, propagating
3308 <     * source result.
3309 <     */
3310 <    public void testWhenCompleteAsync2() {
3311 <        final AtomicInteger a = new AtomicInteger();
3312 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3313 <        CompletableFuture<Integer> g =
3314 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3315 <        f.completeExceptionally(new CFException());
3316 <        checkCompletedWithWrappedCFException(f);
3317 <        checkCompletedWithWrappedCFException(g);
3318 <    }
3319 <
3320 <    /**
3321 <     * If a whenCompleteAsync action throws an exception when
3322 <     * triggered by a normal completion, it completes exceptionally
3323 <     */
3324 <    public void testWhenCompleteAsync3() {
3325 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3326 <        CompletableFuture<Integer> g =
3327 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3328 <                           { throw new CFException(); } );
3329 <        f.complete(three);
3330 <        checkCompletedNormally(f, three);
3331 <        checkCompletedWithWrappedCFException(g);
3332 <    }
3252 >    //--- tests of implementation details; not part of official tck ---
3253  
3254 <    /**
3255 <     * whenCompleteAsync action executes on normal completion, propagating
3256 <     * source result.
3257 <     */
3258 <    public void testWhenCompleteAsync1e() {
3259 <        final AtomicInteger a = new AtomicInteger();
3260 <        ThreadExecutor exec = new ThreadExecutor();
3341 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3342 <        CompletableFuture<Integer> g =
3343 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3344 <                                exec);
3345 <        f.complete(three);
3346 <        checkCompletedNormally(f, three);
3347 <        checkCompletedNormally(g, three);
3348 <        assertEquals(a.get(), 1);
3254 >    Object resultOf(CompletableFuture<?> f) {
3255 >        try {
3256 >            java.lang.reflect.Field resultField
3257 >                = CompletableFuture.class.getDeclaredField("result");
3258 >            resultField.setAccessible(true);
3259 >            return resultField.get(f);
3260 >        } catch (Throwable t) { throw new AssertionError(t); }
3261      }
3262  
3263 <    /**
3264 <     * whenCompleteAsync action executes on exceptional completion, propagating
3265 <     * source result.
3266 <     */
3267 <    public void testWhenCompleteAsync2e() {
3268 <        final AtomicInteger a = new AtomicInteger();
3269 <        ThreadExecutor exec = new ThreadExecutor();
3358 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3359 <        CompletableFuture<Integer> g =
3360 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3361 <                                exec);
3362 <        f.completeExceptionally(new CFException());
3363 <        checkCompletedWithWrappedCFException(f);
3364 <        checkCompletedWithWrappedCFException(g);
3365 <    }
3263 >    public void testExceptionPropagationReusesResultObject() {
3264 >        if (!testImplementationDetails) return;
3265 >        for (ExecutionMode m : ExecutionMode.values())
3266 >    {
3267 >        final CFException ex = new CFException();
3268 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3269 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3270  
3271 <    /**
3272 <     * If a whenCompleteAsync action throws an exception when triggered
3369 <     * by a normal completion, it completes exceptionally
3370 <     */
3371 <    public void testWhenCompleteAsync3e() {
3372 <        ThreadExecutor exec = new ThreadExecutor();
3373 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3374 <        CompletableFuture<Integer> g =
3375 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3376 <                                { throw new CFException(); },
3377 <                                exec);
3378 <        f.complete(three);
3379 <        checkCompletedNormally(f, three);
3380 <        checkCompletedWithWrappedCFException(g);
3381 <    }
3271 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3272 >            = new ArrayList<>();
3273  
3274 <    /**
3275 <     * handleAsync action completes normally with function value on
3276 <     * either normal or exceptional completion of source
3386 <     */
3387 <    public void testHandleAsync() {
3388 <        CompletableFuture<Integer> f, g;
3389 <        IntegerHandler r;
3274 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3275 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3276 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3277  
3278 <        f = new CompletableFuture<>();
3279 <        g = f.handleAsync(r = new IntegerHandler());
3280 <        assertFalse(r.ran);
3394 <        f.completeExceptionally(new CFException());
3395 <        checkCompletedWithWrappedCFException(f);
3396 <        checkCompletedNormally(g, three);
3397 <        assertTrue(r.ran);
3278 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3279 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3280 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3281  
3282 <        f = new CompletableFuture<>();
3283 <        g = f.handleAsync(r = new IntegerHandler());
3284 <        assertFalse(r.ran);
3402 <        f.completeExceptionally(new CFException());
3403 <        checkCompletedWithWrappedCFException(f);
3404 <        checkCompletedNormally(g, three);
3405 <        assertTrue(r.ran);
3282 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3283 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3284 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3285  
3286 <        f = new CompletableFuture<>();
3408 <        g = f.handleAsync(r = new IntegerHandler());
3409 <        assertFalse(r.ran);
3410 <        f.complete(one);
3411 <        checkCompletedNormally(f, one);
3412 <        checkCompletedNormally(g, two);
3413 <        assertTrue(r.ran);
3286 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3287  
3288 <        f = new CompletableFuture<>();
3416 <        g = f.handleAsync(r = new IntegerHandler());
3417 <        assertFalse(r.ran);
3418 <        f.complete(one);
3419 <        checkCompletedNormally(f, one);
3420 <        checkCompletedNormally(g, two);
3421 <        assertTrue(r.ran);
3422 <    }
3288 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3289  
3290 <    /**
3291 <     * handleAsync action with Executor completes normally with
3426 <     * function value on either normal or exceptional completion of
3427 <     * source
3428 <     */
3429 <    public void testHandleAsync2() {
3430 <        CompletableFuture<Integer> f, g;
3431 <        ThreadExecutor exec = new ThreadExecutor();
3432 <        IntegerHandler r;
3290 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3291 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3292  
3293 <        f = new CompletableFuture<>();
3294 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3295 <        assertFalse(r.ran);
3296 <        f.completeExceptionally(new CFException());
3297 <        checkCompletedWithWrappedCFException(f);
3298 <        checkCompletedNormally(g, three);
3299 <        assertTrue(r.ran);
3293 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3294 >                 fun : funs) {
3295 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3296 >            f.completeExceptionally(ex);
3297 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3298 >            checkCompletedWithWrappedException(src, ex);
3299 >            CompletableFuture<?> dep = fun.apply(src);
3300 >            checkCompletedWithWrappedException(dep, ex);
3301 >            assertSame(resultOf(src), resultOf(dep));
3302 >        }
3303  
3304 <        f = new CompletableFuture<>();
3305 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3306 <        assertFalse(r.ran);
3307 <        f.completeExceptionally(new CFException());
3308 <        checkCompletedWithWrappedCFException(f);
3309 <        checkCompletedNormally(g, three);
3310 <        assertTrue(r.ran);
3304 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3305 >                 fun : funs) {
3306 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3307 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3308 >            CompletableFuture<?> dep = fun.apply(src);
3309 >            f.completeExceptionally(ex);
3310 >            checkCompletedWithWrappedException(src, ex);
3311 >            checkCompletedWithWrappedException(dep, ex);
3312 >            assertSame(resultOf(src), resultOf(dep));
3313 >        }
3314  
3315 <        f = new CompletableFuture<>();
3316 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3317 <        assertFalse(r.ran);
3318 <        f.complete(one);
3319 <        checkCompletedNormally(f, one);
3320 <        checkCompletedNormally(g, two);
3321 <        assertTrue(r.ran);
3315 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3316 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3317 >                 fun : funs) {
3318 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3319 >            f.cancel(mayInterruptIfRunning);
3320 >            checkCancelled(f);
3321 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3322 >            checkCompletedWithWrappedCancellationException(src);
3323 >            CompletableFuture<?> dep = fun.apply(src);
3324 >            checkCompletedWithWrappedCancellationException(dep);
3325 >            assertSame(resultOf(src), resultOf(dep));
3326 >        }
3327  
3328 <        f = new CompletableFuture<>();
3329 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3330 <        assertFalse(r.ran);
3331 <        f.complete(one);
3332 <        checkCompletedNormally(f, one);
3333 <        checkCompletedNormally(g, two);
3334 <        assertTrue(r.ran);
3335 <    }
3328 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3329 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3330 >                 fun : funs) {
3331 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3332 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3333 >            CompletableFuture<?> dep = fun.apply(src);
3334 >            f.cancel(mayInterruptIfRunning);
3335 >            checkCancelled(f);
3336 >            checkCompletedWithWrappedCancellationException(src);
3337 >            checkCompletedWithWrappedCancellationException(dep);
3338 >            assertSame(resultOf(src), resultOf(dep));
3339 >        }
3340 >    }}
3341  
3342   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines