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.37 by jsr166, Sun Jun 1 23:20:19 2014 UTC vs.
Revision 1.79 by jsr166, Mon Jun 16 17:08:15 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 >    abstract class CheckedIntegerAction extends CheckedAction {
389 >        Integer value;
390 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
391 >        void assertValue(Integer expected) {
392 >            assertInvoked();
393 >            assertEquals(expected, value);
394 >        }
395 >    }
396 >
397 >    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 <    // A non-commutative function that handles null values as well,
427 <    // and produces null values occasionally.
428 <    public static Integer subtract(Integer x, Integer y) {
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 <    static final Supplier<Integer> supplyOne =
445 <        () -> Integer.valueOf(1);
446 <    static final Function<Integer, Integer> inc =
447 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
333 <    static final BiFunction<Integer, Integer, Integer> subtract =
334 <        (Integer x, Integer y) -> subtract(x, y);
335 <    static final class IncAction implements Consumer<Integer> {
336 <        int value;
337 <        public void accept(Integer x) { value = x.intValue() + 1; }
338 <    }
339 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
340 <        int invocationCount = 0;
341 <        Integer value;
342 <        // Check this action was invoked exactly once when result is computed.
343 <        public boolean ran() { return invocationCount == 1; }
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 <            invocationCount++;
449 >            invoked();
450              value = subtract(x, y);
451          }
452      }
453 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
454 <        int invocationCount = 0;
455 <        Integer value;
456 <        // Check this action was invoked exactly once when result is computed.
457 <        public boolean ran() { return invocationCount == 1; }
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 <            invocationCount++;
459 >            invoked();
460              return value = subtract(x, y);
461          }
462      }
463 <    static final class Noop implements Runnable {
464 <        boolean ran;
465 <        public void run() { ran = true; }
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();
415 <        }
416 <    }
417 <
418 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
419 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
420 <    }
421 <
422 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
423 <        boolean ran;
424 <        public Integer apply(Integer x, Throwable t) {
425 <            ran = true;
426 <            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 449 | Line 628 | public class CompletableFutureTest exten
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 482 | Line 702 | public class CompletableFutureTest exten
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  
487 //         REVERSE_DEFAULT_ASYNC {
488 //             public <T,U> CompletableFuture<Void> runAfterBoth
489 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
490 //                 return f.runAfterBothAsync(g, a);
491 //             }
492 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
493 //                 (CompletableFuture<T> f,
494 //                  CompletionStage<? extends U> g,
495 //                  BiConsumer<? super T,? super U> a) {
496 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
497 //             }
498 //         },
499
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 514 | Line 775 | public class CompletableFutureTest exten
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
# Line 526 | Line 823 | public class CompletableFutureTest exten
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 completes with function value on source
842 <     * exception; otherwise with source value
841 >     * exceptionally action is not invoked when source completes
842 >     * normally, and source result is propagated
843       */
844 <    public void testExceptionally() {
845 <        CompletableFuture<Integer> f = new CompletableFuture<>();
846 <        ExceptionToInteger r = new ExceptionToInteger();
847 <        CompletableFuture<Integer> g = f.exceptionally(r);
848 <        f.completeExceptionally(new CFException());
849 <        checkCompletedNormally(g, three);
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 <        f = new CompletableFuture<>();
860 <        r = new ExceptionToInteger();
861 <        g = f.exceptionally(r);
862 <        f.complete(one);
546 <        checkCompletedNormally(g, one);
547 <    }
859 >        checkCompletedNormally(g, v1);
860 >        checkCompletedNormally(f, v1);
861 >        assertEquals(0, a.get());
862 >    }}
863  
864      /**
865 <     * handle action completes normally with function value on either
866 <     * normal or exceptional completion of source
865 >     * exceptionally action completes with function value on source
866 >     * exception
867       */
868 <    public void testHandle() {
869 <        CompletableFuture<Integer> f, g;
870 <        IntegerHandler r;
871 <
872 <        f = new CompletableFuture<>();
873 <        f.completeExceptionally(new CFException());
874 <        g = f.handle(r = new IntegerHandler());
875 <        assertTrue(r.ran);
876 <        checkCompletedNormally(g, three);
877 <
878 <        f = new CompletableFuture<>();
879 <        g = f.handle(r = new IntegerHandler());
880 <        assertFalse(r.ran);
881 <        f.completeExceptionally(new CFException());
882 <        checkCompletedNormally(g, three);
883 <        assertTrue(r.ran);
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 <        f.complete(one);
887 <        g = f.handle(r = new IntegerHandler());
573 <        assertTrue(r.ran);
574 <        checkCompletedNormally(g, two);
885 >        checkCompletedNormally(g, v1);
886 >        assertEquals(1, a.get());
887 >    }}
888  
889 <        f = new CompletableFuture<>();
890 <        g = f.handle(r = new IntegerHandler());
891 <        assertFalse(r.ran);
892 <        f.complete(one);
893 <        assertTrue(r.ran);
894 <        checkCompletedNormally(g, two);
895 <    }
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 <     * runAsync completes after running Runnable
912 >     * whenComplete action executes on normal completion, propagating
913 >     * source result.
914       */
915 <    public void testRunAsync() {
916 <        Noop r = new Noop();
917 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
918 <        assertNull(f.join());
919 <        assertTrue(r.ran);
920 <        checkCompletedNormally(f, null);
921 <    }
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 <    /**
934 <     * runAsync with executor completes after running Runnable
935 <     */
936 <    public void testRunAsync2() {
599 <        Noop r = new Noop();
600 <        ThreadExecutor exec = new ThreadExecutor();
601 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
602 <        assertNull(f.join());
603 <        assertTrue(r.ran);
604 <        checkCompletedNormally(f, null);
605 <        assertEquals(1, exec.count.get());
606 <    }
933 >        checkCompletedNormally(g, v1);
934 >        checkCompletedNormally(f, v1);
935 >        assertEquals(1, a.get());
936 >    }}
937  
938      /**
939 <     * failing runAsync completes exceptionally after running Runnable
939 >     * whenComplete action executes on exceptional completion, propagating
940 >     * source result.
941       */
942 <    public void testRunAsync3() {
943 <        FailingNoop r = new FailingNoop();
944 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
945 <        checkCompletedWithWrappedCFException(f);
946 <        assertTrue(r.ran);
947 <    }
942 >    public void testWhenComplete_exceptionalCompletion() {
943 >        for (ExecutionMode m : ExecutionMode.values())
944 >        for (boolean createIncomplete : new boolean[] { true, false })
945 >        for (Integer v1 : new Integer[] { 1, null })
946 >    {
947 >        final AtomicInteger a = new AtomicInteger(0);
948 >        final CFException ex = new CFException();
949 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
950 >        if (!createIncomplete) f.completeExceptionally(ex);
951 >        final CompletableFuture<Integer> g = m.whenComplete
952 >            (f,
953 >             (Integer x, Throwable t) -> {
954 >                m.checkExecutionMode();
955 >                threadAssertNull(x);
956 >                threadAssertSame(t, ex);
957 >                a.getAndIncrement();
958 >            });
959 >        if (createIncomplete) f.completeExceptionally(ex);
960 >
961 >        checkCompletedWithWrappedException(g, ex);
962 >        checkCompletedExceptionally(f, ex);
963 >        assertEquals(1, a.get());
964 >    }}
965  
966      /**
967 <     * supplyAsync completes with result of supplier
967 >     * whenComplete action executes on cancelled source, propagating
968 >     * CancellationException.
969       */
970 <    public void testSupplyAsync() {
971 <        CompletableFuture<Integer> f;
972 <        f = CompletableFuture.supplyAsync(supplyOne);
973 <        assertEquals(f.join(), one);
974 <        checkCompletedNormally(f, one);
975 <    }
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 <    /**
989 <     * supplyAsync with executor completes with result of supplier
990 <     */
991 <    public void testSupplyAsync2() {
632 <        CompletableFuture<Integer> f;
633 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
634 <        assertEquals(f.join(), one);
635 <        checkCompletedNormally(f, one);
636 <    }
988 >        checkCompletedWithWrappedCancellationException(g);
989 >        checkCancelled(f);
990 >        assertEquals(1, a.get());
991 >    }}
992  
993      /**
994 <     * Failing supplyAsync completes exceptionally
994 >     * If a whenComplete action throws an exception when triggered by
995 >     * a normal completion, it completes exceptionally
996       */
997 <    public void testSupplyAsync3() {
998 <        FailingSupplier r = new FailingSupplier();
999 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1000 <        checkCompletedWithWrappedCFException(f);
1001 <        assertTrue(r.ran);
1002 <    }
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 <    // seq completion methods
1017 >        checkCompletedWithWrappedException(g, ex);
1018 >        checkCompletedNormally(f, v1);
1019 >        assertEquals(1, a.get());
1020 >    }}
1021  
1022      /**
1023 <     * thenRun result completes normally after normal completion of source
1023 >     * If a whenComplete action throws an exception when triggered by
1024 >     * a source completion that also throws an exception, the source
1025 >     * exception takes precedence.
1026       */
1027 <    public void testThenRun() {
1028 <        CompletableFuture<Integer> f;
1029 <        CompletableFuture<Void> g;
1030 <        Noop r;
1031 <
1032 <        f = new CompletableFuture<>();
1033 <        g = f.thenRun(r = new Noop());
1034 <        f.complete(null);
1035 <        checkCompletedNormally(g, null);
1036 <        assertTrue(r.ran);
1037 <
1038 <        f = new CompletableFuture<>();
1039 <        f.complete(null);
1040 <        g = f.thenRun(r = new Noop());
1041 <        checkCompletedNormally(g, null);
1042 <        assertTrue(r.ran);
1043 <    }
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 <     * thenRun result completes exceptionally after exceptional
1055 >     * handle action completes normally with function value on normal
1056       * completion of source
1057       */
1058 <    public void testThenRun2() {
1059 <        CompletableFuture<Integer> f;
1060 <        CompletableFuture<Void> g;
1061 <        Noop r;
1062 <
1063 <        f = new CompletableFuture<>();
1064 <        g = f.thenRun(r = new Noop());
1065 <        f.completeExceptionally(new CFException());
1066 <        checkCompletedWithWrappedCFException(g);
1067 <        assertFalse(r.ran);
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 <        f = new CompletableFuture<>();
1078 <        f.completeExceptionally(new CFException());
1079 <        g = f.thenRun(r = new Noop());
1080 <        checkCompletedWithWrappedCFException(g);
690 <        assertFalse(r.ran);
691 <    }
1077 >        checkCompletedNormally(g, inc(v1));
1078 >        checkCompletedNormally(f, v1);
1079 >        assertEquals(1, a.get());
1080 >    }}
1081  
1082      /**
1083 <     * thenRun result completes exceptionally if action does
1083 >     * handle action completes normally with function value on
1084 >     * exceptional completion of source
1085       */
1086 <    public void testThenRun3() {
1087 <        CompletableFuture<Integer> f;
1088 <        CompletableFuture<Void> g;
1089 <        FailingNoop r;
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 <        f = new CompletableFuture<>();
1107 <        g = f.thenRun(r = new FailingNoop());
1108 <        f.complete(null);
1109 <        checkCompletedWithWrappedCFException(g);
1106 >        checkCompletedNormally(g, v1);
1107 >        checkCompletedExceptionally(f, ex);
1108 >        assertEquals(1, a.get());
1109 >    }}
1110  
1111 <        f = new CompletableFuture<>();
1112 <        f.complete(null);
1113 <        g = f.thenRun(r = new FailingNoop());
1114 <        checkCompletedWithWrappedCFException(g);
1115 <    }
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 <     * thenRun result completes exceptionally if source cancelled
1141 >     * handle result completes exceptionally if action does
1142       */
1143 <    public void testThenRun4() {
1144 <        CompletableFuture<Integer> f;
1145 <        CompletableFuture<Void> g;
1146 <        Noop r;
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 <        f = new CompletableFuture<>();
1169 <        g = f.thenRun(r = new Noop());
1170 <        assertTrue(f.cancel(true));
1171 <        checkCompletedWithWrappedCancellationException(g);
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 <        f = new CompletableFuture<>();
1189 <        assertTrue(f.cancel(true));
1190 <        g = f.thenRun(r = new Noop());
1191 <        checkCompletedWithWrappedCancellationException(g);
729 <    }
1188 >        checkCompletedWithWrappedException(g, ex);
1189 >        checkCompletedNormally(f, v1);
1190 >        assertEquals(1, a.get());
1191 >    }}
1192  
1193      /**
1194 <     * thenApply result completes normally after normal completion of source
1194 >     * runAsync completes after running Runnable
1195       */
1196 <    public void testThenApply() {
1197 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1198 <        CompletableFuture<Integer> g = f.thenApply(inc);
1199 <        f.complete(one);
1200 <        checkCompletedNormally(g, two);
1201 <    }
1196 >    public void testRunAsync_normalCompletion() {
1197 >        ExecutionMode[] executionModes = {
1198 >            ExecutionMode.ASYNC,
1199 >            ExecutionMode.EXECUTOR,
1200 >        };
1201 >        for (ExecutionMode m : executionModes)
1202 >    {
1203 >        final Noop r = new Noop(m);
1204 >        final CompletableFuture<Void> f = m.runAsync(r);
1205 >        assertNull(f.join());
1206 >        checkCompletedNormally(f, null);
1207 >        r.assertInvoked();
1208 >    }}
1209  
1210      /**
1211 <     * thenApply result completes exceptionally after exceptional
743 <     * completion of source
1211 >     * failing runAsync completes exceptionally after running Runnable
1212       */
1213 <    public void testThenApply2() {
1214 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1215 <        CompletableFuture<Integer> g = f.thenApply(inc);
1216 <        f.completeExceptionally(new CFException());
1217 <        checkCompletedWithWrappedCFException(g);
1218 <    }
1213 >    public void testRunAsync_exceptionalCompletion() {
1214 >        ExecutionMode[] executionModes = {
1215 >            ExecutionMode.ASYNC,
1216 >            ExecutionMode.EXECUTOR,
1217 >        };
1218 >        for (ExecutionMode m : executionModes)
1219 >    {
1220 >        final FailingRunnable r = new FailingRunnable(m);
1221 >        final CompletableFuture<Void> f = m.runAsync(r);
1222 >        checkCompletedWithWrappedCFException(f);
1223 >        r.assertInvoked();
1224 >    }}
1225  
1226      /**
1227 <     * thenApply result completes exceptionally if action does
1227 >     * supplyAsync completes with result of supplier
1228       */
1229 <    public void testThenApply3() {
1230 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1231 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1232 <        f.complete(one);
1233 <        checkCompletedWithWrappedCFException(g);
1234 <    }
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 <     * thenApply result completes exceptionally if source cancelled
1245 >     * Failing supplyAsync completes exceptionally
1246       */
1247 <    public void testThenApply4() {
1248 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1249 <        CompletableFuture<Integer> g = f.thenApply(inc);
1250 <        assertTrue(f.cancel(true));
1251 <        checkCompletedWithWrappedCancellationException(g);
1252 <    }
1247 >    public void testSupplyAsync_exceptionalCompletion() {
1248 >        ExecutionMode[] executionModes = {
1249 >            ExecutionMode.ASYNC,
1250 >            ExecutionMode.EXECUTOR,
1251 >        };
1252 >        for (ExecutionMode m : executionModes)
1253 >    {
1254 >        FailingSupplier r = new FailingSupplier(m);
1255 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1256 >        checkCompletedWithWrappedCFException(f);
1257 >        r.assertInvoked();
1258 >    }}
1259 >
1260 >    // seq completion methods
1261  
1262      /**
1263 <     * thenAccept result completes normally after normal completion of source
1263 >     * thenRun result completes normally after normal completion of source
1264       */
1265 <    public void testThenAccept() {
1266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1267 <        IncAction r = new IncAction();
1268 <        CompletableFuture<Void> g = f.thenAccept(r);
1269 <        f.complete(one);
1265 >    public void testThenRun_normalCompletion() {
1266 >        for (ExecutionMode m : ExecutionMode.values())
1267 >        for (boolean createIncomplete : new boolean[] { true, false })
1268 >        for (Integer v1 : new Integer[] { 1, null })
1269 >    {
1270 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 >        final Noop r = new Noop(m);
1272 >        if (!createIncomplete) assertTrue(f.complete(v1));
1273 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1274 >        if (createIncomplete) {
1275 >            checkIncomplete(g);
1276 >            assertTrue(f.complete(v1));
1277 >        }
1278 >
1279          checkCompletedNormally(g, null);
1280 <        assertEquals(r.value, 2);
1281 <    }
1280 >        checkCompletedNormally(f, v1);
1281 >        r.assertInvoked();
1282 >    }}
1283  
1284      /**
1285 <     * thenAccept result completes exceptionally after exceptional
1285 >     * thenRun result completes exceptionally after exceptional
1286       * completion of source
1287       */
1288 <    public void testThenAccept2() {
1289 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1290 <        IncAction r = new IncAction();
1291 <        CompletableFuture<Void> g = f.thenAccept(r);
1292 <        f.completeExceptionally(new CFException());
1293 <        checkCompletedWithWrappedCFException(g);
1294 <    }
1288 >    public void testThenRun_exceptionalCompletion() {
1289 >        for (ExecutionMode m : ExecutionMode.values())
1290 >        for (boolean createIncomplete : new boolean[] { true, false })
1291 >    {
1292 >        final CFException ex = new CFException();
1293 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1294 >        final Noop r = new Noop(m);
1295 >        if (!createIncomplete) f.completeExceptionally(ex);
1296 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1297 >        if (createIncomplete) {
1298 >            checkIncomplete(g);
1299 >            f.completeExceptionally(ex);
1300 >        }
1301  
1302 <    /**
1303 <     * thenAccept result completes exceptionally if action does
1304 <     */
1305 <    public void testThenAccept3() {
800 <        CompletableFuture<Integer> f = new CompletableFuture<>();
801 <        FailingConsumer r = new FailingConsumer();
802 <        CompletableFuture<Void> g = f.thenAccept(r);
803 <        f.complete(one);
804 <        checkCompletedWithWrappedCFException(g);
805 <        assertTrue(r.ran);
806 <    }
1302 >        checkCompletedWithWrappedException(g, ex);
1303 >        checkCompletedExceptionally(f, ex);
1304 >        r.assertNotInvoked();
1305 >    }}
1306  
1307      /**
1308 <     * thenAccept result completes exceptionally if source cancelled
1308 >     * thenRun result completes exceptionally if source cancelled
1309       */
1310 <    public void testThenAccept4() {
1311 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1312 <        IncAction r = new IncAction();
1313 <        CompletableFuture<Void> g = f.thenAccept(r);
1314 <        assertTrue(f.cancel(true));
1310 >    public void testThenRun_sourceCancelled() {
1311 >        for (ExecutionMode m : ExecutionMode.values())
1312 >        for (boolean createIncomplete : new boolean[] { true, false })
1313 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1314 >    {
1315 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1316 >        final Noop r = new Noop(m);
1317 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1318 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1319 >        if (createIncomplete) {
1320 >            checkIncomplete(g);
1321 >            assertTrue(f.cancel(mayInterruptIfRunning));
1322 >        }
1323 >
1324          checkCompletedWithWrappedCancellationException(g);
1325 <    }
1325 >        checkCancelled(f);
1326 >        r.assertNotInvoked();
1327 >    }}
1328  
1329      /**
1330 <     * thenCombine result completes normally after normal completion
821 <     * of sources
1330 >     * thenRun result completes exceptionally if action does
1331       */
1332 <    public void testThenCombine_normalCompletion1() {
1332 >    public void testThenRun_actionFailed() {
1333          for (ExecutionMode m : ExecutionMode.values())
1334 +        for (boolean createIncomplete : new boolean[] { true, false })
1335          for (Integer v1 : new Integer[] { 1, null })
1336 <        for (Integer v2 : new Integer[] { 2, null }) {
827 <
1336 >    {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1339 <        final SubtractFunction r = new SubtractFunction();
1340 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1341 <
1342 <        f.complete(v1);
1343 <        checkIncomplete(h);
1344 <        assertFalse(r.ran());
836 <        g.complete(v2);
1338 >        final FailingRunnable r = new FailingRunnable(m);
1339 >        if (!createIncomplete) assertTrue(f.complete(v1));
1340 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1341 >        if (createIncomplete) {
1342 >            checkIncomplete(g);
1343 >            assertTrue(f.complete(v1));
1344 >        }
1345  
1346 <        checkCompletedNormally(h, subtract(v1, v2));
1346 >        checkCompletedWithWrappedCFException(g);
1347          checkCompletedNormally(f, v1);
1348 <        checkCompletedNormally(g, v2);
841 <        }
842 <    }
1348 >    }}
1349  
1350 <    public void testThenCombine_normalCompletion2() {
1350 >    /**
1351 >     * thenApply result completes normally after normal completion of source
1352 >     */
1353 >    public void testThenApply_normalCompletion() {
1354          for (ExecutionMode m : ExecutionMode.values())
1355 +        for (boolean createIncomplete : new boolean[] { true, false })
1356          for (Integer v1 : new Integer[] { 1, null })
1357 <        for (Integer v2 : new Integer[] { 2, null }) {
848 <
1357 >    {
1358          final CompletableFuture<Integer> f = new CompletableFuture<>();
1359 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1360 <        final SubtractFunction r = new SubtractFunction();
1361 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1362 <
1363 <        g.complete(v2);
1364 <        checkIncomplete(h);
1365 <        assertFalse(r.ran());
857 <        f.complete(v1);
1359 >        final IncFunction r = new IncFunction(m);
1360 >        if (!createIncomplete) assertTrue(f.complete(v1));
1361 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1362 >        if (createIncomplete) {
1363 >            checkIncomplete(g);
1364 >            assertTrue(f.complete(v1));
1365 >        }
1366  
1367 <        checkCompletedNormally(h, subtract(v1, v2));
1367 >        checkCompletedNormally(g, inc(v1));
1368          checkCompletedNormally(f, v1);
1369 <        checkCompletedNormally(g, v2);
1370 <        }
863 <    }
1369 >        r.assertValue(inc(v1));
1370 >    }}
1371  
1372 <    public void testThenCombine_normalCompletion3() {
1372 >    /**
1373 >     * thenApply result completes exceptionally after exceptional
1374 >     * completion of source
1375 >     */
1376 >    public void testThenApply_exceptionalCompletion() {
1377          for (ExecutionMode m : ExecutionMode.values())
1378 <        for (Integer v1 : new Integer[] { 1, null })
1379 <        for (Integer v2 : new Integer[] { 2, null }) {
1380 <
1378 >        for (boolean createIncomplete : new boolean[] { true, false })
1379 >    {
1380 >        final CFException ex = new CFException();
1381          final CompletableFuture<Integer> f = new CompletableFuture<>();
1382 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1383 <        final SubtractFunction r = new SubtractFunction();
1382 >        final IncFunction r = new IncFunction(m);
1383 >        if (!createIncomplete) f.completeExceptionally(ex);
1384 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1385 >        if (createIncomplete) {
1386 >            checkIncomplete(g);
1387 >            f.completeExceptionally(ex);
1388 >        }
1389  
1390 <        g.complete(v2);
1391 <        f.complete(v1);
1392 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1390 >        checkCompletedWithWrappedException(g, ex);
1391 >        checkCompletedExceptionally(f, ex);
1392 >        r.assertNotInvoked();
1393 >    }}
1394  
1395 <        checkCompletedNormally(h, subtract(v1, v2));
1396 <        checkCompletedNormally(f, v1);
1397 <        checkCompletedNormally(g, v2);
1395 >    /**
1396 >     * thenApply result completes exceptionally if source cancelled
1397 >     */
1398 >    public void testThenApply_sourceCancelled() {
1399 >        for (ExecutionMode m : ExecutionMode.values())
1400 >        for (boolean createIncomplete : new boolean[] { true, false })
1401 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1402 >    {
1403 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1404 >        final IncFunction r = new IncFunction(m);
1405 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1406 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1407 >        if (createIncomplete) {
1408 >            checkIncomplete(g);
1409 >            assertTrue(f.cancel(mayInterruptIfRunning));
1410          }
882    }
1411  
1412 <    public void testThenCombine_normalCompletion4() {
1412 >        checkCompletedWithWrappedCancellationException(g);
1413 >        checkCancelled(f);
1414 >        r.assertNotInvoked();
1415 >    }}
1416 >
1417 >    /**
1418 >     * thenApply result completes exceptionally if action does
1419 >     */
1420 >    public void testThenApply_actionFailed() {
1421          for (ExecutionMode m : ExecutionMode.values())
1422 +        for (boolean createIncomplete : new boolean[] { true, false })
1423          for (Integer v1 : new Integer[] { 1, null })
1424 <        for (Integer v2 : new Integer[] { 2, null }) {
888 <
1424 >    {
1425          final CompletableFuture<Integer> f = new CompletableFuture<>();
1426 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1427 <        final SubtractFunction r = new SubtractFunction();
1428 <
1429 <        f.complete(v1);
1430 <        g.complete(v2);
1431 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1426 >        final FailingFunction r = new FailingFunction(m);
1427 >        if (!createIncomplete) assertTrue(f.complete(v1));
1428 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1429 >        if (createIncomplete) {
1430 >            checkIncomplete(g);
1431 >            assertTrue(f.complete(v1));
1432 >        }
1433  
1434 <        checkCompletedNormally(h, subtract(v1, v2));
1434 >        checkCompletedWithWrappedCFException(g);
1435          checkCompletedNormally(f, v1);
1436 <        checkCompletedNormally(g, v2);
900 <        }
901 <    }
1436 >    }}
1437  
1438      /**
1439 <     * thenCombine result completes exceptionally after exceptional
905 <     * completion of either source
1439 >     * thenAccept result completes normally after normal completion of source
1440       */
1441 <    public void testThenCombine_exceptionalCompletion1() {
1441 >    public void testThenAccept_normalCompletion() {
1442          for (ExecutionMode m : ExecutionMode.values())
1443 <        for (Integer v1 : new Integer[] { 1, null }) {
1444 <
1443 >        for (boolean createIncomplete : new boolean[] { true, false })
1444 >        for (Integer v1 : new Integer[] { 1, null })
1445 >    {
1446          final CompletableFuture<Integer> f = new CompletableFuture<>();
1447 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1448 <        final SubtractFunction r = new SubtractFunction();
1449 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1450 <        final CFException ex = new CFException();
1451 <
1452 <        f.completeExceptionally(ex);
918 <        checkIncomplete(h);
919 <        g.complete(v1);
920 <
921 <        checkCompletedWithWrappedCFException(h, ex);
922 <        checkCompletedWithWrappedCFException(f, ex);
923 <        assertFalse(r.ran());
924 <        checkCompletedNormally(g, v1);
1447 >        final NoopConsumer r = new NoopConsumer(m);
1448 >        if (!createIncomplete) assertTrue(f.complete(v1));
1449 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1450 >        if (createIncomplete) {
1451 >            checkIncomplete(g);
1452 >            assertTrue(f.complete(v1));
1453          }
926    }
1454  
1455 <    public void testThenCombine_exceptionalCompletion2() {
1456 <        for (ExecutionMode m : ExecutionMode.values())
930 <        for (Integer v1 : new Integer[] { 1, null }) {
931 <
932 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
933 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
934 <        final SubtractFunction r = new SubtractFunction();
935 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
936 <        final CFException ex = new CFException();
937 <
938 <        g.completeExceptionally(ex);
939 <        checkIncomplete(h);
940 <        f.complete(v1);
941 <
942 <        checkCompletedWithWrappedCFException(h, ex);
943 <        checkCompletedWithWrappedCFException(g, ex);
944 <        assertFalse(r.ran());
1455 >        checkCompletedNormally(g, null);
1456 >        r.assertValue(v1);
1457          checkCompletedNormally(f, v1);
1458 <        }
947 <    }
1458 >    }}
1459  
1460 <    public void testThenCombine_exceptionalCompletion3() {
1460 >    /**
1461 >     * thenAccept result completes exceptionally after exceptional
1462 >     * completion of source
1463 >     */
1464 >    public void testThenAccept_exceptionalCompletion() {
1465          for (ExecutionMode m : ExecutionMode.values())
1466 <        for (Integer v1 : new Integer[] { 1, null }) {
1467 <
953 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
954 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
955 <        final SubtractFunction r = new SubtractFunction();
1466 >        for (boolean createIncomplete : new boolean[] { true, false })
1467 >    {
1468          final CFException ex = new CFException();
1469 <
1470 <        g.completeExceptionally(ex);
1471 <        f.complete(v1);
1472 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1473 <
1474 <        checkCompletedWithWrappedCFException(h, ex);
1475 <        checkCompletedWithWrappedCFException(g, ex);
964 <        assertFalse(r.ran());
965 <        checkCompletedNormally(f, v1);
1469 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 >        final NoopConsumer r = new NoopConsumer(m);
1471 >        if (!createIncomplete) f.completeExceptionally(ex);
1472 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1473 >        if (createIncomplete) {
1474 >            checkIncomplete(g);
1475 >            f.completeExceptionally(ex);
1476          }
967    }
1477  
1478 <    public void testThenCombine_exceptionalCompletion4() {
1479 <        for (ExecutionMode m : ExecutionMode.values())
1480 <        for (Integer v1 : new Integer[] { 1, null }) {
1478 >        checkCompletedWithWrappedException(g, ex);
1479 >        checkCompletedExceptionally(f, ex);
1480 >        r.assertNotInvoked();
1481 >    }}
1482  
1483 +    /**
1484 +     * thenAccept result completes exceptionally if source cancelled
1485 +     */
1486 +    public void testThenAccept_sourceCancelled() {
1487 +        for (ExecutionMode m : ExecutionMode.values())
1488 +        for (boolean createIncomplete : new boolean[] { true, false })
1489 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490 +    {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1493 <        final SubtractFunction r = new SubtractFunction();
1494 <        final CFException ex = new CFException();
1495 <
1496 <        f.completeExceptionally(ex);
1497 <        g.complete(v1);
980 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
981 <
982 <        checkCompletedWithWrappedCFException(h, ex);
983 <        checkCompletedWithWrappedCFException(f, ex);
984 <        assertFalse(r.ran());
985 <        checkCompletedNormally(g, v1);
1492 >        final NoopConsumer r = new NoopConsumer(m);
1493 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1494 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1495 >        if (createIncomplete) {
1496 >            checkIncomplete(g);
1497 >            assertTrue(f.cancel(mayInterruptIfRunning));
1498          }
1499 <    }
1499 >
1500 >        checkCompletedWithWrappedCancellationException(g);
1501 >        checkCancelled(f);
1502 >        r.assertNotInvoked();
1503 >    }}
1504  
1505      /**
1506 <     * thenCombine result completes exceptionally if action does
1506 >     * thenAccept result completes exceptionally if action does
1507       */
1508 <    public void testThenCombine_actionFailed1() {
1508 >    public void testThenAccept_actionFailed() {
1509          for (ExecutionMode m : ExecutionMode.values())
1510 +        for (boolean createIncomplete : new boolean[] { true, false })
1511          for (Integer v1 : new Integer[] { 1, null })
1512 <        for (Integer v2 : new Integer[] { 2, null }) {
996 <
1512 >    {
1513          final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1515 <        final FailingBiFunction r = new FailingBiFunction();
1516 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1517 <
1518 <        f.complete(v1);
1519 <        checkIncomplete(h);
1520 <        g.complete(v2);
1514 >        final FailingConsumer r = new FailingConsumer(m);
1515 >        if (!createIncomplete) f.complete(v1);
1516 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1517 >        if (createIncomplete) {
1518 >            checkIncomplete(g);
1519 >            f.complete(v1);
1520 >        }
1521  
1522 <        checkCompletedWithWrappedCFException(h);
1522 >        checkCompletedWithWrappedCFException(g);
1523          checkCompletedNormally(f, v1);
1524 <        checkCompletedNormally(g, v2);
1009 <        }
1010 <    }
1524 >    }}
1525  
1526 <    public void testThenCombine_actionFailed2() {
1526 >    /**
1527 >     * thenCombine result completes normally after normal completion
1528 >     * of sources
1529 >     */
1530 >    public void testThenCombine_normalCompletion() {
1531          for (ExecutionMode m : ExecutionMode.values())
1532 +        for (boolean fFirst : new boolean[] { true, false })
1533          for (Integer v1 : new Integer[] { 1, null })
1534 <        for (Integer v2 : new Integer[] { 2, null }) {
1535 <
1534 >        for (Integer v2 : new Integer[] { 2, null })
1535 >    {
1536          final CompletableFuture<Integer> f = new CompletableFuture<>();
1537          final CompletableFuture<Integer> g = new CompletableFuture<>();
1538 <        final FailingBiFunction r = new FailingBiFunction();
1539 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1540 <
1541 <        g.complete(v2);
1542 <        checkIncomplete(h);
1543 <        f.complete(v1);
1544 <
1545 <        checkCompletedWithWrappedCFException(h);
1538 >        final SubtractFunction r1 = new SubtractFunction(m);
1539 >        final SubtractFunction r2 = new SubtractFunction(m);
1540 >        final SubtractFunction r3 = new SubtractFunction(m);
1541 >
1542 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1543 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1544 >        final Integer w1 =  fFirst ? v1 : v2;
1545 >        final Integer w2 = !fFirst ? v1 : v2;
1546 >
1547 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1548 >        assertTrue(fst.complete(w1));
1549 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1550 >        checkIncomplete(h1);
1551 >        checkIncomplete(h2);
1552 >        r1.assertNotInvoked();
1553 >        r2.assertNotInvoked();
1554 >        assertTrue(snd.complete(w2));
1555 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1556 >
1557 >        checkCompletedNormally(h1, subtract(v1, v2));
1558 >        checkCompletedNormally(h2, subtract(v1, v2));
1559 >        checkCompletedNormally(h3, subtract(v1, v2));
1560 >        r1.assertValue(subtract(v1, v2));
1561 >        r2.assertValue(subtract(v1, v2));
1562 >        r3.assertValue(subtract(v1, v2));
1563          checkCompletedNormally(f, v1);
1564          checkCompletedNormally(g, v2);
1565 <        }
1030 <    }
1565 >    }}
1566  
1567      /**
1568 <     * thenCombine result completes exceptionally if either source cancelled
1568 >     * thenCombine result completes exceptionally after exceptional
1569 >     * completion of either source
1570       */
1571 <    public void testThenCombine_sourceCancelled1() {
1571 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1572          for (ExecutionMode m : ExecutionMode.values())
1573 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1574 <        for (Integer v1 : new Integer[] { 1, null }) {
1575 <
1573 >        for (boolean fFirst : new boolean[] { true, false })
1574 >        for (boolean failFirst : new boolean[] { true, false })
1575 >        for (Integer v1 : new Integer[] { 1, null })
1576 >    {
1577          final CompletableFuture<Integer> f = new CompletableFuture<>();
1578          final CompletableFuture<Integer> g = new CompletableFuture<>();
1579 <        final SubtractFunction r = new SubtractFunction();
1580 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1581 <
1582 <        assertTrue(f.cancel(mayInterruptIfRunning));
1583 <        checkIncomplete(h);
1584 <        g.complete(v1);
1585 <
1586 <        checkCompletedWithWrappedCancellationException(h);
1587 <        checkCancelled(f);
1588 <        assertFalse(r.ran());
1589 <        checkCompletedNormally(g, v1);
1590 <        }
1591 <    }
1579 >        final CFException ex = new CFException();
1580 >        final SubtractFunction r1 = new SubtractFunction(m);
1581 >        final SubtractFunction r2 = new SubtractFunction(m);
1582 >        final SubtractFunction r3 = new SubtractFunction(m);
1583 >
1584 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1585 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1586 >        final Callable<Boolean> complete1 = failFirst ?
1587 >            () -> fst.completeExceptionally(ex) :
1588 >            () -> fst.complete(v1);
1589 >        final Callable<Boolean> complete2 = failFirst ?
1590 >            () -> snd.complete(v1) :
1591 >            () -> snd.completeExceptionally(ex);
1592 >
1593 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1594 >        assertTrue(complete1.call());
1595 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1596 >        checkIncomplete(h1);
1597 >        checkIncomplete(h2);
1598 >        assertTrue(complete2.call());
1599 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1600 >
1601 >        checkCompletedWithWrappedException(h1, ex);
1602 >        checkCompletedWithWrappedException(h2, ex);
1603 >        checkCompletedWithWrappedException(h3, ex);
1604 >        r1.assertNotInvoked();
1605 >        r2.assertNotInvoked();
1606 >        r3.assertNotInvoked();
1607 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1608 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1609 >    }}
1610  
1611 <    public void testThenCombine_sourceCancelled2() {
1611 >    /**
1612 >     * thenCombine result completes exceptionally if either source cancelled
1613 >     */
1614 >    public void testThenCombine_sourceCancelled() throws Throwable {
1615          for (ExecutionMode m : ExecutionMode.values())
1616          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1617 <        for (Integer v1 : new Integer[] { 1, null }) {
1618 <
1617 >        for (boolean fFirst : new boolean[] { true, false })
1618 >        for (boolean failFirst : new boolean[] { true, false })
1619 >        for (Integer v1 : new Integer[] { 1, null })
1620 >    {
1621          final CompletableFuture<Integer> f = new CompletableFuture<>();
1622          final CompletableFuture<Integer> g = new CompletableFuture<>();
1623 <        final SubtractFunction r = new SubtractFunction();
1624 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1625 <
1626 <        assertTrue(g.cancel(mayInterruptIfRunning));
1627 <        checkIncomplete(h);
1628 <        f.complete(v1);
1623 >        final SubtractFunction r1 = new SubtractFunction(m);
1624 >        final SubtractFunction r2 = new SubtractFunction(m);
1625 >        final SubtractFunction r3 = new SubtractFunction(m);
1626 >
1627 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1628 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1629 >        final Callable<Boolean> complete1 = failFirst ?
1630 >            () -> fst.cancel(mayInterruptIfRunning) :
1631 >            () -> fst.complete(v1);
1632 >        final Callable<Boolean> complete2 = failFirst ?
1633 >            () -> snd.complete(v1) :
1634 >            () -> snd.cancel(mayInterruptIfRunning);
1635 >
1636 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1637 >        assertTrue(complete1.call());
1638 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1639 >        checkIncomplete(h1);
1640 >        checkIncomplete(h2);
1641 >        assertTrue(complete2.call());
1642 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1643 >
1644 >        checkCompletedWithWrappedCancellationException(h1);
1645 >        checkCompletedWithWrappedCancellationException(h2);
1646 >        checkCompletedWithWrappedCancellationException(h3);
1647 >        r1.assertNotInvoked();
1648 >        r2.assertNotInvoked();
1649 >        r3.assertNotInvoked();
1650 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1651 >        checkCancelled(failFirst ? fst : snd);
1652 >    }}
1653  
1654 <        checkCompletedWithWrappedCancellationException(h);
1655 <        checkCancelled(g);
1656 <        assertFalse(r.ran());
1657 <        checkCompletedNormally(f, v1);
1074 <        }
1075 <    }
1076 <
1077 <    public void testThenCombine_sourceCancelled3() {
1654 >    /**
1655 >     * thenCombine result completes exceptionally if action does
1656 >     */
1657 >    public void testThenCombine_actionFailed() {
1658          for (ExecutionMode m : ExecutionMode.values())
1659 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1660 <        for (Integer v1 : new Integer[] { 1, null }) {
1661 <
1659 >        for (boolean fFirst : new boolean[] { true, false })
1660 >        for (Integer v1 : new Integer[] { 1, null })
1661 >        for (Integer v2 : new Integer[] { 2, null })
1662 >    {
1663          final CompletableFuture<Integer> f = new CompletableFuture<>();
1664          final CompletableFuture<Integer> g = new CompletableFuture<>();
1665 <        final SubtractFunction r = new SubtractFunction();
1666 <
1667 <        assertTrue(g.cancel(mayInterruptIfRunning));
1668 <        f.complete(v1);
1669 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1670 <
1671 <        checkCompletedWithWrappedCancellationException(h);
1672 <        checkCancelled(g);
1673 <        assertFalse(r.ran());
1665 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1666 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1667 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1668 >
1669 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1670 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1671 >        final Integer w1 =  fFirst ? v1 : v2;
1672 >        final Integer w2 = !fFirst ? v1 : v2;
1673 >
1674 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1675 >        assertTrue(fst.complete(w1));
1676 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1677 >        assertTrue(snd.complete(w2));
1678 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1679 >
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedWithWrappedCFException(h3);
1683          checkCompletedNormally(f, v1);
1684 <        }
1685 <    }
1096 <
1097 <    public void testThenCombine_sourceCancelled4() {
1098 <        for (ExecutionMode m : ExecutionMode.values())
1099 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1100 <        for (Integer v1 : new Integer[] { 1, null }) {
1101 <
1102 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1103 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1104 <        final SubtractFunction r = new SubtractFunction();
1105 <
1106 <        assertTrue(f.cancel(mayInterruptIfRunning));
1107 <        g.complete(v1);
1108 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1109 <
1110 <        checkCompletedWithWrappedCancellationException(h);
1111 <        checkCancelled(f);
1112 <        assertFalse(r.ran());
1113 <        checkCompletedNormally(g, v1);
1114 <        }
1115 <    }
1684 >        checkCompletedNormally(g, v2);
1685 >    }}
1686  
1687      /**
1688       * thenAcceptBoth result completes normally after normal
1689       * completion of sources
1690       */
1691 <    public void testThenAcceptBoth_normalCompletion1() {
1691 >    public void testThenAcceptBoth_normalCompletion() {
1692          for (ExecutionMode m : ExecutionMode.values())
1693 +        for (boolean createIncomplete : new boolean[] { true, false })
1694 +        for (boolean fFirst : new boolean[] { true, false })
1695          for (Integer v1 : new Integer[] { 1, null })
1696 <        for (Integer v2 : new Integer[] { 2, null }) {
1697 <
1696 >        for (Integer v2 : new Integer[] { 2, null })
1697 >    {
1698          final CompletableFuture<Integer> f = new CompletableFuture<>();
1699          final CompletableFuture<Integer> g = new CompletableFuture<>();
1700 <        final SubtractAction r = new SubtractAction();
1129 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1700 >        final SubtractAction r = new SubtractAction(m);
1701  
1702 <        f.complete(v1);
1703 <        checkIncomplete(h);
1704 <        assertFalse(r.ran());
1705 <        g.complete(v2);
1702 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1703 >        if (!createIncomplete)
1704 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1705 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1706 >        if (createIncomplete) {
1707 >            checkIncomplete(h);
1708 >            r.assertNotInvoked();
1709 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1710 >        }
1711  
1712          checkCompletedNormally(h, null);
1713 <        assertEquals(r.value, subtract(v1, v2));
1713 >        r.assertValue(subtract(v1, v2));
1714          checkCompletedNormally(f, v1);
1715          checkCompletedNormally(g, v2);
1716 <        }
1141 <    }
1716 >    }}
1717  
1718 <    public void testThenAcceptBoth_normalCompletion2() {
1718 >    /**
1719 >     * thenAcceptBoth result completes exceptionally after exceptional
1720 >     * completion of either source
1721 >     */
1722 >    public void testThenAcceptBoth_exceptionalCompletion() {
1723          for (ExecutionMode m : ExecutionMode.values())
1724 +        for (boolean createIncomplete : new boolean[] { true, false })
1725 +        for (boolean fFirst : new boolean[] { true, false })
1726          for (Integer v1 : new Integer[] { 1, null })
1727 <        for (Integer v2 : new Integer[] { 2, null }) {
1147 <
1727 >    {
1728          final CompletableFuture<Integer> f = new CompletableFuture<>();
1729          final CompletableFuture<Integer> g = new CompletableFuture<>();
1730 <        final SubtractAction r = new SubtractAction();
1731 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1152 <
1153 <        g.complete(v2);
1154 <        checkIncomplete(h);
1155 <        assertFalse(r.ran());
1156 <        f.complete(v1);
1730 >        final CFException ex = new CFException();
1731 >        final SubtractAction r = new SubtractAction(m);
1732  
1733 <        checkCompletedNormally(h, null);
1734 <        assertEquals(r.value, subtract(v1, v2));
1735 <        checkCompletedNormally(f, v1);
1736 <        checkCompletedNormally(g, v2);
1733 >        assertTrue((fFirst ? f : g).complete(v1));
1734 >        if (!createIncomplete)
1735 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1736 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1737 >        if (createIncomplete) {
1738 >            checkIncomplete(h);
1739 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1740          }
1163    }
1741  
1742 <    public void testThenAcceptBoth_normalCompletion3() {
1742 >        checkCompletedWithWrappedException(h, ex);
1743 >        r.assertNotInvoked();
1744 >        checkCompletedNormally(fFirst ? f : g, v1);
1745 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1746 >    }}
1747 >
1748 >    /**
1749 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1750 >     */
1751 >    public void testThenAcceptBoth_sourceCancelled() {
1752          for (ExecutionMode m : ExecutionMode.values())
1753 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1754 +        for (boolean createIncomplete : new boolean[] { true, false })
1755 +        for (boolean fFirst : new boolean[] { true, false })
1756          for (Integer v1 : new Integer[] { 1, null })
1757 <        for (Integer v2 : new Integer[] { 2, null }) {
1169 <
1757 >    {
1758          final CompletableFuture<Integer> f = new CompletableFuture<>();
1759          final CompletableFuture<Integer> g = new CompletableFuture<>();
1760 <        final SubtractAction r = new SubtractAction();
1760 >        final SubtractAction r = new SubtractAction(m);
1761  
1762 <        g.complete(v2);
1763 <        f.complete(v1);
1762 >        assertTrue((fFirst ? f : g).complete(v1));
1763 >        if (!createIncomplete)
1764 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1765          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1766 <
1767 <        checkCompletedNormally(h, null);
1768 <        assertEquals(r.value, subtract(v1, v2));
1180 <        checkCompletedNormally(f, v1);
1181 <        checkCompletedNormally(g, v2);
1766 >        if (createIncomplete) {
1767 >            checkIncomplete(h);
1768 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1769          }
1183    }
1770  
1771 <    public void testThenAcceptBoth_normalCompletion4() {
1771 >        checkCompletedWithWrappedCancellationException(h);
1772 >        checkCancelled(!fFirst ? f : g);
1773 >        r.assertNotInvoked();
1774 >        checkCompletedNormally(fFirst ? f : g, v1);
1775 >    }}
1776 >
1777 >    /**
1778 >     * thenAcceptBoth result completes exceptionally if action does
1779 >     */
1780 >    public void testThenAcceptBoth_actionFailed() {
1781          for (ExecutionMode m : ExecutionMode.values())
1782 +        for (boolean fFirst : new boolean[] { true, false })
1783          for (Integer v1 : new Integer[] { 1, null })
1784 <        for (Integer v2 : new Integer[] { 2, null }) {
1785 <
1784 >        for (Integer v2 : new Integer[] { 2, null })
1785 >    {
1786          final CompletableFuture<Integer> f = new CompletableFuture<>();
1787          final CompletableFuture<Integer> g = new CompletableFuture<>();
1788 <        final SubtractAction r = new SubtractAction();
1193 <
1194 <        f.complete(v1);
1195 <        g.complete(v2);
1788 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1789          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1790  
1791 <        checkCompletedNormally(h, null);
1792 <        assertEquals(r.value, subtract(v1, v2));
1791 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1792 >        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1793 >
1794 >        checkCompletedWithWrappedCFException(h);
1795          checkCompletedNormally(f, v1);
1796          checkCompletedNormally(g, v2);
1797 <        }
1203 <    }
1797 >    }}
1798  
1799      /**
1800 <     * thenAcceptBoth result completes exceptionally after exceptional
1801 <     * completion of either source
1800 >     * runAfterBoth result completes normally after normal
1801 >     * completion of sources
1802       */
1803 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1803 >    public void testRunAfterBoth_normalCompletion() {
1804          for (ExecutionMode m : ExecutionMode.values())
1805 <        for (Integer v1 : new Integer[] { 1, null }) {
1806 <
1805 >        for (boolean createIncomplete : new boolean[] { true, false })
1806 >        for (boolean fFirst : new boolean[] { true, false })
1807 >        for (Integer v1 : new Integer[] { 1, null })
1808 >        for (Integer v2 : new Integer[] { 2, null })
1809 >    {
1810          final CompletableFuture<Integer> f = new CompletableFuture<>();
1811          final CompletableFuture<Integer> g = new CompletableFuture<>();
1812 <        final SubtractAction r = new SubtractAction();
1216 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1217 <        final CFException ex = new CFException();
1812 >        final Noop r = new Noop(m);
1813  
1814 <        f.completeExceptionally(ex);
1815 <        checkIncomplete(h);
1816 <        g.complete(v1);
1817 <
1818 <        checkCompletedWithWrappedCFException(h, ex);
1819 <        checkCompletedWithWrappedCFException(f, ex);
1820 <        assertFalse(r.ran());
1821 <        checkCompletedNormally(g, v1);
1814 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1815 >        if (!createIncomplete)
1816 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1817 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1818 >        if (createIncomplete) {
1819 >            checkIncomplete(h);
1820 >            r.assertNotInvoked();
1821 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1822          }
1228    }
1229
1230    public void testThenAcceptBoth_exceptionalCompletion2() {
1231        for (ExecutionMode m : ExecutionMode.values())
1232        for (Integer v1 : new Integer[] { 1, null }) {
1233
1234        final CompletableFuture<Integer> f = new CompletableFuture<>();
1235        final CompletableFuture<Integer> g = new CompletableFuture<>();
1236        final SubtractAction r = new SubtractAction();
1237        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1238        final CFException ex = new CFException();
1823  
1824 <        g.completeExceptionally(ex);
1825 <        checkIncomplete(h);
1242 <        f.complete(v1);
1243 <
1244 <        checkCompletedWithWrappedCFException(h, ex);
1245 <        checkCompletedWithWrappedCFException(g, ex);
1246 <        assertFalse(r.ran());
1824 >        checkCompletedNormally(h, null);
1825 >        r.assertInvoked();
1826          checkCompletedNormally(f, v1);
1827 <        }
1828 <    }
1827 >        checkCompletedNormally(g, v2);
1828 >    }}
1829  
1830 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1830 >    /**
1831 >     * runAfterBoth result completes exceptionally after exceptional
1832 >     * completion of either source
1833 >     */
1834 >    public void testRunAfterBoth_exceptionalCompletion() {
1835          for (ExecutionMode m : ExecutionMode.values())
1836 <        for (Integer v1 : new Integer[] { 1, null }) {
1837 <
1836 >        for (boolean createIncomplete : new boolean[] { true, false })
1837 >        for (boolean fFirst : new boolean[] { true, false })
1838 >        for (Integer v1 : new Integer[] { 1, null })
1839 >    {
1840          final CompletableFuture<Integer> f = new CompletableFuture<>();
1841          final CompletableFuture<Integer> g = new CompletableFuture<>();
1257        final SubtractAction r = new SubtractAction();
1842          final CFException ex = new CFException();
1843 +        final Noop r = new Noop(m);
1844  
1845 <        g.completeExceptionally(ex);
1846 <        f.complete(v1);
1847 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1848 <
1849 <        checkCompletedWithWrappedCFException(h, ex);
1850 <        checkCompletedWithWrappedCFException(g, ex);
1851 <        assertFalse(r.ran());
1267 <        checkCompletedNormally(f, v1);
1845 >        assertTrue((fFirst ? f : g).complete(v1));
1846 >        if (!createIncomplete)
1847 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1848 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1849 >        if (createIncomplete) {
1850 >            checkIncomplete(h);
1851 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1852          }
1269    }
1853  
1854 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1855 <        for (ExecutionMode m : ExecutionMode.values())
1856 <        for (Integer v1 : new Integer[] { 1, null }) {
1854 >        checkCompletedWithWrappedException(h, ex);
1855 >        r.assertNotInvoked();
1856 >        checkCompletedNormally(fFirst ? f : g, v1);
1857 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1858 >    }}
1859  
1860 +    /**
1861 +     * runAfterBoth result completes exceptionally if either source cancelled
1862 +     */
1863 +    public void testRunAfterBoth_sourceCancelled() {
1864 +        for (ExecutionMode m : ExecutionMode.values())
1865 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1866 +        for (boolean createIncomplete : new boolean[] { true, false })
1867 +        for (boolean fFirst : new boolean[] { true, false })
1868 +        for (Integer v1 : new Integer[] { 1, null })
1869 +    {
1870          final CompletableFuture<Integer> f = new CompletableFuture<>();
1871          final CompletableFuture<Integer> g = new CompletableFuture<>();
1872 <        final SubtractAction r = new SubtractAction();
1278 <        final CFException ex = new CFException();
1872 >        final Noop r = new Noop(m);
1873  
1874 <        f.completeExceptionally(ex);
1875 <        g.complete(v1);
1876 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1877 <
1878 <        checkCompletedWithWrappedCFException(h, ex);
1879 <        checkCompletedWithWrappedCFException(f, ex);
1880 <        assertFalse(r.ran());
1287 <        checkCompletedNormally(g, v1);
1874 >        assertTrue((fFirst ? f : g).complete(v1));
1875 >        if (!createIncomplete)
1876 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1877 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1878 >        if (createIncomplete) {
1879 >            checkIncomplete(h);
1880 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1881          }
1882 <    }
1882 >
1883 >        checkCompletedWithWrappedCancellationException(h);
1884 >        checkCancelled(!fFirst ? f : g);
1885 >        r.assertNotInvoked();
1886 >        checkCompletedNormally(fFirst ? f : g, v1);
1887 >    }}
1888  
1889      /**
1890 <     * thenAcceptBoth result completes exceptionally if action does
1890 >     * runAfterBoth result completes exceptionally if action does
1891       */
1892 <    public void testThenAcceptBoth_actionFailed1() {
1892 >    public void testRunAfterBoth_actionFailed() {
1893          for (ExecutionMode m : ExecutionMode.values())
1894 +        for (boolean fFirst : new boolean[] { true, false })
1895          for (Integer v1 : new Integer[] { 1, null })
1896 <        for (Integer v2 : new Integer[] { 2, null }) {
1897 <
1896 >        for (Integer v2 : new Integer[] { 2, null })
1897 >    {
1898          final CompletableFuture<Integer> f = new CompletableFuture<>();
1899          final CompletableFuture<Integer> g = new CompletableFuture<>();
1900 <        final FailingBiConsumer r = new FailingBiConsumer();
1901 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1900 >        final FailingRunnable r1 = new FailingRunnable(m);
1901 >        final FailingRunnable r2 = new FailingRunnable(m);
1902  
1903 <        f.complete(v1);
1904 <        checkIncomplete(h);
1905 <        g.complete(v2);
1903 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1904 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1905 >        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1906 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1907  
1908 <        checkCompletedWithWrappedCFException(h);
1908 >        checkCompletedWithWrappedCFException(h1);
1909 >        checkCompletedWithWrappedCFException(h2);
1910          checkCompletedNormally(f, v1);
1911          checkCompletedNormally(g, v2);
1912 <        }
1312 <    }
1912 >    }}
1913  
1914 <    public void testThenAcceptBoth_actionFailed2() {
1914 >    /**
1915 >     * applyToEither result completes normally after normal completion
1916 >     * of either source
1917 >     */
1918 >    public void testApplyToEither_normalCompletion() {
1919          for (ExecutionMode m : ExecutionMode.values())
1920          for (Integer v1 : new Integer[] { 1, null })
1921 <        for (Integer v2 : new Integer[] { 2, null }) {
1922 <
1921 >        for (Integer v2 : new Integer[] { 2, null })
1922 >    {
1923          final CompletableFuture<Integer> f = new CompletableFuture<>();
1924          final CompletableFuture<Integer> g = new CompletableFuture<>();
1925 <        final FailingBiConsumer r = new FailingBiConsumer();
1926 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1925 >        final IncFunction[] rs = new IncFunction[6];
1926 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1927  
1928 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1929 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1930 +        checkIncomplete(h0);
1931 +        checkIncomplete(h1);
1932 +        rs[0].assertNotInvoked();
1933 +        rs[1].assertNotInvoked();
1934 +        f.complete(v1);
1935 +        checkCompletedNormally(h0, inc(v1));
1936 +        checkCompletedNormally(h1, inc(v1));
1937 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1938 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1939 +        checkCompletedNormally(h2, inc(v1));
1940 +        checkCompletedNormally(h3, inc(v1));
1941          g.complete(v2);
1325        checkIncomplete(h);
1326        f.complete(v1);
1942  
1943 <        checkCompletedWithWrappedCFException(h);
1943 >        // unspecified behavior - both source completions available
1944 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1945 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1946 >        rs[4].assertValue(h4.join());
1947 >        rs[5].assertValue(h5.join());
1948 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1949 >                   Objects.equals(inc(v2), h4.join()));
1950 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1951 >                   Objects.equals(inc(v2), h5.join()));
1952 >
1953          checkCompletedNormally(f, v1);
1954          checkCompletedNormally(g, v2);
1955 <        }
1956 <    }
1955 >        checkCompletedNormally(h0, inc(v1));
1956 >        checkCompletedNormally(h1, inc(v1));
1957 >        checkCompletedNormally(h2, inc(v1));
1958 >        checkCompletedNormally(h3, inc(v1));
1959 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1960 >    }}
1961  
1962      /**
1963 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1963 >     * applyToEither result completes exceptionally after exceptional
1964 >     * completion of either source
1965       */
1966 <    public void testThenAcceptBoth_sourceCancelled1() {
1966 >    public void testApplyToEither_exceptionalCompletion() {
1967          for (ExecutionMode m : ExecutionMode.values())
1968 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1969 <        for (Integer v1 : new Integer[] { 1, null }) {
1341 <
1968 >        for (Integer v1 : new Integer[] { 1, null })
1969 >    {
1970          final CompletableFuture<Integer> f = new CompletableFuture<>();
1971          final CompletableFuture<Integer> g = new CompletableFuture<>();
1972 <        final SubtractAction r = new SubtractAction();
1973 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1972 >        final CFException ex = new CFException();
1973 >        final IncFunction[] rs = new IncFunction[6];
1974 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1975  
1976 <        assertTrue(f.cancel(mayInterruptIfRunning));
1977 <        checkIncomplete(h);
1976 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1977 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1978 >        checkIncomplete(h0);
1979 >        checkIncomplete(h1);
1980 >        rs[0].assertNotInvoked();
1981 >        rs[1].assertNotInvoked();
1982 >        f.completeExceptionally(ex);
1983 >        checkCompletedWithWrappedException(h0, ex);
1984 >        checkCompletedWithWrappedException(h1, ex);
1985 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1986 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1987 >        checkCompletedWithWrappedException(h2, ex);
1988 >        checkCompletedWithWrappedException(h3, ex);
1989          g.complete(v1);
1990  
1991 <        checkCompletedWithWrappedCancellationException(h);
1992 <        checkCancelled(f);
1993 <        assertFalse(r.ran());
1994 <        checkCompletedNormally(g, v1);
1991 >        // unspecified behavior - both source completions available
1992 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1993 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1994 >        try {
1995 >            assertEquals(inc(v1), h4.join());
1996 >            rs[4].assertValue(inc(v1));
1997 >        } catch (CompletionException ok) {
1998 >            checkCompletedWithWrappedException(h4, ex);
1999 >            rs[4].assertNotInvoked();
2000 >        }
2001 >        try {
2002 >            assertEquals(inc(v1), h5.join());
2003 >            rs[5].assertValue(inc(v1));
2004 >        } catch (CompletionException ok) {
2005 >            checkCompletedWithWrappedException(h5, ex);
2006 >            rs[5].assertNotInvoked();
2007          }
1356    }
2008  
2009 <    public void testThenAcceptBoth_sourceCancelled2() {
2010 <        for (ExecutionMode m : ExecutionMode.values())
2011 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2012 <        for (Integer v1 : new Integer[] { 1, null }) {
2009 >        checkCompletedExceptionally(f, ex);
2010 >        checkCompletedNormally(g, v1);
2011 >        checkCompletedWithWrappedException(h0, ex);
2012 >        checkCompletedWithWrappedException(h1, ex);
2013 >        checkCompletedWithWrappedException(h2, ex);
2014 >        checkCompletedWithWrappedException(h3, ex);
2015 >        checkCompletedWithWrappedException(h4, ex);
2016 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2017 >    }}
2018  
2019 +    public void testApplyToEither_exceptionalCompletion2() {
2020 +        for (ExecutionMode m : ExecutionMode.values())
2021 +        for (boolean fFirst : new boolean[] { true, false })
2022 +        for (Integer v1 : new Integer[] { 1, null })
2023 +    {
2024          final CompletableFuture<Integer> f = new CompletableFuture<>();
2025          final CompletableFuture<Integer> g = new CompletableFuture<>();
2026 <        final SubtractAction r = new SubtractAction();
2027 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2026 >        final CFException ex = new CFException();
2027 >        final IncFunction[] rs = new IncFunction[6];
2028 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2029  
2030 <        assertTrue(g.cancel(mayInterruptIfRunning));
2031 <        checkIncomplete(h);
2032 <        f.complete(v1);
2030 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2031 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2032 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2033 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2034 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2035 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2036  
2037 <        checkCompletedWithWrappedCancellationException(h);
2038 <        checkCancelled(g);
2039 <        assertFalse(r.ran());
2040 <        checkCompletedNormally(f, v1);
2037 >        // unspecified behavior - both source completions available
2038 >        try {
2039 >            assertEquals(inc(v1), h0.join());
2040 >            rs[0].assertValue(inc(v1));
2041 >        } catch (CompletionException ok) {
2042 >            checkCompletedWithWrappedException(h0, ex);
2043 >            rs[0].assertNotInvoked();
2044 >        }
2045 >        try {
2046 >            assertEquals(inc(v1), h1.join());
2047 >            rs[1].assertValue(inc(v1));
2048 >        } catch (CompletionException ok) {
2049 >            checkCompletedWithWrappedException(h1, ex);
2050 >            rs[1].assertNotInvoked();
2051 >        }
2052 >        try {
2053 >            assertEquals(inc(v1), h2.join());
2054 >            rs[2].assertValue(inc(v1));
2055 >        } catch (CompletionException ok) {
2056 >            checkCompletedWithWrappedException(h2, ex);
2057 >            rs[2].assertNotInvoked();
2058 >        }
2059 >        try {
2060 >            assertEquals(inc(v1), h3.join());
2061 >            rs[3].assertValue(inc(v1));
2062 >        } catch (CompletionException ok) {
2063 >            checkCompletedWithWrappedException(h3, ex);
2064 >            rs[3].assertNotInvoked();
2065          }
1377    }
1378
1379    public void testThenAcceptBoth_sourceCancelled3() {
1380        for (ExecutionMode m : ExecutionMode.values())
1381        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1382        for (Integer v1 : new Integer[] { 1, null }) {
1383
1384        final CompletableFuture<Integer> f = new CompletableFuture<>();
1385        final CompletableFuture<Integer> g = new CompletableFuture<>();
1386        final SubtractAction r = new SubtractAction();
1387
1388        assertTrue(g.cancel(mayInterruptIfRunning));
1389        f.complete(v1);
1390        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2066  
1392        checkCompletedWithWrappedCancellationException(h);
1393        checkCancelled(g);
1394        assertFalse(r.ran());
2067          checkCompletedNormally(f, v1);
2068 <        }
2069 <    }
2068 >        checkCompletedExceptionally(g, ex);
2069 >    }}
2070  
2071 <    public void testThenAcceptBoth_sourceCancelled4() {
2071 >    /**
2072 >     * applyToEither result completes exceptionally if either source cancelled
2073 >     */
2074 >    public void testApplyToEither_sourceCancelled() {
2075          for (ExecutionMode m : ExecutionMode.values())
2076          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2077 <        for (Integer v1 : new Integer[] { 1, null }) {
2078 <
2077 >        for (Integer v1 : new Integer[] { 1, null })
2078 >    {
2079          final CompletableFuture<Integer> f = new CompletableFuture<>();
2080          final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 <        final SubtractAction r = new SubtractAction();
2081 >        final IncFunction[] rs = new IncFunction[6];
2082 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2083  
2084 <        assertTrue(f.cancel(mayInterruptIfRunning));
2084 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2085 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2086 >        checkIncomplete(h0);
2087 >        checkIncomplete(h1);
2088 >        rs[0].assertNotInvoked();
2089 >        rs[1].assertNotInvoked();
2090 >        f.cancel(mayInterruptIfRunning);
2091 >        checkCompletedWithWrappedCancellationException(h0);
2092 >        checkCompletedWithWrappedCancellationException(h1);
2093 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2094 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2095 >        checkCompletedWithWrappedCancellationException(h2);
2096 >        checkCompletedWithWrappedCancellationException(h3);
2097          g.complete(v1);
1410        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2098  
2099 <        checkCompletedWithWrappedCancellationException(h);
2099 >        // unspecified behavior - both source completions available
2100 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2101 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2102 >        try {
2103 >            assertEquals(inc(v1), h4.join());
2104 >            rs[4].assertValue(inc(v1));
2105 >        } catch (CompletionException ok) {
2106 >            checkCompletedWithWrappedCancellationException(h4);
2107 >            rs[4].assertNotInvoked();
2108 >        }
2109 >        try {
2110 >            assertEquals(inc(v1), h5.join());
2111 >            rs[5].assertValue(inc(v1));
2112 >        } catch (CompletionException ok) {
2113 >            checkCompletedWithWrappedCancellationException(h5);
2114 >            rs[5].assertNotInvoked();
2115 >        }
2116 >
2117          checkCancelled(f);
1414        assertFalse(r.ran());
2118          checkCompletedNormally(g, v1);
2119 <        }
2120 <    }
2119 >        checkCompletedWithWrappedCancellationException(h0);
2120 >        checkCompletedWithWrappedCancellationException(h1);
2121 >        checkCompletedWithWrappedCancellationException(h2);
2122 >        checkCompletedWithWrappedCancellationException(h3);
2123 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2124 >    }}
2125  
2126 <    /**
1420 <     * runAfterBoth result completes normally after normal
1421 <     * completion of sources
1422 <     */
1423 <    public void testRunAfterBoth_normalCompletion1() {
2126 >    public void testApplyToEither_sourceCancelled2() {
2127          for (ExecutionMode m : ExecutionMode.values())
2128 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2129 +        for (boolean fFirst : new boolean[] { true, false })
2130          for (Integer v1 : new Integer[] { 1, null })
2131 <        for (Integer v2 : new Integer[] { 2, null }) {
1427 <
2131 >    {
2132          final CompletableFuture<Integer> f = new CompletableFuture<>();
2133          final CompletableFuture<Integer> g = new CompletableFuture<>();
2134 <        final Noop r = new Noop();
2135 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2134 >        final IncFunction[] rs = new IncFunction[6];
2135 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2136  
2137 <        f.complete(v1);
2138 <        checkIncomplete(h);
2139 <        assertFalse(r.ran);
2140 <        g.complete(v2);
2137 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2138 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2139 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2140 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2141 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2142 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2143  
2144 <        checkCompletedNormally(h, null);
2145 <        assertTrue(r.ran);
2146 <        checkCompletedNormally(f, v1);
2147 <        checkCompletedNormally(g, v2);
2144 >        // unspecified behavior - both source completions available
2145 >        try {
2146 >            assertEquals(inc(v1), h0.join());
2147 >            rs[0].assertValue(inc(v1));
2148 >        } catch (CompletionException ok) {
2149 >            checkCompletedWithWrappedCancellationException(h0);
2150 >            rs[0].assertNotInvoked();
2151 >        }
2152 >        try {
2153 >            assertEquals(inc(v1), h1.join());
2154 >            rs[1].assertValue(inc(v1));
2155 >        } catch (CompletionException ok) {
2156 >            checkCompletedWithWrappedCancellationException(h1);
2157 >            rs[1].assertNotInvoked();
2158 >        }
2159 >        try {
2160 >            assertEquals(inc(v1), h2.join());
2161 >            rs[2].assertValue(inc(v1));
2162 >        } catch (CompletionException ok) {
2163 >            checkCompletedWithWrappedCancellationException(h2);
2164 >            rs[2].assertNotInvoked();
2165 >        }
2166 >        try {
2167 >            assertEquals(inc(v1), h3.join());
2168 >            rs[3].assertValue(inc(v1));
2169 >        } catch (CompletionException ok) {
2170 >            checkCompletedWithWrappedCancellationException(h3);
2171 >            rs[3].assertNotInvoked();
2172          }
1443    }
1444
1445    public void testRunAfterBoth_normalCompletion2() {
1446        for (ExecutionMode m : ExecutionMode.values())
1447        for (Integer v1 : new Integer[] { 1, null })
1448        for (Integer v2 : new Integer[] { 2, null }) {
1449
1450        final CompletableFuture<Integer> f = new CompletableFuture<>();
1451        final CompletableFuture<Integer> g = new CompletableFuture<>();
1452        final Noop r = new Noop();
1453        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1454
1455        g.complete(v2);
1456        checkIncomplete(h);
1457        assertFalse(r.ran);
1458        f.complete(v1);
2173  
1460        checkCompletedNormally(h, null);
1461        assertTrue(r.ran);
2174          checkCompletedNormally(f, v1);
2175 <        checkCompletedNormally(g, v2);
2176 <        }
1465 <    }
2175 >        checkCancelled(g);
2176 >    }}
2177  
2178 <    public void testRunAfterBoth_normalCompletion3() {
2178 >    /**
2179 >     * applyToEither result completes exceptionally if action does
2180 >     */
2181 >    public void testApplyToEither_actionFailed() {
2182          for (ExecutionMode m : ExecutionMode.values())
2183          for (Integer v1 : new Integer[] { 1, null })
2184 <        for (Integer v2 : new Integer[] { 2, null }) {
2185 <
2184 >        for (Integer v2 : new Integer[] { 2, null })
2185 >    {
2186          final CompletableFuture<Integer> f = new CompletableFuture<>();
2187          final CompletableFuture<Integer> g = new CompletableFuture<>();
2188 <        final Noop r = new Noop();
2188 >        final FailingFunction[] rs = new FailingFunction[6];
2189 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2190 >
2191 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2192 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2193 >        f.complete(v1);
2194 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2195 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2196 >        checkCompletedWithWrappedCFException(h0);
2197 >        checkCompletedWithWrappedCFException(h1);
2198 >        checkCompletedWithWrappedCFException(h2);
2199 >        checkCompletedWithWrappedCFException(h3);
2200 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2201  
2202          g.complete(v2);
1477        f.complete(v1);
1478        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2203  
2204 <        checkCompletedNormally(h, null);
2205 <        assertTrue(r.ran);
2204 >        // unspecified behavior - both source completions available
2205 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2206 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2207 >
2208 >        checkCompletedWithWrappedCFException(h4);
2209 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2210 >                   Objects.equals(v2, rs[4].value));
2211 >        checkCompletedWithWrappedCFException(h5);
2212 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2213 >                   Objects.equals(v2, rs[5].value));
2214 >
2215          checkCompletedNormally(f, v1);
2216          checkCompletedNormally(g, v2);
2217 <        }
1485 <    }
2217 >    }}
2218  
2219 <    public void testRunAfterBoth_normalCompletion4() {
2219 >    /**
2220 >     * acceptEither result completes normally after normal completion
2221 >     * of either source
2222 >     */
2223 >    public void testAcceptEither_normalCompletion() {
2224          for (ExecutionMode m : ExecutionMode.values())
2225          for (Integer v1 : new Integer[] { 1, null })
2226 <        for (Integer v2 : new Integer[] { 2, null }) {
2227 <
2226 >        for (Integer v2 : new Integer[] { 2, null })
2227 >    {
2228          final CompletableFuture<Integer> f = new CompletableFuture<>();
2229          final CompletableFuture<Integer> g = new CompletableFuture<>();
2230 <        final Noop r = new Noop();
2230 >        final NoopConsumer[] rs = new NoopConsumer[6];
2231 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2232  
2233 <        f.complete(v1);
2233 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2234 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2235 >        checkIncomplete(h0);
2236 >        checkIncomplete(h1);
2237 >        rs[0].assertNotInvoked();
2238 >        rs[1].assertNotInvoked();
2239 >        f.complete(v1);
2240 >        checkCompletedNormally(h0, null);
2241 >        checkCompletedNormally(h1, null);
2242 >        rs[0].assertValue(v1);
2243 >        rs[1].assertValue(v1);
2244 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2245 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2246 >        checkCompletedNormally(h2, null);
2247 >        checkCompletedNormally(h3, null);
2248 >        rs[2].assertValue(v1);
2249 >        rs[3].assertValue(v1);
2250          g.complete(v2);
1498        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2251  
2252 <        checkCompletedNormally(h, null);
2253 <        assertTrue(r.ran);
2252 >        // unspecified behavior - both source completions available
2253 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2254 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2255 >        checkCompletedNormally(h4, null);
2256 >        checkCompletedNormally(h5, null);
2257 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2258 >                   Objects.equals(v2, rs[4].value));
2259 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2260 >                   Objects.equals(v2, rs[5].value));
2261 >
2262          checkCompletedNormally(f, v1);
2263          checkCompletedNormally(g, v2);
2264 <        }
2265 <    }
2264 >        checkCompletedNormally(h0, null);
2265 >        checkCompletedNormally(h1, null);
2266 >        checkCompletedNormally(h2, null);
2267 >        checkCompletedNormally(h3, null);
2268 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2269 >    }}
2270  
2271      /**
2272 <     * runAfterBoth result completes exceptionally after exceptional
2272 >     * acceptEither result completes exceptionally after exceptional
2273       * completion of either source
2274       */
2275 <    public void testRunAfterBoth_exceptionalCompletion1() {
2275 >    public void testAcceptEither_exceptionalCompletion() {
2276          for (ExecutionMode m : ExecutionMode.values())
2277 <        for (Integer v1 : new Integer[] { 1, null }) {
2278 <
2277 >        for (Integer v1 : new Integer[] { 1, null })
2278 >    {
2279          final CompletableFuture<Integer> f = new CompletableFuture<>();
2280          final CompletableFuture<Integer> g = new CompletableFuture<>();
1517        final Noop r = new Noop();
1518        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2281          final CFException ex = new CFException();
2282 +        final NoopConsumer[] rs = new NoopConsumer[6];
2283 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2284  
2285 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2286 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2287 +        checkIncomplete(h0);
2288 +        checkIncomplete(h1);
2289 +        rs[0].assertNotInvoked();
2290 +        rs[1].assertNotInvoked();
2291          f.completeExceptionally(ex);
2292 <        checkIncomplete(h);
2292 >        checkCompletedWithWrappedException(h0, ex);
2293 >        checkCompletedWithWrappedException(h1, ex);
2294 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2295 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2296 >        checkCompletedWithWrappedException(h2, ex);
2297 >        checkCompletedWithWrappedException(h3, ex);
2298 >
2299          g.complete(v1);
2300  
2301 <        checkCompletedWithWrappedCFException(h, ex);
2302 <        checkCompletedWithWrappedCFException(f, ex);
2303 <        assertFalse(r.ran);
2304 <        checkCompletedNormally(g, v1);
2301 >        // unspecified behavior - both source completions available
2302 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2303 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2304 >        try {
2305 >            assertNull(h4.join());
2306 >            rs[4].assertValue(v1);
2307 >        } catch (CompletionException ok) {
2308 >            checkCompletedWithWrappedException(h4, ex);
2309 >            rs[4].assertNotInvoked();
2310 >        }
2311 >        try {
2312 >            assertNull(h5.join());
2313 >            rs[5].assertValue(v1);
2314 >        } catch (CompletionException ok) {
2315 >            checkCompletedWithWrappedException(h5, ex);
2316 >            rs[5].assertNotInvoked();
2317          }
1530    }
2318  
2319 <    public void testRunAfterBoth_exceptionalCompletion2() {
2320 <        for (ExecutionMode m : ExecutionMode.values())
2321 <        for (Integer v1 : new Integer[] { 1, null }) {
2319 >        checkCompletedExceptionally(f, ex);
2320 >        checkCompletedNormally(g, v1);
2321 >        checkCompletedWithWrappedException(h0, ex);
2322 >        checkCompletedWithWrappedException(h1, ex);
2323 >        checkCompletedWithWrappedException(h2, ex);
2324 >        checkCompletedWithWrappedException(h3, ex);
2325 >        checkCompletedWithWrappedException(h4, ex);
2326 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2327 >    }}
2328  
2329 +    public void testAcceptEither_exceptionalCompletion2() {
2330 +        for (ExecutionMode m : ExecutionMode.values())
2331 +        for (boolean fFirst : new boolean[] { true, false })
2332 +        for (Integer v1 : new Integer[] { 1, null })
2333 +    {
2334          final CompletableFuture<Integer> f = new CompletableFuture<>();
2335          final CompletableFuture<Integer> g = new CompletableFuture<>();
1538        final Noop r = new Noop();
1539        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2336          final CFException ex = new CFException();
2337 +        final NoopConsumer[] rs = new NoopConsumer[6];
2338 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2339  
2340 <        g.completeExceptionally(ex);
2341 <        checkIncomplete(h);
2342 <        f.complete(v1);
2340 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2341 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2342 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2343 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2344 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2345 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2346  
2347 <        checkCompletedWithWrappedCFException(h, ex);
2348 <        checkCompletedWithWrappedCFException(g, ex);
2349 <        assertFalse(r.ran);
2350 <        checkCompletedNormally(f, v1);
2347 >        // unspecified behavior - both source completions available
2348 >        try {
2349 >            assertEquals(null, h0.join());
2350 >            rs[0].assertValue(v1);
2351 >        } catch (CompletionException ok) {
2352 >            checkCompletedWithWrappedException(h0, ex);
2353 >            rs[0].assertNotInvoked();
2354 >        }
2355 >        try {
2356 >            assertEquals(null, h1.join());
2357 >            rs[1].assertValue(v1);
2358 >        } catch (CompletionException ok) {
2359 >            checkCompletedWithWrappedException(h1, ex);
2360 >            rs[1].assertNotInvoked();
2361 >        }
2362 >        try {
2363 >            assertEquals(null, h2.join());
2364 >            rs[2].assertValue(v1);
2365 >        } catch (CompletionException ok) {
2366 >            checkCompletedWithWrappedException(h2, ex);
2367 >            rs[2].assertNotInvoked();
2368 >        }
2369 >        try {
2370 >            assertEquals(null, h3.join());
2371 >            rs[3].assertValue(v1);
2372 >        } catch (CompletionException ok) {
2373 >            checkCompletedWithWrappedException(h3, ex);
2374 >            rs[3].assertNotInvoked();
2375          }
1551    }
1552
1553    public void testRunAfterBoth_exceptionalCompletion3() {
1554        for (ExecutionMode m : ExecutionMode.values())
1555        for (Integer v1 : new Integer[] { 1, null }) {
1556
1557        final CompletableFuture<Integer> f = new CompletableFuture<>();
1558        final CompletableFuture<Integer> g = new CompletableFuture<>();
1559        final Noop r = new Noop();
1560        final CFException ex = new CFException();
1561
1562        g.completeExceptionally(ex);
1563        f.complete(v1);
1564        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2376  
1566        checkCompletedWithWrappedCFException(h, ex);
1567        checkCompletedWithWrappedCFException(g, ex);
1568        assertFalse(r.ran);
2377          checkCompletedNormally(f, v1);
2378 <        }
2379 <    }
2378 >        checkCompletedExceptionally(g, ex);
2379 >    }}
2380  
2381 <    public void testRunAfterBoth_exceptionalCompletion4() {
2381 >    /**
2382 >     * acceptEither result completes exceptionally if either source cancelled
2383 >     */
2384 >    public void testAcceptEither_sourceCancelled() {
2385          for (ExecutionMode m : ExecutionMode.values())
2386 <        for (Integer v1 : new Integer[] { 1, null }) {
2387 <
2386 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2387 >        for (Integer v1 : new Integer[] { 1, null })
2388 >    {
2389          final CompletableFuture<Integer> f = new CompletableFuture<>();
2390          final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final Noop r = new Noop();
2392 <        final CFException ex = new CFException();
2391 >        final NoopConsumer[] rs = new NoopConsumer[6];
2392 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2393 >
2394 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2395 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2396 >        checkIncomplete(h0);
2397 >        checkIncomplete(h1);
2398 >        rs[0].assertNotInvoked();
2399 >        rs[1].assertNotInvoked();
2400 >        f.cancel(mayInterruptIfRunning);
2401 >        checkCompletedWithWrappedCancellationException(h0);
2402 >        checkCompletedWithWrappedCancellationException(h1);
2403 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2404 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2405 >        checkCompletedWithWrappedCancellationException(h2);
2406 >        checkCompletedWithWrappedCancellationException(h3);
2407  
1582        f.completeExceptionally(ex);
2408          g.complete(v1);
1584        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2409  
2410 <        checkCompletedWithWrappedCFException(h, ex);
2411 <        checkCompletedWithWrappedCFException(f, ex);
2412 <        assertFalse(r.ran);
2413 <        checkCompletedNormally(g, v1);
2410 >        // unspecified behavior - both source completions available
2411 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2412 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2413 >        try {
2414 >            assertNull(h4.join());
2415 >            rs[4].assertValue(v1);
2416 >        } catch (CompletionException ok) {
2417 >            checkCompletedWithWrappedCancellationException(h4);
2418 >            rs[4].assertNotInvoked();
2419 >        }
2420 >        try {
2421 >            assertNull(h5.join());
2422 >            rs[5].assertValue(v1);
2423 >        } catch (CompletionException ok) {
2424 >            checkCompletedWithWrappedCancellationException(h5);
2425 >            rs[5].assertNotInvoked();
2426          }
2427 <    }
2427 >
2428 >        checkCancelled(f);
2429 >        checkCompletedNormally(g, v1);
2430 >        checkCompletedWithWrappedCancellationException(h0);
2431 >        checkCompletedWithWrappedCancellationException(h1);
2432 >        checkCompletedWithWrappedCancellationException(h2);
2433 >        checkCompletedWithWrappedCancellationException(h3);
2434 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2435 >    }}
2436  
2437      /**
2438 <     * runAfterBoth result completes exceptionally if action does
2438 >     * acceptEither result completes exceptionally if action does
2439       */
2440 <    public void testRunAfterBoth_actionFailed1() {
2440 >    public void testAcceptEither_actionFailed() {
2441          for (ExecutionMode m : ExecutionMode.values())
2442          for (Integer v1 : new Integer[] { 1, null })
2443 <        for (Integer v2 : new Integer[] { 2, null }) {
2444 <
2443 >        for (Integer v2 : new Integer[] { 2, null })
2444 >    {
2445          final CompletableFuture<Integer> f = new CompletableFuture<>();
2446          final CompletableFuture<Integer> g = new CompletableFuture<>();
2447 <        final FailingNoop r = new FailingNoop();
2448 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2447 >        final FailingConsumer[] rs = new FailingConsumer[6];
2448 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2449 >
2450 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2451 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2452 >        f.complete(v1);
2453 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2454 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2455 >        checkCompletedWithWrappedCFException(h0);
2456 >        checkCompletedWithWrappedCFException(h1);
2457 >        checkCompletedWithWrappedCFException(h2);
2458 >        checkCompletedWithWrappedCFException(h3);
2459 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2460  
1606        f.complete(v1);
1607        checkIncomplete(h);
2461          g.complete(v2);
2462  
2463 <        checkCompletedWithWrappedCFException(h);
2463 >        // unspecified behavior - both source completions available
2464 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2465 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2466 >
2467 >        checkCompletedWithWrappedCFException(h4);
2468 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2469 >                   Objects.equals(v2, rs[4].value));
2470 >        checkCompletedWithWrappedCFException(h5);
2471 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2472 >                   Objects.equals(v2, rs[5].value));
2473 >
2474          checkCompletedNormally(f, v1);
2475          checkCompletedNormally(g, v2);
2476 <        }
1614 <    }
2476 >    }}
2477  
2478 <    public void testRunAfterBoth_actionFailed2() {
2478 >    /**
2479 >     * runAfterEither result completes normally after normal completion
2480 >     * of either source
2481 >     */
2482 >    public void testRunAfterEither_normalCompletion() {
2483          for (ExecutionMode m : ExecutionMode.values())
2484          for (Integer v1 : new Integer[] { 1, null })
2485 <        for (Integer v2 : new Integer[] { 2, null }) {
2486 <
2485 >        for (Integer v2 : new Integer[] { 2, null })
2486 >    {
2487          final CompletableFuture<Integer> f = new CompletableFuture<>();
2488          final CompletableFuture<Integer> g = new CompletableFuture<>();
2489 <        final FailingNoop r = new FailingNoop();
2490 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2489 >        final Noop[] rs = new Noop[6];
2490 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2491 >
2492 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2493 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2494 >        checkIncomplete(h0);
2495 >        checkIncomplete(h1);
2496 >        rs[0].assertNotInvoked();
2497 >        rs[1].assertNotInvoked();
2498 >        f.complete(v1);
2499 >        checkCompletedNormally(h0, null);
2500 >        checkCompletedNormally(h1, null);
2501 >        rs[0].assertInvoked();
2502 >        rs[1].assertInvoked();
2503 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2504 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2505 >        checkCompletedNormally(h2, null);
2506 >        checkCompletedNormally(h3, null);
2507 >        rs[2].assertInvoked();
2508 >        rs[3].assertInvoked();
2509  
2510          g.complete(v2);
1627        checkIncomplete(h);
1628        f.complete(v1);
2511  
2512 <        checkCompletedWithWrappedCFException(h);
2512 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2513 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2514 >
2515          checkCompletedNormally(f, v1);
2516          checkCompletedNormally(g, v2);
2517 <        }
2518 <    }
2517 >        checkCompletedNormally(h0, null);
2518 >        checkCompletedNormally(h1, null);
2519 >        checkCompletedNormally(h2, null);
2520 >        checkCompletedNormally(h3, null);
2521 >        checkCompletedNormally(h4, null);
2522 >        checkCompletedNormally(h5, null);
2523 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2524 >    }}
2525  
2526      /**
2527 <     * runAfterBoth result completes exceptionally if either source cancelled
2527 >     * runAfterEither result completes exceptionally after exceptional
2528 >     * completion of either source
2529       */
2530 <    public void testRunAfterBoth_sourceCancelled1() {
2530 >    public void testRunAfterEither_exceptionalCompletion() {
2531          for (ExecutionMode m : ExecutionMode.values())
2532 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2533 <        for (Integer v1 : new Integer[] { 1, null }) {
1643 <
2532 >        for (Integer v1 : new Integer[] { 1, null })
2533 >    {
2534          final CompletableFuture<Integer> f = new CompletableFuture<>();
2535          final CompletableFuture<Integer> g = new CompletableFuture<>();
2536 <        final Noop r = new Noop();
2537 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2536 >        final CFException ex = new CFException();
2537 >        final Noop[] rs = new Noop[6];
2538 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2539  
2540 <        assertTrue(f.cancel(mayInterruptIfRunning));
2541 <        checkIncomplete(h);
2542 <        g.complete(v1);
2540 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2541 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2542 >        checkIncomplete(h0);
2543 >        checkIncomplete(h1);
2544 >        rs[0].assertNotInvoked();
2545 >        rs[1].assertNotInvoked();
2546 >        assertTrue(f.completeExceptionally(ex));
2547 >        checkCompletedWithWrappedException(h0, ex);
2548 >        checkCompletedWithWrappedException(h1, ex);
2549 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2550 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2551 >        checkCompletedWithWrappedException(h2, ex);
2552 >        checkCompletedWithWrappedException(h3, ex);
2553 >
2554 >        assertTrue(g.complete(v1));
2555 >
2556 >        // unspecified behavior - both source completions available
2557 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2558 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2559 >        try {
2560 >            assertNull(h4.join());
2561 >            rs[4].assertInvoked();
2562 >        } catch (CompletionException ok) {
2563 >            checkCompletedWithWrappedException(h4, ex);
2564 >            rs[4].assertNotInvoked();
2565 >        }
2566 >        try {
2567 >            assertNull(h5.join());
2568 >            rs[5].assertInvoked();
2569 >        } catch (CompletionException ok) {
2570 >            checkCompletedWithWrappedException(h5, ex);
2571 >            rs[5].assertNotInvoked();
2572 >        }
2573  
2574 <        checkCompletedWithWrappedCancellationException(h);
1654 <        checkCancelled(f);
1655 <        assertFalse(r.ran);
2574 >        checkCompletedExceptionally(f, ex);
2575          checkCompletedNormally(g, v1);
2576 <        }
2577 <    }
2576 >        checkCompletedWithWrappedException(h0, ex);
2577 >        checkCompletedWithWrappedException(h1, ex);
2578 >        checkCompletedWithWrappedException(h2, ex);
2579 >        checkCompletedWithWrappedException(h3, ex);
2580 >        checkCompletedWithWrappedException(h4, ex);
2581 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2582 >    }}
2583  
2584 <    public void testRunAfterBoth_sourceCancelled2() {
2584 >    public void testRunAfterEither_exceptionalCompletion2() {
2585          for (ExecutionMode m : ExecutionMode.values())
2586 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2587 <        for (Integer v1 : new Integer[] { 1, null }) {
2588 <
2586 >        for (boolean fFirst : new boolean[] { true, false })
2587 >        for (Integer v1 : new Integer[] { 1, null })
2588 >    {
2589          final CompletableFuture<Integer> f = new CompletableFuture<>();
2590          final CompletableFuture<Integer> g = new CompletableFuture<>();
2591 <        final Noop r = new Noop();
2592 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2591 >        final CFException ex = new CFException();
2592 >        final Noop[] rs = new Noop[6];
2593 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2594  
2595 <        assertTrue(g.cancel(mayInterruptIfRunning));
2596 <        checkIncomplete(h);
2597 <        f.complete(v1);
2595 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2596 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2597 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2598 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2599 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2600 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2601  
2602 <        checkCompletedWithWrappedCancellationException(h);
2603 <        checkCancelled(g);
2604 <        assertFalse(r.ran);
2605 <        checkCompletedNormally(f, v1);
2602 >        // unspecified behavior - both source completions available
2603 >        try {
2604 >            assertEquals(null, h0.join());
2605 >            rs[0].assertInvoked();
2606 >        } catch (CompletionException ok) {
2607 >            checkCompletedWithWrappedException(h0, ex);
2608 >            rs[0].assertNotInvoked();
2609 >        }
2610 >        try {
2611 >            assertEquals(null, h1.join());
2612 >            rs[1].assertInvoked();
2613 >        } catch (CompletionException ok) {
2614 >            checkCompletedWithWrappedException(h1, ex);
2615 >            rs[1].assertNotInvoked();
2616 >        }
2617 >        try {
2618 >            assertEquals(null, h2.join());
2619 >            rs[2].assertInvoked();
2620 >        } catch (CompletionException ok) {
2621 >            checkCompletedWithWrappedException(h2, ex);
2622 >            rs[2].assertNotInvoked();
2623 >        }
2624 >        try {
2625 >            assertEquals(null, h3.join());
2626 >            rs[3].assertInvoked();
2627 >        } catch (CompletionException ok) {
2628 >            checkCompletedWithWrappedException(h3, ex);
2629 >            rs[3].assertNotInvoked();
2630          }
1679    }
1680
1681    public void testRunAfterBoth_sourceCancelled3() {
1682        for (ExecutionMode m : ExecutionMode.values())
1683        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1684        for (Integer v1 : new Integer[] { 1, null }) {
1685
1686        final CompletableFuture<Integer> f = new CompletableFuture<>();
1687        final CompletableFuture<Integer> g = new CompletableFuture<>();
1688        final Noop r = new Noop();
1689
1690        assertTrue(g.cancel(mayInterruptIfRunning));
1691        f.complete(v1);
1692        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2631  
1694        checkCompletedWithWrappedCancellationException(h);
1695        checkCancelled(g);
1696        assertFalse(r.ran);
2632          checkCompletedNormally(f, v1);
2633 <        }
2634 <    }
2633 >        checkCompletedExceptionally(g, ex);
2634 >    }}
2635  
2636 <    public void testRunAfterBoth_sourceCancelled4() {
2636 >    /**
2637 >     * runAfterEither result completes exceptionally if either source cancelled
2638 >     */
2639 >    public void testRunAfterEither_sourceCancelled() {
2640          for (ExecutionMode m : ExecutionMode.values())
2641          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2642 <        for (Integer v1 : new Integer[] { 1, null }) {
2643 <
2642 >        for (Integer v1 : new Integer[] { 1, null })
2643 >    {
2644          final CompletableFuture<Integer> f = new CompletableFuture<>();
2645          final CompletableFuture<Integer> g = new CompletableFuture<>();
2646 <        final Noop r = new Noop();
2646 >        final Noop[] rs = new Noop[6];
2647 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2648  
2649 <        assertTrue(f.cancel(mayInterruptIfRunning));
2650 <        g.complete(v1);
2651 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2649 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2650 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2651 >        checkIncomplete(h0);
2652 >        checkIncomplete(h1);
2653 >        rs[0].assertNotInvoked();
2654 >        rs[1].assertNotInvoked();
2655 >        f.cancel(mayInterruptIfRunning);
2656 >        checkCompletedWithWrappedCancellationException(h0);
2657 >        checkCompletedWithWrappedCancellationException(h1);
2658 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2659 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2660 >        checkCompletedWithWrappedCancellationException(h2);
2661 >        checkCompletedWithWrappedCancellationException(h3);
2662 >
2663 >        assertTrue(g.complete(v1));
2664 >
2665 >        // unspecified behavior - both source completions available
2666 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2667 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2668 >        try {
2669 >            assertNull(h4.join());
2670 >            rs[4].assertInvoked();
2671 >        } catch (CompletionException ok) {
2672 >            checkCompletedWithWrappedCancellationException(h4);
2673 >            rs[4].assertNotInvoked();
2674 >        }
2675 >        try {
2676 >            assertNull(h5.join());
2677 >            rs[5].assertInvoked();
2678 >        } catch (CompletionException ok) {
2679 >            checkCompletedWithWrappedCancellationException(h5);
2680 >            rs[5].assertNotInvoked();
2681 >        }
2682  
1714        checkCompletedWithWrappedCancellationException(h);
2683          checkCancelled(f);
1716        assertFalse(r.ran);
2684          checkCompletedNormally(g, v1);
2685 <        }
2686 <    }
2687 <
2688 <    /**
2689 <     * applyToEither result completes normally after normal completion
2690 <     * of either source
1724 <     */
1725 <    public void testApplyToEither() {
1726 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1727 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1728 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1729 <        f.complete(one);
1730 <        checkCompletedNormally(g, two);
1731 <        f2.complete(one);
1732 <        checkCompletedNormally(g, two);
1733 <
1734 <        f = new CompletableFuture<>();
1735 <        f.complete(one);
1736 <        f2 = new CompletableFuture<>();
1737 <        g = f.applyToEither(f2, inc);
1738 <        checkCompletedNormally(g, two);
1739 <    }
1740 <
1741 <    /**
1742 <     * applyToEither result completes exceptionally after exceptional
1743 <     * completion of either source
1744 <     */
1745 <    public void testApplyToEither2() {
1746 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1747 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1748 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1749 <        f.completeExceptionally(new CFException());
1750 <        f2.complete(one);
1751 <        checkCompletedWithWrappedCFException(g);
1752 <
1753 <        f = new CompletableFuture<>();
1754 <        f2 = new CompletableFuture<>();
1755 <        f2.completeExceptionally(new CFException());
1756 <        g = f.applyToEither(f2, inc);
1757 <        checkCompletedWithWrappedCFException(g);
1758 <    }
1759 <
1760 <    /**
1761 <     * applyToEither result completes exceptionally if action does
1762 <     */
1763 <    public void testApplyToEither3() {
1764 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1765 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1766 <        FailingFunction r = new FailingFunction();
1767 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1768 <        f2.complete(two);
1769 <        checkCompletedWithWrappedCFException(g);
1770 <    }
1771 <
1772 <    /**
1773 <     * applyToEither result completes exceptionally if either source cancelled
1774 <     */
1775 <    public void testApplyToEither4() {
1776 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1777 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1778 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1779 <        assertTrue(f.cancel(true));
1780 <        checkCompletedWithWrappedCancellationException(g);
1781 <        f = new CompletableFuture<>();
1782 <        f2 = new CompletableFuture<>();
1783 <        assertTrue(f2.cancel(true));
1784 <        checkCompletedWithWrappedCancellationException(g);
1785 <    }
1786 <
1787 <    /**
1788 <     * acceptEither result completes normally after normal completion
1789 <     * of either source
1790 <     */
1791 <    public void testAcceptEither() {
1792 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1793 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1794 <        IncAction r = new IncAction();
1795 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1796 <        f.complete(one);
1797 <        checkCompletedNormally(g, null);
1798 <        f2.complete(one);
1799 <        checkCompletedNormally(g, null);
1800 <        assertEquals(r.value, 2);
1801 <
1802 <        r = new IncAction();
1803 <        f = new CompletableFuture<>();
1804 <        f.complete(one);
1805 <        f2 = new CompletableFuture<>();
1806 <        g = f.acceptEither(f2, r);
1807 <        checkCompletedNormally(g, null);
1808 <        assertEquals(r.value, 2);
1809 <    }
1810 <
1811 <    /**
1812 <     * acceptEither result completes exceptionally after exceptional
1813 <     * completion of either source
1814 <     */
1815 <    public void testAcceptEither2() {
1816 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1817 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1818 <        IncAction r = new IncAction();
1819 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1820 <        f.completeExceptionally(new CFException());
1821 <        f2.complete(one);
1822 <        checkCompletedWithWrappedCFException(g);
1823 <
1824 <        r = new IncAction();
1825 <        f = new CompletableFuture<>();
1826 <        f2 = new CompletableFuture<>();
1827 <        f2.completeExceptionally(new CFException());
1828 <        g = f.acceptEither(f2, r);
1829 <        checkCompletedWithWrappedCFException(g);
1830 <    }
1831 <
1832 <    /**
1833 <     * acceptEither result completes exceptionally if action does
1834 <     */
1835 <    public void testAcceptEither3() {
1836 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1837 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1838 <        FailingConsumer r = new FailingConsumer();
1839 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1840 <        f2.complete(two);
1841 <        checkCompletedWithWrappedCFException(g);
1842 <    }
1843 <
1844 <    /**
1845 <     * acceptEither result completes exceptionally if either source cancelled
1846 <     */
1847 <    public void testAcceptEither4() {
1848 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1849 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1850 <        IncAction r = new IncAction();
1851 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1852 <        assertTrue(f.cancel(true));
1853 <        checkCompletedWithWrappedCancellationException(g);
1854 <        f = new CompletableFuture<>();
1855 <        f2 = new CompletableFuture<>();
1856 <        assertTrue(f2.cancel(true));
1857 <        checkCompletedWithWrappedCancellationException(g);
1858 <    }
1859 <
1860 <    /**
1861 <     * runAfterEither result completes normally after normal completion
1862 <     * of either source
1863 <     */
1864 <    public void testRunAfterEither() {
1865 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1866 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1867 <        Noop r = new Noop();
1868 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1869 <        f.complete(one);
1870 <        checkCompletedNormally(g, null);
1871 <        f2.complete(one);
1872 <        checkCompletedNormally(g, null);
1873 <        assertTrue(r.ran);
1874 <
1875 <        r = new Noop();
1876 <        f = new CompletableFuture<>();
1877 <        f.complete(one);
1878 <        f2 = new CompletableFuture<>();
1879 <        g = f.runAfterEither(f2, r);
1880 <        checkCompletedNormally(g, null);
1881 <        assertTrue(r.ran);
1882 <    }
1883 <
1884 <    /**
1885 <     * runAfterEither result completes exceptionally after exceptional
1886 <     * completion of either source
1887 <     */
1888 <    public void testRunAfterEither2() {
1889 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1890 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1891 <        Noop r = new Noop();
1892 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1893 <        f.completeExceptionally(new CFException());
1894 <        f2.complete(one);
1895 <        checkCompletedWithWrappedCFException(g);
1896 <
1897 <        r = new Noop();
1898 <        f = new CompletableFuture<>();
1899 <        f2 = new CompletableFuture<>();
1900 <        f2.completeExceptionally(new CFException());
1901 <        g = f.runAfterEither(f2, r);
1902 <        checkCompletedWithWrappedCFException(g);
1903 <    }
2685 >        checkCompletedWithWrappedCancellationException(h0);
2686 >        checkCompletedWithWrappedCancellationException(h1);
2687 >        checkCompletedWithWrappedCancellationException(h2);
2688 >        checkCompletedWithWrappedCancellationException(h3);
2689 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2690 >    }}
2691  
2692      /**
2693       * runAfterEither result completes exceptionally if action does
2694       */
2695 <    public void testRunAfterEither3() {
2696 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2697 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2698 <        FailingNoop r = new FailingNoop();
2699 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2700 <        f2.complete(two);
2701 <        checkCompletedWithWrappedCFException(g);
2702 <    }
2695 >    public void testRunAfterEither_actionFailed() {
2696 >        for (ExecutionMode m : ExecutionMode.values())
2697 >        for (Integer v1 : new Integer[] { 1, null })
2698 >        for (Integer v2 : new Integer[] { 2, null })
2699 >    {
2700 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2701 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2702 >        final FailingRunnable[] rs = new FailingRunnable[6];
2703 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2704  
2705 <    /**
2706 <     * runAfterEither result completes exceptionally if either source cancelled
2707 <     */
2708 <    public void testRunAfterEither4() {
2709 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2710 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2711 <        Noop r = new Noop();
2712 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2713 <        assertTrue(f.cancel(true));
2714 <        checkCompletedWithWrappedCancellationException(g);
2715 <        f = new CompletableFuture<>();
2716 <        f2 = new CompletableFuture<>();
2717 <        assertTrue(f2.cancel(true));
2718 <        checkCompletedWithWrappedCancellationException(g);
2719 <    }
2705 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2706 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2707 >        assertTrue(f.complete(v1));
2708 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2709 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2710 >        checkCompletedWithWrappedCFException(h0);
2711 >        checkCompletedWithWrappedCFException(h1);
2712 >        checkCompletedWithWrappedCFException(h2);
2713 >        checkCompletedWithWrappedCFException(h3);
2714 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2715 >        assertTrue(g.complete(v2));
2716 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2717 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2718 >        checkCompletedWithWrappedCFException(h4);
2719 >        checkCompletedWithWrappedCFException(h5);
2720 >
2721 >        checkCompletedNormally(f, v1);
2722 >        checkCompletedNormally(g, v2);
2723 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2724 >    }}
2725  
2726      /**
2727       * thenCompose result completes normally after normal completion of source
2728       */
2729 <    public void testThenCompose() {
2730 <        CompletableFuture<Integer> f, g;
2731 <        CompletableFutureInc r;
2732 <
2733 <        f = new CompletableFuture<>();
2734 <        g = f.thenCompose(r = new CompletableFutureInc());
2735 <        f.complete(one);
2736 <        checkCompletedNormally(g, two);
2737 <        assertTrue(r.ran);
2729 >    public void testThenCompose_normalCompletion() {
2730 >        for (ExecutionMode m : ExecutionMode.values())
2731 >        for (boolean createIncomplete : new boolean[] { true, false })
2732 >        for (Integer v1 : new Integer[] { 1, null })
2733 >    {
2734 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2735 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2736 >        if (!createIncomplete) assertTrue(f.complete(v1));
2737 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2738 >        if (createIncomplete) assertTrue(f.complete(v1));
2739  
2740 <        f = new CompletableFuture<>();
2741 <        f.complete(one);
2742 <        g = f.thenCompose(r = new CompletableFutureInc());
2743 <        checkCompletedNormally(g, two);
1950 <        assertTrue(r.ran);
1951 <    }
2740 >        checkCompletedNormally(g, inc(v1));
2741 >        checkCompletedNormally(f, v1);
2742 >        r.assertValue(v1);
2743 >    }}
2744  
2745      /**
2746       * thenCompose result completes exceptionally after exceptional
2747       * completion of source
2748       */
2749 <    public void testThenCompose2() {
2750 <        CompletableFuture<Integer> f, g;
2751 <        CompletableFutureInc r;
2752 <
2753 <        f = new CompletableFuture<>();
2754 <        g = f.thenCompose(r = new CompletableFutureInc());
2755 <        f.completeExceptionally(new CFException());
2756 <        checkCompletedWithWrappedCFException(g);
2757 <
2758 <        f = new CompletableFuture<>();
2759 <        f.completeExceptionally(new CFException());
2760 <        g = f.thenCompose(r = new CompletableFutureInc());
2761 <        checkCompletedWithWrappedCFException(g);
2762 <    }
2749 >    public void testThenCompose_exceptionalCompletion() {
2750 >        for (ExecutionMode m : ExecutionMode.values())
2751 >        for (boolean createIncomplete : new boolean[] { true, false })
2752 >    {
2753 >        final CFException ex = new CFException();
2754 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2755 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2756 >        if (!createIncomplete) f.completeExceptionally(ex);
2757 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2758 >        if (createIncomplete) f.completeExceptionally(ex);
2759 >
2760 >        checkCompletedWithWrappedException(g, ex);
2761 >        checkCompletedExceptionally(f, ex);
2762 >        r.assertNotInvoked();
2763 >    }}
2764  
2765      /**
2766       * thenCompose result completes exceptionally if action does
2767       */
2768 <    public void testThenCompose3() {
2769 <        CompletableFuture<Integer> f, g;
2770 <        FailingCompletableFutureFunction r;
2771 <
2772 <        f = new CompletableFuture<>();
2773 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2774 <        f.complete(one);
2775 <        checkCompletedWithWrappedCFException(g);
2768 >    public void testThenCompose_actionFailed() {
2769 >        for (ExecutionMode m : ExecutionMode.values())
2770 >        for (boolean createIncomplete : new boolean[] { true, false })
2771 >        for (Integer v1 : new Integer[] { 1, null })
2772 >    {
2773 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2774 >        final FailingCompletableFutureFunction r
2775 >            = new FailingCompletableFutureFunction(m);
2776 >        if (!createIncomplete) assertTrue(f.complete(v1));
2777 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2778 >        if (createIncomplete) assertTrue(f.complete(v1));
2779  
1984        f = new CompletableFuture<>();
1985        f.complete(one);
1986        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2780          checkCompletedWithWrappedCFException(g);
2781 <    }
2781 >        checkCompletedNormally(f, v1);
2782 >    }}
2783  
2784      /**
2785       * thenCompose result completes exceptionally if source cancelled
2786       */
2787 <    public void testThenCompose4() {
2788 <        CompletableFuture<Integer> f, g;
2789 <        CompletableFutureInc r;
2790 <
2791 <        f = new CompletableFuture<>();
2792 <        g = f.thenCompose(r = new CompletableFutureInc());
2793 <        assertTrue(f.cancel(true));
2794 <        checkCompletedWithWrappedCancellationException(g);
2795 <
2796 <        f = new CompletableFuture<>();
2797 <        assertTrue(f.cancel(true));
2798 <        g = f.thenCompose(r = new CompletableFutureInc());
2799 <        checkCompletedWithWrappedCancellationException(g);
2006 <    }
2007 <
2008 <    // asyncs
2009 <
2010 <    /**
2011 <     * thenRunAsync result completes normally after normal completion of source
2012 <     */
2013 <    public void testThenRunAsync() {
2014 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2015 <        Noop r = new Noop();
2016 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2017 <        f.complete(null);
2018 <        checkCompletedNormally(g, null);
2019 <
2020 <        // reordered version
2021 <        f = new CompletableFuture<>();
2022 <        f.complete(null);
2023 <        r = new Noop();
2024 <        g = f.thenRunAsync(r);
2025 <        checkCompletedNormally(g, null);
2026 <    }
2027 <
2028 <    /**
2029 <     * thenRunAsync result completes exceptionally after exceptional
2030 <     * completion of source
2031 <     */
2032 <    public void testThenRunAsync2() {
2033 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2034 <        Noop r = new Noop();
2035 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2036 <        f.completeExceptionally(new CFException());
2037 <        try {
2038 <            g.join();
2039 <            shouldThrow();
2040 <        } catch (CompletionException success) {}
2041 <        checkCompletedWithWrappedCFException(g);
2042 <    }
2043 <
2044 <    /**
2045 <     * thenRunAsync result completes exceptionally if action does
2046 <     */
2047 <    public void testThenRunAsync3() {
2048 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2049 <        FailingNoop r = new FailingNoop();
2050 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2051 <        f.complete(null);
2052 <        checkCompletedWithWrappedCFException(g);
2053 <    }
2054 <
2055 <    /**
2056 <     * thenRunAsync result completes exceptionally if source cancelled
2057 <     */
2058 <    public void testThenRunAsync4() {
2059 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2060 <        Noop r = new Noop();
2061 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2062 <        assertTrue(f.cancel(true));
2063 <        checkCompletedWithWrappedCancellationException(g);
2064 <    }
2065 <
2066 <    /**
2067 <     * thenApplyAsync result completes normally after normal completion of source
2068 <     */
2069 <    public void testThenApplyAsync() {
2070 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2071 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2072 <        f.complete(one);
2073 <        checkCompletedNormally(g, two);
2074 <    }
2075 <
2076 <    /**
2077 <     * thenApplyAsync result completes exceptionally after exceptional
2078 <     * completion of source
2079 <     */
2080 <    public void testThenApplyAsync2() {
2081 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2082 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2083 <        f.completeExceptionally(new CFException());
2084 <        checkCompletedWithWrappedCFException(g);
2085 <    }
2086 <
2087 <    /**
2088 <     * thenApplyAsync result completes exceptionally if action does
2089 <     */
2090 <    public void testThenApplyAsync3() {
2091 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2092 <        FailingFunction r = new FailingFunction();
2093 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2094 <        f.complete(null);
2095 <        checkCompletedWithWrappedCFException(g);
2096 <    }
2097 <
2098 <    /**
2099 <     * thenApplyAsync result completes exceptionally if source cancelled
2100 <     */
2101 <    public void testThenApplyAsync4() {
2102 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2103 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2104 <        assertTrue(f.cancel(true));
2105 <        checkCompletedWithWrappedCancellationException(g);
2106 <    }
2107 <
2108 <    /**
2109 <     * thenAcceptAsync result completes normally after normal
2110 <     * completion of source
2111 <     */
2112 <    public void testThenAcceptAsync() {
2113 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2114 <        IncAction r = new IncAction();
2115 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2116 <        f.complete(one);
2117 <        checkCompletedNormally(g, null);
2118 <        assertEquals(r.value, 2);
2119 <    }
2120 <
2121 <    /**
2122 <     * thenAcceptAsync result completes exceptionally after exceptional
2123 <     * completion of source
2124 <     */
2125 <    public void testThenAcceptAsync2() {
2126 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2127 <        IncAction r = new IncAction();
2128 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2129 <        f.completeExceptionally(new CFException());
2130 <        checkCompletedWithWrappedCFException(g);
2131 <    }
2132 <
2133 <    /**
2134 <     * thenAcceptAsync result completes exceptionally if action does
2135 <     */
2136 <    public void testThenAcceptAsync3() {
2137 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2138 <        FailingConsumer r = new FailingConsumer();
2139 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2140 <        f.complete(null);
2141 <        checkCompletedWithWrappedCFException(g);
2142 <    }
2143 <
2144 <    /**
2145 <     * thenAcceptAsync result completes exceptionally if source cancelled
2146 <     */
2147 <    public void testThenAcceptAsync4() {
2148 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2149 <        IncAction r = new IncAction();
2150 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2151 <        assertTrue(f.cancel(true));
2152 <        checkCompletedWithWrappedCancellationException(g);
2153 <    }
2154 <
2155 <    /**
2156 <     * applyToEitherAsync result completes normally after normal
2157 <     * completion of sources
2158 <     */
2159 <    public void testApplyToEitherAsync() {
2160 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2161 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2162 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2163 <        f.complete(one);
2164 <        checkCompletedNormally(g, two);
2165 <
2166 <        f = new CompletableFuture<>();
2167 <        f.complete(one);
2168 <        f2 = new CompletableFuture<>();
2169 <        g = f.applyToEitherAsync(f2, inc);
2170 <        checkCompletedNormally(g, two);
2171 <    }
2172 <
2173 <    /**
2174 <     * applyToEitherAsync result completes exceptionally after exceptional
2175 <     * completion of source
2176 <     */
2177 <    public void testApplyToEitherAsync2() {
2178 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2179 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2180 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2181 <        f.completeExceptionally(new CFException());
2182 <        checkCompletedWithWrappedCFException(g);
2183 <
2184 <        f = new CompletableFuture<>();
2185 <        f2 = new CompletableFuture<>();
2186 <        f2.completeExceptionally(new CFException());
2187 <        g = f.applyToEitherAsync(f2, inc);
2188 <        f.complete(one);
2189 <        checkCompletedWithWrappedCFException(g);
2190 <    }
2191 <
2192 <    /**
2193 <     * applyToEitherAsync result completes exceptionally if action does
2194 <     */
2195 <    public void testApplyToEitherAsync3() {
2196 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2197 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2198 <        FailingFunction r = new FailingFunction();
2199 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2200 <        f.complete(one);
2201 <        checkCompletedWithWrappedCFException(g);
2202 <    }
2203 <
2204 <    /**
2205 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2206 <     */
2207 <    public void testApplyToEitherAsync4() {
2208 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2209 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2210 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2211 <        assertTrue(f.cancel(true));
2212 <        checkCompletedWithWrappedCancellationException(g);
2213 <
2214 <        f = new CompletableFuture<>();
2215 <        f2 = new CompletableFuture<>();
2216 <        assertTrue(f2.cancel(true));
2217 <        g = f.applyToEitherAsync(f2, inc);
2218 <        checkCompletedWithWrappedCancellationException(g);
2219 <    }
2220 <
2221 <    /**
2222 <     * acceptEitherAsync result completes normally after normal
2223 <     * completion of sources
2224 <     */
2225 <    public void testAcceptEitherAsync() {
2226 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2227 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2228 <        IncAction r = new IncAction();
2229 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2230 <        f.complete(one);
2231 <        checkCompletedNormally(g, null);
2232 <        assertEquals(r.value, 2);
2233 <
2234 <        r = new IncAction();
2235 <        f = new CompletableFuture<>();
2236 <        f.complete(one);
2237 <        f2 = new CompletableFuture<>();
2238 <        g = f.acceptEitherAsync(f2, r);
2239 <        checkCompletedNormally(g, null);
2240 <        assertEquals(r.value, 2);
2241 <    }
2242 <
2243 <    /**
2244 <     * acceptEitherAsync result completes exceptionally after exceptional
2245 <     * completion of source
2246 <     */
2247 <    public void testAcceptEitherAsync2() {
2248 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2249 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2250 <        IncAction r = new IncAction();
2251 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2252 <        f.completeExceptionally(new CFException());
2253 <        checkCompletedWithWrappedCFException(g);
2254 <
2255 <        r = new IncAction();
2256 <        f = new CompletableFuture<>();
2257 <        f2 = new CompletableFuture<>();
2258 <        f2.completeExceptionally(new CFException());
2259 <        g = f.acceptEitherAsync(f2, r);
2260 <        f.complete(one);
2261 <        checkCompletedWithWrappedCFException(g);
2262 <    }
2263 <
2264 <    /**
2265 <     * acceptEitherAsync result completes exceptionally if action does
2266 <     */
2267 <    public void testAcceptEitherAsync3() {
2268 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2269 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2270 <        FailingConsumer r = new FailingConsumer();
2271 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2272 <        f.complete(one);
2273 <        checkCompletedWithWrappedCFException(g);
2274 <    }
2275 <
2276 <    /**
2277 <     * acceptEitherAsync result completes exceptionally if either
2278 <     * source cancelled
2279 <     */
2280 <    public void testAcceptEitherAsync4() {
2281 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2282 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2283 <        IncAction r = new IncAction();
2284 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2285 <        assertTrue(f.cancel(true));
2286 <        checkCompletedWithWrappedCancellationException(g);
2287 <
2288 <        r = new IncAction();
2289 <        f = new CompletableFuture<>();
2290 <        f2 = new CompletableFuture<>();
2291 <        assertTrue(f2.cancel(true));
2292 <        g = f.acceptEitherAsync(f2, r);
2293 <        checkCompletedWithWrappedCancellationException(g);
2294 <    }
2295 <
2296 <    /**
2297 <     * runAfterEitherAsync result completes normally after normal
2298 <     * completion of sources
2299 <     */
2300 <    public void testRunAfterEitherAsync() {
2301 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2302 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2303 <        Noop r = new Noop();
2304 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2305 <        f.complete(one);
2306 <        checkCompletedNormally(g, null);
2307 <        assertTrue(r.ran);
2308 <
2309 <        r = new Noop();
2310 <        f = new CompletableFuture<>();
2311 <        f.complete(one);
2312 <        f2 = new CompletableFuture<>();
2313 <        g = f.runAfterEitherAsync(f2, r);
2314 <        checkCompletedNormally(g, null);
2315 <        assertTrue(r.ran);
2316 <    }
2317 <
2318 <    /**
2319 <     * runAfterEitherAsync result completes exceptionally after exceptional
2320 <     * completion of source
2321 <     */
2322 <    public void testRunAfterEitherAsync2() {
2323 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2324 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2325 <        Noop r = new Noop();
2326 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2327 <        f.completeExceptionally(new CFException());
2328 <        checkCompletedWithWrappedCFException(g);
2329 <
2330 <        r = new Noop();
2331 <        f = new CompletableFuture<>();
2332 <        f2 = new CompletableFuture<>();
2333 <        f2.completeExceptionally(new CFException());
2334 <        g = f.runAfterEitherAsync(f2, r);
2335 <        f.complete(one);
2336 <        checkCompletedWithWrappedCFException(g);
2337 <    }
2338 <
2339 <    /**
2340 <     * runAfterEitherAsync result completes exceptionally if action does
2341 <     */
2342 <    public void testRunAfterEitherAsync3() {
2343 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2344 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2345 <        FailingNoop r = new FailingNoop();
2346 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2347 <        f.complete(one);
2348 <        checkCompletedWithWrappedCFException(g);
2349 <    }
2350 <
2351 <    /**
2352 <     * runAfterEitherAsync result completes exceptionally if either
2353 <     * source cancelled
2354 <     */
2355 <    public void testRunAfterEitherAsync4() {
2356 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2357 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2358 <        Noop r = new Noop();
2359 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2360 <        assertTrue(f.cancel(true));
2361 <        checkCompletedWithWrappedCancellationException(g);
2362 <
2363 <        r = new Noop();
2364 <        f = new CompletableFuture<>();
2365 <        f2 = new CompletableFuture<>();
2366 <        assertTrue(f2.cancel(true));
2367 <        g = f.runAfterEitherAsync(f2, r);
2368 <        checkCompletedWithWrappedCancellationException(g);
2369 <    }
2370 <
2371 <    /**
2372 <     * thenComposeAsync result completes normally after normal
2373 <     * completion of source
2374 <     */
2375 <    public void testThenComposeAsync() {
2376 <        CompletableFuture<Integer> f, g;
2377 <        CompletableFutureInc r;
2378 <
2379 <        f = new CompletableFuture<>();
2380 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2381 <        f.complete(one);
2382 <        checkCompletedNormally(g, two);
2383 <
2384 <        f = new CompletableFuture<>();
2385 <        f.complete(one);
2386 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2387 <        checkCompletedNormally(g, two);
2388 <    }
2389 <
2390 <    /**
2391 <     * thenComposeAsync result completes exceptionally after
2392 <     * exceptional completion of source
2393 <     */
2394 <    public void testThenComposeAsync2() {
2395 <        CompletableFuture<Integer> f, g;
2396 <        CompletableFutureInc r;
2397 <
2398 <        f = new CompletableFuture<>();
2399 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2400 <        f.completeExceptionally(new CFException());
2401 <        checkCompletedWithWrappedCFException(g);
2402 <        assertFalse(r.ran);
2403 <
2404 <        f = new CompletableFuture<>();
2405 <        f.completeExceptionally(new CFException());
2406 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2407 <        checkCompletedWithWrappedCFException(g);
2408 <        assertFalse(r.ran);
2409 <    }
2410 <
2411 <    /**
2412 <     * thenComposeAsync result completes exceptionally if action does
2413 <     */
2414 <    public void testThenComposeAsync3() {
2415 <        CompletableFuture<Integer> f, g;
2416 <        FailingCompletableFutureFunction r;
2417 <
2418 <        f = new CompletableFuture<>();
2419 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2420 <        f.complete(one);
2421 <        checkCompletedWithWrappedCFException(g);
2422 <
2423 <        f = new CompletableFuture<>();
2424 <        f.complete(one);
2425 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2426 <        checkCompletedWithWrappedCFException(g);
2427 <    }
2428 <
2429 <    /**
2430 <     * thenComposeAsync result completes exceptionally if source cancelled
2431 <     */
2432 <    public void testThenComposeAsync4() {
2433 <        CompletableFuture<Integer> f, g;
2434 <        CompletableFutureInc r;
2435 <
2436 <        f = new CompletableFuture<>();
2437 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2438 <        assertTrue(f.cancel(true));
2439 <        checkCompletedWithWrappedCancellationException(g);
2440 <
2441 <        f = new CompletableFuture<>();
2442 <        assertTrue(f.cancel(true));
2443 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2444 <        checkCompletedWithWrappedCancellationException(g);
2445 <    }
2446 <
2447 <    // async with explicit executors
2448 <
2449 <    /**
2450 <     * thenRunAsync result completes normally after normal completion of source
2451 <     */
2452 <    public void testThenRunAsyncE() {
2453 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2454 <        Noop r = new Noop();
2455 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2456 <        f.complete(null);
2457 <        checkCompletedNormally(g, null);
2458 <
2459 <        // reordered version
2460 <        f = new CompletableFuture<>();
2461 <        f.complete(null);
2462 <        r = new Noop();
2463 <        g = f.thenRunAsync(r, new ThreadExecutor());
2464 <        checkCompletedNormally(g, null);
2465 <    }
2466 <
2467 <    /**
2468 <     * thenRunAsync result completes exceptionally after exceptional
2469 <     * completion of source
2470 <     */
2471 <    public void testThenRunAsync2E() {
2472 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2473 <        Noop r = new Noop();
2474 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2475 <        f.completeExceptionally(new CFException());
2476 <        try {
2477 <            g.join();
2478 <            shouldThrow();
2479 <        } catch (CompletionException success) {}
2480 <        checkCompletedWithWrappedCFException(g);
2481 <    }
2482 <
2483 <    /**
2484 <     * thenRunAsync result completes exceptionally if action does
2485 <     */
2486 <    public void testThenRunAsync3E() {
2487 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2488 <        FailingNoop r = new FailingNoop();
2489 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2490 <        f.complete(null);
2491 <        checkCompletedWithWrappedCFException(g);
2492 <    }
2493 <
2494 <    /**
2495 <     * thenRunAsync result completes exceptionally if source cancelled
2496 <     */
2497 <    public void testThenRunAsync4E() {
2498 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2499 <        Noop r = new Noop();
2500 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2501 <        assertTrue(f.cancel(true));
2502 <        checkCompletedWithWrappedCancellationException(g);
2503 <    }
2504 <
2505 <    /**
2506 <     * thenApplyAsync result completes normally after normal completion of source
2507 <     */
2508 <    public void testThenApplyAsyncE() {
2509 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2510 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2511 <        f.complete(one);
2512 <        checkCompletedNormally(g, two);
2513 <    }
2514 <
2515 <    /**
2516 <     * thenApplyAsync result completes exceptionally after exceptional
2517 <     * completion of source
2518 <     */
2519 <    public void testThenApplyAsync2E() {
2520 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2521 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2522 <        f.completeExceptionally(new CFException());
2523 <        checkCompletedWithWrappedCFException(g);
2524 <    }
2525 <
2526 <    /**
2527 <     * thenApplyAsync result completes exceptionally if action does
2528 <     */
2529 <    public void testThenApplyAsync3E() {
2530 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2531 <        FailingFunction r = new FailingFunction();
2532 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2533 <        f.complete(null);
2534 <        checkCompletedWithWrappedCFException(g);
2535 <    }
2536 <
2537 <    /**
2538 <     * thenApplyAsync result completes exceptionally if source cancelled
2539 <     */
2540 <    public void testThenApplyAsync4E() {
2541 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2542 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2543 <        assertTrue(f.cancel(true));
2544 <        checkCompletedWithWrappedCancellationException(g);
2545 <    }
2546 <
2547 <    /**
2548 <     * thenAcceptAsync result completes normally after normal
2549 <     * completion of source
2550 <     */
2551 <    public void testThenAcceptAsyncE() {
2552 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2553 <        IncAction r = new IncAction();
2554 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2555 <        f.complete(one);
2556 <        checkCompletedNormally(g, null);
2557 <        assertEquals(r.value, 2);
2558 <    }
2559 <
2560 <    /**
2561 <     * thenAcceptAsync result completes exceptionally after exceptional
2562 <     * completion of source
2563 <     */
2564 <    public void testThenAcceptAsync2E() {
2565 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2566 <        IncAction r = new IncAction();
2567 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2568 <        f.completeExceptionally(new CFException());
2569 <        checkCompletedWithWrappedCFException(g);
2570 <    }
2571 <
2572 <    /**
2573 <     * thenAcceptAsync result completes exceptionally if action does
2574 <     */
2575 <    public void testThenAcceptAsync3E() {
2576 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2577 <        FailingConsumer r = new FailingConsumer();
2578 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2579 <        f.complete(null);
2580 <        checkCompletedWithWrappedCFException(g);
2581 <    }
2582 <
2583 <    /**
2584 <     * thenAcceptAsync result completes exceptionally if source cancelled
2585 <     */
2586 <    public void testThenAcceptAsync4E() {
2587 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2588 <        IncAction r = new IncAction();
2589 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2590 <        assertTrue(f.cancel(true));
2591 <        checkCompletedWithWrappedCancellationException(g);
2592 <    }
2593 <
2594 <    /**
2595 <     * applyToEitherAsync result completes normally after normal
2596 <     * completion of sources
2597 <     */
2598 <    public void testApplyToEitherAsyncE() {
2599 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2600 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2601 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2602 <        f.complete(one);
2603 <        checkCompletedNormally(g, two);
2604 <
2605 <        f = new CompletableFuture<>();
2606 <        f.complete(one);
2607 <        f2 = new CompletableFuture<>();
2608 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2609 <        checkCompletedNormally(g, two);
2610 <    }
2611 <
2612 <    /**
2613 <     * applyToEitherAsync result completes exceptionally after exceptional
2614 <     * completion of source
2615 <     */
2616 <    public void testApplyToEitherAsync2E() {
2617 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2618 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2619 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2620 <        f.completeExceptionally(new CFException());
2621 <        checkCompletedWithWrappedCFException(g);
2622 <
2623 <        f = new CompletableFuture<>();
2624 <        f2 = new CompletableFuture<>();
2625 <        f2.completeExceptionally(new CFException());
2626 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2627 <        f.complete(one);
2628 <        checkCompletedWithWrappedCFException(g);
2629 <    }
2630 <
2631 <    /**
2632 <     * applyToEitherAsync result completes exceptionally if action does
2633 <     */
2634 <    public void testApplyToEitherAsync3E() {
2635 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2636 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2637 <        FailingFunction r = new FailingFunction();
2638 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2639 <        f.complete(one);
2640 <        checkCompletedWithWrappedCFException(g);
2641 <    }
2642 <
2643 <    /**
2644 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2645 <     */
2646 <    public void testApplyToEitherAsync4E() {
2647 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2648 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2649 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2650 <        assertTrue(f.cancel(true));
2651 <        checkCompletedWithWrappedCancellationException(g);
2652 <
2653 <        f = new CompletableFuture<>();
2654 <        f2 = new CompletableFuture<>();
2655 <        assertTrue(f2.cancel(true));
2656 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2657 <        checkCompletedWithWrappedCancellationException(g);
2658 <    }
2659 <
2660 <    /**
2661 <     * acceptEitherAsync result completes normally after normal
2662 <     * completion of sources
2663 <     */
2664 <    public void testAcceptEitherAsyncE() {
2665 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2666 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2667 <        IncAction r = new IncAction();
2668 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2669 <        f.complete(one);
2670 <        checkCompletedNormally(g, null);
2671 <        assertEquals(r.value, 2);
2672 <
2673 <        r = new IncAction();
2674 <        f = new CompletableFuture<>();
2675 <        f.complete(one);
2676 <        f2 = new CompletableFuture<>();
2677 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2678 <        checkCompletedNormally(g, null);
2679 <        assertEquals(r.value, 2);
2680 <    }
2681 <
2682 <    /**
2683 <     * acceptEitherAsync result completes exceptionally after exceptional
2684 <     * completion of source
2685 <     */
2686 <    public void testAcceptEitherAsync2E() {
2687 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2688 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2689 <        IncAction r = new IncAction();
2690 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2691 <        f.completeExceptionally(new CFException());
2692 <        checkCompletedWithWrappedCFException(g);
2693 <
2694 <        r = new IncAction();
2695 <        f = new CompletableFuture<>();
2696 <        f2 = new CompletableFuture<>();
2697 <        f2.completeExceptionally(new CFException());
2698 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2699 <        f.complete(one);
2700 <        checkCompletedWithWrappedCFException(g);
2701 <    }
2702 <
2703 <    /**
2704 <     * acceptEitherAsync result completes exceptionally if action does
2705 <     */
2706 <    public void testAcceptEitherAsync3E() {
2707 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2708 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2709 <        FailingConsumer r = new FailingConsumer();
2710 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2711 <        f.complete(one);
2712 <        checkCompletedWithWrappedCFException(g);
2713 <    }
2714 <
2715 <    /**
2716 <     * acceptEitherAsync result completes exceptionally if either
2717 <     * source cancelled
2718 <     */
2719 <    public void testAcceptEitherAsync4E() {
2720 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2721 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2722 <        IncAction r = new IncAction();
2723 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2724 <        assertTrue(f.cancel(true));
2725 <        checkCompletedWithWrappedCancellationException(g);
2726 <
2727 <        r = new IncAction();
2728 <        f = new CompletableFuture<>();
2729 <        f2 = new CompletableFuture<>();
2730 <        assertTrue(f2.cancel(true));
2731 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2732 <        checkCompletedWithWrappedCancellationException(g);
2733 <    }
2734 <
2735 <    /**
2736 <     * runAfterEitherAsync result completes normally after normal
2737 <     * completion of sources
2738 <     */
2739 <    public void testRunAfterEitherAsyncE() {
2740 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2741 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2742 <        Noop r = new Noop();
2743 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2744 <        f.complete(one);
2745 <        checkCompletedNormally(g, null);
2746 <        assertTrue(r.ran);
2747 <
2748 <        r = new Noop();
2749 <        f = new CompletableFuture<>();
2750 <        f.complete(one);
2751 <        f2 = new CompletableFuture<>();
2752 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2753 <        checkCompletedNormally(g, null);
2754 <        assertTrue(r.ran);
2755 <    }
2756 <
2757 <    /**
2758 <     * runAfterEitherAsync result completes exceptionally after exceptional
2759 <     * completion of source
2760 <     */
2761 <    public void testRunAfterEitherAsync2E() {
2762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2763 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2764 <        Noop r = new Noop();
2765 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2766 <        f.completeExceptionally(new CFException());
2767 <        checkCompletedWithWrappedCFException(g);
2768 <
2769 <        r = new Noop();
2770 <        f = new CompletableFuture<>();
2771 <        f2 = new CompletableFuture<>();
2772 <        f2.completeExceptionally(new CFException());
2773 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2774 <        f.complete(one);
2775 <        checkCompletedWithWrappedCFException(g);
2776 <    }
2777 <
2778 <    /**
2779 <     * runAfterEitherAsync result completes exceptionally if action does
2780 <     */
2781 <    public void testRunAfterEitherAsync3E() {
2782 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2783 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2784 <        FailingNoop r = new FailingNoop();
2785 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2786 <        f.complete(one);
2787 <        checkCompletedWithWrappedCFException(g);
2788 <    }
2789 <
2790 <    /**
2791 <     * runAfterEitherAsync result completes exceptionally if either
2792 <     * source cancelled
2793 <     */
2794 <    public void testRunAfterEitherAsync4E() {
2795 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2796 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2797 <        Noop r = new Noop();
2798 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2799 <        assertTrue(f.cancel(true));
2800 <        checkCompletedWithWrappedCancellationException(g);
2801 <
2802 <        r = new Noop();
2803 <        f = new CompletableFuture<>();
2804 <        f2 = new CompletableFuture<>();
2805 <        assertTrue(f2.cancel(true));
2806 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2807 <        checkCompletedWithWrappedCancellationException(g);
2808 <    }
2809 <
2810 <    /**
2811 <     * thenComposeAsync result completes normally after normal
2812 <     * completion of source
2813 <     */
2814 <    public void testThenComposeAsyncE() {
2815 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2816 <        CompletableFutureInc r = new CompletableFutureInc();
2817 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2818 <        f.complete(one);
2819 <        checkCompletedNormally(g, two);
2820 <    }
2821 <
2822 <    /**
2823 <     * thenComposeAsync result completes exceptionally after
2824 <     * exceptional completion of source
2825 <     */
2826 <    public void testThenComposeAsync2E() {
2827 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2828 <        CompletableFutureInc r = new CompletableFutureInc();
2829 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2830 <        f.completeExceptionally(new CFException());
2831 <        checkCompletedWithWrappedCFException(g);
2832 <    }
2833 <
2834 <    /**
2835 <     * thenComposeAsync result completes exceptionally if action does
2836 <     */
2837 <    public void testThenComposeAsync3E() {
2838 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2839 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2840 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2841 <        f.complete(one);
2842 <        checkCompletedWithWrappedCFException(g);
2843 <    }
2787 >    public void testThenCompose_sourceCancelled() {
2788 >        for (ExecutionMode m : ExecutionMode.values())
2789 >        for (boolean createIncomplete : new boolean[] { true, false })
2790 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2791 >    {
2792 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2793 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2794 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2795 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2796 >        if (createIncomplete) {
2797 >            checkIncomplete(g);
2798 >            assertTrue(f.cancel(mayInterruptIfRunning));
2799 >        }
2800  
2845    /**
2846     * thenComposeAsync result completes exceptionally if source cancelled
2847     */
2848    public void testThenComposeAsync4E() {
2849        CompletableFuture<Integer> f = new CompletableFuture<>();
2850        CompletableFutureInc r = new CompletableFutureInc();
2851        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2852        assertTrue(f.cancel(true));
2801          checkCompletedWithWrappedCancellationException(g);
2802 <    }
2802 >        checkCancelled(f);
2803 >    }}
2804  
2805      // other static methods
2806  
# Line 2870 | Line 2819 | public class CompletableFutureTest exten
2819       */
2820      public void testAllOf_normal() throws Exception {
2821          for (int k = 1; k < 20; ++k) {
2822 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2822 >            CompletableFuture<Integer>[] fs
2823 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2824              for (int i = 0; i < k; ++i)
2825                  fs[i] = new CompletableFuture<>();
2826              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 2884 | Line 2834 | public class CompletableFutureTest exten
2834          }
2835      }
2836  
2837 +    public void testAllOf_backwards() throws Exception {
2838 +        for (int k = 1; k < 20; ++k) {
2839 +            CompletableFuture<Integer>[] fs
2840 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2841 +            for (int i = 0; i < k; ++i)
2842 +                fs[i] = new CompletableFuture<>();
2843 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2844 +            for (int i = k - 1; i >= 0; i--) {
2845 +                checkIncomplete(f);
2846 +                checkIncomplete(CompletableFuture.allOf(fs));
2847 +                fs[i].complete(one);
2848 +            }
2849 +            checkCompletedNormally(f, null);
2850 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2851 +        }
2852 +    }
2853 +
2854      /**
2855       * anyOf(no component futures) returns an incomplete future
2856       */
# Line 2942 | Line 2909 | public class CompletableFutureTest exten
2909          Runnable[] throwingActions = {
2910              () -> CompletableFuture.supplyAsync(null),
2911              () -> CompletableFuture.supplyAsync(null, exec),
2912 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2912 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2913  
2914              () -> CompletableFuture.runAsync(null),
2915              () -> CompletableFuture.runAsync(null, exec),
# Line 3015 | Line 2982 | public class CompletableFutureTest exten
2982  
2983              () -> f.thenCompose(null),
2984              () -> f.thenComposeAsync(null),
2985 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2985 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2986              () -> f.thenComposeAsync(null, exec),
2987  
2988              () -> f.exceptionally(null),
# Line 3047 | Line 3014 | public class CompletableFutureTest exten
3014          assertSame(f, f.toCompletableFuture());
3015      }
3016  
3017 <    /**
3018 <     * whenComplete action executes on normal completion, propagating
3019 <     * source result.
3020 <     */
3021 <    public void testWhenComplete1() {
3022 <        final AtomicInteger a = new AtomicInteger();
3023 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3024 <        CompletableFuture<Integer> g =
3025 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3026 <        f.complete(three);
3027 <        checkCompletedNormally(f, three);
3028 <        checkCompletedNormally(g, three);
3029 <        assertEquals(a.get(), 1);
3030 <    }
3031 <
3032 <    /**
3033 <     * whenComplete action executes on exceptional completion, propagating
3067 <     * source result.
3068 <     */
3069 <    public void testWhenComplete2() {
3070 <        final AtomicInteger a = new AtomicInteger();
3071 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3072 <        CompletableFuture<Integer> g =
3073 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3074 <        f.completeExceptionally(new CFException());
3075 <        assertTrue(f.isCompletedExceptionally());
3076 <        assertTrue(g.isCompletedExceptionally());
3077 <        assertEquals(a.get(), 1);
3078 <    }
3079 <
3080 <    /**
3081 <     * If a whenComplete action throws an exception when triggered by
3082 <     * a normal completion, it completes exceptionally
3083 <     */
3084 <    public void testWhenComplete3() {
3085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3086 <        CompletableFuture<Integer> g =
3087 <            f.whenComplete((Integer x, Throwable t) ->
3088 <                           { throw new CFException(); } );
3089 <        f.complete(three);
3090 <        checkCompletedNormally(f, three);
3091 <        assertTrue(g.isCompletedExceptionally());
3092 <        checkCompletedWithWrappedCFException(g);
3093 <    }
3094 <
3095 <    /**
3096 <     * whenCompleteAsync action executes on normal completion, propagating
3097 <     * source result.
3098 <     */
3099 <    public void testWhenCompleteAsync1() {
3100 <        final AtomicInteger a = new AtomicInteger();
3101 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3102 <        CompletableFuture<Integer> g =
3103 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3104 <        f.complete(three);
3105 <        checkCompletedNormally(f, three);
3106 <        checkCompletedNormally(g, three);
3107 <        assertEquals(a.get(), 1);
3108 <    }
3109 <
3110 <    /**
3111 <     * whenCompleteAsync action executes on exceptional completion, propagating
3112 <     * source result.
3113 <     */
3114 <    public void testWhenCompleteAsync2() {
3115 <        final AtomicInteger a = new AtomicInteger();
3116 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3117 <        CompletableFuture<Integer> g =
3118 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3119 <        f.completeExceptionally(new CFException());
3120 <        checkCompletedWithWrappedCFException(f);
3121 <        checkCompletedWithWrappedCFException(g);
3122 <    }
3123 <
3124 <    /**
3125 <     * If a whenCompleteAsync action throws an exception when
3126 <     * triggered by a normal completion, it completes exceptionally
3127 <     */
3128 <    public void testWhenCompleteAsync3() {
3129 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3130 <        CompletableFuture<Integer> g =
3131 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3132 <                           { throw new CFException(); } );
3133 <        f.complete(three);
3134 <        checkCompletedNormally(f, three);
3135 <        checkCompletedWithWrappedCFException(g);
3136 <    }
3137 <
3138 <    /**
3139 <     * whenCompleteAsync action executes on normal completion, propagating
3140 <     * source result.
3141 <     */
3142 <    public void testWhenCompleteAsync1e() {
3143 <        final AtomicInteger a = new AtomicInteger();
3144 <        ThreadExecutor exec = new ThreadExecutor();
3145 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3146 <        CompletableFuture<Integer> g =
3147 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3148 <                                exec);
3149 <        f.complete(three);
3150 <        checkCompletedNormally(f, three);
3151 <        checkCompletedNormally(g, three);
3152 <        assertEquals(a.get(), 1);
3153 <    }
3154 <
3155 <    /**
3156 <     * whenCompleteAsync action executes on exceptional completion, propagating
3157 <     * source result.
3158 <     */
3159 <    public void testWhenCompleteAsync2e() {
3160 <        final AtomicInteger a = new AtomicInteger();
3161 <        ThreadExecutor exec = new ThreadExecutor();
3162 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3163 <        CompletableFuture<Integer> g =
3164 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3165 <                                exec);
3166 <        f.completeExceptionally(new CFException());
3167 <        checkCompletedWithWrappedCFException(f);
3168 <        checkCompletedWithWrappedCFException(g);
3169 <    }
3170 <
3171 <    /**
3172 <     * If a whenCompleteAsync action throws an exception when triggered
3173 <     * by a normal completion, it completes exceptionally
3174 <     */
3175 <    public void testWhenCompleteAsync3e() {
3176 <        ThreadExecutor exec = new ThreadExecutor();
3177 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3178 <        CompletableFuture<Integer> g =
3179 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3180 <                                { throw new CFException(); },
3181 <                                exec);
3182 <        f.complete(three);
3183 <        checkCompletedNormally(f, three);
3184 <        checkCompletedWithWrappedCFException(g);
3185 <    }
3186 <
3187 <    /**
3188 <     * handleAsync action completes normally with function value on
3189 <     * either normal or exceptional completion of source
3190 <     */
3191 <    public void testHandleAsync() {
3192 <        CompletableFuture<Integer> f, g;
3193 <        IntegerHandler r;
3194 <
3195 <        f = new CompletableFuture<>();
3196 <        g = f.handleAsync(r = new IntegerHandler());
3197 <        assertFalse(r.ran);
3198 <        f.completeExceptionally(new CFException());
3199 <        checkCompletedWithWrappedCFException(f);
3200 <        checkCompletedNormally(g, three);
3201 <        assertTrue(r.ran);
3202 <
3203 <        f = new CompletableFuture<>();
3204 <        g = f.handleAsync(r = new IntegerHandler());
3205 <        assertFalse(r.ran);
3206 <        f.completeExceptionally(new CFException());
3207 <        checkCompletedWithWrappedCFException(f);
3208 <        checkCompletedNormally(g, three);
3209 <        assertTrue(r.ran);
3210 <
3211 <        f = new CompletableFuture<>();
3212 <        g = f.handleAsync(r = new IntegerHandler());
3213 <        assertFalse(r.ran);
3214 <        f.complete(one);
3215 <        checkCompletedNormally(f, one);
3216 <        checkCompletedNormally(g, two);
3217 <        assertTrue(r.ran);
3218 <
3219 <        f = new CompletableFuture<>();
3220 <        g = f.handleAsync(r = new IntegerHandler());
3221 <        assertFalse(r.ran);
3222 <        f.complete(one);
3223 <        checkCompletedNormally(f, one);
3224 <        checkCompletedNormally(g, two);
3225 <        assertTrue(r.ran);
3226 <    }
3227 <
3228 <    /**
3229 <     * handleAsync action with Executor completes normally with
3230 <     * function value on either normal or exceptional completion of
3231 <     * source
3232 <     */
3233 <    public void testHandleAsync2() {
3234 <        CompletableFuture<Integer> f, g;
3235 <        ThreadExecutor exec = new ThreadExecutor();
3236 <        IntegerHandler r;
3237 <
3238 <        f = new CompletableFuture<>();
3239 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3240 <        assertFalse(r.ran);
3241 <        f.completeExceptionally(new CFException());
3242 <        checkCompletedWithWrappedCFException(f);
3243 <        checkCompletedNormally(g, three);
3244 <        assertTrue(r.ran);
3245 <
3246 <        f = new CompletableFuture<>();
3247 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3248 <        assertFalse(r.ran);
3249 <        f.completeExceptionally(new CFException());
3250 <        checkCompletedWithWrappedCFException(f);
3251 <        checkCompletedNormally(g, three);
3252 <        assertTrue(r.ran);
3253 <
3254 <        f = new CompletableFuture<>();
3255 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3256 <        assertFalse(r.ran);
3257 <        f.complete(one);
3258 <        checkCompletedNormally(f, one);
3259 <        checkCompletedNormally(g, two);
3260 <        assertTrue(r.ran);
3261 <
3262 <        f = new CompletableFuture<>();
3263 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3264 <        assertFalse(r.ran);
3265 <        f.complete(one);
3266 <        checkCompletedNormally(f, one);
3267 <        checkCompletedNormally(g, two);
3268 <        assertTrue(r.ran);
3269 <    }
3017 > //     public void testRunAfterEither_resultDeterminedAtTimeOfCreation() {
3018 > //         for (ExecutionMode m : ExecutionMode.values())
3019 > //         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3020 > //         for (Integer v1 : new Integer[] { 1, null })
3021 > //     {
3022 > //         final CompletableFuture<Integer> f = new CompletableFuture<>();
3023 > //         final CompletableFuture<Integer> g = new CompletableFuture<>();
3024 > //         final Noop[] rs = new Noop[2];
3025 > //         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
3026 > //         f.complete(v1);
3027 > //         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3028 > //         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3029 > //         assertTrue(g.cancel(mayInterruptIfRunning));
3030 > //         checkCompletedNormally(h0, null);
3031 > //         checkCompletedNormally(h1, null);
3032 > //         for (Noop r : rs) r.assertInvoked();
3033 > //     }}
3034  
3035   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines