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.36 by jsr166, Sun Jun 1 23:12:45 2014 UTC vs.
Revision 1.92 by jsr166, Tue Jun 17 20:50:01 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 <    // A non-commutative function that handles null values as well
417 <    public static int subtract(Integer x, Integer y) {
418 <        return ((x == null) ? 42 : x.intValue())
416 >    class NoopConsumer extends CheckedIntegerAction
417 >        implements Consumer<Integer>
418 >    {
419 >        NoopConsumer(ExecutionMode m) { super(m); }
420 >        public void accept(Integer x) {
421 >            invoked();
422 >            value = x;
423 >        }
424 >    }
425 >
426 >    class IncFunction extends CheckedIntegerAction
427 >        implements Function<Integer,Integer>
428 >    {
429 >        IncFunction(ExecutionMode m) { super(m); }
430 >        public Integer apply(Integer x) {
431 >            invoked();
432 >            return value = inc(x);
433 >        }
434 >    }
435 >
436 >    // Choose non-commutative actions for better coverage
437 >    // A non-commutative function that handles and produces null values as well.
438 >    static Integer subtract(Integer x, Integer y) {
439 >        return (x == null && y == null) ? null :
440 >            ((x == null) ? 42 : x.intValue())
441              - ((y == null) ? 99 : y.intValue());
442      }
443  
444 <    static final Supplier<Integer> supplyOne =
445 <        () -> Integer.valueOf(1);
446 <    static final Function<Integer, Integer> inc =
447 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
331 <    static final BiFunction<Integer, Integer, Integer> subtract =
332 <        (Integer x, Integer y) -> subtract(x, y);
333 <    static final class IncAction implements Consumer<Integer> {
334 <        int value;
335 <        public void accept(Integer x) { value = x.intValue() + 1; }
336 <    }
337 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
338 <        volatile int invocationCount = 0;
339 <        int value;
340 <        // Check this action was invoked exactly once when result is computed.
341 <        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 <        volatile int invocationCount = 0;
455 <        int 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++;
460 <            return subtract(x, y);
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();
413 <        }
414 <    }
415 <
416 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
417 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
418 <    }
419 <
420 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
421 <        boolean ran;
422 <        public Integer apply(Integer x, Throwable t) {
423 <            ran = true;
424 <            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 447 | 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 480 | 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  
485 //         REVERSE_DEFAULT_ASYNC {
486 //             public <T,U> CompletableFuture<Void> runAfterBoth
487 //                 (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
488 //                 return f.runAfterBothAsync(g, a);
489 //             }
490 //             public <T,U> CompletableFuture<Void> thenAcceptBoth
491 //                 (CompletableFuture<T> f,
492 //                  CompletionStage<? extends U> g,
493 //                  BiConsumer<? super T,? super U> a) {
494 //                 return DEFAULT_ASYNC.thenAcceptBoth(f, g, a);
495 //             }
496 //         },
497
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 512 | 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 524 | 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);
544 <        checkCompletedNormally(g, one);
545 <    }
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());
571 <        assertTrue(r.ran);
572 <        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() {
597 <        Noop r = new Noop();
598 <        ThreadExecutor exec = new ThreadExecutor();
599 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
600 <        assertNull(f.join());
601 <        assertTrue(r.ran);
602 <        checkCompletedNormally(f, null);
603 <        assertEquals(1, exec.count.get());
604 <    }
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() {
630 <        CompletableFuture<Integer> f;
631 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
632 <        assertEquals(f.join(), one);
633 <        checkCompletedNormally(f, one);
634 <    }
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);
688 <        assertFalse(r.ran);
689 <    }
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;
1090 <
1091 <        f = new CompletableFuture<>();
1092 <        g = f.thenRun(r = new FailingNoop());
1093 <        f.complete(null);
1094 <        checkCompletedWithWrappedCFException(g);
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 <        f.complete(null);
1108 <        g = f.thenRun(r = new FailingNoop());
1109 <        checkCompletedWithWrappedCFException(g);
708 <    }
1106 >        checkCompletedNormally(g, v1);
1107 >        checkCompletedExceptionally(f, ex);
1108 >        assertEquals(1, a.get());
1109 >    }}
1110  
1111      /**
1112 <     * thenRun result completes exceptionally if source cancelled
1112 >     * handle action completes normally with function value on
1113 >     * cancelled source
1114       */
1115 <    public void testThenRun4() {
1116 <        CompletableFuture<Integer> f;
1117 <        CompletableFuture<Void> g;
1118 <        Noop r;
1119 <
1120 <        f = new CompletableFuture<>();
1121 <        g = f.thenRun(r = new Noop());
1122 <        assertTrue(f.cancel(true));
1123 <        checkCompletedWithWrappedCancellationException(g);
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 <        f = new CompletableFuture<>();
1136 <        assertTrue(f.cancel(true));
1137 <        g = f.thenRun(r = new Noop());
1138 <        checkCompletedWithWrappedCancellationException(g);
727 <    }
1135 >        checkCompletedNormally(g, v1);
1136 >        checkCancelled(f);
1137 >        assertEquals(1, a.get());
1138 >    }}
1139  
1140      /**
1141 <     * thenApply result completes normally after normal completion of source
1141 >     * handle result completes exceptionally if action does
1142       */
1143 <    public void testThenApply() {
1144 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1145 <        CompletableFuture<Integer> g = f.thenApply(inc);
1146 <        f.complete(one);
1147 <        checkCompletedNormally(g, two);
1148 <    }
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 <    /**
1169 <     * thenApply result completes exceptionally after exceptional
1170 <     * completion of source
1171 <     */
1172 <    public void testThenApply2() {
1173 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1174 <        CompletableFuture<Integer> g = f.thenApply(inc);
1175 <        f.completeExceptionally(new CFException());
1176 <        checkCompletedWithWrappedCFException(g);
1177 <    }
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 <    /**
1189 <     * thenApply result completes exceptionally if action does
1190 <     */
1191 <    public void testThenApply3() {
754 <        CompletableFuture<Integer> f = new CompletableFuture<>();
755 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
756 <        f.complete(one);
757 <        checkCompletedWithWrappedCFException(g);
758 <    }
1188 >        checkCompletedWithWrappedException(g, ex);
1189 >        checkCompletedNormally(f, v1);
1190 >        assertEquals(1, a.get());
1191 >    }}
1192  
1193      /**
1194 <     * thenApply result completes exceptionally if source cancelled
1194 >     * runAsync completes after running Runnable
1195       */
1196 <    public void testThenApply4() {
1197 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1198 <        CompletableFuture<Integer> g = f.thenApply(inc);
1199 <        assertTrue(f.cancel(true));
1200 <        checkCompletedWithWrappedCancellationException(g);
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 <     * thenAccept result completes normally after normal completion of source
1211 >     * failing runAsync completes exceptionally after running Runnable
1212       */
1213 <    public void testThenAccept() {
1214 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1215 <        IncAction r = new IncAction();
1216 <        CompletableFuture<Void> g = f.thenAccept(r);
1217 <        f.complete(one);
1218 <        checkCompletedNormally(g, null);
1219 <        assertEquals(r.value, 2);
1220 <    }
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 <     * thenAccept result completes exceptionally after exceptional
784 <     * completion of source
1227 >     * supplyAsync completes with result of supplier
1228       */
1229 <    public void testThenAccept2() {
1230 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1231 <        IncAction r = new IncAction();
1232 <        CompletableFuture<Void> g = f.thenAccept(r);
1233 <        f.completeExceptionally(new CFException());
1234 <        checkCompletedWithWrappedCFException(g);
1235 <    }
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 <     * thenAccept result completes exceptionally if action does
1245 >     * Failing supplyAsync completes exceptionally
1246       */
1247 <    public void testThenAccept3() {
1248 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1249 <        FailingConsumer r = new FailingConsumer();
1250 <        CompletableFuture<Void> g = f.thenAccept(r);
1251 <        f.complete(one);
1252 <        checkCompletedWithWrappedCFException(g);
1253 <        assertTrue(r.ran);
1254 <    }
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 <    /**
807 <     * thenAccept result completes exceptionally if source cancelled
808 <     */
809 <    public void testThenAccept4() {
810 <        CompletableFuture<Integer> f = new CompletableFuture<>();
811 <        IncAction r = new IncAction();
812 <        CompletableFuture<Void> g = f.thenAccept(r);
813 <        assertTrue(f.cancel(true));
814 <        checkCompletedWithWrappedCancellationException(g);
815 <    }
1260 >    // seq completion methods
1261  
1262      /**
1263 <     * thenCombine result completes normally after normal completion
819 <     * of sources
1263 >     * thenRun result completes normally after normal completion of source
1264       */
1265 <    public void testThenCombine_normalCompletion1() {
1265 >    public void testThenRun_normalCompletion() {
1266          for (ExecutionMode m : ExecutionMode.values())
1267          for (Integer v1 : new Integer[] { 1, null })
1268 <        for (Integer v2 : new Integer[] { 2, null }) {
825 <
1268 >    {
1269          final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1271 <        final SubtractFunction r = new SubtractFunction();
829 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
830 <
831 <        f.complete(v1);
832 <        checkIncomplete(h);
833 <        assertFalse(r.ran());
834 <        g.complete(v2);
1270 >        final Noop[] rs = new Noop[6];
1271 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1272  
1273 <        checkCompletedNormally(h, subtract(v1, v2));
1273 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1274 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1275 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1276 >        checkIncomplete(h0);
1277 >        checkIncomplete(h1);
1278 >        checkIncomplete(h2);
1279 >        assertTrue(f.complete(v1));
1280 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1281 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1282 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1283 >
1284 >        checkCompletedNormally(h0, null);
1285 >        checkCompletedNormally(h1, null);
1286 >        checkCompletedNormally(h2, null);
1287 >        checkCompletedNormally(h3, null);
1288 >        checkCompletedNormally(h4, null);
1289 >        checkCompletedNormally(h5, null);
1290          checkCompletedNormally(f, v1);
1291 <        checkCompletedNormally(g, v2);
1292 <        }
840 <    }
1291 >        for (Noop r : rs) r.assertInvoked();
1292 >    }}
1293  
1294 <    public void testThenCombine_normalCompletion2() {
1294 >    /**
1295 >     * thenRun result completes exceptionally after exceptional
1296 >     * completion of source
1297 >     */
1298 >    public void testThenRun_exceptionalCompletion() {
1299          for (ExecutionMode m : ExecutionMode.values())
1300 <        for (Integer v1 : new Integer[] { 1, null })
1301 <        for (Integer v2 : new Integer[] { 2, null }) {
846 <
1300 >    {
1301 >        final CFException ex = new CFException();
1302          final CompletableFuture<Integer> f = new CompletableFuture<>();
1303 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1304 <        final SubtractFunction r = new SubtractFunction();
850 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1303 >        final Noop[] rs = new Noop[6];
1304 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1305  
1306 <        g.complete(v2);
1307 <        checkIncomplete(h);
1308 <        assertFalse(r.ran());
1309 <        f.complete(v1);
1306 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1307 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1308 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1309 >        checkIncomplete(h0);
1310 >        checkIncomplete(h1);
1311 >        checkIncomplete(h2);
1312 >        assertTrue(f.completeExceptionally(ex));
1313 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1314 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1315 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1316 >
1317 >        checkCompletedWithWrappedException(h0, ex);
1318 >        checkCompletedWithWrappedException(h1, ex);
1319 >        checkCompletedWithWrappedException(h2, ex);
1320 >        checkCompletedWithWrappedException(h3, ex);
1321 >        checkCompletedWithWrappedException(h4, ex);
1322 >        checkCompletedWithWrappedException(h5, ex);
1323 >        checkCompletedExceptionally(f, ex);
1324 >        for (Noop r : rs) r.assertNotInvoked();
1325 >    }}
1326  
1327 <        checkCompletedNormally(h, subtract(v1, v2));
1328 <        checkCompletedNormally(f, v1);
1329 <        checkCompletedNormally(g, v2);
1330 <        }
861 <    }
862 <
863 <    public void testThenCombine_normalCompletion3() {
1327 >    /**
1328 >     * thenRun result completes exceptionally if source cancelled
1329 >     */
1330 >    public void testThenRun_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1332 <        for (Integer v1 : new Integer[] { 1, null })
1333 <        for (Integer v2 : new Integer[] { 2, null }) {
867 <
1332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 >    {
1334          final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1336 <        final SubtractFunction r = new SubtractFunction();
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337  
1338 <        g.complete(v2);
1339 <        f.complete(v1);
1340 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1341 <
1342 <        checkCompletedNormally(h, subtract(v1, v2));
1343 <        checkCompletedNormally(f, v1);
1344 <        checkCompletedNormally(g, v2);
1345 <        }
1346 <    }
1338 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1339 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1340 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1341 >        checkIncomplete(h0);
1342 >        checkIncomplete(h1);
1343 >        checkIncomplete(h2);
1344 >        assertTrue(f.cancel(mayInterruptIfRunning));
1345 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1346 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1347 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1348 >
1349 >        checkCompletedWithWrappedCancellationException(h0);
1350 >        checkCompletedWithWrappedCancellationException(h1);
1351 >        checkCompletedWithWrappedCancellationException(h2);
1352 >        checkCompletedWithWrappedCancellationException(h3);
1353 >        checkCompletedWithWrappedCancellationException(h4);
1354 >        checkCompletedWithWrappedCancellationException(h5);
1355 >        checkCancelled(f);
1356 >        for (Noop r : rs) r.assertNotInvoked();
1357 >    }}
1358  
1359 <    public void testThenCombine_normalCompletion4() {
1359 >    /**
1360 >     * thenRun result completes exceptionally if action does
1361 >     */
1362 >    public void testThenRun_actionFailed() {
1363          for (ExecutionMode m : ExecutionMode.values())
1364          for (Integer v1 : new Integer[] { 1, null })
1365 <        for (Integer v2 : new Integer[] { 2, null }) {
886 <
1365 >    {
1366          final CompletableFuture<Integer> f = new CompletableFuture<>();
1367 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1368 <        final SubtractFunction r = new SubtractFunction();
890 <
891 <        f.complete(v1);
892 <        g.complete(v2);
893 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1367 >        final FailingRunnable[] rs = new FailingRunnable[6];
1368 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369  
1370 <        checkCompletedNormally(h, subtract(v1, v2));
1370 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1371 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1372 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1373 >        assertTrue(f.complete(v1));
1374 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1375 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1376 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1377 >
1378 >        checkCompletedWithWrappedCFException(h0);
1379 >        checkCompletedWithWrappedCFException(h1);
1380 >        checkCompletedWithWrappedCFException(h2);
1381 >        checkCompletedWithWrappedCFException(h3);
1382 >        checkCompletedWithWrappedCFException(h4);
1383 >        checkCompletedWithWrappedCFException(h5);
1384          checkCompletedNormally(f, v1);
1385 <        checkCompletedNormally(g, v2);
898 <        }
899 <    }
1385 >    }}
1386  
1387      /**
1388 <     * thenCombine result completes exceptionally after exceptional
903 <     * completion of either source
1388 >     * thenApply result completes normally after normal completion of source
1389       */
1390 <    public void testThenCombine_exceptionalCompletion1() {
1390 >    public void testThenApply_normalCompletion() {
1391          for (ExecutionMode m : ExecutionMode.values())
1392 <        for (Integer v1 : new Integer[] { 1, null }) {
1393 <
1392 >        for (Integer v1 : new Integer[] { 1, null })
1393 >    {
1394          final CompletableFuture<Integer> f = new CompletableFuture<>();
1395 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1396 <        final SubtractFunction r = new SubtractFunction();
912 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
913 <        final CFException ex = new CFException();
914 <
915 <        f.completeExceptionally(ex);
916 <        checkIncomplete(h);
917 <        g.complete(v1);
918 <
919 <        checkCompletedWithWrappedCFException(h, ex);
920 <        checkCompletedWithWrappedCFException(f, ex);
921 <        assertFalse(r.ran());
922 <        checkCompletedNormally(g, v1);
923 <        }
924 <    }
925 <
926 <    public void testThenCombine_exceptionalCompletion2() {
927 <        for (ExecutionMode m : ExecutionMode.values())
928 <        for (Integer v1 : new Integer[] { 1, null }) {
1395 >        final IncFunction[] rs = new IncFunction[4];
1396 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1397  
1398 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1399 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1400 <        final SubtractFunction r = new SubtractFunction();
1401 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, subtract);
1402 <        final CFException ex = new CFException();
1403 <
1404 <        g.completeExceptionally(ex);
1405 <        checkIncomplete(h);
1406 <        f.complete(v1);
1407 <
1408 <        checkCompletedWithWrappedCFException(h, ex);
1409 <        checkCompletedWithWrappedCFException(g, ex);
942 <        assertFalse(r.ran());
1398 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1399 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1400 >        checkIncomplete(h0);
1401 >        checkIncomplete(h1);
1402 >        assertTrue(f.complete(v1));
1403 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1404 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1405 >
1406 >        checkCompletedNormally(h0, inc(v1));
1407 >        checkCompletedNormally(h1, inc(v1));
1408 >        checkCompletedNormally(h2, inc(v1));
1409 >        checkCompletedNormally(h3, inc(v1));
1410          checkCompletedNormally(f, v1);
1411 <        }
1412 <    }
1411 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1412 >    }}
1413  
1414 <    public void testThenCombine_exceptionalCompletion3() {
1414 >    /**
1415 >     * thenApply result completes exceptionally after exceptional
1416 >     * completion of source
1417 >     */
1418 >    public void testThenApply_exceptionalCompletion() {
1419          for (ExecutionMode m : ExecutionMode.values())
1420 <        for (Integer v1 : new Integer[] { 1, null }) {
950 <
951 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
952 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
953 <        final SubtractFunction r = new SubtractFunction();
1420 >    {
1421          final CFException ex = new CFException();
1422 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1423 +        final IncFunction[] rs = new IncFunction[4];
1424 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1425  
1426 <        g.completeExceptionally(ex);
1427 <        f.complete(v1);
1428 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1426 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1427 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1428 >        assertTrue(f.completeExceptionally(ex));
1429 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1430 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1431 >
1432 >        checkCompletedWithWrappedException(h0, ex);
1433 >        checkCompletedWithWrappedException(h1, ex);
1434 >        checkCompletedWithWrappedException(h2, ex);
1435 >        checkCompletedWithWrappedException(h3, ex);
1436 >        checkCompletedExceptionally(f, ex);
1437 >        for (IncFunction r : rs) r.assertNotInvoked();
1438 >    }}
1439  
1440 <        checkCompletedWithWrappedCFException(h, ex);
1441 <        checkCompletedWithWrappedCFException(g, ex);
1442 <        assertFalse(r.ran());
1443 <        checkCompletedNormally(f, v1);
964 <        }
965 <    }
966 <
967 <    public void testThenCombine_exceptionalCompletion4() {
1440 >    /**
1441 >     * thenApply result completes exceptionally if source cancelled
1442 >     */
1443 >    public void testThenApply_sourceCancelled() {
1444          for (ExecutionMode m : ExecutionMode.values())
1445 <        for (Integer v1 : new Integer[] { 1, null }) {
1446 <
1445 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1446 >    {
1447          final CompletableFuture<Integer> f = new CompletableFuture<>();
1448 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1449 <        final SubtractFunction r = new SubtractFunction();
974 <        final CFException ex = new CFException();
1448 >        final IncFunction[] rs = new IncFunction[4];
1449 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1450  
1451 <        f.completeExceptionally(ex);
1452 <        g.complete(v1);
1453 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, subtract);
1451 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1452 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1453 >        assertTrue(f.cancel(mayInterruptIfRunning));
1454 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1455 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1456  
1457 <        checkCompletedWithWrappedCFException(h, ex);
1458 <        checkCompletedWithWrappedCFException(f, ex);
1459 <        assertFalse(r.ran());
1460 <        checkCompletedNormally(g, v1);
1461 <        }
1462 <    }
1457 >        checkCompletedWithWrappedCancellationException(h0);
1458 >        checkCompletedWithWrappedCancellationException(h1);
1459 >        checkCompletedWithWrappedCancellationException(h2);
1460 >        checkCompletedWithWrappedCancellationException(h3);
1461 >        checkCancelled(f);
1462 >        for (IncFunction r : rs) r.assertNotInvoked();
1463 >    }}
1464  
1465      /**
1466 <     * thenCombine result completes exceptionally if action does
1466 >     * thenApply result completes exceptionally if action does
1467       */
1468 <    public void testThenCombine_actionFailed1() {
1468 >    public void testThenApply_actionFailed() {
1469          for (ExecutionMode m : ExecutionMode.values())
1470          for (Integer v1 : new Integer[] { 1, null })
1471 <        for (Integer v2 : new Integer[] { 2, null }) {
994 <
1471 >    {
1472          final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1474 <        final FailingBiFunction r = new FailingBiFunction();
998 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
999 <
1000 <        f.complete(v1);
1001 <        checkIncomplete(h);
1002 <        g.complete(v2);
1473 >        final FailingFunction[] rs = new FailingFunction[4];
1474 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1475  
1476 <        checkCompletedWithWrappedCFException(h);
1476 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1477 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1478 >        assertTrue(f.complete(v1));
1479 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1480 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1481 >
1482 >        checkCompletedWithWrappedCFException(h0);
1483 >        checkCompletedWithWrappedCFException(h1);
1484 >        checkCompletedWithWrappedCFException(h2);
1485 >        checkCompletedWithWrappedCFException(h3);
1486          checkCompletedNormally(f, v1);
1487 <        checkCompletedNormally(g, v2);
1007 <        }
1008 <    }
1487 >    }}
1488  
1489 <    public void testThenCombine_actionFailed2() {
1489 >    /**
1490 >     * thenAccept result completes normally after normal completion of source
1491 >     */
1492 >    public void testThenAccept_normalCompletion() {
1493          for (ExecutionMode m : ExecutionMode.values())
1494          for (Integer v1 : new Integer[] { 1, null })
1495 <        for (Integer v2 : new Integer[] { 2, null }) {
1014 <
1495 >    {
1496          final CompletableFuture<Integer> f = new CompletableFuture<>();
1497 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1498 <        final FailingBiFunction r = new FailingBiFunction();
1018 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1019 <
1020 <        g.complete(v2);
1021 <        checkIncomplete(h);
1022 <        f.complete(v1);
1497 >        final NoopConsumer[] rs = new NoopConsumer[4];
1498 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1499  
1500 <        checkCompletedWithWrappedCFException(h);
1500 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1501 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1502 >        checkIncomplete(h0);
1503 >        checkIncomplete(h1);
1504 >        assertTrue(f.complete(v1));
1505 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1506 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1507 >
1508 >        checkCompletedNormally(h0, null);
1509 >        checkCompletedNormally(h1, null);
1510 >        checkCompletedNormally(h2, null);
1511 >        checkCompletedNormally(h3, null);
1512          checkCompletedNormally(f, v1);
1513 <        checkCompletedNormally(g, v2);
1514 <        }
1028 <    }
1513 >        for (NoopConsumer r : rs) r.assertValue(v1);
1514 >    }}
1515  
1516      /**
1517 <     * thenCombine result completes exceptionally if either source cancelled
1517 >     * thenAccept result completes exceptionally after exceptional
1518 >     * completion of source
1519       */
1520 <    public void testThenCombine_sourceCancelled1() {
1520 >    public void testThenAccept_exceptionalCompletion() {
1521          for (ExecutionMode m : ExecutionMode.values())
1522 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1523 <        for (Integer v1 : new Integer[] { 1, null }) {
1037 <
1522 >    {
1523 >        final CFException ex = new CFException();
1524          final CompletableFuture<Integer> f = new CompletableFuture<>();
1525 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1526 <        final SubtractFunction r = new SubtractFunction();
1041 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1042 <
1043 <        assertTrue(f.cancel(mayInterruptIfRunning));
1044 <        checkIncomplete(h);
1045 <        g.complete(v1);
1525 >        final NoopConsumer[] rs = new NoopConsumer[4];
1526 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1527  
1528 <        checkCompletedWithWrappedCancellationException(h);
1529 <        checkCancelled(f);
1530 <        assertFalse(r.ran());
1531 <        checkCompletedNormally(g, v1);
1532 <        }
1533 <    }
1528 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1529 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1530 >        assertTrue(f.completeExceptionally(ex));
1531 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1532 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1533 >
1534 >        checkCompletedWithWrappedException(h0, ex);
1535 >        checkCompletedWithWrappedException(h1, ex);
1536 >        checkCompletedWithWrappedException(h2, ex);
1537 >        checkCompletedWithWrappedException(h3, ex);
1538 >        checkCompletedExceptionally(f, ex);
1539 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1540 >    }}
1541  
1542 <    public void testThenCombine_sourceCancelled2() {
1542 >    /**
1543 >     * thenAccept result completes exceptionally if source cancelled
1544 >     */
1545 >    public void testThenAccept_sourceCancelled() {
1546          for (ExecutionMode m : ExecutionMode.values())
1547          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1548 <        for (Integer v1 : new Integer[] { 1, null }) {
1058 <
1548 >    {
1549          final CompletableFuture<Integer> f = new CompletableFuture<>();
1550 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1551 <        final SubtractFunction r = new SubtractFunction();
1062 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1550 >        final NoopConsumer[] rs = new NoopConsumer[4];
1551 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1552  
1553 <        assertTrue(g.cancel(mayInterruptIfRunning));
1554 <        checkIncomplete(h);
1555 <        f.complete(v1);
1553 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1554 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1555 >        assertTrue(f.cancel(mayInterruptIfRunning));
1556 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1557 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1558  
1559 <        checkCompletedWithWrappedCancellationException(h);
1560 <        checkCancelled(g);
1561 <        assertFalse(r.ran());
1562 <        checkCompletedNormally(f, v1);
1563 <        }
1564 <    }
1559 >        checkCompletedWithWrappedCancellationException(h0);
1560 >        checkCompletedWithWrappedCancellationException(h1);
1561 >        checkCompletedWithWrappedCancellationException(h2);
1562 >        checkCompletedWithWrappedCancellationException(h3);
1563 >        checkCancelled(f);
1564 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1565 >    }}
1566  
1567 <    public void testThenCombine_sourceCancelled3() {
1567 >    /**
1568 >     * thenAccept result completes exceptionally if action does
1569 >     */
1570 >    public void testThenAccept_actionFailed() {
1571          for (ExecutionMode m : ExecutionMode.values())
1572 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1573 <        for (Integer v1 : new Integer[] { 1, null }) {
1079 <
1572 >        for (Integer v1 : new Integer[] { 1, null })
1573 >    {
1574          final CompletableFuture<Integer> f = new CompletableFuture<>();
1575 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1576 <        final SubtractFunction r = new SubtractFunction();
1083 <
1084 <        assertTrue(g.cancel(mayInterruptIfRunning));
1085 <        f.complete(v1);
1086 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1575 >        final FailingConsumer[] rs = new FailingConsumer[4];
1576 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1577  
1578 <        checkCompletedWithWrappedCancellationException(h);
1579 <        checkCancelled(g);
1580 <        assertFalse(r.ran());
1578 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1579 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1580 >        assertTrue(f.complete(v1));
1581 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1582 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1583 >
1584 >        checkCompletedWithWrappedCFException(h0);
1585 >        checkCompletedWithWrappedCFException(h1);
1586 >        checkCompletedWithWrappedCFException(h2);
1587 >        checkCompletedWithWrappedCFException(h3);
1588          checkCompletedNormally(f, v1);
1589 <        }
1093 <    }
1589 >    }}
1590  
1591 <    public void testThenCombine_sourceCancelled4() {
1591 >    /**
1592 >     * thenCombine result completes normally after normal completion
1593 >     * of sources
1594 >     */
1595 >    public void testThenCombine_normalCompletion() {
1596          for (ExecutionMode m : ExecutionMode.values())
1597 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1598 <        for (Integer v1 : new Integer[] { 1, null }) {
1599 <
1597 >        for (boolean fFirst : new boolean[] { true, false })
1598 >        for (Integer v1 : new Integer[] { 1, null })
1599 >        for (Integer v2 : new Integer[] { 2, null })
1600 >    {
1601          final CompletableFuture<Integer> f = new CompletableFuture<>();
1602          final CompletableFuture<Integer> g = new CompletableFuture<>();
1603 <        final SubtractFunction r = new SubtractFunction();
1604 <
1605 <        assertTrue(f.cancel(mayInterruptIfRunning));
1606 <        g.complete(v1);
1607 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1608 <
1609 <        checkCompletedWithWrappedCancellationException(h);
1610 <        checkCancelled(f);
1611 <        assertFalse(r.ran());
1612 <        checkCompletedNormally(g, v1);
1613 <        }
1614 <    }
1603 >        final SubtractFunction r1 = new SubtractFunction(m);
1604 >        final SubtractFunction r2 = new SubtractFunction(m);
1605 >        final SubtractFunction r3 = new SubtractFunction(m);
1606 >
1607 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1608 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1609 >        final Integer w1 =  fFirst ? v1 : v2;
1610 >        final Integer w2 = !fFirst ? v1 : v2;
1611 >
1612 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1613 >        assertTrue(fst.complete(w1));
1614 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1615 >        checkIncomplete(h1);
1616 >        checkIncomplete(h2);
1617 >        r1.assertNotInvoked();
1618 >        r2.assertNotInvoked();
1619 >        assertTrue(snd.complete(w2));
1620 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1621 >
1622 >        checkCompletedNormally(h1, subtract(v1, v2));
1623 >        checkCompletedNormally(h2, subtract(v1, v2));
1624 >        checkCompletedNormally(h3, subtract(v1, v2));
1625 >        r1.assertValue(subtract(v1, v2));
1626 >        r2.assertValue(subtract(v1, v2));
1627 >        r3.assertValue(subtract(v1, v2));
1628 >        checkCompletedNormally(f, v1);
1629 >        checkCompletedNormally(g, v2);
1630 >    }}
1631  
1632      /**
1633 <     * thenAcceptBoth result completes normally after normal
1634 <     * completion of sources
1633 >     * thenCombine result completes exceptionally after exceptional
1634 >     * completion of either source
1635       */
1636 <    public void testThenAcceptBoth_normalCompletion1() {
1636 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1637          for (ExecutionMode m : ExecutionMode.values())
1638 +        for (boolean fFirst : new boolean[] { true, false })
1639 +        for (boolean failFirst : new boolean[] { true, false })
1640          for (Integer v1 : new Integer[] { 1, null })
1641 <        for (Integer v2 : new Integer[] { 2, null }) {
1123 <
1641 >    {
1642          final CompletableFuture<Integer> f = new CompletableFuture<>();
1643          final CompletableFuture<Integer> g = new CompletableFuture<>();
1644 <        final SubtractAction r = new SubtractAction();
1645 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1646 <
1647 <        f.complete(v1);
1648 <        checkIncomplete(h);
1649 <        assertEquals(r.value, 0);
1650 <        g.complete(v2);
1651 <
1652 <        checkCompletedNormally(h, null);
1653 <        assertEquals(r.value, subtract(v1, v2));
1654 <        checkCompletedNormally(f, v1);
1655 <        checkCompletedNormally(g, v2);
1656 <        }
1657 <    }
1644 >        final CFException ex = new CFException();
1645 >        final SubtractFunction r1 = new SubtractFunction(m);
1646 >        final SubtractFunction r2 = new SubtractFunction(m);
1647 >        final SubtractFunction r3 = new SubtractFunction(m);
1648 >
1649 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1650 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1651 >        final Callable<Boolean> complete1 = failFirst ?
1652 >            () -> fst.completeExceptionally(ex) :
1653 >            () -> fst.complete(v1);
1654 >        final Callable<Boolean> complete2 = failFirst ?
1655 >            () -> snd.complete(v1) :
1656 >            () -> snd.completeExceptionally(ex);
1657 >
1658 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1659 >        assertTrue(complete1.call());
1660 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1661 >        checkIncomplete(h1);
1662 >        checkIncomplete(h2);
1663 >        assertTrue(complete2.call());
1664 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1665 >
1666 >        checkCompletedWithWrappedException(h1, ex);
1667 >        checkCompletedWithWrappedException(h2, ex);
1668 >        checkCompletedWithWrappedException(h3, ex);
1669 >        r1.assertNotInvoked();
1670 >        r2.assertNotInvoked();
1671 >        r3.assertNotInvoked();
1672 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1673 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1674 >    }}
1675  
1676 <    public void testThenAcceptBoth_normalCompletion2() {
1676 >    /**
1677 >     * thenCombine result completes exceptionally if either source cancelled
1678 >     */
1679 >    public void testThenCombine_sourceCancelled() throws Throwable {
1680          for (ExecutionMode m : ExecutionMode.values())
1681 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1682 +        for (boolean fFirst : new boolean[] { true, false })
1683 +        for (boolean failFirst : new boolean[] { true, false })
1684          for (Integer v1 : new Integer[] { 1, null })
1685 <        for (Integer v2 : new Integer[] { 2, null }) {
1145 <
1685 >    {
1686          final CompletableFuture<Integer> f = new CompletableFuture<>();
1687          final CompletableFuture<Integer> g = new CompletableFuture<>();
1688 <        final SubtractAction r = new SubtractAction();
1689 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1690 <
1691 <        g.complete(v2);
1692 <        checkIncomplete(h);
1693 <        assertEquals(r.value, 0);
1694 <        f.complete(v1);
1688 >        final SubtractFunction r1 = new SubtractFunction(m);
1689 >        final SubtractFunction r2 = new SubtractFunction(m);
1690 >        final SubtractFunction r3 = new SubtractFunction(m);
1691 >
1692 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1693 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1694 >        final Callable<Boolean> complete1 = failFirst ?
1695 >            () -> fst.cancel(mayInterruptIfRunning) :
1696 >            () -> fst.complete(v1);
1697 >        final Callable<Boolean> complete2 = failFirst ?
1698 >            () -> snd.complete(v1) :
1699 >            () -> snd.cancel(mayInterruptIfRunning);
1700 >
1701 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1702 >        assertTrue(complete1.call());
1703 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1704 >        checkIncomplete(h1);
1705 >        checkIncomplete(h2);
1706 >        assertTrue(complete2.call());
1707 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1708 >
1709 >        checkCompletedWithWrappedCancellationException(h1);
1710 >        checkCompletedWithWrappedCancellationException(h2);
1711 >        checkCompletedWithWrappedCancellationException(h3);
1712 >        r1.assertNotInvoked();
1713 >        r2.assertNotInvoked();
1714 >        r3.assertNotInvoked();
1715 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1716 >        checkCancelled(failFirst ? fst : snd);
1717 >    }}
1718  
1719 <        checkCompletedNormally(h, null);
1720 <        assertEquals(r.value, subtract(v1, v2));
1721 <        checkCompletedNormally(f, v1);
1722 <        checkCompletedNormally(g, v2);
1160 <        }
1161 <    }
1162 <
1163 <    public void testThenAcceptBoth_normalCompletion3() {
1719 >    /**
1720 >     * thenCombine result completes exceptionally if action does
1721 >     */
1722 >    public void testThenCombine_actionFailed() {
1723          for (ExecutionMode m : ExecutionMode.values())
1724 +        for (boolean fFirst : new boolean[] { true, false })
1725          for (Integer v1 : new Integer[] { 1, null })
1726 <        for (Integer v2 : new Integer[] { 2, null }) {
1727 <
1726 >        for (Integer v2 : new Integer[] { 2, null })
1727 >    {
1728          final CompletableFuture<Integer> f = new CompletableFuture<>();
1729          final CompletableFuture<Integer> g = new CompletableFuture<>();
1730 <        final SubtractAction r = new SubtractAction();
1731 <
1732 <        g.complete(v2);
1733 <        f.complete(v1);
1734 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1735 <
1736 <        checkCompletedNormally(h, null);
1737 <        assertEquals(r.value, subtract(v1, v2));
1730 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1731 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1732 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1733 >
1734 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1735 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1736 >        final Integer w1 =  fFirst ? v1 : v2;
1737 >        final Integer w2 = !fFirst ? v1 : v2;
1738 >
1739 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1740 >        assertTrue(fst.complete(w1));
1741 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1742 >        assertTrue(snd.complete(w2));
1743 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1744 >
1745 >        checkCompletedWithWrappedCFException(h1);
1746 >        checkCompletedWithWrappedCFException(h2);
1747 >        checkCompletedWithWrappedCFException(h3);
1748 >        r1.assertInvoked();
1749 >        r2.assertInvoked();
1750 >        r3.assertInvoked();
1751          checkCompletedNormally(f, v1);
1752          checkCompletedNormally(g, v2);
1753 <        }
1181 <    }
1753 >    }}
1754  
1755 <    public void testThenAcceptBoth_normalCompletion4() {
1755 >    /**
1756 >     * thenAcceptBoth result completes normally after normal
1757 >     * completion of sources
1758 >     */
1759 >    public void testThenAcceptBoth_normalCompletion() {
1760          for (ExecutionMode m : ExecutionMode.values())
1761 +        for (boolean fFirst : new boolean[] { true, false })
1762          for (Integer v1 : new Integer[] { 1, null })
1763 <        for (Integer v2 : new Integer[] { 2, null }) {
1764 <
1763 >        for (Integer v2 : new Integer[] { 2, null })
1764 >    {
1765          final CompletableFuture<Integer> f = new CompletableFuture<>();
1766          final CompletableFuture<Integer> g = new CompletableFuture<>();
1767 <        final SubtractAction r = new SubtractAction();
1768 <
1769 <        f.complete(v1);
1770 <        g.complete(v2);
1771 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1772 <
1773 <        checkCompletedNormally(h, null);
1774 <        assertEquals(r.value, subtract(v1, v2));
1767 >        final SubtractAction r1 = new SubtractAction(m);
1768 >        final SubtractAction r2 = new SubtractAction(m);
1769 >        final SubtractAction r3 = new SubtractAction(m);
1770 >
1771 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1772 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1773 >        final Integer w1 =  fFirst ? v1 : v2;
1774 >        final Integer w2 = !fFirst ? v1 : v2;
1775 >
1776 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1777 >        assertTrue(fst.complete(w1));
1778 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1779 >        checkIncomplete(h1);
1780 >        checkIncomplete(h2);
1781 >        r1.assertNotInvoked();
1782 >        r2.assertNotInvoked();
1783 >        assertTrue(snd.complete(w2));
1784 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1785 >
1786 >        checkCompletedNormally(h1, null);
1787 >        checkCompletedNormally(h2, null);
1788 >        checkCompletedNormally(h3, null);
1789 >        r1.assertValue(subtract(v1, v2));
1790 >        r2.assertValue(subtract(v1, v2));
1791 >        r3.assertValue(subtract(v1, v2));
1792          checkCompletedNormally(f, v1);
1793          checkCompletedNormally(g, v2);
1794 <        }
1201 <    }
1794 >    }}
1795  
1796      /**
1797       * thenAcceptBoth result completes exceptionally after exceptional
1798       * completion of either source
1799       */
1800 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1800 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1801          for (ExecutionMode m : ExecutionMode.values())
1802 <        for (Integer v1 : new Integer[] { 1, null }) {
1803 <
1802 >        for (boolean fFirst : new boolean[] { true, false })
1803 >        for (boolean failFirst : new boolean[] { true, false })
1804 >        for (Integer v1 : new Integer[] { 1, null })
1805 >    {
1806          final CompletableFuture<Integer> f = new CompletableFuture<>();
1807          final CompletableFuture<Integer> g = new CompletableFuture<>();
1213        final SubtractAction r = new SubtractAction();
1214        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1808          final CFException ex = new CFException();
1809 +        final SubtractAction r1 = new SubtractAction(m);
1810 +        final SubtractAction r2 = new SubtractAction(m);
1811 +        final SubtractAction r3 = new SubtractAction(m);
1812 +
1813 +        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1814 +        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1815 +        final Callable<Boolean> complete1 = failFirst ?
1816 +            () -> fst.completeExceptionally(ex) :
1817 +            () -> fst.complete(v1);
1818 +        final Callable<Boolean> complete2 = failFirst ?
1819 +            () -> snd.complete(v1) :
1820 +            () -> snd.completeExceptionally(ex);
1821 +
1822 +        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1823 +        assertTrue(complete1.call());
1824 +        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1825 +        checkIncomplete(h1);
1826 +        checkIncomplete(h2);
1827 +        assertTrue(complete2.call());
1828 +        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1829 +
1830 +        checkCompletedWithWrappedException(h1, ex);
1831 +        checkCompletedWithWrappedException(h2, ex);
1832 +        checkCompletedWithWrappedException(h3, ex);
1833 +        r1.assertNotInvoked();
1834 +        r2.assertNotInvoked();
1835 +        r3.assertNotInvoked();
1836 +        checkCompletedNormally(failFirst ? snd : fst, v1);
1837 +        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1838 +    }}
1839  
1840 <        f.completeExceptionally(ex);
1841 <        checkIncomplete(h);
1842 <        g.complete(v1);
1843 <
1221 <        checkCompletedWithWrappedCFException(h, ex);
1222 <        checkCompletedWithWrappedCFException(f, ex);
1223 <        assertFalse(r.ran());
1224 <        checkCompletedNormally(g, v1);
1225 <        }
1226 <    }
1227 <
1228 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1840 >    /**
1841 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1842 >     */
1843 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1844          for (ExecutionMode m : ExecutionMode.values())
1845 <        for (Integer v1 : new Integer[] { 1, null }) {
1846 <
1845 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1846 >        for (boolean fFirst : new boolean[] { true, false })
1847 >        for (boolean failFirst : new boolean[] { true, false })
1848 >        for (Integer v1 : new Integer[] { 1, null })
1849 >    {
1850          final CompletableFuture<Integer> f = new CompletableFuture<>();
1851          final CompletableFuture<Integer> g = new CompletableFuture<>();
1852 <        final SubtractAction r = new SubtractAction();
1853 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1854 <        final CFException ex = new CFException();
1855 <
1856 <        g.completeExceptionally(ex);
1857 <        checkIncomplete(h);
1858 <        f.complete(v1);
1852 >        final SubtractAction r1 = new SubtractAction(m);
1853 >        final SubtractAction r2 = new SubtractAction(m);
1854 >        final SubtractAction r3 = new SubtractAction(m);
1855 >
1856 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1857 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1858 >        final Callable<Boolean> complete1 = failFirst ?
1859 >            () -> fst.cancel(mayInterruptIfRunning) :
1860 >            () -> fst.complete(v1);
1861 >        final Callable<Boolean> complete2 = failFirst ?
1862 >            () -> snd.complete(v1) :
1863 >            () -> snd.cancel(mayInterruptIfRunning);
1864 >
1865 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1866 >        assertTrue(complete1.call());
1867 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1868 >        checkIncomplete(h1);
1869 >        checkIncomplete(h2);
1870 >        assertTrue(complete2.call());
1871 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1872 >
1873 >        checkCompletedWithWrappedCancellationException(h1);
1874 >        checkCompletedWithWrappedCancellationException(h2);
1875 >        checkCompletedWithWrappedCancellationException(h3);
1876 >        r1.assertNotInvoked();
1877 >        r2.assertNotInvoked();
1878 >        r3.assertNotInvoked();
1879 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1880 >        checkCancelled(failFirst ? fst : snd);
1881 >    }}
1882  
1883 <        checkCompletedWithWrappedCFException(h, ex);
1884 <        checkCompletedWithWrappedCFException(g, ex);
1885 <        assertFalse(r.ran());
1883 >    /**
1884 >     * thenAcceptBoth result completes exceptionally if action does
1885 >     */
1886 >    public void testThenAcceptBoth_actionFailed() {
1887 >        for (ExecutionMode m : ExecutionMode.values())
1888 >        for (boolean fFirst : new boolean[] { true, false })
1889 >        for (Integer v1 : new Integer[] { 1, null })
1890 >        for (Integer v2 : new Integer[] { 2, null })
1891 >    {
1892 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1893 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1894 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1895 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1896 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1897 >
1898 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1899 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1900 >        final Integer w1 =  fFirst ? v1 : v2;
1901 >        final Integer w2 = !fFirst ? v1 : v2;
1902 >
1903 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1904 >        assertTrue(fst.complete(w1));
1905 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1906 >        assertTrue(snd.complete(w2));
1907 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1908 >
1909 >        checkCompletedWithWrappedCFException(h1);
1910 >        checkCompletedWithWrappedCFException(h2);
1911 >        checkCompletedWithWrappedCFException(h3);
1912 >        r1.assertInvoked();
1913 >        r2.assertInvoked();
1914 >        r3.assertInvoked();
1915          checkCompletedNormally(f, v1);
1916 <        }
1917 <    }
1916 >        checkCompletedNormally(g, v2);
1917 >    }}
1918  
1919 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1919 >    /**
1920 >     * runAfterBoth result completes normally after normal
1921 >     * completion of sources
1922 >     */
1923 >    public void testRunAfterBoth_normalCompletion() {
1924          for (ExecutionMode m : ExecutionMode.values())
1925 <        for (Integer v1 : new Integer[] { 1, null }) {
1926 <
1925 >        for (boolean fFirst : new boolean[] { true, false })
1926 >        for (Integer v1 : new Integer[] { 1, null })
1927 >        for (Integer v2 : new Integer[] { 2, null })
1928 >    {
1929          final CompletableFuture<Integer> f = new CompletableFuture<>();
1930          final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 <        final SubtractAction r = new SubtractAction();
1932 <        final CFException ex = new CFException();
1933 <
1934 <        g.completeExceptionally(ex);
1935 <        f.complete(v1);
1936 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1937 <
1938 <        checkCompletedWithWrappedCFException(h, ex);
1939 <        checkCompletedWithWrappedCFException(g, ex);
1940 <        assertFalse(r.ran());
1931 >        final Noop r1 = new Noop(m);
1932 >        final Noop r2 = new Noop(m);
1933 >        final Noop r3 = new Noop(m);
1934 >
1935 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1936 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1937 >        final Integer w1 =  fFirst ? v1 : v2;
1938 >        final Integer w2 = !fFirst ? v1 : v2;
1939 >
1940 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1941 >        assertTrue(fst.complete(w1));
1942 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1943 >        checkIncomplete(h1);
1944 >        checkIncomplete(h2);
1945 >        r1.assertNotInvoked();
1946 >        r2.assertNotInvoked();
1947 >        assertTrue(snd.complete(w2));
1948 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1949 >
1950 >        checkCompletedNormally(h1, null);
1951 >        checkCompletedNormally(h2, null);
1952 >        checkCompletedNormally(h3, null);
1953 >        r1.assertInvoked();
1954 >        r2.assertInvoked();
1955 >        r3.assertInvoked();
1956          checkCompletedNormally(f, v1);
1957 <        }
1958 <    }
1957 >        checkCompletedNormally(g, v2);
1958 >    }}
1959  
1960 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1960 >    /**
1961 >     * runAfterBoth result completes exceptionally after exceptional
1962 >     * completion of either source
1963 >     */
1964 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1965          for (ExecutionMode m : ExecutionMode.values())
1966 <        for (Integer v1 : new Integer[] { 1, null }) {
1967 <
1966 >        for (boolean fFirst : new boolean[] { true, false })
1967 >        for (boolean failFirst : new boolean[] { true, false })
1968 >        for (Integer v1 : new Integer[] { 1, null })
1969 >    {
1970          final CompletableFuture<Integer> f = new CompletableFuture<>();
1971          final CompletableFuture<Integer> g = new CompletableFuture<>();
1275        final SubtractAction r = new SubtractAction();
1972          final CFException ex = new CFException();
1973 <
1974 <        f.completeExceptionally(ex);
1975 <        g.complete(v1);
1976 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1977 <
1978 <        checkCompletedWithWrappedCFException(h, ex);
1979 <        checkCompletedWithWrappedCFException(f, ex);
1980 <        assertFalse(r.ran());
1981 <        checkCompletedNormally(g, v1);
1982 <        }
1983 <    }
1973 >        final Noop r1 = new Noop(m);
1974 >        final Noop r2 = new Noop(m);
1975 >        final Noop r3 = new Noop(m);
1976 >
1977 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1978 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1979 >        final Callable<Boolean> complete1 = failFirst ?
1980 >            () -> fst.completeExceptionally(ex) :
1981 >            () -> fst.complete(v1);
1982 >        final Callable<Boolean> complete2 = failFirst ?
1983 >            () -> snd.complete(v1) :
1984 >            () -> snd.completeExceptionally(ex);
1985 >
1986 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1987 >        assertTrue(complete1.call());
1988 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1989 >        checkIncomplete(h1);
1990 >        checkIncomplete(h2);
1991 >        assertTrue(complete2.call());
1992 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1993 >
1994 >        checkCompletedWithWrappedException(h1, ex);
1995 >        checkCompletedWithWrappedException(h2, ex);
1996 >        checkCompletedWithWrappedException(h3, ex);
1997 >        r1.assertNotInvoked();
1998 >        r2.assertNotInvoked();
1999 >        r3.assertNotInvoked();
2000 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2001 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2002 >    }}
2003  
2004      /**
2005 <     * thenAcceptBoth result completes exceptionally if action does
2005 >     * runAfterBoth result completes exceptionally if either source cancelled
2006       */
2007 <    public void testThenAcceptBoth_actionFailed1() {
2007 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2008          for (ExecutionMode m : ExecutionMode.values())
2009 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2010 +        for (boolean fFirst : new boolean[] { true, false })
2011 +        for (boolean failFirst : new boolean[] { true, false })
2012          for (Integer v1 : new Integer[] { 1, null })
2013 <        for (Integer v2 : new Integer[] { 2, null }) {
1296 <
2013 >    {
2014          final CompletableFuture<Integer> f = new CompletableFuture<>();
2015          final CompletableFuture<Integer> g = new CompletableFuture<>();
2016 <        final FailingBiConsumer r = new FailingBiConsumer();
2017 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2018 <
2019 <        f.complete(v1);
2020 <        checkIncomplete(h);
2021 <        g.complete(v2);
2016 >        final Noop r1 = new Noop(m);
2017 >        final Noop r2 = new Noop(m);
2018 >        final Noop r3 = new Noop(m);
2019 >
2020 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2021 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2022 >        final Callable<Boolean> complete1 = failFirst ?
2023 >            () -> fst.cancel(mayInterruptIfRunning) :
2024 >            () -> fst.complete(v1);
2025 >        final Callable<Boolean> complete2 = failFirst ?
2026 >            () -> snd.complete(v1) :
2027 >            () -> snd.cancel(mayInterruptIfRunning);
2028 >
2029 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2030 >        assertTrue(complete1.call());
2031 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2032 >        checkIncomplete(h1);
2033 >        checkIncomplete(h2);
2034 >        assertTrue(complete2.call());
2035 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2036 >
2037 >        checkCompletedWithWrappedCancellationException(h1);
2038 >        checkCompletedWithWrappedCancellationException(h2);
2039 >        checkCompletedWithWrappedCancellationException(h3);
2040 >        r1.assertNotInvoked();
2041 >        r2.assertNotInvoked();
2042 >        r3.assertNotInvoked();
2043 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2044 >        checkCancelled(failFirst ? fst : snd);
2045 >    }}
2046  
2047 <        checkCompletedWithWrappedCFException(h);
2047 >    /**
2048 >     * runAfterBoth result completes exceptionally if action does
2049 >     */
2050 >    public void testRunAfterBoth_actionFailed() {
2051 >        for (ExecutionMode m : ExecutionMode.values())
2052 >        for (boolean fFirst : new boolean[] { true, false })
2053 >        for (Integer v1 : new Integer[] { 1, null })
2054 >        for (Integer v2 : new Integer[] { 2, null })
2055 >    {
2056 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2057 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2058 >        final FailingRunnable r1 = new FailingRunnable(m);
2059 >        final FailingRunnable r2 = new FailingRunnable(m);
2060 >        final FailingRunnable r3 = new FailingRunnable(m);
2061 >
2062 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2063 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2064 >        final Integer w1 =  fFirst ? v1 : v2;
2065 >        final Integer w2 = !fFirst ? v1 : v2;
2066 >
2067 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2068 >        assertTrue(fst.complete(w1));
2069 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2070 >        assertTrue(snd.complete(w2));
2071 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2072 >
2073 >        checkCompletedWithWrappedCFException(h1);
2074 >        checkCompletedWithWrappedCFException(h2);
2075 >        checkCompletedWithWrappedCFException(h3);
2076 >        r1.assertInvoked();
2077 >        r2.assertInvoked();
2078 >        r3.assertInvoked();
2079          checkCompletedNormally(f, v1);
2080          checkCompletedNormally(g, v2);
2081 <        }
1310 <    }
2081 >    }}
2082  
2083 <    public void testThenAcceptBoth_actionFailed2() {
2083 >    /**
2084 >     * applyToEither result completes normally after normal completion
2085 >     * of either source
2086 >     */
2087 >    public void testApplyToEither_normalCompletion() {
2088          for (ExecutionMode m : ExecutionMode.values())
2089          for (Integer v1 : new Integer[] { 1, null })
2090 <        for (Integer v2 : new Integer[] { 2, null }) {
2091 <
2090 >        for (Integer v2 : new Integer[] { 2, null })
2091 >    {
2092          final CompletableFuture<Integer> f = new CompletableFuture<>();
2093          final CompletableFuture<Integer> g = new CompletableFuture<>();
2094 <        final FailingBiConsumer r = new FailingBiConsumer();
2095 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2094 >        final IncFunction[] rs = new IncFunction[6];
2095 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2096  
2097 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2098 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2099 +        checkIncomplete(h0);
2100 +        checkIncomplete(h1);
2101 +        rs[0].assertNotInvoked();
2102 +        rs[1].assertNotInvoked();
2103 +        f.complete(v1);
2104 +        checkCompletedNormally(h0, inc(v1));
2105 +        checkCompletedNormally(h1, inc(v1));
2106 +        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2107 +        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2108 +        checkCompletedNormally(h2, inc(v1));
2109 +        checkCompletedNormally(h3, inc(v1));
2110          g.complete(v2);
1323        checkIncomplete(h);
1324        f.complete(v1);
2111  
2112 <        checkCompletedWithWrappedCFException(h);
2112 >        // unspecified behavior - both source completions available
2113 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2114 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2115 >        rs[4].assertValue(h4.join());
2116 >        rs[5].assertValue(h5.join());
2117 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2118 >                   Objects.equals(inc(v2), h4.join()));
2119 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2120 >                   Objects.equals(inc(v2), h5.join()));
2121 >
2122          checkCompletedNormally(f, v1);
2123          checkCompletedNormally(g, v2);
2124 <        }
2125 <    }
2124 >        checkCompletedNormally(h0, inc(v1));
2125 >        checkCompletedNormally(h1, inc(v1));
2126 >        checkCompletedNormally(h2, inc(v1));
2127 >        checkCompletedNormally(h3, inc(v1));
2128 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2129 >    }}
2130  
2131      /**
2132 <     * thenAcceptBoth result completes exceptionally if either source cancelled
2132 >     * applyToEither result completes exceptionally after exceptional
2133 >     * completion of either source
2134       */
2135 <    public void testThenAcceptBoth_sourceCancelled1() {
2135 >    public void testApplyToEither_exceptionalCompletion() {
2136          for (ExecutionMode m : ExecutionMode.values())
2137 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2138 <        for (Integer v1 : new Integer[] { 1, null }) {
1339 <
2137 >        for (Integer v1 : new Integer[] { 1, null })
2138 >    {
2139          final CompletableFuture<Integer> f = new CompletableFuture<>();
2140          final CompletableFuture<Integer> g = new CompletableFuture<>();
2141 <        final SubtractAction r = new SubtractAction();
2142 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2141 >        final CFException ex = new CFException();
2142 >        final IncFunction[] rs = new IncFunction[6];
2143 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2144  
2145 <        assertTrue(f.cancel(mayInterruptIfRunning));
2146 <        checkIncomplete(h);
2145 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2146 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2147 >        checkIncomplete(h0);
2148 >        checkIncomplete(h1);
2149 >        rs[0].assertNotInvoked();
2150 >        rs[1].assertNotInvoked();
2151 >        f.completeExceptionally(ex);
2152 >        checkCompletedWithWrappedException(h0, ex);
2153 >        checkCompletedWithWrappedException(h1, ex);
2154 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2155 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2156 >        checkCompletedWithWrappedException(h2, ex);
2157 >        checkCompletedWithWrappedException(h3, ex);
2158          g.complete(v1);
2159  
2160 <        checkCompletedWithWrappedCancellationException(h);
2161 <        checkCancelled(f);
2162 <        assertFalse(r.ran());
2163 <        checkCompletedNormally(g, v1);
2160 >        // unspecified behavior - both source completions available
2161 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2162 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2163 >        try {
2164 >            assertEquals(inc(v1), h4.join());
2165 >            rs[4].assertValue(inc(v1));
2166 >        } catch (CompletionException ok) {
2167 >            checkCompletedWithWrappedException(h4, ex);
2168 >            rs[4].assertNotInvoked();
2169 >        }
2170 >        try {
2171 >            assertEquals(inc(v1), h5.join());
2172 >            rs[5].assertValue(inc(v1));
2173 >        } catch (CompletionException ok) {
2174 >            checkCompletedWithWrappedException(h5, ex);
2175 >            rs[5].assertNotInvoked();
2176          }
1354    }
2177  
2178 <    public void testThenAcceptBoth_sourceCancelled2() {
2179 <        for (ExecutionMode m : ExecutionMode.values())
2180 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2181 <        for (Integer v1 : new Integer[] { 1, null }) {
2178 >        checkCompletedExceptionally(f, ex);
2179 >        checkCompletedNormally(g, v1);
2180 >        checkCompletedWithWrappedException(h0, ex);
2181 >        checkCompletedWithWrappedException(h1, ex);
2182 >        checkCompletedWithWrappedException(h2, ex);
2183 >        checkCompletedWithWrappedException(h3, ex);
2184 >        checkCompletedWithWrappedException(h4, ex);
2185 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2186 >    }}
2187  
2188 +    public void testApplyToEither_exceptionalCompletion2() {
2189 +        for (ExecutionMode m : ExecutionMode.values())
2190 +        for (boolean fFirst : new boolean[] { true, false })
2191 +        for (Integer v1 : new Integer[] { 1, null })
2192 +    {
2193          final CompletableFuture<Integer> f = new CompletableFuture<>();
2194          final CompletableFuture<Integer> g = new CompletableFuture<>();
2195 <        final SubtractAction r = new SubtractAction();
2196 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2195 >        final CFException ex = new CFException();
2196 >        final IncFunction[] rs = new IncFunction[6];
2197 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2198  
2199 <        assertTrue(g.cancel(mayInterruptIfRunning));
2200 <        checkIncomplete(h);
2201 <        f.complete(v1);
2199 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2200 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2201 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2202 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2203 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2204 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2205  
2206 <        checkCompletedWithWrappedCancellationException(h);
2207 <        checkCancelled(g);
2208 <        assertFalse(r.ran());
2209 <        checkCompletedNormally(f, v1);
2206 >        // unspecified behavior - both source completions available
2207 >        try {
2208 >            assertEquals(inc(v1), h0.join());
2209 >            rs[0].assertValue(inc(v1));
2210 >        } catch (CompletionException ok) {
2211 >            checkCompletedWithWrappedException(h0, ex);
2212 >            rs[0].assertNotInvoked();
2213 >        }
2214 >        try {
2215 >            assertEquals(inc(v1), h1.join());
2216 >            rs[1].assertValue(inc(v1));
2217 >        } catch (CompletionException ok) {
2218 >            checkCompletedWithWrappedException(h1, ex);
2219 >            rs[1].assertNotInvoked();
2220 >        }
2221 >        try {
2222 >            assertEquals(inc(v1), h2.join());
2223 >            rs[2].assertValue(inc(v1));
2224 >        } catch (CompletionException ok) {
2225 >            checkCompletedWithWrappedException(h2, ex);
2226 >            rs[2].assertNotInvoked();
2227 >        }
2228 >        try {
2229 >            assertEquals(inc(v1), h3.join());
2230 >            rs[3].assertValue(inc(v1));
2231 >        } catch (CompletionException ok) {
2232 >            checkCompletedWithWrappedException(h3, ex);
2233 >            rs[3].assertNotInvoked();
2234          }
1375    }
1376
1377    public void testThenAcceptBoth_sourceCancelled3() {
1378        for (ExecutionMode m : ExecutionMode.values())
1379        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1380        for (Integer v1 : new Integer[] { 1, null }) {
1381
1382        final CompletableFuture<Integer> f = new CompletableFuture<>();
1383        final CompletableFuture<Integer> g = new CompletableFuture<>();
1384        final SubtractAction r = new SubtractAction();
1385
1386        assertTrue(g.cancel(mayInterruptIfRunning));
1387        f.complete(v1);
1388        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2235  
1390        checkCompletedWithWrappedCancellationException(h);
1391        checkCancelled(g);
1392        assertFalse(r.ran());
2236          checkCompletedNormally(f, v1);
2237 <        }
2238 <    }
2237 >        checkCompletedExceptionally(g, ex);
2238 >    }}
2239  
2240 <    public void testThenAcceptBoth_sourceCancelled4() {
2240 >    /**
2241 >     * applyToEither result completes exceptionally if either source cancelled
2242 >     */
2243 >    public void testApplyToEither_sourceCancelled() {
2244          for (ExecutionMode m : ExecutionMode.values())
2245          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2246 <        for (Integer v1 : new Integer[] { 1, null }) {
2247 <
2246 >        for (Integer v1 : new Integer[] { 1, null })
2247 >    {
2248          final CompletableFuture<Integer> f = new CompletableFuture<>();
2249          final CompletableFuture<Integer> g = new CompletableFuture<>();
2250 <        final SubtractAction r = new SubtractAction();
2250 >        final IncFunction[] rs = new IncFunction[6];
2251 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2252  
2253 <        assertTrue(f.cancel(mayInterruptIfRunning));
2253 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2254 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2255 >        checkIncomplete(h0);
2256 >        checkIncomplete(h1);
2257 >        rs[0].assertNotInvoked();
2258 >        rs[1].assertNotInvoked();
2259 >        f.cancel(mayInterruptIfRunning);
2260 >        checkCompletedWithWrappedCancellationException(h0);
2261 >        checkCompletedWithWrappedCancellationException(h1);
2262 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2263 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2264 >        checkCompletedWithWrappedCancellationException(h2);
2265 >        checkCompletedWithWrappedCancellationException(h3);
2266          g.complete(v1);
1408        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2267  
2268 <        checkCompletedWithWrappedCancellationException(h);
2268 >        // unspecified behavior - both source completions available
2269 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2270 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2271 >        try {
2272 >            assertEquals(inc(v1), h4.join());
2273 >            rs[4].assertValue(inc(v1));
2274 >        } catch (CompletionException ok) {
2275 >            checkCompletedWithWrappedCancellationException(h4);
2276 >            rs[4].assertNotInvoked();
2277 >        }
2278 >        try {
2279 >            assertEquals(inc(v1), h5.join());
2280 >            rs[5].assertValue(inc(v1));
2281 >        } catch (CompletionException ok) {
2282 >            checkCompletedWithWrappedCancellationException(h5);
2283 >            rs[5].assertNotInvoked();
2284 >        }
2285 >
2286          checkCancelled(f);
1412        assertFalse(r.ran());
2287          checkCompletedNormally(g, v1);
2288 <        }
2289 <    }
2288 >        checkCompletedWithWrappedCancellationException(h0);
2289 >        checkCompletedWithWrappedCancellationException(h1);
2290 >        checkCompletedWithWrappedCancellationException(h2);
2291 >        checkCompletedWithWrappedCancellationException(h3);
2292 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2293 >    }}
2294  
2295 <    /**
1418 <     * runAfterBoth result completes normally after normal
1419 <     * completion of sources
1420 <     */
1421 <    public void testRunAfterBoth_normalCompletion1() {
2295 >    public void testApplyToEither_sourceCancelled2() {
2296          for (ExecutionMode m : ExecutionMode.values())
2297 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2298 +        for (boolean fFirst : new boolean[] { true, false })
2299          for (Integer v1 : new Integer[] { 1, null })
2300 <        for (Integer v2 : new Integer[] { 2, null }) {
1425 <
2300 >    {
2301          final CompletableFuture<Integer> f = new CompletableFuture<>();
2302          final CompletableFuture<Integer> g = new CompletableFuture<>();
2303 <        final Noop r = new Noop();
2304 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2303 >        final IncFunction[] rs = new IncFunction[6];
2304 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2305  
2306 <        f.complete(v1);
2307 <        checkIncomplete(h);
2308 <        assertFalse(r.ran);
2309 <        g.complete(v2);
2306 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2307 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2308 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2309 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2310 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2311 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2312  
2313 <        checkCompletedNormally(h, null);
2314 <        assertTrue(r.ran);
2315 <        checkCompletedNormally(f, v1);
2316 <        checkCompletedNormally(g, v2);
2313 >        // unspecified behavior - both source completions available
2314 >        try {
2315 >            assertEquals(inc(v1), h0.join());
2316 >            rs[0].assertValue(inc(v1));
2317 >        } catch (CompletionException ok) {
2318 >            checkCompletedWithWrappedCancellationException(h0);
2319 >            rs[0].assertNotInvoked();
2320 >        }
2321 >        try {
2322 >            assertEquals(inc(v1), h1.join());
2323 >            rs[1].assertValue(inc(v1));
2324 >        } catch (CompletionException ok) {
2325 >            checkCompletedWithWrappedCancellationException(h1);
2326 >            rs[1].assertNotInvoked();
2327 >        }
2328 >        try {
2329 >            assertEquals(inc(v1), h2.join());
2330 >            rs[2].assertValue(inc(v1));
2331 >        } catch (CompletionException ok) {
2332 >            checkCompletedWithWrappedCancellationException(h2);
2333 >            rs[2].assertNotInvoked();
2334 >        }
2335 >        try {
2336 >            assertEquals(inc(v1), h3.join());
2337 >            rs[3].assertValue(inc(v1));
2338 >        } catch (CompletionException ok) {
2339 >            checkCompletedWithWrappedCancellationException(h3);
2340 >            rs[3].assertNotInvoked();
2341          }
1441    }
1442
1443    public void testRunAfterBoth_normalCompletion2() {
1444        for (ExecutionMode m : ExecutionMode.values())
1445        for (Integer v1 : new Integer[] { 1, null })
1446        for (Integer v2 : new Integer[] { 2, null }) {
1447
1448        final CompletableFuture<Integer> f = new CompletableFuture<>();
1449        final CompletableFuture<Integer> g = new CompletableFuture<>();
1450        final Noop r = new Noop();
1451        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1452
1453        g.complete(v2);
1454        checkIncomplete(h);
1455        assertFalse(r.ran);
1456        f.complete(v1);
2342  
1458        checkCompletedNormally(h, null);
1459        assertTrue(r.ran);
2343          checkCompletedNormally(f, v1);
2344 <        checkCompletedNormally(g, v2);
2345 <        }
1463 <    }
2344 >        checkCancelled(g);
2345 >    }}
2346  
2347 <    public void testRunAfterBoth_normalCompletion3() {
2347 >    /**
2348 >     * applyToEither result completes exceptionally if action does
2349 >     */
2350 >    public void testApplyToEither_actionFailed() {
2351          for (ExecutionMode m : ExecutionMode.values())
2352          for (Integer v1 : new Integer[] { 1, null })
2353 <        for (Integer v2 : new Integer[] { 2, null }) {
2354 <
2353 >        for (Integer v2 : new Integer[] { 2, null })
2354 >    {
2355          final CompletableFuture<Integer> f = new CompletableFuture<>();
2356          final CompletableFuture<Integer> g = new CompletableFuture<>();
2357 <        final Noop r = new Noop();
2357 >        final FailingFunction[] rs = new FailingFunction[6];
2358 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2359 >
2360 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2361 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2362 >        f.complete(v1);
2363 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2364 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2365 >        checkCompletedWithWrappedCFException(h0);
2366 >        checkCompletedWithWrappedCFException(h1);
2367 >        checkCompletedWithWrappedCFException(h2);
2368 >        checkCompletedWithWrappedCFException(h3);
2369 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2370  
2371          g.complete(v2);
1475        f.complete(v1);
1476        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2372  
2373 <        checkCompletedNormally(h, null);
2374 <        assertTrue(r.ran);
2373 >        // unspecified behavior - both source completions available
2374 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2375 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2376 >
2377 >        checkCompletedWithWrappedCFException(h4);
2378 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2379 >                   Objects.equals(v2, rs[4].value));
2380 >        checkCompletedWithWrappedCFException(h5);
2381 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2382 >                   Objects.equals(v2, rs[5].value));
2383 >
2384          checkCompletedNormally(f, v1);
2385          checkCompletedNormally(g, v2);
2386 <        }
1483 <    }
2386 >    }}
2387  
2388 <    public void testRunAfterBoth_normalCompletion4() {
2388 >    /**
2389 >     * acceptEither result completes normally after normal completion
2390 >     * of either source
2391 >     */
2392 >    public void testAcceptEither_normalCompletion() {
2393          for (ExecutionMode m : ExecutionMode.values())
2394          for (Integer v1 : new Integer[] { 1, null })
2395 <        for (Integer v2 : new Integer[] { 2, null }) {
2396 <
2395 >        for (Integer v2 : new Integer[] { 2, null })
2396 >    {
2397          final CompletableFuture<Integer> f = new CompletableFuture<>();
2398          final CompletableFuture<Integer> g = new CompletableFuture<>();
2399 <        final Noop r = new Noop();
2399 >        final NoopConsumer[] rs = new NoopConsumer[6];
2400 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2401  
2402 <        f.complete(v1);
2402 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2403 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2404 >        checkIncomplete(h0);
2405 >        checkIncomplete(h1);
2406 >        rs[0].assertNotInvoked();
2407 >        rs[1].assertNotInvoked();
2408 >        f.complete(v1);
2409 >        checkCompletedNormally(h0, null);
2410 >        checkCompletedNormally(h1, null);
2411 >        rs[0].assertValue(v1);
2412 >        rs[1].assertValue(v1);
2413 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2414 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2415 >        checkCompletedNormally(h2, null);
2416 >        checkCompletedNormally(h3, null);
2417 >        rs[2].assertValue(v1);
2418 >        rs[3].assertValue(v1);
2419          g.complete(v2);
1496        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2420  
2421 <        checkCompletedNormally(h, null);
2422 <        assertTrue(r.ran);
2421 >        // unspecified behavior - both source completions available
2422 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2423 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2424 >        checkCompletedNormally(h4, null);
2425 >        checkCompletedNormally(h5, null);
2426 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2427 >                   Objects.equals(v2, rs[4].value));
2428 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2429 >                   Objects.equals(v2, rs[5].value));
2430 >
2431          checkCompletedNormally(f, v1);
2432          checkCompletedNormally(g, v2);
2433 <        }
2434 <    }
2433 >        checkCompletedNormally(h0, null);
2434 >        checkCompletedNormally(h1, null);
2435 >        checkCompletedNormally(h2, null);
2436 >        checkCompletedNormally(h3, null);
2437 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2438 >    }}
2439  
2440      /**
2441 <     * runAfterBoth result completes exceptionally after exceptional
2441 >     * acceptEither result completes exceptionally after exceptional
2442       * completion of either source
2443       */
2444 <    public void testRunAfterBoth_exceptionalCompletion1() {
2444 >    public void testAcceptEither_exceptionalCompletion() {
2445          for (ExecutionMode m : ExecutionMode.values())
2446 <        for (Integer v1 : new Integer[] { 1, null }) {
2447 <
2446 >        for (Integer v1 : new Integer[] { 1, null })
2447 >    {
2448          final CompletableFuture<Integer> f = new CompletableFuture<>();
2449          final CompletableFuture<Integer> g = new CompletableFuture<>();
1515        final Noop r = new Noop();
1516        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2450          final CFException ex = new CFException();
2451 +        final NoopConsumer[] rs = new NoopConsumer[6];
2452 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2453  
2454 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2455 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2456 +        checkIncomplete(h0);
2457 +        checkIncomplete(h1);
2458 +        rs[0].assertNotInvoked();
2459 +        rs[1].assertNotInvoked();
2460          f.completeExceptionally(ex);
2461 <        checkIncomplete(h);
2461 >        checkCompletedWithWrappedException(h0, ex);
2462 >        checkCompletedWithWrappedException(h1, ex);
2463 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2464 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2465 >        checkCompletedWithWrappedException(h2, ex);
2466 >        checkCompletedWithWrappedException(h3, ex);
2467 >
2468          g.complete(v1);
2469  
2470 <        checkCompletedWithWrappedCFException(h, ex);
2471 <        checkCompletedWithWrappedCFException(f, ex);
2472 <        assertFalse(r.ran);
2473 <        checkCompletedNormally(g, v1);
2470 >        // unspecified behavior - both source completions available
2471 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2472 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2473 >        try {
2474 >            assertNull(h4.join());
2475 >            rs[4].assertValue(v1);
2476 >        } catch (CompletionException ok) {
2477 >            checkCompletedWithWrappedException(h4, ex);
2478 >            rs[4].assertNotInvoked();
2479 >        }
2480 >        try {
2481 >            assertNull(h5.join());
2482 >            rs[5].assertValue(v1);
2483 >        } catch (CompletionException ok) {
2484 >            checkCompletedWithWrappedException(h5, ex);
2485 >            rs[5].assertNotInvoked();
2486          }
1528    }
2487  
2488 <    public void testRunAfterBoth_exceptionalCompletion2() {
2489 <        for (ExecutionMode m : ExecutionMode.values())
2490 <        for (Integer v1 : new Integer[] { 1, null }) {
2488 >        checkCompletedExceptionally(f, ex);
2489 >        checkCompletedNormally(g, v1);
2490 >        checkCompletedWithWrappedException(h0, ex);
2491 >        checkCompletedWithWrappedException(h1, ex);
2492 >        checkCompletedWithWrappedException(h2, ex);
2493 >        checkCompletedWithWrappedException(h3, ex);
2494 >        checkCompletedWithWrappedException(h4, ex);
2495 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2496 >    }}
2497  
2498 +    public void testAcceptEither_exceptionalCompletion2() {
2499 +        for (ExecutionMode m : ExecutionMode.values())
2500 +        for (boolean fFirst : new boolean[] { true, false })
2501 +        for (Integer v1 : new Integer[] { 1, null })
2502 +    {
2503          final CompletableFuture<Integer> f = new CompletableFuture<>();
2504          final CompletableFuture<Integer> g = new CompletableFuture<>();
1536        final Noop r = new Noop();
1537        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2505          final CFException ex = new CFException();
2506 +        final NoopConsumer[] rs = new NoopConsumer[6];
2507 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2508  
2509 <        g.completeExceptionally(ex);
2510 <        checkIncomplete(h);
2511 <        f.complete(v1);
2509 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2510 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2511 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2512 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2513 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2514 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2515  
2516 <        checkCompletedWithWrappedCFException(h, ex);
2517 <        checkCompletedWithWrappedCFException(g, ex);
2518 <        assertFalse(r.ran);
2519 <        checkCompletedNormally(f, v1);
2516 >        // unspecified behavior - both source completions available
2517 >        try {
2518 >            assertEquals(null, h0.join());
2519 >            rs[0].assertValue(v1);
2520 >        } catch (CompletionException ok) {
2521 >            checkCompletedWithWrappedException(h0, ex);
2522 >            rs[0].assertNotInvoked();
2523 >        }
2524 >        try {
2525 >            assertEquals(null, h1.join());
2526 >            rs[1].assertValue(v1);
2527 >        } catch (CompletionException ok) {
2528 >            checkCompletedWithWrappedException(h1, ex);
2529 >            rs[1].assertNotInvoked();
2530 >        }
2531 >        try {
2532 >            assertEquals(null, h2.join());
2533 >            rs[2].assertValue(v1);
2534 >        } catch (CompletionException ok) {
2535 >            checkCompletedWithWrappedException(h2, ex);
2536 >            rs[2].assertNotInvoked();
2537 >        }
2538 >        try {
2539 >            assertEquals(null, h3.join());
2540 >            rs[3].assertValue(v1);
2541 >        } catch (CompletionException ok) {
2542 >            checkCompletedWithWrappedException(h3, ex);
2543 >            rs[3].assertNotInvoked();
2544          }
1549    }
1550
1551    public void testRunAfterBoth_exceptionalCompletion3() {
1552        for (ExecutionMode m : ExecutionMode.values())
1553        for (Integer v1 : new Integer[] { 1, null }) {
1554
1555        final CompletableFuture<Integer> f = new CompletableFuture<>();
1556        final CompletableFuture<Integer> g = new CompletableFuture<>();
1557        final Noop r = new Noop();
1558        final CFException ex = new CFException();
1559
1560        g.completeExceptionally(ex);
1561        f.complete(v1);
1562        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2545  
1564        checkCompletedWithWrappedCFException(h, ex);
1565        checkCompletedWithWrappedCFException(g, ex);
1566        assertFalse(r.ran);
2546          checkCompletedNormally(f, v1);
2547 <        }
2548 <    }
2547 >        checkCompletedExceptionally(g, ex);
2548 >    }}
2549  
2550 <    public void testRunAfterBoth_exceptionalCompletion4() {
2550 >    /**
2551 >     * acceptEither result completes exceptionally if either source cancelled
2552 >     */
2553 >    public void testAcceptEither_sourceCancelled() {
2554          for (ExecutionMode m : ExecutionMode.values())
2555 <        for (Integer v1 : new Integer[] { 1, null }) {
2556 <
2555 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2556 >        for (Integer v1 : new Integer[] { 1, null })
2557 >    {
2558          final CompletableFuture<Integer> f = new CompletableFuture<>();
2559          final CompletableFuture<Integer> g = new CompletableFuture<>();
2560 <        final Noop r = new Noop();
2561 <        final CFException ex = new CFException();
2560 >        final NoopConsumer[] rs = new NoopConsumer[6];
2561 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2562 >
2563 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2564 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2565 >        checkIncomplete(h0);
2566 >        checkIncomplete(h1);
2567 >        rs[0].assertNotInvoked();
2568 >        rs[1].assertNotInvoked();
2569 >        f.cancel(mayInterruptIfRunning);
2570 >        checkCompletedWithWrappedCancellationException(h0);
2571 >        checkCompletedWithWrappedCancellationException(h1);
2572 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2573 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2574 >        checkCompletedWithWrappedCancellationException(h2);
2575 >        checkCompletedWithWrappedCancellationException(h3);
2576  
1580        f.completeExceptionally(ex);
2577          g.complete(v1);
1582        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2578  
2579 <        checkCompletedWithWrappedCFException(h, ex);
2580 <        checkCompletedWithWrappedCFException(f, ex);
2581 <        assertFalse(r.ran);
2582 <        checkCompletedNormally(g, v1);
2579 >        // unspecified behavior - both source completions available
2580 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2581 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2582 >        try {
2583 >            assertNull(h4.join());
2584 >            rs[4].assertValue(v1);
2585 >        } catch (CompletionException ok) {
2586 >            checkCompletedWithWrappedCancellationException(h4);
2587 >            rs[4].assertNotInvoked();
2588 >        }
2589 >        try {
2590 >            assertNull(h5.join());
2591 >            rs[5].assertValue(v1);
2592 >        } catch (CompletionException ok) {
2593 >            checkCompletedWithWrappedCancellationException(h5);
2594 >            rs[5].assertNotInvoked();
2595          }
2596 <    }
2596 >
2597 >        checkCancelled(f);
2598 >        checkCompletedNormally(g, v1);
2599 >        checkCompletedWithWrappedCancellationException(h0);
2600 >        checkCompletedWithWrappedCancellationException(h1);
2601 >        checkCompletedWithWrappedCancellationException(h2);
2602 >        checkCompletedWithWrappedCancellationException(h3);
2603 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2604 >    }}
2605  
2606      /**
2607 <     * runAfterBoth result completes exceptionally if action does
2607 >     * acceptEither result completes exceptionally if action does
2608       */
2609 <    public void testRunAfterBoth_actionFailed1() {
2609 >    public void testAcceptEither_actionFailed() {
2610          for (ExecutionMode m : ExecutionMode.values())
2611          for (Integer v1 : new Integer[] { 1, null })
2612 <        for (Integer v2 : new Integer[] { 2, null }) {
2613 <
2612 >        for (Integer v2 : new Integer[] { 2, null })
2613 >    {
2614          final CompletableFuture<Integer> f = new CompletableFuture<>();
2615          final CompletableFuture<Integer> g = new CompletableFuture<>();
2616 <        final FailingNoop r = new FailingNoop();
2617 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2616 >        final FailingConsumer[] rs = new FailingConsumer[6];
2617 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2618 >
2619 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2620 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2621 >        f.complete(v1);
2622 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2623 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2624 >        checkCompletedWithWrappedCFException(h0);
2625 >        checkCompletedWithWrappedCFException(h1);
2626 >        checkCompletedWithWrappedCFException(h2);
2627 >        checkCompletedWithWrappedCFException(h3);
2628 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2629  
1604        f.complete(v1);
1605        checkIncomplete(h);
2630          g.complete(v2);
2631  
2632 <        checkCompletedWithWrappedCFException(h);
2632 >        // unspecified behavior - both source completions available
2633 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2634 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2635 >
2636 >        checkCompletedWithWrappedCFException(h4);
2637 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2638 >                   Objects.equals(v2, rs[4].value));
2639 >        checkCompletedWithWrappedCFException(h5);
2640 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2641 >                   Objects.equals(v2, rs[5].value));
2642 >
2643          checkCompletedNormally(f, v1);
2644          checkCompletedNormally(g, v2);
2645 <        }
1612 <    }
2645 >    }}
2646  
2647 <    public void testRunAfterBoth_actionFailed2() {
2647 >    /**
2648 >     * runAfterEither result completes normally after normal completion
2649 >     * of either source
2650 >     */
2651 >    public void testRunAfterEither_normalCompletion() {
2652          for (ExecutionMode m : ExecutionMode.values())
2653          for (Integer v1 : new Integer[] { 1, null })
2654 <        for (Integer v2 : new Integer[] { 2, null }) {
2655 <
2654 >        for (Integer v2 : new Integer[] { 2, null })
2655 >    {
2656          final CompletableFuture<Integer> f = new CompletableFuture<>();
2657          final CompletableFuture<Integer> g = new CompletableFuture<>();
2658 <        final FailingNoop r = new FailingNoop();
2659 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2658 >        final Noop[] rs = new Noop[6];
2659 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2660 >
2661 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2662 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2663 >        checkIncomplete(h0);
2664 >        checkIncomplete(h1);
2665 >        rs[0].assertNotInvoked();
2666 >        rs[1].assertNotInvoked();
2667 >        f.complete(v1);
2668 >        checkCompletedNormally(h0, null);
2669 >        checkCompletedNormally(h1, null);
2670 >        rs[0].assertInvoked();
2671 >        rs[1].assertInvoked();
2672 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2673 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2674 >        checkCompletedNormally(h2, null);
2675 >        checkCompletedNormally(h3, null);
2676 >        rs[2].assertInvoked();
2677 >        rs[3].assertInvoked();
2678  
2679          g.complete(v2);
1625        checkIncomplete(h);
1626        f.complete(v1);
2680  
2681 <        checkCompletedWithWrappedCFException(h);
2681 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2682 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2683 >
2684          checkCompletedNormally(f, v1);
2685          checkCompletedNormally(g, v2);
2686 <        }
2687 <    }
2686 >        checkCompletedNormally(h0, null);
2687 >        checkCompletedNormally(h1, null);
2688 >        checkCompletedNormally(h2, null);
2689 >        checkCompletedNormally(h3, null);
2690 >        checkCompletedNormally(h4, null);
2691 >        checkCompletedNormally(h5, null);
2692 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2693 >    }}
2694  
2695      /**
2696 <     * runAfterBoth result completes exceptionally if either source cancelled
2696 >     * runAfterEither result completes exceptionally after exceptional
2697 >     * completion of either source
2698       */
2699 <    public void testRunAfterBoth_sourceCancelled1() {
2699 >    public void testRunAfterEither_exceptionalCompletion() {
2700          for (ExecutionMode m : ExecutionMode.values())
2701 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2702 <        for (Integer v1 : new Integer[] { 1, null }) {
1641 <
2701 >        for (Integer v1 : new Integer[] { 1, null })
2702 >    {
2703          final CompletableFuture<Integer> f = new CompletableFuture<>();
2704          final CompletableFuture<Integer> g = new CompletableFuture<>();
2705 <        final Noop r = new Noop();
2706 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2705 >        final CFException ex = new CFException();
2706 >        final Noop[] rs = new Noop[6];
2707 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2708  
2709 <        assertTrue(f.cancel(mayInterruptIfRunning));
2710 <        checkIncomplete(h);
2711 <        g.complete(v1);
2709 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2710 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2711 >        checkIncomplete(h0);
2712 >        checkIncomplete(h1);
2713 >        rs[0].assertNotInvoked();
2714 >        rs[1].assertNotInvoked();
2715 >        assertTrue(f.completeExceptionally(ex));
2716 >        checkCompletedWithWrappedException(h0, ex);
2717 >        checkCompletedWithWrappedException(h1, ex);
2718 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2719 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2720 >        checkCompletedWithWrappedException(h2, ex);
2721 >        checkCompletedWithWrappedException(h3, ex);
2722 >
2723 >        assertTrue(g.complete(v1));
2724 >
2725 >        // unspecified behavior - both source completions available
2726 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2727 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2728 >        try {
2729 >            assertNull(h4.join());
2730 >            rs[4].assertInvoked();
2731 >        } catch (CompletionException ok) {
2732 >            checkCompletedWithWrappedException(h4, ex);
2733 >            rs[4].assertNotInvoked();
2734 >        }
2735 >        try {
2736 >            assertNull(h5.join());
2737 >            rs[5].assertInvoked();
2738 >        } catch (CompletionException ok) {
2739 >            checkCompletedWithWrappedException(h5, ex);
2740 >            rs[5].assertNotInvoked();
2741 >        }
2742  
2743 <        checkCompletedWithWrappedCancellationException(h);
1652 <        checkCancelled(f);
1653 <        assertFalse(r.ran);
2743 >        checkCompletedExceptionally(f, ex);
2744          checkCompletedNormally(g, v1);
2745 <        }
2746 <    }
2745 >        checkCompletedWithWrappedException(h0, ex);
2746 >        checkCompletedWithWrappedException(h1, ex);
2747 >        checkCompletedWithWrappedException(h2, ex);
2748 >        checkCompletedWithWrappedException(h3, ex);
2749 >        checkCompletedWithWrappedException(h4, ex);
2750 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2751 >    }}
2752  
2753 <    public void testRunAfterBoth_sourceCancelled2() {
2753 >    public void testRunAfterEither_exceptionalCompletion2() {
2754          for (ExecutionMode m : ExecutionMode.values())
2755 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2756 <        for (Integer v1 : new Integer[] { 1, null }) {
2757 <
2755 >        for (boolean fFirst : new boolean[] { true, false })
2756 >        for (Integer v1 : new Integer[] { 1, null })
2757 >    {
2758          final CompletableFuture<Integer> f = new CompletableFuture<>();
2759          final CompletableFuture<Integer> g = new CompletableFuture<>();
2760 <        final Noop r = new Noop();
2761 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2760 >        final CFException ex = new CFException();
2761 >        final Noop[] rs = new Noop[6];
2762 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2763  
2764 <        assertTrue(g.cancel(mayInterruptIfRunning));
2765 <        checkIncomplete(h);
2766 <        f.complete(v1);
2764 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2765 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2766 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2767 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2768 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2769 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2770  
2771 <        checkCompletedWithWrappedCancellationException(h);
2772 <        checkCancelled(g);
2773 <        assertFalse(r.ran);
2774 <        checkCompletedNormally(f, v1);
2771 >        // unspecified behavior - both source completions available
2772 >        try {
2773 >            assertEquals(null, h0.join());
2774 >            rs[0].assertInvoked();
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedException(h0, ex);
2777 >            rs[0].assertNotInvoked();
2778 >        }
2779 >        try {
2780 >            assertEquals(null, h1.join());
2781 >            rs[1].assertInvoked();
2782 >        } catch (CompletionException ok) {
2783 >            checkCompletedWithWrappedException(h1, ex);
2784 >            rs[1].assertNotInvoked();
2785 >        }
2786 >        try {
2787 >            assertEquals(null, h2.join());
2788 >            rs[2].assertInvoked();
2789 >        } catch (CompletionException ok) {
2790 >            checkCompletedWithWrappedException(h2, ex);
2791 >            rs[2].assertNotInvoked();
2792 >        }
2793 >        try {
2794 >            assertEquals(null, h3.join());
2795 >            rs[3].assertInvoked();
2796 >        } catch (CompletionException ok) {
2797 >            checkCompletedWithWrappedException(h3, ex);
2798 >            rs[3].assertNotInvoked();
2799          }
1677    }
1678
1679    public void testRunAfterBoth_sourceCancelled3() {
1680        for (ExecutionMode m : ExecutionMode.values())
1681        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1682        for (Integer v1 : new Integer[] { 1, null }) {
1683
1684        final CompletableFuture<Integer> f = new CompletableFuture<>();
1685        final CompletableFuture<Integer> g = new CompletableFuture<>();
1686        final Noop r = new Noop();
1687
1688        assertTrue(g.cancel(mayInterruptIfRunning));
1689        f.complete(v1);
1690        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2800  
1692        checkCompletedWithWrappedCancellationException(h);
1693        checkCancelled(g);
1694        assertFalse(r.ran);
2801          checkCompletedNormally(f, v1);
2802 <        }
2803 <    }
2802 >        checkCompletedExceptionally(g, ex);
2803 >    }}
2804  
2805 <    public void testRunAfterBoth_sourceCancelled4() {
2805 >    /**
2806 >     * runAfterEither result completes exceptionally if either source cancelled
2807 >     */
2808 >    public void testRunAfterEither_sourceCancelled() {
2809          for (ExecutionMode m : ExecutionMode.values())
2810          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2811 <        for (Integer v1 : new Integer[] { 1, null }) {
2812 <
2811 >        for (Integer v1 : new Integer[] { 1, null })
2812 >    {
2813          final CompletableFuture<Integer> f = new CompletableFuture<>();
2814          final CompletableFuture<Integer> g = new CompletableFuture<>();
2815 <        final Noop r = new Noop();
2815 >        final Noop[] rs = new Noop[6];
2816 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2817  
2818 <        assertTrue(f.cancel(mayInterruptIfRunning));
2819 <        g.complete(v1);
2820 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2818 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2819 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2820 >        checkIncomplete(h0);
2821 >        checkIncomplete(h1);
2822 >        rs[0].assertNotInvoked();
2823 >        rs[1].assertNotInvoked();
2824 >        f.cancel(mayInterruptIfRunning);
2825 >        checkCompletedWithWrappedCancellationException(h0);
2826 >        checkCompletedWithWrappedCancellationException(h1);
2827 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2828 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2829 >        checkCompletedWithWrappedCancellationException(h2);
2830 >        checkCompletedWithWrappedCancellationException(h3);
2831 >
2832 >        assertTrue(g.complete(v1));
2833 >
2834 >        // unspecified behavior - both source completions available
2835 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2836 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2837 >        try {
2838 >            assertNull(h4.join());
2839 >            rs[4].assertInvoked();
2840 >        } catch (CompletionException ok) {
2841 >            checkCompletedWithWrappedCancellationException(h4);
2842 >            rs[4].assertNotInvoked();
2843 >        }
2844 >        try {
2845 >            assertNull(h5.join());
2846 >            rs[5].assertInvoked();
2847 >        } catch (CompletionException ok) {
2848 >            checkCompletedWithWrappedCancellationException(h5);
2849 >            rs[5].assertNotInvoked();
2850 >        }
2851  
1712        checkCompletedWithWrappedCancellationException(h);
2852          checkCancelled(f);
1714        assertFalse(r.ran);
2853          checkCompletedNormally(g, v1);
2854 <        }
2855 <    }
2856 <
2857 <    /**
2858 <     * applyToEither result completes normally after normal completion
2859 <     * of either source
1722 <     */
1723 <    public void testApplyToEither() {
1724 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1725 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1726 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1727 <        f.complete(one);
1728 <        checkCompletedNormally(g, two);
1729 <        f2.complete(one);
1730 <        checkCompletedNormally(g, two);
1731 <
1732 <        f = new CompletableFuture<>();
1733 <        f.complete(one);
1734 <        f2 = new CompletableFuture<>();
1735 <        g = f.applyToEither(f2, inc);
1736 <        checkCompletedNormally(g, two);
1737 <    }
1738 <
1739 <    /**
1740 <     * applyToEither result completes exceptionally after exceptional
1741 <     * completion of either source
1742 <     */
1743 <    public void testApplyToEither2() {
1744 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1745 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1746 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1747 <        f.completeExceptionally(new CFException());
1748 <        f2.complete(one);
1749 <        checkCompletedWithWrappedCFException(g);
1750 <
1751 <        f = new CompletableFuture<>();
1752 <        f2 = new CompletableFuture<>();
1753 <        f2.completeExceptionally(new CFException());
1754 <        g = f.applyToEither(f2, inc);
1755 <        checkCompletedWithWrappedCFException(g);
1756 <    }
1757 <
1758 <    /**
1759 <     * applyToEither result completes exceptionally if action does
1760 <     */
1761 <    public void testApplyToEither3() {
1762 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1763 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1764 <        FailingFunction r = new FailingFunction();
1765 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
1766 <        f2.complete(two);
1767 <        checkCompletedWithWrappedCFException(g);
1768 <    }
1769 <
1770 <    /**
1771 <     * applyToEither result completes exceptionally if either source cancelled
1772 <     */
1773 <    public void testApplyToEither4() {
1774 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1775 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1776 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1777 <        assertTrue(f.cancel(true));
1778 <        checkCompletedWithWrappedCancellationException(g);
1779 <        f = new CompletableFuture<>();
1780 <        f2 = new CompletableFuture<>();
1781 <        assertTrue(f2.cancel(true));
1782 <        checkCompletedWithWrappedCancellationException(g);
1783 <    }
1784 <
1785 <    /**
1786 <     * acceptEither result completes normally after normal completion
1787 <     * of either source
1788 <     */
1789 <    public void testAcceptEither() {
1790 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1791 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1792 <        IncAction r = new IncAction();
1793 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1794 <        f.complete(one);
1795 <        checkCompletedNormally(g, null);
1796 <        f2.complete(one);
1797 <        checkCompletedNormally(g, null);
1798 <        assertEquals(r.value, 2);
1799 <
1800 <        r = new IncAction();
1801 <        f = new CompletableFuture<>();
1802 <        f.complete(one);
1803 <        f2 = new CompletableFuture<>();
1804 <        g = f.acceptEither(f2, r);
1805 <        checkCompletedNormally(g, null);
1806 <        assertEquals(r.value, 2);
1807 <    }
1808 <
1809 <    /**
1810 <     * acceptEither result completes exceptionally after exceptional
1811 <     * completion of either source
1812 <     */
1813 <    public void testAcceptEither2() {
1814 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1815 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1816 <        IncAction r = new IncAction();
1817 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1818 <        f.completeExceptionally(new CFException());
1819 <        f2.complete(one);
1820 <        checkCompletedWithWrappedCFException(g);
1821 <
1822 <        r = new IncAction();
1823 <        f = new CompletableFuture<>();
1824 <        f2 = new CompletableFuture<>();
1825 <        f2.completeExceptionally(new CFException());
1826 <        g = f.acceptEither(f2, r);
1827 <        checkCompletedWithWrappedCFException(g);
1828 <    }
1829 <
1830 <    /**
1831 <     * acceptEither result completes exceptionally if action does
1832 <     */
1833 <    public void testAcceptEither3() {
1834 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1835 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1836 <        FailingConsumer r = new FailingConsumer();
1837 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1838 <        f2.complete(two);
1839 <        checkCompletedWithWrappedCFException(g);
1840 <    }
1841 <
1842 <    /**
1843 <     * acceptEither result completes exceptionally if either source cancelled
1844 <     */
1845 <    public void testAcceptEither4() {
1846 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1847 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1848 <        IncAction r = new IncAction();
1849 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1850 <        assertTrue(f.cancel(true));
1851 <        checkCompletedWithWrappedCancellationException(g);
1852 <        f = new CompletableFuture<>();
1853 <        f2 = new CompletableFuture<>();
1854 <        assertTrue(f2.cancel(true));
1855 <        checkCompletedWithWrappedCancellationException(g);
1856 <    }
1857 <
1858 <    /**
1859 <     * runAfterEither result completes normally after normal completion
1860 <     * of either source
1861 <     */
1862 <    public void testRunAfterEither() {
1863 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1864 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1865 <        Noop r = new Noop();
1866 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1867 <        f.complete(one);
1868 <        checkCompletedNormally(g, null);
1869 <        f2.complete(one);
1870 <        checkCompletedNormally(g, null);
1871 <        assertTrue(r.ran);
1872 <
1873 <        r = new Noop();
1874 <        f = new CompletableFuture<>();
1875 <        f.complete(one);
1876 <        f2 = new CompletableFuture<>();
1877 <        g = f.runAfterEither(f2, r);
1878 <        checkCompletedNormally(g, null);
1879 <        assertTrue(r.ran);
1880 <    }
1881 <
1882 <    /**
1883 <     * runAfterEither result completes exceptionally after exceptional
1884 <     * completion of either source
1885 <     */
1886 <    public void testRunAfterEither2() {
1887 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1888 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
1889 <        Noop r = new Noop();
1890 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1891 <        f.completeExceptionally(new CFException());
1892 <        f2.complete(one);
1893 <        checkCompletedWithWrappedCFException(g);
1894 <
1895 <        r = new Noop();
1896 <        f = new CompletableFuture<>();
1897 <        f2 = new CompletableFuture<>();
1898 <        f2.completeExceptionally(new CFException());
1899 <        g = f.runAfterEither(f2, r);
1900 <        checkCompletedWithWrappedCFException(g);
1901 <    }
2854 >        checkCompletedWithWrappedCancellationException(h0);
2855 >        checkCompletedWithWrappedCancellationException(h1);
2856 >        checkCompletedWithWrappedCancellationException(h2);
2857 >        checkCompletedWithWrappedCancellationException(h3);
2858 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2859 >    }}
2860  
2861      /**
2862       * runAfterEither result completes exceptionally if action does
2863       */
2864 <    public void testRunAfterEither3() {
2865 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2866 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2867 <        FailingNoop r = new FailingNoop();
2868 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2869 <        f2.complete(two);
2870 <        checkCompletedWithWrappedCFException(g);
2871 <    }
2864 >    public void testRunAfterEither_actionFailed() {
2865 >        for (ExecutionMode m : ExecutionMode.values())
2866 >        for (Integer v1 : new Integer[] { 1, null })
2867 >        for (Integer v2 : new Integer[] { 2, null })
2868 >    {
2869 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2870 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2871 >        final FailingRunnable[] rs = new FailingRunnable[6];
2872 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2873  
2874 <    /**
2875 <     * runAfterEither result completes exceptionally if either source cancelled
2876 <     */
2877 <    public void testRunAfterEither4() {
2878 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2879 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2880 <        Noop r = new Noop();
2881 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2882 <        assertTrue(f.cancel(true));
2883 <        checkCompletedWithWrappedCancellationException(g);
2884 <        f = new CompletableFuture<>();
2885 <        f2 = new CompletableFuture<>();
2886 <        assertTrue(f2.cancel(true));
2887 <        checkCompletedWithWrappedCancellationException(g);
2888 <    }
2874 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2875 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2876 >        assertTrue(f.complete(v1));
2877 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2878 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2879 >        checkCompletedWithWrappedCFException(h0);
2880 >        checkCompletedWithWrappedCFException(h1);
2881 >        checkCompletedWithWrappedCFException(h2);
2882 >        checkCompletedWithWrappedCFException(h3);
2883 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2884 >        assertTrue(g.complete(v2));
2885 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2886 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2887 >        checkCompletedWithWrappedCFException(h4);
2888 >        checkCompletedWithWrappedCFException(h5);
2889 >
2890 >        checkCompletedNormally(f, v1);
2891 >        checkCompletedNormally(g, v2);
2892 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2893 >    }}
2894  
2895      /**
2896       * thenCompose result completes normally after normal completion of source
2897       */
2898 <    public void testThenCompose() {
2899 <        CompletableFuture<Integer> f, g;
2900 <        CompletableFutureInc r;
2901 <
2902 <        f = new CompletableFuture<>();
2903 <        g = f.thenCompose(r = new CompletableFutureInc());
2904 <        f.complete(one);
2905 <        checkCompletedNormally(g, two);
2906 <        assertTrue(r.ran);
2898 >    public void testThenCompose_normalCompletion() {
2899 >        for (ExecutionMode m : ExecutionMode.values())
2900 >        for (boolean createIncomplete : new boolean[] { true, false })
2901 >        for (Integer v1 : new Integer[] { 1, null })
2902 >    {
2903 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2904 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2905 >        if (!createIncomplete) assertTrue(f.complete(v1));
2906 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2907 >        if (createIncomplete) assertTrue(f.complete(v1));
2908  
2909 <        f = new CompletableFuture<>();
2910 <        f.complete(one);
2911 <        g = f.thenCompose(r = new CompletableFutureInc());
2912 <        checkCompletedNormally(g, two);
1948 <        assertTrue(r.ran);
1949 <    }
2909 >        checkCompletedNormally(g, inc(v1));
2910 >        checkCompletedNormally(f, v1);
2911 >        r.assertValue(v1);
2912 >    }}
2913  
2914      /**
2915       * thenCompose result completes exceptionally after exceptional
2916       * completion of source
2917       */
2918 <    public void testThenCompose2() {
2919 <        CompletableFuture<Integer> f, g;
2920 <        CompletableFutureInc r;
2921 <
2922 <        f = new CompletableFuture<>();
2923 <        g = f.thenCompose(r = new CompletableFutureInc());
2924 <        f.completeExceptionally(new CFException());
2925 <        checkCompletedWithWrappedCFException(g);
2926 <
2927 <        f = new CompletableFuture<>();
2928 <        f.completeExceptionally(new CFException());
2929 <        g = f.thenCompose(r = new CompletableFutureInc());
2930 <        checkCompletedWithWrappedCFException(g);
2931 <    }
2918 >    public void testThenCompose_exceptionalCompletion() {
2919 >        for (ExecutionMode m : ExecutionMode.values())
2920 >        for (boolean createIncomplete : new boolean[] { true, false })
2921 >    {
2922 >        final CFException ex = new CFException();
2923 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2924 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2925 >        if (!createIncomplete) f.completeExceptionally(ex);
2926 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2927 >        if (createIncomplete) f.completeExceptionally(ex);
2928 >
2929 >        checkCompletedWithWrappedException(g, ex);
2930 >        checkCompletedExceptionally(f, ex);
2931 >        r.assertNotInvoked();
2932 >    }}
2933  
2934      /**
2935       * thenCompose result completes exceptionally if action does
2936       */
2937 <    public void testThenCompose3() {
2938 <        CompletableFuture<Integer> f, g;
2939 <        FailingCompletableFutureFunction r;
2940 <
2941 <        f = new CompletableFuture<>();
2942 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2943 <        f.complete(one);
2944 <        checkCompletedWithWrappedCFException(g);
2937 >    public void testThenCompose_actionFailed() {
2938 >        for (ExecutionMode m : ExecutionMode.values())
2939 >        for (boolean createIncomplete : new boolean[] { true, false })
2940 >        for (Integer v1 : new Integer[] { 1, null })
2941 >    {
2942 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2943 >        final FailingCompletableFutureFunction r
2944 >            = new FailingCompletableFutureFunction(m);
2945 >        if (!createIncomplete) assertTrue(f.complete(v1));
2946 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2947 >        if (createIncomplete) assertTrue(f.complete(v1));
2948  
1982        f = new CompletableFuture<>();
1983        f.complete(one);
1984        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2949          checkCompletedWithWrappedCFException(g);
2950 <    }
2950 >        checkCompletedNormally(f, v1);
2951 >    }}
2952  
2953      /**
2954       * thenCompose result completes exceptionally if source cancelled
2955       */
2956 <    public void testThenCompose4() {
2957 <        CompletableFuture<Integer> f, g;
2958 <        CompletableFutureInc r;
2959 <
2960 <        f = new CompletableFuture<>();
2961 <        g = f.thenCompose(r = new CompletableFutureInc());
2962 <        assertTrue(f.cancel(true));
2963 <        checkCompletedWithWrappedCancellationException(g);
2964 <
2965 <        f = new CompletableFuture<>();
2966 <        assertTrue(f.cancel(true));
2967 <        g = f.thenCompose(r = new CompletableFutureInc());
2968 <        checkCompletedWithWrappedCancellationException(g);
2004 <    }
2005 <
2006 <    // asyncs
2007 <
2008 <    /**
2009 <     * thenRunAsync result completes normally after normal completion of source
2010 <     */
2011 <    public void testThenRunAsync() {
2012 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2013 <        Noop r = new Noop();
2014 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2015 <        f.complete(null);
2016 <        checkCompletedNormally(g, null);
2017 <
2018 <        // reordered version
2019 <        f = new CompletableFuture<>();
2020 <        f.complete(null);
2021 <        r = new Noop();
2022 <        g = f.thenRunAsync(r);
2023 <        checkCompletedNormally(g, null);
2024 <    }
2025 <
2026 <    /**
2027 <     * thenRunAsync result completes exceptionally after exceptional
2028 <     * completion of source
2029 <     */
2030 <    public void testThenRunAsync2() {
2031 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2032 <        Noop r = new Noop();
2033 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2034 <        f.completeExceptionally(new CFException());
2035 <        try {
2036 <            g.join();
2037 <            shouldThrow();
2038 <        } catch (CompletionException success) {}
2039 <        checkCompletedWithWrappedCFException(g);
2040 <    }
2041 <
2042 <    /**
2043 <     * thenRunAsync result completes exceptionally if action does
2044 <     */
2045 <    public void testThenRunAsync3() {
2046 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2047 <        FailingNoop r = new FailingNoop();
2048 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2049 <        f.complete(null);
2050 <        checkCompletedWithWrappedCFException(g);
2051 <    }
2052 <
2053 <    /**
2054 <     * thenRunAsync result completes exceptionally if source cancelled
2055 <     */
2056 <    public void testThenRunAsync4() {
2057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2058 <        Noop r = new Noop();
2059 <        CompletableFuture<Void> g = f.thenRunAsync(r);
2060 <        assertTrue(f.cancel(true));
2061 <        checkCompletedWithWrappedCancellationException(g);
2062 <    }
2063 <
2064 <    /**
2065 <     * thenApplyAsync result completes normally after normal completion of source
2066 <     */
2067 <    public void testThenApplyAsync() {
2068 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2069 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2070 <        f.complete(one);
2071 <        checkCompletedNormally(g, two);
2072 <    }
2073 <
2074 <    /**
2075 <     * thenApplyAsync result completes exceptionally after exceptional
2076 <     * completion of source
2077 <     */
2078 <    public void testThenApplyAsync2() {
2079 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2080 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2081 <        f.completeExceptionally(new CFException());
2082 <        checkCompletedWithWrappedCFException(g);
2083 <    }
2084 <
2085 <    /**
2086 <     * thenApplyAsync result completes exceptionally if action does
2087 <     */
2088 <    public void testThenApplyAsync3() {
2089 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2090 <        FailingFunction r = new FailingFunction();
2091 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2092 <        f.complete(null);
2093 <        checkCompletedWithWrappedCFException(g);
2094 <    }
2095 <
2096 <    /**
2097 <     * thenApplyAsync result completes exceptionally if source cancelled
2098 <     */
2099 <    public void testThenApplyAsync4() {
2100 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2101 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2102 <        assertTrue(f.cancel(true));
2103 <        checkCompletedWithWrappedCancellationException(g);
2104 <    }
2105 <
2106 <    /**
2107 <     * thenAcceptAsync result completes normally after normal
2108 <     * completion of source
2109 <     */
2110 <    public void testThenAcceptAsync() {
2111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2112 <        IncAction r = new IncAction();
2113 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2114 <        f.complete(one);
2115 <        checkCompletedNormally(g, null);
2116 <        assertEquals(r.value, 2);
2117 <    }
2118 <
2119 <    /**
2120 <     * thenAcceptAsync result completes exceptionally after exceptional
2121 <     * completion of source
2122 <     */
2123 <    public void testThenAcceptAsync2() {
2124 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2125 <        IncAction r = new IncAction();
2126 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2127 <        f.completeExceptionally(new CFException());
2128 <        checkCompletedWithWrappedCFException(g);
2129 <    }
2130 <
2131 <    /**
2132 <     * thenAcceptAsync result completes exceptionally if action does
2133 <     */
2134 <    public void testThenAcceptAsync3() {
2135 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2136 <        FailingConsumer r = new FailingConsumer();
2137 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2138 <        f.complete(null);
2139 <        checkCompletedWithWrappedCFException(g);
2140 <    }
2141 <
2142 <    /**
2143 <     * thenAcceptAsync result completes exceptionally if source cancelled
2144 <     */
2145 <    public void testThenAcceptAsync4() {
2146 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2147 <        IncAction r = new IncAction();
2148 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2149 <        assertTrue(f.cancel(true));
2150 <        checkCompletedWithWrappedCancellationException(g);
2151 <    }
2152 <
2153 <    /**
2154 <     * applyToEitherAsync result completes normally after normal
2155 <     * completion of sources
2156 <     */
2157 <    public void testApplyToEitherAsync() {
2158 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2159 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2160 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2161 <        f.complete(one);
2162 <        checkCompletedNormally(g, two);
2163 <
2164 <        f = new CompletableFuture<>();
2165 <        f.complete(one);
2166 <        f2 = new CompletableFuture<>();
2167 <        g = f.applyToEitherAsync(f2, inc);
2168 <        checkCompletedNormally(g, two);
2169 <    }
2170 <
2171 <    /**
2172 <     * applyToEitherAsync result completes exceptionally after exceptional
2173 <     * completion of source
2174 <     */
2175 <    public void testApplyToEitherAsync2() {
2176 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2177 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2178 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2179 <        f.completeExceptionally(new CFException());
2180 <        checkCompletedWithWrappedCFException(g);
2181 <
2182 <        f = new CompletableFuture<>();
2183 <        f2 = new CompletableFuture<>();
2184 <        f2.completeExceptionally(new CFException());
2185 <        g = f.applyToEitherAsync(f2, inc);
2186 <        f.complete(one);
2187 <        checkCompletedWithWrappedCFException(g);
2188 <    }
2189 <
2190 <    /**
2191 <     * applyToEitherAsync result completes exceptionally if action does
2192 <     */
2193 <    public void testApplyToEitherAsync3() {
2194 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2195 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2196 <        FailingFunction r = new FailingFunction();
2197 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
2198 <        f.complete(one);
2199 <        checkCompletedWithWrappedCFException(g);
2200 <    }
2201 <
2202 <    /**
2203 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2204 <     */
2205 <    public void testApplyToEitherAsync4() {
2206 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2207 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2208 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
2209 <        assertTrue(f.cancel(true));
2210 <        checkCompletedWithWrappedCancellationException(g);
2211 <
2212 <        f = new CompletableFuture<>();
2213 <        f2 = new CompletableFuture<>();
2214 <        assertTrue(f2.cancel(true));
2215 <        g = f.applyToEitherAsync(f2, inc);
2216 <        checkCompletedWithWrappedCancellationException(g);
2217 <    }
2218 <
2219 <    /**
2220 <     * acceptEitherAsync result completes normally after normal
2221 <     * completion of sources
2222 <     */
2223 <    public void testAcceptEitherAsync() {
2224 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2225 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2226 <        IncAction r = new IncAction();
2227 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2228 <        f.complete(one);
2229 <        checkCompletedNormally(g, null);
2230 <        assertEquals(r.value, 2);
2231 <
2232 <        r = new IncAction();
2233 <        f = new CompletableFuture<>();
2234 <        f.complete(one);
2235 <        f2 = new CompletableFuture<>();
2236 <        g = f.acceptEitherAsync(f2, r);
2237 <        checkCompletedNormally(g, null);
2238 <        assertEquals(r.value, 2);
2239 <    }
2240 <
2241 <    /**
2242 <     * acceptEitherAsync result completes exceptionally after exceptional
2243 <     * completion of source
2244 <     */
2245 <    public void testAcceptEitherAsync2() {
2246 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2247 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2248 <        IncAction r = new IncAction();
2249 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2250 <        f.completeExceptionally(new CFException());
2251 <        checkCompletedWithWrappedCFException(g);
2252 <
2253 <        r = new IncAction();
2254 <        f = new CompletableFuture<>();
2255 <        f2 = new CompletableFuture<>();
2256 <        f2.completeExceptionally(new CFException());
2257 <        g = f.acceptEitherAsync(f2, r);
2258 <        f.complete(one);
2259 <        checkCompletedWithWrappedCFException(g);
2260 <    }
2261 <
2262 <    /**
2263 <     * acceptEitherAsync result completes exceptionally if action does
2264 <     */
2265 <    public void testAcceptEitherAsync3() {
2266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2267 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2268 <        FailingConsumer r = new FailingConsumer();
2269 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2270 <        f.complete(one);
2271 <        checkCompletedWithWrappedCFException(g);
2272 <    }
2273 <
2274 <    /**
2275 <     * acceptEitherAsync result completes exceptionally if either
2276 <     * source cancelled
2277 <     */
2278 <    public void testAcceptEitherAsync4() {
2279 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2280 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2281 <        IncAction r = new IncAction();
2282 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
2283 <        assertTrue(f.cancel(true));
2284 <        checkCompletedWithWrappedCancellationException(g);
2285 <
2286 <        r = new IncAction();
2287 <        f = new CompletableFuture<>();
2288 <        f2 = new CompletableFuture<>();
2289 <        assertTrue(f2.cancel(true));
2290 <        g = f.acceptEitherAsync(f2, r);
2291 <        checkCompletedWithWrappedCancellationException(g);
2292 <    }
2293 <
2294 <    /**
2295 <     * runAfterEitherAsync result completes normally after normal
2296 <     * completion of sources
2297 <     */
2298 <    public void testRunAfterEitherAsync() {
2299 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2300 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2301 <        Noop r = new Noop();
2302 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2303 <        f.complete(one);
2304 <        checkCompletedNormally(g, null);
2305 <        assertTrue(r.ran);
2306 <
2307 <        r = new Noop();
2308 <        f = new CompletableFuture<>();
2309 <        f.complete(one);
2310 <        f2 = new CompletableFuture<>();
2311 <        g = f.runAfterEitherAsync(f2, r);
2312 <        checkCompletedNormally(g, null);
2313 <        assertTrue(r.ran);
2314 <    }
2315 <
2316 <    /**
2317 <     * runAfterEitherAsync result completes exceptionally after exceptional
2318 <     * completion of source
2319 <     */
2320 <    public void testRunAfterEitherAsync2() {
2321 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2322 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2323 <        Noop r = new Noop();
2324 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2325 <        f.completeExceptionally(new CFException());
2326 <        checkCompletedWithWrappedCFException(g);
2327 <
2328 <        r = new Noop();
2329 <        f = new CompletableFuture<>();
2330 <        f2 = new CompletableFuture<>();
2331 <        f2.completeExceptionally(new CFException());
2332 <        g = f.runAfterEitherAsync(f2, r);
2333 <        f.complete(one);
2334 <        checkCompletedWithWrappedCFException(g);
2335 <    }
2336 <
2337 <    /**
2338 <     * runAfterEitherAsync result completes exceptionally if action does
2339 <     */
2340 <    public void testRunAfterEitherAsync3() {
2341 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2342 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2343 <        FailingNoop r = new FailingNoop();
2344 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2345 <        f.complete(one);
2346 <        checkCompletedWithWrappedCFException(g);
2347 <    }
2348 <
2349 <    /**
2350 <     * runAfterEitherAsync result completes exceptionally if either
2351 <     * source cancelled
2352 <     */
2353 <    public void testRunAfterEitherAsync4() {
2354 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2355 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2356 <        Noop r = new Noop();
2357 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2358 <        assertTrue(f.cancel(true));
2359 <        checkCompletedWithWrappedCancellationException(g);
2360 <
2361 <        r = new Noop();
2362 <        f = new CompletableFuture<>();
2363 <        f2 = new CompletableFuture<>();
2364 <        assertTrue(f2.cancel(true));
2365 <        g = f.runAfterEitherAsync(f2, r);
2366 <        checkCompletedWithWrappedCancellationException(g);
2367 <    }
2368 <
2369 <    /**
2370 <     * thenComposeAsync result completes normally after normal
2371 <     * completion of source
2372 <     */
2373 <    public void testThenComposeAsync() {
2374 <        CompletableFuture<Integer> f, g;
2375 <        CompletableFutureInc r;
2376 <
2377 <        f = new CompletableFuture<>();
2378 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2379 <        f.complete(one);
2380 <        checkCompletedNormally(g, two);
2381 <
2382 <        f = new CompletableFuture<>();
2383 <        f.complete(one);
2384 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2385 <        checkCompletedNormally(g, two);
2386 <    }
2387 <
2388 <    /**
2389 <     * thenComposeAsync result completes exceptionally after
2390 <     * exceptional completion of source
2391 <     */
2392 <    public void testThenComposeAsync2() {
2393 <        CompletableFuture<Integer> f, g;
2394 <        CompletableFutureInc r;
2395 <
2396 <        f = new CompletableFuture<>();
2397 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2398 <        f.completeExceptionally(new CFException());
2399 <        checkCompletedWithWrappedCFException(g);
2400 <        assertFalse(r.ran);
2401 <
2402 <        f = new CompletableFuture<>();
2403 <        f.completeExceptionally(new CFException());
2404 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2405 <        checkCompletedWithWrappedCFException(g);
2406 <        assertFalse(r.ran);
2407 <    }
2408 <
2409 <    /**
2410 <     * thenComposeAsync result completes exceptionally if action does
2411 <     */
2412 <    public void testThenComposeAsync3() {
2413 <        CompletableFuture<Integer> f, g;
2414 <        FailingCompletableFutureFunction r;
2415 <
2416 <        f = new CompletableFuture<>();
2417 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2418 <        f.complete(one);
2419 <        checkCompletedWithWrappedCFException(g);
2420 <
2421 <        f = new CompletableFuture<>();
2422 <        f.complete(one);
2423 <        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2424 <        checkCompletedWithWrappedCFException(g);
2425 <    }
2426 <
2427 <    /**
2428 <     * thenComposeAsync result completes exceptionally if source cancelled
2429 <     */
2430 <    public void testThenComposeAsync4() {
2431 <        CompletableFuture<Integer> f, g;
2432 <        CompletableFutureInc r;
2433 <
2434 <        f = new CompletableFuture<>();
2435 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2436 <        assertTrue(f.cancel(true));
2437 <        checkCompletedWithWrappedCancellationException(g);
2438 <
2439 <        f = new CompletableFuture<>();
2440 <        assertTrue(f.cancel(true));
2441 <        g = f.thenComposeAsync(r = new CompletableFutureInc());
2442 <        checkCompletedWithWrappedCancellationException(g);
2443 <    }
2444 <
2445 <    // async with explicit executors
2446 <
2447 <    /**
2448 <     * thenRunAsync result completes normally after normal completion of source
2449 <     */
2450 <    public void testThenRunAsyncE() {
2451 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2452 <        Noop r = new Noop();
2453 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2454 <        f.complete(null);
2455 <        checkCompletedNormally(g, null);
2456 <
2457 <        // reordered version
2458 <        f = new CompletableFuture<>();
2459 <        f.complete(null);
2460 <        r = new Noop();
2461 <        g = f.thenRunAsync(r, new ThreadExecutor());
2462 <        checkCompletedNormally(g, null);
2463 <    }
2464 <
2465 <    /**
2466 <     * thenRunAsync result completes exceptionally after exceptional
2467 <     * completion of source
2468 <     */
2469 <    public void testThenRunAsync2E() {
2470 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2471 <        Noop r = new Noop();
2472 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2473 <        f.completeExceptionally(new CFException());
2474 <        try {
2475 <            g.join();
2476 <            shouldThrow();
2477 <        } catch (CompletionException success) {}
2478 <        checkCompletedWithWrappedCFException(g);
2479 <    }
2480 <
2481 <    /**
2482 <     * thenRunAsync result completes exceptionally if action does
2483 <     */
2484 <    public void testThenRunAsync3E() {
2485 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2486 <        FailingNoop r = new FailingNoop();
2487 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2488 <        f.complete(null);
2489 <        checkCompletedWithWrappedCFException(g);
2490 <    }
2491 <
2492 <    /**
2493 <     * thenRunAsync result completes exceptionally if source cancelled
2494 <     */
2495 <    public void testThenRunAsync4E() {
2496 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2497 <        Noop r = new Noop();
2498 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2499 <        assertTrue(f.cancel(true));
2500 <        checkCompletedWithWrappedCancellationException(g);
2501 <    }
2502 <
2503 <    /**
2504 <     * thenApplyAsync result completes normally after normal completion of source
2505 <     */
2506 <    public void testThenApplyAsyncE() {
2507 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2508 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2509 <        f.complete(one);
2510 <        checkCompletedNormally(g, two);
2511 <    }
2512 <
2513 <    /**
2514 <     * thenApplyAsync result completes exceptionally after exceptional
2515 <     * completion of source
2516 <     */
2517 <    public void testThenApplyAsync2E() {
2518 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2519 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2520 <        f.completeExceptionally(new CFException());
2521 <        checkCompletedWithWrappedCFException(g);
2522 <    }
2523 <
2524 <    /**
2525 <     * thenApplyAsync result completes exceptionally if action does
2526 <     */
2527 <    public void testThenApplyAsync3E() {
2528 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2529 <        FailingFunction r = new FailingFunction();
2530 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
2531 <        f.complete(null);
2532 <        checkCompletedWithWrappedCFException(g);
2533 <    }
2534 <
2535 <    /**
2536 <     * thenApplyAsync result completes exceptionally if source cancelled
2537 <     */
2538 <    public void testThenApplyAsync4E() {
2539 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2540 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
2541 <        assertTrue(f.cancel(true));
2542 <        checkCompletedWithWrappedCancellationException(g);
2543 <    }
2544 <
2545 <    /**
2546 <     * thenAcceptAsync result completes normally after normal
2547 <     * completion of source
2548 <     */
2549 <    public void testThenAcceptAsyncE() {
2550 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2551 <        IncAction r = new IncAction();
2552 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2553 <        f.complete(one);
2554 <        checkCompletedNormally(g, null);
2555 <        assertEquals(r.value, 2);
2556 <    }
2557 <
2558 <    /**
2559 <     * thenAcceptAsync result completes exceptionally after exceptional
2560 <     * completion of source
2561 <     */
2562 <    public void testThenAcceptAsync2E() {
2563 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2564 <        IncAction r = new IncAction();
2565 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2566 <        f.completeExceptionally(new CFException());
2567 <        checkCompletedWithWrappedCFException(g);
2568 <    }
2569 <
2570 <    /**
2571 <     * thenAcceptAsync result completes exceptionally if action does
2572 <     */
2573 <    public void testThenAcceptAsync3E() {
2574 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2575 <        FailingConsumer r = new FailingConsumer();
2576 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2577 <        f.complete(null);
2578 <        checkCompletedWithWrappedCFException(g);
2579 <    }
2580 <
2581 <    /**
2582 <     * thenAcceptAsync result completes exceptionally if source cancelled
2583 <     */
2584 <    public void testThenAcceptAsync4E() {
2585 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2586 <        IncAction r = new IncAction();
2587 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2588 <        assertTrue(f.cancel(true));
2589 <        checkCompletedWithWrappedCancellationException(g);
2590 <    }
2591 <
2592 <    /**
2593 <     * applyToEitherAsync result completes normally after normal
2594 <     * completion of sources
2595 <     */
2596 <    public void testApplyToEitherAsyncE() {
2597 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2598 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2599 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2600 <        f.complete(one);
2601 <        checkCompletedNormally(g, two);
2602 <
2603 <        f = new CompletableFuture<>();
2604 <        f.complete(one);
2605 <        f2 = new CompletableFuture<>();
2606 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2607 <        checkCompletedNormally(g, two);
2608 <    }
2609 <
2610 <    /**
2611 <     * applyToEitherAsync result completes exceptionally after exceptional
2612 <     * completion of source
2613 <     */
2614 <    public void testApplyToEitherAsync2E() {
2615 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2616 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2617 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2618 <        f.completeExceptionally(new CFException());
2619 <        checkCompletedWithWrappedCFException(g);
2620 <
2621 <        f = new CompletableFuture<>();
2622 <        f2 = new CompletableFuture<>();
2623 <        f2.completeExceptionally(new CFException());
2624 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2625 <        f.complete(one);
2626 <        checkCompletedWithWrappedCFException(g);
2627 <    }
2628 <
2629 <    /**
2630 <     * applyToEitherAsync result completes exceptionally if action does
2631 <     */
2632 <    public void testApplyToEitherAsync3E() {
2633 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2634 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2635 <        FailingFunction r = new FailingFunction();
2636 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2637 <        f.complete(one);
2638 <        checkCompletedWithWrappedCFException(g);
2639 <    }
2640 <
2641 <    /**
2642 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2643 <     */
2644 <    public void testApplyToEitherAsync4E() {
2645 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2646 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2647 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2648 <        assertTrue(f.cancel(true));
2649 <        checkCompletedWithWrappedCancellationException(g);
2650 <
2651 <        f = new CompletableFuture<>();
2652 <        f2 = new CompletableFuture<>();
2653 <        assertTrue(f2.cancel(true));
2654 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2655 <        checkCompletedWithWrappedCancellationException(g);
2656 <    }
2657 <
2658 <    /**
2659 <     * acceptEitherAsync result completes normally after normal
2660 <     * completion of sources
2661 <     */
2662 <    public void testAcceptEitherAsyncE() {
2663 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2664 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2665 <        IncAction r = new IncAction();
2666 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2667 <        f.complete(one);
2668 <        checkCompletedNormally(g, null);
2669 <        assertEquals(r.value, 2);
2670 <
2671 <        r = new IncAction();
2672 <        f = new CompletableFuture<>();
2673 <        f.complete(one);
2674 <        f2 = new CompletableFuture<>();
2675 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2676 <        checkCompletedNormally(g, null);
2677 <        assertEquals(r.value, 2);
2678 <    }
2679 <
2680 <    /**
2681 <     * acceptEitherAsync result completes exceptionally after exceptional
2682 <     * completion of source
2683 <     */
2684 <    public void testAcceptEitherAsync2E() {
2685 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2686 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2687 <        IncAction r = new IncAction();
2688 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2689 <        f.completeExceptionally(new CFException());
2690 <        checkCompletedWithWrappedCFException(g);
2691 <
2692 <        r = new IncAction();
2693 <        f = new CompletableFuture<>();
2694 <        f2 = new CompletableFuture<>();
2695 <        f2.completeExceptionally(new CFException());
2696 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2697 <        f.complete(one);
2698 <        checkCompletedWithWrappedCFException(g);
2699 <    }
2700 <
2701 <    /**
2702 <     * acceptEitherAsync result completes exceptionally if action does
2703 <     */
2704 <    public void testAcceptEitherAsync3E() {
2705 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2706 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2707 <        FailingConsumer r = new FailingConsumer();
2708 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2709 <        f.complete(one);
2710 <        checkCompletedWithWrappedCFException(g);
2711 <    }
2712 <
2713 <    /**
2714 <     * acceptEitherAsync result completes exceptionally if either
2715 <     * source cancelled
2716 <     */
2717 <    public void testAcceptEitherAsync4E() {
2718 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2719 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2720 <        IncAction r = new IncAction();
2721 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2722 <        assertTrue(f.cancel(true));
2723 <        checkCompletedWithWrappedCancellationException(g);
2724 <
2725 <        r = new IncAction();
2726 <        f = new CompletableFuture<>();
2727 <        f2 = new CompletableFuture<>();
2728 <        assertTrue(f2.cancel(true));
2729 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2730 <        checkCompletedWithWrappedCancellationException(g);
2731 <    }
2732 <
2733 <    /**
2734 <     * runAfterEitherAsync result completes normally after normal
2735 <     * completion of sources
2736 <     */
2737 <    public void testRunAfterEitherAsyncE() {
2738 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2739 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2740 <        Noop r = new Noop();
2741 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2742 <        f.complete(one);
2743 <        checkCompletedNormally(g, null);
2744 <        assertTrue(r.ran);
2745 <
2746 <        r = new Noop();
2747 <        f = new CompletableFuture<>();
2748 <        f.complete(one);
2749 <        f2 = new CompletableFuture<>();
2750 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2751 <        checkCompletedNormally(g, null);
2752 <        assertTrue(r.ran);
2753 <    }
2754 <
2755 <    /**
2756 <     * runAfterEitherAsync result completes exceptionally after exceptional
2757 <     * completion of source
2758 <     */
2759 <    public void testRunAfterEitherAsync2E() {
2760 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2761 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2762 <        Noop r = new Noop();
2763 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2764 <        f.completeExceptionally(new CFException());
2765 <        checkCompletedWithWrappedCFException(g);
2766 <
2767 <        r = new Noop();
2768 <        f = new CompletableFuture<>();
2769 <        f2 = new CompletableFuture<>();
2770 <        f2.completeExceptionally(new CFException());
2771 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2772 <        f.complete(one);
2773 <        checkCompletedWithWrappedCFException(g);
2774 <    }
2775 <
2776 <    /**
2777 <     * runAfterEitherAsync result completes exceptionally if action does
2778 <     */
2779 <    public void testRunAfterEitherAsync3E() {
2780 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2781 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2782 <        FailingNoop r = new FailingNoop();
2783 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2784 <        f.complete(one);
2785 <        checkCompletedWithWrappedCFException(g);
2786 <    }
2787 <
2788 <    /**
2789 <     * runAfterEitherAsync result completes exceptionally if either
2790 <     * source cancelled
2791 <     */
2792 <    public void testRunAfterEitherAsync4E() {
2793 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2794 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2795 <        Noop r = new Noop();
2796 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2797 <        assertTrue(f.cancel(true));
2798 <        checkCompletedWithWrappedCancellationException(g);
2799 <
2800 <        r = new Noop();
2801 <        f = new CompletableFuture<>();
2802 <        f2 = new CompletableFuture<>();
2803 <        assertTrue(f2.cancel(true));
2804 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2805 <        checkCompletedWithWrappedCancellationException(g);
2806 <    }
2807 <
2808 <    /**
2809 <     * thenComposeAsync result completes normally after normal
2810 <     * completion of source
2811 <     */
2812 <    public void testThenComposeAsyncE() {
2813 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2814 <        CompletableFutureInc r = new CompletableFutureInc();
2815 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2816 <        f.complete(one);
2817 <        checkCompletedNormally(g, two);
2818 <    }
2819 <
2820 <    /**
2821 <     * thenComposeAsync result completes exceptionally after
2822 <     * exceptional completion of source
2823 <     */
2824 <    public void testThenComposeAsync2E() {
2825 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2826 <        CompletableFutureInc r = new CompletableFutureInc();
2827 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2828 <        f.completeExceptionally(new CFException());
2829 <        checkCompletedWithWrappedCFException(g);
2830 <    }
2831 <
2832 <    /**
2833 <     * thenComposeAsync result completes exceptionally if action does
2834 <     */
2835 <    public void testThenComposeAsync3E() {
2836 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2837 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2838 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2839 <        f.complete(one);
2840 <        checkCompletedWithWrappedCFException(g);
2841 <    }
2956 >    public void testThenCompose_sourceCancelled() {
2957 >        for (ExecutionMode m : ExecutionMode.values())
2958 >        for (boolean createIncomplete : new boolean[] { true, false })
2959 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2960 >    {
2961 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2962 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2963 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2964 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2965 >        if (createIncomplete) {
2966 >            checkIncomplete(g);
2967 >            assertTrue(f.cancel(mayInterruptIfRunning));
2968 >        }
2969  
2843    /**
2844     * thenComposeAsync result completes exceptionally if source cancelled
2845     */
2846    public void testThenComposeAsync4E() {
2847        CompletableFuture<Integer> f = new CompletableFuture<>();
2848        CompletableFutureInc r = new CompletableFutureInc();
2849        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2850        assertTrue(f.cancel(true));
2970          checkCompletedWithWrappedCancellationException(g);
2971 <    }
2971 >        checkCancelled(f);
2972 >    }}
2973  
2974      // other static methods
2975  
# Line 2867 | Line 2987 | public class CompletableFutureTest exten
2987       * when all components complete normally
2988       */
2989      public void testAllOf_normal() throws Exception {
2990 <        for (int k = 1; k < 20; ++k) {
2991 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2992 <            for (int i = 0; i < k; ++i)
2990 >        for (int k = 1; k < 10; k++) {
2991 >            CompletableFuture<Integer>[] fs
2992 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2993 >            for (int i = 0; i < k; i++)
2994                  fs[i] = new CompletableFuture<>();
2995              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2996 <            for (int i = 0; i < k; ++i) {
2996 >            for (int i = 0; i < k; i++) {
2997                  checkIncomplete(f);
2998                  checkIncomplete(CompletableFuture.allOf(fs));
2999                  fs[i].complete(one);
# Line 2882 | Line 3003 | public class CompletableFutureTest exten
3003          }
3004      }
3005  
3006 +    public void testAllOf_backwards() throws Exception {
3007 +        for (int k = 1; k < 10; k++) {
3008 +            CompletableFuture<Integer>[] fs
3009 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3010 +            for (int i = 0; i < k; i++)
3011 +                fs[i] = new CompletableFuture<>();
3012 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3013 +            for (int i = k - 1; i >= 0; i--) {
3014 +                checkIncomplete(f);
3015 +                checkIncomplete(CompletableFuture.allOf(fs));
3016 +                fs[i].complete(one);
3017 +            }
3018 +            checkCompletedNormally(f, null);
3019 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3020 +        }
3021 +    }
3022 +
3023 +    public void testAllOf_exceptional() throws Exception {
3024 +        for (int k = 1; k < 10; k++) {
3025 +            CompletableFuture<Integer>[] fs
3026 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3027 +            CFException ex = new CFException();
3028 +            for (int i = 0; i < k; i++)
3029 +                fs[i] = new CompletableFuture<>();
3030 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3031 +            for (int i = 0; i < k; i++) {
3032 +                checkIncomplete(f);
3033 +                checkIncomplete(CompletableFuture.allOf(fs));
3034 +                if (i != k/2) {
3035 +                    fs[i].complete(i);
3036 +                    checkCompletedNormally(fs[i], i);
3037 +                } else {
3038 +                    fs[i].completeExceptionally(ex);
3039 +                    checkCompletedExceptionally(fs[i], ex);
3040 +                }
3041 +            }
3042 +            checkCompletedWithWrappedException(f, ex);
3043 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3044 +        }
3045 +    }
3046 +
3047      /**
3048       * anyOf(no component futures) returns an incomplete future
3049       */
3050      public void testAnyOf_empty() throws Exception {
3051 +        for (Integer v1 : new Integer[] { 1, null })
3052 +    {
3053          CompletableFuture<Object> f = CompletableFuture.anyOf();
3054          checkIncomplete(f);
3055 <    }
3055 >
3056 >        f.complete(v1);
3057 >        checkCompletedNormally(f, v1);
3058 >    }}
3059  
3060      /**
3061       * anyOf returns a future completed normally with a value when
3062       * a component future does
3063       */
3064      public void testAnyOf_normal() throws Exception {
3065 <        for (int k = 0; k < 10; ++k) {
3065 >        for (int k = 0; k < 10; k++) {
3066              CompletableFuture[] fs = new CompletableFuture[k];
3067 <            for (int i = 0; i < k; ++i)
3067 >            for (int i = 0; i < k; i++)
3068                  fs[i] = new CompletableFuture<>();
3069              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3070              checkIncomplete(f);
3071 <            for (int i = 0; i < k; ++i) {
3072 <                fs[i].complete(one);
3073 <                checkCompletedNormally(f, one);
3074 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3071 >            for (int i = 0; i < k; i++) {
3072 >                fs[i].complete(i);
3073 >                checkCompletedNormally(f, 0);
3074 >                int x = (int) CompletableFuture.anyOf(fs).join();
3075 >                assertTrue(0 <= x && x <= i);
3076 >            }
3077 >        }
3078 >    }
3079 >    public void testAnyOf_normal_backwards() throws Exception {
3080 >        for (int k = 0; k < 10; k++) {
3081 >            CompletableFuture[] fs = new CompletableFuture[k];
3082 >            for (int i = 0; i < k; i++)
3083 >                fs[i] = new CompletableFuture<>();
3084 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3085 >            checkIncomplete(f);
3086 >            for (int i = k - 1; i >= 0; i--) {
3087 >                fs[i].complete(i);
3088 >                checkCompletedNormally(f, k - 1);
3089 >                int x = (int) CompletableFuture.anyOf(fs).join();
3090 >                assertTrue(i <= x && x <= k - 1);
3091              }
3092          }
3093      }
# Line 2913 | Line 3096 | public class CompletableFutureTest exten
3096       * anyOf result completes exceptionally when any component does.
3097       */
3098      public void testAnyOf_exceptional() throws Exception {
3099 <        for (int k = 0; k < 10; ++k) {
3099 >        for (int k = 0; k < 10; k++) {
3100              CompletableFuture[] fs = new CompletableFuture[k];
3101 <            for (int i = 0; i < k; ++i)
3101 >            CFException[] exs = new CFException[k];
3102 >            for (int i = 0; i < k; i++) {
3103                  fs[i] = new CompletableFuture<>();
3104 +                exs[i] = new CFException();
3105 +            }
3106              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3107              checkIncomplete(f);
3108 <            for (int i = 0; i < k; ++i) {
3109 <                fs[i].completeExceptionally(new CFException());
3110 <                checkCompletedWithWrappedCFException(f);
3108 >            for (int i = 0; i < k; i++) {
3109 >                fs[i].completeExceptionally(exs[i]);
3110 >                checkCompletedWithWrappedException(f, exs[0]);
3111 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3112 >            }
3113 >        }
3114 >    }
3115 >
3116 >    public void testAnyOf_exceptional_backwards() throws Exception {
3117 >        for (int k = 0; k < 10; k++) {
3118 >            CompletableFuture[] fs = new CompletableFuture[k];
3119 >            CFException[] exs = new CFException[k];
3120 >            for (int i = 0; i < k; i++) {
3121 >                fs[i] = new CompletableFuture<>();
3122 >                exs[i] = new CFException();
3123 >            }
3124 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3125 >            checkIncomplete(f);
3126 >            for (int i = k - 1; i >= 0; i--) {
3127 >                fs[i].completeExceptionally(exs[i]);
3128 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3129                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3130              }
3131          }
# Line 2940 | Line 3144 | public class CompletableFutureTest exten
3144          Runnable[] throwingActions = {
3145              () -> CompletableFuture.supplyAsync(null),
3146              () -> CompletableFuture.supplyAsync(null, exec),
3147 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3147 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3148  
3149              () -> CompletableFuture.runAsync(null),
3150              () -> CompletableFuture.runAsync(null, exec),
# Line 3013 | Line 3217 | public class CompletableFutureTest exten
3217  
3218              () -> f.thenCompose(null),
3219              () -> f.thenComposeAsync(null),
3220 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3220 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3221              () -> f.thenComposeAsync(null, exec),
3222  
3223              () -> f.exceptionally(null),
# Line 3045 | Line 3249 | public class CompletableFutureTest exten
3249          assertSame(f, f.toCompletableFuture());
3250      }
3251  
3252 <    /**
3049 <     * whenComplete action executes on normal completion, propagating
3050 <     * source result.
3051 <     */
3052 <    public void testWhenComplete1() {
3053 <        final AtomicInteger a = new AtomicInteger();
3054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3055 <        CompletableFuture<Integer> g =
3056 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3057 <        f.complete(three);
3058 <        checkCompletedNormally(f, three);
3059 <        checkCompletedNormally(g, three);
3060 <        assertEquals(a.get(), 1);
3061 <    }
3062 <
3063 <    /**
3064 <     * whenComplete action executes on exceptional completion, propagating
3065 <     * source result.
3066 <     */
3067 <    public void testWhenComplete2() {
3068 <        final AtomicInteger a = new AtomicInteger();
3069 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3070 <        CompletableFuture<Integer> g =
3071 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3072 <        f.completeExceptionally(new CFException());
3073 <        assertTrue(f.isCompletedExceptionally());
3074 <        assertTrue(g.isCompletedExceptionally());
3075 <        assertEquals(a.get(), 1);
3076 <    }
3077 <
3078 <    /**
3079 <     * If a whenComplete action throws an exception when triggered by
3080 <     * a normal completion, it completes exceptionally
3081 <     */
3082 <    public void testWhenComplete3() {
3083 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3084 <        CompletableFuture<Integer> g =
3085 <            f.whenComplete((Integer x, Throwable t) ->
3086 <                           { throw new CFException(); } );
3087 <        f.complete(three);
3088 <        checkCompletedNormally(f, three);
3089 <        assertTrue(g.isCompletedExceptionally());
3090 <        checkCompletedWithWrappedCFException(g);
3091 <    }
3092 <
3093 <    /**
3094 <     * whenCompleteAsync action executes on normal completion, propagating
3095 <     * source result.
3096 <     */
3097 <    public void testWhenCompleteAsync1() {
3098 <        final AtomicInteger a = new AtomicInteger();
3099 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3100 <        CompletableFuture<Integer> g =
3101 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3102 <        f.complete(three);
3103 <        checkCompletedNormally(f, three);
3104 <        checkCompletedNormally(g, three);
3105 <        assertEquals(a.get(), 1);
3106 <    }
3107 <
3108 <    /**
3109 <     * whenCompleteAsync action executes on exceptional completion, propagating
3110 <     * source result.
3111 <     */
3112 <    public void testWhenCompleteAsync2() {
3113 <        final AtomicInteger a = new AtomicInteger();
3114 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3115 <        CompletableFuture<Integer> g =
3116 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3117 <        f.completeExceptionally(new CFException());
3118 <        checkCompletedWithWrappedCFException(f);
3119 <        checkCompletedWithWrappedCFException(g);
3120 <    }
3121 <
3122 <    /**
3123 <     * If a whenCompleteAsync action throws an exception when
3124 <     * triggered by a normal completion, it completes exceptionally
3125 <     */
3126 <    public void testWhenCompleteAsync3() {
3127 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3128 <        CompletableFuture<Integer> g =
3129 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3130 <                           { throw new CFException(); } );
3131 <        f.complete(three);
3132 <        checkCompletedNormally(f, three);
3133 <        checkCompletedWithWrappedCFException(g);
3134 <    }
3252 >    //--- tests of implementation details; not part of official tck ---
3253  
3254 <    /**
3255 <     * whenCompleteAsync action executes on normal completion, propagating
3256 <     * source result.
3257 <     */
3258 <    public void testWhenCompleteAsync1e() {
3259 <        final AtomicInteger a = new AtomicInteger();
3260 <        ThreadExecutor exec = new ThreadExecutor();
3143 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3144 <        CompletableFuture<Integer> g =
3145 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3146 <                                exec);
3147 <        f.complete(three);
3148 <        checkCompletedNormally(f, three);
3149 <        checkCompletedNormally(g, three);
3150 <        assertEquals(a.get(), 1);
3254 >    Object resultOf(CompletableFuture<?> f) {
3255 >        try {
3256 >            java.lang.reflect.Field resultField
3257 >                = CompletableFuture.class.getDeclaredField("result");
3258 >            resultField.setAccessible(true);
3259 >            return resultField.get(f);
3260 >        } catch (Throwable t) { throw new AssertionError(t); }
3261      }
3262  
3263 <    /**
3264 <     * whenCompleteAsync action executes on exceptional completion, propagating
3265 <     * source result.
3266 <     */
3267 <    public void testWhenCompleteAsync2e() {
3268 <        final AtomicInteger a = new AtomicInteger();
3269 <        ThreadExecutor exec = new ThreadExecutor();
3160 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3161 <        CompletableFuture<Integer> g =
3162 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3163 <                                exec);
3164 <        f.completeExceptionally(new CFException());
3165 <        checkCompletedWithWrappedCFException(f);
3166 <        checkCompletedWithWrappedCFException(g);
3167 <    }
3263 >    public void testExceptionPropagationReusesResultObject() {
3264 >        if (!testImplementationDetails) return;
3265 >        for (ExecutionMode m : ExecutionMode.values())
3266 >    {
3267 >        final CFException ex = new CFException();
3268 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3269 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3270  
3271 <    /**
3272 <     * If a whenCompleteAsync action throws an exception when triggered
3171 <     * by a normal completion, it completes exceptionally
3172 <     */
3173 <    public void testWhenCompleteAsync3e() {
3174 <        ThreadExecutor exec = new ThreadExecutor();
3175 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3176 <        CompletableFuture<Integer> g =
3177 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3178 <                                { throw new CFException(); },
3179 <                                exec);
3180 <        f.complete(three);
3181 <        checkCompletedNormally(f, three);
3182 <        checkCompletedWithWrappedCFException(g);
3183 <    }
3271 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3272 >            = new ArrayList<>();
3273  
3274 <    /**
3275 <     * handleAsync action completes normally with function value on
3276 <     * either normal or exceptional completion of source
3188 <     */
3189 <    public void testHandleAsync() {
3190 <        CompletableFuture<Integer> f, g;
3191 <        IntegerHandler r;
3274 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3275 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3276 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3277  
3278 <        f = new CompletableFuture<>();
3279 <        g = f.handleAsync(r = new IntegerHandler());
3280 <        assertFalse(r.ran);
3196 <        f.completeExceptionally(new CFException());
3197 <        checkCompletedWithWrappedCFException(f);
3198 <        checkCompletedNormally(g, three);
3199 <        assertTrue(r.ran);
3278 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3279 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3280 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3281  
3282 <        f = new CompletableFuture<>();
3283 <        g = f.handleAsync(r = new IntegerHandler());
3284 <        assertFalse(r.ran);
3204 <        f.completeExceptionally(new CFException());
3205 <        checkCompletedWithWrappedCFException(f);
3206 <        checkCompletedNormally(g, three);
3207 <        assertTrue(r.ran);
3282 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3283 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3284 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3285  
3286 <        f = new CompletableFuture<>();
3210 <        g = f.handleAsync(r = new IntegerHandler());
3211 <        assertFalse(r.ran);
3212 <        f.complete(one);
3213 <        checkCompletedNormally(f, one);
3214 <        checkCompletedNormally(g, two);
3215 <        assertTrue(r.ran);
3286 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3287  
3288 <        f = new CompletableFuture<>();
3218 <        g = f.handleAsync(r = new IntegerHandler());
3219 <        assertFalse(r.ran);
3220 <        f.complete(one);
3221 <        checkCompletedNormally(f, one);
3222 <        checkCompletedNormally(g, two);
3223 <        assertTrue(r.ran);
3224 <    }
3288 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3289  
3290 <    /**
3291 <     * handleAsync action with Executor completes normally with
3228 <     * function value on either normal or exceptional completion of
3229 <     * source
3230 <     */
3231 <    public void testHandleAsync2() {
3232 <        CompletableFuture<Integer> f, g;
3233 <        ThreadExecutor exec = new ThreadExecutor();
3234 <        IntegerHandler r;
3290 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3291 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3292  
3293 <        f = new CompletableFuture<>();
3294 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3295 <        assertFalse(r.ran);
3296 <        f.completeExceptionally(new CFException());
3297 <        checkCompletedWithWrappedCFException(f);
3298 <        checkCompletedNormally(g, three);
3299 <        assertTrue(r.ran);
3293 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3294 >                 fun : funs) {
3295 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3296 >            f.completeExceptionally(ex);
3297 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3298 >            checkCompletedWithWrappedException(src, ex);
3299 >            CompletableFuture<?> dep = fun.apply(src);
3300 >            checkCompletedWithWrappedException(dep, ex);
3301 >            assertSame(resultOf(src), resultOf(dep));
3302 >        }
3303  
3304 <        f = new CompletableFuture<>();
3305 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3306 <        assertFalse(r.ran);
3307 <        f.completeExceptionally(new CFException());
3308 <        checkCompletedWithWrappedCFException(f);
3309 <        checkCompletedNormally(g, three);
3310 <        assertTrue(r.ran);
3304 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3305 >                 fun : funs) {
3306 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3307 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3308 >            CompletableFuture<?> dep = fun.apply(src);
3309 >            f.completeExceptionally(ex);
3310 >            checkCompletedWithWrappedException(src, ex);
3311 >            checkCompletedWithWrappedException(dep, ex);
3312 >            assertSame(resultOf(src), resultOf(dep));
3313 >        }
3314  
3315 <        f = new CompletableFuture<>();
3316 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3317 <        assertFalse(r.ran);
3318 <        f.complete(one);
3319 <        checkCompletedNormally(f, one);
3320 <        checkCompletedNormally(g, two);
3321 <        assertTrue(r.ran);
3315 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3316 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3317 >                 fun : funs) {
3318 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3319 >            f.cancel(mayInterruptIfRunning);
3320 >            checkCancelled(f);
3321 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3322 >            checkCompletedWithWrappedCancellationException(src);
3323 >            CompletableFuture<?> dep = fun.apply(src);
3324 >            checkCompletedWithWrappedCancellationException(dep);
3325 >            assertSame(resultOf(src), resultOf(dep));
3326 >        }
3327  
3328 <        f = new CompletableFuture<>();
3329 <        g = f.handleAsync(r = new IntegerHandler(), exec);
3330 <        assertFalse(r.ran);
3331 <        f.complete(one);
3332 <        checkCompletedNormally(f, one);
3333 <        checkCompletedNormally(g, two);
3334 <        assertTrue(r.ran);
3335 <    }
3328 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3329 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3330 >                 fun : funs) {
3331 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3332 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3333 >            CompletableFuture<?> dep = fun.apply(src);
3334 >            f.cancel(mayInterruptIfRunning);
3335 >            checkCancelled(f);
3336 >            checkCompletedWithWrappedCancellationException(src);
3337 >            checkCompletedWithWrappedCancellationException(dep);
3338 >            assertSame(resultOf(src), resultOf(dep));
3339 >        }
3340 >    }}
3341  
3342   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines