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.35 by jsr166, Sun Jun 1 22:22:49 2014 UTC vs.
Revision 1.90 by jsr166, Tue Jun 17 18:09:28 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines