ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines