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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines