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.34 by jsr166, Sun Jun 1 21:17:05 2014 UTC vs.
Revision 1.95 by jsr166, Wed Jun 25 15:32:10 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines