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.27 by jsr166, Mon Jul 8 21:12:28 2013 UTC vs.
Revision 1.78 by jsr166, Sat Jun 7 23:32:17 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines