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.89 by jsr166, Mon Jun 16 21:34:49 2014 UTC

# Line 16 | Line 16 | import java.util.concurrent.ExecutionExc
16   import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19 + import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 102 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
108 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 >                                                      Throwable ex) {
110          try {
111              f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
# Line 128 | Line 131 | public class CompletableFutureTest exten
131          } catch (ExecutionException success) {
132              assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 203 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 +        for (Integer v1 : new Integer[] { 1, null })
231 +    {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233          checkIncomplete(f);
234 <        f.complete(one);
235 <        checkCompletedNormally(f, one);
236 <    }
234 >        assertTrue(f.complete(v1));
235 >        assertFalse(f.complete(v1));
236 >        checkCompletedNormally(f, v1);
237 >    }}
238  
239      /**
240       * completeExceptionally completes exceptionally, as indicated by
# Line 215 | Line 242 | public class CompletableFutureTest exten
242       */
243      public void testCompleteExceptionally() {
244          CompletableFuture<Integer> f = new CompletableFuture<>();
245 +        CFException ex = new CFException();
246          checkIncomplete(f);
247 <        f.completeExceptionally(new CFException());
248 <        checkCompletedWithWrappedCFException(f);
247 >        f.completeExceptionally(ex);
248 >        checkCompletedExceptionally(f, ex);
249      }
250  
251      /**
# Line 225 | Line 253 | public class CompletableFutureTest exten
253       * methods isDone, isCancelled, join, get, and getNow
254       */
255      public void testCancel() {
256 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
257 +    {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260          assertTrue(f.cancel(true));
261 +        assertTrue(f.cancel(true));
262          checkCancelled(f);
263 <    }
263 >    }}
264  
265      /**
266       * obtrudeValue forces completion with given value
# Line 237 | Line 268 | public class CompletableFutureTest exten
268      public void testObtrudeValue() {
269          CompletableFuture<Integer> f = new CompletableFuture<>();
270          checkIncomplete(f);
271 <        f.complete(one);
271 >        assertTrue(f.complete(one));
272          checkCompletedNormally(f, one);
273          f.obtrudeValue(three);
274          checkCompletedNormally(f, three);
# Line 246 | Line 277 | public class CompletableFutureTest exten
277          f = new CompletableFuture<>();
278          f.obtrudeValue(three);
279          checkCompletedNormally(f, three);
280 +        f.obtrudeValue(null);
281 +        checkCompletedNormally(f, null);
282          f = new CompletableFuture<>();
283          f.completeExceptionally(new CFException());
284          f.obtrudeValue(four);
# Line 256 | Line 289 | public class CompletableFutureTest exten
289       * obtrudeException forces completion with given exception
290       */
291      public void testObtrudeException() {
292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
293 <        checkIncomplete(f);
294 <        f.complete(one);
295 <        checkCompletedNormally(f, one);
296 <        f.obtrudeException(new CFException());
264 <        checkCompletedWithWrappedCFException(f);
292 >        for (Integer v1 : new Integer[] { 1, null })
293 >    {
294 >        CFException ex;
295 >        CompletableFuture<Integer> f;
296 >
297          f = new CompletableFuture<>();
298 <        f.obtrudeException(new CFException());
299 <        checkCompletedWithWrappedCFException(f);
298 >        assertTrue(f.complete(v1));
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304          f = new CompletableFuture<>();
305 +        for (int i = 0; i < 2; i++) {
306 +            f.obtrudeException(ex = new CFException());
307 +            checkCompletedExceptionally(f, ex);
308 +        }
309 +
310 +        f = new CompletableFuture<>();
311 +        f.completeExceptionally(ex = new CFException());
312 +        f.obtrudeValue(v1);
313 +        checkCompletedNormally(f, v1);
314 +        f.obtrudeException(ex = new CFException());
315 +        checkCompletedExceptionally(f, ex);
316          f.completeExceptionally(new CFException());
317 <        f.obtrudeValue(four);
318 <        checkCompletedNormally(f, four);
319 <        f.obtrudeException(new CFException());
320 <        checkCompletedWithWrappedCFException(f);
274 <    }
317 >        checkCompletedExceptionally(f, ex);
318 >        assertFalse(f.complete(v1));
319 >        checkCompletedExceptionally(f, ex);
320 >    }}
321  
322      /**
323       * getNumberOfDependents returns number of dependent tasks
324       */
325      public void testGetNumberOfDependents() {
326 +        for (ExecutionMode m : ExecutionMode.values())
327 +        for (Integer v1 : new Integer[] { 1, null })
328 +    {
329          CompletableFuture<Integer> f = new CompletableFuture<>();
330 <        assertEquals(f.getNumberOfDependents(), 0);
331 <        CompletableFuture g = f.thenRun(new Noop());
332 <        assertEquals(f.getNumberOfDependents(), 1);
333 <        assertEquals(g.getNumberOfDependents(), 0);
334 <        CompletableFuture h = f.thenRun(new Noop());
335 <        assertEquals(f.getNumberOfDependents(), 2);
336 <        f.complete(1);
330 >        assertEquals(0, f.getNumberOfDependents());
331 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
332 >        assertEquals(1, f.getNumberOfDependents());
333 >        assertEquals(0, g.getNumberOfDependents());
334 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
335 >        assertEquals(2, f.getNumberOfDependents());
336 >        assertEquals(0, h.getNumberOfDependents());
337 >        assertTrue(f.complete(v1));
338          checkCompletedNormally(g, null);
339 <        assertEquals(f.getNumberOfDependents(), 0);
340 <        assertEquals(g.getNumberOfDependents(), 0);
341 <    }
339 >        checkCompletedNormally(h, null);
340 >        assertEquals(0, f.getNumberOfDependents());
341 >        assertEquals(0, g.getNumberOfDependents());
342 >        assertEquals(0, h.getNumberOfDependents());
343 >    }}
344  
345      /**
346       * toString indicates current completion state
# Line 299 | Line 351 | public class CompletableFutureTest exten
351          f = new CompletableFuture<String>();
352          assertTrue(f.toString().contains("[Not completed]"));
353  
354 <        f.complete("foo");
354 >        assertTrue(f.complete("foo"));
355          assertTrue(f.toString().contains("[Completed normally]"));
356  
357          f = new CompletableFuture<String>();
358 <        f.completeExceptionally(new IndexOutOfBoundsException());
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359          assertTrue(f.toString().contains("[Completed exceptionally]"));
360 +
361 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
362 +            f = new CompletableFuture<String>();
363 +            assertTrue(f.cancel(mayInterruptIfRunning));
364 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
365 +        }
366      }
367  
368      /**
# Line 315 | Line 373 | public class CompletableFutureTest exten
373          checkCompletedNormally(f, "test");
374      }
375  
376 <    // Choose non-commutative actions for better coverage
377 <
378 <    static final Supplier<Integer> supplyOne =
379 <        () -> Integer.valueOf(1);
380 <    static final Function<Integer, Integer> inc =
381 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
382 <    static final BiFunction<Integer, Integer, Integer> subtract =
325 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
326 <    static final class IncAction implements Consumer<Integer> {
327 <        int value;
328 <        public void accept(Integer x) { value = x.intValue() + 1; }
329 <    }
330 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
331 <        int value;
332 <        public void accept(Integer x, Integer y) {
333 <            value = x.intValue() - y.intValue();
376 >    abstract class CheckedAction {
377 >        int invocationCount = 0;
378 >        final ExecutionMode m;
379 >        CheckedAction(ExecutionMode m) { this.m = m; }
380 >        void invoked() {
381 >            m.checkExecutionMode();
382 >            assertEquals(0, invocationCount++);
383          }
384 <    }
385 <    static final class Noop implements Runnable {
337 <        boolean ran;
338 <        public void run() { ran = true; }
384 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
385 >        void assertInvoked() { assertEquals(1, invocationCount); }
386      }
387  
388 <    static final class FailingSupplier implements Supplier<Integer> {
389 <        boolean ran;
390 <        public Integer get() { ran = true; throw new CFException(); }
391 <    }
392 <    static final class FailingConsumer implements Consumer<Integer> {
393 <        boolean ran;
347 <        public void accept(Integer x) { ran = true; throw new CFException(); }
348 <    }
349 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
350 <        boolean ran;
351 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
352 <    }
353 <    static final class FailingFunction implements Function<Integer, Integer> {
354 <        boolean ran;
355 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
356 <    }
357 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
358 <        boolean ran;
359 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
360 <    }
361 <    static final class FailingNoop implements Runnable {
362 <        boolean ran;
363 <        public void run() { ran = true; throw new CFException(); }
364 <    }
365 <
366 <    static final class CompletableFutureInc
367 <        implements Function<Integer, CompletableFuture<Integer>> {
368 <        boolean ran;
369 <        public CompletableFuture<Integer> apply(Integer x) {
370 <            ran = true;
371 <            CompletableFuture<Integer> f = new CompletableFuture<>();
372 <            f.complete(Integer.valueOf(x.intValue() + 1));
373 <            return f;
388 >    abstract class CheckedIntegerAction extends CheckedAction {
389 >        Integer value;
390 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
391 >        void assertValue(Integer expected) {
392 >            assertInvoked();
393 >            assertEquals(expected, value);
394          }
395      }
396  
397 <    static final class FailingCompletableFutureFunction
398 <        implements Function<Integer, CompletableFuture<Integer>> {
399 <        boolean ran;
400 <        public CompletableFuture<Integer> apply(Integer x) {
401 <            ran = true; throw new CFException();
397 >    class IntegerSupplier extends CheckedAction
398 >        implements Supplier<Integer>
399 >    {
400 >        final Integer value;
401 >        IntegerSupplier(ExecutionMode m, Integer value) {
402 >            super(m);
403 >            this.value = value;
404          }
405 <    }
406 <
407 <    // Used for explicit executor tests
386 <    static final class ThreadExecutor implements Executor {
387 <        AtomicInteger count = new AtomicInteger(0);
388 <
389 <        public void execute(Runnable r) {
390 <            count.getAndIncrement();
391 <            new Thread(r).start();
405 >        public Integer get() {
406 >            invoked();
407 >            return value;
408          }
409      }
410  
411 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
412 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
411 >    // A function that handles and produces null values as well.
412 >    static Integer inc(Integer x) {
413 >        return (x == null) ? null : x + 1;
414      }
415  
416 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
417 <        boolean ran;
418 <        public Integer apply(Integer x, Throwable t) {
419 <            ran = true;
420 <            return (t == null) ? two : three;
416 >    class NoopConsumer extends CheckedIntegerAction
417 >        implements Consumer<Integer>
418 >    {
419 >        NoopConsumer(ExecutionMode m) { super(m); }
420 >        public void accept(Integer x) {
421 >            invoked();
422 >            value = x;
423          }
424      }
425  
426 <    /**
427 <     * exceptionally action completes with function value on source
428 <     * exception; otherwise with source value
429 <     */
430 <    public void testExceptionally() {
431 <        CompletableFuture<Integer> f = new CompletableFuture<>();
432 <        ExceptionToInteger r = new ExceptionToInteger();
433 <        CompletableFuture<Integer> g = f.exceptionally(r);
415 <        f.completeExceptionally(new CFException());
416 <        checkCompletedNormally(g, three);
417 <
418 <        f = new CompletableFuture<>();
419 <        r = new ExceptionToInteger();
420 <        g = f.exceptionally(r);
421 <        f.complete(one);
422 <        checkCompletedNormally(g, one);
423 <    }
424 <
425 <    /**
426 <     * handle action completes normally with function value on either
427 <     * normal or exceptional completion of source
428 <     */
429 <    public void testHandle() {
430 <        CompletableFuture<Integer> f, g;
431 <        IntegerHandler r;
432 <
433 <        f = new CompletableFuture<>();
434 <        f.completeExceptionally(new CFException());
435 <        g = f.handle(r = new IntegerHandler());
436 <        assertTrue(r.ran);
437 <        checkCompletedNormally(g, three);
438 <
439 <        f = new CompletableFuture<>();
440 <        g = f.handle(r = new IntegerHandler());
441 <        assertFalse(r.ran);
442 <        f.completeExceptionally(new CFException());
443 <        checkCompletedNormally(g, three);
444 <        assertTrue(r.ran);
445 <
446 <        f = new CompletableFuture<>();
447 <        f.complete(one);
448 <        g = f.handle(r = new IntegerHandler());
449 <        assertTrue(r.ran);
450 <        checkCompletedNormally(g, two);
451 <
452 <        f = new CompletableFuture<>();
453 <        g = f.handle(r = new IntegerHandler());
454 <        assertFalse(r.ran);
455 <        f.complete(one);
456 <        assertTrue(r.ran);
457 <        checkCompletedNormally(g, two);
458 <    }
459 <
460 <    /**
461 <     * runAsync completes after running Runnable
462 <     */
463 <    public void testRunAsync() {
464 <        Noop r = new Noop();
465 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
466 <        assertNull(f.join());
467 <        assertTrue(r.ran);
468 <        checkCompletedNormally(f, null);
469 <    }
470 <
471 <    /**
472 <     * runAsync with executor completes after running Runnable
473 <     */
474 <    public void testRunAsync2() {
475 <        Noop r = new Noop();
476 <        ThreadExecutor exec = new ThreadExecutor();
477 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
478 <        assertNull(f.join());
479 <        assertTrue(r.ran);
480 <        checkCompletedNormally(f, null);
481 <        assertEquals(1, exec.count.get());
482 <    }
483 <
484 <    /**
485 <     * failing runAsync completes exceptionally after running Runnable
486 <     */
487 <    public void testRunAsync3() {
488 <        FailingNoop r = new FailingNoop();
489 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
490 <        checkCompletedWithWrappedCFException(f);
491 <        assertTrue(r.ran);
492 <    }
493 <
494 <    /**
495 <     * supplyAsync completes with result of supplier
496 <     */
497 <    public void testSupplyAsync() {
498 <        CompletableFuture<Integer> f;
499 <        f = CompletableFuture.supplyAsync(supplyOne);
500 <        assertEquals(f.join(), one);
501 <        checkCompletedNormally(f, one);
502 <    }
503 <
504 <    /**
505 <     * supplyAsync with executor completes with result of supplier
506 <     */
507 <    public void testSupplyAsync2() {
508 <        CompletableFuture<Integer> f;
509 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
510 <        assertEquals(f.join(), one);
511 <        checkCompletedNormally(f, one);
512 <    }
513 <
514 <    /**
515 <     * Failing supplyAsync completes exceptionally
516 <     */
517 <    public void testSupplyAsync3() {
518 <        FailingSupplier r = new FailingSupplier();
519 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
520 <        checkCompletedWithWrappedCFException(f);
521 <        assertTrue(r.ran);
522 <    }
523 <
524 <    // seq completion methods
525 <
526 <    /**
527 <     * thenRun result completes normally after normal completion of source
528 <     */
529 <    public void testThenRun() {
530 <        CompletableFuture<Integer> f;
531 <        CompletableFuture<Void> g;
532 <        Noop r;
533 <
534 <        f = new CompletableFuture<>();
535 <        g = f.thenRun(r = new Noop());
536 <        f.complete(null);
537 <        checkCompletedNormally(g, null);
538 <        assertTrue(r.ran);
539 <
540 <        f = new CompletableFuture<>();
541 <        f.complete(null);
542 <        g = f.thenRun(r = new Noop());
543 <        checkCompletedNormally(g, null);
544 <        assertTrue(r.ran);
545 <    }
546 <
547 <    /**
548 <     * thenRun result completes exceptionally after exceptional
549 <     * completion of source
550 <     */
551 <    public void testThenRun2() {
552 <        CompletableFuture<Integer> f;
553 <        CompletableFuture<Void> g;
554 <        Noop r;
555 <
556 <        f = new CompletableFuture<>();
557 <        g = f.thenRun(r = new Noop());
558 <        f.completeExceptionally(new CFException());
559 <        checkCompletedWithWrappedCFException(g);
560 <        assertFalse(r.ran);
561 <
562 <        f = new CompletableFuture<>();
563 <        f.completeExceptionally(new CFException());
564 <        g = f.thenRun(r = new Noop());
565 <        checkCompletedWithWrappedCFException(g);
566 <        assertFalse(r.ran);
567 <    }
568 <
569 <    /**
570 <     * thenRun result completes exceptionally if action does
571 <     */
572 <    public void testThenRun3() {
573 <        CompletableFuture<Integer> f;
574 <        CompletableFuture<Void> g;
575 <        FailingNoop r;
576 <
577 <        f = new CompletableFuture<>();
578 <        g = f.thenRun(r = new FailingNoop());
579 <        f.complete(null);
580 <        checkCompletedWithWrappedCFException(g);
581 <
582 <        f = new CompletableFuture<>();
583 <        f.complete(null);
584 <        g = f.thenRun(r = new FailingNoop());
585 <        checkCompletedWithWrappedCFException(g);
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);
862
863        f = new CompletableFuture<>();
864        g = new CompletableFuture<>();
865        h = f.thenAcceptBoth(g, r = new SubtractAction());
866        g.completeExceptionally(new CFException());
867        checkIncomplete(h);
868        f.complete(3);
869        checkCompletedWithWrappedCFException(h);
533  
534 <        f = new CompletableFuture<>();
535 <        g = new CompletableFuture<>();
536 <        f.complete(3);
537 <        g.completeExceptionally(new CFException());
538 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
539 <        checkCompletedWithWrappedCFException(h);
540 <
541 <        f = new CompletableFuture<>();
542 <        g = new CompletableFuture<>();
543 <        f.completeExceptionally(new CFException());
544 <        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);
853 <
854 <        f.complete(v1);
855 <        checkIncomplete(h);
856 <        assertFalse(r.ran);
857 <        g.complete(v2);
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 <        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);
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 <        g.complete(v2);
886 <        checkIncomplete(h);
887 <        assertFalse(r.ran);
1018 <        f.complete(v1);
1019 <
1020 <        checkCompletedNormally(h, null);
1021 <        assertTrue(r.ran);
1022 <        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();
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 <        g.complete(v2);
912 <        f.complete(v1);
913 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
914 <
915 <        checkCompletedNormally(h, null);
1041 <        assertTrue(r.ran);
1042 <        checkCompletedNormally(f, v1);
1043 <        checkCompletedNormally(g, v2);
1044 <        }
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();
924 <
925 <        f.complete(v1);
926 <        g.complete(v2);
927 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
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 <        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();
981 <
982 <        g.completeExceptionally(ex);
983 <        checkIncomplete(h);
984 <        f.complete(v1);
977 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978 >        final CompletableFuture<Integer> g = m.whenComplete
979 >            (f,
980 >             (Integer x, Throwable t) -> {
981 >                m.checkExecutionMode();
982 >                threadAssertNull(x);
983 >                threadAssertTrue(t instanceof CancellationException);
984 >                a.getAndIncrement();
985 >            });
986 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987  
988 <        checkCompletedWithWrappedCFException(h, ex);
989 <        checkCompletedWithWrappedCFException(g, ex);
990 <        assertFalse(r.ran);
991 <        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();
1036  
1037 <        f.completeExceptionally(ex);
1038 <        g.complete(v1);
1039 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1040 <
1041 <        checkCompletedWithWrappedCFException(h, ex);
1042 <        checkCompletedWithWrappedCFException(f, ex);
1043 <        assertFalse(r.ran);
1044 <        checkCompletedNormally(g, v1);
1045 <        }
1046 <    }
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);
1125 <
1126 <        assertTrue(f.cancel(mayInterruptIfRunning));
1127 <        checkIncomplete(h);
1128 <        g.complete(v1);
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  
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 <    }
1319 <
1320 <    /**
1321 <     * applyToEither result completes exceptionally if action does
1322 <     */
1323 <    public void testApplyToEither3() {
1324 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1325 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1326 <        FailingFunction r = new FailingFunction();
1327 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1328 <        f2.complete(two);
1329 <        checkCompletedWithWrappedCFException(g);
1330 <    }
1190 >        assertEquals(1, a.get());
1191 >    }}
1192  
1193      /**
1194 <     * applyToEither result completes exceptionally if either source cancelled
1194 >     * runAsync completes after running Runnable
1195       */
1196 <    public void testApplyToEither4() {
1197 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1198 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1199 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1200 <        assertTrue(f.cancel(true));
1201 <        checkCompletedWithWrappedCancellationException(g);
1202 <        f = new CompletableFuture<>();
1203 <        f2 = new CompletableFuture<>();
1204 <        assertTrue(f2.cancel(true));
1205 <        checkCompletedWithWrappedCancellationException(g);
1206 <    }
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 <     * acceptEither result completes normally after normal completion
1349 <     * of either source
1211 >     * failing runAsync completes exceptionally after running Runnable
1212       */
1213 <    public void testAcceptEither() {
1214 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1215 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1216 <        IncAction r = new IncAction();
1217 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1218 <        f.complete(one);
1219 <        checkCompletedNormally(g, null);
1220 <        f2.complete(one);
1221 <        checkCompletedNormally(g, null);
1222 <        assertEquals(r.value, 2);
1223 <
1224 <        r = new IncAction();
1363 <        f = new CompletableFuture<>();
1364 <        f.complete(one);
1365 <        f2 = new CompletableFuture<>();
1366 <        g = f.acceptEither(f2, r);
1367 <        checkCompletedNormally(g, null);
1368 <        assertEquals(r.value, 2);
1369 <    }
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 exceptionally after exceptional
1373 <     * completion of either source
1227 >     * supplyAsync completes with result of supplier
1228       */
1229 <    public void testAcceptEither2() {
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.completeExceptionally(new CFException());
1235 <        f2.complete(one);
1236 <        checkCompletedWithWrappedCFException(g);
1237 <
1238 <        r = new IncAction();
1239 <        f = new CompletableFuture<>();
1240 <        f2 = new CompletableFuture<>();
1241 <        f2.completeExceptionally(new CFException());
1242 <        g = f.acceptEither(f2, r);
1389 <        checkCompletedWithWrappedCFException(g);
1390 <    }
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 if action does
1245 >     * Failing supplyAsync completes exceptionally
1246       */
1247 <    public void testAcceptEither3() {
1248 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1249 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1250 <        FailingConsumer r = new FailingConsumer();
1251 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1252 <        f2.complete(two);
1253 <        checkCompletedWithWrappedCFException(g);
1254 <    }
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 <    /**
1405 <     * acceptEither result completes exceptionally if either source cancelled
1406 <     */
1407 <    public void testAcceptEither4() {
1408 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1409 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1410 <        IncAction r = new IncAction();
1411 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1412 <        assertTrue(f.cancel(true));
1413 <        checkCompletedWithWrappedCancellationException(g);
1414 <        f = new CompletableFuture<>();
1415 <        f2 = new CompletableFuture<>();
1416 <        assertTrue(f2.cancel(true));
1417 <        checkCompletedWithWrappedCancellationException(g);
1418 <    }
1260 >    // seq completion methods
1261  
1262      /**
1263 <     * runAfterEither result completes normally after normal completion
1422 <     * of either source
1263 >     * thenRun result completes normally after normal completion of source
1264       */
1265 <    public void testRunAfterEither() {
1266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1267 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1268 <        Noop r = new Noop();
1269 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1270 <        f.complete(one);
1271 <        checkCompletedNormally(g, null);
1272 <        f2.complete(one);
1273 <        checkCompletedNormally(g, null);
1274 <        assertTrue(r.ran);
1265 >    public void testThenRun_normalCompletion() {
1266 >        for (ExecutionMode m : ExecutionMode.values())
1267 >        for (boolean createIncomplete : new boolean[] { true, false })
1268 >        for (Integer v1 : new Integer[] { 1, null })
1269 >    {
1270 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 >        final Noop r = new Noop(m);
1272 >        if (!createIncomplete) assertTrue(f.complete(v1));
1273 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1274 >        if (createIncomplete) {
1275 >            checkIncomplete(g);
1276 >            assertTrue(f.complete(v1));
1277 >        }
1278  
1435        r = new Noop();
1436        f = new CompletableFuture<>();
1437        f.complete(one);
1438        f2 = new CompletableFuture<>();
1439        g = f.runAfterEither(f2, r);
1279          checkCompletedNormally(g, null);
1280 <        assertTrue(r.ran);
1281 <    }
1282 <
1444 <    /**
1445 <     * runAfterEither result completes exceptionally after exceptional
1446 <     * completion of either source
1447 <     */
1448 <    public void testRunAfterEither2() {
1449 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1450 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1451 <        Noop r = new Noop();
1452 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1453 <        f.completeExceptionally(new CFException());
1454 <        f2.complete(one);
1455 <        checkCompletedWithWrappedCFException(g);
1456 <
1457 <        r = new Noop();
1458 <        f = new CompletableFuture<>();
1459 <        f2 = new CompletableFuture<>();
1460 <        f2.completeExceptionally(new CFException());
1461 <        g = f.runAfterEither(f2, r);
1462 <        checkCompletedWithWrappedCFException(g);
1463 <    }
1464 <
1465 <    /**
1466 <     * runAfterEither result completes exceptionally if action does
1467 <     */
1468 <    public void testRunAfterEither3() {
1469 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1471 <        FailingNoop r = new FailingNoop();
1472 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1473 <        f2.complete(two);
1474 <        checkCompletedWithWrappedCFException(g);
1475 <    }
1476 <
1477 <    /**
1478 <     * runAfterEither result completes exceptionally if either source cancelled
1479 <     */
1480 <    public void testRunAfterEither4() {
1481 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1483 <        Noop r = new Noop();
1484 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1485 <        assertTrue(f.cancel(true));
1486 <        checkCompletedWithWrappedCancellationException(g);
1487 <        f = new CompletableFuture<>();
1488 <        f2 = new CompletableFuture<>();
1489 <        assertTrue(f2.cancel(true));
1490 <        checkCompletedWithWrappedCancellationException(g);
1491 <    }
1492 <
1493 <    /**
1494 <     * thenCompose result completes normally after normal completion of source
1495 <     */
1496 <    public void testThenCompose() {
1497 <        CompletableFuture<Integer> f, g;
1498 <        CompletableFutureInc r;
1499 <
1500 <        f = new CompletableFuture<>();
1501 <        g = f.thenCompose(r = new CompletableFutureInc());
1502 <        f.complete(one);
1503 <        checkCompletedNormally(g, two);
1504 <        assertTrue(r.ran);
1505 <
1506 <        f = new CompletableFuture<>();
1507 <        f.complete(one);
1508 <        g = f.thenCompose(r = new CompletableFutureInc());
1509 <        checkCompletedNormally(g, two);
1510 <        assertTrue(r.ran);
1511 <    }
1280 >        checkCompletedNormally(f, v1);
1281 >        r.assertInvoked();
1282 >    }}
1283  
1284      /**
1285 <     * thenCompose result completes exceptionally after exceptional
1285 >     * thenRun result completes exceptionally after exceptional
1286       * completion of source
1287       */
1288 <    public void testThenCompose2() {
1289 <        CompletableFuture<Integer> f, g;
1290 <        CompletableFutureInc r;
1291 <
1292 <        f = new CompletableFuture<>();
1293 <        g = f.thenCompose(r = new CompletableFutureInc());
1294 <        f.completeExceptionally(new CFException());
1295 <        checkCompletedWithWrappedCFException(g);
1296 <
1297 <        f = new CompletableFuture<>();
1298 <        f.completeExceptionally(new CFException());
1299 <        g = f.thenCompose(r = new CompletableFutureInc());
1300 <        checkCompletedWithWrappedCFException(g);
1530 <    }
1531 <
1532 <    /**
1533 <     * thenCompose result completes exceptionally if action does
1534 <     */
1535 <    public void testThenCompose3() {
1536 <        CompletableFuture<Integer> f, g;
1537 <        FailingCompletableFutureFunction r;
1538 <
1539 <        f = new CompletableFuture<>();
1540 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1541 <        f.complete(one);
1542 <        checkCompletedWithWrappedCFException(g);
1543 <
1544 <        f = new CompletableFuture<>();
1545 <        f.complete(one);
1546 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1547 <        checkCompletedWithWrappedCFException(g);
1548 <    }
1549 <
1550 <    /**
1551 <     * thenCompose result completes exceptionally if source cancelled
1552 <     */
1553 <    public void testThenCompose4() {
1554 <        CompletableFuture<Integer> f, g;
1555 <        CompletableFutureInc r;
1556 <
1557 <        f = new CompletableFuture<>();
1558 <        g = f.thenCompose(r = new CompletableFutureInc());
1559 <        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 <    }
1567 <
1568 <    // asyncs
1569 <
1570 <    /**
1571 <     * thenRunAsync result completes normally after normal completion of source
1572 <     */
1573 <    public void testThenRunAsync() {
1574 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1575 <        Noop r = new Noop();
1576 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1577 <        f.complete(null);
1578 <        checkCompletedNormally(g, null);
1579 <
1580 <        // reordered version
1581 <        f = new CompletableFuture<>();
1582 <        f.complete(null);
1583 <        r = new Noop();
1584 <        g = f.thenRunAsync(r);
1585 <        checkCompletedNormally(g, null);
1586 <    }
1288 >    public void testThenRun_exceptionalCompletion() {
1289 >        for (ExecutionMode m : ExecutionMode.values())
1290 >        for (boolean createIncomplete : new boolean[] { true, false })
1291 >    {
1292 >        final CFException ex = new CFException();
1293 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1294 >        final Noop r = new Noop(m);
1295 >        if (!createIncomplete) f.completeExceptionally(ex);
1296 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1297 >        if (createIncomplete) {
1298 >            checkIncomplete(g);
1299 >            f.completeExceptionally(ex);
1300 >        }
1301  
1302 <    /**
1303 <     * thenRunAsync result completes exceptionally after exceptional
1304 <     * completion of source
1305 <     */
1592 <    public void testThenRunAsync2() {
1593 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        Noop r = new Noop();
1595 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1596 <        f.completeExceptionally(new CFException());
1597 <        try {
1598 <            g.join();
1599 <            shouldThrow();
1600 <        } catch (CompletionException success) {}
1601 <        checkCompletedWithWrappedCFException(g);
1602 <    }
1302 >        checkCompletedWithWrappedException(g, ex);
1303 >        checkCompletedExceptionally(f, ex);
1304 >        r.assertNotInvoked();
1305 >    }}
1306  
1307      /**
1308 <     * thenRunAsync result completes exceptionally if action does
1308 >     * thenRun result completes exceptionally if source cancelled
1309       */
1310 <    public void testThenRunAsync3() {
1311 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1312 <        FailingNoop r = new FailingNoop();
1313 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1314 <        f.complete(null);
1315 <        checkCompletedWithWrappedCFException(g);
1316 <    }
1310 >    public void testThenRun_sourceCancelled() {
1311 >        for (ExecutionMode m : ExecutionMode.values())
1312 >        for (boolean createIncomplete : new boolean[] { true, false })
1313 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1314 >    {
1315 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1316 >        final Noop r = new Noop(m);
1317 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1318 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1319 >        if (createIncomplete) {
1320 >            checkIncomplete(g);
1321 >            assertTrue(f.cancel(mayInterruptIfRunning));
1322 >        }
1323  
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));
1324          checkCompletedWithWrappedCancellationException(g);
1325 <    }
1325 >        checkCancelled(f);
1326 >        r.assertNotInvoked();
1327 >    }}
1328  
1329      /**
1330 <     * thenApplyAsync result completes normally after normal completion of source
1330 >     * thenRun result completes exceptionally if action does
1331       */
1332 <    public void testThenApplyAsync() {
1333 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1334 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1335 <        f.complete(one);
1336 <        checkCompletedNormally(g, two);
1337 <    }
1332 >    public void testThenRun_actionFailed() {
1333 >        for (ExecutionMode m : ExecutionMode.values())
1334 >        for (boolean createIncomplete : new boolean[] { true, false })
1335 >        for (Integer v1 : new Integer[] { 1, null })
1336 >    {
1337 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1338 >        final FailingRunnable r = new FailingRunnable(m);
1339 >        if (!createIncomplete) assertTrue(f.complete(v1));
1340 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1341 >        if (createIncomplete) {
1342 >            checkIncomplete(g);
1343 >            assertTrue(f.complete(v1));
1344 >        }
1345  
1636    /**
1637     * thenApplyAsync result completes exceptionally after exceptional
1638     * completion of source
1639     */
1640    public void testThenApplyAsync2() {
1641        CompletableFuture<Integer> f = new CompletableFuture<>();
1642        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1643        f.completeExceptionally(new CFException());
1346          checkCompletedWithWrappedCFException(g);
1347 <    }
1347 >        checkCompletedNormally(f, v1);
1348 >    }}
1349  
1350      /**
1351 <     * thenApplyAsync result completes exceptionally if action does
1351 >     * thenApply result completes normally after normal completion of source
1352       */
1353 <    public void testThenApplyAsync3() {
1354 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1355 <        FailingFunction r = new FailingFunction();
1356 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1357 <        f.complete(null);
1358 <        checkCompletedWithWrappedCFException(g);
1359 <    }
1353 >    public void testThenApply_normalCompletion() {
1354 >        for (ExecutionMode m : ExecutionMode.values())
1355 >        for (boolean createIncomplete : new boolean[] { true, false })
1356 >        for (Integer v1 : new Integer[] { 1, null })
1357 >    {
1358 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1359 >        final IncFunction r = new IncFunction(m);
1360 >        if (!createIncomplete) assertTrue(f.complete(v1));
1361 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1362 >        if (createIncomplete) {
1363 >            checkIncomplete(g);
1364 >            assertTrue(f.complete(v1));
1365 >        }
1366  
1367 <    /**
1368 <     * thenApplyAsync result completes exceptionally if source cancelled
1369 <     */
1370 <    public void testThenApplyAsync4() {
1662 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1663 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1664 <        assertTrue(f.cancel(true));
1665 <        checkCompletedWithWrappedCancellationException(g);
1666 <    }
1367 >        checkCompletedNormally(g, inc(v1));
1368 >        checkCompletedNormally(f, v1);
1369 >        r.assertValue(inc(v1));
1370 >    }}
1371  
1372      /**
1373 <     * thenAcceptAsync result completes normally after normal
1373 >     * thenApply result completes exceptionally after exceptional
1374       * completion of source
1375       */
1376 <    public void testThenAcceptAsync() {
1377 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1378 <        IncAction r = new IncAction();
1379 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1380 <        f.complete(one);
1381 <        checkCompletedNormally(g, null);
1382 <        assertEquals(r.value, 2);
1383 <    }
1376 >    public void testThenApply_exceptionalCompletion() {
1377 >        for (ExecutionMode m : ExecutionMode.values())
1378 >        for (boolean createIncomplete : new boolean[] { true, false })
1379 >    {
1380 >        final CFException ex = new CFException();
1381 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1382 >        final IncFunction r = new IncFunction(m);
1383 >        if (!createIncomplete) f.completeExceptionally(ex);
1384 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1385 >        if (createIncomplete) {
1386 >            checkIncomplete(g);
1387 >            f.completeExceptionally(ex);
1388 >        }
1389  
1390 <    /**
1391 <     * thenAcceptAsync result completes exceptionally after exceptional
1392 <     * completion of source
1393 <     */
1685 <    public void testThenAcceptAsync2() {
1686 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1687 <        IncAction r = new IncAction();
1688 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1689 <        f.completeExceptionally(new CFException());
1690 <        checkCompletedWithWrappedCFException(g);
1691 <    }
1390 >        checkCompletedWithWrappedException(g, ex);
1391 >        checkCompletedExceptionally(f, ex);
1392 >        r.assertNotInvoked();
1393 >    }}
1394  
1395      /**
1396 <     * thenAcceptAsync result completes exceptionally if action does
1396 >     * thenApply result completes exceptionally if source cancelled
1397       */
1398 <    public void testThenAcceptAsync3() {
1399 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1400 <        FailingConsumer r = new FailingConsumer();
1401 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1402 <        f.complete(null);
1403 <        checkCompletedWithWrappedCFException(g);
1404 <    }
1398 >    public void testThenApply_sourceCancelled() {
1399 >        for (ExecutionMode m : ExecutionMode.values())
1400 >        for (boolean createIncomplete : new boolean[] { true, false })
1401 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1402 >    {
1403 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1404 >        final IncFunction r = new IncFunction(m);
1405 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1406 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1407 >        if (createIncomplete) {
1408 >            checkIncomplete(g);
1409 >            assertTrue(f.cancel(mayInterruptIfRunning));
1410 >        }
1411  
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));
1412          checkCompletedWithWrappedCancellationException(g);
1413 <    }
1414 <
1415 <    /**
1716 <     * thenCombineAsync result completes normally after normal
1717 <     * completion of sources
1718 <     */
1719 <    public void testThenCombineAsync() {
1720 <        CompletableFuture<Integer> f, g, h;
1721 <
1722 <        f = new CompletableFuture<>();
1723 <        g = new CompletableFuture<>();
1724 <        h = f.thenCombineAsync(g, subtract);
1725 <        f.complete(3);
1726 <        checkIncomplete(h);
1727 <        g.complete(1);
1728 <        checkCompletedNormally(h, 2);
1729 <
1730 <        f = new CompletableFuture<>();
1731 <        g = new CompletableFuture<>();
1732 <        h = f.thenCombineAsync(g, subtract);
1733 <        g.complete(1);
1734 <        checkIncomplete(h);
1735 <        f.complete(3);
1736 <        checkCompletedNormally(h, 2);
1737 <
1738 <        f = new CompletableFuture<>();
1739 <        g = new CompletableFuture<>();
1740 <        g.complete(1);
1741 <        f.complete(3);
1742 <        h = f.thenCombineAsync(g, subtract);
1743 <        checkCompletedNormally(h, 2);
1744 <    }
1413 >        checkCancelled(f);
1414 >        r.assertNotInvoked();
1415 >    }}
1416  
1417      /**
1418 <     * thenCombineAsync result completes exceptionally after exceptional
1748 <     * completion of either source
1418 >     * thenApply result completes exceptionally if action does
1419       */
1420 <    public void testThenCombineAsync2() {
1421 <        CompletableFuture<Integer> f, g, h;
1422 <
1423 <        f = new CompletableFuture<>();
1424 <        g = new CompletableFuture<>();
1425 <        h = f.thenCombineAsync(g, subtract);
1426 <        f.completeExceptionally(new CFException());
1427 <        checkIncomplete(h);
1428 <        g.complete(1);
1429 <        checkCompletedWithWrappedCFException(h);
1430 <
1431 <        f = new CompletableFuture<>();
1432 <        g = new CompletableFuture<>();
1763 <        h = f.thenCombineAsync(g, subtract);
1764 <        g.completeExceptionally(new CFException());
1765 <        checkIncomplete(h);
1766 <        f.complete(3);
1767 <        checkCompletedWithWrappedCFException(h);
1768 <
1769 <        f = new CompletableFuture<>();
1770 <        g = new CompletableFuture<>();
1771 <        g.completeExceptionally(new CFException());
1772 <        f.complete(3);
1773 <        h = f.thenCombineAsync(g, subtract);
1774 <        checkCompletedWithWrappedCFException(h);
1775 <    }
1420 >    public void testThenApply_actionFailed() {
1421 >        for (ExecutionMode m : ExecutionMode.values())
1422 >        for (boolean createIncomplete : new boolean[] { true, false })
1423 >        for (Integer v1 : new Integer[] { 1, null })
1424 >    {
1425 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1426 >        final FailingFunction r = new FailingFunction(m);
1427 >        if (!createIncomplete) assertTrue(f.complete(v1));
1428 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1429 >        if (createIncomplete) {
1430 >            checkIncomplete(g);
1431 >            assertTrue(f.complete(v1));
1432 >        }
1433  
1777    /**
1778     * thenCombineAsync result completes exceptionally if action does
1779     */
1780    public void testThenCombineAsync3() {
1781        CompletableFuture<Integer> f = new CompletableFuture<>();
1782        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1783        FailingBiFunction r = new FailingBiFunction();
1784        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1785        f.complete(one);
1786        checkIncomplete(g);
1787        assertFalse(r.ran);
1788        f2.complete(two);
1434          checkCompletedWithWrappedCFException(g);
1435 <        assertTrue(r.ran);
1436 <    }
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 <    }
1435 >        checkCompletedNormally(f, v1);
1436 >    }}
1437  
1438      /**
1439 <     * thenAcceptBothAsync result completes normally after normal
1832 <     * completion of sources
1439 >     * thenAccept result completes normally after normal completion of source
1440       */
1441 <    public void testThenAcceptBothAsync() {
1442 <        CompletableFuture<Integer> f, g;
1443 <        CompletableFuture<Void> h;
1444 <        SubtractAction r;
1445 <
1446 <        f = new CompletableFuture<>();
1447 <        g = new CompletableFuture<>();
1448 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1449 <        f.complete(3);
1450 <        checkIncomplete(h);
1451 <        g.complete(1);
1452 <        checkCompletedNormally(h, null);
1453 <        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);
1441 >    public void testThenAccept_normalCompletion() {
1442 >        for (ExecutionMode m : ExecutionMode.values())
1443 >        for (boolean createIncomplete : new boolean[] { true, false })
1444 >        for (Integer v1 : new Integer[] { 1, null })
1445 >    {
1446 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1447 >        final NoopConsumer r = new NoopConsumer(m);
1448 >        if (!createIncomplete) assertTrue(f.complete(v1));
1449 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1450 >        if (createIncomplete) {
1451 >            checkIncomplete(g);
1452 >            assertTrue(f.complete(v1));
1453 >        }
1454  
1455 <        f = new CompletableFuture<>();
1456 <        g = new CompletableFuture<>();
1457 <        g.complete(1);
1458 <        f.complete(3);
1861 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1862 <        checkCompletedNormally(h, null);
1863 <        assertEquals(r.value, 2);
1864 <    }
1455 >        checkCompletedNormally(g, null);
1456 >        r.assertValue(v1);
1457 >        checkCompletedNormally(f, v1);
1458 >    }}
1459  
1460      /**
1461 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1461 >     * thenAccept result completes exceptionally after exceptional
1462       * completion of source
1463       */
1464 <    public void testThenAcceptBothAsync2() {
1465 <        CompletableFuture<Integer> f, g;
1466 <        CompletableFuture<Void> h;
1467 <        SubtractAction r;
1468 <
1469 <        f = new CompletableFuture<>();
1470 <        g = new CompletableFuture<>();
1471 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1472 <        f.completeExceptionally(new CFException());
1473 <        checkIncomplete(h);
1474 <        g.complete(1);
1475 <        checkCompletedWithWrappedCFException(h);
1476 <
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);
1464 >    public void testThenAccept_exceptionalCompletion() {
1465 >        for (ExecutionMode m : ExecutionMode.values())
1466 >        for (boolean createIncomplete : new boolean[] { true, false })
1467 >    {
1468 >        final CFException ex = new CFException();
1469 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 >        final NoopConsumer r = new NoopConsumer(m);
1471 >        if (!createIncomplete) f.completeExceptionally(ex);
1472 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1473 >        if (createIncomplete) {
1474 >            checkIncomplete(g);
1475 >            f.completeExceptionally(ex);
1476 >        }
1477  
1478 <        f = new CompletableFuture<>();
1479 <        g = new CompletableFuture<>();
1480 <        f.completeExceptionally(new CFException());
1481 <        g.complete(3);
1902 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1903 <        checkCompletedWithWrappedCFException(h);
1904 <    }
1478 >        checkCompletedWithWrappedException(g, ex);
1479 >        checkCompletedExceptionally(f, ex);
1480 >        r.assertNotInvoked();
1481 >    }}
1482  
1483      /**
1484 <     * thenAcceptBothAsync result completes exceptionally if action does
1484 >     * thenAccept result completes exceptionally if source cancelled
1485       */
1486 <    public void testThenAcceptBothAsync3() {
1487 <        CompletableFuture<Integer> f, g;
1488 <        CompletableFuture<Void> h;
1489 <        FailingBiConsumer r;
1490 <
1491 <        f = new CompletableFuture<>();
1492 <        g = new CompletableFuture<>();
1493 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1494 <        f.complete(3);
1495 <        checkIncomplete(h);
1496 <        g.complete(1);
1497 <        checkCompletedWithWrappedCFException(h);
1486 >    public void testThenAccept_sourceCancelled() {
1487 >        for (ExecutionMode m : ExecutionMode.values())
1488 >        for (boolean createIncomplete : new boolean[] { true, false })
1489 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490 >    {
1491 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 >        final NoopConsumer r = new NoopConsumer(m);
1493 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1494 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1495 >        if (createIncomplete) {
1496 >            checkIncomplete(g);
1497 >            assertTrue(f.cancel(mayInterruptIfRunning));
1498 >        }
1499  
1500 <        f = new CompletableFuture<>();
1501 <        g = new CompletableFuture<>();
1502 <        f.complete(3);
1503 <        g.complete(1);
1926 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1927 <        checkCompletedWithWrappedCFException(h);
1928 <    }
1500 >        checkCompletedWithWrappedCancellationException(g);
1501 >        checkCancelled(f);
1502 >        r.assertNotInvoked();
1503 >    }}
1504  
1505      /**
1506 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1506 >     * thenAccept result completes exceptionally if action does
1507       */
1508 <    public void testThenAcceptBothAsync4() {
1509 <        CompletableFuture<Integer> f, g;
1510 <        CompletableFuture<Void> h;
1511 <        SubtractAction r;
1512 <
1513 <        f = new CompletableFuture<>();
1514 <        g = new CompletableFuture<>();
1515 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1516 <        assertTrue(f.cancel(true));
1517 <        checkIncomplete(h);
1518 <        g.complete(1);
1519 <        checkCompletedWithWrappedCancellationException(h);
1520 <
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);
1508 >    public void testThenAccept_actionFailed() {
1509 >        for (ExecutionMode m : ExecutionMode.values())
1510 >        for (boolean createIncomplete : new boolean[] { true, false })
1511 >        for (Integer v1 : new Integer[] { 1, null })
1512 >    {
1513 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 >        final FailingConsumer r = new FailingConsumer(m);
1515 >        if (!createIncomplete) f.complete(v1);
1516 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1517 >        if (createIncomplete) {
1518 >            checkIncomplete(g);
1519 >            f.complete(v1);
1520 >        }
1521  
1522 <        f = new CompletableFuture<>();
1523 <        g = new CompletableFuture<>();
1524 <        assertTrue(f.cancel(true));
1964 <        g.complete(3);
1965 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1966 <        checkCompletedWithWrappedCancellationException(h);
1967 <    }
1522 >        checkCompletedWithWrappedCFException(g);
1523 >        checkCompletedNormally(f, v1);
1524 >    }}
1525  
1526      /**
1527 <     * applyToEitherAsync result completes normally after normal
1528 <     * completion of sources
1527 >     * thenCombine result completes normally after normal completion
1528 >     * of sources
1529       */
1530 <    public void testApplyToEitherAsync() {
1531 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1532 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1533 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1534 <        f.complete(one);
1535 <        checkCompletedNormally(g, two);
1536 <
1537 <        f = new CompletableFuture<>();
1538 <        f.complete(one);
1539 <        f2 = new CompletableFuture<>();
1540 <        g = f.applyToEitherAsync(f2, inc);
1541 <        checkCompletedNormally(g, two);
1542 <    }
1530 >    public void testThenCombine_normalCompletion() {
1531 >        for (ExecutionMode m : ExecutionMode.values())
1532 >        for (boolean fFirst : new boolean[] { true, false })
1533 >        for (Integer v1 : new Integer[] { 1, null })
1534 >        for (Integer v2 : new Integer[] { 2, null })
1535 >    {
1536 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1537 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1538 >        final SubtractFunction r1 = new SubtractFunction(m);
1539 >        final SubtractFunction r2 = new SubtractFunction(m);
1540 >        final SubtractFunction r3 = new SubtractFunction(m);
1541 >
1542 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1543 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1544 >        final Integer w1 =  fFirst ? v1 : v2;
1545 >        final Integer w2 = !fFirst ? v1 : v2;
1546 >
1547 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1548 >        assertTrue(fst.complete(w1));
1549 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1550 >        checkIncomplete(h1);
1551 >        checkIncomplete(h2);
1552 >        r1.assertNotInvoked();
1553 >        r2.assertNotInvoked();
1554 >        assertTrue(snd.complete(w2));
1555 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1556 >
1557 >        checkCompletedNormally(h1, subtract(v1, v2));
1558 >        checkCompletedNormally(h2, subtract(v1, v2));
1559 >        checkCompletedNormally(h3, subtract(v1, v2));
1560 >        r1.assertValue(subtract(v1, v2));
1561 >        r2.assertValue(subtract(v1, v2));
1562 >        r3.assertValue(subtract(v1, v2));
1563 >        checkCompletedNormally(f, v1);
1564 >        checkCompletedNormally(g, v2);
1565 >    }}
1566  
1567      /**
1568 <     * applyToEitherAsync result completes exceptionally after exceptional
1569 <     * completion of source
1568 >     * thenCombine result completes exceptionally after exceptional
1569 >     * completion of either source
1570       */
1571 <    public void testApplyToEitherAsync2() {
1572 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1573 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1574 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1575 <        f.completeExceptionally(new CFException());
1576 <        checkCompletedWithWrappedCFException(g);
1577 <
1578 <        f = new CompletableFuture<>();
1579 <        f2 = new CompletableFuture<>();
1580 <        f2.completeExceptionally(new CFException());
1581 <        g = f.applyToEitherAsync(f2, inc);
1582 <        f.complete(one);
1583 <        checkCompletedWithWrappedCFException(g);
1584 <    }
1571 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1572 >        for (ExecutionMode m : ExecutionMode.values())
1573 >        for (boolean fFirst : new boolean[] { true, false })
1574 >        for (boolean failFirst : new boolean[] { true, false })
1575 >        for (Integer v1 : new Integer[] { 1, null })
1576 >    {
1577 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1578 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1579 >        final CFException ex = new CFException();
1580 >        final SubtractFunction r1 = new SubtractFunction(m);
1581 >        final SubtractFunction r2 = new SubtractFunction(m);
1582 >        final SubtractFunction r3 = new SubtractFunction(m);
1583 >
1584 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1585 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1586 >        final Callable<Boolean> complete1 = failFirst ?
1587 >            () -> fst.completeExceptionally(ex) :
1588 >            () -> fst.complete(v1);
1589 >        final Callable<Boolean> complete2 = failFirst ?
1590 >            () -> snd.complete(v1) :
1591 >            () -> snd.completeExceptionally(ex);
1592 >
1593 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1594 >        assertTrue(complete1.call());
1595 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1596 >        checkIncomplete(h1);
1597 >        checkIncomplete(h2);
1598 >        assertTrue(complete2.call());
1599 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1600 >
1601 >        checkCompletedWithWrappedException(h1, ex);
1602 >        checkCompletedWithWrappedException(h2, ex);
1603 >        checkCompletedWithWrappedException(h3, ex);
1604 >        r1.assertNotInvoked();
1605 >        r2.assertNotInvoked();
1606 >        r3.assertNotInvoked();
1607 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1608 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1609 >    }}
1610  
1611      /**
1612 <     * applyToEitherAsync result completes exceptionally if action does
1612 >     * thenCombine result completes exceptionally if either source cancelled
1613       */
1614 <    public void testApplyToEitherAsync3() {
1615 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1616 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1617 <        FailingFunction r = new FailingFunction();
1618 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1619 <        f.complete(one);
1620 <        checkCompletedWithWrappedCFException(g);
1621 <    }
1614 >    public void testThenCombine_sourceCancelled() throws Throwable {
1615 >        for (ExecutionMode m : ExecutionMode.values())
1616 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1617 >        for (boolean fFirst : new boolean[] { true, false })
1618 >        for (boolean failFirst : new boolean[] { true, false })
1619 >        for (Integer v1 : new Integer[] { 1, null })
1620 >    {
1621 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1622 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1623 >        final SubtractFunction r1 = new SubtractFunction(m);
1624 >        final SubtractFunction r2 = new SubtractFunction(m);
1625 >        final SubtractFunction r3 = new SubtractFunction(m);
1626 >
1627 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1628 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1629 >        final Callable<Boolean> complete1 = failFirst ?
1630 >            () -> fst.cancel(mayInterruptIfRunning) :
1631 >            () -> fst.complete(v1);
1632 >        final Callable<Boolean> complete2 = failFirst ?
1633 >            () -> snd.complete(v1) :
1634 >            () -> snd.cancel(mayInterruptIfRunning);
1635 >
1636 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1637 >        assertTrue(complete1.call());
1638 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1639 >        checkIncomplete(h1);
1640 >        checkIncomplete(h2);
1641 >        assertTrue(complete2.call());
1642 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1643 >
1644 >        checkCompletedWithWrappedCancellationException(h1);
1645 >        checkCompletedWithWrappedCancellationException(h2);
1646 >        checkCompletedWithWrappedCancellationException(h3);
1647 >        r1.assertNotInvoked();
1648 >        r2.assertNotInvoked();
1649 >        r3.assertNotInvoked();
1650 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1651 >        checkCancelled(failFirst ? fst : snd);
1652 >    }}
1653  
1654      /**
1655 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1655 >     * thenCombine result completes exceptionally if action does
1656       */
1657 <    public void testApplyToEitherAsync4() {
1658 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1659 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1660 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1661 <        assertTrue(f.cancel(true));
1662 <        checkCompletedWithWrappedCancellationException(g);
1663 <
1664 <        f = new CompletableFuture<>();
1665 <        f2 = new CompletableFuture<>();
1666 <        assertTrue(f2.cancel(true));
1667 <        g = f.applyToEitherAsync(f2, inc);
1668 <        checkCompletedWithWrappedCancellationException(g);
1669 <    }
1657 >    public void testThenCombine_actionFailed() {
1658 >        for (ExecutionMode m : ExecutionMode.values())
1659 >        for (boolean fFirst : new boolean[] { true, false })
1660 >        for (Integer v1 : new Integer[] { 1, null })
1661 >        for (Integer v2 : new Integer[] { 2, null })
1662 >    {
1663 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1664 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1665 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1666 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1667 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1668 >
1669 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1670 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1671 >        final Integer w1 =  fFirst ? v1 : v2;
1672 >        final Integer w2 = !fFirst ? v1 : v2;
1673 >
1674 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1675 >        assertTrue(fst.complete(w1));
1676 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1677 >        assertTrue(snd.complete(w2));
1678 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1679 >
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedWithWrappedCFException(h3);
1683 >        r1.assertInvoked();
1684 >        r2.assertInvoked();
1685 >        r3.assertInvoked();
1686 >        checkCompletedNormally(f, v1);
1687 >        checkCompletedNormally(g, v2);
1688 >    }}
1689  
1690      /**
1691 <     * acceptEitherAsync result completes normally after normal
1691 >     * thenAcceptBoth result completes normally after normal
1692       * completion of sources
1693       */
1694 <    public void testAcceptEitherAsync() {
1695 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1696 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1697 <        IncAction r = new IncAction();
1698 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1699 <        f.complete(one);
1700 <        checkCompletedNormally(g, null);
1701 <        assertEquals(r.value, 2);
1702 <
1703 <        r = new IncAction();
1704 <        f = new CompletableFuture<>();
1705 <        f.complete(one);
1706 <        f2 = new CompletableFuture<>();
1707 <        g = f.acceptEitherAsync(f2, r);
1708 <        checkCompletedNormally(g, null);
1709 <        assertEquals(r.value, 2);
1710 <    }
1694 >    public void testThenAcceptBoth_normalCompletion() {
1695 >        for (ExecutionMode m : ExecutionMode.values())
1696 >        for (boolean fFirst : new boolean[] { true, false })
1697 >        for (Integer v1 : new Integer[] { 1, null })
1698 >        for (Integer v2 : new Integer[] { 2, null })
1699 >    {
1700 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1701 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1702 >        final SubtractAction r1 = new SubtractAction(m);
1703 >        final SubtractAction r2 = new SubtractAction(m);
1704 >        final SubtractAction r3 = new SubtractAction(m);
1705 >
1706 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1707 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1708 >        final Integer w1 =  fFirst ? v1 : v2;
1709 >        final Integer w2 = !fFirst ? v1 : v2;
1710 >
1711 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1712 >        assertTrue(fst.complete(w1));
1713 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1714 >        checkIncomplete(h1);
1715 >        checkIncomplete(h2);
1716 >        r1.assertNotInvoked();
1717 >        r2.assertNotInvoked();
1718 >        assertTrue(snd.complete(w2));
1719 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1720 >
1721 >        checkCompletedNormally(h1, null);
1722 >        checkCompletedNormally(h2, null);
1723 >        checkCompletedNormally(h3, null);
1724 >        r1.assertValue(subtract(v1, v2));
1725 >        r2.assertValue(subtract(v1, v2));
1726 >        r3.assertValue(subtract(v1, v2));
1727 >        checkCompletedNormally(f, v1);
1728 >        checkCompletedNormally(g, v2);
1729 >    }}
1730  
1731      /**
1732 <     * acceptEitherAsync result completes exceptionally after exceptional
1733 <     * completion of source
1732 >     * thenAcceptBoth result completes exceptionally after exceptional
1733 >     * completion of either source
1734       */
1735 <    public void testAcceptEitherAsync2() {
1736 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1737 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1738 <        IncAction r = new IncAction();
1739 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1740 <        f.completeExceptionally(new CFException());
1741 <        checkCompletedWithWrappedCFException(g);
1742 <
1743 <        r = new IncAction();
1744 <        f = new CompletableFuture<>();
1745 <        f2 = new CompletableFuture<>();
1746 <        f2.completeExceptionally(new CFException());
1747 <        g = f.acceptEitherAsync(f2, r);
1748 <        f.complete(one);
1749 <        checkCompletedWithWrappedCFException(g);
1750 <    }
1735 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1736 >        for (ExecutionMode m : ExecutionMode.values())
1737 >        for (boolean fFirst : new boolean[] { true, false })
1738 >        for (boolean failFirst : new boolean[] { true, false })
1739 >        for (Integer v1 : new Integer[] { 1, null })
1740 >    {
1741 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1742 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1743 >        final CFException ex = new CFException();
1744 >        final SubtractAction r1 = new SubtractAction(m);
1745 >        final SubtractAction r2 = new SubtractAction(m);
1746 >        final SubtractAction r3 = new SubtractAction(m);
1747 >
1748 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1749 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1750 >        final Callable<Boolean> complete1 = failFirst ?
1751 >            () -> fst.completeExceptionally(ex) :
1752 >            () -> fst.complete(v1);
1753 >        final Callable<Boolean> complete2 = failFirst ?
1754 >            () -> snd.complete(v1) :
1755 >            () -> snd.completeExceptionally(ex);
1756 >
1757 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1758 >        assertTrue(complete1.call());
1759 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1760 >        checkIncomplete(h1);
1761 >        checkIncomplete(h2);
1762 >        assertTrue(complete2.call());
1763 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1764 >
1765 >        checkCompletedWithWrappedException(h1, ex);
1766 >        checkCompletedWithWrappedException(h2, ex);
1767 >        checkCompletedWithWrappedException(h3, ex);
1768 >        r1.assertNotInvoked();
1769 >        r2.assertNotInvoked();
1770 >        r3.assertNotInvoked();
1771 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1772 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1773 >    }}
1774  
1775      /**
1776 <     * acceptEitherAsync result completes exceptionally if action does
1776 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1777       */
1778 <    public void testAcceptEitherAsync3() {
1779 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1780 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1781 <        FailingConsumer r = new FailingConsumer();
1782 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1783 <        f.complete(one);
1784 <        checkCompletedWithWrappedCFException(g);
1785 <    }
1778 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1779 >        for (ExecutionMode m : ExecutionMode.values())
1780 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1781 >        for (boolean fFirst : new boolean[] { true, false })
1782 >        for (boolean failFirst : new boolean[] { true, false })
1783 >        for (Integer v1 : new Integer[] { 1, null })
1784 >    {
1785 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1786 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1787 >        final SubtractAction r1 = new SubtractAction(m);
1788 >        final SubtractAction r2 = new SubtractAction(m);
1789 >        final SubtractAction r3 = new SubtractAction(m);
1790 >
1791 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1792 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1793 >        final Callable<Boolean> complete1 = failFirst ?
1794 >            () -> fst.cancel(mayInterruptIfRunning) :
1795 >            () -> fst.complete(v1);
1796 >        final Callable<Boolean> complete2 = failFirst ?
1797 >            () -> snd.complete(v1) :
1798 >            () -> snd.cancel(mayInterruptIfRunning);
1799 >
1800 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1801 >        assertTrue(complete1.call());
1802 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1803 >        checkIncomplete(h1);
1804 >        checkIncomplete(h2);
1805 >        assertTrue(complete2.call());
1806 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1807 >
1808 >        checkCompletedWithWrappedCancellationException(h1);
1809 >        checkCompletedWithWrappedCancellationException(h2);
1810 >        checkCompletedWithWrappedCancellationException(h3);
1811 >        r1.assertNotInvoked();
1812 >        r2.assertNotInvoked();
1813 >        r3.assertNotInvoked();
1814 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1815 >        checkCancelled(failFirst ? fst : snd);
1816 >    }}
1817  
1818      /**
1819 <     * acceptEitherAsync result completes exceptionally if either
2092 <     * source cancelled
1819 >     * thenAcceptBoth result completes exceptionally if action does
1820       */
1821 <    public void testAcceptEitherAsync4() {
1822 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1823 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1824 <        IncAction r = new IncAction();
1825 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1826 <        assertTrue(f.cancel(true));
1827 <        checkCompletedWithWrappedCancellationException(g);
1828 <
1829 <        r = new IncAction();
1830 <        f = new CompletableFuture<>();
1831 <        f2 = new CompletableFuture<>();
1832 <        assertTrue(f2.cancel(true));
1833 <        g = f.acceptEitherAsync(f2, r);
1834 <        checkCompletedWithWrappedCancellationException(g);
1835 <    }
1821 >    public void testThenAcceptBoth_actionFailed() {
1822 >        for (ExecutionMode m : ExecutionMode.values())
1823 >        for (boolean fFirst : new boolean[] { true, false })
1824 >        for (Integer v1 : new Integer[] { 1, null })
1825 >        for (Integer v2 : new Integer[] { 2, null })
1826 >    {
1827 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1828 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1829 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1830 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1831 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1832 >
1833 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1834 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1835 >        final Integer w1 =  fFirst ? v1 : v2;
1836 >        final Integer w2 = !fFirst ? v1 : v2;
1837 >
1838 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1839 >        assertTrue(fst.complete(w1));
1840 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1841 >        assertTrue(snd.complete(w2));
1842 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1843 >
1844 >        checkCompletedWithWrappedCFException(h1);
1845 >        checkCompletedWithWrappedCFException(h2);
1846 >        checkCompletedWithWrappedCFException(h3);
1847 >        r1.assertInvoked();
1848 >        r2.assertInvoked();
1849 >        r3.assertInvoked();
1850 >        checkCompletedNormally(f, v1);
1851 >        checkCompletedNormally(g, v2);
1852 >    }}
1853  
1854      /**
1855 <     * runAfterEitherAsync result completes normally after normal
1855 >     * runAfterBoth result completes normally after normal
1856       * completion of sources
1857       */
1858 <    public void testRunAfterEitherAsync() {
1859 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1860 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1861 <        Noop r = new Noop();
1862 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1863 <        f.complete(one);
1864 <        checkCompletedNormally(g, null);
1865 <        assertTrue(r.ran);
1866 <
1867 <        r = new Noop();
1868 <        f = new CompletableFuture<>();
1869 <        f.complete(one);
1870 <        f2 = new CompletableFuture<>();
1871 <        g = f.runAfterEitherAsync(f2, r);
1872 <        checkCompletedNormally(g, null);
1873 <        assertTrue(r.ran);
1874 <    }
1858 >    public void testRunAfterBoth_normalCompletion() {
1859 >        for (ExecutionMode m : ExecutionMode.values())
1860 >        for (boolean fFirst : new boolean[] { true, false })
1861 >        for (Integer v1 : new Integer[] { 1, null })
1862 >        for (Integer v2 : new Integer[] { 2, null })
1863 >    {
1864 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1865 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1866 >        final Noop r1 = new Noop(m);
1867 >        final Noop r2 = new Noop(m);
1868 >        final Noop r3 = new Noop(m);
1869 >
1870 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1871 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1872 >        final Integer w1 =  fFirst ? v1 : v2;
1873 >        final Integer w2 = !fFirst ? v1 : v2;
1874 >
1875 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1876 >        assertTrue(fst.complete(w1));
1877 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1878 >        checkIncomplete(h1);
1879 >        checkIncomplete(h2);
1880 >        r1.assertNotInvoked();
1881 >        r2.assertNotInvoked();
1882 >        assertTrue(snd.complete(w2));
1883 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1884 >
1885 >        checkCompletedNormally(h1, null);
1886 >        checkCompletedNormally(h2, null);
1887 >        checkCompletedNormally(h3, null);
1888 >        r1.assertInvoked();
1889 >        r2.assertInvoked();
1890 >        r3.assertInvoked();
1891 >        checkCompletedNormally(f, v1);
1892 >        checkCompletedNormally(g, v2);
1893 >    }}
1894  
1895      /**
1896 <     * runAfterEitherAsync result completes exceptionally after exceptional
1897 <     * completion of source
1896 >     * runAfterBoth result completes exceptionally after exceptional
1897 >     * completion of either source
1898       */
1899 <    public void testRunAfterEitherAsync2() {
1900 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1901 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1902 <        Noop r = new Noop();
1903 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1904 <        f.completeExceptionally(new CFException());
1905 <        checkCompletedWithWrappedCFException(g);
1906 <
1907 <        r = new Noop();
1908 <        f = new CompletableFuture<>();
1909 <        f2 = new CompletableFuture<>();
1910 <        f2.completeExceptionally(new CFException());
1911 <        g = f.runAfterEitherAsync(f2, r);
1912 <        f.complete(one);
1913 <        checkCompletedWithWrappedCFException(g);
1914 <    }
1899 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1900 >        for (ExecutionMode m : ExecutionMode.values())
1901 >        for (boolean fFirst : new boolean[] { true, false })
1902 >        for (boolean failFirst : new boolean[] { true, false })
1903 >        for (Integer v1 : new Integer[] { 1, null })
1904 >    {
1905 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1906 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1907 >        final CFException ex = new CFException();
1908 >        final Noop r1 = new Noop(m);
1909 >        final Noop r2 = new Noop(m);
1910 >        final Noop r3 = new Noop(m);
1911 >
1912 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1913 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1914 >        final Callable<Boolean> complete1 = failFirst ?
1915 >            () -> fst.completeExceptionally(ex) :
1916 >            () -> fst.complete(v1);
1917 >        final Callable<Boolean> complete2 = failFirst ?
1918 >            () -> snd.complete(v1) :
1919 >            () -> snd.completeExceptionally(ex);
1920 >
1921 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1922 >        assertTrue(complete1.call());
1923 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1924 >        checkIncomplete(h1);
1925 >        checkIncomplete(h2);
1926 >        assertTrue(complete2.call());
1927 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1928 >
1929 >        checkCompletedWithWrappedException(h1, ex);
1930 >        checkCompletedWithWrappedException(h2, ex);
1931 >        checkCompletedWithWrappedException(h3, ex);
1932 >        r1.assertNotInvoked();
1933 >        r2.assertNotInvoked();
1934 >        r3.assertNotInvoked();
1935 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1936 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1937 >    }}
1938  
1939      /**
1940 <     * runAfterEitherAsync result completes exceptionally if action does
1940 >     * runAfterBoth result completes exceptionally if either source cancelled
1941       */
1942 <    public void testRunAfterEitherAsync3() {
1943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1944 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1945 <        FailingNoop r = new FailingNoop();
1946 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1947 <        f.complete(one);
1948 <        checkCompletedWithWrappedCFException(g);
1949 <    }
1942 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1943 >        for (ExecutionMode m : ExecutionMode.values())
1944 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1945 >        for (boolean fFirst : new boolean[] { true, false })
1946 >        for (boolean failFirst : new boolean[] { true, false })
1947 >        for (Integer v1 : new Integer[] { 1, null })
1948 >    {
1949 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1950 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1951 >        final Noop r1 = new Noop(m);
1952 >        final Noop r2 = new Noop(m);
1953 >        final Noop r3 = new Noop(m);
1954 >
1955 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1956 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1957 >        final Callable<Boolean> complete1 = failFirst ?
1958 >            () -> fst.cancel(mayInterruptIfRunning) :
1959 >            () -> fst.complete(v1);
1960 >        final Callable<Boolean> complete2 = failFirst ?
1961 >            () -> snd.complete(v1) :
1962 >            () -> snd.cancel(mayInterruptIfRunning);
1963 >
1964 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1965 >        assertTrue(complete1.call());
1966 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1967 >        checkIncomplete(h1);
1968 >        checkIncomplete(h2);
1969 >        assertTrue(complete2.call());
1970 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1971 >
1972 >        checkCompletedWithWrappedCancellationException(h1);
1973 >        checkCompletedWithWrappedCancellationException(h2);
1974 >        checkCompletedWithWrappedCancellationException(h3);
1975 >        r1.assertNotInvoked();
1976 >        r2.assertNotInvoked();
1977 >        r3.assertNotInvoked();
1978 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1979 >        checkCancelled(failFirst ? fst : snd);
1980 >    }}
1981  
1982      /**
1983 <     * runAfterEitherAsync result completes exceptionally if either
2167 <     * source cancelled
1983 >     * runAfterBoth result completes exceptionally if action does
1984       */
1985 <    public void testRunAfterEitherAsync4() {
1986 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1987 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1988 <        Noop r = new Noop();
1989 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1990 <        assertTrue(f.cancel(true));
1991 <        checkCompletedWithWrappedCancellationException(g);
1992 <
1993 <        r = new Noop();
1994 <        f = new CompletableFuture<>();
1995 <        f2 = new CompletableFuture<>();
1996 <        assertTrue(f2.cancel(true));
1997 <        g = f.runAfterEitherAsync(f2, r);
1998 <        checkCompletedWithWrappedCancellationException(g);
1999 <    }
1985 >    public void testRunAfterBoth_actionFailed() {
1986 >        for (ExecutionMode m : ExecutionMode.values())
1987 >        for (boolean fFirst : new boolean[] { true, false })
1988 >        for (Integer v1 : new Integer[] { 1, null })
1989 >        for (Integer v2 : new Integer[] { 2, null })
1990 >    {
1991 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1992 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1993 >        final FailingRunnable r1 = new FailingRunnable(m);
1994 >        final FailingRunnable r2 = new FailingRunnable(m);
1995 >        final FailingRunnable r3 = new FailingRunnable(m);
1996 >
1997 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1998 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1999 >        final Integer w1 =  fFirst ? v1 : v2;
2000 >        final Integer w2 = !fFirst ? v1 : v2;
2001 >
2002 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2003 >        assertTrue(fst.complete(w1));
2004 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2005 >        assertTrue(snd.complete(w2));
2006 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2007 >
2008 >        checkCompletedWithWrappedCFException(h1);
2009 >        checkCompletedWithWrappedCFException(h2);
2010 >        checkCompletedWithWrappedCFException(h3);
2011 >        r1.assertInvoked();
2012 >        r2.assertInvoked();
2013 >        r3.assertInvoked();
2014 >        checkCompletedNormally(f, v1);
2015 >        checkCompletedNormally(g, v2);
2016 >    }}
2017  
2018      /**
2019 <     * thenComposeAsync result completes normally after normal
2020 <     * completion of source
2019 >     * applyToEither result completes normally after normal completion
2020 >     * of either source
2021       */
2022 <    public void testThenComposeAsync() {
2023 <        CompletableFuture<Integer> f, g;
2024 <        CompletableFutureInc r;
2025 <
2026 <        f = new CompletableFuture<>();
2027 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2028 <        f.complete(one);
2029 <        checkCompletedNormally(g, two);
2030 <
2198 <        f = new CompletableFuture<>();
2199 <        f.complete(one);
2200 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2201 <        checkCompletedNormally(g, two);
2202 <    }
2022 >    public void testApplyToEither_normalCompletion() {
2023 >        for (ExecutionMode m : ExecutionMode.values())
2024 >        for (Integer v1 : new Integer[] { 1, null })
2025 >        for (Integer v2 : new Integer[] { 2, null })
2026 >    {
2027 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2028 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2029 >        final IncFunction[] rs = new IncFunction[6];
2030 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2031  
2032 <    /**
2033 <     * thenComposeAsync result completes exceptionally after
2034 <     * exceptional completion of source
2035 <     */
2036 <    public void testThenComposeAsync2() {
2037 <        CompletableFuture<Integer> f, g;
2038 <        CompletableFutureInc r;
2032 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2033 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2034 >        checkIncomplete(h0);
2035 >        checkIncomplete(h1);
2036 >        rs[0].assertNotInvoked();
2037 >        rs[1].assertNotInvoked();
2038 >        f.complete(v1);
2039 >        checkCompletedNormally(h0, inc(v1));
2040 >        checkCompletedNormally(h1, inc(v1));
2041 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2042 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2043 >        checkCompletedNormally(h2, inc(v1));
2044 >        checkCompletedNormally(h3, inc(v1));
2045 >        g.complete(v2);
2046  
2047 <        f = new CompletableFuture<>();
2048 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2049 <        f.completeExceptionally(new CFException());
2050 <        checkCompletedWithWrappedCFException(g);
2051 <        assertFalse(r.ran);
2047 >        // unspecified behavior - both source completions available
2048 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2049 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2050 >        rs[4].assertValue(h4.join());
2051 >        rs[5].assertValue(h5.join());
2052 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2053 >                   Objects.equals(inc(v2), h4.join()));
2054 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2055 >                   Objects.equals(inc(v2), h5.join()));
2056  
2057 <        f = new CompletableFuture<>();
2058 <        f.completeExceptionally(new CFException());
2059 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2060 <        checkCompletedWithWrappedCFException(g);
2061 <        assertFalse(r.ran);
2062 <    }
2057 >        checkCompletedNormally(f, v1);
2058 >        checkCompletedNormally(g, v2);
2059 >        checkCompletedNormally(h0, inc(v1));
2060 >        checkCompletedNormally(h1, inc(v1));
2061 >        checkCompletedNormally(h2, inc(v1));
2062 >        checkCompletedNormally(h3, inc(v1));
2063 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2064 >    }}
2065  
2066      /**
2067 <     * thenComposeAsync result completes exceptionally if action does
2067 >     * applyToEither result completes exceptionally after exceptional
2068 >     * completion of either source
2069       */
2070 <    public void testThenComposeAsync3() {
2071 <        CompletableFuture<Integer> f, g;
2072 <        FailingCompletableFutureFunction r;
2070 >    public void testApplyToEither_exceptionalCompletion() {
2071 >        for (ExecutionMode m : ExecutionMode.values())
2072 >        for (Integer v1 : new Integer[] { 1, null })
2073 >    {
2074 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2075 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2076 >        final CFException ex = new CFException();
2077 >        final IncFunction[] rs = new IncFunction[6];
2078 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2079  
2080 <        f = new CompletableFuture<>();
2081 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2082 <        f.complete(one);
2083 <        checkCompletedWithWrappedCFException(g);
2080 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2081 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2082 >        checkIncomplete(h0);
2083 >        checkIncomplete(h1);
2084 >        rs[0].assertNotInvoked();
2085 >        rs[1].assertNotInvoked();
2086 >        f.completeExceptionally(ex);
2087 >        checkCompletedWithWrappedException(h0, ex);
2088 >        checkCompletedWithWrappedException(h1, ex);
2089 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2090 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2091 >        checkCompletedWithWrappedException(h2, ex);
2092 >        checkCompletedWithWrappedException(h3, ex);
2093 >        g.complete(v1);
2094  
2095 <        f = new CompletableFuture<>();
2096 <        f.complete(one);
2097 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2098 <        checkCompletedWithWrappedCFException(g);
2099 <    }
2095 >        // unspecified behavior - both source completions available
2096 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2097 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2098 >        try {
2099 >            assertEquals(inc(v1), h4.join());
2100 >            rs[4].assertValue(inc(v1));
2101 >        } catch (CompletionException ok) {
2102 >            checkCompletedWithWrappedException(h4, ex);
2103 >            rs[4].assertNotInvoked();
2104 >        }
2105 >        try {
2106 >            assertEquals(inc(v1), h5.join());
2107 >            rs[5].assertValue(inc(v1));
2108 >        } catch (CompletionException ok) {
2109 >            checkCompletedWithWrappedException(h5, ex);
2110 >            rs[5].assertNotInvoked();
2111 >        }
2112  
2113 <    /**
2114 <     * thenComposeAsync result completes exceptionally if source cancelled
2115 <     */
2116 <    public void testThenComposeAsync4() {
2117 <        CompletableFuture<Integer> f, g;
2118 <        CompletableFutureInc r;
2113 >        checkCompletedExceptionally(f, ex);
2114 >        checkCompletedNormally(g, v1);
2115 >        checkCompletedWithWrappedException(h0, ex);
2116 >        checkCompletedWithWrappedException(h1, ex);
2117 >        checkCompletedWithWrappedException(h2, ex);
2118 >        checkCompletedWithWrappedException(h3, ex);
2119 >        checkCompletedWithWrappedException(h4, ex);
2120 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2121 >    }}
2122  
2123 <        f = new CompletableFuture<>();
2124 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2125 <        assertTrue(f.cancel(true));
2126 <        checkCompletedWithWrappedCancellationException(g);
2123 >    public void testApplyToEither_exceptionalCompletion2() {
2124 >        for (ExecutionMode m : ExecutionMode.values())
2125 >        for (boolean fFirst : new boolean[] { true, false })
2126 >        for (Integer v1 : new Integer[] { 1, null })
2127 >    {
2128 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2129 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2130 >        final CFException ex = new CFException();
2131 >        final IncFunction[] rs = new IncFunction[6];
2132 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2133  
2134 <        f = new CompletableFuture<>();
2135 <        assertTrue(f.cancel(true));
2136 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2137 <        checkCompletedWithWrappedCancellationException(g);
2138 <    }
2134 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2135 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2136 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2137 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2138 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2139 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2140 >
2141 >        // unspecified behavior - both source completions available
2142 >        try {
2143 >            assertEquals(inc(v1), h0.join());
2144 >            rs[0].assertValue(inc(v1));
2145 >        } catch (CompletionException ok) {
2146 >            checkCompletedWithWrappedException(h0, ex);
2147 >            rs[0].assertNotInvoked();
2148 >        }
2149 >        try {
2150 >            assertEquals(inc(v1), h1.join());
2151 >            rs[1].assertValue(inc(v1));
2152 >        } catch (CompletionException ok) {
2153 >            checkCompletedWithWrappedException(h1, ex);
2154 >            rs[1].assertNotInvoked();
2155 >        }
2156 >        try {
2157 >            assertEquals(inc(v1), h2.join());
2158 >            rs[2].assertValue(inc(v1));
2159 >        } catch (CompletionException ok) {
2160 >            checkCompletedWithWrappedException(h2, ex);
2161 >            rs[2].assertNotInvoked();
2162 >        }
2163 >        try {
2164 >            assertEquals(inc(v1), h3.join());
2165 >            rs[3].assertValue(inc(v1));
2166 >        } catch (CompletionException ok) {
2167 >            checkCompletedWithWrappedException(h3, ex);
2168 >            rs[3].assertNotInvoked();
2169 >        }
2170  
2171 <    // async with explicit executors
2171 >        checkCompletedNormally(f, v1);
2172 >        checkCompletedExceptionally(g, ex);
2173 >    }}
2174  
2175      /**
2176 <     * thenRunAsync result completes normally after normal completion of source
2176 >     * applyToEither result completes exceptionally if either source cancelled
2177       */
2178 <    public void testThenRunAsyncE() {
2179 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2180 <        Noop r = new Noop();
2181 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2182 <        f.complete(null);
2183 <        checkCompletedNormally(g, null);
2178 >    public void testApplyToEither_sourceCancelled() {
2179 >        for (ExecutionMode m : ExecutionMode.values())
2180 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2181 >        for (Integer v1 : new Integer[] { 1, null })
2182 >    {
2183 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2184 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2185 >        final IncFunction[] rs = new IncFunction[6];
2186 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2187  
2188 <        // reordered version
2189 <        f = new CompletableFuture<>();
2190 <        f.complete(null);
2191 <        r = new Noop();
2192 <        g = f.thenRunAsync(r, new ThreadExecutor());
2193 <        checkCompletedNormally(g, null);
2194 <    }
2188 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2189 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2190 >        checkIncomplete(h0);
2191 >        checkIncomplete(h1);
2192 >        rs[0].assertNotInvoked();
2193 >        rs[1].assertNotInvoked();
2194 >        f.cancel(mayInterruptIfRunning);
2195 >        checkCompletedWithWrappedCancellationException(h0);
2196 >        checkCompletedWithWrappedCancellationException(h1);
2197 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2198 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2199 >        checkCompletedWithWrappedCancellationException(h2);
2200 >        checkCompletedWithWrappedCancellationException(h3);
2201 >        g.complete(v1);
2202  
2203 <    /**
2204 <     * thenRunAsync result completes exceptionally after exceptional
2205 <     * completion of source
2206 <     */
2207 <    public void testThenRunAsync2E() {
2208 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2209 <        Noop r = new Noop();
2210 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2211 <        f.completeExceptionally(new CFException());
2212 <        try {
2213 <            g.join();
2214 <            shouldThrow();
2215 <        } catch (CompletionException success) {}
2216 <        checkCompletedWithWrappedCFException(g);
2217 <    }
2203 >        // unspecified behavior - both source completions available
2204 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2205 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2206 >        try {
2207 >            assertEquals(inc(v1), h4.join());
2208 >            rs[4].assertValue(inc(v1));
2209 >        } catch (CompletionException ok) {
2210 >            checkCompletedWithWrappedCancellationException(h4);
2211 >            rs[4].assertNotInvoked();
2212 >        }
2213 >        try {
2214 >            assertEquals(inc(v1), h5.join());
2215 >            rs[5].assertValue(inc(v1));
2216 >        } catch (CompletionException ok) {
2217 >            checkCompletedWithWrappedCancellationException(h5);
2218 >            rs[5].assertNotInvoked();
2219 >        }
2220  
2221 <    /**
2222 <     * thenRunAsync result completes exceptionally if action does
2223 <     */
2224 <    public void testThenRunAsync3E() {
2225 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2226 <        FailingNoop r = new FailingNoop();
2227 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2228 <        f.complete(null);
2305 <        checkCompletedWithWrappedCFException(g);
2306 <    }
2221 >        checkCancelled(f);
2222 >        checkCompletedNormally(g, v1);
2223 >        checkCompletedWithWrappedCancellationException(h0);
2224 >        checkCompletedWithWrappedCancellationException(h1);
2225 >        checkCompletedWithWrappedCancellationException(h2);
2226 >        checkCompletedWithWrappedCancellationException(h3);
2227 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2228 >    }}
2229  
2230 <    /**
2231 <     * thenRunAsync result completes exceptionally if source cancelled
2232 <     */
2233 <    public void testThenRunAsync4E() {
2234 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2235 <        Noop r = new Noop();
2236 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2237 <        assertTrue(f.cancel(true));
2238 <        checkCompletedWithWrappedCancellationException(g);
2239 <    }
2230 >    public void testApplyToEither_sourceCancelled2() {
2231 >        for (ExecutionMode m : ExecutionMode.values())
2232 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2233 >        for (boolean fFirst : new boolean[] { true, false })
2234 >        for (Integer v1 : new Integer[] { 1, null })
2235 >    {
2236 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2237 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2238 >        final IncFunction[] rs = new IncFunction[6];
2239 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2240  
2241 <    /**
2242 <     * thenApplyAsync result completes normally after normal completion of source
2243 <     */
2244 <    public void testThenApplyAsyncE() {
2245 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2246 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2247 <        f.complete(one);
2248 <        checkCompletedNormally(g, two);
2249 <    }
2241 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2242 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2243 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2244 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2245 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2246 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2247 >
2248 >        // unspecified behavior - both source completions available
2249 >        try {
2250 >            assertEquals(inc(v1), h0.join());
2251 >            rs[0].assertValue(inc(v1));
2252 >        } catch (CompletionException ok) {
2253 >            checkCompletedWithWrappedCancellationException(h0);
2254 >            rs[0].assertNotInvoked();
2255 >        }
2256 >        try {
2257 >            assertEquals(inc(v1), h1.join());
2258 >            rs[1].assertValue(inc(v1));
2259 >        } catch (CompletionException ok) {
2260 >            checkCompletedWithWrappedCancellationException(h1);
2261 >            rs[1].assertNotInvoked();
2262 >        }
2263 >        try {
2264 >            assertEquals(inc(v1), h2.join());
2265 >            rs[2].assertValue(inc(v1));
2266 >        } catch (CompletionException ok) {
2267 >            checkCompletedWithWrappedCancellationException(h2);
2268 >            rs[2].assertNotInvoked();
2269 >        }
2270 >        try {
2271 >            assertEquals(inc(v1), h3.join());
2272 >            rs[3].assertValue(inc(v1));
2273 >        } catch (CompletionException ok) {
2274 >            checkCompletedWithWrappedCancellationException(h3);
2275 >            rs[3].assertNotInvoked();
2276 >        }
2277  
2278 <    /**
2279 <     * thenApplyAsync result completes exceptionally after exceptional
2280 <     * completion of source
2332 <     */
2333 <    public void testThenApplyAsync2E() {
2334 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2335 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2336 <        f.completeExceptionally(new CFException());
2337 <        checkCompletedWithWrappedCFException(g);
2338 <    }
2278 >        checkCompletedNormally(f, v1);
2279 >        checkCancelled(g);
2280 >    }}
2281  
2282      /**
2283 <     * thenApplyAsync result completes exceptionally if action does
2283 >     * applyToEither result completes exceptionally if action does
2284       */
2285 <    public void testThenApplyAsync3E() {
2286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2287 <        FailingFunction r = new FailingFunction();
2288 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2289 <        f.complete(null);
2290 <        checkCompletedWithWrappedCFException(g);
2291 <    }
2285 >    public void testApplyToEither_actionFailed() {
2286 >        for (ExecutionMode m : ExecutionMode.values())
2287 >        for (Integer v1 : new Integer[] { 1, null })
2288 >        for (Integer v2 : new Integer[] { 2, null })
2289 >    {
2290 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2291 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2292 >        final FailingFunction[] rs = new FailingFunction[6];
2293 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2294  
2295 <    /**
2296 <     * thenApplyAsync result completes exceptionally if source cancelled
2297 <     */
2298 <    public void testThenApplyAsync4E() {
2299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2300 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2301 <        assertTrue(f.cancel(true));
2302 <        checkCompletedWithWrappedCancellationException(g);
2303 <    }
2295 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2296 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2297 >        f.complete(v1);
2298 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2299 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2300 >        checkCompletedWithWrappedCFException(h0);
2301 >        checkCompletedWithWrappedCFException(h1);
2302 >        checkCompletedWithWrappedCFException(h2);
2303 >        checkCompletedWithWrappedCFException(h3);
2304 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2305  
2306 <    /**
2362 <     * thenAcceptAsync result completes normally after normal
2363 <     * completion of source
2364 <     */
2365 <    public void testThenAcceptAsyncE() {
2366 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2367 <        IncAction r = new IncAction();
2368 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2369 <        f.complete(one);
2370 <        checkCompletedNormally(g, null);
2371 <        assertEquals(r.value, 2);
2372 <    }
2306 >        g.complete(v2);
2307  
2308 <    /**
2309 <     * thenAcceptAsync result completes exceptionally after exceptional
2310 <     * completion of source
2311 <     */
2312 <    public void testThenAcceptAsync2E() {
2313 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2314 <        IncAction r = new IncAction();
2315 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2316 <        f.completeExceptionally(new CFException());
2317 <        checkCompletedWithWrappedCFException(g);
2384 <    }
2308 >        // unspecified behavior - both source completions available
2309 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2310 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2311 >
2312 >        checkCompletedWithWrappedCFException(h4);
2313 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2314 >                   Objects.equals(v2, rs[4].value));
2315 >        checkCompletedWithWrappedCFException(h5);
2316 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2317 >                   Objects.equals(v2, rs[5].value));
2318  
2319 <    /**
2320 <     * thenAcceptAsync result completes exceptionally if action does
2321 <     */
2389 <    public void testThenAcceptAsync3E() {
2390 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2391 <        FailingConsumer r = new FailingConsumer();
2392 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2393 <        f.complete(null);
2394 <        checkCompletedWithWrappedCFException(g);
2395 <    }
2319 >        checkCompletedNormally(f, v1);
2320 >        checkCompletedNormally(g, v2);
2321 >    }}
2322  
2323      /**
2324 <     * thenAcceptAsync result completes exceptionally if source cancelled
2324 >     * acceptEither result completes normally after normal completion
2325 >     * of either source
2326       */
2327 <    public void testThenAcceptAsync4E() {
2328 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2329 <        IncAction r = new IncAction();
2330 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2331 <        assertTrue(f.cancel(true));
2332 <        checkCompletedWithWrappedCancellationException(g);
2333 <    }
2327 >    public void testAcceptEither_normalCompletion() {
2328 >        for (ExecutionMode m : ExecutionMode.values())
2329 >        for (Integer v1 : new Integer[] { 1, null })
2330 >        for (Integer v2 : new Integer[] { 2, null })
2331 >    {
2332 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2333 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2334 >        final NoopConsumer[] rs = new NoopConsumer[6];
2335 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2336  
2337 <    /**
2338 <     * thenCombineAsync result completes normally after normal
2339 <     * completion of sources
2340 <     */
2341 <    public void testThenCombineAsyncE() {
2342 <        CompletableFuture<Integer> f, g, h;
2343 <        ThreadExecutor e = new ThreadExecutor();
2344 <        int count = 0;
2337 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2338 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2339 >        checkIncomplete(h0);
2340 >        checkIncomplete(h1);
2341 >        rs[0].assertNotInvoked();
2342 >        rs[1].assertNotInvoked();
2343 >        f.complete(v1);
2344 >        checkCompletedNormally(h0, null);
2345 >        checkCompletedNormally(h1, null);
2346 >        rs[0].assertValue(v1);
2347 >        rs[1].assertValue(v1);
2348 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2349 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2350 >        checkCompletedNormally(h2, null);
2351 >        checkCompletedNormally(h3, null);
2352 >        rs[2].assertValue(v1);
2353 >        rs[3].assertValue(v1);
2354 >        g.complete(v2);
2355  
2356 <        f = new CompletableFuture<>();
2357 <        g = new CompletableFuture<>();
2358 <        h = f.thenCombineAsync(g, subtract, e);
2359 <        f.complete(3);
2360 <        checkIncomplete(h);
2361 <        g.complete(1);
2362 <        checkCompletedNormally(h, 2);
2363 <        assertEquals(++count, e.count.get());
2356 >        // unspecified behavior - both source completions available
2357 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2358 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2359 >        checkCompletedNormally(h4, null);
2360 >        checkCompletedNormally(h5, null);
2361 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2362 >                   Objects.equals(v2, rs[4].value));
2363 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2364 >                   Objects.equals(v2, rs[5].value));
2365  
2366 <        f = new CompletableFuture<>();
2367 <        g = new CompletableFuture<>();
2368 <        h = f.thenCombineAsync(g, subtract, e);
2369 <        g.complete(1);
2370 <        checkIncomplete(h);
2371 <        f.complete(3);
2372 <        checkCompletedNormally(h, 2);
2373 <        assertEquals(++count, e.count.get());
2434 <
2435 <        f = new CompletableFuture<>();
2436 <        g = new CompletableFuture<>();
2437 <        g.complete(1);
2438 <        f.complete(3);
2439 <        h = f.thenCombineAsync(g, subtract, e);
2440 <        checkCompletedNormally(h, 2);
2441 <        assertEquals(++count, e.count.get());
2442 <    }
2366 >        checkCompletedNormally(f, v1);
2367 >        checkCompletedNormally(g, v2);
2368 >        checkCompletedNormally(h0, null);
2369 >        checkCompletedNormally(h1, null);
2370 >        checkCompletedNormally(h2, null);
2371 >        checkCompletedNormally(h3, null);
2372 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2373 >    }}
2374  
2375      /**
2376 <     * thenCombineAsync result completes exceptionally after exceptional
2376 >     * acceptEither result completes exceptionally after exceptional
2377       * completion of either source
2378       */
2379 <    public void testThenCombineAsync2E() {
2380 <        CompletableFuture<Integer> f, g, h;
2381 <        ThreadExecutor e = new ThreadExecutor();
2382 <        int count = 0;
2383 <
2384 <        f = new CompletableFuture<>();
2385 <        g = new CompletableFuture<>();
2386 <        h = f.thenCombineAsync(g, subtract, e);
2387 <        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 <    }
2379 >    public void testAcceptEither_exceptionalCompletion() {
2380 >        for (ExecutionMode m : ExecutionMode.values())
2381 >        for (Integer v1 : new Integer[] { 1, null })
2382 >    {
2383 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2384 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2385 >        final CFException ex = new CFException();
2386 >        final NoopConsumer[] rs = new NoopConsumer[6];
2387 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2388  
2389 <    /**
2390 <     * thenCombineAsync result completes exceptionally if action does
2391 <     */
2392 <    public void testThenCombineAsync3E() {
2393 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2394 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2395 <        FailingBiFunction r = new FailingBiFunction();
2396 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2397 <        f.complete(one);
2398 <        checkIncomplete(g);
2399 <        assertFalse(r.ran);
2400 <        f2.complete(two);
2401 <        checkCompletedWithWrappedCFException(g);
2493 <        assertTrue(r.ran);
2494 <    }
2389 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2390 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2391 >        checkIncomplete(h0);
2392 >        checkIncomplete(h1);
2393 >        rs[0].assertNotInvoked();
2394 >        rs[1].assertNotInvoked();
2395 >        f.completeExceptionally(ex);
2396 >        checkCompletedWithWrappedException(h0, ex);
2397 >        checkCompletedWithWrappedException(h1, ex);
2398 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2399 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2400 >        checkCompletedWithWrappedException(h2, ex);
2401 >        checkCompletedWithWrappedException(h3, ex);
2402  
2403 <    /**
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();
2403 >        g.complete(v1);
2404  
2405 <        f = new CompletableFuture<>();
2406 <        g = new CompletableFuture<>();
2407 <        h = f.thenCombineAsync(g, subtract, e);
2408 <        assertTrue(f.cancel(true));
2409 <        checkIncomplete(h);
2410 <        g.complete(1);
2411 <        checkCompletedWithWrappedCancellationException(h);
2405 >        // unspecified behavior - both source completions available
2406 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2407 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2408 >        try {
2409 >            assertNull(h4.join());
2410 >            rs[4].assertValue(v1);
2411 >        } catch (CompletionException ok) {
2412 >            checkCompletedWithWrappedException(h4, ex);
2413 >            rs[4].assertNotInvoked();
2414 >        }
2415 >        try {
2416 >            assertNull(h5.join());
2417 >            rs[5].assertValue(v1);
2418 >        } catch (CompletionException ok) {
2419 >            checkCompletedWithWrappedException(h5, ex);
2420 >            rs[5].assertNotInvoked();
2421 >        }
2422  
2423 <        f = new CompletableFuture<>();
2424 <        g = new CompletableFuture<>();
2425 <        h = f.thenCombineAsync(g, subtract, e);
2426 <        assertTrue(g.cancel(true));
2427 <        checkIncomplete(h);
2428 <        f.complete(3);
2429 <        checkCompletedWithWrappedCancellationException(h);
2423 >        checkCompletedExceptionally(f, ex);
2424 >        checkCompletedNormally(g, v1);
2425 >        checkCompletedWithWrappedException(h0, ex);
2426 >        checkCompletedWithWrappedException(h1, ex);
2427 >        checkCompletedWithWrappedException(h2, ex);
2428 >        checkCompletedWithWrappedException(h3, ex);
2429 >        checkCompletedWithWrappedException(h4, ex);
2430 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2431 >    }}
2432  
2433 <        f = new CompletableFuture<>();
2434 <        g = new CompletableFuture<>();
2435 <        assertTrue(g.cancel(true));
2436 <        h = f.thenCombineAsync(g, subtract, e);
2437 <        checkIncomplete(h);
2438 <        f.complete(3);
2439 <        checkCompletedWithWrappedCancellationException(h);
2433 >    public void testAcceptEither_exceptionalCompletion2() {
2434 >        for (ExecutionMode m : ExecutionMode.values())
2435 >        for (boolean fFirst : new boolean[] { true, false })
2436 >        for (Integer v1 : new Integer[] { 1, null })
2437 >    {
2438 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2439 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2440 >        final CFException ex = new CFException();
2441 >        final NoopConsumer[] rs = new NoopConsumer[6];
2442 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2443  
2444 <        f = new CompletableFuture<>();
2445 <        g = new CompletableFuture<>();
2446 <        assertTrue(f.cancel(true));
2447 <        assertTrue(g.cancel(true));
2448 <        h = f.thenCombineAsync(g, subtract, e);
2449 <        checkCompletedWithWrappedCancellationException(h);
2444 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2445 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2446 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2447 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2448 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2449 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2450 >
2451 >        // unspecified behavior - both source completions available
2452 >        try {
2453 >            assertEquals(null, h0.join());
2454 >            rs[0].assertValue(v1);
2455 >        } catch (CompletionException ok) {
2456 >            checkCompletedWithWrappedException(h0, ex);
2457 >            rs[0].assertNotInvoked();
2458 >        }
2459 >        try {
2460 >            assertEquals(null, h1.join());
2461 >            rs[1].assertValue(v1);
2462 >        } catch (CompletionException ok) {
2463 >            checkCompletedWithWrappedException(h1, ex);
2464 >            rs[1].assertNotInvoked();
2465 >        }
2466 >        try {
2467 >            assertEquals(null, h2.join());
2468 >            rs[2].assertValue(v1);
2469 >        } catch (CompletionException ok) {
2470 >            checkCompletedWithWrappedException(h2, ex);
2471 >            rs[2].assertNotInvoked();
2472 >        }
2473 >        try {
2474 >            assertEquals(null, h3.join());
2475 >            rs[3].assertValue(v1);
2476 >        } catch (CompletionException ok) {
2477 >            checkCompletedWithWrappedException(h3, ex);
2478 >            rs[3].assertNotInvoked();
2479 >        }
2480  
2481 <        assertEquals(0, e.count.get());
2482 <    }
2481 >        checkCompletedNormally(f, v1);
2482 >        checkCompletedExceptionally(g, ex);
2483 >    }}
2484  
2485      /**
2486 <     * thenAcceptBothAsync result completes normally after normal
2539 <     * completion of sources
2486 >     * acceptEither result completes exceptionally if either source cancelled
2487       */
2488 <    public void testThenAcceptBothAsyncE() {
2489 <        CompletableFuture<Integer> f, g;
2490 <        CompletableFuture<Void> h;
2491 <        SubtractAction r;
2492 <        ThreadExecutor e = new ThreadExecutor();
2488 >    public void testAcceptEither_sourceCancelled() {
2489 >        for (ExecutionMode m : ExecutionMode.values())
2490 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2491 >        for (Integer v1 : new Integer[] { 1, null })
2492 >    {
2493 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2494 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2495 >        final NoopConsumer[] rs = new NoopConsumer[6];
2496 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2497  
2498 <        f = new CompletableFuture<>();
2499 <        g = new CompletableFuture<>();
2500 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2501 <        f.complete(3);
2502 <        checkIncomplete(h);
2503 <        g.complete(1);
2504 <        checkCompletedNormally(h, null);
2505 <        assertEquals(r.value, 2);
2498 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2499 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2500 >        checkIncomplete(h0);
2501 >        checkIncomplete(h1);
2502 >        rs[0].assertNotInvoked();
2503 >        rs[1].assertNotInvoked();
2504 >        f.cancel(mayInterruptIfRunning);
2505 >        checkCompletedWithWrappedCancellationException(h0);
2506 >        checkCompletedWithWrappedCancellationException(h1);
2507 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2508 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2509 >        checkCompletedWithWrappedCancellationException(h2);
2510 >        checkCompletedWithWrappedCancellationException(h3);
2511  
2512 <        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);
2512 >        g.complete(v1);
2513  
2514 <        f = new CompletableFuture<>();
2515 <        g = new CompletableFuture<>();
2516 <        g.complete(1);
2517 <        f.complete(3);
2518 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2519 <        checkCompletedNormally(h, null);
2520 <        assertEquals(r.value, 2);
2514 >        // unspecified behavior - both source completions available
2515 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2516 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2517 >        try {
2518 >            assertNull(h4.join());
2519 >            rs[4].assertValue(v1);
2520 >        } catch (CompletionException ok) {
2521 >            checkCompletedWithWrappedCancellationException(h4);
2522 >            rs[4].assertNotInvoked();
2523 >        }
2524 >        try {
2525 >            assertNull(h5.join());
2526 >            rs[5].assertValue(v1);
2527 >        } catch (CompletionException ok) {
2528 >            checkCompletedWithWrappedCancellationException(h5);
2529 >            rs[5].assertNotInvoked();
2530 >        }
2531  
2532 <        assertEquals(3, e.count.get());
2533 <    }
2532 >        checkCancelled(f);
2533 >        checkCompletedNormally(g, v1);
2534 >        checkCompletedWithWrappedCancellationException(h0);
2535 >        checkCompletedWithWrappedCancellationException(h1);
2536 >        checkCompletedWithWrappedCancellationException(h2);
2537 >        checkCompletedWithWrappedCancellationException(h3);
2538 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2539 >    }}
2540  
2541      /**
2542 <     * thenAcceptBothAsync result completes exceptionally after exceptional
2578 <     * completion of source
2542 >     * acceptEither result completes exceptionally if action does
2543       */
2544 <    public void testThenAcceptBothAsync2E() {
2545 <        CompletableFuture<Integer> f, g;
2546 <        CompletableFuture<Void> h;
2547 <        SubtractAction r;
2548 <        ThreadExecutor e = new ThreadExecutor();
2549 <
2550 <        f = new CompletableFuture<>();
2551 <        g = new CompletableFuture<>();
2552 <        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 <    }
2544 >    public void testAcceptEither_actionFailed() {
2545 >        for (ExecutionMode m : ExecutionMode.values())
2546 >        for (Integer v1 : new Integer[] { 1, null })
2547 >        for (Integer v2 : new Integer[] { 2, null })
2548 >    {
2549 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2550 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2551 >        final FailingConsumer[] rs = new FailingConsumer[6];
2552 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2553  
2554 <    /**
2555 <     * thenAcceptBothAsync result completes exceptionally if action does
2556 <     */
2557 <    public void testThenAcceptBothAsync3E() {
2558 <        CompletableFuture<Integer> f, g;
2559 <        CompletableFuture<Void> h;
2560 <        FailingBiConsumer r;
2561 <        ThreadExecutor e = new ThreadExecutor();
2554 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2555 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2556 >        f.complete(v1);
2557 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2558 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2559 >        checkCompletedWithWrappedCFException(h0);
2560 >        checkCompletedWithWrappedCFException(h1);
2561 >        checkCompletedWithWrappedCFException(h2);
2562 >        checkCompletedWithWrappedCFException(h3);
2563 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2564  
2565 <        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);
2565 >        g.complete(v2);
2566  
2567 <        f = new CompletableFuture<>();
2568 <        g = new CompletableFuture<>();
2569 <        f.complete(3);
2570 <        g.complete(1);
2571 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2572 <        checkCompletedWithWrappedCFException(h);
2567 >        // unspecified behavior - both source completions available
2568 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2569 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2570 >
2571 >        checkCompletedWithWrappedCFException(h4);
2572 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2573 >                   Objects.equals(v2, rs[4].value));
2574 >        checkCompletedWithWrappedCFException(h5);
2575 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2576 >                   Objects.equals(v2, rs[5].value));
2577  
2578 <        assertEquals(2, e.count.get());
2579 <    }
2578 >        checkCompletedNormally(f, v1);
2579 >        checkCompletedNormally(g, v2);
2580 >    }}
2581  
2582      /**
2583 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
2583 >     * runAfterEither result completes normally after normal completion
2584 >     * of either source
2585       */
2586 <    public void testThenAcceptBothAsync4E() {
2587 <        CompletableFuture<Integer> f, g;
2588 <        CompletableFuture<Void> h;
2589 <        SubtractAction r;
2590 <        ThreadExecutor e = new ThreadExecutor();
2591 <
2592 <        f = new CompletableFuture<>();
2593 <        g = new CompletableFuture<>();
2594 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2658 <        assertTrue(f.cancel(true));
2659 <        checkIncomplete(h);
2660 <        g.complete(1);
2661 <        checkCompletedWithWrappedCancellationException(h);
2586 >    public void testRunAfterEither_normalCompletion() {
2587 >        for (ExecutionMode m : ExecutionMode.values())
2588 >        for (Integer v1 : new Integer[] { 1, null })
2589 >        for (Integer v2 : new Integer[] { 2, null })
2590 >    {
2591 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2592 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2593 >        final Noop[] rs = new Noop[6];
2594 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2595  
2596 <        f = new CompletableFuture<>();
2597 <        g = new CompletableFuture<>();
2598 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2599 <        assertTrue(g.cancel(true));
2600 <        checkIncomplete(h);
2601 <        f.complete(3);
2602 <        checkCompletedWithWrappedCancellationException(h);
2596 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2597 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2598 >        checkIncomplete(h0);
2599 >        checkIncomplete(h1);
2600 >        rs[0].assertNotInvoked();
2601 >        rs[1].assertNotInvoked();
2602 >        f.complete(v1);
2603 >        checkCompletedNormally(h0, null);
2604 >        checkCompletedNormally(h1, null);
2605 >        rs[0].assertInvoked();
2606 >        rs[1].assertInvoked();
2607 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2608 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2609 >        checkCompletedNormally(h2, null);
2610 >        checkCompletedNormally(h3, null);
2611 >        rs[2].assertInvoked();
2612 >        rs[3].assertInvoked();
2613  
2614 <        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);
2614 >        g.complete(v2);
2615  
2616 <        f = new CompletableFuture<>();
2617 <        g = new CompletableFuture<>();
2680 <        assertTrue(f.cancel(true));
2681 <        g.complete(3);
2682 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2683 <        checkCompletedWithWrappedCancellationException(h);
2616 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2617 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2618  
2619 <        assertEquals(0, e.count.get());
2620 <    }
2619 >        checkCompletedNormally(f, v1);
2620 >        checkCompletedNormally(g, v2);
2621 >        checkCompletedNormally(h0, null);
2622 >        checkCompletedNormally(h1, null);
2623 >        checkCompletedNormally(h2, null);
2624 >        checkCompletedNormally(h3, null);
2625 >        checkCompletedNormally(h4, null);
2626 >        checkCompletedNormally(h5, null);
2627 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2628 >    }}
2629  
2630      /**
2631 <     * applyToEitherAsync result completes normally after normal
2632 <     * completion of sources
2631 >     * runAfterEither result completes exceptionally after exceptional
2632 >     * completion of either source
2633       */
2634 <    public void testApplyToEitherAsyncE() {
2635 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2636 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2637 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2638 <        f.complete(one);
2639 <        checkCompletedNormally(g, two);
2640 <
2641 <        f = new CompletableFuture<>();
2642 <        f.complete(one);
2701 <        f2 = new CompletableFuture<>();
2702 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2703 <        checkCompletedNormally(g, two);
2704 <    }
2634 >    public void testRunAfterEither_exceptionalCompletion() {
2635 >        for (ExecutionMode m : ExecutionMode.values())
2636 >        for (Integer v1 : new Integer[] { 1, null })
2637 >    {
2638 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2639 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2640 >        final CFException ex = new CFException();
2641 >        final Noop[] rs = new Noop[6];
2642 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2643  
2644 <    /**
2645 <     * applyToEitherAsync result completes exceptionally after exceptional
2646 <     * completion of source
2647 <     */
2648 <    public void testApplyToEitherAsync2E() {
2649 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2650 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2651 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2652 <        f.completeExceptionally(new CFException());
2653 <        checkCompletedWithWrappedCFException(g);
2644 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2645 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2646 >        checkIncomplete(h0);
2647 >        checkIncomplete(h1);
2648 >        rs[0].assertNotInvoked();
2649 >        rs[1].assertNotInvoked();
2650 >        assertTrue(f.completeExceptionally(ex));
2651 >        checkCompletedWithWrappedException(h0, ex);
2652 >        checkCompletedWithWrappedException(h1, ex);
2653 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2654 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2655 >        checkCompletedWithWrappedException(h2, ex);
2656 >        checkCompletedWithWrappedException(h3, ex);
2657 >
2658 >        assertTrue(g.complete(v1));
2659 >
2660 >        // unspecified behavior - both source completions available
2661 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2662 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2663 >        try {
2664 >            assertNull(h4.join());
2665 >            rs[4].assertInvoked();
2666 >        } catch (CompletionException ok) {
2667 >            checkCompletedWithWrappedException(h4, ex);
2668 >            rs[4].assertNotInvoked();
2669 >        }
2670 >        try {
2671 >            assertNull(h5.join());
2672 >            rs[5].assertInvoked();
2673 >        } catch (CompletionException ok) {
2674 >            checkCompletedWithWrappedException(h5, ex);
2675 >            rs[5].assertNotInvoked();
2676 >        }
2677  
2678 <        f = new CompletableFuture<>();
2679 <        f2 = new CompletableFuture<>();
2680 <        f2.completeExceptionally(new CFException());
2681 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2682 <        f.complete(one);
2683 <        checkCompletedWithWrappedCFException(g);
2684 <    }
2678 >        checkCompletedExceptionally(f, ex);
2679 >        checkCompletedNormally(g, v1);
2680 >        checkCompletedWithWrappedException(h0, ex);
2681 >        checkCompletedWithWrappedException(h1, ex);
2682 >        checkCompletedWithWrappedException(h2, ex);
2683 >        checkCompletedWithWrappedException(h3, ex);
2684 >        checkCompletedWithWrappedException(h4, ex);
2685 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2686 >    }}
2687  
2688 <    /**
2689 <     * applyToEitherAsync result completes exceptionally if action does
2690 <     */
2691 <    public void testApplyToEitherAsync3E() {
2692 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2693 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2694 <        FailingFunction r = new FailingFunction();
2695 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2696 <        f.complete(one);
2697 <        checkCompletedWithWrappedCFException(g);
2735 <    }
2688 >    public void testRunAfterEither_exceptionalCompletion2() {
2689 >        for (ExecutionMode m : ExecutionMode.values())
2690 >        for (boolean fFirst : new boolean[] { true, false })
2691 >        for (Integer v1 : new Integer[] { 1, null })
2692 >    {
2693 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2694 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2695 >        final CFException ex = new CFException();
2696 >        final Noop[] rs = new Noop[6];
2697 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2698  
2699 <    /**
2700 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2701 <     */
2702 <    public void testApplyToEitherAsync4E() {
2703 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2704 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2705 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2706 <        assertTrue(f.cancel(true));
2707 <        checkCompletedWithWrappedCancellationException(g);
2699 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2700 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2701 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2702 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2703 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2704 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2705 >
2706 >        // unspecified behavior - both source completions available
2707 >        try {
2708 >            assertEquals(null, h0.join());
2709 >            rs[0].assertInvoked();
2710 >        } catch (CompletionException ok) {
2711 >            checkCompletedWithWrappedException(h0, ex);
2712 >            rs[0].assertNotInvoked();
2713 >        }
2714 >        try {
2715 >            assertEquals(null, h1.join());
2716 >            rs[1].assertInvoked();
2717 >        } catch (CompletionException ok) {
2718 >            checkCompletedWithWrappedException(h1, ex);
2719 >            rs[1].assertNotInvoked();
2720 >        }
2721 >        try {
2722 >            assertEquals(null, h2.join());
2723 >            rs[2].assertInvoked();
2724 >        } catch (CompletionException ok) {
2725 >            checkCompletedWithWrappedException(h2, ex);
2726 >            rs[2].assertNotInvoked();
2727 >        }
2728 >        try {
2729 >            assertEquals(null, h3.join());
2730 >            rs[3].assertInvoked();
2731 >        } catch (CompletionException ok) {
2732 >            checkCompletedWithWrappedException(h3, ex);
2733 >            rs[3].assertNotInvoked();
2734 >        }
2735  
2736 <        f = new CompletableFuture<>();
2737 <        f2 = new CompletableFuture<>();
2738 <        assertTrue(f2.cancel(true));
2750 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2751 <        checkCompletedWithWrappedCancellationException(g);
2752 <    }
2736 >        checkCompletedNormally(f, v1);
2737 >        checkCompletedExceptionally(g, ex);
2738 >    }}
2739  
2740      /**
2741 <     * acceptEitherAsync result completes normally after normal
2756 <     * completion of sources
2741 >     * runAfterEither result completes exceptionally if either source cancelled
2742       */
2743 <    public void testAcceptEitherAsyncE() {
2744 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2745 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2746 <        IncAction r = new IncAction();
2747 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2748 <        f.complete(one);
2749 <        checkCompletedNormally(g, null);
2750 <        assertEquals(r.value, 2);
2751 <
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 <    }
2743 >    public void testRunAfterEither_sourceCancelled() {
2744 >        for (ExecutionMode m : ExecutionMode.values())
2745 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2746 >        for (Integer v1 : new Integer[] { 1, null })
2747 >    {
2748 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2749 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2750 >        final Noop[] rs = new Noop[6];
2751 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2752  
2753 <    /**
2754 <     * acceptEitherAsync result completes exceptionally after exceptional
2755 <     * completion of source
2756 <     */
2757 <    public void testAcceptEitherAsync2E() {
2758 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2759 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2760 <        IncAction r = new IncAction();
2761 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2762 <        f.completeExceptionally(new CFException());
2763 <        checkCompletedWithWrappedCFException(g);
2753 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2754 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2755 >        checkIncomplete(h0);
2756 >        checkIncomplete(h1);
2757 >        rs[0].assertNotInvoked();
2758 >        rs[1].assertNotInvoked();
2759 >        f.cancel(mayInterruptIfRunning);
2760 >        checkCompletedWithWrappedCancellationException(h0);
2761 >        checkCompletedWithWrappedCancellationException(h1);
2762 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2763 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2764 >        checkCompletedWithWrappedCancellationException(h2);
2765 >        checkCompletedWithWrappedCancellationException(h3);
2766 >
2767 >        assertTrue(g.complete(v1));
2768 >
2769 >        // unspecified behavior - both source completions available
2770 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2771 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2772 >        try {
2773 >            assertNull(h4.join());
2774 >            rs[4].assertInvoked();
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedCancellationException(h4);
2777 >            rs[4].assertNotInvoked();
2778 >        }
2779 >        try {
2780 >            assertNull(h5.join());
2781 >            rs[5].assertInvoked();
2782 >        } catch (CompletionException ok) {
2783 >            checkCompletedWithWrappedCancellationException(h5);
2784 >            rs[5].assertNotInvoked();
2785 >        }
2786  
2787 <        r = new IncAction();
2788 <        f = new CompletableFuture<>();
2789 <        f2 = new CompletableFuture<>();
2790 <        f2.completeExceptionally(new CFException());
2791 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2792 <        f.complete(one);
2793 <        checkCompletedWithWrappedCFException(g);
2794 <    }
2787 >        checkCancelled(f);
2788 >        checkCompletedNormally(g, v1);
2789 >        checkCompletedWithWrappedCancellationException(h0);
2790 >        checkCompletedWithWrappedCancellationException(h1);
2791 >        checkCompletedWithWrappedCancellationException(h2);
2792 >        checkCompletedWithWrappedCancellationException(h3);
2793 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2794 >    }}
2795  
2796      /**
2797 <     * acceptEitherAsync result completes exceptionally if action does
2797 >     * runAfterEither result completes exceptionally if action does
2798       */
2799 <    public void testAcceptEitherAsync3E() {
2800 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2801 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2802 <        FailingConsumer r = new FailingConsumer();
2803 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2804 <        f.complete(one);
2805 <        checkCompletedWithWrappedCFException(g);
2806 <    }
2799 >    public void testRunAfterEither_actionFailed() {
2800 >        for (ExecutionMode m : ExecutionMode.values())
2801 >        for (Integer v1 : new Integer[] { 1, null })
2802 >        for (Integer v2 : new Integer[] { 2, null })
2803 >    {
2804 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2805 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2806 >        final FailingRunnable[] rs = new FailingRunnable[6];
2807 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2808  
2809 <    /**
2810 <     * acceptEitherAsync result completes exceptionally if either
2811 <     * source cancelled
2812 <     */
2813 <    public void testAcceptEitherAsync4E() {
2814 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2815 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2816 <        IncAction r = new IncAction();
2817 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2818 <        assertTrue(f.cancel(true));
2819 <        checkCompletedWithWrappedCancellationException(g);
2809 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2810 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2811 >        assertTrue(f.complete(v1));
2812 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2813 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2814 >        checkCompletedWithWrappedCFException(h0);
2815 >        checkCompletedWithWrappedCFException(h1);
2816 >        checkCompletedWithWrappedCFException(h2);
2817 >        checkCompletedWithWrappedCFException(h3);
2818 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2819 >        assertTrue(g.complete(v2));
2820 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2821 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2822 >        checkCompletedWithWrappedCFException(h4);
2823 >        checkCompletedWithWrappedCFException(h5);
2824  
2825 <        r = new IncAction();
2826 <        f = new CompletableFuture<>();
2827 <        f2 = new CompletableFuture<>();
2828 <        assertTrue(f2.cancel(true));
2825 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2826 <        checkCompletedWithWrappedCancellationException(g);
2827 <    }
2825 >        checkCompletedNormally(f, v1);
2826 >        checkCompletedNormally(g, v2);
2827 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2828 >    }}
2829  
2830      /**
2831 <     * runAfterEitherAsync result completes normally after normal
2831 <     * completion of sources
2831 >     * thenCompose result completes normally after normal completion of source
2832       */
2833 <    public void testRunAfterEitherAsyncE() {
2834 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2835 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2836 <        Noop r = new Noop();
2837 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2838 <        f.complete(one);
2839 <        checkCompletedNormally(g, null);
2840 <        assertTrue(r.ran);
2833 >    public void testThenCompose_normalCompletion() {
2834 >        for (ExecutionMode m : ExecutionMode.values())
2835 >        for (boolean createIncomplete : new boolean[] { true, false })
2836 >        for (Integer v1 : new Integer[] { 1, null })
2837 >    {
2838 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2839 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2840 >        if (!createIncomplete) assertTrue(f.complete(v1));
2841 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2842 >        if (createIncomplete) assertTrue(f.complete(v1));
2843  
2844 <        r = new Noop();
2845 <        f = new CompletableFuture<>();
2846 <        f.complete(one);
2847 <        f2 = new CompletableFuture<>();
2846 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2847 <        checkCompletedNormally(g, null);
2848 <        assertTrue(r.ran);
2849 <    }
2844 >        checkCompletedNormally(g, inc(v1));
2845 >        checkCompletedNormally(f, v1);
2846 >        r.assertValue(v1);
2847 >    }}
2848  
2849      /**
2850 <     * runAfterEitherAsync result completes exceptionally after exceptional
2850 >     * thenCompose result completes exceptionally after exceptional
2851       * completion of source
2852       */
2853 <    public void testRunAfterEitherAsync2E() {
2854 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2855 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2856 <        Noop r = new Noop();
2857 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2858 <        f.completeExceptionally(new CFException());
2859 <        checkCompletedWithWrappedCFException(g);
2860 <
2861 <        r = new Noop();
2862 <        f = new CompletableFuture<>();
2863 <        f2 = new CompletableFuture<>();
2864 <        f2.completeExceptionally(new CFException());
2865 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2866 <        f.complete(one);
2867 <        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 <    }
2853 >    public void testThenCompose_exceptionalCompletion() {
2854 >        for (ExecutionMode m : ExecutionMode.values())
2855 >        for (boolean createIncomplete : new boolean[] { true, false })
2856 >    {
2857 >        final CFException ex = new CFException();
2858 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2859 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2860 >        if (!createIncomplete) f.completeExceptionally(ex);
2861 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2862 >        if (createIncomplete) f.completeExceptionally(ex);
2863 >
2864 >        checkCompletedWithWrappedException(g, ex);
2865 >        checkCompletedExceptionally(f, ex);
2866 >        r.assertNotInvoked();
2867 >    }}
2868  
2869      /**
2870 <     * thenComposeAsync result completes normally after normal
2906 <     * completion of source
2870 >     * thenCompose result completes exceptionally if action does
2871       */
2872 <    public void testThenComposeAsyncE() {
2873 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2874 <        CompletableFutureInc r = new CompletableFutureInc();
2875 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2876 <        f.complete(one);
2877 <        checkCompletedNormally(g, two);
2878 <    }
2872 >    public void testThenCompose_actionFailed() {
2873 >        for (ExecutionMode m : ExecutionMode.values())
2874 >        for (boolean createIncomplete : new boolean[] { true, false })
2875 >        for (Integer v1 : new Integer[] { 1, null })
2876 >    {
2877 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2878 >        final FailingCompletableFutureFunction r
2879 >            = new FailingCompletableFutureFunction(m);
2880 >        if (!createIncomplete) assertTrue(f.complete(v1));
2881 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2882 >        if (createIncomplete) assertTrue(f.complete(v1));
2883  
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());
2884          checkCompletedWithWrappedCFException(g);
2885 <    }
2885 >        checkCompletedNormally(f, v1);
2886 >    }}
2887  
2888      /**
2889 <     * thenComposeAsync result completes exceptionally if action does
2889 >     * thenCompose result completes exceptionally if source cancelled
2890       */
2891 <    public void testThenComposeAsync3E() {
2892 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2893 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2894 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2895 <        f.complete(one);
2896 <        checkCompletedWithWrappedCFException(g);
2897 <    }
2891 >    public void testThenCompose_sourceCancelled() {
2892 >        for (ExecutionMode m : ExecutionMode.values())
2893 >        for (boolean createIncomplete : new boolean[] { true, false })
2894 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2895 >    {
2896 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2897 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2898 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2899 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2900 >        if (createIncomplete) {
2901 >            checkIncomplete(g);
2902 >            assertTrue(f.cancel(mayInterruptIfRunning));
2903 >        }
2904  
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));
2905          checkCompletedWithWrappedCancellationException(g);
2906 <    }
2906 >        checkCancelled(f);
2907 >    }}
2908  
2909      // other static methods
2910  
# Line 2963 | Line 2922 | public class CompletableFutureTest exten
2922       * when all components complete normally
2923       */
2924      public void testAllOf_normal() throws Exception {
2925 <        for (int k = 1; k < 20; ++k) {
2926 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2927 <            for (int i = 0; i < k; ++i)
2925 >        for (int k = 1; k < 10; k++) {
2926 >            CompletableFuture<Integer>[] fs
2927 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2928 >            for (int i = 0; i < k; i++)
2929 >                fs[i] = new CompletableFuture<>();
2930 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2931 >            for (int i = 0; i < k; i++) {
2932 >                checkIncomplete(f);
2933 >                checkIncomplete(CompletableFuture.allOf(fs));
2934 >                fs[i].complete(one);
2935 >            }
2936 >            checkCompletedNormally(f, null);
2937 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2938 >        }
2939 >    }
2940 >
2941 >    public void testAllOf_backwards() throws Exception {
2942 >        for (int k = 1; k < 10; k++) {
2943 >            CompletableFuture<Integer>[] fs
2944 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2945 >            for (int i = 0; i < k; i++)
2946                  fs[i] = new CompletableFuture<>();
2947              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2948 <            for (int i = 0; i < k; ++i) {
2948 >            for (int i = k - 1; i >= 0; i--) {
2949                  checkIncomplete(f);
2950                  checkIncomplete(CompletableFuture.allOf(fs));
2951                  fs[i].complete(one);
# Line 2978 | Line 2955 | public class CompletableFutureTest exten
2955          }
2956      }
2957  
2958 +    public void testAllOf_exceptional() throws Exception {
2959 +        for (int k = 1; k < 10; k++) {
2960 +            CompletableFuture<Integer>[] fs
2961 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2962 +            CFException ex = new CFException();
2963 +            for (int i = 0; i < k; i++)
2964 +                fs[i] = new CompletableFuture<>();
2965 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2966 +            for (int i = 0; i < k; i++) {
2967 +                checkIncomplete(f);
2968 +                checkIncomplete(CompletableFuture.allOf(fs));
2969 +                if (i != k/2) {
2970 +                    fs[i].complete(i);
2971 +                    checkCompletedNormally(fs[i], i);
2972 +                } else {
2973 +                    fs[i].completeExceptionally(ex);
2974 +                    checkCompletedExceptionally(fs[i], ex);
2975 +                }
2976 +            }
2977 +            checkCompletedWithWrappedException(f, ex);
2978 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
2979 +        }
2980 +    }
2981 +
2982      /**
2983       * anyOf(no component futures) returns an incomplete future
2984       */
2985      public void testAnyOf_empty() throws Exception {
2986 +        for (Integer v1 : new Integer[] { 1, null })
2987 +    {
2988          CompletableFuture<Object> f = CompletableFuture.anyOf();
2989          checkIncomplete(f);
2990 <    }
2990 >
2991 >        f.complete(v1);
2992 >        checkCompletedNormally(f, v1);
2993 >    }}
2994  
2995      /**
2996       * anyOf returns a future completed normally with a value when
2997       * a component future does
2998       */
2999      public void testAnyOf_normal() throws Exception {
3000 <        for (int k = 0; k < 10; ++k) {
3000 >        for (int k = 0; k < 10; k++) {
3001              CompletableFuture[] fs = new CompletableFuture[k];
3002 <            for (int i = 0; i < k; ++i)
3002 >            for (int i = 0; i < k; i++)
3003                  fs[i] = new CompletableFuture<>();
3004              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3005              checkIncomplete(f);
3006 <            for (int i = 0; i < k; ++i) {
3007 <                fs[i].complete(one);
3008 <                checkCompletedNormally(f, one);
3009 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3006 >            for (int i = 0; i < k; i++) {
3007 >                fs[i].complete(i);
3008 >                checkCompletedNormally(f, 0);
3009 >                int x = (int) CompletableFuture.anyOf(fs).join();
3010 >                assertTrue(0 <= x && x <= i);
3011 >            }
3012 >        }
3013 >    }
3014 >    public void testAnyOf_normal_backwards() throws Exception {
3015 >        for (int k = 0; k < 10; k++) {
3016 >            CompletableFuture[] fs = new CompletableFuture[k];
3017 >            for (int i = 0; i < k; i++)
3018 >                fs[i] = new CompletableFuture<>();
3019 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3020 >            checkIncomplete(f);
3021 >            for (int i = k - 1; i >= 0; i--) {
3022 >                fs[i].complete(i);
3023 >                checkCompletedNormally(f, k - 1);
3024 >                int x = (int) CompletableFuture.anyOf(fs).join();
3025 >                assertTrue(i <= x && x <= k - 1);
3026              }
3027          }
3028      }
# Line 3009 | Line 3031 | public class CompletableFutureTest exten
3031       * anyOf result completes exceptionally when any component does.
3032       */
3033      public void testAnyOf_exceptional() throws Exception {
3034 <        for (int k = 0; k < 10; ++k) {
3034 >        for (int k = 0; k < 10; k++) {
3035 >            CompletableFuture[] fs = new CompletableFuture[k];
3036 >            CFException[] exs = new CFException[k];
3037 >            for (int i = 0; i < k; i++) {
3038 >                fs[i] = new CompletableFuture<>();
3039 >                exs[i] = new CFException();
3040 >            }
3041 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3042 >            checkIncomplete(f);
3043 >            for (int i = 0; i < k; i++) {
3044 >                fs[i].completeExceptionally(exs[i]);
3045 >                checkCompletedWithWrappedException(f, exs[0]);
3046 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3047 >            }
3048 >        }
3049 >    }
3050 >
3051 >    public void testAnyOf_exceptional_backwards() throws Exception {
3052 >        for (int k = 0; k < 10; k++) {
3053              CompletableFuture[] fs = new CompletableFuture[k];
3054 <            for (int i = 0; i < k; ++i)
3054 >            CFException[] exs = new CFException[k];
3055 >            for (int i = 0; i < k; i++) {
3056                  fs[i] = new CompletableFuture<>();
3057 +                exs[i] = new CFException();
3058 +            }
3059              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3060              checkIncomplete(f);
3061 <            for (int i = 0; i < k; ++i) {
3062 <                fs[i].completeExceptionally(new CFException());
3063 <                checkCompletedWithWrappedCFException(f);
3061 >            for (int i = k - 1; i >= 0; i--) {
3062 >                fs[i].completeExceptionally(exs[i]);
3063 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3064                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3065              }
3066          }
# Line 3036 | Line 3079 | public class CompletableFutureTest exten
3079          Runnable[] throwingActions = {
3080              () -> CompletableFuture.supplyAsync(null),
3081              () -> CompletableFuture.supplyAsync(null, exec),
3082 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3082 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3083  
3084              () -> CompletableFuture.runAsync(null),
3085              () -> CompletableFuture.runAsync(null, exec),
# Line 3109 | Line 3152 | public class CompletableFutureTest exten
3152  
3153              () -> f.thenCompose(null),
3154              () -> f.thenComposeAsync(null),
3155 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3155 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3156              () -> f.thenComposeAsync(null, exec),
3157  
3158              () -> f.exceptionally(null),
# Line 3141 | Line 3184 | public class CompletableFutureTest exten
3184          assertSame(f, f.toCompletableFuture());
3185      }
3186  
3187 <    /**
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 <    }
3158 <
3159 <    /**
3160 <     * whenComplete action executes on exceptional completion, propagating
3161 <     * source result.
3162 <     */
3163 <    public void testWhenComplete2() {
3164 <        final AtomicInteger a = new AtomicInteger();
3165 <        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 <    }
3187 >    //--- tests of implementation details; not part of official tck ---
3188  
3189 <    /**
3190 <     * whenCompleteAsync action executes on normal completion, propagating
3191 <     * source result.
3192 <     */
3193 <    public void testWhenCompleteAsync1e() {
3194 <        final AtomicInteger a = new AtomicInteger();
3195 <        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);
3189 >    Object resultOf(CompletableFuture<?> f) {
3190 >        try {
3191 >            java.lang.reflect.Field resultField
3192 >                = CompletableFuture.class.getDeclaredField("result");
3193 >            resultField.setAccessible(true);
3194 >            return resultField.get(f);
3195 >        } catch (Throwable t) { throw new AssertionError(t); }
3196      }
3197  
3198 <    /**
3199 <     * whenCompleteAsync action executes on exceptional completion, propagating
3200 <     * source result.
3201 <     */
3202 <    public void testWhenCompleteAsync2e() {
3203 <        final AtomicInteger a = new AtomicInteger();
3204 <        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 <    }
3198 >    public void testExceptionPropagationReusesResultObject() {
3199 >        if (!testImplementationDetails) return;
3200 >        for (ExecutionMode m : ExecutionMode.values())
3201 >    {
3202 >        final CFException ex = new CFException();
3203 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3204 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3205  
3206 <    /**
3207 <     * 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 <    }
3206 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3207 >            = new ArrayList<>();
3208  
3209 <    /**
3210 <     * handleAsync action completes normally with function value on
3211 <     * either normal or exceptional completion of source
3284 <     */
3285 <    public void testHandleAsync() {
3286 <        CompletableFuture<Integer> f, g;
3287 <        IntegerHandler r;
3209 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3210 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3211 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3212  
3213 <        f = new CompletableFuture<>();
3214 <        g = f.handleAsync(r = new IntegerHandler());
3215 <        assertFalse(r.ran);
3292 <        f.completeExceptionally(new CFException());
3293 <        checkCompletedWithWrappedCFException(f);
3294 <        checkCompletedNormally(g, three);
3295 <        assertTrue(r.ran);
3213 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3214 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3215 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3216  
3217 <        f = new CompletableFuture<>();
3218 <        g = f.handleAsync(r = new IntegerHandler());
3219 <        assertFalse(r.ran);
3300 <        f.completeExceptionally(new CFException());
3301 <        checkCompletedWithWrappedCFException(f);
3302 <        checkCompletedNormally(g, three);
3303 <        assertTrue(r.ran);
3217 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3218 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3219 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3220  
3221 <        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);
3221 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3222  
3223 <        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 <    }
3223 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3224  
3225 <    /**
3226 <     * 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;
3225 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3226 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3227  
3228 <        f = new CompletableFuture<>();
3229 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3230 <        assertFalse(r.ran);
3231 <        f.completeExceptionally(new CFException());
3232 <        checkCompletedWithWrappedCFException(f);
3233 <        checkCompletedNormally(g, three);
3234 <        assertTrue(r.ran);
3228 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3229 >                 fun : funs) {
3230 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3231 >            f.completeExceptionally(ex);
3232 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3233 >            checkCompletedWithWrappedException(src, ex);
3234 >            CompletableFuture<?> dep = fun.apply(src);
3235 >            checkCompletedWithWrappedException(dep, ex);
3236 >            assertSame(resultOf(src), resultOf(dep));
3237 >        }
3238  
3239 <        f = new CompletableFuture<>();
3240 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3241 <        assertFalse(r.ran);
3242 <        f.completeExceptionally(new CFException());
3243 <        checkCompletedWithWrappedCFException(f);
3244 <        checkCompletedNormally(g, three);
3245 <        assertTrue(r.ran);
3239 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3240 >                 fun : funs) {
3241 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3242 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3243 >            CompletableFuture<?> dep = fun.apply(src);
3244 >            f.completeExceptionally(ex);
3245 >            checkCompletedWithWrappedException(src, ex);
3246 >            checkCompletedWithWrappedException(dep, ex);
3247 >            assertSame(resultOf(src), resultOf(dep));
3248 >        }
3249  
3250 <        f = new CompletableFuture<>();
3251 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3252 <        assertFalse(r.ran);
3253 <        f.complete(one);
3254 <        checkCompletedNormally(f, one);
3255 <        checkCompletedNormally(g, two);
3256 <        assertTrue(r.ran);
3250 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3251 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3252 >                 fun : funs) {
3253 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3254 >            f.cancel(mayInterruptIfRunning);
3255 >            checkCancelled(f);
3256 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3257 >            checkCompletedWithWrappedCancellationException(src);
3258 >            CompletableFuture<?> dep = fun.apply(src);
3259 >            checkCompletedWithWrappedCancellationException(dep);
3260 >            assertSame(resultOf(src), resultOf(dep));
3261 >        }
3262  
3263 <        f = new CompletableFuture<>();
3264 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3265 <        assertFalse(r.ran);
3266 <        f.complete(one);
3267 <        checkCompletedNormally(f, one);
3268 <        checkCompletedNormally(g, two);
3269 <        assertTrue(r.ran);
3270 <    }
3263 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3264 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3265 >                 fun : funs) {
3266 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3267 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3268 >            CompletableFuture<?> dep = fun.apply(src);
3269 >            f.cancel(mayInterruptIfRunning);
3270 >            checkCancelled(f);
3271 >            checkCompletedWithWrappedCancellationException(src);
3272 >            checkCompletedWithWrappedCancellationException(dep);
3273 >            assertSame(resultOf(src), resultOf(dep));
3274 >        }
3275 >    }}
3276  
3277   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines