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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines