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.34 by jsr166, Sun Jun 1 21:17:05 2014 UTC vs.
Revision 1.91 by jsr166, Tue Jun 17 20:34:18 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; }
339 <    }
340 <
341 <    static final class FailingSupplier implements Supplier<Integer> {
342 <        boolean ran;
343 <        public Integer get() { ran = true; throw new CFException(); }
344 <    }
345 <    static final class FailingConsumer implements Consumer<Integer> {
346 <        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(); }
384 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
385 >        void assertInvoked() { assertEquals(1, invocationCount); }
386      }
387  
388 <    static final class CompletableFutureInc
389 <        implements Function<Integer, CompletableFuture<Integer>> {
390 <        boolean ran;
391 <        public CompletableFuture<Integer> apply(Integer x) {
392 <            ran = true;
393 <            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);
586 <    }
587 <
588 <    /**
589 <     * thenRun result completes exceptionally if source cancelled
590 <     */
591 <    public void testThenRun4() {
592 <        CompletableFuture<Integer> f;
593 <        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);
605 <    }
606 <
607 <    /**
608 <     * thenApply result completes normally after normal completion of source
609 <     */
610 <    public void testThenApply() {
611 <        CompletableFuture<Integer> f = new CompletableFuture<>();
612 <        CompletableFuture<Integer> g = f.thenApply(inc);
613 <        f.complete(one);
614 <        checkCompletedNormally(g, two);
615 <    }
616 <
617 <    /**
618 <     * thenApply result completes exceptionally after exceptional
619 <     * completion of source
620 <     */
621 <    public void testThenApply2() {
622 <        CompletableFuture<Integer> f = new CompletableFuture<>();
623 <        CompletableFuture<Integer> g = f.thenApply(inc);
624 <        f.completeExceptionally(new CFException());
625 <        checkCompletedWithWrappedCFException(g);
626 <    }
627 <
628 <    /**
629 <     * thenApply result completes exceptionally if action does
630 <     */
631 <    public void testThenApply3() {
632 <        CompletableFuture<Integer> f = new CompletableFuture<>();
633 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
634 <        f.complete(one);
635 <        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 <     * thenApply result completes exceptionally if source cancelled
438 <     */
439 <    public void testThenApply4() {
440 <        CompletableFuture<Integer> f = new CompletableFuture<>();
441 <        CompletableFuture<Integer> g = f.thenApply(inc);
644 <        assertTrue(f.cancel(true));
645 <        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 <     * thenAccept result completes normally after normal completion of source
446 <     */
447 <    public void testThenAccept() {
448 <        CompletableFuture<Integer> f = new CompletableFuture<>();
449 <        IncAction r = new IncAction();
450 <        CompletableFuture<Void> g = f.thenAccept(r);
451 <        f.complete(one);
656 <        checkCompletedNormally(g, null);
657 <        assertEquals(r.value, 2);
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 <     * thenAccept result completes exceptionally after exceptional
456 <     * completion of source
457 <     */
458 <    public void testThenAccept2() {
459 <        CompletableFuture<Integer> f = new CompletableFuture<>();
460 <        IncAction r = new IncAction();
461 <        CompletableFuture<Void> g = f.thenAccept(r);
668 <        f.completeExceptionally(new CFException());
669 <        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 <     * thenAccept result completes exceptionally if action does
466 <     */
467 <    public void testThenAccept3() {
468 <        CompletableFuture<Integer> f = new CompletableFuture<>();
677 <        FailingConsumer r = new FailingConsumer();
678 <        CompletableFuture<Void> g = f.thenAccept(r);
679 <        f.complete(one);
680 <        checkCompletedWithWrappedCFException(g);
681 <        assertTrue(r.ran);
464 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466 >        public void run() {
467 >            invoked();
468 >        }
469      }
470  
471 <    /**
472 <     * thenAccept result completes exceptionally if source cancelled
473 <     */
474 <    public void testThenAccept4() {
475 <        CompletableFuture<Integer> f = new CompletableFuture<>();
476 <        IncAction r = new IncAction();
477 <        CompletableFuture<Void> g = f.thenAccept(r);
478 <        assertTrue(f.cancel(true));
692 <        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 <     * thenCombine result completes normally after normal completion
483 <     * of sources
484 <     */
485 <    public void testThenCombine() {
486 <        CompletableFuture<Integer> f, g, h;
487 <
488 <        f = new CompletableFuture<>();
489 <        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);
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 <     * thenCombine result completes exceptionally after exceptional
494 <     * completion of either source
495 <     */
496 <    public void testThenCombine2() {
497 <        CompletableFuture<Integer> f, g, h;
498 <
499 <        f = new CompletableFuture<>();
500 <        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);
755 <
756 <        f = new CompletableFuture<>();
757 <        g = new CompletableFuture<>();
758 <        f.completeExceptionally(new CFException());
759 <        g.complete(3);
760 <        h = f.thenCombine(g, subtract);
761 <        checkCompletedWithWrappedCFException(h);
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 <     * thenCombine result completes exceptionally if action does
505 <     */
506 <    public void testThenCombine3() {
507 <        CompletableFuture<Integer> f = new CompletableFuture<>();
508 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
509 <        FailingBiFunction r = new FailingBiFunction();
510 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
511 <        f.complete(one);
773 <        checkIncomplete(g);
774 <        assertFalse(r.ran);
775 <        f2.complete(two);
776 <        checkCompletedWithWrappedCFException(g);
777 <        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 <     * thenCombine result completes exceptionally if either source cancelled
516 <     */
517 <    public void testThenCombine4() {
518 <        CompletableFuture<Integer> f, g, h;
519 <
520 <        f = new CompletableFuture<>();
521 <        g = new CompletableFuture<>();
522 <        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);
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 <     * thenAcceptBoth result completes normally after normal
527 <     * completion of sources
528 <     */
529 <    public void testThenAcceptBoth() {
530 <        CompletableFuture<Integer> f, g;
816 <        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);
836 <
837 <        f = new CompletableFuture<>();
838 <        g = new CompletableFuture<>();
839 <        g.complete(1);
840 <        f.complete(3);
841 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
842 <        checkCompletedNormally(h, null);
843 <        assertEquals(r.value, 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  
846    /**
847     * thenAcceptBoth result completes exceptionally after exceptional
848     * completion of either source
849     */
850    public void testThenAcceptBoth2() {
851        CompletableFuture<Integer> f, g;
852        CompletableFuture<Void> h;
853        SubtractAction r;
854
855        f = new CompletableFuture<>();
856        g = new CompletableFuture<>();
857        h = f.thenAcceptBoth(g, r = new SubtractAction());
858        f.completeExceptionally(new CFException());
859        checkIncomplete(h);
860        g.complete(1);
861        checkCompletedWithWrappedCFException(h);
533  
534 <        f = new CompletableFuture<>();
535 <        g = new CompletableFuture<>();
536 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
537 <        g.completeExceptionally(new CFException());
538 <        checkIncomplete(h);
539 <        f.complete(3);
540 <        checkCompletedWithWrappedCFException(h);
541 <
542 <        f = new CompletableFuture<>();
543 <        g = new CompletableFuture<>();
544 <        f.complete(3);
874 <        g.completeExceptionally(new CFException());
875 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
876 <        checkCompletedWithWrappedCFException(h);
877 <
878 <        f = new CompletableFuture<>();
879 <        g = new CompletableFuture<>();
880 <        f.completeExceptionally(new CFException());
881 <        g.complete(3);
882 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
883 <        checkCompletedWithWrappedCFException(h);
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 <     * thenAcceptBoth result completes exceptionally if action does
549 <     */
550 <    public void testThenAcceptBoth3() {
551 <        CompletableFuture<Integer> f, g;
552 <        CompletableFuture<Void> h;
553 <        FailingBiConsumer r;
554 <
555 <        f = new CompletableFuture<>();
895 <        g = new CompletableFuture<>();
896 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
897 <        f.complete(3);
898 <        checkIncomplete(h);
899 <        g.complete(1);
900 <        checkCompletedWithWrappedCFException(h);
901 <
902 <        f = new CompletableFuture<>();
903 <        g = new CompletableFuture<>();
904 <        f.complete(3);
905 <        g.complete(1);
906 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
907 <        checkCompletedWithWrappedCFException(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 exceptionally if either source cancelled
560 <     */
561 <    public void testThenAcceptBoth4() {
562 <        CompletableFuture<Integer> f, g;
563 <        CompletableFuture<Void> h;
564 <        SubtractAction r;
917 <
918 <        f = new CompletableFuture<>();
919 <        g = new CompletableFuture<>();
920 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
921 <        assertTrue(f.cancel(true));
922 <        checkIncomplete(h);
923 <        g.complete(1);
924 <        checkCompletedWithWrappedCancellationException(h);
925 <
926 <        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);
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 <        assertTrue(f.cancel(true));
569 <        g.complete(3);
945 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
946 <        checkCompletedWithWrappedCancellationException(h);
566 >        public void execute(Runnable r) {
567 >            count.getAndIncrement();
568 >            new Thread(tg, r).start();
569 >        }
570      }
571  
572      /**
573       * Permits the testing of parallel code for the 3 different
574 <     * execution modes without repeating all the testing code.
574 >     * execution modes without copy/pasting all the test methods.
575       */
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 r) {
617 <                return f.runAfterBoth(g, r);
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 <        DEFAULT_ASYNC {
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 r) {
691 <                return f.runAfterBothAsync(g, r);
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          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 r) {
764 <                return f.runAfterBothAsync(g, r, new ThreadExecutor());
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 +        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 r);
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 <     * runAfterBoth result completes normally after normal
842 <     * completion of sources
841 >     * exceptionally action is not invoked when source completes
842 >     * normally, and source result is propagated
843       */
844 <    public void testRunAfterBoth_normalCompletion1() {
845 <        for (ExecutionMode m : ExecutionMode.values())
844 >    public void testExceptionally_normalCompletion() {
845 >        for (boolean createIncomplete : new boolean[] { true, false })
846          for (Integer v1 : new Integer[] { 1, null })
847 <        for (Integer v2 : new Integer[] { 2, null }) {
848 <
847 >    {
848 >        final AtomicInteger a = new AtomicInteger(0);
849          final CompletableFuture<Integer> f = new CompletableFuture<>();
850 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
851 <        final Noop r = new Noop();
852 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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.complete(v1);
994 <        checkIncomplete(h);
995 <        assertFalse(r.ran);
996 <        g.complete(v2);
997 <
998 <        checkCompletedNormally(h, null);
999 <        assertTrue(r.ran);
859 >        checkCompletedNormally(g, v1);
860          checkCompletedNormally(f, v1);
861 <        checkCompletedNormally(g, v2);
862 <        }
1003 <    }
861 >        assertEquals(0, a.get());
862 >    }}
863  
864 <    public void testRunAfterBoth_normalCompletion2() {
865 <        for (ExecutionMode m : ExecutionMode.values())
864 >    /**
865 >     * exceptionally action completes with function value on source
866 >     * exception
867 >     */
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 = m.runAfterBoth(f, g, r);
878 <
879 <        g.complete(v2);
880 <        checkIncomplete(h);
881 <        assertFalse(r.ran);
882 <        f.complete(v1);
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 <        checkCompletedNormally(h, null);
886 <        assertTrue(r.ran);
887 <        checkCompletedNormally(f, v1);
1023 <        checkCompletedNormally(g, v2);
1024 <        }
1025 <    }
885 >        checkCompletedNormally(g, v1);
886 >        assertEquals(1, a.get());
887 >    }}
888  
889 <    public void testRunAfterBoth_normalCompletion3() {
890 <        for (ExecutionMode m : ExecutionMode.values())
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 <
900 <        g.complete(v2);
901 <        f.complete(v1);
902 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        checkCompletedNormally(h, null);
912 <        assertTrue(r.ran);
913 <        checkCompletedNormally(f, v1);
914 <        checkCompletedNormally(g, v2);
915 <        }
1045 <    }
1046 <
1047 <    public void testRunAfterBoth_normalCompletion4() {
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 <        f.complete(v1);
1057 <        g.complete(v2);
1058 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1059 <
1060 <        checkCompletedNormally(h, null);
1061 <        assertTrue(r.ran);
933 >        checkCompletedNormally(g, v1);
934          checkCompletedNormally(f, v1);
935 <        checkCompletedNormally(g, v2);
936 <        }
1065 <    }
935 >        assertEquals(1, a.get());
936 >    }}
937  
938      /**
939 <     * runAfterBoth result completes exceptionally after exceptional
940 <     * completion of either source
939 >     * whenComplete action executes on exceptional completion, propagating
940 >     * source result.
941       */
942 <    public void testRunAfterBoth_exceptionalCompletion1() {
942 >    public void testWhenComplete_exceptionalCompletion() {
943          for (ExecutionMode m : ExecutionMode.values())
944 <        for (Integer v1 : new Integer[] { 1, null }) {
945 <
946 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
947 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1077 <        final Noop r = new Noop();
1078 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
944 >        for (boolean createIncomplete : new boolean[] { true, false })
945 >        for (Integer v1 : new Integer[] { 1, null })
946 >    {
947 >        final AtomicInteger a = new AtomicInteger(0);
948          final CFException ex = new CFException();
949 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
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 <        f.completeExceptionally(ex);
967 <        checkIncomplete(h);
968 <        g.complete(v1);
969 <
970 <        checkCompletedWithWrappedCFException(h, ex);
1086 <        checkCompletedWithWrappedCFException(f, ex);
1087 <        assertFalse(r.ran);
1088 <        checkCompletedNormally(g, v1);
1089 <        }
1090 <    }
1091 <
1092 <    public void testRunAfterBoth_exceptionalCompletion2() {
966 >    /**
967 >     * whenComplete action executes on cancelled source, propagating
968 >     * CancellationException.
969 >     */
970 >    public void testWhenComplete_sourceCancelled() {
971          for (ExecutionMode m : ExecutionMode.values())
972 <        for (Integer v1 : new Integer[] { 1, null }) {
973 <
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 = m.runAfterBoth(f, g, r);
980 <        final CFException ex = new CFException();
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 <        g.completeExceptionally(ex);
989 <        checkIncomplete(h);
990 <        f.complete(v1);
991 <
1106 <        checkCompletedWithWrappedCFException(h, ex);
1107 <        checkCompletedWithWrappedCFException(g, ex);
1108 <        assertFalse(r.ran);
1109 <        checkCompletedNormally(f, v1);
1110 <        }
1111 <    }
988 >        checkCompletedWithWrappedCancellationException(g);
989 >        checkCancelled(f);
990 >        assertEquals(1, a.get());
991 >    }}
992  
993 <    public void testRunAfterBoth_exceptionalCompletion3() {
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 CompletableFuture<Integer> f = new CompletableFuture<>();
1118 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1119 <        final Noop r = new Noop();
1000 >        for (Integer v1 : new Integer[] { 1, null })
1001 >    {
1002 >        final AtomicInteger a = new AtomicInteger(0);
1003          final CFException ex = new CFException();
1004 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
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 <        g.completeExceptionally(ex);
1123 <        f.complete(v1);
1124 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1125 <
1126 <        checkCompletedWithWrappedCFException(h, ex);
1127 <        checkCompletedWithWrappedCFException(g, ex);
1128 <        assertFalse(r.ran);
1017 >        checkCompletedWithWrappedException(g, ex);
1018          checkCompletedNormally(f, v1);
1019 <        }
1020 <    }
1019 >        assertEquals(1, a.get());
1020 >    }}
1021  
1022 <    public void testRunAfterBoth_exceptionalCompletion4() {
1022 >    /**
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 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 <
1030 >        for (Integer v1 : new Integer[] { 1, null })
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<>();
1138        final CompletableFuture<Integer> g = new CompletableFuture<>();
1139        final Noop r = new Noop();
1140        final CFException ex = new CFException();
1141
1142        f.completeExceptionally(ex);
1143        g.complete(v1);
1144        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1036  
1037 <        checkCompletedWithWrappedCFException(h, ex);
1038 <        checkCompletedWithWrappedCFException(f, ex);
1039 <        assertFalse(r.ran);
1040 <        checkCompletedNormally(g, v1);
1041 <        }
1042 <    }
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 <     * runAfterBoth result completes exceptionally if action does
1055 >     * handle action completes normally with function value on normal
1056 >     * completion of source
1057       */
1058 <    public void testRunAfterBoth_actionFailed1() {
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 }) {
1160 <
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 = m.runAfterBoth(f, 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 <        f.complete(v1);
1167 <        checkIncomplete(h);
1168 <        g.complete(v2);
1169 <
1170 <        checkCompletedWithWrappedCFException(h);
1077 >        checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
1079 <        checkCompletedNormally(g, v2);
1080 <        }
1174 <    }
1079 >        assertEquals(1, a.get());
1080 >    }}
1081  
1082 <    public void testRunAfterBoth_actionFailed2() {
1082 >    /**
1083 >     * handle action completes normally with function value on
1084 >     * exceptional completion of source
1085 >     */
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 <        for (Integer v2 : new Integer[] { 2, null }) {
1180 <
1090 >    {
1091          final CompletableFuture<Integer> f = new CompletableFuture<>();
1092 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1093 <        final FailingNoop r = new FailingNoop();
1094 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1095 <
1096 <        g.complete(v2);
1097 <        checkIncomplete(h);
1098 <        f.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  
1106 <        checkCompletedWithWrappedCFException(h);
1107 <        checkCompletedNormally(f, v1);
1108 <        checkCompletedNormally(g, v2);
1109 <        }
1194 <    }
1106 >        checkCompletedNormally(g, v1);
1107 >        checkCompletedExceptionally(f, ex);
1108 >        assertEquals(1, a.get());
1109 >    }}
1110  
1111      /**
1112 <     * runAfterBoth result completes exceptionally if either source cancelled
1112 >     * handle action completes normally with function value on
1113 >     * cancelled source
1114       */
1115 <    public void testRunAfterBoth_sourceCancelled1() {
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 <        final CompletableFuture<Void> h = m.runAfterBoth(f, 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  
1209        assertTrue(f.cancel(mayInterruptIfRunning));
1210        checkIncomplete(h);
1211        g.complete(v1);
1212
1213        checkCompletedWithWrappedCancellationException(h);
1214        checkCancelled(f);
1215        assertFalse(r.ran);
1135          checkCompletedNormally(g, v1);
1136 <        }
1137 <    }
1136 >        checkCancelled(f);
1137 >        assertEquals(1, a.get());
1138 >    }}
1139  
1140 <    public void testRunAfterBoth_sourceCancelled2() {
1140 >    /**
1141 >     * handle result completes exceptionally if action does
1142 >     */
1143 >    public void testHandle_sourceFailedActionFailed() {
1144          for (ExecutionMode m : ExecutionMode.values())
1145 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1146 <        for (Integer v1 : new Integer[] { 1, null }) {
1224 <
1145 >        for (boolean createIncomplete : new boolean[] { true, false })
1146 >    {
1147          final CompletableFuture<Integer> f = new CompletableFuture<>();
1148 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1149 <        final Noop r = new Noop();
1150 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1151 <
1152 <        assertTrue(g.cancel(mayInterruptIfRunning));
1153 <        checkIncomplete(h);
1154 <        f.complete(v1);
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 <        checkCompletedWithWrappedCancellationException(h);
1235 <        checkCancelled(g);
1236 <        assertFalse(r.ran);
1237 <        checkCompletedNormally(f, v1);
1238 <        }
1239 <    }
1240 <
1241 <    public void testRunAfterBoth_sourceCancelled3() {
1168 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1169          for (ExecutionMode m : ExecutionMode.values())
1170 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1171 <        for (Integer v1 : new Integer[] { 1, null }) {
1172 <
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 CompletableFuture<Integer> g = new CompletableFuture<>();
1175 <        final Noop r = new Noop();
1176 <
1177 <        assertTrue(g.cancel(mayInterruptIfRunning));
1178 <        f.complete(v1);
1179 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        checkCompletedWithWrappedCancellationException(h);
1255 <        checkCancelled(g);
1256 <        assertFalse(r.ran);
1188 >        checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
1190 <        }
1191 <    }
1260 <
1261 <    public void testRunAfterBoth_sourceCancelled4() {
1262 <        for (ExecutionMode m : ExecutionMode.values())
1263 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1264 <        for (Integer v1 : new Integer[] { 1, null }) {
1265 <
1266 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1267 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1268 <        final Noop r = new Noop();
1269 <
1270 <        assertTrue(f.cancel(mayInterruptIfRunning));
1271 <        g.complete(v1);
1272 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1273 <
1274 <        checkCompletedWithWrappedCancellationException(h);
1275 <        checkCancelled(f);
1276 <        assertFalse(r.ran);
1277 <        checkCompletedNormally(g, v1);
1278 <        }
1279 <    }
1280 <
1281 <    /**
1282 <     * applyToEither result completes normally after normal completion
1283 <     * of either source
1284 <     */
1285 <    public void testApplyToEither() {
1286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1287 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1288 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1289 <        f.complete(one);
1290 <        checkCompletedNormally(g, two);
1291 <        f2.complete(one);
1292 <        checkCompletedNormally(g, two);
1293 <
1294 <        f = new CompletableFuture<>();
1295 <        f.complete(one);
1296 <        f2 = new CompletableFuture<>();
1297 <        g = f.applyToEither(f2, inc);
1298 <        checkCompletedNormally(g, two);
1299 <    }
1300 <
1301 <    /**
1302 <     * applyToEither result completes exceptionally after exceptional
1303 <     * completion of either source
1304 <     */
1305 <    public void testApplyToEither2() {
1306 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1307 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1308 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1309 <        f.completeExceptionally(new CFException());
1310 <        f2.complete(one);
1311 <        checkCompletedWithWrappedCFException(g);
1312 <
1313 <        f = new CompletableFuture<>();
1314 <        f2 = new CompletableFuture<>();
1315 <        f2.completeExceptionally(new CFException());
1316 <        g = f.applyToEither(f2, inc);
1317 <        checkCompletedWithWrappedCFException(g);
1318 <    }
1190 >        assertEquals(1, a.get());
1191 >    }}
1192  
1193      /**
1194 <     * applyToEither result completes exceptionally if action does
1194 >     * runAsync completes after running Runnable
1195       */
1196 <    public void testApplyToEither3() {
1197 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1198 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1199 <        FailingFunction r = new FailingFunction();
1200 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1201 <        f2.complete(two);
1202 <        checkCompletedWithWrappedCFException(g);
1203 <    }
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 <     * applyToEither result completes exceptionally if either source cancelled
1211 >     * failing runAsync completes exceptionally after running Runnable
1212       */
1213 <    public void testApplyToEither4() {
1214 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1215 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1216 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1217 <        assertTrue(f.cancel(true));
1218 <        checkCompletedWithWrappedCancellationException(g);
1219 <        f = new CompletableFuture<>();
1220 <        f2 = new CompletableFuture<>();
1221 <        assertTrue(f2.cancel(true));
1222 <        checkCompletedWithWrappedCancellationException(g);
1223 <    }
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 <     * acceptEither result completes normally after normal completion
1349 <     * of either source
1227 >     * supplyAsync completes with result of supplier
1228       */
1229 <    public void testAcceptEither() {
1230 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1231 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1232 <        IncAction r = new IncAction();
1233 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1234 <        f.complete(one);
1235 <        checkCompletedNormally(g, null);
1236 <        f2.complete(one);
1237 <        checkCompletedNormally(g, null);
1238 <        assertEquals(r.value, 2);
1239 <
1240 <        r = new IncAction();
1241 <        f = new CompletableFuture<>();
1242 <        f.complete(one);
1365 <        f2 = new CompletableFuture<>();
1366 <        g = f.acceptEither(f2, r);
1367 <        checkCompletedNormally(g, null);
1368 <        assertEquals(r.value, 2);
1369 <    }
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 <     * acceptEither result completes exceptionally after exceptional
1373 <     * completion of either source
1245 >     * Failing supplyAsync completes exceptionally
1246       */
1247 <    public void testAcceptEither2() {
1248 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1249 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1250 <        IncAction r = new IncAction();
1251 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1252 <        f.completeExceptionally(new CFException());
1253 <        f2.complete(one);
1254 <        checkCompletedWithWrappedCFException(g);
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 <        r = new IncAction();
1385 <        f = new CompletableFuture<>();
1386 <        f2 = new CompletableFuture<>();
1387 <        f2.completeExceptionally(new CFException());
1388 <        g = f.acceptEither(f2, r);
1389 <        checkCompletedWithWrappedCFException(g);
1390 <    }
1260 >    // seq completion methods
1261  
1262      /**
1263 <     * acceptEither result completes exceptionally if action does
1263 >     * thenRun result completes normally after normal completion of source
1264       */
1265 <    public void testAcceptEither3() {
1266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1267 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1268 <        FailingConsumer r = new FailingConsumer();
1269 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1270 <        f2.complete(two);
1271 <        checkCompletedWithWrappedCFException(g);
1402 <    }
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 <    /**
1274 <     * acceptEither result completes exceptionally if either source cancelled
1275 <     */
1276 <    public void testAcceptEither4() {
1277 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1278 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1279 <        IncAction r = new IncAction();
1280 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1281 <        assertTrue(f.cancel(true));
1282 <        checkCompletedWithWrappedCancellationException(g);
1283 <        f = new CompletableFuture<>();
1284 <        f2 = new CompletableFuture<>();
1285 <        assertTrue(f2.cancel(true));
1286 <        checkCompletedWithWrappedCancellationException(g);
1287 <    }
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 <     * runAfterEither result completes normally after normal completion
1296 <     * of either source
1295 >     * thenRun result completes exceptionally after exceptional
1296 >     * completion of source
1297       */
1298 <    public void testRunAfterEither() {
1299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1300 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1301 <        Noop r = new Noop();
1302 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1303 <        f.complete(one);
1304 <        checkCompletedNormally(g, null);
1431 <        f2.complete(one);
1432 <        checkCompletedNormally(g, null);
1433 <        assertTrue(r.ran);
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 <        r = new Noop();
1307 <        f = new CompletableFuture<>();
1308 <        f.complete(one);
1309 <        f2 = new CompletableFuture<>();
1310 <        g = f.runAfterEither(f2, r);
1311 <        checkCompletedNormally(g, null);
1312 <        assertTrue(r.ran);
1313 <    }
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 <     * runAfterEither result completes exceptionally after exceptional
1446 <     * completion of either source
1328 >     * thenRun result completes exceptionally if source cancelled
1329       */
1330 <    public void testRunAfterEither2() {
1331 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1332 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1333 <        Noop r = new Noop();
1334 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1335 <        f.completeExceptionally(new CFException());
1336 <        f2.complete(one);
1455 <        checkCompletedWithWrappedCFException(g);
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 <        r = new Noop();
1339 <        f = new CompletableFuture<>();
1340 <        f2 = new CompletableFuture<>();
1341 <        f2.completeExceptionally(new CFException());
1342 <        g = f.runAfterEither(f2, r);
1343 <        checkCompletedWithWrappedCFException(g);
1344 <    }
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 <     * runAfterEither result completes exceptionally if action does
1360 >     * thenRun result completes exceptionally if action does
1361       */
1362 <    public void testRunAfterEither3() {
1363 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1364 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1365 <        FailingNoop r = new FailingNoop();
1366 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1367 <        f2.complete(two);
1368 <        checkCompletedWithWrappedCFException(g);
1475 <    }
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 <     * runAfterEither result completes exceptionally if either source cancelled
1372 <     */
1373 <    public void testRunAfterEither4() {
1374 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1375 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1376 <        Noop r = new Noop();
1377 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1378 <        assertTrue(f.cancel(true));
1379 <        checkCompletedWithWrappedCancellationException(g);
1380 <        f = new CompletableFuture<>();
1381 <        f2 = new CompletableFuture<>();
1382 <        assertTrue(f2.cancel(true));
1383 <        checkCompletedWithWrappedCancellationException(g);
1384 <    }
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 <     * thenCompose result completes normally after normal completion of source
1388 >     * thenApply result completes normally after normal completion of source
1389       */
1390 <    public void testThenCompose() {
1391 <        CompletableFuture<Integer> f, g;
1392 <        CompletableFutureInc r;
1393 <
1394 <        f = new CompletableFuture<>();
1395 <        g = f.thenCompose(r = new CompletableFutureInc());
1396 <        f.complete(one);
1503 <        checkCompletedNormally(g, two);
1504 <        assertTrue(r.ran);
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 <        f = new CompletableFuture<>();
1399 <        f.complete(one);
1400 <        g = f.thenCompose(r = new CompletableFutureInc());
1401 <        checkCompletedNormally(g, two);
1402 <        assertTrue(r.ran);
1403 <    }
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 <     * thenCompose result completes exceptionally after exceptional
1415 >     * thenApply result completes exceptionally after exceptional
1416       * completion of source
1417       */
1418 <    public void testThenCompose2() {
1419 <        CompletableFuture<Integer> f, g;
1420 <        CompletableFutureInc r;
1421 <
1422 <        f = new CompletableFuture<>();
1423 <        g = f.thenCompose(r = new CompletableFutureInc());
1424 <        f.completeExceptionally(new CFException());
1524 <        checkCompletedWithWrappedCFException(g);
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 <        f.completeExceptionally(new CFException());
1428 <        g = f.thenCompose(r = new CompletableFutureInc());
1429 <        checkCompletedWithWrappedCFException(g);
1430 <    }
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 <     * thenCompose result completes exceptionally if action does
1441 >     * thenApply result completes exceptionally if source cancelled
1442       */
1443 <    public void testThenCompose3() {
1444 <        CompletableFuture<Integer> f, g;
1445 <        FailingCompletableFutureFunction r;
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 = f.thenCompose(r = new FailingCompletableFutureFunction());
1453 <        f.complete(one);
1454 <        checkCompletedWithWrappedCFException(g);
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 <        f = new CompletableFuture<>();
1458 <        f.complete(one);
1459 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1460 <        checkCompletedWithWrappedCFException(g);
1461 <    }
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 <     * thenCompose result completes exceptionally if source cancelled
1466 >     * thenApply result completes exceptionally if action does
1467       */
1468 <    public void testThenCompose4() {
1469 <        CompletableFuture<Integer> f, g;
1470 <        CompletableFutureInc r;
1471 <
1472 <        f = new CompletableFuture<>();
1473 <        g = f.thenCompose(r = new CompletableFutureInc());
1474 <        assertTrue(f.cancel(true));
1560 <        checkCompletedWithWrappedCancellationException(g);
1561 <
1562 <        f = new CompletableFuture<>();
1563 <        assertTrue(f.cancel(true));
1564 <        g = f.thenCompose(r = new CompletableFutureInc());
1565 <        checkCompletedWithWrappedCancellationException(g);
1566 <    }
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 <    // asyncs
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 <     * thenRunAsync result completes normally after normal completion of source
1490 >     * thenAccept result completes normally after normal completion of source
1491       */
1492 <    public void testThenRunAsync() {
1493 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1494 <        Noop r = new Noop();
1495 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1496 <        f.complete(null);
1497 <        checkCompletedNormally(g, null);
1492 >    public void testThenAccept_normalCompletion() {
1493 >        for (ExecutionMode m : ExecutionMode.values())
1494 >        for (boolean createIncomplete : new boolean[] { true, false })
1495 >        for (Integer v1 : new Integer[] { 1, null })
1496 >    {
1497 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1498 >        final NoopConsumer r = new NoopConsumer(m);
1499 >        if (!createIncomplete) assertTrue(f.complete(v1));
1500 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1501 >        if (createIncomplete) {
1502 >            checkIncomplete(g);
1503 >            assertTrue(f.complete(v1));
1504 >        }
1505  
1580        // reordered version
1581        f = new CompletableFuture<>();
1582        f.complete(null);
1583        r = new Noop();
1584        g = f.thenRunAsync(r);
1506          checkCompletedNormally(g, null);
1507 <    }
1507 >        r.assertValue(v1);
1508 >        checkCompletedNormally(f, v1);
1509 >    }}
1510  
1511      /**
1512 <     * thenRunAsync result completes exceptionally after exceptional
1512 >     * thenAccept result completes exceptionally after exceptional
1513       * completion of source
1514       */
1515 <    public void testThenRunAsync2() {
1516 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1517 <        Noop r = new Noop();
1518 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1519 <        f.completeExceptionally(new CFException());
1520 <        try {
1521 <            g.join();
1522 <            shouldThrow();
1523 <        } catch (CompletionException success) {}
1524 <        checkCompletedWithWrappedCFException(g);
1525 <    }
1526 <
1527 <    /**
1605 <     * thenRunAsync result completes exceptionally if action does
1606 <     */
1607 <    public void testThenRunAsync3() {
1608 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1609 <        FailingNoop r = new FailingNoop();
1610 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1611 <        f.complete(null);
1612 <        checkCompletedWithWrappedCFException(g);
1613 <    }
1614 <
1615 <    /**
1616 <     * thenRunAsync result completes exceptionally if source cancelled
1617 <     */
1618 <    public void testThenRunAsync4() {
1619 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1620 <        Noop r = new Noop();
1621 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1622 <        assertTrue(f.cancel(true));
1623 <        checkCompletedWithWrappedCancellationException(g);
1624 <    }
1625 <
1626 <    /**
1627 <     * thenApplyAsync result completes normally after normal completion of source
1628 <     */
1629 <    public void testThenApplyAsync() {
1630 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1631 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1632 <        f.complete(one);
1633 <        checkCompletedNormally(g, two);
1634 <    }
1515 >    public void testThenAccept_exceptionalCompletion() {
1516 >        for (ExecutionMode m : ExecutionMode.values())
1517 >        for (boolean createIncomplete : new boolean[] { true, false })
1518 >    {
1519 >        final CFException ex = new CFException();
1520 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1521 >        final NoopConsumer r = new NoopConsumer(m);
1522 >        if (!createIncomplete) f.completeExceptionally(ex);
1523 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1524 >        if (createIncomplete) {
1525 >            checkIncomplete(g);
1526 >            f.completeExceptionally(ex);
1527 >        }
1528  
1529 <    /**
1530 <     * thenApplyAsync result completes exceptionally after exceptional
1531 <     * completion of source
1532 <     */
1640 <    public void testThenApplyAsync2() {
1641 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1642 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1643 <        f.completeExceptionally(new CFException());
1644 <        checkCompletedWithWrappedCFException(g);
1645 <    }
1529 >        checkCompletedWithWrappedException(g, ex);
1530 >        checkCompletedExceptionally(f, ex);
1531 >        r.assertNotInvoked();
1532 >    }}
1533  
1534      /**
1535 <     * thenApplyAsync result completes exceptionally if action does
1535 >     * thenAccept result completes exceptionally if source cancelled
1536       */
1537 <    public void testThenApplyAsync3() {
1538 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1539 <        FailingFunction r = new FailingFunction();
1540 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1541 <        f.complete(null);
1542 <        checkCompletedWithWrappedCFException(g);
1543 <    }
1537 >    public void testThenAccept_sourceCancelled() {
1538 >        for (ExecutionMode m : ExecutionMode.values())
1539 >        for (boolean createIncomplete : new boolean[] { true, false })
1540 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1541 >    {
1542 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1543 >        final NoopConsumer r = new NoopConsumer(m);
1544 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1545 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1546 >        if (createIncomplete) {
1547 >            checkIncomplete(g);
1548 >            assertTrue(f.cancel(mayInterruptIfRunning));
1549 >        }
1550  
1658    /**
1659     * thenApplyAsync result completes exceptionally if source cancelled
1660     */
1661    public void testThenApplyAsync4() {
1662        CompletableFuture<Integer> f = new CompletableFuture<>();
1663        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1664        assertTrue(f.cancel(true));
1551          checkCompletedWithWrappedCancellationException(g);
1552 <    }
1553 <
1554 <    /**
1669 <     * thenAcceptAsync result completes normally after normal
1670 <     * completion of source
1671 <     */
1672 <    public void testThenAcceptAsync() {
1673 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1674 <        IncAction r = new IncAction();
1675 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1676 <        f.complete(one);
1677 <        checkCompletedNormally(g, null);
1678 <        assertEquals(r.value, 2);
1679 <    }
1552 >        checkCancelled(f);
1553 >        r.assertNotInvoked();
1554 >    }}
1555  
1556      /**
1557 <     * thenAcceptAsync result completes exceptionally after exceptional
1683 <     * completion of source
1557 >     * thenAccept result completes exceptionally if action does
1558       */
1559 <    public void testThenAcceptAsync2() {
1560 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1561 <        IncAction r = new IncAction();
1562 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1563 <        f.completeExceptionally(new CFException());
1564 <        checkCompletedWithWrappedCFException(g);
1565 <    }
1559 >    public void testThenAccept_actionFailed() {
1560 >        for (ExecutionMode m : ExecutionMode.values())
1561 >        for (boolean createIncomplete : new boolean[] { true, false })
1562 >        for (Integer v1 : new Integer[] { 1, null })
1563 >    {
1564 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1565 >        final FailingConsumer r = new FailingConsumer(m);
1566 >        if (!createIncomplete) f.complete(v1);
1567 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1568 >        if (createIncomplete) {
1569 >            checkIncomplete(g);
1570 >            f.complete(v1);
1571 >        }
1572  
1693    /**
1694     * thenAcceptAsync result completes exceptionally if action does
1695     */
1696    public void testThenAcceptAsync3() {
1697        CompletableFuture<Integer> f = new CompletableFuture<>();
1698        FailingConsumer r = new FailingConsumer();
1699        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1700        f.complete(null);
1573          checkCompletedWithWrappedCFException(g);
1574 <    }
1575 <
1704 <    /**
1705 <     * thenAcceptAsync result completes exceptionally if source cancelled
1706 <     */
1707 <    public void testThenAcceptAsync4() {
1708 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1709 <        IncAction r = new IncAction();
1710 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1711 <        assertTrue(f.cancel(true));
1712 <        checkCompletedWithWrappedCancellationException(g);
1713 <    }
1574 >        checkCompletedNormally(f, v1);
1575 >    }}
1576  
1577      /**
1578 <     * thenCombineAsync result completes normally after normal
1579 <     * completion of sources
1578 >     * thenCombine result completes normally after normal completion
1579 >     * of sources
1580       */
1581 <    public void testThenCombineAsync() {
1582 <        CompletableFuture<Integer> f, g, h;
1583 <
1584 <        f = new CompletableFuture<>();
1585 <        g = new CompletableFuture<>();
1586 <        h = f.thenCombineAsync(g, subtract);
1587 <        f.complete(3);
1588 <        checkIncomplete(h);
1589 <        g.complete(1);
1590 <        checkCompletedNormally(h, 2);
1591 <
1592 <        f = new CompletableFuture<>();
1593 <        g = new CompletableFuture<>();
1594 <        h = f.thenCombineAsync(g, subtract);
1595 <        g.complete(1);
1596 <        checkIncomplete(h);
1597 <        f.complete(3);
1598 <        checkCompletedNormally(h, 2);
1599 <
1600 <        f = new CompletableFuture<>();
1601 <        g = new CompletableFuture<>();
1602 <        g.complete(1);
1603 <        f.complete(3);
1604 <        h = f.thenCombineAsync(g, subtract);
1605 <        checkCompletedNormally(h, 2);
1606 <    }
1581 >    public void testThenCombine_normalCompletion() {
1582 >        for (ExecutionMode m : ExecutionMode.values())
1583 >        for (boolean fFirst : new boolean[] { true, false })
1584 >        for (Integer v1 : new Integer[] { 1, null })
1585 >        for (Integer v2 : new Integer[] { 2, null })
1586 >    {
1587 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1588 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1589 >        final SubtractFunction r1 = new SubtractFunction(m);
1590 >        final SubtractFunction r2 = new SubtractFunction(m);
1591 >        final SubtractFunction r3 = new SubtractFunction(m);
1592 >
1593 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1594 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1595 >        final Integer w1 =  fFirst ? v1 : v2;
1596 >        final Integer w2 = !fFirst ? v1 : v2;
1597 >
1598 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1599 >        assertTrue(fst.complete(w1));
1600 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1601 >        checkIncomplete(h1);
1602 >        checkIncomplete(h2);
1603 >        r1.assertNotInvoked();
1604 >        r2.assertNotInvoked();
1605 >        assertTrue(snd.complete(w2));
1606 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1607 >
1608 >        checkCompletedNormally(h1, subtract(v1, v2));
1609 >        checkCompletedNormally(h2, subtract(v1, v2));
1610 >        checkCompletedNormally(h3, subtract(v1, v2));
1611 >        r1.assertValue(subtract(v1, v2));
1612 >        r2.assertValue(subtract(v1, v2));
1613 >        r3.assertValue(subtract(v1, v2));
1614 >        checkCompletedNormally(f, v1);
1615 >        checkCompletedNormally(g, v2);
1616 >    }}
1617  
1618      /**
1619 <     * thenCombineAsync result completes exceptionally after exceptional
1619 >     * thenCombine result completes exceptionally after exceptional
1620       * completion of either source
1621       */
1622 <    public void testThenCombineAsync2() {
1623 <        CompletableFuture<Integer> f, g, h;
1624 <
1625 <        f = new CompletableFuture<>();
1626 <        g = new CompletableFuture<>();
1627 <        h = f.thenCombineAsync(g, subtract);
1628 <        f.completeExceptionally(new CFException());
1629 <        checkIncomplete(h);
1630 <        g.complete(1);
1631 <        checkCompletedWithWrappedCFException(h);
1632 <
1633 <        f = new CompletableFuture<>();
1634 <        g = new CompletableFuture<>();
1635 <        h = f.thenCombineAsync(g, subtract);
1636 <        g.completeExceptionally(new CFException());
1637 <        checkIncomplete(h);
1638 <        f.complete(3);
1639 <        checkCompletedWithWrappedCFException(h);
1640 <
1641 <        f = new CompletableFuture<>();
1642 <        g = new CompletableFuture<>();
1643 <        g.completeExceptionally(new CFException());
1644 <        f.complete(3);
1645 <        h = f.thenCombineAsync(g, subtract);
1646 <        checkCompletedWithWrappedCFException(h);
1647 <    }
1648 <
1649 <    /**
1650 <     * thenCombineAsync result completes exceptionally if action does
1651 <     */
1652 <    public void testThenCombineAsync3() {
1653 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1654 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1655 <        FailingBiFunction r = new FailingBiFunction();
1656 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1657 <        f.complete(one);
1658 <        checkIncomplete(g);
1659 <        assertFalse(r.ran);
1660 <        f2.complete(two);
1789 <        checkCompletedWithWrappedCFException(g);
1790 <        assertTrue(r.ran);
1791 <    }
1792 <
1793 <    /**
1794 <     * thenCombineAsync result completes exceptionally if either source cancelled
1795 <     */
1796 <    public void testThenCombineAsync4() {
1797 <        CompletableFuture<Integer> f, g, h;
1798 <
1799 <        f = new CompletableFuture<>();
1800 <        g = new CompletableFuture<>();
1801 <        h = f.thenCombineAsync(g, subtract);
1802 <        assertTrue(f.cancel(true));
1803 <        checkIncomplete(h);
1804 <        g.complete(1);
1805 <        checkCompletedWithWrappedCancellationException(h);
1806 <
1807 <        f = new CompletableFuture<>();
1808 <        g = new CompletableFuture<>();
1809 <        h = f.thenCombineAsync(g, subtract);
1810 <        assertTrue(g.cancel(true));
1811 <        checkIncomplete(h);
1812 <        f.complete(3);
1813 <        checkCompletedWithWrappedCancellationException(h);
1814 <
1815 <        f = new CompletableFuture<>();
1816 <        g = new CompletableFuture<>();
1817 <        g.complete(3);
1818 <        assertTrue(f.cancel(true));
1819 <        h = f.thenCombineAsync(g, subtract);
1820 <        checkCompletedWithWrappedCancellationException(h);
1821 <
1822 <        f = new CompletableFuture<>();
1823 <        g = new CompletableFuture<>();
1824 <        f.complete(3);
1825 <        assertTrue(g.cancel(true));
1826 <        h = f.thenCombineAsync(g, subtract);
1827 <        checkCompletedWithWrappedCancellationException(h);
1828 <    }
1829 <
1830 <    /**
1831 <     * thenAcceptBothAsync result completes normally after normal
1832 <     * completion of sources
1833 <     */
1834 <    public void testThenAcceptBothAsync() {
1835 <        CompletableFuture<Integer> f, g;
1836 <        CompletableFuture<Void> h;
1837 <        SubtractAction r;
1838 <
1839 <        f = new CompletableFuture<>();
1840 <        g = new CompletableFuture<>();
1841 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1842 <        f.complete(3);
1843 <        checkIncomplete(h);
1844 <        g.complete(1);
1845 <        checkCompletedNormally(h, null);
1846 <        assertEquals(r.value, 2);
1847 <
1848 <        f = new CompletableFuture<>();
1849 <        g = new CompletableFuture<>();
1850 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1851 <        g.complete(1);
1852 <        checkIncomplete(h);
1853 <        f.complete(3);
1854 <        checkCompletedNormally(h, null);
1855 <        assertEquals(r.value, 2);
1856 <
1857 <        f = new CompletableFuture<>();
1858 <        g = new CompletableFuture<>();
1859 <        g.complete(1);
1860 <        f.complete(3);
1861 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1862 <        checkCompletedNormally(h, null);
1863 <        assertEquals(r.value, 2);
1864 <    }
1865 <
1866 <    /**
1867 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1868 <     * completion of source
1869 <     */
1870 <    public void testThenAcceptBothAsync2() {
1871 <        CompletableFuture<Integer> f, g;
1872 <        CompletableFuture<Void> h;
1873 <        SubtractAction r;
1874 <
1875 <        f = new CompletableFuture<>();
1876 <        g = new CompletableFuture<>();
1877 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1878 <        f.completeExceptionally(new CFException());
1879 <        checkIncomplete(h);
1880 <        g.complete(1);
1881 <        checkCompletedWithWrappedCFException(h);
1882 <
1883 <        f = new CompletableFuture<>();
1884 <        g = new CompletableFuture<>();
1885 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1886 <        g.completeExceptionally(new CFException());
1887 <        checkIncomplete(h);
1888 <        f.complete(3);
1889 <        checkCompletedWithWrappedCFException(h);
1890 <
1891 <        f = new CompletableFuture<>();
1892 <        g = new CompletableFuture<>();
1893 <        f.complete(3);
1894 <        g.completeExceptionally(new CFException());
1895 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1896 <        checkCompletedWithWrappedCFException(h);
1897 <
1898 <        f = new CompletableFuture<>();
1899 <        g = new CompletableFuture<>();
1900 <        f.completeExceptionally(new CFException());
1901 <        g.complete(3);
1902 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1903 <        checkCompletedWithWrappedCFException(h);
1904 <    }
1905 <
1906 <    /**
1907 <     * thenAcceptBothAsync result completes exceptionally if action does
1908 <     */
1909 <    public void testThenAcceptBothAsync3() {
1910 <        CompletableFuture<Integer> f, g;
1911 <        CompletableFuture<Void> h;
1912 <        FailingBiConsumer r;
1913 <
1914 <        f = new CompletableFuture<>();
1915 <        g = new CompletableFuture<>();
1916 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1917 <        f.complete(3);
1918 <        checkIncomplete(h);
1919 <        g.complete(1);
1920 <        checkCompletedWithWrappedCFException(h);
1921 <
1922 <        f = new CompletableFuture<>();
1923 <        g = new CompletableFuture<>();
1924 <        f.complete(3);
1925 <        g.complete(1);
1926 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1927 <        checkCompletedWithWrappedCFException(h);
1928 <    }
1929 <
1930 <    /**
1931 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1932 <     */
1933 <    public void testThenAcceptBothAsync4() {
1934 <        CompletableFuture<Integer> f, g;
1935 <        CompletableFuture<Void> h;
1936 <        SubtractAction r;
1937 <
1938 <        f = new CompletableFuture<>();
1939 <        g = new CompletableFuture<>();
1940 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1941 <        assertTrue(f.cancel(true));
1942 <        checkIncomplete(h);
1943 <        g.complete(1);
1944 <        checkCompletedWithWrappedCancellationException(h);
1945 <
1946 <        f = new CompletableFuture<>();
1947 <        g = new CompletableFuture<>();
1948 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1949 <        assertTrue(g.cancel(true));
1950 <        checkIncomplete(h);
1951 <        f.complete(3);
1952 <        checkCompletedWithWrappedCancellationException(h);
1953 <
1954 <        f = new CompletableFuture<>();
1955 <        g = new CompletableFuture<>();
1956 <        f.complete(3);
1957 <        assertTrue(g.cancel(true));
1958 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1959 <        checkCompletedWithWrappedCancellationException(h);
1960 <
1961 <        f = new CompletableFuture<>();
1962 <        g = new CompletableFuture<>();
1963 <        assertTrue(f.cancel(true));
1964 <        g.complete(3);
1965 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1966 <        checkCompletedWithWrappedCancellationException(h);
1967 <    }
1968 <
1969 <    /**
1970 <     * applyToEitherAsync result completes normally after normal
1971 <     * completion of sources
1972 <     */
1973 <    public void testApplyToEitherAsync() {
1974 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1975 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1976 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1977 <        f.complete(one);
1978 <        checkCompletedNormally(g, two);
1979 <
1980 <        f = new CompletableFuture<>();
1981 <        f.complete(one);
1982 <        f2 = new CompletableFuture<>();
1983 <        g = f.applyToEitherAsync(f2, inc);
1984 <        checkCompletedNormally(g, two);
1985 <    }
1986 <
1987 <    /**
1988 <     * applyToEitherAsync result completes exceptionally after exceptional
1989 <     * completion of source
1990 <     */
1991 <    public void testApplyToEitherAsync2() {
1992 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1993 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1994 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1995 <        f.completeExceptionally(new CFException());
1996 <        checkCompletedWithWrappedCFException(g);
1997 <
1998 <        f = new CompletableFuture<>();
1999 <        f2 = new CompletableFuture<>();
2000 <        f2.completeExceptionally(new CFException());
2001 <        g = f.applyToEitherAsync(f2, inc);
2002 <        f.complete(one);
2003 <        checkCompletedWithWrappedCFException(g);
2004 <    }
1622 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1623 >        for (ExecutionMode m : ExecutionMode.values())
1624 >        for (boolean fFirst : new boolean[] { true, false })
1625 >        for (boolean failFirst : new boolean[] { true, false })
1626 >        for (Integer v1 : new Integer[] { 1, null })
1627 >    {
1628 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1629 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1630 >        final CFException ex = new CFException();
1631 >        final SubtractFunction r1 = new SubtractFunction(m);
1632 >        final SubtractFunction r2 = new SubtractFunction(m);
1633 >        final SubtractFunction r3 = new SubtractFunction(m);
1634 >
1635 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1636 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1637 >        final Callable<Boolean> complete1 = failFirst ?
1638 >            () -> fst.completeExceptionally(ex) :
1639 >            () -> fst.complete(v1);
1640 >        final Callable<Boolean> complete2 = failFirst ?
1641 >            () -> snd.complete(v1) :
1642 >            () -> snd.completeExceptionally(ex);
1643 >
1644 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1645 >        assertTrue(complete1.call());
1646 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1647 >        checkIncomplete(h1);
1648 >        checkIncomplete(h2);
1649 >        assertTrue(complete2.call());
1650 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1651 >
1652 >        checkCompletedWithWrappedException(h1, ex);
1653 >        checkCompletedWithWrappedException(h2, ex);
1654 >        checkCompletedWithWrappedException(h3, ex);
1655 >        r1.assertNotInvoked();
1656 >        r2.assertNotInvoked();
1657 >        r3.assertNotInvoked();
1658 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1659 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1660 >    }}
1661  
1662      /**
1663 <     * applyToEitherAsync result completes exceptionally if action does
1663 >     * thenCombine result completes exceptionally if either source cancelled
1664       */
1665 <    public void testApplyToEitherAsync3() {
1666 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1667 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1668 <        FailingFunction r = new FailingFunction();
1669 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1670 <        f.complete(one);
1671 <        checkCompletedWithWrappedCFException(g);
1672 <    }
1665 >    public void testThenCombine_sourceCancelled() throws Throwable {
1666 >        for (ExecutionMode m : ExecutionMode.values())
1667 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1668 >        for (boolean fFirst : new boolean[] { true, false })
1669 >        for (boolean failFirst : new boolean[] { true, false })
1670 >        for (Integer v1 : new Integer[] { 1, null })
1671 >    {
1672 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1673 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1674 >        final SubtractFunction r1 = new SubtractFunction(m);
1675 >        final SubtractFunction r2 = new SubtractFunction(m);
1676 >        final SubtractFunction r3 = new SubtractFunction(m);
1677 >
1678 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1679 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1680 >        final Callable<Boolean> complete1 = failFirst ?
1681 >            () -> fst.cancel(mayInterruptIfRunning) :
1682 >            () -> fst.complete(v1);
1683 >        final Callable<Boolean> complete2 = failFirst ?
1684 >            () -> snd.complete(v1) :
1685 >            () -> snd.cancel(mayInterruptIfRunning);
1686 >
1687 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1688 >        assertTrue(complete1.call());
1689 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1690 >        checkIncomplete(h1);
1691 >        checkIncomplete(h2);
1692 >        assertTrue(complete2.call());
1693 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1694 >
1695 >        checkCompletedWithWrappedCancellationException(h1);
1696 >        checkCompletedWithWrappedCancellationException(h2);
1697 >        checkCompletedWithWrappedCancellationException(h3);
1698 >        r1.assertNotInvoked();
1699 >        r2.assertNotInvoked();
1700 >        r3.assertNotInvoked();
1701 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1702 >        checkCancelled(failFirst ? fst : snd);
1703 >    }}
1704  
1705      /**
1706 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1706 >     * thenCombine result completes exceptionally if action does
1707       */
1708 <    public void testApplyToEitherAsync4() {
1709 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1710 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1711 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1712 <        assertTrue(f.cancel(true));
1713 <        checkCompletedWithWrappedCancellationException(g);
1714 <
1715 <        f = new CompletableFuture<>();
1716 <        f2 = new CompletableFuture<>();
1717 <        assertTrue(f2.cancel(true));
1718 <        g = f.applyToEitherAsync(f2, inc);
1719 <        checkCompletedWithWrappedCancellationException(g);
1720 <    }
1708 >    public void testThenCombine_actionFailed() {
1709 >        for (ExecutionMode m : ExecutionMode.values())
1710 >        for (boolean fFirst : new boolean[] { true, false })
1711 >        for (Integer v1 : new Integer[] { 1, null })
1712 >        for (Integer v2 : new Integer[] { 2, null })
1713 >    {
1714 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1715 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1716 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1717 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1718 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1719 >
1720 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1721 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1722 >        final Integer w1 =  fFirst ? v1 : v2;
1723 >        final Integer w2 = !fFirst ? v1 : v2;
1724 >
1725 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1726 >        assertTrue(fst.complete(w1));
1727 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1728 >        assertTrue(snd.complete(w2));
1729 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1730 >
1731 >        checkCompletedWithWrappedCFException(h1);
1732 >        checkCompletedWithWrappedCFException(h2);
1733 >        checkCompletedWithWrappedCFException(h3);
1734 >        r1.assertInvoked();
1735 >        r2.assertInvoked();
1736 >        r3.assertInvoked();
1737 >        checkCompletedNormally(f, v1);
1738 >        checkCompletedNormally(g, v2);
1739 >    }}
1740  
1741      /**
1742 <     * acceptEitherAsync result completes normally after normal
1742 >     * thenAcceptBoth result completes normally after normal
1743       * completion of sources
1744       */
1745 <    public void testAcceptEitherAsync() {
1746 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1747 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1748 <        IncAction r = new IncAction();
1749 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1750 <        f.complete(one);
1751 <        checkCompletedNormally(g, null);
1752 <        assertEquals(r.value, 2);
1753 <
1754 <        r = new IncAction();
1755 <        f = new CompletableFuture<>();
1756 <        f.complete(one);
1757 <        f2 = new CompletableFuture<>();
1758 <        g = f.acceptEitherAsync(f2, r);
1759 <        checkCompletedNormally(g, null);
1760 <        assertEquals(r.value, 2);
1761 <    }
1745 >    public void testThenAcceptBoth_normalCompletion() {
1746 >        for (ExecutionMode m : ExecutionMode.values())
1747 >        for (boolean fFirst : new boolean[] { true, false })
1748 >        for (Integer v1 : new Integer[] { 1, null })
1749 >        for (Integer v2 : new Integer[] { 2, null })
1750 >    {
1751 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1752 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1753 >        final SubtractAction r1 = new SubtractAction(m);
1754 >        final SubtractAction r2 = new SubtractAction(m);
1755 >        final SubtractAction r3 = new SubtractAction(m);
1756 >
1757 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1758 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1759 >        final Integer w1 =  fFirst ? v1 : v2;
1760 >        final Integer w2 = !fFirst ? v1 : v2;
1761 >
1762 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1763 >        assertTrue(fst.complete(w1));
1764 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1765 >        checkIncomplete(h1);
1766 >        checkIncomplete(h2);
1767 >        r1.assertNotInvoked();
1768 >        r2.assertNotInvoked();
1769 >        assertTrue(snd.complete(w2));
1770 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1771 >
1772 >        checkCompletedNormally(h1, null);
1773 >        checkCompletedNormally(h2, null);
1774 >        checkCompletedNormally(h3, null);
1775 >        r1.assertValue(subtract(v1, v2));
1776 >        r2.assertValue(subtract(v1, v2));
1777 >        r3.assertValue(subtract(v1, v2));
1778 >        checkCompletedNormally(f, v1);
1779 >        checkCompletedNormally(g, v2);
1780 >    }}
1781  
1782      /**
1783 <     * acceptEitherAsync result completes exceptionally after exceptional
1784 <     * completion of source
1783 >     * thenAcceptBoth result completes exceptionally after exceptional
1784 >     * completion of either source
1785       */
1786 <    public void testAcceptEitherAsync2() {
1787 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1788 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1789 <        IncAction r = new IncAction();
1790 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1791 <        f.completeExceptionally(new CFException());
1792 <        checkCompletedWithWrappedCFException(g);
1793 <
1794 <        r = new IncAction();
1795 <        f = new CompletableFuture<>();
1796 <        f2 = new CompletableFuture<>();
1797 <        f2.completeExceptionally(new CFException());
1798 <        g = f.acceptEitherAsync(f2, r);
1799 <        f.complete(one);
1800 <        checkCompletedWithWrappedCFException(g);
1801 <    }
1786 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1787 >        for (ExecutionMode m : ExecutionMode.values())
1788 >        for (boolean fFirst : new boolean[] { true, false })
1789 >        for (boolean failFirst : new boolean[] { true, false })
1790 >        for (Integer v1 : new Integer[] { 1, null })
1791 >    {
1792 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1793 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1794 >        final CFException ex = new CFException();
1795 >        final SubtractAction r1 = new SubtractAction(m);
1796 >        final SubtractAction r2 = new SubtractAction(m);
1797 >        final SubtractAction r3 = new SubtractAction(m);
1798 >
1799 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1800 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1801 >        final Callable<Boolean> complete1 = failFirst ?
1802 >            () -> fst.completeExceptionally(ex) :
1803 >            () -> fst.complete(v1);
1804 >        final Callable<Boolean> complete2 = failFirst ?
1805 >            () -> snd.complete(v1) :
1806 >            () -> snd.completeExceptionally(ex);
1807 >
1808 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1809 >        assertTrue(complete1.call());
1810 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1811 >        checkIncomplete(h1);
1812 >        checkIncomplete(h2);
1813 >        assertTrue(complete2.call());
1814 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1815 >
1816 >        checkCompletedWithWrappedException(h1, ex);
1817 >        checkCompletedWithWrappedException(h2, ex);
1818 >        checkCompletedWithWrappedException(h3, ex);
1819 >        r1.assertNotInvoked();
1820 >        r2.assertNotInvoked();
1821 >        r3.assertNotInvoked();
1822 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1823 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1824 >    }}
1825  
1826      /**
1827 <     * acceptEitherAsync result completes exceptionally if action does
1827 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1828       */
1829 <    public void testAcceptEitherAsync3() {
1830 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1831 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1832 <        FailingConsumer r = new FailingConsumer();
1833 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1834 <        f.complete(one);
1835 <        checkCompletedWithWrappedCFException(g);
1836 <    }
1829 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1830 >        for (ExecutionMode m : ExecutionMode.values())
1831 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1832 >        for (boolean fFirst : new boolean[] { true, false })
1833 >        for (boolean failFirst : new boolean[] { true, false })
1834 >        for (Integer v1 : new Integer[] { 1, null })
1835 >    {
1836 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1837 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1838 >        final SubtractAction r1 = new SubtractAction(m);
1839 >        final SubtractAction r2 = new SubtractAction(m);
1840 >        final SubtractAction r3 = new SubtractAction(m);
1841 >
1842 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1843 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1844 >        final Callable<Boolean> complete1 = failFirst ?
1845 >            () -> fst.cancel(mayInterruptIfRunning) :
1846 >            () -> fst.complete(v1);
1847 >        final Callable<Boolean> complete2 = failFirst ?
1848 >            () -> snd.complete(v1) :
1849 >            () -> snd.cancel(mayInterruptIfRunning);
1850 >
1851 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1852 >        assertTrue(complete1.call());
1853 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1854 >        checkIncomplete(h1);
1855 >        checkIncomplete(h2);
1856 >        assertTrue(complete2.call());
1857 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1858 >
1859 >        checkCompletedWithWrappedCancellationException(h1);
1860 >        checkCompletedWithWrappedCancellationException(h2);
1861 >        checkCompletedWithWrappedCancellationException(h3);
1862 >        r1.assertNotInvoked();
1863 >        r2.assertNotInvoked();
1864 >        r3.assertNotInvoked();
1865 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1866 >        checkCancelled(failFirst ? fst : snd);
1867 >    }}
1868  
1869      /**
1870 <     * acceptEitherAsync result completes exceptionally if either
2092 <     * source cancelled
1870 >     * thenAcceptBoth result completes exceptionally if action does
1871       */
1872 <    public void testAcceptEitherAsync4() {
1873 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1874 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1875 <        IncAction r = new IncAction();
1876 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1877 <        assertTrue(f.cancel(true));
1878 <        checkCompletedWithWrappedCancellationException(g);
1879 <
1880 <        r = new IncAction();
1881 <        f = new CompletableFuture<>();
1882 <        f2 = new CompletableFuture<>();
1883 <        assertTrue(f2.cancel(true));
1884 <        g = f.acceptEitherAsync(f2, r);
1885 <        checkCompletedWithWrappedCancellationException(g);
1886 <    }
1872 >    public void testThenAcceptBoth_actionFailed() {
1873 >        for (ExecutionMode m : ExecutionMode.values())
1874 >        for (boolean fFirst : new boolean[] { true, false })
1875 >        for (Integer v1 : new Integer[] { 1, null })
1876 >        for (Integer v2 : new Integer[] { 2, null })
1877 >    {
1878 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1879 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1880 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1881 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1882 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1883 >
1884 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1885 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1886 >        final Integer w1 =  fFirst ? v1 : v2;
1887 >        final Integer w2 = !fFirst ? v1 : v2;
1888 >
1889 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1890 >        assertTrue(fst.complete(w1));
1891 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1892 >        assertTrue(snd.complete(w2));
1893 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1894 >
1895 >        checkCompletedWithWrappedCFException(h1);
1896 >        checkCompletedWithWrappedCFException(h2);
1897 >        checkCompletedWithWrappedCFException(h3);
1898 >        r1.assertInvoked();
1899 >        r2.assertInvoked();
1900 >        r3.assertInvoked();
1901 >        checkCompletedNormally(f, v1);
1902 >        checkCompletedNormally(g, v2);
1903 >    }}
1904  
1905      /**
1906 <     * runAfterEitherAsync result completes normally after normal
1906 >     * runAfterBoth result completes normally after normal
1907       * completion of sources
1908       */
1909 <    public void testRunAfterEitherAsync() {
1910 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1911 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1912 <        Noop r = new Noop();
1913 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1914 <        f.complete(one);
1915 <        checkCompletedNormally(g, null);
1916 <        assertTrue(r.ran);
1917 <
1918 <        r = new Noop();
1919 <        f = new CompletableFuture<>();
1920 <        f.complete(one);
1921 <        f2 = new CompletableFuture<>();
1922 <        g = f.runAfterEitherAsync(f2, r);
1923 <        checkCompletedNormally(g, null);
1924 <        assertTrue(r.ran);
1925 <    }
1909 >    public void testRunAfterBoth_normalCompletion() {
1910 >        for (ExecutionMode m : ExecutionMode.values())
1911 >        for (boolean fFirst : new boolean[] { true, false })
1912 >        for (Integer v1 : new Integer[] { 1, null })
1913 >        for (Integer v2 : new Integer[] { 2, null })
1914 >    {
1915 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1916 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1917 >        final Noop r1 = new Noop(m);
1918 >        final Noop r2 = new Noop(m);
1919 >        final Noop r3 = new Noop(m);
1920 >
1921 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1922 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1923 >        final Integer w1 =  fFirst ? v1 : v2;
1924 >        final Integer w2 = !fFirst ? v1 : v2;
1925 >
1926 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1927 >        assertTrue(fst.complete(w1));
1928 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1929 >        checkIncomplete(h1);
1930 >        checkIncomplete(h2);
1931 >        r1.assertNotInvoked();
1932 >        r2.assertNotInvoked();
1933 >        assertTrue(snd.complete(w2));
1934 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1935 >
1936 >        checkCompletedNormally(h1, null);
1937 >        checkCompletedNormally(h2, null);
1938 >        checkCompletedNormally(h3, null);
1939 >        r1.assertInvoked();
1940 >        r2.assertInvoked();
1941 >        r3.assertInvoked();
1942 >        checkCompletedNormally(f, v1);
1943 >        checkCompletedNormally(g, v2);
1944 >    }}
1945  
1946      /**
1947 <     * runAfterEitherAsync result completes exceptionally after exceptional
1948 <     * completion of source
1947 >     * runAfterBoth result completes exceptionally after exceptional
1948 >     * completion of either source
1949       */
1950 <    public void testRunAfterEitherAsync2() {
1951 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1952 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1953 <        Noop r = new Noop();
1954 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1955 <        f.completeExceptionally(new CFException());
1956 <        checkCompletedWithWrappedCFException(g);
1957 <
1958 <        r = new Noop();
1959 <        f = new CompletableFuture<>();
1960 <        f2 = new CompletableFuture<>();
1961 <        f2.completeExceptionally(new CFException());
1962 <        g = f.runAfterEitherAsync(f2, r);
1963 <        f.complete(one);
1964 <        checkCompletedWithWrappedCFException(g);
1965 <    }
1950 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1951 >        for (ExecutionMode m : ExecutionMode.values())
1952 >        for (boolean fFirst : new boolean[] { true, false })
1953 >        for (boolean failFirst : new boolean[] { true, false })
1954 >        for (Integer v1 : new Integer[] { 1, null })
1955 >    {
1956 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1957 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1958 >        final CFException ex = new CFException();
1959 >        final Noop r1 = new Noop(m);
1960 >        final Noop r2 = new Noop(m);
1961 >        final Noop r3 = new Noop(m);
1962 >
1963 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1964 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1965 >        final Callable<Boolean> complete1 = failFirst ?
1966 >            () -> fst.completeExceptionally(ex) :
1967 >            () -> fst.complete(v1);
1968 >        final Callable<Boolean> complete2 = failFirst ?
1969 >            () -> snd.complete(v1) :
1970 >            () -> snd.completeExceptionally(ex);
1971 >
1972 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1973 >        assertTrue(complete1.call());
1974 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1975 >        checkIncomplete(h1);
1976 >        checkIncomplete(h2);
1977 >        assertTrue(complete2.call());
1978 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1979 >
1980 >        checkCompletedWithWrappedException(h1, ex);
1981 >        checkCompletedWithWrappedException(h2, ex);
1982 >        checkCompletedWithWrappedException(h3, ex);
1983 >        r1.assertNotInvoked();
1984 >        r2.assertNotInvoked();
1985 >        r3.assertNotInvoked();
1986 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1987 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1988 >    }}
1989  
1990      /**
1991 <     * runAfterEitherAsync result completes exceptionally if action does
1991 >     * runAfterBoth result completes exceptionally if either source cancelled
1992       */
1993 <    public void testRunAfterEitherAsync3() {
1994 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1995 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1996 <        FailingNoop r = new FailingNoop();
1997 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1998 <        f.complete(one);
1999 <        checkCompletedWithWrappedCFException(g);
2000 <    }
1993 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1994 >        for (ExecutionMode m : ExecutionMode.values())
1995 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1996 >        for (boolean fFirst : new boolean[] { true, false })
1997 >        for (boolean failFirst : new boolean[] { true, false })
1998 >        for (Integer v1 : new Integer[] { 1, null })
1999 >    {
2000 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 >        final Noop r1 = new Noop(m);
2003 >        final Noop r2 = new Noop(m);
2004 >        final Noop r3 = new Noop(m);
2005 >
2006 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2007 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2008 >        final Callable<Boolean> complete1 = failFirst ?
2009 >            () -> fst.cancel(mayInterruptIfRunning) :
2010 >            () -> fst.complete(v1);
2011 >        final Callable<Boolean> complete2 = failFirst ?
2012 >            () -> snd.complete(v1) :
2013 >            () -> snd.cancel(mayInterruptIfRunning);
2014 >
2015 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2016 >        assertTrue(complete1.call());
2017 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2018 >        checkIncomplete(h1);
2019 >        checkIncomplete(h2);
2020 >        assertTrue(complete2.call());
2021 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2022 >
2023 >        checkCompletedWithWrappedCancellationException(h1);
2024 >        checkCompletedWithWrappedCancellationException(h2);
2025 >        checkCompletedWithWrappedCancellationException(h3);
2026 >        r1.assertNotInvoked();
2027 >        r2.assertNotInvoked();
2028 >        r3.assertNotInvoked();
2029 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2030 >        checkCancelled(failFirst ? fst : snd);
2031 >    }}
2032  
2033      /**
2034 <     * runAfterEitherAsync result completes exceptionally if either
2167 <     * source cancelled
2034 >     * runAfterBoth result completes exceptionally if action does
2035       */
2036 <    public void testRunAfterEitherAsync4() {
2037 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2038 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2039 <        Noop r = new Noop();
2040 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2041 <        assertTrue(f.cancel(true));
2042 <        checkCompletedWithWrappedCancellationException(g);
2043 <
2044 <        r = new Noop();
2045 <        f = new CompletableFuture<>();
2046 <        f2 = new CompletableFuture<>();
2047 <        assertTrue(f2.cancel(true));
2048 <        g = f.runAfterEitherAsync(f2, r);
2049 <        checkCompletedWithWrappedCancellationException(g);
2050 <    }
2036 >    public void testRunAfterBoth_actionFailed() {
2037 >        for (ExecutionMode m : ExecutionMode.values())
2038 >        for (boolean fFirst : new boolean[] { true, false })
2039 >        for (Integer v1 : new Integer[] { 1, null })
2040 >        for (Integer v2 : new Integer[] { 2, null })
2041 >    {
2042 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2043 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2044 >        final FailingRunnable r1 = new FailingRunnable(m);
2045 >        final FailingRunnable r2 = new FailingRunnable(m);
2046 >        final FailingRunnable r3 = new FailingRunnable(m);
2047 >
2048 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2049 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2050 >        final Integer w1 =  fFirst ? v1 : v2;
2051 >        final Integer w2 = !fFirst ? v1 : v2;
2052 >
2053 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2054 >        assertTrue(fst.complete(w1));
2055 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2056 >        assertTrue(snd.complete(w2));
2057 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2058 >
2059 >        checkCompletedWithWrappedCFException(h1);
2060 >        checkCompletedWithWrappedCFException(h2);
2061 >        checkCompletedWithWrappedCFException(h3);
2062 >        r1.assertInvoked();
2063 >        r2.assertInvoked();
2064 >        r3.assertInvoked();
2065 >        checkCompletedNormally(f, v1);
2066 >        checkCompletedNormally(g, v2);
2067 >    }}
2068  
2069      /**
2070 <     * thenComposeAsync result completes normally after normal
2071 <     * completion of source
2070 >     * applyToEither result completes normally after normal completion
2071 >     * of either source
2072       */
2073 <    public void testThenComposeAsync() {
2074 <        CompletableFuture<Integer> f, g;
2075 <        CompletableFutureInc r;
2076 <
2077 <        f = new CompletableFuture<>();
2078 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2079 <        f.complete(one);
2080 <        checkCompletedNormally(g, two);
2081 <
2198 <        f = new CompletableFuture<>();
2199 <        f.complete(one);
2200 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2201 <        checkCompletedNormally(g, two);
2202 <    }
2073 >    public void testApplyToEither_normalCompletion() {
2074 >        for (ExecutionMode m : ExecutionMode.values())
2075 >        for (Integer v1 : new Integer[] { 1, null })
2076 >        for (Integer v2 : new Integer[] { 2, null })
2077 >    {
2078 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2079 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2080 >        final IncFunction[] rs = new IncFunction[6];
2081 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2082  
2083 <    /**
2084 <     * thenComposeAsync result completes exceptionally after
2085 <     * exceptional completion of source
2086 <     */
2087 <    public void testThenComposeAsync2() {
2088 <        CompletableFuture<Integer> f, g;
2089 <        CompletableFutureInc r;
2083 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2084 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2085 >        checkIncomplete(h0);
2086 >        checkIncomplete(h1);
2087 >        rs[0].assertNotInvoked();
2088 >        rs[1].assertNotInvoked();
2089 >        f.complete(v1);
2090 >        checkCompletedNormally(h0, inc(v1));
2091 >        checkCompletedNormally(h1, inc(v1));
2092 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2093 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2094 >        checkCompletedNormally(h2, inc(v1));
2095 >        checkCompletedNormally(h3, inc(v1));
2096 >        g.complete(v2);
2097  
2098 <        f = new CompletableFuture<>();
2099 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2100 <        f.completeExceptionally(new CFException());
2101 <        checkCompletedWithWrappedCFException(g);
2102 <        assertFalse(r.ran);
2098 >        // unspecified behavior - both source completions available
2099 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2100 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2101 >        rs[4].assertValue(h4.join());
2102 >        rs[5].assertValue(h5.join());
2103 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2104 >                   Objects.equals(inc(v2), h4.join()));
2105 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2106 >                   Objects.equals(inc(v2), h5.join()));
2107  
2108 <        f = new CompletableFuture<>();
2109 <        f.completeExceptionally(new CFException());
2110 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2111 <        checkCompletedWithWrappedCFException(g);
2112 <        assertFalse(r.ran);
2113 <    }
2108 >        checkCompletedNormally(f, v1);
2109 >        checkCompletedNormally(g, v2);
2110 >        checkCompletedNormally(h0, inc(v1));
2111 >        checkCompletedNormally(h1, inc(v1));
2112 >        checkCompletedNormally(h2, inc(v1));
2113 >        checkCompletedNormally(h3, inc(v1));
2114 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2115 >    }}
2116  
2117      /**
2118 <     * thenComposeAsync result completes exceptionally if action does
2118 >     * applyToEither result completes exceptionally after exceptional
2119 >     * completion of either source
2120       */
2121 <    public void testThenComposeAsync3() {
2122 <        CompletableFuture<Integer> f, g;
2123 <        FailingCompletableFutureFunction r;
2121 >    public void testApplyToEither_exceptionalCompletion() {
2122 >        for (ExecutionMode m : ExecutionMode.values())
2123 >        for (Integer v1 : new Integer[] { 1, null })
2124 >    {
2125 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2126 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2127 >        final CFException ex = new CFException();
2128 >        final IncFunction[] rs = new IncFunction[6];
2129 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2130  
2131 <        f = new CompletableFuture<>();
2132 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2133 <        f.complete(one);
2134 <        checkCompletedWithWrappedCFException(g);
2131 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2132 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2133 >        checkIncomplete(h0);
2134 >        checkIncomplete(h1);
2135 >        rs[0].assertNotInvoked();
2136 >        rs[1].assertNotInvoked();
2137 >        f.completeExceptionally(ex);
2138 >        checkCompletedWithWrappedException(h0, ex);
2139 >        checkCompletedWithWrappedException(h1, ex);
2140 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2141 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2142 >        checkCompletedWithWrappedException(h2, ex);
2143 >        checkCompletedWithWrappedException(h3, ex);
2144 >        g.complete(v1);
2145  
2146 <        f = new CompletableFuture<>();
2147 <        f.complete(one);
2148 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2149 <        checkCompletedWithWrappedCFException(g);
2150 <    }
2146 >        // unspecified behavior - both source completions available
2147 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2148 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2149 >        try {
2150 >            assertEquals(inc(v1), h4.join());
2151 >            rs[4].assertValue(inc(v1));
2152 >        } catch (CompletionException ok) {
2153 >            checkCompletedWithWrappedException(h4, ex);
2154 >            rs[4].assertNotInvoked();
2155 >        }
2156 >        try {
2157 >            assertEquals(inc(v1), h5.join());
2158 >            rs[5].assertValue(inc(v1));
2159 >        } catch (CompletionException ok) {
2160 >            checkCompletedWithWrappedException(h5, ex);
2161 >            rs[5].assertNotInvoked();
2162 >        }
2163  
2164 <    /**
2165 <     * thenComposeAsync result completes exceptionally if source cancelled
2166 <     */
2167 <    public void testThenComposeAsync4() {
2168 <        CompletableFuture<Integer> f, g;
2169 <        CompletableFutureInc r;
2164 >        checkCompletedExceptionally(f, ex);
2165 >        checkCompletedNormally(g, v1);
2166 >        checkCompletedWithWrappedException(h0, ex);
2167 >        checkCompletedWithWrappedException(h1, ex);
2168 >        checkCompletedWithWrappedException(h2, ex);
2169 >        checkCompletedWithWrappedException(h3, ex);
2170 >        checkCompletedWithWrappedException(h4, ex);
2171 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2172 >    }}
2173  
2174 <        f = new CompletableFuture<>();
2175 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2176 <        assertTrue(f.cancel(true));
2177 <        checkCompletedWithWrappedCancellationException(g);
2174 >    public void testApplyToEither_exceptionalCompletion2() {
2175 >        for (ExecutionMode m : ExecutionMode.values())
2176 >        for (boolean fFirst : new boolean[] { true, false })
2177 >        for (Integer v1 : new Integer[] { 1, null })
2178 >    {
2179 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2180 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2181 >        final CFException ex = new CFException();
2182 >        final IncFunction[] rs = new IncFunction[6];
2183 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2184  
2185 <        f = new CompletableFuture<>();
2186 <        assertTrue(f.cancel(true));
2187 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2188 <        checkCompletedWithWrappedCancellationException(g);
2189 <    }
2185 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2186 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2187 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2188 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2189 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2190 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2191 >
2192 >        // unspecified behavior - both source completions available
2193 >        try {
2194 >            assertEquals(inc(v1), h0.join());
2195 >            rs[0].assertValue(inc(v1));
2196 >        } catch (CompletionException ok) {
2197 >            checkCompletedWithWrappedException(h0, ex);
2198 >            rs[0].assertNotInvoked();
2199 >        }
2200 >        try {
2201 >            assertEquals(inc(v1), h1.join());
2202 >            rs[1].assertValue(inc(v1));
2203 >        } catch (CompletionException ok) {
2204 >            checkCompletedWithWrappedException(h1, ex);
2205 >            rs[1].assertNotInvoked();
2206 >        }
2207 >        try {
2208 >            assertEquals(inc(v1), h2.join());
2209 >            rs[2].assertValue(inc(v1));
2210 >        } catch (CompletionException ok) {
2211 >            checkCompletedWithWrappedException(h2, ex);
2212 >            rs[2].assertNotInvoked();
2213 >        }
2214 >        try {
2215 >            assertEquals(inc(v1), h3.join());
2216 >            rs[3].assertValue(inc(v1));
2217 >        } catch (CompletionException ok) {
2218 >            checkCompletedWithWrappedException(h3, ex);
2219 >            rs[3].assertNotInvoked();
2220 >        }
2221  
2222 <    // async with explicit executors
2222 >        checkCompletedNormally(f, v1);
2223 >        checkCompletedExceptionally(g, ex);
2224 >    }}
2225  
2226      /**
2227 <     * thenRunAsync result completes normally after normal completion of source
2227 >     * applyToEither result completes exceptionally if either source cancelled
2228       */
2229 <    public void testThenRunAsyncE() {
2230 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2231 <        Noop r = new Noop();
2232 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2233 <        f.complete(null);
2234 <        checkCompletedNormally(g, null);
2235 <
2236 <        // reordered version
2237 <        f = new CompletableFuture<>();
2275 <        f.complete(null);
2276 <        r = new Noop();
2277 <        g = f.thenRunAsync(r, new ThreadExecutor());
2278 <        checkCompletedNormally(g, null);
2279 <    }
2229 >    public void testApplyToEither_sourceCancelled() {
2230 >        for (ExecutionMode m : ExecutionMode.values())
2231 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2232 >        for (Integer v1 : new Integer[] { 1, null })
2233 >    {
2234 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2235 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2236 >        final IncFunction[] rs = new IncFunction[6];
2237 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2238  
2239 <    /**
2240 <     * thenRunAsync result completes exceptionally after exceptional
2241 <     * completion of source
2242 <     */
2243 <    public void testThenRunAsync2E() {
2244 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2245 <        Noop r = new Noop();
2246 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2247 <        f.completeExceptionally(new CFException());
2248 <        try {
2249 <            g.join();
2250 <            shouldThrow();
2251 <        } catch (CompletionException success) {}
2252 <        checkCompletedWithWrappedCFException(g);
2295 <    }
2239 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2240 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2241 >        checkIncomplete(h0);
2242 >        checkIncomplete(h1);
2243 >        rs[0].assertNotInvoked();
2244 >        rs[1].assertNotInvoked();
2245 >        f.cancel(mayInterruptIfRunning);
2246 >        checkCompletedWithWrappedCancellationException(h0);
2247 >        checkCompletedWithWrappedCancellationException(h1);
2248 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2249 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2250 >        checkCompletedWithWrappedCancellationException(h2);
2251 >        checkCompletedWithWrappedCancellationException(h3);
2252 >        g.complete(v1);
2253  
2254 <    /**
2255 <     * thenRunAsync result completes exceptionally if action does
2256 <     */
2257 <    public void testThenRunAsync3E() {
2258 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2259 <        FailingNoop r = new FailingNoop();
2260 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2261 <        f.complete(null);
2262 <        checkCompletedWithWrappedCFException(g);
2263 <    }
2254 >        // unspecified behavior - both source completions available
2255 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2256 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2257 >        try {
2258 >            assertEquals(inc(v1), h4.join());
2259 >            rs[4].assertValue(inc(v1));
2260 >        } catch (CompletionException ok) {
2261 >            checkCompletedWithWrappedCancellationException(h4);
2262 >            rs[4].assertNotInvoked();
2263 >        }
2264 >        try {
2265 >            assertEquals(inc(v1), h5.join());
2266 >            rs[5].assertValue(inc(v1));
2267 >        } catch (CompletionException ok) {
2268 >            checkCompletedWithWrappedCancellationException(h5);
2269 >            rs[5].assertNotInvoked();
2270 >        }
2271  
2272 <    /**
2273 <     * thenRunAsync result completes exceptionally if source cancelled
2274 <     */
2275 <    public void testThenRunAsync4E() {
2276 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2277 <        Noop r = new Noop();
2278 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2279 <        assertTrue(f.cancel(true));
2316 <        checkCompletedWithWrappedCancellationException(g);
2317 <    }
2272 >        checkCancelled(f);
2273 >        checkCompletedNormally(g, v1);
2274 >        checkCompletedWithWrappedCancellationException(h0);
2275 >        checkCompletedWithWrappedCancellationException(h1);
2276 >        checkCompletedWithWrappedCancellationException(h2);
2277 >        checkCompletedWithWrappedCancellationException(h3);
2278 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2279 >    }}
2280  
2281 <    /**
2282 <     * thenApplyAsync result completes normally after normal completion of source
2283 <     */
2284 <    public void testThenApplyAsyncE() {
2285 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2286 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2287 <        f.complete(one);
2288 <        checkCompletedNormally(g, two);
2289 <    }
2281 >    public void testApplyToEither_sourceCancelled2() {
2282 >        for (ExecutionMode m : ExecutionMode.values())
2283 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2284 >        for (boolean fFirst : new boolean[] { true, false })
2285 >        for (Integer v1 : new Integer[] { 1, null })
2286 >    {
2287 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2288 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2289 >        final IncFunction[] rs = new IncFunction[6];
2290 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2291  
2292 <    /**
2293 <     * thenApplyAsync result completes exceptionally after exceptional
2294 <     * completion of source
2295 <     */
2296 <    public void testThenApplyAsync2E() {
2297 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2298 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2299 <        f.completeExceptionally(new CFException());
2300 <        checkCompletedWithWrappedCFException(g);
2301 <    }
2292 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2293 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2294 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2295 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2296 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2297 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2298 >
2299 >        // unspecified behavior - both source completions available
2300 >        try {
2301 >            assertEquals(inc(v1), h0.join());
2302 >            rs[0].assertValue(inc(v1));
2303 >        } catch (CompletionException ok) {
2304 >            checkCompletedWithWrappedCancellationException(h0);
2305 >            rs[0].assertNotInvoked();
2306 >        }
2307 >        try {
2308 >            assertEquals(inc(v1), h1.join());
2309 >            rs[1].assertValue(inc(v1));
2310 >        } catch (CompletionException ok) {
2311 >            checkCompletedWithWrappedCancellationException(h1);
2312 >            rs[1].assertNotInvoked();
2313 >        }
2314 >        try {
2315 >            assertEquals(inc(v1), h2.join());
2316 >            rs[2].assertValue(inc(v1));
2317 >        } catch (CompletionException ok) {
2318 >            checkCompletedWithWrappedCancellationException(h2);
2319 >            rs[2].assertNotInvoked();
2320 >        }
2321 >        try {
2322 >            assertEquals(inc(v1), h3.join());
2323 >            rs[3].assertValue(inc(v1));
2324 >        } catch (CompletionException ok) {
2325 >            checkCompletedWithWrappedCancellationException(h3);
2326 >            rs[3].assertNotInvoked();
2327 >        }
2328  
2329 <    /**
2330 <     * thenApplyAsync result completes exceptionally if action does
2331 <     */
2343 <    public void testThenApplyAsync3E() {
2344 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2345 <        FailingFunction r = new FailingFunction();
2346 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2347 <        f.complete(null);
2348 <        checkCompletedWithWrappedCFException(g);
2349 <    }
2329 >        checkCompletedNormally(f, v1);
2330 >        checkCancelled(g);
2331 >    }}
2332  
2333      /**
2334 <     * thenApplyAsync result completes exceptionally if source cancelled
2334 >     * applyToEither result completes exceptionally if action does
2335       */
2336 <    public void testThenApplyAsync4E() {
2337 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2338 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2339 <        assertTrue(f.cancel(true));
2340 <        checkCompletedWithWrappedCancellationException(g);
2341 <    }
2336 >    public void testApplyToEither_actionFailed() {
2337 >        for (ExecutionMode m : ExecutionMode.values())
2338 >        for (Integer v1 : new Integer[] { 1, null })
2339 >        for (Integer v2 : new Integer[] { 2, null })
2340 >    {
2341 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2342 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2343 >        final FailingFunction[] rs = new FailingFunction[6];
2344 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2345  
2346 <    /**
2347 <     * thenAcceptAsync result completes normally after normal
2348 <     * completion of source
2349 <     */
2350 <    public void testThenAcceptAsyncE() {
2351 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2352 <        IncAction r = new IncAction();
2353 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2354 <        f.complete(one);
2355 <        checkCompletedNormally(g, null);
2371 <        assertEquals(r.value, 2);
2372 <    }
2346 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2347 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2348 >        f.complete(v1);
2349 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2350 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2351 >        checkCompletedWithWrappedCFException(h0);
2352 >        checkCompletedWithWrappedCFException(h1);
2353 >        checkCompletedWithWrappedCFException(h2);
2354 >        checkCompletedWithWrappedCFException(h3);
2355 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2356  
2357 <    /**
2375 <     * thenAcceptAsync result completes exceptionally after exceptional
2376 <     * completion of source
2377 <     */
2378 <    public void testThenAcceptAsync2E() {
2379 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2380 <        IncAction r = new IncAction();
2381 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2382 <        f.completeExceptionally(new CFException());
2383 <        checkCompletedWithWrappedCFException(g);
2384 <    }
2357 >        g.complete(v2);
2358  
2359 <    /**
2360 <     * thenAcceptAsync result completes exceptionally if action does
2361 <     */
2362 <    public void testThenAcceptAsync3E() {
2363 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2364 <        FailingConsumer r = new FailingConsumer();
2365 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2366 <        f.complete(null);
2367 <        checkCompletedWithWrappedCFException(g);
2368 <    }
2359 >        // unspecified behavior - both source completions available
2360 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2361 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2362 >
2363 >        checkCompletedWithWrappedCFException(h4);
2364 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2365 >                   Objects.equals(v2, rs[4].value));
2366 >        checkCompletedWithWrappedCFException(h5);
2367 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2368 >                   Objects.equals(v2, rs[5].value));
2369  
2370 <    /**
2371 <     * thenAcceptAsync result completes exceptionally if source cancelled
2372 <     */
2400 <    public void testThenAcceptAsync4E() {
2401 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2402 <        IncAction r = new IncAction();
2403 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2404 <        assertTrue(f.cancel(true));
2405 <        checkCompletedWithWrappedCancellationException(g);
2406 <    }
2370 >        checkCompletedNormally(f, v1);
2371 >        checkCompletedNormally(g, v2);
2372 >    }}
2373  
2374      /**
2375 <     * thenCombineAsync result completes normally after normal
2376 <     * completion of sources
2375 >     * acceptEither result completes normally after normal completion
2376 >     * of either source
2377       */
2378 <    public void testThenCombineAsyncE() {
2379 <        CompletableFuture<Integer> f, g, h;
2380 <        ThreadExecutor e = new ThreadExecutor();
2381 <        int count = 0;
2378 >    public void testAcceptEither_normalCompletion() {
2379 >        for (ExecutionMode m : ExecutionMode.values())
2380 >        for (Integer v1 : new Integer[] { 1, null })
2381 >        for (Integer v2 : new Integer[] { 2, null })
2382 >    {
2383 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2384 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2385 >        final NoopConsumer[] rs = new NoopConsumer[6];
2386 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2387  
2388 <        f = new CompletableFuture<>();
2389 <        g = new CompletableFuture<>();
2390 <        h = f.thenCombineAsync(g, subtract, e);
2391 <        f.complete(3);
2392 <        checkIncomplete(h);
2393 <        g.complete(1);
2394 <        checkCompletedNormally(h, 2);
2395 <        assertEquals(++count, e.count.get());
2388 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2389 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2390 >        checkIncomplete(h0);
2391 >        checkIncomplete(h1);
2392 >        rs[0].assertNotInvoked();
2393 >        rs[1].assertNotInvoked();
2394 >        f.complete(v1);
2395 >        checkCompletedNormally(h0, null);
2396 >        checkCompletedNormally(h1, null);
2397 >        rs[0].assertValue(v1);
2398 >        rs[1].assertValue(v1);
2399 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2400 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2401 >        checkCompletedNormally(h2, null);
2402 >        checkCompletedNormally(h3, null);
2403 >        rs[2].assertValue(v1);
2404 >        rs[3].assertValue(v1);
2405 >        g.complete(v2);
2406  
2407 <        f = new CompletableFuture<>();
2408 <        g = new CompletableFuture<>();
2409 <        h = f.thenCombineAsync(g, subtract, e);
2410 <        g.complete(1);
2411 <        checkIncomplete(h);
2412 <        f.complete(3);
2413 <        checkCompletedNormally(h, 2);
2414 <        assertEquals(++count, e.count.get());
2407 >        // unspecified behavior - both source completions available
2408 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2409 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2410 >        checkCompletedNormally(h4, null);
2411 >        checkCompletedNormally(h5, null);
2412 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2413 >                   Objects.equals(v2, rs[4].value));
2414 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2415 >                   Objects.equals(v2, rs[5].value));
2416  
2417 <        f = new CompletableFuture<>();
2418 <        g = new CompletableFuture<>();
2419 <        g.complete(1);
2420 <        f.complete(3);
2421 <        h = f.thenCombineAsync(g, subtract, e);
2422 <        checkCompletedNormally(h, 2);
2423 <        assertEquals(++count, e.count.get());
2424 <    }
2417 >        checkCompletedNormally(f, v1);
2418 >        checkCompletedNormally(g, v2);
2419 >        checkCompletedNormally(h0, null);
2420 >        checkCompletedNormally(h1, null);
2421 >        checkCompletedNormally(h2, null);
2422 >        checkCompletedNormally(h3, null);
2423 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2424 >    }}
2425  
2426      /**
2427 <     * thenCombineAsync result completes exceptionally after exceptional
2427 >     * acceptEither result completes exceptionally after exceptional
2428       * completion of either source
2429       */
2430 <    public void testThenCombineAsync2E() {
2431 <        CompletableFuture<Integer> f, g, h;
2432 <        ThreadExecutor e = new ThreadExecutor();
2433 <        int count = 0;
2434 <
2435 <        f = new CompletableFuture<>();
2436 <        g = new CompletableFuture<>();
2437 <        h = f.thenCombineAsync(g, subtract, e);
2438 <        f.completeExceptionally(new CFException());
2457 <        checkIncomplete(h);
2458 <        g.complete(1);
2459 <        checkCompletedWithWrappedCFException(h);
2460 <
2461 <        f = new CompletableFuture<>();
2462 <        g = new CompletableFuture<>();
2463 <        h = f.thenCombineAsync(g, subtract, e);
2464 <        g.completeExceptionally(new CFException());
2465 <        checkIncomplete(h);
2466 <        f.complete(3);
2467 <        checkCompletedWithWrappedCFException(h);
2468 <
2469 <        f = new CompletableFuture<>();
2470 <        g = new CompletableFuture<>();
2471 <        g.completeExceptionally(new CFException());
2472 <        h = f.thenCombineAsync(g, subtract, e);
2473 <        checkIncomplete(h);
2474 <        f.complete(3);
2475 <        checkCompletedWithWrappedCFException(h);
2476 <
2477 <        assertEquals(0, e.count.get());
2478 <    }
2430 >    public void testAcceptEither_exceptionalCompletion() {
2431 >        for (ExecutionMode m : ExecutionMode.values())
2432 >        for (Integer v1 : new Integer[] { 1, null })
2433 >    {
2434 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2435 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2436 >        final CFException ex = new CFException();
2437 >        final NoopConsumer[] rs = new NoopConsumer[6];
2438 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2439  
2440 <    /**
2441 <     * thenCombineAsync result completes exceptionally if action does
2442 <     */
2443 <    public void testThenCombineAsync3E() {
2444 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2445 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2446 <        FailingBiFunction r = new FailingBiFunction();
2447 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2448 <        f.complete(one);
2449 <        checkIncomplete(g);
2450 <        assertFalse(r.ran);
2451 <        f2.complete(two);
2452 <        checkCompletedWithWrappedCFException(g);
2493 <        assertTrue(r.ran);
2494 <    }
2440 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2441 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2442 >        checkIncomplete(h0);
2443 >        checkIncomplete(h1);
2444 >        rs[0].assertNotInvoked();
2445 >        rs[1].assertNotInvoked();
2446 >        f.completeExceptionally(ex);
2447 >        checkCompletedWithWrappedException(h0, ex);
2448 >        checkCompletedWithWrappedException(h1, ex);
2449 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2450 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2451 >        checkCompletedWithWrappedException(h2, ex);
2452 >        checkCompletedWithWrappedException(h3, ex);
2453  
2454 <    /**
2497 <     * thenCombineAsync result completes exceptionally if either source cancelled
2498 <     */
2499 <    public void testThenCombineAsync4E() {
2500 <        CompletableFuture<Integer> f, g, h;
2501 <        ThreadExecutor e = new ThreadExecutor();
2454 >        g.complete(v1);
2455  
2456 <        f = new CompletableFuture<>();
2457 <        g = new CompletableFuture<>();
2458 <        h = f.thenCombineAsync(g, subtract, e);
2459 <        assertTrue(f.cancel(true));
2460 <        checkIncomplete(h);
2461 <        g.complete(1);
2462 <        checkCompletedWithWrappedCancellationException(h);
2456 >        // unspecified behavior - both source completions available
2457 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2458 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2459 >        try {
2460 >            assertNull(h4.join());
2461 >            rs[4].assertValue(v1);
2462 >        } catch (CompletionException ok) {
2463 >            checkCompletedWithWrappedException(h4, ex);
2464 >            rs[4].assertNotInvoked();
2465 >        }
2466 >        try {
2467 >            assertNull(h5.join());
2468 >            rs[5].assertValue(v1);
2469 >        } catch (CompletionException ok) {
2470 >            checkCompletedWithWrappedException(h5, ex);
2471 >            rs[5].assertNotInvoked();
2472 >        }
2473  
2474 <        f = new CompletableFuture<>();
2475 <        g = new CompletableFuture<>();
2476 <        h = f.thenCombineAsync(g, subtract, e);
2477 <        assertTrue(g.cancel(true));
2478 <        checkIncomplete(h);
2479 <        f.complete(3);
2480 <        checkCompletedWithWrappedCancellationException(h);
2474 >        checkCompletedExceptionally(f, ex);
2475 >        checkCompletedNormally(g, v1);
2476 >        checkCompletedWithWrappedException(h0, ex);
2477 >        checkCompletedWithWrappedException(h1, ex);
2478 >        checkCompletedWithWrappedException(h2, ex);
2479 >        checkCompletedWithWrappedException(h3, ex);
2480 >        checkCompletedWithWrappedException(h4, ex);
2481 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2482 >    }}
2483  
2484 <        f = new CompletableFuture<>();
2485 <        g = new CompletableFuture<>();
2486 <        assertTrue(g.cancel(true));
2487 <        h = f.thenCombineAsync(g, subtract, e);
2488 <        checkIncomplete(h);
2489 <        f.complete(3);
2490 <        checkCompletedWithWrappedCancellationException(h);
2484 >    public void testAcceptEither_exceptionalCompletion2() {
2485 >        for (ExecutionMode m : ExecutionMode.values())
2486 >        for (boolean fFirst : new boolean[] { true, false })
2487 >        for (Integer v1 : new Integer[] { 1, null })
2488 >    {
2489 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2490 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2491 >        final CFException ex = new CFException();
2492 >        final NoopConsumer[] rs = new NoopConsumer[6];
2493 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2494  
2495 <        f = new CompletableFuture<>();
2496 <        g = new CompletableFuture<>();
2497 <        assertTrue(f.cancel(true));
2498 <        assertTrue(g.cancel(true));
2499 <        h = f.thenCombineAsync(g, subtract, e);
2500 <        checkCompletedWithWrappedCancellationException(h);
2495 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2496 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2497 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2498 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2499 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2500 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2501 >
2502 >        // unspecified behavior - both source completions available
2503 >        try {
2504 >            assertEquals(null, h0.join());
2505 >            rs[0].assertValue(v1);
2506 >        } catch (CompletionException ok) {
2507 >            checkCompletedWithWrappedException(h0, ex);
2508 >            rs[0].assertNotInvoked();
2509 >        }
2510 >        try {
2511 >            assertEquals(null, h1.join());
2512 >            rs[1].assertValue(v1);
2513 >        } catch (CompletionException ok) {
2514 >            checkCompletedWithWrappedException(h1, ex);
2515 >            rs[1].assertNotInvoked();
2516 >        }
2517 >        try {
2518 >            assertEquals(null, h2.join());
2519 >            rs[2].assertValue(v1);
2520 >        } catch (CompletionException ok) {
2521 >            checkCompletedWithWrappedException(h2, ex);
2522 >            rs[2].assertNotInvoked();
2523 >        }
2524 >        try {
2525 >            assertEquals(null, h3.join());
2526 >            rs[3].assertValue(v1);
2527 >        } catch (CompletionException ok) {
2528 >            checkCompletedWithWrappedException(h3, ex);
2529 >            rs[3].assertNotInvoked();
2530 >        }
2531  
2532 <        assertEquals(0, e.count.get());
2533 <    }
2532 >        checkCompletedNormally(f, v1);
2533 >        checkCompletedExceptionally(g, ex);
2534 >    }}
2535  
2536      /**
2537 <     * thenAcceptBothAsync result completes normally after normal
2539 <     * completion of sources
2537 >     * acceptEither result completes exceptionally if either source cancelled
2538       */
2539 <    public void testThenAcceptBothAsyncE() {
2540 <        CompletableFuture<Integer> f, g;
2541 <        CompletableFuture<Void> h;
2542 <        SubtractAction r;
2543 <        ThreadExecutor e = new ThreadExecutor();
2539 >    public void testAcceptEither_sourceCancelled() {
2540 >        for (ExecutionMode m : ExecutionMode.values())
2541 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2542 >        for (Integer v1 : new Integer[] { 1, null })
2543 >    {
2544 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2545 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2546 >        final NoopConsumer[] rs = new NoopConsumer[6];
2547 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2548  
2549 <        f = new CompletableFuture<>();
2550 <        g = new CompletableFuture<>();
2551 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2552 <        f.complete(3);
2553 <        checkIncomplete(h);
2554 <        g.complete(1);
2555 <        checkCompletedNormally(h, null);
2556 <        assertEquals(r.value, 2);
2549 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2550 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2551 >        checkIncomplete(h0);
2552 >        checkIncomplete(h1);
2553 >        rs[0].assertNotInvoked();
2554 >        rs[1].assertNotInvoked();
2555 >        f.cancel(mayInterruptIfRunning);
2556 >        checkCompletedWithWrappedCancellationException(h0);
2557 >        checkCompletedWithWrappedCancellationException(h1);
2558 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2559 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2560 >        checkCompletedWithWrappedCancellationException(h2);
2561 >        checkCompletedWithWrappedCancellationException(h3);
2562  
2563 <        f = new CompletableFuture<>();
2557 <        g = new CompletableFuture<>();
2558 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2559 <        g.complete(1);
2560 <        checkIncomplete(h);
2561 <        f.complete(3);
2562 <        checkCompletedNormally(h, null);
2563 <        assertEquals(r.value, 2);
2563 >        g.complete(v1);
2564  
2565 <        f = new CompletableFuture<>();
2566 <        g = new CompletableFuture<>();
2567 <        g.complete(1);
2568 <        f.complete(3);
2569 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2570 <        checkCompletedNormally(h, null);
2571 <        assertEquals(r.value, 2);
2565 >        // unspecified behavior - both source completions available
2566 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2567 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2568 >        try {
2569 >            assertNull(h4.join());
2570 >            rs[4].assertValue(v1);
2571 >        } catch (CompletionException ok) {
2572 >            checkCompletedWithWrappedCancellationException(h4);
2573 >            rs[4].assertNotInvoked();
2574 >        }
2575 >        try {
2576 >            assertNull(h5.join());
2577 >            rs[5].assertValue(v1);
2578 >        } catch (CompletionException ok) {
2579 >            checkCompletedWithWrappedCancellationException(h5);
2580 >            rs[5].assertNotInvoked();
2581 >        }
2582  
2583 <        assertEquals(3, e.count.get());
2584 <    }
2583 >        checkCancelled(f);
2584 >        checkCompletedNormally(g, v1);
2585 >        checkCompletedWithWrappedCancellationException(h0);
2586 >        checkCompletedWithWrappedCancellationException(h1);
2587 >        checkCompletedWithWrappedCancellationException(h2);
2588 >        checkCompletedWithWrappedCancellationException(h3);
2589 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2590 >    }}
2591  
2592      /**
2593 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2578 <     * completion of source
2593 >     * acceptEither result completes exceptionally if action does
2594       */
2595 <    public void testThenAcceptBothAsync2E() {
2596 <        CompletableFuture<Integer> f, g;
2597 <        CompletableFuture<Void> h;
2598 <        SubtractAction r;
2599 <        ThreadExecutor e = new ThreadExecutor();
2600 <
2601 <        f = new CompletableFuture<>();
2602 <        g = new CompletableFuture<>();
2603 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2589 <        f.completeExceptionally(new CFException());
2590 <        checkIncomplete(h);
2591 <        g.complete(1);
2592 <        checkCompletedWithWrappedCFException(h);
2593 <
2594 <        f = new CompletableFuture<>();
2595 <        g = new CompletableFuture<>();
2596 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2597 <        g.completeExceptionally(new CFException());
2598 <        checkIncomplete(h);
2599 <        f.complete(3);
2600 <        checkCompletedWithWrappedCFException(h);
2601 <
2602 <        f = new CompletableFuture<>();
2603 <        g = new CompletableFuture<>();
2604 <        f.complete(3);
2605 <        g.completeExceptionally(new CFException());
2606 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2607 <        checkCompletedWithWrappedCFException(h);
2608 <
2609 <        f = new CompletableFuture<>();
2610 <        g = new CompletableFuture<>();
2611 <        f.completeExceptionally(new CFException());
2612 <        g.complete(3);
2613 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2614 <        checkCompletedWithWrappedCFException(h);
2615 <
2616 <        assertEquals(0, e.count.get());
2617 <    }
2595 >    public void testAcceptEither_actionFailed() {
2596 >        for (ExecutionMode m : ExecutionMode.values())
2597 >        for (Integer v1 : new Integer[] { 1, null })
2598 >        for (Integer v2 : new Integer[] { 2, null })
2599 >    {
2600 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2601 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2602 >        final FailingConsumer[] rs = new FailingConsumer[6];
2603 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2604  
2605 <    /**
2606 <     * thenAcceptBothAsync result completes exceptionally if action does
2607 <     */
2608 <    public void testThenAcceptBothAsync3E() {
2609 <        CompletableFuture<Integer> f, g;
2610 <        CompletableFuture<Void> h;
2611 <        FailingBiConsumer r;
2612 <        ThreadExecutor e = new ThreadExecutor();
2605 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2606 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2607 >        f.complete(v1);
2608 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2609 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2610 >        checkCompletedWithWrappedCFException(h0);
2611 >        checkCompletedWithWrappedCFException(h1);
2612 >        checkCompletedWithWrappedCFException(h2);
2613 >        checkCompletedWithWrappedCFException(h3);
2614 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2615  
2616 <        f = new CompletableFuture<>();
2629 <        g = new CompletableFuture<>();
2630 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2631 <        f.complete(3);
2632 <        checkIncomplete(h);
2633 <        g.complete(1);
2634 <        checkCompletedWithWrappedCFException(h);
2616 >        g.complete(v2);
2617  
2618 <        f = new CompletableFuture<>();
2619 <        g = new CompletableFuture<>();
2620 <        f.complete(3);
2621 <        g.complete(1);
2622 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2623 <        checkCompletedWithWrappedCFException(h);
2618 >        // unspecified behavior - both source completions available
2619 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2620 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2621 >
2622 >        checkCompletedWithWrappedCFException(h4);
2623 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2624 >                   Objects.equals(v2, rs[4].value));
2625 >        checkCompletedWithWrappedCFException(h5);
2626 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2627 >                   Objects.equals(v2, rs[5].value));
2628  
2629 <        assertEquals(2, e.count.get());
2630 <    }
2629 >        checkCompletedNormally(f, v1);
2630 >        checkCompletedNormally(g, v2);
2631 >    }}
2632  
2633      /**
2634 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2634 >     * runAfterEither result completes normally after normal completion
2635 >     * of either source
2636       */
2637 <    public void testThenAcceptBothAsync4E() {
2638 <        CompletableFuture<Integer> f, g;
2639 <        CompletableFuture<Void> h;
2640 <        SubtractAction r;
2641 <        ThreadExecutor e = new ThreadExecutor();
2642 <
2643 <        f = new CompletableFuture<>();
2644 <        g = new CompletableFuture<>();
2645 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2658 <        assertTrue(f.cancel(true));
2659 <        checkIncomplete(h);
2660 <        g.complete(1);
2661 <        checkCompletedWithWrappedCancellationException(h);
2637 >    public void testRunAfterEither_normalCompletion() {
2638 >        for (ExecutionMode m : ExecutionMode.values())
2639 >        for (Integer v1 : new Integer[] { 1, null })
2640 >        for (Integer v2 : new Integer[] { 2, null })
2641 >    {
2642 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2643 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2644 >        final Noop[] rs = new Noop[6];
2645 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2646  
2647 <        f = new CompletableFuture<>();
2648 <        g = new CompletableFuture<>();
2649 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2650 <        assertTrue(g.cancel(true));
2651 <        checkIncomplete(h);
2652 <        f.complete(3);
2653 <        checkCompletedWithWrappedCancellationException(h);
2647 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2648 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2649 >        checkIncomplete(h0);
2650 >        checkIncomplete(h1);
2651 >        rs[0].assertNotInvoked();
2652 >        rs[1].assertNotInvoked();
2653 >        f.complete(v1);
2654 >        checkCompletedNormally(h0, null);
2655 >        checkCompletedNormally(h1, null);
2656 >        rs[0].assertInvoked();
2657 >        rs[1].assertInvoked();
2658 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2659 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2660 >        checkCompletedNormally(h2, null);
2661 >        checkCompletedNormally(h3, null);
2662 >        rs[2].assertInvoked();
2663 >        rs[3].assertInvoked();
2664  
2665 <        f = new CompletableFuture<>();
2672 <        g = new CompletableFuture<>();
2673 <        f.complete(3);
2674 <        assertTrue(g.cancel(true));
2675 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2676 <        checkCompletedWithWrappedCancellationException(h);
2665 >        g.complete(v2);
2666  
2667 <        f = new CompletableFuture<>();
2668 <        g = new CompletableFuture<>();
2680 <        assertTrue(f.cancel(true));
2681 <        g.complete(3);
2682 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2683 <        checkCompletedWithWrappedCancellationException(h);
2667 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2668 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2669  
2670 <        assertEquals(0, e.count.get());
2671 <    }
2670 >        checkCompletedNormally(f, v1);
2671 >        checkCompletedNormally(g, v2);
2672 >        checkCompletedNormally(h0, null);
2673 >        checkCompletedNormally(h1, null);
2674 >        checkCompletedNormally(h2, null);
2675 >        checkCompletedNormally(h3, null);
2676 >        checkCompletedNormally(h4, null);
2677 >        checkCompletedNormally(h5, null);
2678 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2679 >    }}
2680  
2681      /**
2682 <     * applyToEitherAsync result completes normally after normal
2683 <     * completion of sources
2682 >     * runAfterEither result completes exceptionally after exceptional
2683 >     * completion of either source
2684       */
2685 <    public void testApplyToEitherAsyncE() {
2686 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2687 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2688 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2689 <        f.complete(one);
2690 <        checkCompletedNormally(g, two);
2691 <
2692 <        f = new CompletableFuture<>();
2693 <        f.complete(one);
2701 <        f2 = new CompletableFuture<>();
2702 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2703 <        checkCompletedNormally(g, two);
2704 <    }
2685 >    public void testRunAfterEither_exceptionalCompletion() {
2686 >        for (ExecutionMode m : ExecutionMode.values())
2687 >        for (Integer v1 : new Integer[] { 1, null })
2688 >    {
2689 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2690 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2691 >        final CFException ex = new CFException();
2692 >        final Noop[] rs = new Noop[6];
2693 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2694  
2695 <    /**
2696 <     * applyToEitherAsync result completes exceptionally after exceptional
2697 <     * completion of 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);
2695 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2696 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2697 >        checkIncomplete(h0);
2698 >        checkIncomplete(h1);
2699 >        rs[0].assertNotInvoked();
2700 >        rs[1].assertNotInvoked();
2701 >        assertTrue(f.completeExceptionally(ex));
2702 >        checkCompletedWithWrappedException(h0, ex);
2703 >        checkCompletedWithWrappedException(h1, ex);
2704 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2705 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2706 >        checkCompletedWithWrappedException(h2, ex);
2707 >        checkCompletedWithWrappedException(h3, ex);
2708 >
2709 >        assertTrue(g.complete(v1));
2710 >
2711 >        // unspecified behavior - both source completions available
2712 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2713 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2714 >        try {
2715 >            assertNull(h4.join());
2716 >            rs[4].assertInvoked();
2717 >        } catch (CompletionException ok) {
2718 >            checkCompletedWithWrappedException(h4, ex);
2719 >            rs[4].assertNotInvoked();
2720 >        }
2721 >        try {
2722 >            assertNull(h5.join());
2723 >            rs[5].assertInvoked();
2724 >        } catch (CompletionException ok) {
2725 >            checkCompletedWithWrappedException(h5, ex);
2726 >            rs[5].assertNotInvoked();
2727 >        }
2728  
2729 <        f = new CompletableFuture<>();
2730 <        f2 = new CompletableFuture<>();
2731 <        f2.completeExceptionally(new CFException());
2732 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2733 <        f.complete(one);
2734 <        checkCompletedWithWrappedCFException(g);
2735 <    }
2729 >        checkCompletedExceptionally(f, ex);
2730 >        checkCompletedNormally(g, v1);
2731 >        checkCompletedWithWrappedException(h0, ex);
2732 >        checkCompletedWithWrappedException(h1, ex);
2733 >        checkCompletedWithWrappedException(h2, ex);
2734 >        checkCompletedWithWrappedException(h3, ex);
2735 >        checkCompletedWithWrappedException(h4, ex);
2736 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2737 >    }}
2738  
2739 <    /**
2740 <     * applyToEitherAsync result completes exceptionally if action does
2741 <     */
2742 <    public void testApplyToEitherAsync3E() {
2743 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2744 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2745 <        FailingFunction r = new FailingFunction();
2746 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2747 <        f.complete(one);
2748 <        checkCompletedWithWrappedCFException(g);
2735 <    }
2739 >    public void testRunAfterEither_exceptionalCompletion2() {
2740 >        for (ExecutionMode m : ExecutionMode.values())
2741 >        for (boolean fFirst : new boolean[] { true, false })
2742 >        for (Integer v1 : new Integer[] { 1, null })
2743 >    {
2744 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2745 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2746 >        final CFException ex = new CFException();
2747 >        final Noop[] rs = new Noop[6];
2748 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2749  
2750 <    /**
2751 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2752 <     */
2753 <    public void testApplyToEitherAsync4E() {
2754 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2755 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2756 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2757 <        assertTrue(f.cancel(true));
2758 <        checkCompletedWithWrappedCancellationException(g);
2750 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2751 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2752 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2753 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2754 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2755 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2756 >
2757 >        // unspecified behavior - both source completions available
2758 >        try {
2759 >            assertEquals(null, h0.join());
2760 >            rs[0].assertInvoked();
2761 >        } catch (CompletionException ok) {
2762 >            checkCompletedWithWrappedException(h0, ex);
2763 >            rs[0].assertNotInvoked();
2764 >        }
2765 >        try {
2766 >            assertEquals(null, h1.join());
2767 >            rs[1].assertInvoked();
2768 >        } catch (CompletionException ok) {
2769 >            checkCompletedWithWrappedException(h1, ex);
2770 >            rs[1].assertNotInvoked();
2771 >        }
2772 >        try {
2773 >            assertEquals(null, h2.join());
2774 >            rs[2].assertInvoked();
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedException(h2, ex);
2777 >            rs[2].assertNotInvoked();
2778 >        }
2779 >        try {
2780 >            assertEquals(null, h3.join());
2781 >            rs[3].assertInvoked();
2782 >        } catch (CompletionException ok) {
2783 >            checkCompletedWithWrappedException(h3, ex);
2784 >            rs[3].assertNotInvoked();
2785 >        }
2786  
2787 <        f = new CompletableFuture<>();
2788 <        f2 = new CompletableFuture<>();
2789 <        assertTrue(f2.cancel(true));
2750 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2751 <        checkCompletedWithWrappedCancellationException(g);
2752 <    }
2787 >        checkCompletedNormally(f, v1);
2788 >        checkCompletedExceptionally(g, ex);
2789 >    }}
2790  
2791      /**
2792 <     * acceptEitherAsync result completes normally after normal
2756 <     * completion of sources
2792 >     * runAfterEither result completes exceptionally if either source cancelled
2793       */
2794 <    public void testAcceptEitherAsyncE() {
2795 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2796 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2797 <        IncAction r = new IncAction();
2798 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2799 <        f.complete(one);
2800 <        checkCompletedNormally(g, null);
2801 <        assertEquals(r.value, 2);
2802 <
2767 <        r = new IncAction();
2768 <        f = new CompletableFuture<>();
2769 <        f.complete(one);
2770 <        f2 = new CompletableFuture<>();
2771 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2772 <        checkCompletedNormally(g, null);
2773 <        assertEquals(r.value, 2);
2774 <    }
2794 >    public void testRunAfterEither_sourceCancelled() {
2795 >        for (ExecutionMode m : ExecutionMode.values())
2796 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2797 >        for (Integer v1 : new Integer[] { 1, null })
2798 >    {
2799 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2801 >        final Noop[] rs = new Noop[6];
2802 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2803  
2804 <    /**
2805 <     * acceptEitherAsync result completes exceptionally after exceptional
2806 <     * completion of source
2807 <     */
2808 <    public void testAcceptEitherAsync2E() {
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.completeExceptionally(new CFException());
2814 <        checkCompletedWithWrappedCFException(g);
2804 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2805 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2806 >        checkIncomplete(h0);
2807 >        checkIncomplete(h1);
2808 >        rs[0].assertNotInvoked();
2809 >        rs[1].assertNotInvoked();
2810 >        f.cancel(mayInterruptIfRunning);
2811 >        checkCompletedWithWrappedCancellationException(h0);
2812 >        checkCompletedWithWrappedCancellationException(h1);
2813 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2814 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2815 >        checkCompletedWithWrappedCancellationException(h2);
2816 >        checkCompletedWithWrappedCancellationException(h3);
2817 >
2818 >        assertTrue(g.complete(v1));
2819 >
2820 >        // unspecified behavior - both source completions available
2821 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2822 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2823 >        try {
2824 >            assertNull(h4.join());
2825 >            rs[4].assertInvoked();
2826 >        } catch (CompletionException ok) {
2827 >            checkCompletedWithWrappedCancellationException(h4);
2828 >            rs[4].assertNotInvoked();
2829 >        }
2830 >        try {
2831 >            assertNull(h5.join());
2832 >            rs[5].assertInvoked();
2833 >        } catch (CompletionException ok) {
2834 >            checkCompletedWithWrappedCancellationException(h5);
2835 >            rs[5].assertNotInvoked();
2836 >        }
2837  
2838 <        r = new IncAction();
2839 <        f = new CompletableFuture<>();
2840 <        f2 = new CompletableFuture<>();
2841 <        f2.completeExceptionally(new CFException());
2842 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2843 <        f.complete(one);
2844 <        checkCompletedWithWrappedCFException(g);
2845 <    }
2838 >        checkCancelled(f);
2839 >        checkCompletedNormally(g, v1);
2840 >        checkCompletedWithWrappedCancellationException(h0);
2841 >        checkCompletedWithWrappedCancellationException(h1);
2842 >        checkCompletedWithWrappedCancellationException(h2);
2843 >        checkCompletedWithWrappedCancellationException(h3);
2844 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2845 >    }}
2846  
2847      /**
2848 <     * acceptEitherAsync result completes exceptionally if action does
2848 >     * runAfterEither result completes exceptionally if action does
2849       */
2850 <    public void testAcceptEitherAsync3E() {
2851 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2852 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2853 <        FailingConsumer r = new FailingConsumer();
2854 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2855 <        f.complete(one);
2856 <        checkCompletedWithWrappedCFException(g);
2857 <    }
2850 >    public void testRunAfterEither_actionFailed() {
2851 >        for (ExecutionMode m : ExecutionMode.values())
2852 >        for (Integer v1 : new Integer[] { 1, null })
2853 >        for (Integer v2 : new Integer[] { 2, null })
2854 >    {
2855 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2856 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2857 >        final FailingRunnable[] rs = new FailingRunnable[6];
2858 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2859  
2860 <    /**
2861 <     * acceptEitherAsync result completes exceptionally if either
2862 <     * source cancelled
2863 <     */
2864 <    public void testAcceptEitherAsync4E() {
2865 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2866 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2867 <        IncAction r = new IncAction();
2868 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2869 <        assertTrue(f.cancel(true));
2870 <        checkCompletedWithWrappedCancellationException(g);
2860 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2861 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2862 >        assertTrue(f.complete(v1));
2863 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2864 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2865 >        checkCompletedWithWrappedCFException(h0);
2866 >        checkCompletedWithWrappedCFException(h1);
2867 >        checkCompletedWithWrappedCFException(h2);
2868 >        checkCompletedWithWrappedCFException(h3);
2869 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2870 >        assertTrue(g.complete(v2));
2871 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2872 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2873 >        checkCompletedWithWrappedCFException(h4);
2874 >        checkCompletedWithWrappedCFException(h5);
2875  
2876 <        r = new IncAction();
2877 <        f = new CompletableFuture<>();
2878 <        f2 = new CompletableFuture<>();
2879 <        assertTrue(f2.cancel(true));
2825 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2826 <        checkCompletedWithWrappedCancellationException(g);
2827 <    }
2876 >        checkCompletedNormally(f, v1);
2877 >        checkCompletedNormally(g, v2);
2878 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2879 >    }}
2880  
2881      /**
2882 <     * runAfterEitherAsync result completes normally after normal
2831 <     * completion of sources
2882 >     * thenCompose result completes normally after normal completion of source
2883       */
2884 <    public void testRunAfterEitherAsyncE() {
2885 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2886 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2887 <        Noop r = new Noop();
2888 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2889 <        f.complete(one);
2890 <        checkCompletedNormally(g, null);
2891 <        assertTrue(r.ran);
2884 >    public void testThenCompose_normalCompletion() {
2885 >        for (ExecutionMode m : ExecutionMode.values())
2886 >        for (boolean createIncomplete : new boolean[] { true, false })
2887 >        for (Integer v1 : new Integer[] { 1, null })
2888 >    {
2889 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2890 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2891 >        if (!createIncomplete) assertTrue(f.complete(v1));
2892 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2893 >        if (createIncomplete) assertTrue(f.complete(v1));
2894  
2895 <        r = new Noop();
2896 <        f = new CompletableFuture<>();
2897 <        f.complete(one);
2898 <        f2 = new CompletableFuture<>();
2846 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2847 <        checkCompletedNormally(g, null);
2848 <        assertTrue(r.ran);
2849 <    }
2895 >        checkCompletedNormally(g, inc(v1));
2896 >        checkCompletedNormally(f, v1);
2897 >        r.assertValue(v1);
2898 >    }}
2899  
2900      /**
2901 <     * runAfterEitherAsync result completes exceptionally after exceptional
2901 >     * thenCompose result completes exceptionally after exceptional
2902       * completion of source
2903       */
2904 <    public void testRunAfterEitherAsync2E() {
2905 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2906 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2907 <        Noop r = new Noop();
2908 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2909 <        f.completeExceptionally(new CFException());
2910 <        checkCompletedWithWrappedCFException(g);
2911 <
2912 <        r = new Noop();
2913 <        f = new CompletableFuture<>();
2914 <        f2 = new CompletableFuture<>();
2915 <        f2.completeExceptionally(new CFException());
2916 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2917 <        f.complete(one);
2918 <        checkCompletedWithWrappedCFException(g);
2870 <    }
2871 <
2872 <    /**
2873 <     * runAfterEitherAsync result completes exceptionally if action does
2874 <     */
2875 <    public void testRunAfterEitherAsync3E() {
2876 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2877 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2878 <        FailingNoop r = new FailingNoop();
2879 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2880 <        f.complete(one);
2881 <        checkCompletedWithWrappedCFException(g);
2882 <    }
2883 <
2884 <    /**
2885 <     * runAfterEitherAsync result completes exceptionally if either
2886 <     * source cancelled
2887 <     */
2888 <    public void testRunAfterEitherAsync4E() {
2889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2890 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2891 <        Noop r = new Noop();
2892 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2893 <        assertTrue(f.cancel(true));
2894 <        checkCompletedWithWrappedCancellationException(g);
2895 <
2896 <        r = new Noop();
2897 <        f = new CompletableFuture<>();
2898 <        f2 = new CompletableFuture<>();
2899 <        assertTrue(f2.cancel(true));
2900 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2901 <        checkCompletedWithWrappedCancellationException(g);
2902 <    }
2904 >    public void testThenCompose_exceptionalCompletion() {
2905 >        for (ExecutionMode m : ExecutionMode.values())
2906 >        for (boolean createIncomplete : new boolean[] { true, false })
2907 >    {
2908 >        final CFException ex = new CFException();
2909 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2910 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2911 >        if (!createIncomplete) f.completeExceptionally(ex);
2912 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2913 >        if (createIncomplete) f.completeExceptionally(ex);
2914 >
2915 >        checkCompletedWithWrappedException(g, ex);
2916 >        checkCompletedExceptionally(f, ex);
2917 >        r.assertNotInvoked();
2918 >    }}
2919  
2920      /**
2921 <     * thenComposeAsync result completes normally after normal
2906 <     * completion of source
2921 >     * thenCompose result completes exceptionally if action does
2922       */
2923 <    public void testThenComposeAsyncE() {
2924 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2925 <        CompletableFutureInc r = new CompletableFutureInc();
2926 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2927 <        f.complete(one);
2928 <        checkCompletedNormally(g, two);
2929 <    }
2923 >    public void testThenCompose_actionFailed() {
2924 >        for (ExecutionMode m : ExecutionMode.values())
2925 >        for (boolean createIncomplete : new boolean[] { true, false })
2926 >        for (Integer v1 : new Integer[] { 1, null })
2927 >    {
2928 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2929 >        final FailingCompletableFutureFunction r
2930 >            = new FailingCompletableFutureFunction(m);
2931 >        if (!createIncomplete) assertTrue(f.complete(v1));
2932 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2933 >        if (createIncomplete) assertTrue(f.complete(v1));
2934  
2916    /**
2917     * thenComposeAsync result completes exceptionally after
2918     * exceptional completion of source
2919     */
2920    public void testThenComposeAsync2E() {
2921        CompletableFuture<Integer> f = new CompletableFuture<>();
2922        CompletableFutureInc r = new CompletableFutureInc();
2923        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2924        f.completeExceptionally(new CFException());
2935          checkCompletedWithWrappedCFException(g);
2936 <    }
2936 >        checkCompletedNormally(f, v1);
2937 >    }}
2938  
2939      /**
2940 <     * thenComposeAsync result completes exceptionally if action does
2940 >     * thenCompose result completes exceptionally if source cancelled
2941       */
2942 <    public void testThenComposeAsync3E() {
2943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2944 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2945 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2946 <        f.complete(one);
2947 <        checkCompletedWithWrappedCFException(g);
2948 <    }
2942 >    public void testThenCompose_sourceCancelled() {
2943 >        for (ExecutionMode m : ExecutionMode.values())
2944 >        for (boolean createIncomplete : new boolean[] { true, false })
2945 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2946 >    {
2947 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2948 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2949 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2950 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2951 >        if (createIncomplete) {
2952 >            checkIncomplete(g);
2953 >            assertTrue(f.cancel(mayInterruptIfRunning));
2954 >        }
2955  
2939    /**
2940     * thenComposeAsync result completes exceptionally if source cancelled
2941     */
2942    public void testThenComposeAsync4E() {
2943        CompletableFuture<Integer> f = new CompletableFuture<>();
2944        CompletableFutureInc r = new CompletableFutureInc();
2945        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2946        assertTrue(f.cancel(true));
2956          checkCompletedWithWrappedCancellationException(g);
2957 <    }
2957 >        checkCancelled(f);
2958 >    }}
2959  
2960      // other static methods
2961  
# Line 2963 | Line 2973 | public class CompletableFutureTest exten
2973       * when all components complete normally
2974       */
2975      public void testAllOf_normal() throws Exception {
2976 <        for (int k = 1; k < 20; ++k) {
2977 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2978 <            for (int i = 0; i < k; ++i)
2976 >        for (int k = 1; k < 10; k++) {
2977 >            CompletableFuture<Integer>[] fs
2978 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2979 >            for (int i = 0; i < k; i++)
2980 >                fs[i] = new CompletableFuture<>();
2981 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2982 >            for (int i = 0; i < k; i++) {
2983 >                checkIncomplete(f);
2984 >                checkIncomplete(CompletableFuture.allOf(fs));
2985 >                fs[i].complete(one);
2986 >            }
2987 >            checkCompletedNormally(f, null);
2988 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2989 >        }
2990 >    }
2991 >
2992 >    public void testAllOf_backwards() throws Exception {
2993 >        for (int k = 1; k < 10; k++) {
2994 >            CompletableFuture<Integer>[] fs
2995 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2996 >            for (int i = 0; i < k; i++)
2997                  fs[i] = new CompletableFuture<>();
2998              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2999 <            for (int i = 0; i < k; ++i) {
2999 >            for (int i = k - 1; i >= 0; i--) {
3000                  checkIncomplete(f);
3001                  checkIncomplete(CompletableFuture.allOf(fs));
3002                  fs[i].complete(one);
# Line 2978 | Line 3006 | public class CompletableFutureTest exten
3006          }
3007      }
3008  
3009 +    public void testAllOf_exceptional() throws Exception {
3010 +        for (int k = 1; k < 10; k++) {
3011 +            CompletableFuture<Integer>[] fs
3012 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3013 +            CFException ex = new CFException();
3014 +            for (int i = 0; i < k; i++)
3015 +                fs[i] = new CompletableFuture<>();
3016 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3017 +            for (int i = 0; i < k; i++) {
3018 +                checkIncomplete(f);
3019 +                checkIncomplete(CompletableFuture.allOf(fs));
3020 +                if (i != k/2) {
3021 +                    fs[i].complete(i);
3022 +                    checkCompletedNormally(fs[i], i);
3023 +                } else {
3024 +                    fs[i].completeExceptionally(ex);
3025 +                    checkCompletedExceptionally(fs[i], ex);
3026 +                }
3027 +            }
3028 +            checkCompletedWithWrappedException(f, ex);
3029 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3030 +        }
3031 +    }
3032 +
3033      /**
3034       * anyOf(no component futures) returns an incomplete future
3035       */
3036      public void testAnyOf_empty() throws Exception {
3037 +        for (Integer v1 : new Integer[] { 1, null })
3038 +    {
3039          CompletableFuture<Object> f = CompletableFuture.anyOf();
3040          checkIncomplete(f);
3041 <    }
3041 >
3042 >        f.complete(v1);
3043 >        checkCompletedNormally(f, v1);
3044 >    }}
3045  
3046      /**
3047       * anyOf returns a future completed normally with a value when
3048       * a component future does
3049       */
3050      public void testAnyOf_normal() throws Exception {
3051 <        for (int k = 0; k < 10; ++k) {
3051 >        for (int k = 0; k < 10; k++) {
3052              CompletableFuture[] fs = new CompletableFuture[k];
3053 <            for (int i = 0; i < k; ++i)
3053 >            for (int i = 0; i < k; i++)
3054                  fs[i] = new CompletableFuture<>();
3055              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3056              checkIncomplete(f);
3057 <            for (int i = 0; i < k; ++i) {
3058 <                fs[i].complete(one);
3059 <                checkCompletedNormally(f, one);
3060 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3057 >            for (int i = 0; i < k; i++) {
3058 >                fs[i].complete(i);
3059 >                checkCompletedNormally(f, 0);
3060 >                int x = (int) CompletableFuture.anyOf(fs).join();
3061 >                assertTrue(0 <= x && x <= i);
3062 >            }
3063 >        }
3064 >    }
3065 >    public void testAnyOf_normal_backwards() throws Exception {
3066 >        for (int k = 0; k < 10; k++) {
3067 >            CompletableFuture[] fs = new CompletableFuture[k];
3068 >            for (int i = 0; i < k; i++)
3069 >                fs[i] = new CompletableFuture<>();
3070 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3071 >            checkIncomplete(f);
3072 >            for (int i = k - 1; i >= 0; i--) {
3073 >                fs[i].complete(i);
3074 >                checkCompletedNormally(f, k - 1);
3075 >                int x = (int) CompletableFuture.anyOf(fs).join();
3076 >                assertTrue(i <= x && x <= k - 1);
3077              }
3078          }
3079      }
# Line 3009 | Line 3082 | public class CompletableFutureTest exten
3082       * anyOf result completes exceptionally when any component does.
3083       */
3084      public void testAnyOf_exceptional() throws Exception {
3085 <        for (int k = 0; k < 10; ++k) {
3085 >        for (int k = 0; k < 10; k++) {
3086 >            CompletableFuture[] fs = new CompletableFuture[k];
3087 >            CFException[] exs = new CFException[k];
3088 >            for (int i = 0; i < k; i++) {
3089 >                fs[i] = new CompletableFuture<>();
3090 >                exs[i] = new CFException();
3091 >            }
3092 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3093 >            checkIncomplete(f);
3094 >            for (int i = 0; i < k; i++) {
3095 >                fs[i].completeExceptionally(exs[i]);
3096 >                checkCompletedWithWrappedException(f, exs[0]);
3097 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3098 >            }
3099 >        }
3100 >    }
3101 >
3102 >    public void testAnyOf_exceptional_backwards() throws Exception {
3103 >        for (int k = 0; k < 10; k++) {
3104              CompletableFuture[] fs = new CompletableFuture[k];
3105 <            for (int i = 0; i < k; ++i)
3105 >            CFException[] exs = new CFException[k];
3106 >            for (int i = 0; i < k; i++) {
3107                  fs[i] = new CompletableFuture<>();
3108 +                exs[i] = new CFException();
3109 +            }
3110              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3111              checkIncomplete(f);
3112 <            for (int i = 0; i < k; ++i) {
3113 <                fs[i].completeExceptionally(new CFException());
3114 <                checkCompletedWithWrappedCFException(f);
3112 >            for (int i = k - 1; i >= 0; i--) {
3113 >                fs[i].completeExceptionally(exs[i]);
3114 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3115                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3116              }
3117          }
# Line 3036 | Line 3130 | public class CompletableFutureTest exten
3130          Runnable[] throwingActions = {
3131              () -> CompletableFuture.supplyAsync(null),
3132              () -> CompletableFuture.supplyAsync(null, exec),
3133 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3133 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3134  
3135              () -> CompletableFuture.runAsync(null),
3136              () -> CompletableFuture.runAsync(null, exec),
# Line 3109 | Line 3203 | public class CompletableFutureTest exten
3203  
3204              () -> f.thenCompose(null),
3205              () -> f.thenComposeAsync(null),
3206 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3206 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3207              () -> f.thenComposeAsync(null, exec),
3208  
3209              () -> f.exceptionally(null),
# Line 3141 | Line 3235 | public class CompletableFutureTest exten
3235          assertSame(f, f.toCompletableFuture());
3236      }
3237  
3238 <    /**
3145 <     * whenComplete action executes on normal completion, propagating
3146 <     * source result.
3147 <     */
3148 <    public void testWhenComplete1() {
3149 <        final AtomicInteger a = new AtomicInteger();
3150 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3151 <        CompletableFuture<Integer> g =
3152 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3153 <        f.complete(three);
3154 <        checkCompletedNormally(f, three);
3155 <        checkCompletedNormally(g, three);
3156 <        assertEquals(a.get(), 1);
3157 <    }
3238 >    //--- tests of implementation details; not part of official tck ---
3239  
3240 <    /**
3241 <     * whenComplete action executes on exceptional completion, propagating
3242 <     * source result.
3243 <     */
3244 <    public void testWhenComplete2() {
3245 <        final AtomicInteger a = new AtomicInteger();
3246 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3166 <        CompletableFuture<Integer> g =
3167 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3168 <        f.completeExceptionally(new CFException());
3169 <        assertTrue(f.isCompletedExceptionally());
3170 <        assertTrue(g.isCompletedExceptionally());
3171 <        assertEquals(a.get(), 1);
3172 <    }
3173 <
3174 <    /**
3175 <     * If a whenComplete action throws an exception when triggered by
3176 <     * a normal completion, it completes exceptionally
3177 <     */
3178 <    public void testWhenComplete3() {
3179 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3180 <        CompletableFuture<Integer> g =
3181 <            f.whenComplete((Integer x, Throwable t) ->
3182 <                           { throw new CFException(); } );
3183 <        f.complete(three);
3184 <        checkCompletedNormally(f, three);
3185 <        assertTrue(g.isCompletedExceptionally());
3186 <        checkCompletedWithWrappedCFException(g);
3187 <    }
3188 <
3189 <    /**
3190 <     * whenCompleteAsync action executes on normal completion, propagating
3191 <     * source result.
3192 <     */
3193 <    public void testWhenCompleteAsync1() {
3194 <        final AtomicInteger a = new AtomicInteger();
3195 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3196 <        CompletableFuture<Integer> g =
3197 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3198 <        f.complete(three);
3199 <        checkCompletedNormally(f, three);
3200 <        checkCompletedNormally(g, three);
3201 <        assertEquals(a.get(), 1);
3202 <    }
3203 <
3204 <    /**
3205 <     * whenCompleteAsync action executes on exceptional completion, propagating
3206 <     * source result.
3207 <     */
3208 <    public void testWhenCompleteAsync2() {
3209 <        final AtomicInteger a = new AtomicInteger();
3210 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3211 <        CompletableFuture<Integer> g =
3212 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3213 <        f.completeExceptionally(new CFException());
3214 <        checkCompletedWithWrappedCFException(f);
3215 <        checkCompletedWithWrappedCFException(g);
3216 <    }
3217 <
3218 <    /**
3219 <     * If a whenCompleteAsync action throws an exception when
3220 <     * triggered by a normal completion, it completes exceptionally
3221 <     */
3222 <    public void testWhenCompleteAsync3() {
3223 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3224 <        CompletableFuture<Integer> g =
3225 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3226 <                           { throw new CFException(); } );
3227 <        f.complete(three);
3228 <        checkCompletedNormally(f, three);
3229 <        checkCompletedWithWrappedCFException(g);
3230 <    }
3231 <
3232 <    /**
3233 <     * whenCompleteAsync action executes on normal completion, propagating
3234 <     * source result.
3235 <     */
3236 <    public void testWhenCompleteAsync1e() {
3237 <        final AtomicInteger a = new AtomicInteger();
3238 <        ThreadExecutor exec = new ThreadExecutor();
3239 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3240 <        CompletableFuture<Integer> g =
3241 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3242 <                                exec);
3243 <        f.complete(three);
3244 <        checkCompletedNormally(f, three);
3245 <        checkCompletedNormally(g, three);
3246 <        assertEquals(a.get(), 1);
3240 >    Object resultOf(CompletableFuture<?> f) {
3241 >        try {
3242 >            java.lang.reflect.Field resultField
3243 >                = CompletableFuture.class.getDeclaredField("result");
3244 >            resultField.setAccessible(true);
3245 >            return resultField.get(f);
3246 >        } catch (Throwable t) { throw new AssertionError(t); }
3247      }
3248  
3249 <    /**
3250 <     * whenCompleteAsync action executes on exceptional completion, propagating
3251 <     * source result.
3252 <     */
3253 <    public void testWhenCompleteAsync2e() {
3254 <        final AtomicInteger a = new AtomicInteger();
3255 <        ThreadExecutor exec = new ThreadExecutor();
3256 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3257 <        CompletableFuture<Integer> g =
3258 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3259 <                                exec);
3260 <        f.completeExceptionally(new CFException());
3261 <        checkCompletedWithWrappedCFException(f);
3262 <        checkCompletedWithWrappedCFException(g);
3263 <    }
3249 >    public void testExceptionPropagationReusesResultObject() {
3250 >        if (!testImplementationDetails) return;
3251 >        for (ExecutionMode m : ExecutionMode.values())
3252 >    {
3253 >        final CFException ex = new CFException();
3254 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3255 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3256  
3257 <    /**
3258 <     * If a whenCompleteAsync action throws an exception when triggered
3267 <     * by a normal completion, it completes exceptionally
3268 <     */
3269 <    public void testWhenCompleteAsync3e() {
3270 <        ThreadExecutor exec = new ThreadExecutor();
3271 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3272 <        CompletableFuture<Integer> g =
3273 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3274 <                                { throw new CFException(); },
3275 <                                exec);
3276 <        f.complete(three);
3277 <        checkCompletedNormally(f, three);
3278 <        checkCompletedWithWrappedCFException(g);
3279 <    }
3257 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3258 >            = new ArrayList<>();
3259  
3260 <    /**
3261 <     * handleAsync action completes normally with function value on
3262 <     * either normal or exceptional completion of source
3284 <     */
3285 <    public void testHandleAsync() {
3286 <        CompletableFuture<Integer> f, g;
3287 <        IntegerHandler r;
3260 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3261 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3262 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3263  
3264 <        f = new CompletableFuture<>();
3265 <        g = f.handleAsync(r = new IntegerHandler());
3266 <        assertFalse(r.ran);
3292 <        f.completeExceptionally(new CFException());
3293 <        checkCompletedWithWrappedCFException(f);
3294 <        checkCompletedNormally(g, three);
3295 <        assertTrue(r.ran);
3264 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3265 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3266 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3267  
3268 <        f = new CompletableFuture<>();
3269 <        g = f.handleAsync(r = new IntegerHandler());
3270 <        assertFalse(r.ran);
3300 <        f.completeExceptionally(new CFException());
3301 <        checkCompletedWithWrappedCFException(f);
3302 <        checkCompletedNormally(g, three);
3303 <        assertTrue(r.ran);
3268 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3269 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3270 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3271  
3272 <        f = new CompletableFuture<>();
3306 <        g = f.handleAsync(r = new IntegerHandler());
3307 <        assertFalse(r.ran);
3308 <        f.complete(one);
3309 <        checkCompletedNormally(f, one);
3310 <        checkCompletedNormally(g, two);
3311 <        assertTrue(r.ran);
3272 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3273  
3274 <        f = new CompletableFuture<>();
3314 <        g = f.handleAsync(r = new IntegerHandler());
3315 <        assertFalse(r.ran);
3316 <        f.complete(one);
3317 <        checkCompletedNormally(f, one);
3318 <        checkCompletedNormally(g, two);
3319 <        assertTrue(r.ran);
3320 <    }
3274 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3275  
3276 <    /**
3277 <     * handleAsync action with Executor completes normally with
3324 <     * function value on either normal or exceptional completion of
3325 <     * source
3326 <     */
3327 <    public void testHandleAsync2() {
3328 <        CompletableFuture<Integer> f, g;
3329 <        ThreadExecutor exec = new ThreadExecutor();
3330 <        IntegerHandler r;
3276 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3277 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3278  
3279 <        f = new CompletableFuture<>();
3280 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3281 <        assertFalse(r.ran);
3282 <        f.completeExceptionally(new CFException());
3283 <        checkCompletedWithWrappedCFException(f);
3284 <        checkCompletedNormally(g, three);
3285 <        assertTrue(r.ran);
3279 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3280 >                 fun : funs) {
3281 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3282 >            f.completeExceptionally(ex);
3283 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3284 >            checkCompletedWithWrappedException(src, ex);
3285 >            CompletableFuture<?> dep = fun.apply(src);
3286 >            checkCompletedWithWrappedException(dep, ex);
3287 >            assertSame(resultOf(src), resultOf(dep));
3288 >        }
3289  
3290 <        f = new CompletableFuture<>();
3291 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3292 <        assertFalse(r.ran);
3293 <        f.completeExceptionally(new CFException());
3294 <        checkCompletedWithWrappedCFException(f);
3295 <        checkCompletedNormally(g, three);
3296 <        assertTrue(r.ran);
3290 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3291 >                 fun : funs) {
3292 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3293 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3294 >            CompletableFuture<?> dep = fun.apply(src);
3295 >            f.completeExceptionally(ex);
3296 >            checkCompletedWithWrappedException(src, ex);
3297 >            checkCompletedWithWrappedException(dep, ex);
3298 >            assertSame(resultOf(src), resultOf(dep));
3299 >        }
3300  
3301 <        f = new CompletableFuture<>();
3302 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3303 <        assertFalse(r.ran);
3304 <        f.complete(one);
3305 <        checkCompletedNormally(f, one);
3306 <        checkCompletedNormally(g, two);
3307 <        assertTrue(r.ran);
3301 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3302 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3303 >                 fun : funs) {
3304 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3305 >            f.cancel(mayInterruptIfRunning);
3306 >            checkCancelled(f);
3307 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3308 >            checkCompletedWithWrappedCancellationException(src);
3309 >            CompletableFuture<?> dep = fun.apply(src);
3310 >            checkCompletedWithWrappedCancellationException(dep);
3311 >            assertSame(resultOf(src), resultOf(dep));
3312 >        }
3313  
3314 <        f = new CompletableFuture<>();
3315 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3316 <        assertFalse(r.ran);
3317 <        f.complete(one);
3318 <        checkCompletedNormally(f, one);
3319 <        checkCompletedNormally(g, two);
3320 <        assertTrue(r.ran);
3321 <    }
3314 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3315 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3316 >                 fun : funs) {
3317 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3318 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3319 >            CompletableFuture<?> dep = fun.apply(src);
3320 >            f.cancel(mayInterruptIfRunning);
3321 >            checkCancelled(f);
3322 >            checkCompletedWithWrappedCancellationException(src);
3323 >            checkCompletedWithWrappedCancellationException(dep);
3324 >            assertSame(resultOf(src), resultOf(dep));
3325 >        }
3326 >    }}
3327  
3328   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines