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.33 by jsr166, Sun Jun 1 20:40:13 2014 UTC vs.
Revision 1.100 by jsr166, Thu Jan 15 18:34:19 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines