ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.35 by jsr166, Sun Jun 1 22:22:49 2014 UTC vs.
Revision 1.88 by jsr166, Mon Jun 16 21:23:03 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines