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.40 by jsr166, Mon Jun 2 01:11:53 2014 UTC vs.
Revision 1.79 by jsr166, Mon Jun 16 17:08:15 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines