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.22 by jsr166, Mon Apr 8 20:46:59 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 68 | Line 71 | public class CompletableFutureTest exten
71          } catch (Throwable fail) { threadUnexpectedException(fail); }
72          assertTrue(f.isDone());
73          assertFalse(f.isCancelled());
74 +        assertFalse(f.isCompletedExceptionally());
75          assertTrue(f.toString().contains("[Completed normally]"));
76      }
77  
# Line 101 | 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 121 | Line 177 | public class CompletableFutureTest exten
177          } catch (CancellationException success) {
178          } catch (Throwable fail) { threadUnexpectedException(fail); }
179          assertTrue(f.isDone());
180 +        assertTrue(f.isCompletedExceptionally());
181          assertTrue(f.isCancelled());
182          assertTrue(f.toString().contains("[Completed exceptionally]"));
183      }
# Line 152 | Line 209 | public class CompletableFutureTest exten
209          } catch (Throwable fail) { threadUnexpectedException(fail); }
210          assertTrue(f.isDone());
211          assertFalse(f.isCancelled());
212 +        assertTrue(f.isCompletedExceptionally());
213          assertTrue(f.toString().contains("[Completed exceptionally]"));
214      }
215  
# Line 181 | 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 212 | 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 222 | 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());
230 <        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  
259
333      /**
334       * toString indicates current completion state
335       */
# Line 272 | 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 282 | 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 =
292 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() - y.intValue());
293 <    static final class IncAction implements Consumer<Integer> {
294 <        int value;
295 <        public void accept(Integer x) { value = x.intValue() + 1; }
296 <    }
297 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
298 <        int value;
299 <        public void accept(Integer x, Integer y) {
300 <            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 {
304 <        boolean ran;
305 <        public void run() { ran = true; }
374 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
375 >        void assertInvoked() { assertEquals(1, invocationCount); }
376      }
377  
378 <    static final class FailingSupplier implements Supplier<Integer> {
379 <        boolean ran;
380 <        public Integer get() { ran = true; throw new CFException(); }
381 <    }
382 <    static final class FailingConsumer implements Consumer<Integer> {
383 <        boolean ran;
314 <        public void accept(Integer x) { ran = true; throw new CFException(); }
315 <    }
316 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
317 <        boolean ran;
318 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
319 <    }
320 <    static final class FailingFunction implements Function<Integer, Integer> {
321 <        boolean ran;
322 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
323 <    }
324 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
325 <        boolean ran;
326 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
327 <    }
328 <    static final class FailingNoop implements Runnable {
329 <        boolean ran;
330 <        public void run() { ran = true; throw new CFException(); }
331 <    }
332 <
333 <    static final class CompletableFutureInc
334 <        implements Function<Integer, CompletableFuture<Integer>> {
335 <        boolean ran;
336 <        public CompletableFuture<Integer> apply(Integer x) {
337 <            ran = true;
338 <            CompletableFuture<Integer> f = new CompletableFuture<>();
339 <            f.complete(Integer.valueOf(x.intValue() + 1));
340 <            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
353 <    static final class ThreadExecutor implements Executor {
354 <        AtomicInteger count = new AtomicInteger(0);
355 <
356 <        public void execute(Runnable r) {
357 <            count.getAndIncrement();
358 <            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 <    /**
418 <     * exceptionally action completes with function value on source
419 <     * exception;  otherwise with source value
420 <     */
421 <    public void testExceptionally() {
422 <        CompletableFuture<Integer> f = new CompletableFuture<>();
423 <        ExceptionToInteger r = new ExceptionToInteger();
382 <        CompletableFuture<Integer> g = f.exceptionally(r);
383 <        f.completeExceptionally(new CFException());
384 <        checkCompletedNormally(g, three);
385 <
386 <        f = new CompletableFuture<>();
387 <        r = new ExceptionToInteger();
388 <        g = f.exceptionally(r);
389 <        f.complete(one);
390 <        checkCompletedNormally(g, one);
391 <    }
392 <
393 <    /**
394 <     * handle action completes normally with function value on either
395 <     * normal or exceptional completion of source
396 <     */
397 <    public void testHandle() {
398 <        CompletableFuture<Integer> f, g;
399 <        IntegerHandler r;
400 <
401 <        f = new CompletableFuture<>();
402 <        f.completeExceptionally(new CFException());
403 <        g = f.handle(r = new IntegerHandler());
404 <        assertTrue(r.ran);
405 <        checkCompletedNormally(g, three);
406 <
407 <        f = new CompletableFuture<>();
408 <        g = f.handle(r = new IntegerHandler());
409 <        assertFalse(r.ran);
410 <        f.completeExceptionally(new CFException());
411 <        checkCompletedNormally(g, three);
412 <        assertTrue(r.ran);
413 <
414 <        f = new CompletableFuture<>();
415 <        f.complete(one);
416 <        g = f.handle(r = new IntegerHandler());
417 <        assertTrue(r.ran);
418 <        checkCompletedNormally(g, two);
419 <
420 <        f = new CompletableFuture<>();
421 <        g = f.handle(r = new IntegerHandler());
422 <        assertFalse(r.ran);
423 <        f.complete(one);
424 <        assertTrue(r.ran);
425 <        checkCompletedNormally(g, two);
426 <    }
427 <
428 <    /**
429 <     * runAsync completes after running Runnable
430 <     */
431 <    public void testRunAsync() {
432 <        Noop r = new Noop();
433 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
434 <        assertNull(f.join());
435 <        assertTrue(r.ran);
436 <        checkCompletedNormally(f, null);
437 <    }
438 <
439 <    /**
440 <     * runAsync with executor completes after running Runnable
441 <     */
442 <    public void testRunAsync2() {
443 <        Noop r = new Noop();
444 <        ThreadExecutor exec = new ThreadExecutor();
445 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
446 <        assertNull(f.join());
447 <        assertTrue(r.ran);
448 <        checkCompletedNormally(f, null);
449 <        assertEquals(1, exec.count.get());
450 <    }
451 <
452 <    /**
453 <     * failing runAsync completes exceptionally after running Runnable
454 <     */
455 <    public void testRunAsync3() {
456 <        FailingNoop r = new FailingNoop();
457 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
458 <        checkCompletedWithWrappedCFException(f);
459 <        assertTrue(r.ran);
460 <    }
461 <
462 <    /**
463 <     * supplyAsync completes with result of supplier
464 <     */
465 <    public void testSupplyAsync() {
466 <        CompletableFuture<Integer> f;
467 <        f = CompletableFuture.supplyAsync(supplyOne);
468 <        assertEquals(f.join(), one);
469 <        checkCompletedNormally(f, one);
470 <    }
471 <
472 <    /**
473 <     * supplyAsync with executor completes with result of supplier
474 <     */
475 <    public void testSupplyAsync2() {
476 <        CompletableFuture<Integer> f;
477 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
478 <        assertEquals(f.join(), one);
479 <        checkCompletedNormally(f, one);
480 <    }
481 <
482 <    /**
483 <     * Failing supplyAsync completes exceptionally
484 <     */
485 <    public void testSupplyAsync3() {
486 <        FailingSupplier r = new FailingSupplier();
487 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
488 <        checkCompletedWithWrappedCFException(f);
489 <        assertTrue(r.ran);
490 <    }
491 <
492 <    // seq completion methods
493 <
494 <    /**
495 <     * thenRun result completes normally after normal completion of source
496 <     */
497 <    public void testThenRun() {
498 <        CompletableFuture<Integer> f = new CompletableFuture<>();
499 <        Noop r = new Noop();
500 <        CompletableFuture<Void> g = f.thenRun(r);
501 <        f.complete(null);
502 <        checkCompletedNormally(g, null);
503 <        // reordered version
504 <        f = new CompletableFuture<>();
505 <        f.complete(null);
506 <        r = new Noop();
507 <        g = f.thenRun(r);
508 <        checkCompletedNormally(g, null);
509 <    }
510 <
511 <    /**
512 <     * thenRun result completes exceptionally after exceptional
513 <     * completion of source
514 <     */
515 <    public void testThenRun2() {
516 <        CompletableFuture<Integer> f = new CompletableFuture<>();
517 <        Noop r = new Noop();
518 <        CompletableFuture<Void> g = f.thenRun(r);
519 <        f.completeExceptionally(new CFException());
520 <        checkCompletedWithWrappedCFException(g);
521 <    }
522 <
523 <    /**
524 <     * thenRun result completes exceptionally if action does
525 <     */
526 <    public void testThenRun3() {
527 <        CompletableFuture<Integer> f = new CompletableFuture<>();
528 <        FailingNoop r = new FailingNoop();
529 <        CompletableFuture<Void> g = f.thenRun(r);
530 <        f.complete(null);
531 <        checkCompletedWithWrappedCFException(g);
532 <    }
533 <
534 <    /**
535 <     * thenRun result completes exceptionally if source cancelled
536 <     */
537 <    public void testThenRun4() {
538 <        CompletableFuture<Integer> f = new CompletableFuture<>();
539 <        Noop r = new Noop();
540 <        CompletableFuture<Void> g = f.thenRun(r);
541 <        assertTrue(f.cancel(true));
542 <        checkCompletedWithWrappedCancellationException(g);
543 <    }
544 <
545 <    /**
546 <     * thenApply result completes normally after normal completion of source
547 <     */
548 <    public void testThenApply() {
549 <        CompletableFuture<Integer> f = new CompletableFuture<>();
550 <        CompletableFuture<Integer> g = f.thenApply(inc);
551 <        f.complete(one);
552 <        checkCompletedNormally(g, two);
553 <    }
554 <
555 <    /**
556 <     * thenApply result completes exceptionally after exceptional
557 <     * completion of source
558 <     */
559 <    public void testThenApply2() {
560 <        CompletableFuture<Integer> f = new CompletableFuture<>();
561 <        CompletableFuture<Integer> g = f.thenApply(inc);
562 <        f.completeExceptionally(new CFException());
563 <        checkCompletedWithWrappedCFException(g);
564 <    }
565 <
566 <    /**
567 <     * thenApply result completes exceptionally if action does
568 <     */
569 <    public void testThenApply3() {
570 <        CompletableFuture<Integer> f = new CompletableFuture<>();
571 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
572 <        f.complete(one);
573 <        checkCompletedWithWrappedCFException(g);
574 <    }
575 <
576 <    /**
577 <     * thenApply result completes exceptionally if source cancelled
578 <     */
579 <    public void testThenApply4() {
580 <        CompletableFuture<Integer> f = new CompletableFuture<>();
581 <        CompletableFuture<Integer> g = f.thenApply(inc);
582 <        assertTrue(f.cancel(true));
583 <        checkCompletedWithWrappedCancellationException(g);
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 <     * thenAccept result completes normally after normal completion of source
428 <     */
429 <    public void testThenAccept() {
430 <        CompletableFuture<Integer> f = new CompletableFuture<>();
431 <        IncAction r = new IncAction();
592 <        CompletableFuture<Void> g = f.thenAccept(r);
593 <        f.complete(one);
594 <        checkCompletedNormally(g, null);
595 <        assertEquals(r.value, 2);
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 <    /**
435 <     * thenAccept result completes exceptionally after exceptional
436 <     * completion of source
437 <     */
438 <    public void testThenAccept2() {
439 <        CompletableFuture<Integer> f = new CompletableFuture<>();
440 <        IncAction r = new IncAction();
441 <        CompletableFuture<Void> g = f.thenAccept(r);
606 <        f.completeExceptionally(new CFException());
607 <        checkCompletedWithWrappedCFException(g);
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 <     * thenAccept result completes exceptionally if action does
446 <     */
447 <    public void testThenAccept3() {
448 <        CompletableFuture<Integer> f = new CompletableFuture<>();
449 <        FailingConsumer r = new FailingConsumer();
450 <        CompletableFuture<Void> g = f.thenAccept(r);
451 <        f.complete(one);
618 <        checkCompletedWithWrappedCFException(g);
619 <        assertTrue(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 <     * thenAccept result completes exceptionally if source cancelled
456 <     */
457 <    public void testThenAccept4() {
458 <        CompletableFuture<Integer> f = new CompletableFuture<>();
627 <        IncAction r = new IncAction();
628 <        CompletableFuture<Void> g = f.thenAccept(r);
629 <        assertTrue(f.cancel(true));
630 <        checkCompletedWithWrappedCancellationException(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 <    /**
463 <     * thenCombine result completes normally after normal completion
464 <     * of sources
465 <     */
466 <    public void testThenCombine() {
467 <        CompletableFuture<Integer> f, g, h;
468 <
641 <        f = new CompletableFuture<>();
642 <        g = new CompletableFuture<>();
643 <        h = f.thenCombine(g, subtract);
644 <        f.complete(3);
645 <        checkIncomplete(h);
646 <        g.complete(1);
647 <        checkCompletedNormally(h, 2);
648 <
649 <        f = new CompletableFuture<>();
650 <        g = new CompletableFuture<>();
651 <        h = f.thenCombine(g, subtract);
652 <        g.complete(1);
653 <        checkIncomplete(h);
654 <        f.complete(3);
655 <        checkCompletedNormally(h, 2);
656 <
657 <        f = new CompletableFuture<>();
658 <        g = new CompletableFuture<>();
659 <        g.complete(1);
660 <        f.complete(3);
661 <        h = f.thenCombine(g, subtract);
662 <        checkCompletedNormally(h, 2);
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 <     * thenCombine result completes exceptionally after exceptional
473 <     * completion of either source
474 <     */
475 <    public void testThenCombine2() {
476 <        CompletableFuture<Integer> f, g, h;
477 <
478 <        f = new CompletableFuture<>();
479 <        g = new CompletableFuture<>();
674 <        h = f.thenCombine(g, subtract);
675 <        f.completeExceptionally(new CFException());
676 <        checkIncomplete(h);
677 <        g.complete(1);
678 <        checkCompletedWithWrappedCFException(h);
679 <
680 <        f = new CompletableFuture<>();
681 <        g = new CompletableFuture<>();
682 <        h = f.thenCombine(g, subtract);
683 <        g.completeExceptionally(new CFException());
684 <        checkIncomplete(h);
685 <        f.complete(3);
686 <        checkCompletedWithWrappedCFException(h);
687 <
688 <        f = new CompletableFuture<>();
689 <        g = new CompletableFuture<>();
690 <        f.complete(3);
691 <        g.completeExceptionally(new CFException());
692 <        h = f.thenCombine(g, subtract);
693 <        checkCompletedWithWrappedCFException(h);
694 <
695 <        f = new CompletableFuture<>();
696 <        g = new CompletableFuture<>();
697 <        f.completeExceptionally(new CFException());
698 <        g.complete(3);
699 <        h = f.thenCombine(g, subtract);
700 <        checkCompletedWithWrappedCFException(h);
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 <     * thenCombine result completes exceptionally if action does
484 <     */
485 <    public void testThenCombine3() {
486 <        CompletableFuture<Integer> f = new CompletableFuture<>();
487 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
488 <        FailingBiFunction r = new FailingBiFunction();
489 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
490 <        f.complete(one);
712 <        checkIncomplete(g);
713 <        assertFalse(r.ran);
714 <        f2.complete(two);
715 <        checkCompletedWithWrappedCFException(g);
716 <        assertTrue(r.ran);
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 <     * thenCombine result completes exceptionally if either source cancelled
495 <     */
496 <    public void testThenCombine4() {
497 <        CompletableFuture<Integer> f, g, h;
498 <
499 <        f = new CompletableFuture<>();
500 <        g = new CompletableFuture<>();
501 <        h = f.thenCombine(g, subtract);
728 <        assertTrue(f.cancel(true));
729 <        checkIncomplete(h);
730 <        g.complete(1);
731 <        checkCompletedWithWrappedCancellationException(h);
732 <
733 <        f = new CompletableFuture<>();
734 <        g = new CompletableFuture<>();
735 <        h = f.thenCombine(g, subtract);
736 <        assertTrue(g.cancel(true));
737 <        checkIncomplete(h);
738 <        f.complete(3);
739 <        checkCompletedWithWrappedCancellationException(h);
740 <
741 <        f = new CompletableFuture<>();
742 <        g = new CompletableFuture<>();
743 <        assertTrue(f.cancel(true));
744 <        assertTrue(g.cancel(true));
745 <        h = f.thenCombine(g, subtract);
746 <        checkCompletedWithWrappedCancellationException(h);
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 <     * thenAcceptBoth result completes normally after normal
506 <     * completion of sources
507 <     */
508 <    public void testThenAcceptBoth() {
509 <        CompletableFuture<Integer> f, g;
510 <        CompletableFuture<Void> h;
511 <        SubtractAction r;
512 <
758 <        f = new CompletableFuture<>();
759 <        g = new CompletableFuture<>();
760 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
761 <        f.complete(3);
762 <        checkIncomplete(h);
763 <        g.complete(1);
764 <        checkCompletedNormally(h, null);
765 <        assertEquals(r.value, 2);
766 <
767 <        f = new CompletableFuture<>();
768 <        g = new CompletableFuture<>();
769 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
770 <        g.complete(1);
771 <        checkIncomplete(h);
772 <        f.complete(3);
773 <        checkCompletedNormally(h, null);
774 <        assertEquals(r.value, 2);
775 <
776 <        f = new CompletableFuture<>();
777 <        g = new CompletableFuture<>();
778 <        g.complete(1);
779 <        f.complete(3);
780 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
781 <        checkCompletedNormally(h, null);
782 <        assertEquals(r.value, 2);
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 <     * thenAcceptBoth result completes exceptionally after exceptional
517 <     * completion of either source
518 <     */
519 <    public void testThenAcceptBoth2() {
520 <        CompletableFuture<Integer> f, g;
791 <        CompletableFuture<Void> h;
792 <        SubtractAction r;
793 <
794 <        f = new CompletableFuture<>();
795 <        g = new CompletableFuture<>();
796 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
797 <        f.completeExceptionally(new CFException());
798 <        checkIncomplete(h);
799 <        g.complete(1);
800 <        checkCompletedWithWrappedCFException(h);
801 <
802 <        f = new CompletableFuture<>();
803 <        g = new CompletableFuture<>();
804 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
805 <        g.completeExceptionally(new CFException());
806 <        checkIncomplete(h);
807 <        f.complete(3);
808 <        checkCompletedWithWrappedCFException(h);
809 <
810 <        f = new CompletableFuture<>();
811 <        g = new CompletableFuture<>();
812 <        f.complete(3);
813 <        g.completeExceptionally(new CFException());
814 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
815 <        checkCompletedWithWrappedCFException(h);
816 <
817 <        f = new CompletableFuture<>();
818 <        g = new CompletableFuture<>();
819 <        f.completeExceptionally(new CFException());
820 <        g.complete(3);
821 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
822 <        checkCompletedWithWrappedCFException(h);
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  
825    /**
826     * thenAcceptBoth result completes exceptionally if action does
827     */
828    public void testThenAcceptBoth3() {
829        CompletableFuture<Integer> f, g;
830        CompletableFuture<Void> h;
831        FailingBiConsumer r;
832
833        f = new CompletableFuture<>();
834        g = new CompletableFuture<>();
835        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
836        f.complete(3);
837        checkIncomplete(h);
838        g.complete(1);
839        checkCompletedWithWrappedCFException(h);
523  
524 <        f = new CompletableFuture<>();
525 <        g = new CompletableFuture<>();
526 <        f.complete(3);
527 <        g.complete(1);
528 <        h = f.thenAcceptBoth(g, r = new FailingBiConsumer());
529 <        checkCompletedWithWrappedCFException(h);
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 <     * thenAcceptBoth result completes exceptionally if either source cancelled
539 <     */
540 <    public void testThenAcceptBoth4() {
541 <        CompletableFuture<Integer> f, g;
542 <        CompletableFuture<Void> h;
543 <        SubtractAction r;
544 <
545 <        f = new CompletableFuture<>();
858 <        g = new CompletableFuture<>();
859 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
860 <        assertTrue(f.cancel(true));
861 <        checkIncomplete(h);
862 <        g.complete(1);
863 <        checkCompletedWithWrappedCancellationException(h);
864 <
865 <        f = new CompletableFuture<>();
866 <        g = new CompletableFuture<>();
867 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
868 <        assertTrue(g.cancel(true));
869 <        checkIncomplete(h);
870 <        f.complete(3);
871 <        checkCompletedWithWrappedCancellationException(h);
872 <
873 <        f = new CompletableFuture<>();
874 <        g = new CompletableFuture<>();
875 <        f.complete(3);
876 <        assertTrue(g.cancel(true));
877 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
878 <        checkCompletedWithWrappedCancellationException(h);
879 <
880 <        f = new CompletableFuture<>();
881 <        g = new CompletableFuture<>();
882 <        assertTrue(f.cancel(true));
883 <        g.complete(3);
884 <        h = f.thenAcceptBoth(g, r = new SubtractAction());
885 <        checkCompletedWithWrappedCancellationException(h);
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 <     * runAfterBoth result completes normally after normal
550 <     * completion of sources
551 <     */
552 <    public void testRunAfterBoth() {
553 <        CompletableFuture<Integer> f, g;
554 <        CompletableFuture<Void> h;
895 <        Noop r;
896 <
897 <        f = new CompletableFuture<>();
898 <        g = new CompletableFuture<>();
899 <        h = f.runAfterBoth(g, r = new Noop());
900 <        f.complete(3);
901 <        checkIncomplete(h);
902 <        g.complete(1);
903 <        checkCompletedNormally(h, null);
904 <        assertTrue(r.ran);
905 <
906 <        f = new CompletableFuture<>();
907 <        g = new CompletableFuture<>();
908 <        h = f.runAfterBoth(g, r = new Noop());
909 <        g.complete(1);
910 <        checkIncomplete(h);
911 <        f.complete(3);
912 <        checkCompletedNormally(h, null);
913 <        assertTrue(r.ran);
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);
919 <        h = f.runAfterBoth(g, r = new Noop());
920 <        checkCompletedNormally(h, null);
921 <        assertTrue(r.ran);
556 >        public void execute(Runnable r) {
557 >            count.getAndIncrement();
558 >            new Thread(tg, r).start();
559 >        }
560      }
561  
562      /**
563 <     * runAfterBoth 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 testRunAfterBoth2() {
567 <        CompletableFuture<Integer> f, g;
568 <        CompletableFuture<Void> h;
569 <        Noop r;
570 <
571 <        f = new CompletableFuture<>();
572 <        g = new CompletableFuture<>();
573 <        h = f.runAfterBoth(g, r = new Noop());
574 <        f.completeExceptionally(new CFException());
575 <        checkIncomplete(h);
576 <        g.complete(1);
577 <        checkCompletedWithWrappedCFException(h);
578 <        assertFalse(r.ran);
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 <        h = f.runAfterBoth(g, r = new Noop());
644 <        g.completeExceptionally(new CFException());
645 <        checkIncomplete(h);
646 <        f.complete(3);
647 <        checkCompletedWithWrappedCFException(h);
648 <        assertFalse(r.ran);
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 <        g.completeExceptionally(new CFException());
718 <        f.complete(3);
719 <        h = f.runAfterBoth(g, r = new Noop());
720 <        checkCompletedWithWrappedCFException(h);
721 <        assertFalse(r.ran);
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 <        f = new CompletableFuture<>();
789 <        g = new CompletableFuture<>();
790 <        f.completeExceptionally(new CFException());
791 <        g.complete(1);
792 <        h = f.runAfterBoth(g, r = new Noop());
793 <        checkCompletedWithWrappedCFException(h);
794 <        assertFalse(r.ran);
795 <    }
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 <     * runAfterBoth result completes exceptionally if action does
855 >     * exceptionally action completes with function value on source
856 >     * exception
857       */
858 <    public void testRunAfterBoth3() {
859 <        CompletableFuture<Integer> f = new CompletableFuture<>();
860 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
861 <        FailingNoop r = new FailingNoop();
862 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
863 <        f.complete(one);
864 <        checkIncomplete(g);
865 <        f2.complete(two);
866 <        checkCompletedWithWrappedCFException(g);
867 <    }
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 >     * whenComplete action executes on normal completion, propagating
903 >     * source result.
904 >     */
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 >     * whenComplete action executes on exceptional completion, propagating
930 >     * source result.
931 >     */
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  
982    /**
983     * runAfterBoth result completes exceptionally if either source cancelled
984     */
985    public void testRunAfterBoth4() {
986        CompletableFuture<Integer> f = new CompletableFuture<>();
987        CompletableFuture<Integer> f2 = new CompletableFuture<>();
988        Noop r = new Noop();
989        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
990        assertTrue(f.cancel(true));
991        f2.complete(two);
992        checkCompletedWithWrappedCancellationException(g);
993        f = new CompletableFuture<>();
994        f2 = new CompletableFuture<>();
995        r = new Noop();
996        g = f.runAfterBoth(f2, r);
997        f.complete(one);
998        assertTrue(f2.cancel(true));
978          checkCompletedWithWrappedCancellationException(g);
979 <    }
979 >        checkCancelled(f);
980 >        assertEquals(1, a.get());
981 >    }}
982  
983      /**
984 <     * applyToEither result completes normally after normal completion
985 <     * of either source
984 >     * If a whenComplete action throws an exception when triggered by
985 >     * a normal completion, it completes exceptionally
986       */
987 <    public void testApplyToEither() {
988 <        CompletableFuture<Integer> f = new CompletableFuture<>();
989 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
990 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
991 <        f.complete(one);
992 <        checkCompletedNormally(g, two);
993 <        f2.complete(one);
994 <        checkCompletedNormally(g, two);
995 <
996 <        f = new CompletableFuture<>();
997 <        f.complete(one);
998 <        f2 = new CompletableFuture<>();
999 <        g = f.applyToEither(f2, inc);
1000 <        checkCompletedNormally(g, two);
1001 <    }
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 >     * 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 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 <     * applyToEither 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 testApplyToEither2() {
1077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1078 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1079 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1080 <        f.completeExceptionally(new CFException());
1081 <        f2.complete(one);
1082 <        checkCompletedWithWrappedCFException(g);
1083 <
1084 <        f = new CompletableFuture<>();
1085 <        f2 = new CompletableFuture<>();
1086 <        f2.completeExceptionally(new CFException());
1087 <        g = f.applyToEither(f2, inc);
1088 <        checkCompletedWithWrappedCFException(g);
1089 <    }
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 <    /**
1126 <     * applyToEither result completes exceptionally if action does
1127 <     */
1128 <    public void testApplyToEither3() {
1045 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1046 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1047 <        FailingFunction r = new FailingFunction();
1048 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1049 <        f2.complete(two);
1050 <        checkCompletedWithWrappedCFException(g);
1051 <    }
1125 >        checkCompletedNormally(g, v1);
1126 >        checkCancelled(f);
1127 >        assertEquals(1, a.get());
1128 >    }}
1129  
1130      /**
1131 <     * applyToEither result completes exceptionally if either source cancelled
1131 >     * handle result completes exceptionally if action does
1132       */
1133 <    public void testApplyToEither4() {
1134 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1135 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1136 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1137 <        assertTrue(f.cancel(true));
1138 <        checkCompletedWithWrappedCancellationException(g);
1139 <        f = new CompletableFuture<>();
1140 <        f2 = new CompletableFuture<>();
1141 <        assertTrue(f2.cancel(true));
1142 <        checkCompletedWithWrappedCancellationException(g);
1143 <    }
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 <     * acceptEither result completes normally after normal completion
1070 <     * of either source
1184 >     * runAsync completes after running Runnable
1185       */
1186 <    public void testAcceptEither() {
1187 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1188 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1189 <        IncAction r = new IncAction();
1190 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1191 <        f.complete(one);
1192 <        checkCompletedNormally(g, null);
1193 <        f2.complete(one);
1194 <        checkCompletedNormally(g, null);
1195 <        assertEquals(r.value, 2);
1196 <
1197 <        r = new IncAction();
1198 <        f = new CompletableFuture<>();
1085 <        f.complete(one);
1086 <        f2 = new CompletableFuture<>();
1087 <        g = f.acceptEither(f2, r);
1088 <        checkCompletedNormally(g, null);
1089 <        assertEquals(r.value, 2);
1090 <    }
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 <     * acceptEither result completes exceptionally after exceptional
1094 <     * completion of either source
1201 >     * failing runAsync completes exceptionally after running Runnable
1202       */
1203 <    public void testAcceptEither2() {
1204 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1205 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1206 <        IncAction r = new IncAction();
1207 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1208 <        f.completeExceptionally(new CFException());
1209 <        f2.complete(one);
1210 <        checkCompletedWithWrappedCFException(g);
1211 <
1212 <        r = new IncAction();
1213 <        f = new CompletableFuture<>();
1214 <        f2 = new CompletableFuture<>();
1108 <        f2.completeExceptionally(new CFException());
1109 <        g = f.acceptEither(f2, r);
1110 <        checkCompletedWithWrappedCFException(g);
1111 <    }
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 <     * acceptEither result completes exceptionally if action does
1217 >     * supplyAsync completes with result of supplier
1218       */
1219 <    public void testAcceptEither3() {
1220 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1221 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1222 <        FailingConsumer r = new FailingConsumer();
1223 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1224 <        f2.complete(two);
1225 <        checkCompletedWithWrappedCFException(g);
1226 <    }
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 <     * acceptEither result completes exceptionally if either source cancelled
1235 >     * Failing supplyAsync completes exceptionally
1236       */
1237 <    public void testAcceptEither4() {
1238 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1239 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1240 <        IncAction r = new IncAction();
1241 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1242 <        assertTrue(f.cancel(true));
1243 <        checkCompletedWithWrappedCancellationException(g);
1244 <        f = new CompletableFuture<>();
1245 <        f2 = new CompletableFuture<>();
1246 <        assertTrue(f2.cancel(true));
1247 <        checkCompletedWithWrappedCancellationException(g);
1248 <    }
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 +    // seq completion methods
1251  
1252      /**
1253 <     * runAfterEither result completes normally after normal completion
1144 <     * of either source
1253 >     * thenRun result completes normally after normal completion of source
1254       */
1255 <    public void testRunAfterEither() {
1256 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1257 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1258 <        Noop r = new Noop();
1259 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1260 <        f.complete(one);
1261 <        checkCompletedNormally(g, null);
1262 <        f2.complete(one);
1263 <        checkCompletedNormally(g, null);
1264 <        assertTrue(r.ran);
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  
1157        r = new Noop();
1158        f = new CompletableFuture<>();
1159        f.complete(one);
1160        f2 = new CompletableFuture<>();
1161        g = f.runAfterEither(f2, r);
1269          checkCompletedNormally(g, null);
1270 <        assertTrue(r.ran);
1271 <    }
1272 <
1166 <    /**
1167 <     * runAfterEither result completes exceptionally after exceptional
1168 <     * completion of either source
1169 <     */
1170 <    public void testRunAfterEither2() {
1171 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1172 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1173 <        Noop r = new Noop();
1174 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1175 <        f.completeExceptionally(new CFException());
1176 <        f2.complete(one);
1177 <        checkCompletedWithWrappedCFException(g);
1178 <
1179 <        r = new Noop();
1180 <        f = new CompletableFuture<>();
1181 <        f2 = new CompletableFuture<>();
1182 <        f2.completeExceptionally(new CFException());
1183 <        g = f.runAfterEither(f2, r);
1184 <        checkCompletedWithWrappedCFException(g);
1185 <    }
1186 <
1187 <    /**
1188 <     * runAfterEither result completes exceptionally if action does
1189 <     */
1190 <    public void testRunAfterEither3() {
1191 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1192 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1193 <        FailingNoop r = new FailingNoop();
1194 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1195 <        f2.complete(two);
1196 <        checkCompletedWithWrappedCFException(g);
1197 <    }
1198 <
1199 <    /**
1200 <     * runAfterEither result completes exceptionally if either source cancelled
1201 <     */
1202 <    public void testRunAfterEither4() {
1203 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1204 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1205 <        Noop r = new Noop();
1206 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1207 <        assertTrue(f.cancel(true));
1208 <        checkCompletedWithWrappedCancellationException(g);
1209 <        f = new CompletableFuture<>();
1210 <        f2 = new CompletableFuture<>();
1211 <        assertTrue(f2.cancel(true));
1212 <        checkCompletedWithWrappedCancellationException(g);
1213 <    }
1214 <
1215 <    /**
1216 <     * thenCompose result completes normally after normal completion of source
1217 <     */
1218 <    public void testThenCompose() {
1219 <        CompletableFuture<Integer> f, g;
1220 <        CompletableFutureInc r;
1221 <
1222 <        f = new CompletableFuture<>();
1223 <        g = f.thenCompose(r = new CompletableFutureInc());
1224 <        f.complete(one);
1225 <        checkCompletedNormally(g, two);
1226 <        assertTrue(r.ran);
1227 <
1228 <        f = new CompletableFuture<>();
1229 <        f.complete(one);
1230 <        g = f.thenCompose(r = new CompletableFutureInc());
1231 <        checkCompletedNormally(g, two);
1232 <        assertTrue(r.ran);
1233 <    }
1270 >        checkCompletedNormally(f, v1);
1271 >        r.assertInvoked();
1272 >    }}
1273  
1274      /**
1275 <     * thenCompose result completes exceptionally after exceptional
1275 >     * thenRun result completes exceptionally after exceptional
1276       * completion of source
1277       */
1278 <    public void testThenCompose2() {
1279 <        CompletableFuture<Integer> f, g;
1280 <        CompletableFutureInc r;
1281 <
1282 <        f = new CompletableFuture<>();
1283 <        g = f.thenCompose(r = new CompletableFutureInc());
1284 <        f.completeExceptionally(new CFException());
1285 <        checkCompletedWithWrappedCFException(g);
1286 <
1287 <        f = new CompletableFuture<>();
1288 <        f.completeExceptionally(new CFException());
1289 <        g = f.thenCompose(r = new CompletableFutureInc());
1290 <        checkCompletedWithWrappedCFException(g);
1252 <    }
1253 <
1254 <    /**
1255 <     * thenCompose result completes exceptionally if action does
1256 <     */
1257 <    public void testThenCompose3() {
1258 <        CompletableFuture<Integer> f, g;
1259 <        FailingCompletableFutureFunction r;
1260 <
1261 <        f = new CompletableFuture<>();
1262 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1263 <        f.complete(one);
1264 <        checkCompletedWithWrappedCFException(g);
1265 <
1266 <        f = new CompletableFuture<>();
1267 <        f.complete(one);
1268 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
1269 <        checkCompletedWithWrappedCFException(g);
1270 <    }
1271 <
1272 <    /**
1273 <     * thenCompose result completes exceptionally if source cancelled
1274 <     */
1275 <    public void testThenCompose4() {
1276 <        CompletableFuture<Integer> f, g;
1277 <        CompletableFutureInc r;
1278 <
1279 <        f = new CompletableFuture<>();
1280 <        g = f.thenCompose(r = new CompletableFutureInc());
1281 <        assertTrue(f.cancel(true));
1282 <        checkCompletedWithWrappedCancellationException(g);
1283 <
1284 <        f = new CompletableFuture<>();
1285 <        assertTrue(f.cancel(true));
1286 <        g = f.thenCompose(r = new CompletableFutureInc());
1287 <        checkCompletedWithWrappedCancellationException(g);
1288 <    }
1289 <
1290 <
1291 <    // asyncs
1292 <
1293 <    /**
1294 <     * thenRunAsync result completes normally after normal completion of source
1295 <     */
1296 <    public void testThenRunAsync() {
1297 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1298 <        Noop r = new Noop();
1299 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1300 <        f.complete(null);
1301 <        checkCompletedNormally(g, null);
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 <        // reordered version
1293 <        f = new CompletableFuture<>();
1294 <        f.complete(null);
1295 <        r = new Noop();
1307 <        g = f.thenRunAsync(r);
1308 <        checkCompletedNormally(g, null);
1309 <    }
1292 >        checkCompletedWithWrappedException(g, ex);
1293 >        checkCompletedExceptionally(f, ex);
1294 >        r.assertNotInvoked();
1295 >    }}
1296  
1297      /**
1298 <     * thenRunAsync result completes exceptionally after exceptional
1313 <     * completion of source
1298 >     * thenRun result completes exceptionally if source cancelled
1299       */
1300 <    public void testThenRunAsync2() {
1301 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1302 <        Noop r = new Noop();
1303 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1304 <        f.completeExceptionally(new CFException());
1305 <        try {
1306 <            g.join();
1307 <            shouldThrow();
1308 <        } catch (Exception ok) {
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          }
1325        checkCompletedWithWrappedCFException(g);
1326    }
1313  
1328    /**
1329     * thenRunAsync result completes exceptionally if action does
1330     */
1331    public void testThenRunAsync3() {
1332        CompletableFuture<Integer> f = new CompletableFuture<>();
1333        FailingNoop r = new FailingNoop();
1334        CompletableFuture<Void> g = f.thenRunAsync(r);
1335        f.complete(null);
1336        checkCompletedWithWrappedCFException(g);
1337    }
1338
1339    /**
1340     * thenRunAsync result completes exceptionally if source cancelled
1341     */
1342    public void testThenRunAsync4() {
1343        CompletableFuture<Integer> f = new CompletableFuture<>();
1344        Noop r = new Noop();
1345        CompletableFuture<Void> g = f.thenRunAsync(r);
1346        assertTrue(f.cancel(true));
1314          checkCompletedWithWrappedCancellationException(g);
1315 <    }
1315 >        checkCancelled(f);
1316 >        r.assertNotInvoked();
1317 >    }}
1318  
1319      /**
1320 <     * thenApplyAsync result completes normally after normal completion of source
1320 >     * thenRun result completes exceptionally if action does
1321       */
1322 <    public void testThenApplyAsync() {
1323 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1324 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1325 <        f.complete(one);
1326 <        checkCompletedNormally(g, two);
1327 <    }
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  
1360    /**
1361     * thenApplyAsync result completes exceptionally after exceptional
1362     * completion of source
1363     */
1364    public void testThenApplyAsync2() {
1365        CompletableFuture<Integer> f = new CompletableFuture<>();
1366        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1367        f.completeExceptionally(new CFException());
1336          checkCompletedWithWrappedCFException(g);
1337 <    }
1337 >        checkCompletedNormally(f, v1);
1338 >    }}
1339  
1340      /**
1341 <     * thenApplyAsync result completes exceptionally if action does
1341 >     * thenApply result completes normally after normal completion of source
1342       */
1343 <    public void testThenApplyAsync3() {
1344 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1345 <        FailingFunction r = new FailingFunction();
1346 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1347 <        f.complete(null);
1348 <        checkCompletedWithWrappedCFException(g);
1349 <    }
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 <    /**
1358 <     * thenApplyAsync result completes exceptionally if source cancelled
1359 <     */
1360 <    public void testThenApplyAsync4() {
1386 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1387 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1388 <        assertTrue(f.cancel(true));
1389 <        checkCompletedWithWrappedCancellationException(g);
1390 <    }
1357 >        checkCompletedNormally(g, inc(v1));
1358 >        checkCompletedNormally(f, v1);
1359 >        r.assertValue(inc(v1));
1360 >    }}
1361  
1362      /**
1363 <     * thenAcceptAsync result completes normally after normal
1363 >     * thenApply result completes exceptionally after exceptional
1364       * completion of source
1365       */
1366 <    public void testThenAcceptAsync() {
1367 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1368 <        IncAction r = new IncAction();
1369 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1370 <        f.complete(one);
1371 <        checkCompletedNormally(g, null);
1372 <        assertEquals(r.value, 2);
1373 <    }
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 <    /**
1381 <     * thenAcceptAsync result completes exceptionally after exceptional
1382 <     * completion of source
1383 <     */
1409 <    public void testThenAcceptAsync2() {
1410 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1411 <        IncAction r = new IncAction();
1412 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1413 <        f.completeExceptionally(new CFException());
1414 <        checkCompletedWithWrappedCFException(g);
1415 <    }
1380 >        checkCompletedWithWrappedException(g, ex);
1381 >        checkCompletedExceptionally(f, ex);
1382 >        r.assertNotInvoked();
1383 >    }}
1384  
1385      /**
1386 <     * thenAcceptAsync result completes exceptionally if action does
1386 >     * thenApply result completes exceptionally if source cancelled
1387       */
1388 <    public void testThenAcceptAsync3() {
1389 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1390 <        FailingConsumer r = new FailingConsumer();
1391 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1392 <        f.complete(null);
1393 <        checkCompletedWithWrappedCFException(g);
1394 <    }
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  
1428    /**
1429     * thenAcceptAsync result completes exceptionally if source cancelled
1430     */
1431    public void testThenAcceptAsync4() {
1432        CompletableFuture<Integer> f = new CompletableFuture<>();
1433        IncAction r = new IncAction();
1434        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1435        assertTrue(f.cancel(true));
1402          checkCompletedWithWrappedCancellationException(g);
1403 <    }
1404 <
1405 <    /**
1440 <     * thenCombineAsync result completes normally after normal
1441 <     * completion of sources
1442 <     */
1443 <    public void testThenCombineAsync() {
1444 <        CompletableFuture<Integer> f, g, h;
1445 <
1446 <        f = new CompletableFuture<>();
1447 <        g = new CompletableFuture<>();
1448 <        h = f.thenCombineAsync(g, subtract);
1449 <        f.complete(3);
1450 <        checkIncomplete(h);
1451 <        g.complete(1);
1452 <        checkCompletedNormally(h, 2);
1453 <
1454 <        f = new CompletableFuture<>();
1455 <        g = new CompletableFuture<>();
1456 <        h = f.thenCombineAsync(g, subtract);
1457 <        g.complete(1);
1458 <        checkIncomplete(h);
1459 <        f.complete(3);
1460 <        checkCompletedNormally(h, 2);
1461 <
1462 <        f = new CompletableFuture<>();
1463 <        g = new CompletableFuture<>();
1464 <        g.complete(1);
1465 <        f.complete(3);
1466 <        h = f.thenCombineAsync(g, subtract);
1467 <        checkCompletedNormally(h, 2);
1468 <    }
1403 >        checkCancelled(f);
1404 >        r.assertNotInvoked();
1405 >    }}
1406  
1407      /**
1408 <     * thenCombineAsync result completes exceptionally after exceptional
1472 <     * completion of either source
1408 >     * thenApply result completes exceptionally if action does
1409       */
1410 <    public void testThenCombineAsync2() {
1411 <        CompletableFuture<Integer> f, g, h;
1412 <
1413 <        f = new CompletableFuture<>();
1414 <        g = new CompletableFuture<>();
1415 <        h = f.thenCombineAsync(g, subtract);
1416 <        f.completeExceptionally(new CFException());
1417 <        checkIncomplete(h);
1418 <        g.complete(1);
1419 <        checkCompletedWithWrappedCFException(h);
1420 <
1421 <        f = new CompletableFuture<>();
1422 <        g = new CompletableFuture<>();
1487 <        h = f.thenCombineAsync(g, subtract);
1488 <        g.completeExceptionally(new CFException());
1489 <        checkIncomplete(h);
1490 <        f.complete(3);
1491 <        checkCompletedWithWrappedCFException(h);
1492 <
1493 <        f = new CompletableFuture<>();
1494 <        g = new CompletableFuture<>();
1495 <        g.completeExceptionally(new CFException());
1496 <        f.complete(3);
1497 <        h = f.thenCombineAsync(g, subtract);
1498 <        checkCompletedWithWrappedCFException(h);
1499 <    }
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 >        }
1423  
1501    /**
1502     * thenCombineAsync result completes exceptionally if action does
1503     */
1504    public void testThenCombineAsync3() {
1505        CompletableFuture<Integer> f = new CompletableFuture<>();
1506        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1507        FailingBiFunction r = new FailingBiFunction();
1508        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1509        f.complete(one);
1510        checkIncomplete(g);
1511        assertFalse(r.ran);
1512        f2.complete(two);
1424          checkCompletedWithWrappedCFException(g);
1425 <        assertTrue(r.ran);
1426 <    }
1516 <
1517 <    /**
1518 <     * thenCombineAsync result completes exceptionally if either source cancelled
1519 <     */
1520 <    public void testThenCombineAsync4() {
1521 <        CompletableFuture<Integer> f, g, h;
1522 <
1523 <        f = new CompletableFuture<>();
1524 <        g = new CompletableFuture<>();
1525 <        h = f.thenCombineAsync(g, subtract);
1526 <        assertTrue(f.cancel(true));
1527 <        checkIncomplete(h);
1528 <        g.complete(1);
1529 <        checkCompletedWithWrappedCancellationException(h);
1530 <
1531 <        f = new CompletableFuture<>();
1532 <        g = new CompletableFuture<>();
1533 <        h = f.thenCombineAsync(g, subtract);
1534 <        assertTrue(g.cancel(true));
1535 <        checkIncomplete(h);
1536 <        f.complete(3);
1537 <        checkCompletedWithWrappedCancellationException(h);
1538 <
1539 <        f = new CompletableFuture<>();
1540 <        g = new CompletableFuture<>();
1541 <        g.complete(3);
1542 <        assertTrue(f.cancel(true));
1543 <        h = f.thenCombineAsync(g, subtract);
1544 <        checkCompletedWithWrappedCancellationException(h);
1545 <
1546 <        f = new CompletableFuture<>();
1547 <        g = new CompletableFuture<>();
1548 <        f.complete(3);
1549 <        assertTrue(g.cancel(true));
1550 <        h = f.thenCombineAsync(g, subtract);
1551 <        checkCompletedWithWrappedCancellationException(h);
1552 <    }
1553 <
1554 <    /**
1555 <     * thenAcceptBothAsync result completes normally after normal
1556 <     * completion of sources
1557 <     */
1558 <    public void testThenAcceptBothAsync() {
1559 <        CompletableFuture<Integer> f, g;
1560 <        CompletableFuture<Void> h;
1561 <        SubtractAction r;
1562 <
1563 <        f = new CompletableFuture<>();
1564 <        g = new CompletableFuture<>();
1565 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1566 <        f.complete(3);
1567 <        checkIncomplete(h);
1568 <        g.complete(1);
1569 <        checkCompletedNormally(h, null);
1570 <        assertEquals(r.value, 2);
1571 <
1572 <        f = new CompletableFuture<>();
1573 <        g = new CompletableFuture<>();
1574 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1575 <        g.complete(1);
1576 <        checkIncomplete(h);
1577 <        f.complete(3);
1578 <        checkCompletedNormally(h, null);
1579 <        assertEquals(r.value, 2);
1580 <
1581 <        f = new CompletableFuture<>();
1582 <        g = new CompletableFuture<>();
1583 <        g.complete(1);
1584 <        f.complete(3);
1585 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1586 <        checkCompletedNormally(h, null);
1587 <        assertEquals(r.value, 2);
1588 <    }
1425 >        checkCompletedNormally(f, v1);
1426 >    }}
1427  
1428      /**
1429 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1592 <     * completion of source
1593 <     */
1594 <    public void testThenAcceptBothAsync2() {
1595 <        CompletableFuture<Integer> f, g;
1596 <        CompletableFuture<Void> h;
1597 <        SubtractAction r;
1598 <
1599 <        f = new CompletableFuture<>();
1600 <        g = new CompletableFuture<>();
1601 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1602 <        f.completeExceptionally(new CFException());
1603 <        checkIncomplete(h);
1604 <        g.complete(1);
1605 <        checkCompletedWithWrappedCFException(h);
1606 <
1607 <        f = new CompletableFuture<>();
1608 <        g = new CompletableFuture<>();
1609 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1610 <        g.completeExceptionally(new CFException());
1611 <        checkIncomplete(h);
1612 <        f.complete(3);
1613 <        checkCompletedWithWrappedCFException(h);
1614 <
1615 <        f = new CompletableFuture<>();
1616 <        g = new CompletableFuture<>();
1617 <        f.complete(3);
1618 <        g.completeExceptionally(new CFException());
1619 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1620 <        checkCompletedWithWrappedCFException(h);
1621 <
1622 <        f = new CompletableFuture<>();
1623 <        g = new CompletableFuture<>();
1624 <        f.completeExceptionally(new CFException());
1625 <        g.complete(3);
1626 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1627 <        checkCompletedWithWrappedCFException(h);
1628 <    }
1629 <
1630 <    /**
1631 <     * thenAcceptBothAsync result completes exceptionally if action does
1632 <     */
1633 <    public void testThenAcceptBothAsync3() {
1634 <        CompletableFuture<Integer> f, g;
1635 <        CompletableFuture<Void> h;
1636 <        FailingBiConsumer r;
1637 <
1638 <        f = new CompletableFuture<>();
1639 <        g = new CompletableFuture<>();
1640 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1641 <        f.complete(3);
1642 <        checkIncomplete(h);
1643 <        g.complete(1);
1644 <        checkCompletedWithWrappedCFException(h);
1645 <
1646 <        f = new CompletableFuture<>();
1647 <        g = new CompletableFuture<>();
1648 <        f.complete(3);
1649 <        g.complete(1);
1650 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer());
1651 <        checkCompletedWithWrappedCFException(h);
1652 <    }
1653 <
1654 <    /**
1655 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1429 >     * thenAccept result completes normally after normal completion of source
1430       */
1431 <    public void testThenAcceptBothAsync4() {
1432 <        CompletableFuture<Integer> f, g;
1433 <        CompletableFuture<Void> h;
1434 <        SubtractAction r;
1435 <
1436 <        f = new CompletableFuture<>();
1437 <        g = new CompletableFuture<>();
1438 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1439 <        assertTrue(f.cancel(true));
1440 <        checkIncomplete(h);
1441 <        g.complete(1);
1442 <        checkCompletedWithWrappedCancellationException(h);
1443 <
1670 <        f = new CompletableFuture<>();
1671 <        g = new CompletableFuture<>();
1672 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1673 <        assertTrue(g.cancel(true));
1674 <        checkIncomplete(h);
1675 <        f.complete(3);
1676 <        checkCompletedWithWrappedCancellationException(h);
1677 <
1678 <        f = new CompletableFuture<>();
1679 <        g = new CompletableFuture<>();
1680 <        f.complete(3);
1681 <        assertTrue(g.cancel(true));
1682 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1683 <        checkCompletedWithWrappedCancellationException(h);
1684 <
1685 <        f = new CompletableFuture<>();
1686 <        g = new CompletableFuture<>();
1687 <        assertTrue(f.cancel(true));
1688 <        g.complete(3);
1689 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction());
1690 <        checkCompletedWithWrappedCancellationException(h);
1691 <    }
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  
1693    /**
1694     * runAfterBothAsync result completes normally after normal
1695     * completion of sources
1696     */
1697    public void testRunAfterBothAsync() {
1698        CompletableFuture<Integer> f = new CompletableFuture<>();
1699        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1700        Noop r = new Noop();
1701        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1702        f.complete(one);
1703        checkIncomplete(g);
1704        f2.complete(two);
1445          checkCompletedNormally(g, null);
1446 <        assertTrue(r.ran);
1447 <    }
1446 >        r.assertValue(v1);
1447 >        checkCompletedNormally(f, v1);
1448 >    }}
1449  
1450      /**
1451 <     * runAfterBothAsync result completes exceptionally after exceptional
1451 >     * thenAccept result completes exceptionally after exceptional
1452       * completion of source
1453       */
1454 <    public void testRunAfterBothAsync2() {
1455 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1456 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1457 <        Noop r = new Noop();
1458 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1459 <        f.completeExceptionally(new CFException());
1460 <        f2.complete(two);
1461 <        checkCompletedWithWrappedCFException(g);
1462 <
1463 <        r = new Noop();
1464 <        f = new CompletableFuture<>();
1465 <        f2 = new CompletableFuture<>();
1466 <        g = f.runAfterBothAsync(f2, r);
1726 <        f.complete(one);
1727 <        f2.completeExceptionally(new CFException());
1728 <        checkCompletedWithWrappedCFException(g);
1729 <    }
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 <     * runAfterBothAsync result completes exceptionally if action does
1470 <     */
1471 <    public void testRunAfterBothAsync3() {
1735 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1736 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1737 <        FailingNoop r = new FailingNoop();
1738 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1739 <        f.complete(one);
1740 <        checkIncomplete(g);
1741 <        f2.complete(two);
1742 <        checkCompletedWithWrappedCFException(g);
1743 <    }
1468 >        checkCompletedWithWrappedException(g, ex);
1469 >        checkCompletedExceptionally(f, ex);
1470 >        r.assertNotInvoked();
1471 >    }}
1472  
1473      /**
1474 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1474 >     * thenAccept result completes exceptionally if source cancelled
1475       */
1476 <    public void testRunAfterBothAsync4() {
1477 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1478 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1479 <        Noop r = new Noop();
1480 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1481 <        assertTrue(f.cancel(true));
1482 <        f2.complete(two);
1483 <        checkCompletedWithWrappedCancellationException(g);
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  
1757        r = new Noop();
1758        f = new CompletableFuture<>();
1759        f2 = new CompletableFuture<>();
1760        g = f.runAfterBothAsync(f2, r);
1761        f.complete(one);
1762        assertTrue(f2.cancel(true));
1490          checkCompletedWithWrappedCancellationException(g);
1491 <    }
1492 <
1493 <    /**
1767 <     * applyToEitherAsync result completes normally after normal
1768 <     * completion of sources
1769 <     */
1770 <    public void testApplyToEitherAsync() {
1771 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1772 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1773 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1774 <        f.complete(one);
1775 <        checkCompletedNormally(g, two);
1776 <
1777 <        f = new CompletableFuture<>();
1778 <        f.complete(one);
1779 <        f2 = new CompletableFuture<>();
1780 <        g = f.applyToEitherAsync(f2, inc);
1781 <        checkCompletedNormally(g, two);
1782 <    }
1491 >        checkCancelled(f);
1492 >        r.assertNotInvoked();
1493 >    }}
1494  
1495      /**
1496 <     * applyToEitherAsync result completes exceptionally after exceptional
1786 <     * completion of source
1496 >     * thenAccept result completes exceptionally if action does
1497       */
1498 <    public void testApplyToEitherAsync2() {
1499 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1500 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1501 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1502 <        f.completeExceptionally(new CFException());
1503 <        checkCompletedWithWrappedCFException(g);
1504 <
1505 <        f = new CompletableFuture<>();
1506 <        f2 = new CompletableFuture<>();
1507 <        f2.completeExceptionally(new CFException());
1508 <        g = f.applyToEitherAsync(f2, inc);
1509 <        f.complete(one);
1510 <        checkCompletedWithWrappedCFException(g);
1801 <    }
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  
1803    /**
1804     * applyToEitherAsync result completes exceptionally if action does
1805     */
1806    public void testApplyToEitherAsync3() {
1807        CompletableFuture<Integer> f = new CompletableFuture<>();
1808        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1809        FailingFunction r = new FailingFunction();
1810        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1811        f.complete(one);
1512          checkCompletedWithWrappedCFException(g);
1513 <    }
1513 >        checkCompletedNormally(f, v1);
1514 >    }}
1515  
1516      /**
1517 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1517 >     * thenCombine result completes normally after normal completion
1518 >     * of sources
1519       */
1520 <    public void testApplyToEitherAsync4() {
1521 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1522 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1523 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1524 <        assertTrue(f.cancel(true));
1525 <        checkCompletedWithWrappedCancellationException(g);
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 <        f2 = new CompletableFuture<>();
1543 <        assertTrue(f2.cancel(true));
1544 <        g = f.applyToEitherAsync(f2, inc);
1545 <        checkCompletedWithWrappedCancellationException(g);
1830 <    }
1541 >        checkCompletedNormally(h, subtract(v1, v2));
1542 >        checkCompletedNormally(f, v1);
1543 >        checkCompletedNormally(g, v2);
1544 >        r.assertValue(subtract(v1, v2));
1545 >    }}
1546  
1547      /**
1548 <     * acceptEitherAsync result completes normally after normal
1549 <     * completion of sources
1548 >     * thenCombine result completes exceptionally after exceptional
1549 >     * completion of either source
1550       */
1551 <    public void testAcceptEitherAsync() {
1552 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1553 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1554 <        IncAction r = new IncAction();
1555 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1556 <        f.complete(one);
1557 <        checkCompletedNormally(g, null);
1558 <        assertEquals(r.value, 2);
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 <        r = new IncAction();
1572 <        f = new CompletableFuture<>();
1573 <        f.complete(one);
1574 <        f2 = new CompletableFuture<>();
1575 <        g = f.acceptEitherAsync(f2, r);
1850 <        checkCompletedNormally(g, null);
1851 <        assertEquals(r.value, 2);
1852 <    }
1571 >        checkCompletedWithWrappedException(h, ex);
1572 >        r.assertNotInvoked();
1573 >        checkCompletedNormally(fFirst ? f : g, v1);
1574 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1575 >    }}
1576  
1577      /**
1578 <     * acceptEitherAsync result completes exceptionally after exceptional
1856 <     * completion of source
1578 >     * thenCombine result completes exceptionally if either source cancelled
1579       */
1580 <    public void testAcceptEitherAsync2() {
1581 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1582 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1583 <        IncAction r = new IncAction();
1584 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1585 <        f.completeExceptionally(new CFException());
1586 <        checkCompletedWithWrappedCFException(g);
1587 <
1588 <        r = new IncAction();
1589 <        f = new CompletableFuture<>();
1590 <        f2 = new CompletableFuture<>();
1591 <        f2.completeExceptionally(new CFException());
1592 <        g = f.acceptEitherAsync(f2, r);
1593 <        f.complete(one);
1594 <        checkCompletedWithWrappedCFException(g);
1595 <    }
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  
1600 <    /**
1601 <     * acceptEitherAsync result completes exceptionally if action does
1602 <     */
1603 <    public void testAcceptEitherAsync3() {
1604 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1880 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1881 <        FailingConsumer r = new FailingConsumer();
1882 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1883 <        f.complete(one);
1884 <        checkCompletedWithWrappedCFException(g);
1885 <    }
1600 >        checkCompletedWithWrappedCancellationException(h);
1601 >        checkCancelled(!fFirst ? f : g);
1602 >        r.assertNotInvoked();
1603 >        checkCompletedNormally(fFirst ? f : g, v1);
1604 >    }}
1605  
1606      /**
1607 <     * acceptEitherAsync result completes exceptionally if either
1889 <     * source cancelled
1607 >     * thenCombine result completes exceptionally if action does
1608       */
1609 <    public void testAcceptEitherAsync4() {
1610 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1611 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1612 <        IncAction r = new IncAction();
1613 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1614 <        assertTrue(f.cancel(true));
1615 <        checkCompletedWithWrappedCancellationException(g);
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  
1628 <        r = new IncAction();
1629 <        f = new CompletableFuture<>();
1630 <        f2 = new CompletableFuture<>();
1631 <        assertTrue(f2.cancel(true));
1903 <        g = f.acceptEitherAsync(f2, r);
1904 <        checkCompletedWithWrappedCancellationException(g);
1905 <    }
1628 >        checkCompletedWithWrappedCFException(h);
1629 >        checkCompletedNormally(f, v1);
1630 >        checkCompletedNormally(g, v2);
1631 >    }}
1632  
1633      /**
1634 <     * runAfterEitherAsync result completes normally after normal
1634 >     * thenAcceptBoth result completes normally after normal
1635       * completion of sources
1636       */
1637 <    public void testRunAfterEitherAsync() {
1638 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1639 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1640 <        Noop r = new Noop();
1641 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1642 <        f.complete(one);
1643 <        checkCompletedNormally(g, null);
1644 <        assertTrue(r.ran);
1645 <
1646 <        r = new Noop();
1647 <        f = new CompletableFuture<>();
1648 <        f.complete(one);
1649 <        f2 = new CompletableFuture<>();
1650 <        g = f.runAfterEitherAsync(f2, r);
1651 <        checkCompletedNormally(g, null);
1652 <        assertTrue(r.ran);
1653 <    }
1654 <
1655 <    /**
1930 <     * runAfterEitherAsync result completes exceptionally after exceptional
1931 <     * completion of source
1932 <     */
1933 <    public void testRunAfterEitherAsync2() {
1934 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1935 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1936 <        Noop r = new Noop();
1937 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1938 <        f.completeExceptionally(new CFException());
1939 <        checkCompletedWithWrappedCFException(g);
1940 <
1941 <        r = new Noop();
1942 <        f = new CompletableFuture<>();
1943 <        f2 = new CompletableFuture<>();
1944 <        f2.completeExceptionally(new CFException());
1945 <        g = f.runAfterEitherAsync(f2, r);
1946 <        f.complete(one);
1947 <        checkCompletedWithWrappedCFException(g);
1948 <    }
1949 <
1950 <    /**
1951 <     * runAfterEitherAsync result completes exceptionally if action does
1952 <     */
1953 <    public void testRunAfterEitherAsync3() {
1954 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1955 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1956 <        FailingNoop r = new FailingNoop();
1957 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1958 <        f.complete(one);
1959 <        checkCompletedWithWrappedCFException(g);
1960 <    }
1961 <
1962 <    /**
1963 <     * runAfterEitherAsync result completes exceptionally if either
1964 <     * source cancelled
1965 <     */
1966 <    public void testRunAfterEitherAsync4() {
1967 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1968 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1969 <        Noop r = new Noop();
1970 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1971 <        assertTrue(f.cancel(true));
1972 <        checkCompletedWithWrappedCancellationException(g);
1973 <
1974 <        r = new Noop();
1975 <        f = new CompletableFuture<>();
1976 <        f2 = new CompletableFuture<>();
1977 <        assertTrue(f2.cancel(true));
1978 <        g = f.runAfterEitherAsync(f2, r);
1979 <        checkCompletedWithWrappedCancellationException(g);
1980 <    }
1981 <
1982 <    /**
1983 <     * thenComposeAsync result completes normally after normal
1984 <     * completion of source
1985 <     */
1986 <    public void testThenComposeAsync() {
1987 <        CompletableFuture<Integer> f, g;
1988 <        CompletableFutureInc r;
1989 <
1990 <        f = new CompletableFuture<>();
1991 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1992 <        f.complete(one);
1993 <        checkCompletedNormally(g, two);
1994 <
1995 <        f = new CompletableFuture<>();
1996 <        f.complete(one);
1997 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
1998 <        checkCompletedNormally(g, two);
1999 <    }
2000 <
2001 <    /**
2002 <     * thenComposeAsync result completes exceptionally after
2003 <     * exceptional completion of source
2004 <     */
2005 <    public void testThenComposeAsync2() {
2006 <        CompletableFuture<Integer> f, g;
2007 <        CompletableFutureInc r;
2008 <
2009 <        f = new CompletableFuture<>();
2010 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2011 <        f.completeExceptionally(new CFException());
2012 <        checkCompletedWithWrappedCFException(g);
2013 <        assertFalse(r.ran);
2014 <
2015 <        f = new CompletableFuture<>();
2016 <        f.completeExceptionally(new CFException());
2017 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2018 <        checkCompletedWithWrappedCFException(g);
2019 <        assertFalse(r.ran);
2020 <    }
2021 <
2022 <    /**
2023 <     * thenComposeAsync result completes exceptionally if action does
2024 <     */
2025 <    public void testThenComposeAsync3() {
2026 <        CompletableFuture<Integer> f, g;
2027 <        FailingCompletableFutureFunction r;
2028 <
2029 <        f = new CompletableFuture<>();
2030 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2031 <        f.complete(one);
2032 <        checkCompletedWithWrappedCFException(g);
2033 <
2034 <        f = new CompletableFuture<>();
2035 <        f.complete(one);
2036 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2037 <        checkCompletedWithWrappedCFException(g);
2038 <    }
2039 <
2040 <    /**
2041 <     * thenComposeAsync result completes exceptionally if source cancelled
2042 <     */
2043 <    public void testThenComposeAsync4() {
2044 <        CompletableFuture<Integer> f, g;
2045 <        CompletableFutureInc r;
2046 <
2047 <        f = new CompletableFuture<>();
2048 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2049 <        assertTrue(f.cancel(true));
2050 <        checkCompletedWithWrappedCancellationException(g);
2051 <
2052 <        f = new CompletableFuture<>();
2053 <        assertTrue(f.cancel(true));
2054 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2055 <        checkCompletedWithWrappedCancellationException(g);
2056 <    }
2057 <
2058 <
2059 <    // async with explicit executors
2060 <
2061 <    /**
2062 <     * thenRunAsync result completes normally after normal completion of source
2063 <     */
2064 <    public void testThenRunAsyncE() {
2065 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2066 <        Noop r = new Noop();
2067 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2068 <        f.complete(null);
2069 <        checkCompletedNormally(g, null);
2070 <
2071 <        // reordered version
2072 <        f = new CompletableFuture<>();
2073 <        f.complete(null);
2074 <        r = new Noop();
2075 <        g = f.thenRunAsync(r, new ThreadExecutor());
2076 <        checkCompletedNormally(g, null);
2077 <    }
2078 <
2079 <    /**
2080 <     * thenRunAsync result completes exceptionally after exceptional
2081 <     * completion of source
2082 <     */
2083 <    public void testThenRunAsync2E() {
2084 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2085 <        Noop r = new Noop();
2086 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2087 <        f.completeExceptionally(new CFException());
2088 <        try {
2089 <            g.join();
2090 <            shouldThrow();
2091 <        } catch (Exception ok) {
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          }
2093        checkCompletedWithWrappedCFException(g);
2094    }
2095
2096    /**
2097     * thenRunAsync result completes exceptionally if action does
2098     */
2099    public void testThenRunAsync3E() {
2100        CompletableFuture<Integer> f = new CompletableFuture<>();
2101        FailingNoop r = new FailingNoop();
2102        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2103        f.complete(null);
2104        checkCompletedWithWrappedCFException(g);
2105    }
1657  
1658 <    /**
1659 <     * thenRunAsync result completes exceptionally if source cancelled
1660 <     */
1661 <    public void testThenRunAsync4E() {
1662 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2112 <        Noop r = new Noop();
2113 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2114 <        assertTrue(f.cancel(true));
2115 <        checkCompletedWithWrappedCancellationException(g);
2116 <    }
2117 <
2118 <    /**
2119 <     * thenApplyAsync result completes normally after normal completion of source
2120 <     */
2121 <    public void testThenApplyAsyncE() {
2122 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2123 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2124 <        f.complete(one);
2125 <        checkCompletedNormally(g, two);
2126 <    }
2127 <
2128 <    /**
2129 <     * thenApplyAsync result completes exceptionally after exceptional
2130 <     * completion of source
2131 <     */
2132 <    public void testThenApplyAsync2E() {
2133 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2134 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2135 <        f.completeExceptionally(new CFException());
2136 <        checkCompletedWithWrappedCFException(g);
2137 <    }
1658 >        checkCompletedNormally(h, null);
1659 >        r.assertValue(subtract(v1, v2));
1660 >        checkCompletedNormally(f, v1);
1661 >        checkCompletedNormally(g, v2);
1662 >    }}
1663  
1664      /**
1665 <     * thenApplyAsync result completes exceptionally if action does
1665 >     * thenAcceptBoth result completes exceptionally after exceptional
1666 >     * completion of either source
1667       */
1668 <    public void testThenApplyAsync3E() {
1669 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1670 <        FailingFunction r = new FailingFunction();
1671 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
1672 <        f.complete(null);
1673 <        checkCompletedWithWrappedCFException(g);
1674 <    }
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 <    /**
1689 <     * thenApplyAsync result completes exceptionally if source cancelled
1690 <     */
1691 <    public void testThenApplyAsync4E() {
1692 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2155 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2156 <        assertTrue(f.cancel(true));
2157 <        checkCompletedWithWrappedCancellationException(g);
2158 <    }
1688 >        checkCompletedWithWrappedException(h, ex);
1689 >        r.assertNotInvoked();
1690 >        checkCompletedNormally(fFirst ? f : g, v1);
1691 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1692 >    }}
1693  
1694      /**
1695 <     * thenAcceptAsync result completes normally after normal
2162 <     * completion of source
1695 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1696       */
1697 <    public void testThenAcceptAsyncE() {
1698 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1699 <        IncAction r = new IncAction();
1700 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1701 <        f.complete(one);
1702 <        checkCompletedNormally(g, null);
1703 <        assertEquals(r.value, 2);
1704 <    }
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 <     * thenAcceptAsync result completes exceptionally after exceptional
1719 <     * completion of source
1720 <     */
1721 <    public void testThenAcceptAsync2E() {
2178 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2179 <        IncAction r = new IncAction();
2180 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2181 <        f.completeExceptionally(new CFException());
2182 <        checkCompletedWithWrappedCFException(g);
2183 <    }
1717 >        checkCompletedWithWrappedCancellationException(h);
1718 >        checkCancelled(!fFirst ? f : g);
1719 >        r.assertNotInvoked();
1720 >        checkCompletedNormally(fFirst ? f : g, v1);
1721 >    }}
1722  
1723      /**
1724 <     * thenAcceptAsync result completes exceptionally if action does
1724 >     * thenAcceptBoth result completes exceptionally if action does
1725       */
1726 <    public void testThenAcceptAsync3E() {
1727 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1728 <        FailingConsumer r = new FailingConsumer();
1729 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1730 <        f.complete(null);
1731 <        checkCompletedWithWrappedCFException(g);
1732 <    }
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 <    /**
1746 <     * thenAcceptAsync result completes exceptionally if source cancelled
1747 <     */
1748 <    public void testThenAcceptAsync4E() {
2200 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2201 <        IncAction r = new IncAction();
2202 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2203 <        assertTrue(f.cancel(true));
2204 <        checkCompletedWithWrappedCancellationException(g);
2205 <    }
1745 >        checkCompletedWithWrappedCFException(h);
1746 >        checkCompletedNormally(f, v1);
1747 >        checkCompletedNormally(g, v2);
1748 >    }}
1749  
1750      /**
1751 <     * thenCombineAsync result completes normally after normal
1751 >     * runAfterBoth result completes normally after normal
1752       * completion of sources
1753       */
1754 <    public void testThenCombineAsyncE() {
1755 <        CompletableFuture<Integer> f, g, h;
1756 <        ThreadExecutor e = new ThreadExecutor();
1757 <        int count = 0;
1758 <
1759 <        f = new CompletableFuture<>();
1760 <        g = new CompletableFuture<>();
1761 <        h = f.thenCombineAsync(g, subtract, e);
1762 <        f.complete(3);
1763 <        checkIncomplete(h);
1764 <        g.complete(1);
1765 <        checkCompletedNormally(h, 2);
1766 <        assertEquals(++count, e.count.get());
1767 <
1768 <        f = new CompletableFuture<>();
1769 <        g = new CompletableFuture<>();
1770 <        h = f.thenCombineAsync(g, subtract, e);
1771 <        g.complete(1);
1772 <        checkIncomplete(h);
1773 <        f.complete(3);
2231 <        checkCompletedNormally(h, 2);
2232 <        assertEquals(++count, e.count.get());
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 <        g = new CompletableFuture<>();
1777 <        g.complete(1);
1778 <        f.complete(3);
1779 <        h = f.thenCombineAsync(g, subtract, e);
2239 <        checkCompletedNormally(h, 2);
2240 <        assertEquals(++count, e.count.get());
2241 <    }
1775 >        checkCompletedNormally(h, null);
1776 >        r.assertInvoked();
1777 >        checkCompletedNormally(f, v1);
1778 >        checkCompletedNormally(g, v2);
1779 >    }}
1780  
1781      /**
1782 <     * thenCombineAsync result completes exceptionally after exceptional
1782 >     * runAfterBoth result completes exceptionally after exceptional
1783       * completion of either source
1784       */
1785 <    public void testThenCombineAsync2E() {
1786 <        CompletableFuture<Integer> f, g, h;
1787 <        ThreadExecutor e = new ThreadExecutor();
1788 <        int count = 0;
1789 <
1790 <        f = new CompletableFuture<>();
1791 <        g = new CompletableFuture<>();
1792 <        h = f.thenCombineAsync(g, subtract, e);
1793 <        f.completeExceptionally(new CFException());
1794 <        checkIncomplete(h);
1795 <        g.complete(1);
1796 <        checkCompletedWithWrappedCFException(h);
1797 <
1798 <        f = new CompletableFuture<>();
1799 <        g = new CompletableFuture<>();
1800 <        h = f.thenCombineAsync(g, subtract, e);
1801 <        g.completeExceptionally(new CFException());
1802 <        checkIncomplete(h);
1803 <        f.complete(3);
2266 <        checkCompletedWithWrappedCFException(h);
2267 <
2268 <        f = new CompletableFuture<>();
2269 <        g = new CompletableFuture<>();
2270 <        g.completeExceptionally(new CFException());
2271 <        h = f.thenCombineAsync(g, subtract, e);
2272 <        checkIncomplete(h);
2273 <        f.complete(3);
2274 <        checkCompletedWithWrappedCFException(h);
2275 <
2276 <        assertEquals(0, e.count.get());
2277 <    }
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 <    /**
1806 <     * thenCombineAsync result completes exceptionally if action does
1807 <     */
1808 <    public void testThenCombineAsync3E() {
1809 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2284 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2285 <        FailingBiFunction r = new FailingBiFunction();
2286 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
2287 <        f.complete(one);
2288 <        checkIncomplete(g);
2289 <        assertFalse(r.ran);
2290 <        f2.complete(two);
2291 <        checkCompletedWithWrappedCFException(g);
2292 <        assertTrue(r.ran);
2293 <    }
1805 >        checkCompletedWithWrappedException(h, ex);
1806 >        r.assertNotInvoked();
1807 >        checkCompletedNormally(fFirst ? f : g, v1);
1808 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1809 >    }}
1810  
1811      /**
1812 <     * thenCombineAsync result completes exceptionally if either source cancelled
1812 >     * runAfterBoth result completes exceptionally if either source cancelled
1813       */
1814 <    public void testThenCombineAsync4E() {
1815 <        CompletableFuture<Integer> f, g, h;
1816 <        ThreadExecutor e = new ThreadExecutor();
1817 <
1818 <        f = new CompletableFuture<>();
1819 <        g = new CompletableFuture<>();
1820 <        h = f.thenCombineAsync(g, subtract, e);
1821 <        assertTrue(f.cancel(true));
1822 <        checkIncomplete(h);
1823 <        g.complete(1);
1824 <        checkCompletedWithWrappedCancellationException(h);
1825 <
1826 <        f = new CompletableFuture<>();
1827 <        g = new CompletableFuture<>();
1828 <        h = f.thenCombineAsync(g, subtract, e);
1829 <        assertTrue(g.cancel(true));
1830 <        checkIncomplete(h);
1831 <        f.complete(3);
1832 <        checkCompletedWithWrappedCancellationException(h);
2317 <
2318 <        f = new CompletableFuture<>();
2319 <        g = new CompletableFuture<>();
2320 <        assertTrue(g.cancel(true));
2321 <        h = f.thenCombineAsync(g, subtract, e);
2322 <        checkIncomplete(h);
2323 <        f.complete(3);
2324 <        checkCompletedWithWrappedCancellationException(h);
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  
2326        f = new CompletableFuture<>();
2327        g = new CompletableFuture<>();
2328        assertTrue(f.cancel(true));
2329        assertTrue(g.cancel(true));
2330        h = f.thenCombineAsync(g, subtract, e);
1834          checkCompletedWithWrappedCancellationException(h);
1835 <
1836 <        assertEquals(0, e.count.get());
1837 <    }
1835 >        checkCancelled(!fFirst ? f : g);
1836 >        r.assertNotInvoked();
1837 >        checkCompletedNormally(fFirst ? f : g, v1);
1838 >    }}
1839  
1840      /**
1841 <     * thenAcceptBothAsync result completes normally after normal
2338 <     * completion of sources
1841 >     * runAfterBoth result completes exceptionally if action does
1842       */
1843 <    public void testThenAcceptBothAsyncE() {
1844 <        CompletableFuture<Integer> f, g;
1845 <        CompletableFuture<Void> h;
1846 <        SubtractAction r;
1847 <        ThreadExecutor e = new ThreadExecutor();
1848 <
1849 <        f = new CompletableFuture<>();
1850 <        g = new CompletableFuture<>();
1851 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
1852 <        f.complete(3);
1853 <        checkIncomplete(h);
1854 <        g.complete(1);
1855 <        checkCompletedNormally(h, null);
1856 <        assertEquals(r.value, 2);
1857 <
1858 <        f = new CompletableFuture<>();
1859 <        g = new CompletableFuture<>();
1860 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
1861 <        g.complete(1);
1862 <        checkIncomplete(h);
2360 <        f.complete(3);
2361 <        checkCompletedNormally(h, null);
2362 <        assertEquals(r.value, 2);
2363 <
2364 <        f = new CompletableFuture<>();
2365 <        g = new CompletableFuture<>();
2366 <        g.complete(1);
2367 <        f.complete(3);
2368 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2369 <        checkCompletedNormally(h, null);
2370 <        assertEquals(r.value, 2);
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 <        assertEquals(3, e.count.get());
1865 <    }
1864 >        checkCompletedWithWrappedCFException(h1);
1865 >        checkCompletedWithWrappedCFException(h2);
1866 >        checkCompletedNormally(f, v1);
1867 >        checkCompletedNormally(g, v2);
1868 >    }}
1869  
1870      /**
1871 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1872 <     * completion of source
1871 >     * applyToEither result completes normally after normal completion
1872 >     * of either source
1873       */
1874 <    public void testThenAcceptBothAsync2E() {
1875 <        CompletableFuture<Integer> f, g;
1876 <        CompletableFuture<Void> h;
1877 <        SubtractAction r;
1878 <        ThreadExecutor e = new ThreadExecutor();
1879 <
1880 <        f = new CompletableFuture<>();
1881 <        g = new CompletableFuture<>();
1882 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
1883 <        f.completeExceptionally(new CFException());
1884 <        checkIncomplete(h);
1885 <        g.complete(1);
1886 <        checkCompletedWithWrappedCFException(h);
1887 <
1888 <        f = new CompletableFuture<>();
1889 <        g = new CompletableFuture<>();
1890 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
1891 <        g.completeExceptionally(new CFException());
1892 <        checkIncomplete(h);
1893 <        f.complete(3);
1894 <        checkCompletedWithWrappedCFException(h);
1895 <
1896 <        f = new CompletableFuture<>();
1897 <        g = new CompletableFuture<>();
1898 <        f.complete(3);
1899 <        g.completeExceptionally(new CFException());
1900 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
1901 <        checkCompletedWithWrappedCFException(h);
1902 <
1903 <        f = new CompletableFuture<>();
1904 <        g = new CompletableFuture<>();
1905 <        f.completeExceptionally(new CFException());
1906 <        g.complete(3);
1907 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
1908 <        checkCompletedWithWrappedCFException(h);
1909 <
1910 <        assertEquals(0, e.count.get());
1911 <    }
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 <     * thenAcceptBothAsync result completes exceptionally if action does
1920 <     */
2421 <    public void testThenAcceptBothAsync3E() {
2422 <        CompletableFuture<Integer> f, g;
2423 <        CompletableFuture<Void> h;
2424 <        FailingBiConsumer r;
2425 <        ThreadExecutor e = new ThreadExecutor();
2426 <
2427 <        f = new CompletableFuture<>();
2428 <        g = new CompletableFuture<>();
2429 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2430 <        f.complete(3);
2431 <        checkIncomplete(h);
2432 <        g.complete(1);
2433 <        checkCompletedWithWrappedCFException(h);
2434 <
2435 <        f = new CompletableFuture<>();
2436 <        g = new CompletableFuture<>();
2437 <        f.complete(3);
2438 <        g.complete(1);
2439 <        h = f.thenAcceptBothAsync(g, r = new FailingBiConsumer(), e);
2440 <        checkCompletedWithWrappedCFException(h);
2441 <
2442 <        assertEquals(2, e.count.get());
2443 <    }
2444 <
2445 <    /**
2446 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1919 >     * applyToEither result completes exceptionally after exceptional
1920 >     * completion of either source
1921       */
1922 <    public void testThenAcceptBothAsync4E() {
1923 <        CompletableFuture<Integer> f, g;
1924 <        CompletableFuture<Void> h;
1925 <        SubtractAction r;
1926 <        ThreadExecutor e = new ThreadExecutor();
1927 <
1928 <        f = new CompletableFuture<>();
1929 <        g = new CompletableFuture<>();
1930 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
1931 <        assertTrue(f.cancel(true));
1932 <        checkIncomplete(h);
1933 <        g.complete(1);
1934 <        checkCompletedWithWrappedCancellationException(h);
1935 <
1936 <        f = new CompletableFuture<>();
1937 <        g = new CompletableFuture<>();
1938 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
1939 <        assertTrue(g.cancel(true));
1940 <        checkIncomplete(h);
1941 <        f.complete(3);
1942 <        checkCompletedWithWrappedCancellationException(h);
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 >            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 >        }
1964  
1965 <        f = new CompletableFuture<>();
1966 <        g = new CompletableFuture<>();
1967 <        f.complete(3);
1968 <        assertTrue(g.cancel(true));
1969 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
1970 <        checkCompletedWithWrappedCancellationException(h);
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 <        f = new CompletableFuture<>();
1999 <        g = new CompletableFuture<>();
2000 <        assertTrue(f.cancel(true));
2001 <        g.complete(3);
2002 <        h = f.thenAcceptBothAsync(g, r = new SubtractAction(), e);
2003 <        checkCompletedWithWrappedCancellationException(h);
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 <        assertEquals(0, e.count.get());
2029 <    }
2028 >        checkCompletedNormally(f, v1);
2029 >        checkCompletedExceptionally(g, ex);
2030 >    }}
2031  
2032      /**
2033 <     * runAfterBothAsync result completes normally after normal
2489 <     * completion of sources
2033 >     * applyToEither result completes exceptionally if either source cancelled
2034       */
2035 <    public void testRunAfterBothAsyncE() {
2036 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2037 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2038 <        Noop r = new Noop();
2039 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2040 <        f.complete(one);
2041 <        checkIncomplete(g);
2042 <        f2.complete(two);
2043 <        checkCompletedNormally(g, null);
2044 <        assertTrue(r.ran);
2045 <    }
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 <     * runAfterBothAsync result completes exceptionally after exceptional
2080 <     * completion of source
2081 <     */
2082 <    public void testRunAfterBothAsync2E() {
2083 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2084 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2085 <        Noop r = new Noop();
2086 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2087 <        f.completeExceptionally(new CFException());
2088 <        f2.complete(two);
2089 <        checkCompletedWithWrappedCFException(g);
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 <        r = new Noop();
2111 <        f = new CompletableFuture<>();
2112 <        f2 = new CompletableFuture<>();
2113 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2114 <        f.complete(one);
2115 <        f2.completeExceptionally(new CFException());
2116 <        checkCompletedWithWrappedCFException(g);
2117 <    }
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 <     * runAfterBothAsync result completes exceptionally if action does
2142 <     */
2528 <    public void testRunAfterBothAsync3E() {
2529 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2530 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2531 <        FailingNoop r = new FailingNoop();
2532 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2533 <        f.complete(one);
2534 <        checkIncomplete(g);
2535 <        f2.complete(two);
2536 <        checkCompletedWithWrappedCFException(g);
2537 <    }
2140 >        checkCompletedNormally(f, v1);
2141 >        checkCancelled(g);
2142 >    }}
2143  
2144      /**
2145 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2145 >     * applyToEither result completes exceptionally if action does
2146       */
2147 <    public void testRunAfterBothAsync4E() {
2148 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2149 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2150 <        Noop r = new Noop();
2151 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2152 <        assertTrue(f.cancel(true));
2153 <        f2.complete(two);
2154 <        checkCompletedWithWrappedCancellationException(g);
2155 <
2156 <        r = new Noop();
2157 <        f = new CompletableFuture<>();
2158 <        f2 = new CompletableFuture<>();
2159 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2160 <        f.complete(one);
2161 <        assertTrue(f2.cancel(true));
2162 <        checkCompletedWithWrappedCancellationException(g);
2163 <    }
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 <     * applyToEitherAsync 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 testApplyToEitherAsyncE() {
2190 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2191 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2192 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2193 <        f.complete(one);
2194 <        checkCompletedNormally(g, two);
2195 <
2196 <        f = new CompletableFuture<>();
2197 <        f.complete(one);
2198 <        f2 = new CompletableFuture<>();
2199 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2200 <        checkCompletedNormally(g, two);
2201 <    }
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 <     * applyToEitherAsync result completes exceptionally after exceptional
2239 <     * completion of source
2238 >     * acceptEither result completes exceptionally after exceptional
2239 >     * completion of either source
2240       */
2241 <    public void testApplyToEitherAsync2E() {
2242 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2243 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2244 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2245 <        f.completeExceptionally(new CFException());
2246 <        checkCompletedWithWrappedCFException(g);
2247 <
2248 <        f = new CompletableFuture<>();
2249 <        f2 = new CompletableFuture<>();
2250 <        f2.completeExceptionally(new CFException());
2251 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2252 <        f.complete(one);
2253 <        checkCompletedWithWrappedCFException(g);
2254 <    }
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 <     * applyToEitherAsync result completes exceptionally if action does
2287 <     */
2288 <    public void testApplyToEitherAsync3E() {
2289 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2290 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2291 <        FailingFunction r = new FailingFunction();
2292 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2293 <        f.complete(one);
2294 <        checkCompletedWithWrappedCFException(g);
2295 <    }
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 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2320 <     */
2321 <    public void testApplyToEitherAsync4E() {
2322 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2323 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2324 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2325 <        assertTrue(f.cancel(true));
2326 <        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 <        f = new CompletableFuture<>();
2349 <        f2 = new CompletableFuture<>();
2350 <        assertTrue(f2.cancel(true));
2622 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2623 <        checkCompletedWithWrappedCancellationException(g);
2624 <    }
2348 >        checkCompletedNormally(f, v1);
2349 >        checkCompletedExceptionally(g, ex);
2350 >    }}
2351  
2352      /**
2353 <     * acceptEitherAsync result completes normally after normal
2628 <     * completion of sources
2353 >     * acceptEither result completes exceptionally if either source cancelled
2354       */
2355 <    public void testAcceptEitherAsyncE() {
2356 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2357 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2358 <        IncAction r = new IncAction();
2359 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2360 <        f.complete(one);
2361 <        checkCompletedNormally(g, null);
2362 <        assertEquals(r.value, 2);
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 <        r = new IncAction();
2400 <        f = new CompletableFuture<>();
2401 <        f.complete(one);
2402 <        f2 = new CompletableFuture<>();
2403 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2404 <        checkCompletedNormally(g, null);
2405 <        assertEquals(r.value, 2);
2406 <    }
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 <     * acceptEitherAsync result completes exceptionally after exceptional
2650 <     * completion of source
2409 >     * acceptEither result completes exceptionally if action does
2410       */
2411 <    public void testAcceptEitherAsync2E() {
2412 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2413 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2414 <        IncAction r = new IncAction();
2415 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2416 <        f.completeExceptionally(new CFException());
2417 <        checkCompletedWithWrappedCFException(g);
2418 <
2419 <        r = new IncAction();
2420 <        f = new CompletableFuture<>();
2421 <        f2 = new CompletableFuture<>();
2422 <        f2.completeExceptionally(new CFException());
2423 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2424 <        f.complete(one);
2425 <        checkCompletedWithWrappedCFException(g);
2426 <    }
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 <     * acceptEitherAsync result completes exceptionally if action does
2450 >     * runAfterEither result completes normally after normal completion
2451 >     * of either source
2452       */
2453 <    public void testAcceptEitherAsync3E() {
2454 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2455 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2456 <        FailingConsumer r = new FailingConsumer();
2457 <        CompletableFuture<Void> g = f.acceptEitherAsync(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 <     * acceptEitherAsync result completes exceptionally if either
2499 <     * source cancelled
2498 >     * runAfterEither result completes exceptionally after exceptional
2499 >     * completion of either source
2500       */
2501 <    public void testAcceptEitherAsync4E() {
2502 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2503 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2504 <        IncAction r = new IncAction();
2505 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2506 <        assertTrue(f.cancel(true));
2507 <        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 <        r = new IncAction();
2546 <        f = new CompletableFuture<>();
2547 <        f2 = new CompletableFuture<>();
2548 <        assertTrue(f2.cancel(true));
2549 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2550 <        checkCompletedWithWrappedCancellationException(g);
2551 <    }
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 <     * runAfterEitherAsync result completes normally after normal
2580 <     * completion of sources
2581 <     */
2582 <    public void testRunAfterEitherAsyncE() {
2583 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2584 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2585 <        Noop r = new Noop();
2586 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2587 <        f.complete(one);
2588 <        checkCompletedNormally(g, null);
2589 <        assertTrue(r.ran);
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 Noop();
2609 <        f = new CompletableFuture<>();
2610 <        f.complete(one);
2717 <        f2 = new CompletableFuture<>();
2718 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2719 <        checkCompletedNormally(g, null);
2720 <        assertTrue(r.ran);
2721 <    }
2608 >        checkCompletedNormally(f, v1);
2609 >        checkCompletedExceptionally(g, ex);
2610 >    }}
2611  
2612      /**
2613 <     * runAfterEitherAsync result completes exceptionally after exceptional
2725 <     * completion of source
2613 >     * runAfterEither result completes exceptionally if either source cancelled
2614       */
2615 <    public void testRunAfterEitherAsync2E() {
2616 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2617 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2618 <        Noop r = new Noop();
2619 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2620 <        f.completeExceptionally(new CFException());
2621 <        checkCompletedWithWrappedCFException(g);
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 <        r = new Noop();
2660 <        f = new CompletableFuture<>();
2661 <        f2 = new CompletableFuture<>();
2662 <        f2.completeExceptionally(new CFException());
2663 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2664 <        f.complete(one);
2665 <        checkCompletedWithWrappedCFException(g);
2666 <    }
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 <     * runAfterEitherAsync result completes exceptionally if action does
2669 >     * runAfterEither result completes exceptionally if action does
2670       */
2671 <    public void testRunAfterEitherAsync3E() {
2672 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2673 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2674 <        FailingNoop r = new FailingNoop();
2675 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2676 <        f.complete(one);
2677 <        checkCompletedWithWrappedCFException(g);
2678 <    }
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 exceptionally if either
2758 <     * source cancelled
2703 >     * thenCompose result completes normally after normal completion of source
2704       */
2705 <    public void testRunAfterEitherAsync4E() {
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 <        assertTrue(f.cancel(true));
2711 <        checkCompletedWithWrappedCancellationException(g);
2712 <
2713 <        r = new Noop();
2714 <        f = new CompletableFuture<>();
2715 <        f2 = new CompletableFuture<>();
2716 <        assertTrue(f2.cancel(true));
2717 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2718 <        checkCompletedWithWrappedCancellationException(g);
2719 <    }
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 <     * thenComposeAsync result completes normally after normal
2722 >     * thenCompose result completes exceptionally after exceptional
2723       * completion of source
2724       */
2725 <    public void testThenComposeAsyncE() {
2726 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2727 <        CompletableFutureInc r = new CompletableFutureInc();
2728 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2729 <        f.complete(one);
2730 <        checkCompletedNormally(g, two);
2731 <    }
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 <     * thenComposeAsync result completes exceptionally after
2790 <     * exceptional completion of source
2742 >     * thenCompose result completes exceptionally if action does
2743       */
2744 <    public void testThenComposeAsync2E() {
2745 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2746 <        CompletableFutureInc r = new CompletableFutureInc();
2747 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2748 <        f.completeExceptionally(new CFException());
2749 <        checkCompletedWithWrappedCFException(g);
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  
2800    /**
2801     * thenComposeAsync result completes exceptionally if action does
2802     */
2803    public void testThenComposeAsync3E() {
2804        CompletableFuture<Integer> f = new CompletableFuture<>();
2805        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2806        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2807        f.complete(one);
2756          checkCompletedWithWrappedCFException(g);
2757 <    }
2757 >        checkCompletedNormally(f, v1);
2758 >    }}
2759  
2760      /**
2761 <     * thenComposeAsync result completes exceptionally if source cancelled
2761 >     * thenCompose result completes exceptionally if source cancelled
2762       */
2763 <    public void testThenComposeAsync4E() {
2764 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2765 <        CompletableFutureInc r = new CompletableFutureInc();
2766 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2767 <        assertTrue(f.cancel(true));
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 >
2777          checkCompletedWithWrappedCancellationException(g);
2778 <    }
2778 >        checkCancelled(f);
2779 >    }}
2780  
2781      // other static methods
2782  
# Line 2826 | Line 2785 | public class CompletableFutureTest exten
2785       * with the value null
2786       */
2787      public void testAllOf_empty() throws Exception {
2788 <        CompletableFuture<?> f = CompletableFuture.allOf();
2788 >        CompletableFuture<Void> f = CompletableFuture.allOf();
2789          checkCompletedNormally(f, null);
2790      }
2791  
2792      /**
2793 <     * allOf returns a future completed when all components complete
2793 >     * allOf returns a future completed normally with the value null
2794 >     * when all components complete normally
2795       */
2796 <    public void testAllOf() throws Exception {
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);
2803              for (int i = 0; i < k; ++i) {
2804                  checkIncomplete(f);
2805 +                checkIncomplete(CompletableFuture.allOf(fs));
2806 +                fs[i].complete(one);
2807 +            }
2808 +            checkCompletedNormally(f, null);
2809 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
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  
# Line 2851 | Line 2831 | public class CompletableFutureTest exten
2831       * anyOf(no component futures) returns an incomplete future
2832       */
2833      public void testAnyOf_empty() throws Exception {
2834 <        CompletableFuture<?> f = CompletableFuture.anyOf();
2834 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
2835          checkIncomplete(f);
2836      }
2837  
2838      /**
2839 <     * anyOf returns a future completed when any components complete
2839 >     * anyOf returns a future completed normally with a value when
2840 >     * a component future does
2841       */
2842 <    public void testAnyOf() throws Exception {
2843 <        for (int k = 1; k < 20; ++k) {
2842 >    public void testAnyOf_normal() throws Exception {
2843 >        for (int k = 0; k < 10; ++k) {
2844              CompletableFuture[] fs = new CompletableFuture[k];
2845              for (int i = 0; i < k; ++i)
2846                  fs[i] = new CompletableFuture<>();
# Line 2868 | Line 2849 | public class CompletableFutureTest exten
2849              for (int i = 0; i < k; ++i) {
2850                  fs[i].complete(one);
2851                  checkCompletedNormally(f, one);
2852 +                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2853 +            }
2854 +        }
2855 +    }
2856 +
2857 +    /**
2858 +     * anyOf result completes exceptionally when any component does.
2859 +     */
2860 +    public void testAnyOf_exceptional() throws Exception {
2861 +        for (int k = 0; k < 10; ++k) {
2862 +            CompletableFuture[] fs = new CompletableFuture[k];
2863 +            for (int i = 0; i < k; ++i)
2864 +                fs[i] = new CompletableFuture<>();
2865 +            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2866 +            checkIncomplete(f);
2867 +            for (int i = 0; i < k; ++i) {
2868 +                fs[i].completeExceptionally(new CFException());
2869 +                checkCompletedWithWrappedCFException(f);
2870 +                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
2871              }
2872          }
2873      }
# Line 2883 | 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);
2982          assertEquals(0, exec.count.get());
2983      }
2984  
2985 +    /**
2986 +     * toCompletableFuture returns this CompletableFuture.
2987 +     */
2988 +    public void testToCompletableFuture() {
2989 +        CompletableFuture<Integer> f = new CompletableFuture<>();
2990 +        assertSame(f, f.toCompletableFuture());
2991 +    }
2992 +
2993   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines