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.46 by jsr166, Mon Jun 2 17:41:22 2014 UTC vs.
Revision 1.93 by jsr166, Tue Jun 17 21:09:56 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 259 | 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());
267 <        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);
277 <    }
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(0, f.getNumberOfDependents());
331 <        CompletableFuture g = f.thenRun(new Noop());
331 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
332          assertEquals(1, f.getNumberOfDependents());
333          assertEquals(0, g.getNumberOfDependents());
334 <        CompletableFuture h = f.thenRun(new Noop());
334 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
335          assertEquals(2, f.getNumberOfDependents());
336 <        f.complete(1);
336 >        assertEquals(0, h.getNumberOfDependents());
337 >        assertTrue(f.complete(v1));
338          checkCompletedNormally(g, null);
339 +        checkCompletedNormally(h, null);
340          assertEquals(0, f.getNumberOfDependents());
341          assertEquals(0, g.getNumberOfDependents());
342 <    }
342 >        assertEquals(0, h.getNumberOfDependents());
343 >    }}
344  
345      /**
346       * toString indicates current completion state
# Line 302 | 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 318 | 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 332 | 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);
339 <    static final BiFunction<Integer, Integer, Integer> subtract =
340 <        (Integer x, Integer y) -> subtract(x, y);
341 <    static final class IncAction implements Consumer<Integer> {
342 <        int invocationCount = 0;
343 <        Integer value;
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;
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.
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.
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 <        int invocationCount = 0;
463 >
464 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466          public void run() {
467 <            invocationCount++;
467 >            invoked();
468          }
469      }
470  
471 <    static final class FailingSupplier implements Supplier<Integer> {
472 <        int invocationCount = 0;
471 >    class FailingSupplier extends CheckedAction
472 >        implements Supplier<Integer>
473 >    {
474 >        FailingSupplier(ExecutionMode m) { super(m); }
475          public Integer get() {
476 <            invocationCount++;
476 >            invoked();
477              throw new CFException();
478          }
479      }
480 <    static final class FailingConsumer implements Consumer<Integer> {
481 <        int invocationCount = 0;
480 >
481 >    class FailingConsumer extends CheckedIntegerAction
482 >        implements Consumer<Integer>
483 >    {
484 >        FailingConsumer(ExecutionMode m) { super(m); }
485          public void accept(Integer x) {
486 <            invocationCount++;
486 >            invoked();
487 >            value = x;
488              throw new CFException();
489          }
490      }
491 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
492 <        int invocationCount = 0;
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 <            invocationCount++;
497 >            invoked();
498 >            value = subtract(x, y);
499              throw new CFException();
500          }
501      }
502 <    static final class FailingFunction implements Function<Integer, Integer> {
503 <        int invocationCount = 0;
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 <            invocationCount++;
508 >            invoked();
509 >            value = x;
510              throw new CFException();
511          }
512      }
513 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
514 <        int invocationCount = 0;
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 <            invocationCount++;
519 >            invoked();
520 >            value = subtract(x, y);
521              throw new CFException();
522          }
523      }
524 <    static final class FailingNoop implements Runnable {
525 <        int invocationCount = 0;
524 >
525 >    class FailingRunnable extends CheckedAction implements Runnable {
526 >        FailingRunnable(ExecutionMode m) { super(m); }
527          public void run() {
528 <            invocationCount++;
528 >            invoked();
529              throw new CFException();
530          }
531      }
532  
533 <    static final class CompletableFutureInc
534 <        implements Function<Integer, CompletableFuture<Integer>> {
535 <        int invocationCount = 0;
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 <            invocationCount++;
539 >            invoked();
540 >            value = x;
541              CompletableFuture<Integer> f = new CompletableFuture<>();
542 <            f.complete(inc(x));
542 >            assertTrue(f.complete(inc(x)));
543              return f;
544          }
545      }
546  
547 <    static final class FailingCompletableFutureFunction
548 <        implements Function<Integer, CompletableFuture<Integer>> {
549 <        int invocationCount = 0;
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 <            invocationCount++;
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();
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);
# Line 521 | Line 648 | public class CompletableFutureTest exten
648              }
649          },
650  
651 <        DEFAULT_ASYNC {
651 >        ASYNC {
652 >            public void checkExecutionMode() {
653 >                assertSame(ForkJoinPool.commonPool(),
654 >                           ForkJoinTask.getPool());
655 >            }
656 >            public CompletableFuture<Void> runAsync(Runnable a) {
657 >                return CompletableFuture.runAsync(a);
658 >            }
659 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
660 >                return CompletableFuture.supplyAsync(a);
661 >            }
662              public <T> CompletableFuture<Void> thenRun
663                  (CompletableFuture<T> f, Runnable a) {
664                  return f.thenRunAsync(a);
# Line 586 | Line 723 | public class CompletableFutureTest exten
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());
# Line 649 | Line 795 | public class CompletableFutureTest exten
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
# Line 698 | Line 847 | public class CompletableFutureTest exten
847      {
848          final AtomicInteger a = new AtomicInteger(0);
849          final CompletableFuture<Integer> f = new CompletableFuture<>();
850 <        if (!createIncomplete) f.complete(v1);
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) f.complete(v1);
857 >        if (createIncomplete) assertTrue(f.complete(v1));
858  
859          checkCompletedNormally(g, v1);
860          checkCompletedNormally(f, v1);
861          assertEquals(0, a.get());
862      }}
863  
715
864      /**
865       * exceptionally action completes with function value on source
866       * exception
# Line 727 | Line 875 | public class CompletableFutureTest exten
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;
# Line 748 | Line 897 | public class CompletableFutureTest exten
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 +     * whenComplete action executes on normal completion, propagating
913 +     * source result.
914 +     */
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 +        checkCompletedNormally(g, v1);
934 +        checkCompletedNormally(f, v1);
935 +        assertEquals(1, a.get());
936 +    }}
937 +
938 +    /**
939 +     * whenComplete action executes on exceptional completion, propagating
940 +     * source result.
941 +     */
942 +    public void testWhenComplete_exceptionalCompletion() {
943 +        for (ExecutionMode m : ExecutionMode.values())
944 +        for (boolean createIncomplete : new boolean[] { true, false })
945 +        for (Integer v1 : new Integer[] { 1, null })
946 +    {
947 +        final AtomicInteger a = new AtomicInteger(0);
948 +        final CFException ex = new CFException();
949 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
950 +        if (!createIncomplete) f.completeExceptionally(ex);
951 +        final CompletableFuture<Integer> g = m.whenComplete
952 +            (f,
953 +             (Integer x, Throwable t) -> {
954 +                m.checkExecutionMode();
955 +                threadAssertNull(x);
956 +                threadAssertSame(t, ex);
957 +                a.getAndIncrement();
958 +            });
959 +        if (createIncomplete) f.completeExceptionally(ex);
960 +
961 +        checkCompletedWithWrappedException(g, ex);
962 +        checkCompletedExceptionally(f, ex);
963 +        assertEquals(1, a.get());
964 +    }}
965 +
966 +    /**
967 +     * whenComplete action executes on cancelled source, propagating
968 +     * CancellationException.
969 +     */
970 +    public void testWhenComplete_sourceCancelled() {
971 +        for (ExecutionMode m : ExecutionMode.values())
972 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
973 +        for (boolean createIncomplete : new boolean[] { true, false })
974 +    {
975 +        final AtomicInteger a = new AtomicInteger(0);
976 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978 +        final CompletableFuture<Integer> g = m.whenComplete
979 +            (f,
980 +             (Integer x, Throwable t) -> {
981 +                m.checkExecutionMode();
982 +                threadAssertNull(x);
983 +                threadAssertTrue(t instanceof CancellationException);
984 +                a.getAndIncrement();
985 +            });
986 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987 +
988 +        checkCompletedWithWrappedCancellationException(g);
989 +        checkCancelled(f);
990 +        assertEquals(1, a.get());
991 +    }}
992 +
993 +    /**
994 +     * If a whenComplete action throws an exception when triggered by
995 +     * a normal completion, it completes exceptionally
996 +     */
997 +    public void testWhenComplete_actionFailed() {
998 +        for (boolean createIncomplete : new boolean[] { true, false })
999 +        for (ExecutionMode m : ExecutionMode.values())
1000 +        for (Integer v1 : new Integer[] { 1, null })
1001 +    {
1002 +        final AtomicInteger a = new AtomicInteger(0);
1003 +        final CFException ex = new CFException();
1004 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1005 +        if (!createIncomplete) assertTrue(f.complete(v1));
1006 +        final CompletableFuture<Integer> g = m.whenComplete
1007 +            (f,
1008 +             (Integer x, Throwable t) -> {
1009 +                m.checkExecutionMode();
1010 +                threadAssertSame(x, v1);
1011 +                threadAssertNull(t);
1012 +                a.getAndIncrement();
1013 +                throw ex;
1014 +            });
1015 +        if (createIncomplete) assertTrue(f.complete(v1));
1016 +
1017 +        checkCompletedWithWrappedException(g, ex);
1018 +        checkCompletedNormally(f, v1);
1019 +        assertEquals(1, a.get());
1020 +    }}
1021 +
1022 +    /**
1023 +     * 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 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 <        checkCompletedWithWrappedCFException(g, ex2);
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051          assertEquals(1, a.get());
1052      }}
1053  
# Line 769 | Line 1062 | public class CompletableFutureTest exten
1062      {
1063          final CompletableFuture<Integer> f = new CompletableFuture<>();
1064          final AtomicInteger a = new AtomicInteger(0);
1065 <        if (!createIncomplete) f.complete(v1);
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) f.complete(v1);
1075 >        if (createIncomplete) assertTrue(f.complete(v1));
1076  
1077          checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
# Line 801 | Line 1095 | public class CompletableFutureTest exten
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();
# Line 809 | Line 1104 | public class CompletableFutureTest exten
1104          if (createIncomplete) f.completeExceptionally(ex);
1105  
1106          checkCompletedNormally(g, v1);
1107 <        checkCompletedWithWrappedCFException(f, ex);
1107 >        checkCompletedExceptionally(f, ex);
1108          assertEquals(1, a.get());
1109      }}
1110  
# Line 829 | Line 1124 | public class CompletableFutureTest exten
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();
# Line 856 | Line 1152 | public class CompletableFutureTest exten
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();
# Line 863 | Line 1160 | public class CompletableFutureTest exten
1160              });
1161          if (createIncomplete) f.completeExceptionally(ex1);
1162  
1163 <        checkCompletedWithWrappedCFException(g, ex2);
1164 <        checkCompletedWithWrappedCFException(f, ex1);
1163 >        checkCompletedWithWrappedException(g, ex2);
1164 >        checkCompletedExceptionally(f, ex1);
1165          assertEquals(1, a.get());
1166      }}
1167  
# Line 876 | Line 1173 | public class CompletableFutureTest exten
1173          final CompletableFuture<Integer> f = new CompletableFuture<>();
1174          final AtomicInteger a = new AtomicInteger(0);
1175          final CFException ex = new CFException();
1176 <        if (!createIncomplete) f.complete(v1);
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) f.complete(v1);
1186 >        if (createIncomplete) assertTrue(f.complete(v1));
1187  
1188 <        checkCompletedWithWrappedCFException(g, ex);
1188 >        checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
1190          assertEquals(1, a.get());
1191      }}
# Line 895 | Line 1193 | public class CompletableFutureTest exten
1193      /**
1194       * runAsync completes after running Runnable
1195       */
1196 <    public void testRunAsync() {
1197 <        Noop r = new Noop();
1198 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1199 <        assertNull(f.join());
1200 <        assertEquals(1, r.invocationCount);
1201 <        checkCompletedNormally(f, null);
1202 <    }
1203 <
1204 <    /**
907 <     * runAsync with executor completes after running Runnable
908 <     */
909 <    public void testRunAsync2() {
910 <        Noop r = new Noop();
911 <        ThreadExecutor exec = new ThreadExecutor();
912 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
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());
914        assertEquals(1, r.invocationCount);
1206          checkCompletedNormally(f, null);
1207 <        assertEquals(1, exec.count.get());
1208 <    }
1207 >        r.assertInvoked();
1208 >    }}
1209  
1210      /**
1211       * failing runAsync completes exceptionally after running Runnable
1212       */
1213 <    public void testRunAsync3() {
1214 <        FailingNoop r = new FailingNoop();
1215 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1213 >    public void testRunAsync_exceptionalCompletion() {
1214 >        ExecutionMode[] executionModes = {
1215 >            ExecutionMode.ASYNC,
1216 >            ExecutionMode.EXECUTOR,
1217 >        };
1218 >        for (ExecutionMode m : executionModes)
1219 >    {
1220 >        final FailingRunnable r = new FailingRunnable(m);
1221 >        final CompletableFuture<Void> f = m.runAsync(r);
1222          checkCompletedWithWrappedCFException(f);
1223 <        assertEquals(1, r.invocationCount);
1224 <    }
1223 >        r.assertInvoked();
1224 >    }}
1225  
1226      /**
1227       * supplyAsync completes with result of supplier
1228       */
1229 <    public void testSupplyAsync() {
1230 <        CompletableFuture<Integer> f;
1231 <        f = CompletableFuture.supplyAsync(supplyOne);
1232 <        assertEquals(f.join(), one);
1233 <        checkCompletedNormally(f, one);
1234 <    }
1235 <
1236 <    /**
1237 <     * supplyAsync with executor completes with result of supplier
1238 <     */
1239 <    public void testSupplyAsync2() {
1240 <        CompletableFuture<Integer> f;
1241 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1242 <        assertEquals(f.join(), one);
946 <        checkCompletedNormally(f, one);
947 <    }
1229 >    public void testSupplyAsync_normalCompletion() {
1230 >        ExecutionMode[] executionModes = {
1231 >            ExecutionMode.ASYNC,
1232 >            ExecutionMode.EXECUTOR,
1233 >        };
1234 >        for (ExecutionMode m : executionModes)
1235 >        for (Integer v1 : new Integer[] { 1, null })
1236 >    {
1237 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1238 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1239 >        assertSame(v1, f.join());
1240 >        checkCompletedNormally(f, v1);
1241 >        r.assertInvoked();
1242 >    }}
1243  
1244      /**
1245       * Failing supplyAsync completes exceptionally
1246       */
1247 <    public void testSupplyAsync3() {
1248 <        FailingSupplier r = new FailingSupplier();
1249 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1247 >    public void testSupplyAsync_exceptionalCompletion() {
1248 >        ExecutionMode[] executionModes = {
1249 >            ExecutionMode.ASYNC,
1250 >            ExecutionMode.EXECUTOR,
1251 >        };
1252 >        for (ExecutionMode m : executionModes)
1253 >    {
1254 >        FailingSupplier r = new FailingSupplier(m);
1255 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1256          checkCompletedWithWrappedCFException(f);
1257 <        assertEquals(1, r.invocationCount);
1258 <    }
1257 >        r.assertInvoked();
1258 >    }}
1259  
1260      // seq completion methods
1261  
1262      /**
1263       * thenRun result completes normally after normal completion of source
1264       */
1265 <    public void testThenRun() {
1266 <        CompletableFuture<Integer> f;
1267 <        CompletableFuture<Void> g;
1268 <        Noop r;
1269 <
1270 <        f = new CompletableFuture<>();
1271 <        g = f.thenRun(r = new Noop());
971 <        f.complete(null);
972 <        checkCompletedNormally(g, null);
973 <        assertEquals(1, r.invocationCount);
1265 >    public void testThenRun_normalCompletion() {
1266 >        for (ExecutionMode m : ExecutionMode.values())
1267 >        for (Integer v1 : new Integer[] { 1, null })
1268 >    {
1269 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 >        final Noop[] rs = new Noop[6];
1271 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1272  
1273 <        f = new CompletableFuture<>();
1274 <        f.complete(null);
1275 <        g = f.thenRun(r = new Noop());
1276 <        checkCompletedNormally(g, null);
1277 <        assertEquals(1, r.invocationCount);
1278 <    }
1273 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1274 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1275 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1276 >        checkIncomplete(h0);
1277 >        checkIncomplete(h1);
1278 >        checkIncomplete(h2);
1279 >        assertTrue(f.complete(v1));
1280 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1281 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1282 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1283 >
1284 >        checkCompletedNormally(h0, null);
1285 >        checkCompletedNormally(h1, null);
1286 >        checkCompletedNormally(h2, null);
1287 >        checkCompletedNormally(h3, null);
1288 >        checkCompletedNormally(h4, null);
1289 >        checkCompletedNormally(h5, null);
1290 >        checkCompletedNormally(f, v1);
1291 >        for (Noop r : rs) r.assertInvoked();
1292 >    }}
1293  
1294      /**
1295       * thenRun result completes exceptionally after exceptional
1296       * completion of source
1297       */
1298 <    public void testThenRun2() {
1299 <        CompletableFuture<Integer> f;
1300 <        CompletableFuture<Void> g;
1301 <        Noop r;
1302 <
1303 <        f = new CompletableFuture<>();
1304 <        g = f.thenRun(r = new Noop());
993 <        f.completeExceptionally(new CFException());
994 <        checkCompletedWithWrappedCFException(g);
995 <        assertEquals(0, r.invocationCount);
996 <
997 <        f = new CompletableFuture<>();
998 <        f.completeExceptionally(new CFException());
999 <        g = f.thenRun(r = new Noop());
1000 <        checkCompletedWithWrappedCFException(g);
1001 <        assertEquals(0, r.invocationCount);
1002 <    }
1003 <
1004 <    /**
1005 <     * thenRun result completes exceptionally if action does
1006 <     */
1007 <    public void testThenRun3() {
1008 <        CompletableFuture<Integer> f;
1009 <        CompletableFuture<Void> g;
1010 <        FailingNoop r;
1011 <
1012 <        f = new CompletableFuture<>();
1013 <        g = f.thenRun(r = new FailingNoop());
1014 <        f.complete(null);
1015 <        checkCompletedWithWrappedCFException(g);
1298 >    public void testThenRun_exceptionalCompletion() {
1299 >        for (ExecutionMode m : ExecutionMode.values())
1300 >    {
1301 >        final CFException ex = new CFException();
1302 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1303 >        final Noop[] rs = new Noop[6];
1304 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1305  
1306 <        f = new CompletableFuture<>();
1307 <        f.complete(null);
1308 <        g = f.thenRun(r = new FailingNoop());
1309 <        checkCompletedWithWrappedCFException(g);
1310 <    }
1306 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1307 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1308 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1309 >        checkIncomplete(h0);
1310 >        checkIncomplete(h1);
1311 >        checkIncomplete(h2);
1312 >        assertTrue(f.completeExceptionally(ex));
1313 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1314 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1315 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1316 >
1317 >        checkCompletedWithWrappedException(h0, ex);
1318 >        checkCompletedWithWrappedException(h1, ex);
1319 >        checkCompletedWithWrappedException(h2, ex);
1320 >        checkCompletedWithWrappedException(h3, ex);
1321 >        checkCompletedWithWrappedException(h4, ex);
1322 >        checkCompletedWithWrappedException(h5, ex);
1323 >        checkCompletedExceptionally(f, ex);
1324 >        for (Noop r : rs) r.assertNotInvoked();
1325 >    }}
1326  
1327      /**
1328       * thenRun result completes exceptionally if source cancelled
1329       */
1330 <    public void testThenRun4() {
1331 <        CompletableFuture<Integer> f;
1332 <        CompletableFuture<Void> g;
1333 <        Noop r;
1334 <
1335 <        f = new CompletableFuture<>();
1336 <        g = f.thenRun(r = new Noop());
1033 <        assertTrue(f.cancel(true));
1034 <        checkCompletedWithWrappedCancellationException(g);
1035 <
1036 <        f = new CompletableFuture<>();
1037 <        assertTrue(f.cancel(true));
1038 <        g = f.thenRun(r = new Noop());
1039 <        checkCompletedWithWrappedCancellationException(g);
1040 <    }
1041 <
1042 <    /**
1043 <     * thenApply result completes normally after normal completion of source
1044 <     */
1045 <    public void testThenApply() {
1046 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1047 <        CompletableFuture<Integer> g = f.thenApply(inc);
1048 <        f.complete(one);
1049 <        checkCompletedNormally(g, two);
1050 <    }
1051 <
1052 <    /**
1053 <     * thenApply result completes exceptionally after exceptional
1054 <     * completion of source
1055 <     */
1056 <    public void testThenApply2() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        CompletableFuture<Integer> g = f.thenApply(inc);
1059 <        f.completeExceptionally(new CFException());
1060 <        checkCompletedWithWrappedCFException(g);
1061 <    }
1062 <
1063 <    /**
1064 <     * thenApply result completes exceptionally if action does
1065 <     */
1066 <    public void testThenApply3() {
1067 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1068 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1069 <        f.complete(one);
1070 <        checkCompletedWithWrappedCFException(g);
1071 <    }
1072 <
1073 <    /**
1074 <     * thenApply result completes exceptionally if source cancelled
1075 <     */
1076 <    public void testThenApply4() {
1077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1078 <        CompletableFuture<Integer> g = f.thenApply(inc);
1079 <        assertTrue(f.cancel(true));
1080 <        checkCompletedWithWrappedCancellationException(g);
1081 <    }
1082 <
1083 <    /**
1084 <     * thenAccept result completes normally after normal completion of source
1085 <     */
1086 <    public void testThenAccept() {
1087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1088 <        IncAction r = new IncAction();
1089 <        CompletableFuture<Void> g = f.thenAccept(r);
1090 <        f.complete(one);
1091 <        checkCompletedNormally(g, null);
1092 <        assertEquals(r.value, (Integer) 2);
1093 <    }
1094 <
1095 <    /**
1096 <     * thenAccept result completes exceptionally after exceptional
1097 <     * completion of source
1098 <     */
1099 <    public void testThenAccept2() {
1100 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1101 <        IncAction r = new IncAction();
1102 <        CompletableFuture<Void> g = f.thenAccept(r);
1103 <        f.completeExceptionally(new CFException());
1104 <        checkCompletedWithWrappedCFException(g);
1105 <    }
1106 <
1107 <    /**
1108 <     * thenAccept result completes exceptionally if action does
1109 <     */
1110 <    public void testThenAccept3() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1112 <        FailingConsumer r = new FailingConsumer();
1113 <        CompletableFuture<Void> g = f.thenAccept(r);
1114 <        f.complete(one);
1115 <        checkCompletedWithWrappedCFException(g);
1116 <        assertEquals(1, r.invocationCount);
1117 <    }
1330 >    public void testThenRun_sourceCancelled() {
1331 >        for (ExecutionMode m : ExecutionMode.values())
1332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333 >    {
1334 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337  
1338 <    /**
1339 <     * thenAccept result completes exceptionally if source cancelled
1340 <     */
1341 <    public void testThenAccept4() {
1342 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1343 <        IncAction r = new IncAction();
1344 <        CompletableFuture<Void> g = f.thenAccept(r);
1345 <        assertTrue(f.cancel(true));
1346 <        checkCompletedWithWrappedCancellationException(g);
1347 <    }
1338 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1339 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1340 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1341 >        checkIncomplete(h0);
1342 >        checkIncomplete(h1);
1343 >        checkIncomplete(h2);
1344 >        assertTrue(f.cancel(mayInterruptIfRunning));
1345 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1346 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1347 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1348 >
1349 >        checkCompletedWithWrappedCancellationException(h0);
1350 >        checkCompletedWithWrappedCancellationException(h1);
1351 >        checkCompletedWithWrappedCancellationException(h2);
1352 >        checkCompletedWithWrappedCancellationException(h3);
1353 >        checkCompletedWithWrappedCancellationException(h4);
1354 >        checkCompletedWithWrappedCancellationException(h5);
1355 >        checkCancelled(f);
1356 >        for (Noop r : rs) r.assertNotInvoked();
1357 >    }}
1358  
1359      /**
1360 <     * thenCombine result completes normally after normal completion
1132 <     * of sources
1360 >     * thenRun result completes exceptionally if action does
1361       */
1362 <    public void testThenCombine_normalCompletion1() {
1135 <        for (boolean createIncomplete : new boolean[] { true, false })
1136 <        for (boolean fFirst : new boolean[] { true, false })
1362 >    public void testThenRun_actionFailed() {
1363          for (ExecutionMode m : ExecutionMode.values())
1364          for (Integer v1 : new Integer[] { 1, null })
1365 <        for (Integer v2 : new Integer[] { 2, null }) {
1140 <
1365 >    {
1366          final CompletableFuture<Integer> f = new CompletableFuture<>();
1367 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1368 <        final SubtractFunction r = new SubtractFunction();
1144 <        CompletableFuture<Integer> h = null;
1145 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1146 <
1147 <        if (fFirst)
1148 <            f.complete(v1);
1149 <        else
1150 <            g.complete(v2);
1151 <        if (createIncomplete) checkIncomplete(h);
1152 <        assertEquals(0, r.invocationCount);
1153 <        if (!fFirst)
1154 <            f.complete(v1);
1155 <        else
1156 <            g.complete(v2);
1157 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1367 >        final FailingRunnable[] rs = new FailingRunnable[6];
1368 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369  
1370 <        checkCompletedNormally(h, subtract(v1, v2));
1370 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1371 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1372 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1373 >        assertTrue(f.complete(v1));
1374 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1375 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1376 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1377 >
1378 >        checkCompletedWithWrappedCFException(h0);
1379 >        checkCompletedWithWrappedCFException(h1);
1380 >        checkCompletedWithWrappedCFException(h2);
1381 >        checkCompletedWithWrappedCFException(h3);
1382 >        checkCompletedWithWrappedCFException(h4);
1383 >        checkCompletedWithWrappedCFException(h5);
1384          checkCompletedNormally(f, v1);
1385 <        checkCompletedNormally(g, v2);
1162 <        assertEquals(1, r.invocationCount);
1163 <        }
1164 <    }
1385 >    }}
1386  
1387      /**
1388 <     * thenCombine result completes exceptionally after exceptional
1168 <     * completion of either source
1388 >     * thenApply result completes normally after normal completion of source
1389       */
1390 <    public void testThenCombine_exceptionalCompletion1() {
1390 >    public void testThenApply_normalCompletion() {
1391          for (ExecutionMode m : ExecutionMode.values())
1392 <        for (Integer v1 : new Integer[] { 1, null }) {
1393 <
1174 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1175 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1176 <        final SubtractFunction r = new SubtractFunction();
1177 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1178 <        final CFException ex = new CFException();
1179 <
1180 <        f.completeExceptionally(ex);
1181 <        checkIncomplete(h);
1182 <        g.complete(v1);
1183 <
1184 <        checkCompletedWithWrappedCFException(h, ex);
1185 <        checkCompletedWithWrappedCFException(f, ex);
1186 <        assertEquals(0, r.invocationCount);
1187 <        checkCompletedNormally(g, v1);
1188 <        }
1189 <    }
1190 <
1191 <    public void testThenCombine_exceptionalCompletion2() {
1192 <        for (ExecutionMode m : ExecutionMode.values())
1193 <        for (Integer v1 : new Integer[] { 1, null }) {
1194 <
1392 >        for (Integer v1 : new Integer[] { 1, null })
1393 >    {
1394          final CompletableFuture<Integer> f = new CompletableFuture<>();
1395 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1396 <        final SubtractFunction r = new SubtractFunction();
1198 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1199 <        final CFException ex = new CFException();
1200 <
1201 <        g.completeExceptionally(ex);
1202 <        checkIncomplete(h);
1203 <        f.complete(v1);
1395 >        final IncFunction[] rs = new IncFunction[4];
1396 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1397  
1398 <        checkCompletedWithWrappedCFException(h, ex);
1399 <        checkCompletedWithWrappedCFException(g, ex);
1400 <        assertEquals(0, r.invocationCount);
1398 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1399 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1400 >        checkIncomplete(h0);
1401 >        checkIncomplete(h1);
1402 >        assertTrue(f.complete(v1));
1403 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1404 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1405 >
1406 >        checkCompletedNormally(h0, inc(v1));
1407 >        checkCompletedNormally(h1, inc(v1));
1408 >        checkCompletedNormally(h2, inc(v1));
1409 >        checkCompletedNormally(h3, inc(v1));
1410          checkCompletedNormally(f, v1);
1411 <        }
1412 <    }
1411 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1412 >    }}
1413  
1414 <    public void testThenCombine_exceptionalCompletion3() {
1414 >    /**
1415 >     * thenApply result completes exceptionally after exceptional
1416 >     * completion of source
1417 >     */
1418 >    public void testThenApply_exceptionalCompletion() {
1419          for (ExecutionMode m : ExecutionMode.values())
1420 <        for (Integer v1 : new Integer[] { 1, null }) {
1215 <
1216 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1217 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1218 <        final SubtractFunction r = new SubtractFunction();
1420 >    {
1421          final CFException ex = new CFException();
1220
1221        g.completeExceptionally(ex);
1222        f.complete(v1);
1223        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1224
1225        checkCompletedWithWrappedCFException(h, ex);
1226        checkCompletedWithWrappedCFException(g, ex);
1227        assertEquals(0, r.invocationCount);
1228        checkCompletedNormally(f, v1);
1229        }
1230    }
1231
1232    public void testThenCombine_exceptionalCompletion4() {
1233        for (ExecutionMode m : ExecutionMode.values())
1234        for (Integer v1 : new Integer[] { 1, null }) {
1235
1422          final CompletableFuture<Integer> f = new CompletableFuture<>();
1423 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1424 <        final SubtractFunction r = new SubtractFunction();
1239 <        final CFException ex = new CFException();
1240 <
1241 <        f.completeExceptionally(ex);
1242 <        g.complete(v1);
1243 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1423 >        final IncFunction[] rs = new IncFunction[4];
1424 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1425  
1426 <        checkCompletedWithWrappedCFException(h, ex);
1427 <        checkCompletedWithWrappedCFException(f, ex);
1428 <        assertEquals(0, r.invocationCount);
1429 <        checkCompletedNormally(g, v1);
1430 <        }
1431 <    }
1426 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1427 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1428 >        assertTrue(f.completeExceptionally(ex));
1429 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1430 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1431 >
1432 >        checkCompletedWithWrappedException(h0, ex);
1433 >        checkCompletedWithWrappedException(h1, ex);
1434 >        checkCompletedWithWrappedException(h2, ex);
1435 >        checkCompletedWithWrappedException(h3, ex);
1436 >        checkCompletedExceptionally(f, ex);
1437 >        for (IncFunction r : rs) r.assertNotInvoked();
1438 >    }}
1439  
1440      /**
1441 <     * thenCombine result completes exceptionally if action does
1441 >     * thenApply result completes exceptionally if source cancelled
1442       */
1443 <    public void testThenCombine_actionFailed1() {
1443 >    public void testThenApply_sourceCancelled() {
1444          for (ExecutionMode m : ExecutionMode.values())
1445 <        for (Integer v1 : new Integer[] { 1, null })
1446 <        for (Integer v2 : new Integer[] { 2, null }) {
1259 <
1445 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1446 >    {
1447          final CompletableFuture<Integer> f = new CompletableFuture<>();
1448 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1449 <        final FailingBiFunction r = new FailingBiFunction();
1263 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1448 >        final IncFunction[] rs = new IncFunction[4];
1449 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1450  
1451 <        f.complete(v1);
1452 <        checkIncomplete(h);
1453 <        g.complete(v2);
1451 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1452 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1453 >        assertTrue(f.cancel(mayInterruptIfRunning));
1454 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1455 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1456  
1457 <        checkCompletedWithWrappedCFException(h);
1458 <        checkCompletedNormally(f, v1);
1459 <        checkCompletedNormally(g, v2);
1460 <        }
1461 <    }
1457 >        checkCompletedWithWrappedCancellationException(h0);
1458 >        checkCompletedWithWrappedCancellationException(h1);
1459 >        checkCompletedWithWrappedCancellationException(h2);
1460 >        checkCompletedWithWrappedCancellationException(h3);
1461 >        checkCancelled(f);
1462 >        for (IncFunction r : rs) r.assertNotInvoked();
1463 >    }}
1464  
1465 <    public void testThenCombine_actionFailed2() {
1465 >    /**
1466 >     * thenApply result completes exceptionally if action does
1467 >     */
1468 >    public void testThenApply_actionFailed() {
1469          for (ExecutionMode m : ExecutionMode.values())
1470          for (Integer v1 : new Integer[] { 1, null })
1471 <        for (Integer v2 : new Integer[] { 2, null }) {
1279 <
1471 >    {
1472          final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1474 <        final FailingBiFunction r = new FailingBiFunction();
1283 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1473 >        final FailingFunction[] rs = new FailingFunction[4];
1474 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1475  
1476 <        g.complete(v2);
1477 <        checkIncomplete(h);
1478 <        f.complete(v1);
1479 <
1480 <        checkCompletedWithWrappedCFException(h);
1476 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1477 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1478 >        assertTrue(f.complete(v1));
1479 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1480 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1481 >
1482 >        checkCompletedWithWrappedCFException(h0);
1483 >        checkCompletedWithWrappedCFException(h1);
1484 >        checkCompletedWithWrappedCFException(h2);
1485 >        checkCompletedWithWrappedCFException(h3);
1486          checkCompletedNormally(f, v1);
1487 <        checkCompletedNormally(g, v2);
1292 <        }
1293 <    }
1487 >    }}
1488  
1489      /**
1490 <     * thenCombine result completes exceptionally if either source cancelled
1490 >     * thenAccept result completes normally after normal completion of source
1491       */
1492 <    public void testThenCombine_sourceCancelled1() {
1492 >    public void testThenAccept_normalCompletion() {
1493          for (ExecutionMode m : ExecutionMode.values())
1494 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1495 <        for (Integer v1 : new Integer[] { 1, null }) {
1302 <
1303 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1304 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1305 <        final SubtractFunction r = new SubtractFunction();
1306 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1307 <
1308 <        assertTrue(f.cancel(mayInterruptIfRunning));
1309 <        checkIncomplete(h);
1310 <        g.complete(v1);
1311 <
1312 <        checkCompletedWithWrappedCancellationException(h);
1313 <        checkCancelled(f);
1314 <        assertEquals(0, r.invocationCount);
1315 <        checkCompletedNormally(g, v1);
1316 <        }
1317 <    }
1318 <
1319 <    public void testThenCombine_sourceCancelled2() {
1320 <        for (ExecutionMode m : ExecutionMode.values())
1321 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1322 <        for (Integer v1 : new Integer[] { 1, null }) {
1323 <
1494 >        for (Integer v1 : new Integer[] { 1, null })
1495 >    {
1496          final CompletableFuture<Integer> f = new CompletableFuture<>();
1497 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1498 <        final SubtractFunction r = new SubtractFunction();
1327 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1328 <
1329 <        assertTrue(g.cancel(mayInterruptIfRunning));
1330 <        checkIncomplete(h);
1331 <        f.complete(v1);
1497 >        final NoopConsumer[] rs = new NoopConsumer[4];
1498 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1499  
1500 <        checkCompletedWithWrappedCancellationException(h);
1501 <        checkCancelled(g);
1502 <        assertEquals(0, r.invocationCount);
1500 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1501 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1502 >        checkIncomplete(h0);
1503 >        checkIncomplete(h1);
1504 >        assertTrue(f.complete(v1));
1505 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1506 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1507 >
1508 >        checkCompletedNormally(h0, null);
1509 >        checkCompletedNormally(h1, null);
1510 >        checkCompletedNormally(h2, null);
1511 >        checkCompletedNormally(h3, null);
1512          checkCompletedNormally(f, v1);
1513 <        }
1514 <    }
1513 >        for (NoopConsumer r : rs) r.assertValue(v1);
1514 >    }}
1515  
1516 <    public void testThenCombine_sourceCancelled3() {
1516 >    /**
1517 >     * thenAccept result completes exceptionally after exceptional
1518 >     * completion of source
1519 >     */
1520 >    public void testThenAccept_exceptionalCompletion() {
1521          for (ExecutionMode m : ExecutionMode.values())
1522 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1523 <        for (Integer v1 : new Integer[] { 1, null }) {
1344 <
1522 >    {
1523 >        final CFException ex = new CFException();
1524          final CompletableFuture<Integer> f = new CompletableFuture<>();
1525 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1526 <        final SubtractFunction r = new SubtractFunction();
1525 >        final NoopConsumer[] rs = new NoopConsumer[4];
1526 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1527  
1528 <        assertTrue(g.cancel(mayInterruptIfRunning));
1529 <        f.complete(v1);
1530 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1531 <
1532 <        checkCompletedWithWrappedCancellationException(h);
1533 <        checkCancelled(g);
1534 <        assertEquals(0, r.invocationCount);
1535 <        checkCompletedNormally(f, v1);
1536 <        }
1537 <    }
1528 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1529 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1530 >        assertTrue(f.completeExceptionally(ex));
1531 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1532 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1533 >
1534 >        checkCompletedWithWrappedException(h0, ex);
1535 >        checkCompletedWithWrappedException(h1, ex);
1536 >        checkCompletedWithWrappedException(h2, ex);
1537 >        checkCompletedWithWrappedException(h3, ex);
1538 >        checkCompletedExceptionally(f, ex);
1539 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1540 >    }}
1541  
1542 <    public void testThenCombine_sourceCancelled4() {
1542 >    /**
1543 >     * thenAccept result completes exceptionally if source cancelled
1544 >     */
1545 >    public void testThenAccept_sourceCancelled() {
1546          for (ExecutionMode m : ExecutionMode.values())
1547          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1548 <        for (Integer v1 : new Integer[] { 1, null }) {
1364 <
1548 >    {
1549          final CompletableFuture<Integer> f = new CompletableFuture<>();
1550 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1551 <        final SubtractFunction r = new SubtractFunction();
1550 >        final NoopConsumer[] rs = new NoopConsumer[4];
1551 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1552  
1553 +        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1554 +        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1555          assertTrue(f.cancel(mayInterruptIfRunning));
1556 <        g.complete(v1);
1557 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1556 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1557 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1558  
1559 <        checkCompletedWithWrappedCancellationException(h);
1559 >        checkCompletedWithWrappedCancellationException(h0);
1560 >        checkCompletedWithWrappedCancellationException(h1);
1561 >        checkCompletedWithWrappedCancellationException(h2);
1562 >        checkCompletedWithWrappedCancellationException(h3);
1563          checkCancelled(f);
1564 <        assertEquals(0, r.invocationCount);
1565 <        checkCompletedNormally(g, v1);
1377 <        }
1378 <    }
1564 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1565 >    }}
1566  
1567      /**
1568 <     * thenAcceptBoth result completes normally after normal
1382 <     * completion of sources
1568 >     * thenAccept result completes exceptionally if action does
1569       */
1570 <    public void testThenAcceptBoth_normalCompletion1() {
1385 <        for (ExecutionMode m : ExecutionMode.values())
1386 <        for (Integer v1 : new Integer[] { 1, null })
1387 <        for (Integer v2 : new Integer[] { 2, null }) {
1388 <
1389 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1390 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1391 <        final SubtractAction r = new SubtractAction();
1392 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1393 <
1394 <        f.complete(v1);
1395 <        checkIncomplete(h);
1396 <        assertEquals(0, r.invocationCount);
1397 <        g.complete(v2);
1398 <
1399 <        checkCompletedNormally(h, null);
1400 <        assertEquals(subtract(v1, v2), r.value);
1401 <        checkCompletedNormally(f, v1);
1402 <        checkCompletedNormally(g, v2);
1403 <        }
1404 <    }
1405 <
1406 <    public void testThenAcceptBoth_normalCompletion2() {
1407 <        for (ExecutionMode m : ExecutionMode.values())
1408 <        for (Integer v1 : new Integer[] { 1, null })
1409 <        for (Integer v2 : new Integer[] { 2, null }) {
1410 <
1411 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1412 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1413 <        final SubtractAction r = new SubtractAction();
1414 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1415 <
1416 <        g.complete(v2);
1417 <        checkIncomplete(h);
1418 <        assertEquals(0, r.invocationCount);
1419 <        f.complete(v1);
1420 <
1421 <        checkCompletedNormally(h, null);
1422 <        assertEquals(subtract(v1, v2), r.value);
1423 <        checkCompletedNormally(f, v1);
1424 <        checkCompletedNormally(g, v2);
1425 <        }
1426 <    }
1427 <
1428 <    public void testThenAcceptBoth_normalCompletion3() {
1570 >    public void testThenAccept_actionFailed() {
1571          for (ExecutionMode m : ExecutionMode.values())
1572          for (Integer v1 : new Integer[] { 1, null })
1573 <        for (Integer v2 : new Integer[] { 2, null }) {
1432 <
1573 >    {
1574          final CompletableFuture<Integer> f = new CompletableFuture<>();
1575 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1576 <        final SubtractAction r = new SubtractAction();
1436 <
1437 <        g.complete(v2);
1438 <        f.complete(v1);
1439 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1575 >        final FailingConsumer[] rs = new FailingConsumer[4];
1576 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1577  
1578 <        checkCompletedNormally(h, null);
1579 <        assertEquals(subtract(v1, v2), r.value);
1578 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1579 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1580 >        assertTrue(f.complete(v1));
1581 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1582 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1583 >
1584 >        checkCompletedWithWrappedCFException(h0);
1585 >        checkCompletedWithWrappedCFException(h1);
1586 >        checkCompletedWithWrappedCFException(h2);
1587 >        checkCompletedWithWrappedCFException(h3);
1588          checkCompletedNormally(f, v1);
1589 <        checkCompletedNormally(g, v2);
1445 <        }
1446 <    }
1589 >    }}
1590  
1591 <    public void testThenAcceptBoth_normalCompletion4() {
1591 >    /**
1592 >     * thenCombine result completes normally after normal completion
1593 >     * of sources
1594 >     */
1595 >    public void testThenCombine_normalCompletion() {
1596          for (ExecutionMode m : ExecutionMode.values())
1597 +        for (boolean fFirst : new boolean[] { true, false })
1598          for (Integer v1 : new Integer[] { 1, null })
1599 <        for (Integer v2 : new Integer[] { 2, null }) {
1600 <
1599 >        for (Integer v2 : new Integer[] { 2, null })
1600 >    {
1601          final CompletableFuture<Integer> f = new CompletableFuture<>();
1602          final CompletableFuture<Integer> g = new CompletableFuture<>();
1603 <        final SubtractAction r = new SubtractAction();
1604 <
1457 <        f.complete(v1);
1458 <        g.complete(v2);
1459 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1603 >        final SubtractFunction[] rs = new SubtractFunction[6];
1604 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1605  
1606 <        checkCompletedNormally(h, null);
1607 <        assertEquals(subtract(v1, v2), r.value);
1606 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1607 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1608 >        final Integer w1 =  fFirst ? v1 : v2;
1609 >        final Integer w2 = !fFirst ? v1 : v2;
1610 >
1611 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1612 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1613 >        assertTrue(fst.complete(w1));
1614 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1615 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1616 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1617 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1618 >        checkCompletedNormally(h1, subtract(w1, w1));
1619 >        checkCompletedNormally(h3, subtract(w1, w1));
1620 >        rs[1].assertValue(subtract(w1, w1));
1621 >        rs[3].assertValue(subtract(w1, w1));
1622 >        assertTrue(snd.complete(w2));
1623 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1624 >
1625 >        checkCompletedNormally(h0, subtract(v1, v2));
1626 >        checkCompletedNormally(h2, subtract(v1, v2));
1627 >        checkCompletedNormally(h4, subtract(v1, v2));
1628 >        rs[0].assertValue(subtract(v1, v2));
1629 >        rs[2].assertValue(subtract(v1, v2));
1630 >        rs[4].assertValue(subtract(v1, v2));
1631 >      
1632          checkCompletedNormally(f, v1);
1633          checkCompletedNormally(g, v2);
1634 <        }
1466 <    }
1634 >    }}
1635  
1636      /**
1637 <     * thenAcceptBoth result completes exceptionally after exceptional
1637 >     * thenCombine result completes exceptionally after exceptional
1638       * completion of either source
1639       */
1640 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1640 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1641          for (ExecutionMode m : ExecutionMode.values())
1642 <        for (Integer v1 : new Integer[] { 1, null }) {
1643 <
1644 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1645 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1478 <        final SubtractAction r = new SubtractAction();
1479 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1480 <        final CFException ex = new CFException();
1481 <
1482 <        f.completeExceptionally(ex);
1483 <        checkIncomplete(h);
1484 <        g.complete(v1);
1485 <
1486 <        checkCompletedWithWrappedCFException(h, ex);
1487 <        checkCompletedWithWrappedCFException(f, ex);
1488 <        assertEquals(0, r.invocationCount);
1489 <        checkCompletedNormally(g, v1);
1490 <        }
1491 <    }
1492 <
1493 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1494 <        for (ExecutionMode m : ExecutionMode.values())
1495 <        for (Integer v1 : new Integer[] { 1, null }) {
1496 <
1497 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1498 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1499 <        final SubtractAction r = new SubtractAction();
1500 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1501 <        final CFException ex = new CFException();
1502 <
1503 <        g.completeExceptionally(ex);
1504 <        checkIncomplete(h);
1505 <        f.complete(v1);
1506 <
1507 <        checkCompletedWithWrappedCFException(h, ex);
1508 <        checkCompletedWithWrappedCFException(g, ex);
1509 <        assertEquals(0, r.invocationCount);
1510 <        checkCompletedNormally(f, v1);
1511 <        }
1512 <    }
1513 <
1514 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1515 <        for (ExecutionMode m : ExecutionMode.values())
1516 <        for (Integer v1 : new Integer[] { 1, null }) {
1517 <
1518 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1519 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1520 <        final SubtractAction r = new SubtractAction();
1521 <        final CFException ex = new CFException();
1522 <
1523 <        g.completeExceptionally(ex);
1524 <        f.complete(v1);
1525 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1526 <
1527 <        checkCompletedWithWrappedCFException(h, ex);
1528 <        checkCompletedWithWrappedCFException(g, ex);
1529 <        assertEquals(0, r.invocationCount);
1530 <        checkCompletedNormally(f, v1);
1531 <        }
1532 <    }
1533 <
1534 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1535 <        for (ExecutionMode m : ExecutionMode.values())
1536 <        for (Integer v1 : new Integer[] { 1, null }) {
1537 <
1642 >        for (boolean fFirst : new boolean[] { true, false })
1643 >        for (boolean failFirst : new boolean[] { true, false })
1644 >        for (Integer v1 : new Integer[] { 1, null })
1645 >    {
1646          final CompletableFuture<Integer> f = new CompletableFuture<>();
1647          final CompletableFuture<Integer> g = new CompletableFuture<>();
1540        final SubtractAction r = new SubtractAction();
1648          final CFException ex = new CFException();
1649 <
1650 <        f.completeExceptionally(ex);
1651 <        g.complete(v1);
1652 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1653 <
1654 <        checkCompletedWithWrappedCFException(h, ex);
1655 <        checkCompletedWithWrappedCFException(f, ex);
1656 <        assertEquals(0, r.invocationCount);
1657 <        checkCompletedNormally(g, v1);
1658 <        }
1659 <    }
1649 >        final SubtractFunction r1 = new SubtractFunction(m);
1650 >        final SubtractFunction r2 = new SubtractFunction(m);
1651 >        final SubtractFunction r3 = new SubtractFunction(m);
1652 >
1653 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1654 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1655 >        final Callable<Boolean> complete1 = failFirst ?
1656 >            () -> fst.completeExceptionally(ex) :
1657 >            () -> fst.complete(v1);
1658 >        final Callable<Boolean> complete2 = failFirst ?
1659 >            () -> snd.complete(v1) :
1660 >            () -> snd.completeExceptionally(ex);
1661 >
1662 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1663 >        assertTrue(complete1.call());
1664 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1665 >        checkIncomplete(h1);
1666 >        checkIncomplete(h2);
1667 >        assertTrue(complete2.call());
1668 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1669 >
1670 >        checkCompletedWithWrappedException(h1, ex);
1671 >        checkCompletedWithWrappedException(h2, ex);
1672 >        checkCompletedWithWrappedException(h3, ex);
1673 >        r1.assertNotInvoked();
1674 >        r2.assertNotInvoked();
1675 >        r3.assertNotInvoked();
1676 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1677 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1678 >    }}
1679  
1680      /**
1681 <     * thenAcceptBoth result completes exceptionally if action does
1681 >     * thenCombine result completes exceptionally if either source cancelled
1682       */
1683 <    public void testThenAcceptBoth_actionFailed1() {
1683 >    public void testThenCombine_sourceCancelled() throws Throwable {
1684          for (ExecutionMode m : ExecutionMode.values())
1685 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1686 +        for (boolean fFirst : new boolean[] { true, false })
1687 +        for (boolean failFirst : new boolean[] { true, false })
1688          for (Integer v1 : new Integer[] { 1, null })
1689 <        for (Integer v2 : new Integer[] { 2, null }) {
1561 <
1689 >    {
1690          final CompletableFuture<Integer> f = new CompletableFuture<>();
1691          final CompletableFuture<Integer> g = new CompletableFuture<>();
1692 <        final FailingBiConsumer r = new FailingBiConsumer();
1693 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1694 <
1695 <        f.complete(v1);
1696 <        checkIncomplete(h);
1697 <        g.complete(v2);
1698 <
1699 <        checkCompletedWithWrappedCFException(h);
1700 <        checkCompletedNormally(f, v1);
1701 <        checkCompletedNormally(g, v2);
1702 <        }
1703 <    }
1692 >        final SubtractFunction r1 = new SubtractFunction(m);
1693 >        final SubtractFunction r2 = new SubtractFunction(m);
1694 >        final SubtractFunction r3 = new SubtractFunction(m);
1695 >
1696 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1697 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1698 >        final Callable<Boolean> complete1 = failFirst ?
1699 >            () -> fst.cancel(mayInterruptIfRunning) :
1700 >            () -> fst.complete(v1);
1701 >        final Callable<Boolean> complete2 = failFirst ?
1702 >            () -> snd.complete(v1) :
1703 >            () -> snd.cancel(mayInterruptIfRunning);
1704 >
1705 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1706 >        assertTrue(complete1.call());
1707 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1708 >        checkIncomplete(h1);
1709 >        checkIncomplete(h2);
1710 >        assertTrue(complete2.call());
1711 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1712 >
1713 >        checkCompletedWithWrappedCancellationException(h1);
1714 >        checkCompletedWithWrappedCancellationException(h2);
1715 >        checkCompletedWithWrappedCancellationException(h3);
1716 >        r1.assertNotInvoked();
1717 >        r2.assertNotInvoked();
1718 >        r3.assertNotInvoked();
1719 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1720 >        checkCancelled(failFirst ? fst : snd);
1721 >    }}
1722  
1723 <    public void testThenAcceptBoth_actionFailed2() {
1723 >    /**
1724 >     * thenCombine result completes exceptionally if action does
1725 >     */
1726 >    public void testThenCombine_actionFailed() {
1727          for (ExecutionMode m : ExecutionMode.values())
1728 +        for (boolean fFirst : new boolean[] { true, false })
1729          for (Integer v1 : new Integer[] { 1, null })
1730 <        for (Integer v2 : new Integer[] { 2, null }) {
1731 <
1730 >        for (Integer v2 : new Integer[] { 2, null })
1731 >    {
1732          final CompletableFuture<Integer> f = new CompletableFuture<>();
1733          final CompletableFuture<Integer> g = new CompletableFuture<>();
1734 <        final FailingBiConsumer r = new FailingBiConsumer();
1735 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1736 <
1737 <        g.complete(v2);
1738 <        checkIncomplete(h);
1739 <        f.complete(v1);
1740 <
1741 <        checkCompletedWithWrappedCFException(h);
1734 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1735 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1736 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1737 >
1738 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1739 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1740 >        final Integer w1 =  fFirst ? v1 : v2;
1741 >        final Integer w2 = !fFirst ? v1 : v2;
1742 >
1743 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1744 >        assertTrue(fst.complete(w1));
1745 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1746 >        assertTrue(snd.complete(w2));
1747 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1748 >
1749 >        checkCompletedWithWrappedCFException(h1);
1750 >        checkCompletedWithWrappedCFException(h2);
1751 >        checkCompletedWithWrappedCFException(h3);
1752 >        r1.assertInvoked();
1753 >        r2.assertInvoked();
1754 >        r3.assertInvoked();
1755          checkCompletedNormally(f, v1);
1756          checkCompletedNormally(g, v2);
1757 <        }
1595 <    }
1757 >    }}
1758  
1759      /**
1760 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1760 >     * thenAcceptBoth result completes normally after normal
1761 >     * completion of sources
1762       */
1763 <    public void testThenAcceptBoth_sourceCancelled1() {
1601 <        for (ExecutionMode m : ExecutionMode.values())
1602 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1603 <        for (Integer v1 : new Integer[] { 1, null }) {
1604 <
1605 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1606 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1607 <        final SubtractAction r = new SubtractAction();
1608 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1609 <
1610 <        assertTrue(f.cancel(mayInterruptIfRunning));
1611 <        checkIncomplete(h);
1612 <        g.complete(v1);
1613 <
1614 <        checkCompletedWithWrappedCancellationException(h);
1615 <        checkCancelled(f);
1616 <        assertEquals(0, r.invocationCount);
1617 <        checkCompletedNormally(g, v1);
1618 <        }
1619 <    }
1620 <
1621 <    public void testThenAcceptBoth_sourceCancelled2() {
1622 <        for (ExecutionMode m : ExecutionMode.values())
1623 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1624 <        for (Integer v1 : new Integer[] { 1, null }) {
1625 <
1626 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1627 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1628 <        final SubtractAction r = new SubtractAction();
1629 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1630 <
1631 <        assertTrue(g.cancel(mayInterruptIfRunning));
1632 <        checkIncomplete(h);
1633 <        f.complete(v1);
1634 <
1635 <        checkCompletedWithWrappedCancellationException(h);
1636 <        checkCancelled(g);
1637 <        assertEquals(0, r.invocationCount);
1638 <        checkCompletedNormally(f, v1);
1639 <        }
1640 <    }
1641 <
1642 <    public void testThenAcceptBoth_sourceCancelled3() {
1763 >    public void testThenAcceptBoth_normalCompletion() {
1764          for (ExecutionMode m : ExecutionMode.values())
1765 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1766 <        for (Integer v1 : new Integer[] { 1, null }) {
1767 <
1765 >        for (boolean fFirst : new boolean[] { true, false })
1766 >        for (Integer v1 : new Integer[] { 1, null })
1767 >        for (Integer v2 : new Integer[] { 2, null })
1768 >    {
1769          final CompletableFuture<Integer> f = new CompletableFuture<>();
1770          final CompletableFuture<Integer> g = new CompletableFuture<>();
1771 <        final SubtractAction r = new SubtractAction();
1772 <
1773 <        assertTrue(g.cancel(mayInterruptIfRunning));
1774 <        f.complete(v1);
1775 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1776 <
1777 <        checkCompletedWithWrappedCancellationException(h);
1778 <        checkCancelled(g);
1779 <        assertEquals(0, r.invocationCount);
1771 >        final SubtractAction r1 = new SubtractAction(m);
1772 >        final SubtractAction r2 = new SubtractAction(m);
1773 >        final SubtractAction r3 = new SubtractAction(m);
1774 >
1775 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1776 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1777 >        final Integer w1 =  fFirst ? v1 : v2;
1778 >        final Integer w2 = !fFirst ? v1 : v2;
1779 >
1780 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1781 >        assertTrue(fst.complete(w1));
1782 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1783 >        checkIncomplete(h1);
1784 >        checkIncomplete(h2);
1785 >        r1.assertNotInvoked();
1786 >        r2.assertNotInvoked();
1787 >        assertTrue(snd.complete(w2));
1788 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1789 >
1790 >        checkCompletedNormally(h1, null);
1791 >        checkCompletedNormally(h2, null);
1792 >        checkCompletedNormally(h3, null);
1793 >        r1.assertValue(subtract(v1, v2));
1794 >        r2.assertValue(subtract(v1, v2));
1795 >        r3.assertValue(subtract(v1, v2));
1796          checkCompletedNormally(f, v1);
1797 <        }
1798 <    }
1661 <
1662 <    public void testThenAcceptBoth_sourceCancelled4() {
1663 <        for (ExecutionMode m : ExecutionMode.values())
1664 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1665 <        for (Integer v1 : new Integer[] { 1, null }) {
1666 <
1667 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1668 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1669 <        final SubtractAction r = new SubtractAction();
1670 <
1671 <        assertTrue(f.cancel(mayInterruptIfRunning));
1672 <        g.complete(v1);
1673 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1674 <
1675 <        checkCompletedWithWrappedCancellationException(h);
1676 <        checkCancelled(f);
1677 <        assertEquals(0, r.invocationCount);
1678 <        checkCompletedNormally(g, v1);
1679 <        }
1680 <    }
1797 >        checkCompletedNormally(g, v2);
1798 >    }}
1799  
1800      /**
1801 <     * runAfterBoth result completes normally after normal
1802 <     * completion of sources
1801 >     * thenAcceptBoth result completes exceptionally after exceptional
1802 >     * completion of either source
1803       */
1804 <    public void testRunAfterBoth_normalCompletion1() {
1804 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1805          for (ExecutionMode m : ExecutionMode.values())
1806 +        for (boolean fFirst : new boolean[] { true, false })
1807 +        for (boolean failFirst : new boolean[] { true, false })
1808          for (Integer v1 : new Integer[] { 1, null })
1809 <        for (Integer v2 : new Integer[] { 2, null }) {
1690 <
1809 >    {
1810          final CompletableFuture<Integer> f = new CompletableFuture<>();
1811          final CompletableFuture<Integer> g = new CompletableFuture<>();
1812 <        final Noop r = new Noop();
1813 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1814 <
1815 <        f.complete(v1);
1816 <        checkIncomplete(h);
1817 <        assertEquals(0, r.invocationCount);
1818 <        g.complete(v2);
1819 <
1820 <        checkCompletedNormally(h, null);
1821 <        assertEquals(1, r.invocationCount);
1822 <        checkCompletedNormally(f, v1);
1823 <        checkCompletedNormally(g, v2);
1824 <        }
1825 <    }
1812 >        final CFException ex = new CFException();
1813 >        final SubtractAction r1 = new SubtractAction(m);
1814 >        final SubtractAction r2 = new SubtractAction(m);
1815 >        final SubtractAction r3 = new SubtractAction(m);
1816 >
1817 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1818 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1819 >        final Callable<Boolean> complete1 = failFirst ?
1820 >            () -> fst.completeExceptionally(ex) :
1821 >            () -> fst.complete(v1);
1822 >        final Callable<Boolean> complete2 = failFirst ?
1823 >            () -> snd.complete(v1) :
1824 >            () -> snd.completeExceptionally(ex);
1825 >
1826 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1827 >        assertTrue(complete1.call());
1828 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1829 >        checkIncomplete(h1);
1830 >        checkIncomplete(h2);
1831 >        assertTrue(complete2.call());
1832 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1833 >
1834 >        checkCompletedWithWrappedException(h1, ex);
1835 >        checkCompletedWithWrappedException(h2, ex);
1836 >        checkCompletedWithWrappedException(h3, ex);
1837 >        r1.assertNotInvoked();
1838 >        r2.assertNotInvoked();
1839 >        r3.assertNotInvoked();
1840 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1841 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1842 >    }}
1843  
1844 <    public void testRunAfterBoth_normalCompletion2() {
1844 >    /**
1845 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1846 >     */
1847 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1848          for (ExecutionMode m : ExecutionMode.values())
1849 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1850 +        for (boolean fFirst : new boolean[] { true, false })
1851 +        for (boolean failFirst : new boolean[] { true, false })
1852          for (Integer v1 : new Integer[] { 1, null })
1853 <        for (Integer v2 : new Integer[] { 2, null }) {
1712 <
1853 >    {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856 <        final Noop r = new Noop();
1857 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1858 <
1859 <        g.complete(v2);
1860 <        checkIncomplete(h);
1861 <        assertEquals(0, r.invocationCount);
1862 <        f.complete(v1);
1863 <
1864 <        checkCompletedNormally(h, null);
1865 <        assertEquals(1, r.invocationCount);
1866 <        checkCompletedNormally(f, v1);
1867 <        checkCompletedNormally(g, v2);
1868 <        }
1869 <    }
1856 >        final SubtractAction r1 = new SubtractAction(m);
1857 >        final SubtractAction r2 = new SubtractAction(m);
1858 >        final SubtractAction r3 = new SubtractAction(m);
1859 >
1860 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1861 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1862 >        final Callable<Boolean> complete1 = failFirst ?
1863 >            () -> fst.cancel(mayInterruptIfRunning) :
1864 >            () -> fst.complete(v1);
1865 >        final Callable<Boolean> complete2 = failFirst ?
1866 >            () -> snd.complete(v1) :
1867 >            () -> snd.cancel(mayInterruptIfRunning);
1868 >
1869 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1870 >        assertTrue(complete1.call());
1871 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1872 >        checkIncomplete(h1);
1873 >        checkIncomplete(h2);
1874 >        assertTrue(complete2.call());
1875 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1876 >
1877 >        checkCompletedWithWrappedCancellationException(h1);
1878 >        checkCompletedWithWrappedCancellationException(h2);
1879 >        checkCompletedWithWrappedCancellationException(h3);
1880 >        r1.assertNotInvoked();
1881 >        r2.assertNotInvoked();
1882 >        r3.assertNotInvoked();
1883 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1884 >        checkCancelled(failFirst ? fst : snd);
1885 >    }}
1886  
1887 <    public void testRunAfterBoth_normalCompletion3() {
1887 >    /**
1888 >     * thenAcceptBoth result completes exceptionally if action does
1889 >     */
1890 >    public void testThenAcceptBoth_actionFailed() {
1891          for (ExecutionMode m : ExecutionMode.values())
1892 +        for (boolean fFirst : new boolean[] { true, false })
1893          for (Integer v1 : new Integer[] { 1, null })
1894 <        for (Integer v2 : new Integer[] { 2, null }) {
1895 <
1894 >        for (Integer v2 : new Integer[] { 2, null })
1895 >    {
1896          final CompletableFuture<Integer> f = new CompletableFuture<>();
1897          final CompletableFuture<Integer> g = new CompletableFuture<>();
1898 <        final Noop r = new Noop();
1899 <
1900 <        g.complete(v2);
1901 <        f.complete(v1);
1902 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1903 <
1904 <        checkCompletedNormally(h, null);
1905 <        assertEquals(1, r.invocationCount);
1898 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1899 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1900 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1901 >
1902 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1903 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1904 >        final Integer w1 =  fFirst ? v1 : v2;
1905 >        final Integer w2 = !fFirst ? v1 : v2;
1906 >
1907 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1908 >        assertTrue(fst.complete(w1));
1909 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1910 >        assertTrue(snd.complete(w2));
1911 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1912 >
1913 >        checkCompletedWithWrappedCFException(h1);
1914 >        checkCompletedWithWrappedCFException(h2);
1915 >        checkCompletedWithWrappedCFException(h3);
1916 >        r1.assertInvoked();
1917 >        r2.assertInvoked();
1918 >        r3.assertInvoked();
1919          checkCompletedNormally(f, v1);
1920          checkCompletedNormally(g, v2);
1921 <        }
1748 <    }
1921 >    }}
1922  
1923 <    public void testRunAfterBoth_normalCompletion4() {
1923 >    /**
1924 >     * runAfterBoth result completes normally after normal
1925 >     * completion of sources
1926 >     */
1927 >    public void testRunAfterBoth_normalCompletion() {
1928          for (ExecutionMode m : ExecutionMode.values())
1929 +        for (boolean fFirst : new boolean[] { true, false })
1930          for (Integer v1 : new Integer[] { 1, null })
1931 <        for (Integer v2 : new Integer[] { 2, null }) {
1932 <
1931 >        for (Integer v2 : new Integer[] { 2, null })
1932 >    {
1933          final CompletableFuture<Integer> f = new CompletableFuture<>();
1934          final CompletableFuture<Integer> g = new CompletableFuture<>();
1935 <        final Noop r = new Noop();
1936 <
1937 <        f.complete(v1);
1938 <        g.complete(v2);
1939 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1940 <
1941 <        checkCompletedNormally(h, null);
1942 <        assertEquals(1, r.invocationCount);
1935 >        final Noop r1 = new Noop(m);
1936 >        final Noop r2 = new Noop(m);
1937 >        final Noop r3 = new Noop(m);
1938 >
1939 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1940 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1941 >        final Integer w1 =  fFirst ? v1 : v2;
1942 >        final Integer w2 = !fFirst ? v1 : v2;
1943 >
1944 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1945 >        assertTrue(fst.complete(w1));
1946 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1947 >        checkIncomplete(h1);
1948 >        checkIncomplete(h2);
1949 >        r1.assertNotInvoked();
1950 >        r2.assertNotInvoked();
1951 >        assertTrue(snd.complete(w2));
1952 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1953 >
1954 >        checkCompletedNormally(h1, null);
1955 >        checkCompletedNormally(h2, null);
1956 >        checkCompletedNormally(h3, null);
1957 >        r1.assertInvoked();
1958 >        r2.assertInvoked();
1959 >        r3.assertInvoked();
1960          checkCompletedNormally(f, v1);
1961          checkCompletedNormally(g, v2);
1962 <        }
1768 <    }
1962 >    }}
1963  
1964      /**
1965       * runAfterBoth result completes exceptionally after exceptional
1966       * completion of either source
1967       */
1968 <    public void testRunAfterBoth_exceptionalCompletion1() {
1775 <        for (ExecutionMode m : ExecutionMode.values())
1776 <        for (Integer v1 : new Integer[] { 1, null }) {
1777 <
1778 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1779 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1780 <        final Noop r = new Noop();
1781 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1782 <        final CFException ex = new CFException();
1783 <
1784 <        f.completeExceptionally(ex);
1785 <        checkIncomplete(h);
1786 <        g.complete(v1);
1787 <
1788 <        checkCompletedWithWrappedCFException(h, ex);
1789 <        checkCompletedWithWrappedCFException(f, ex);
1790 <        assertEquals(0, r.invocationCount);
1791 <        checkCompletedNormally(g, v1);
1792 <        }
1793 <    }
1794 <
1795 <    public void testRunAfterBoth_exceptionalCompletion2() {
1796 <        for (ExecutionMode m : ExecutionMode.values())
1797 <        for (Integer v1 : new Integer[] { 1, null }) {
1798 <
1799 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1800 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1801 <        final Noop r = new Noop();
1802 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1803 <        final CFException ex = new CFException();
1804 <
1805 <        g.completeExceptionally(ex);
1806 <        checkIncomplete(h);
1807 <        f.complete(v1);
1808 <
1809 <        checkCompletedWithWrappedCFException(h, ex);
1810 <        checkCompletedWithWrappedCFException(g, ex);
1811 <        assertEquals(0, r.invocationCount);
1812 <        checkCompletedNormally(f, v1);
1813 <        }
1814 <    }
1815 <
1816 <    public void testRunAfterBoth_exceptionalCompletion3() {
1968 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1969          for (ExecutionMode m : ExecutionMode.values())
1970 <        for (Integer v1 : new Integer[] { 1, null }) {
1971 <
1972 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1973 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1822 <        final Noop r = new Noop();
1823 <        final CFException ex = new CFException();
1824 <
1825 <        g.completeExceptionally(ex);
1826 <        f.complete(v1);
1827 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1828 <
1829 <        checkCompletedWithWrappedCFException(h, ex);
1830 <        checkCompletedWithWrappedCFException(g, ex);
1831 <        assertEquals(0, r.invocationCount);
1832 <        checkCompletedNormally(f, v1);
1833 <        }
1834 <    }
1835 <
1836 <    public void testRunAfterBoth_exceptionalCompletion4() {
1837 <        for (ExecutionMode m : ExecutionMode.values())
1838 <        for (Integer v1 : new Integer[] { 1, null }) {
1839 <
1970 >        for (boolean fFirst : new boolean[] { true, false })
1971 >        for (boolean failFirst : new boolean[] { true, false })
1972 >        for (Integer v1 : new Integer[] { 1, null })
1973 >    {
1974          final CompletableFuture<Integer> f = new CompletableFuture<>();
1975          final CompletableFuture<Integer> g = new CompletableFuture<>();
1842        final Noop r = new Noop();
1976          final CFException ex = new CFException();
1977 <
1978 <        f.completeExceptionally(ex);
1979 <        g.complete(v1);
1980 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1981 <
1982 <        checkCompletedWithWrappedCFException(h, ex);
1983 <        checkCompletedWithWrappedCFException(f, ex);
1984 <        assertEquals(0, r.invocationCount);
1985 <        checkCompletedNormally(g, v1);
1986 <        }
1987 <    }
1977 >        final Noop r1 = new Noop(m);
1978 >        final Noop r2 = new Noop(m);
1979 >        final Noop r3 = new Noop(m);
1980 >
1981 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1982 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1983 >        final Callable<Boolean> complete1 = failFirst ?
1984 >            () -> fst.completeExceptionally(ex) :
1985 >            () -> fst.complete(v1);
1986 >        final Callable<Boolean> complete2 = failFirst ?
1987 >            () -> snd.complete(v1) :
1988 >            () -> snd.completeExceptionally(ex);
1989 >
1990 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1991 >        assertTrue(complete1.call());
1992 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1993 >        checkIncomplete(h1);
1994 >        checkIncomplete(h2);
1995 >        assertTrue(complete2.call());
1996 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1997 >
1998 >        checkCompletedWithWrappedException(h1, ex);
1999 >        checkCompletedWithWrappedException(h2, ex);
2000 >        checkCompletedWithWrappedException(h3, ex);
2001 >        r1.assertNotInvoked();
2002 >        r2.assertNotInvoked();
2003 >        r3.assertNotInvoked();
2004 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2005 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2006 >    }}
2007  
2008      /**
2009 <     * runAfterBoth result completes exceptionally if action does
2009 >     * runAfterBoth result completes exceptionally if either source cancelled
2010       */
2011 <    public void testRunAfterBoth_actionFailed1() {
1860 <        for (ExecutionMode m : ExecutionMode.values())
1861 <        for (Integer v1 : new Integer[] { 1, null })
1862 <        for (Integer v2 : new Integer[] { 2, null }) {
1863 <
1864 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1865 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1866 <        final FailingNoop r = new FailingNoop();
1867 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1868 <
1869 <        f.complete(v1);
1870 <        checkIncomplete(h);
1871 <        g.complete(v2);
1872 <
1873 <        checkCompletedWithWrappedCFException(h);
1874 <        checkCompletedNormally(f, v1);
1875 <        checkCompletedNormally(g, v2);
1876 <        }
1877 <    }
1878 <
1879 <    public void testRunAfterBoth_actionFailed2() {
2011 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2012          for (ExecutionMode m : ExecutionMode.values())
2013 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2014 +        for (boolean fFirst : new boolean[] { true, false })
2015 +        for (boolean failFirst : new boolean[] { true, false })
2016          for (Integer v1 : new Integer[] { 1, null })
2017 <        for (Integer v2 : new Integer[] { 2, null }) {
1883 <
2017 >    {
2018          final CompletableFuture<Integer> f = new CompletableFuture<>();
2019          final CompletableFuture<Integer> g = new CompletableFuture<>();
2020 <        final FailingNoop r = new FailingNoop();
2021 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2022 <
2023 <        g.complete(v2);
2024 <        checkIncomplete(h);
2025 <        f.complete(v1);
2026 <
2027 <        checkCompletedWithWrappedCFException(h);
2028 <        checkCompletedNormally(f, v1);
2029 <        checkCompletedNormally(g, v2);
2030 <        }
2031 <    }
2020 >        final Noop r1 = new Noop(m);
2021 >        final Noop r2 = new Noop(m);
2022 >        final Noop r3 = new Noop(m);
2023 >
2024 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2025 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2026 >        final Callable<Boolean> complete1 = failFirst ?
2027 >            () -> fst.cancel(mayInterruptIfRunning) :
2028 >            () -> fst.complete(v1);
2029 >        final Callable<Boolean> complete2 = failFirst ?
2030 >            () -> snd.complete(v1) :
2031 >            () -> snd.cancel(mayInterruptIfRunning);
2032 >
2033 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2034 >        assertTrue(complete1.call());
2035 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2036 >        checkIncomplete(h1);
2037 >        checkIncomplete(h2);
2038 >        assertTrue(complete2.call());
2039 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2040 >
2041 >        checkCompletedWithWrappedCancellationException(h1);
2042 >        checkCompletedWithWrappedCancellationException(h2);
2043 >        checkCompletedWithWrappedCancellationException(h3);
2044 >        r1.assertNotInvoked();
2045 >        r2.assertNotInvoked();
2046 >        r3.assertNotInvoked();
2047 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2048 >        checkCancelled(failFirst ? fst : snd);
2049 >    }}
2050  
2051      /**
2052 <     * runAfterBoth result completes exceptionally if either source cancelled
2052 >     * runAfterBoth result completes exceptionally if action does
2053       */
2054 <    public void testRunAfterBoth_sourceCancelled1() {
1903 <        for (ExecutionMode m : ExecutionMode.values())
1904 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1905 <        for (Integer v1 : new Integer[] { 1, null }) {
1906 <
1907 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1908 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1909 <        final Noop r = new Noop();
1910 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1911 <
1912 <        assertTrue(f.cancel(mayInterruptIfRunning));
1913 <        checkIncomplete(h);
1914 <        g.complete(v1);
1915 <
1916 <        checkCompletedWithWrappedCancellationException(h);
1917 <        checkCancelled(f);
1918 <        assertEquals(0, r.invocationCount);
1919 <        checkCompletedNormally(g, v1);
1920 <        }
1921 <    }
1922 <
1923 <    public void testRunAfterBoth_sourceCancelled2() {
1924 <        for (ExecutionMode m : ExecutionMode.values())
1925 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1926 <        for (Integer v1 : new Integer[] { 1, null }) {
1927 <
1928 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1929 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1930 <        final Noop r = new Noop();
1931 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1932 <
1933 <        assertTrue(g.cancel(mayInterruptIfRunning));
1934 <        checkIncomplete(h);
1935 <        f.complete(v1);
1936 <
1937 <        checkCompletedWithWrappedCancellationException(h);
1938 <        checkCancelled(g);
1939 <        assertEquals(0, r.invocationCount);
1940 <        checkCompletedNormally(f, v1);
1941 <        }
1942 <    }
1943 <
1944 <    public void testRunAfterBoth_sourceCancelled3() {
2054 >    public void testRunAfterBoth_actionFailed() {
2055          for (ExecutionMode m : ExecutionMode.values())
2056 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2057 <        for (Integer v1 : new Integer[] { 1, null }) {
2058 <
2056 >        for (boolean fFirst : new boolean[] { true, false })
2057 >        for (Integer v1 : new Integer[] { 1, null })
2058 >        for (Integer v2 : new Integer[] { 2, null })
2059 >    {
2060          final CompletableFuture<Integer> f = new CompletableFuture<>();
2061          final CompletableFuture<Integer> g = new CompletableFuture<>();
2062 <        final Noop r = new Noop();
2063 <
2064 <        assertTrue(g.cancel(mayInterruptIfRunning));
2065 <        f.complete(v1);
2066 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2067 <
2068 <        checkCompletedWithWrappedCancellationException(h);
2069 <        checkCancelled(g);
2070 <        assertEquals(0, r.invocationCount);
2062 >        final FailingRunnable r1 = new FailingRunnable(m);
2063 >        final FailingRunnable r2 = new FailingRunnable(m);
2064 >        final FailingRunnable r3 = new FailingRunnable(m);
2065 >
2066 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2067 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2068 >        final Integer w1 =  fFirst ? v1 : v2;
2069 >        final Integer w2 = !fFirst ? v1 : v2;
2070 >
2071 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2072 >        assertTrue(fst.complete(w1));
2073 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2074 >        assertTrue(snd.complete(w2));
2075 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2076 >
2077 >        checkCompletedWithWrappedCFException(h1);
2078 >        checkCompletedWithWrappedCFException(h2);
2079 >        checkCompletedWithWrappedCFException(h3);
2080 >        r1.assertInvoked();
2081 >        r2.assertInvoked();
2082 >        r3.assertInvoked();
2083          checkCompletedNormally(f, v1);
2084 <        }
2085 <    }
1963 <
1964 <    public void testRunAfterBoth_sourceCancelled4() {
1965 <        for (ExecutionMode m : ExecutionMode.values())
1966 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1967 <        for (Integer v1 : new Integer[] { 1, null }) {
1968 <
1969 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1970 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1971 <        final Noop r = new Noop();
1972 <
1973 <        assertTrue(f.cancel(mayInterruptIfRunning));
1974 <        g.complete(v1);
1975 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1976 <
1977 <        checkCompletedWithWrappedCancellationException(h);
1978 <        checkCancelled(f);
1979 <        assertEquals(0, r.invocationCount);
1980 <        checkCompletedNormally(g, v1);
1981 <        }
1982 <    }
2084 >        checkCompletedNormally(g, v2);
2085 >    }}
2086  
2087      /**
2088       * applyToEither result completes normally after normal completion
2089       * of either source
2090       */
2091 <    public void testApplyToEither_normalCompletion1() {
1989 <        for (ExecutionMode m : ExecutionMode.values())
1990 <        for (Integer v1 : new Integer[] { 1, null })
1991 <        for (Integer v2 : new Integer[] { 2, null }) {
1992 <
1993 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1994 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1995 <        final IncFunction r = new IncFunction();
1996 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1997 <
1998 <        f.complete(v1);
1999 <        checkCompletedNormally(h, inc(v1));
2000 <        g.complete(v2);
2001 <
2002 <        checkCompletedNormally(f, v1);
2003 <        checkCompletedNormally(g, v2);
2004 <        checkCompletedNormally(h, inc(v1));
2005 <        }
2006 <    }
2007 <
2008 <    public void testApplyToEither_normalCompletion2() {
2091 >    public void testApplyToEither_normalCompletion() {
2092          for (ExecutionMode m : ExecutionMode.values())
2093          for (Integer v1 : new Integer[] { 1, null })
2094 <        for (Integer v2 : new Integer[] { 2, null }) {
2095 <
2013 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2014 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2015 <        final IncFunction r = new IncFunction();
2016 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2017 <
2018 <        g.complete(v2);
2019 <        checkCompletedNormally(h, inc(v2));
2020 <        f.complete(v1);
2021 <
2022 <        checkCompletedNormally(f, v1);
2023 <        checkCompletedNormally(g, v2);
2024 <        checkCompletedNormally(h, inc(v2));
2025 <        }
2026 <    }
2027 <    public void testApplyToEither_normalCompletion3() {
2028 <        for (ExecutionMode m : ExecutionMode.values())
2029 <        for (Integer v1 : new Integer[] { 1, null })
2030 <        for (Integer v2 : new Integer[] { 2, null }) {
2031 <
2094 >        for (Integer v2 : new Integer[] { 2, null })
2095 >    {
2096          final CompletableFuture<Integer> f = new CompletableFuture<>();
2097          final CompletableFuture<Integer> g = new CompletableFuture<>();
2098 <        final IncFunction r = new IncFunction();
2098 >        final IncFunction[] rs = new IncFunction[6];
2099 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2100  
2101 <        f.complete(v1);
2102 <        g.complete(v2);
2103 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2101 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2102 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2103 >        checkIncomplete(h0);
2104 >        checkIncomplete(h1);
2105 >        rs[0].assertNotInvoked();
2106 >        rs[1].assertNotInvoked();
2107 >        f.complete(v1);
2108 >        checkCompletedNormally(h0, inc(v1));
2109 >        checkCompletedNormally(h1, inc(v1));
2110 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2111 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2112 >        checkCompletedNormally(h2, inc(v1));
2113 >        checkCompletedNormally(h3, inc(v1));
2114 >        g.complete(v2);
2115 >
2116 >        // unspecified behavior - both source completions available
2117 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2118 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2119 >        rs[4].assertValue(h4.join());
2120 >        rs[5].assertValue(h5.join());
2121 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2122 >                   Objects.equals(inc(v2), h4.join()));
2123 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2124 >                   Objects.equals(inc(v2), h5.join()));
2125  
2126          checkCompletedNormally(f, v1);
2127          checkCompletedNormally(g, v2);
2128 <
2129 <        // unspecified behavior
2130 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2131 <                   Objects.equals(h.join(), inc(v2)));
2132 <        assertEquals(1, r.invocationCount);
2133 <        }
2048 <    }
2128 >        checkCompletedNormally(h0, inc(v1));
2129 >        checkCompletedNormally(h1, inc(v1));
2130 >        checkCompletedNormally(h2, inc(v1));
2131 >        checkCompletedNormally(h3, inc(v1));
2132 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2133 >    }}
2134  
2135      /**
2136       * applyToEither result completes exceptionally after exceptional
2137       * completion of either source
2138       */
2139 <    public void testApplyToEither_exceptionalCompletion1() {
2139 >    public void testApplyToEither_exceptionalCompletion() {
2140          for (ExecutionMode m : ExecutionMode.values())
2141 <        for (Integer v1 : new Integer[] { 1, null }) {
2142 <
2141 >        for (Integer v1 : new Integer[] { 1, null })
2142 >    {
2143          final CompletableFuture<Integer> f = new CompletableFuture<>();
2144          final CompletableFuture<Integer> g = new CompletableFuture<>();
2060        final IncFunction r = new IncFunction();
2061        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2145          final CFException ex = new CFException();
2146 +        final IncFunction[] rs = new IncFunction[6];
2147 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2148  
2149 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2150 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2151 +        checkIncomplete(h0);
2152 +        checkIncomplete(h1);
2153 +        rs[0].assertNotInvoked();
2154 +        rs[1].assertNotInvoked();
2155          f.completeExceptionally(ex);
2156 <        checkCompletedWithWrappedCFException(h, ex);
2156 >        checkCompletedWithWrappedException(h0, ex);
2157 >        checkCompletedWithWrappedException(h1, ex);
2158 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2159 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2160 >        checkCompletedWithWrappedException(h2, ex);
2161 >        checkCompletedWithWrappedException(h3, ex);
2162          g.complete(v1);
2163  
2164 <        assertEquals(0, r.invocationCount);
2165 <        checkCompletedNormally(g, v1);
2166 <        checkCompletedWithWrappedCFException(f, ex);
2167 <        checkCompletedWithWrappedCFException(h, ex);
2168 <        }
2169 <    }
2170 <
2171 <    public void testApplyToEither_exceptionalCompletion2() {
2172 <        for (ExecutionMode m : ExecutionMode.values())
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);
2083 <        final CFException ex = new CFException();
2084 <
2085 <        g.completeExceptionally(ex);
2086 <        checkCompletedWithWrappedCFException(h, ex);
2087 <        f.complete(v1);
2088 <
2089 <        assertEquals(0, r.invocationCount);
2090 <        checkCompletedNormally(f, v1);
2091 <        checkCompletedWithWrappedCFException(g, ex);
2092 <        checkCompletedWithWrappedCFException(h, ex);
2164 >        // unspecified behavior - both source completions available
2165 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2166 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2167 >        try {
2168 >            assertEquals(inc(v1), h4.join());
2169 >            rs[4].assertValue(inc(v1));
2170 >        } catch (CompletionException ok) {
2171 >            checkCompletedWithWrappedException(h4, ex);
2172 >            rs[4].assertNotInvoked();
2173          }
2094    }
2095
2096    public void testApplyToEither_exceptionalCompletion3() {
2097        for (ExecutionMode m : ExecutionMode.values())
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        final CFException ex = new CFException();
2104
2105        g.completeExceptionally(ex);
2106        f.complete(v1);
2107        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2108
2109        // unspecified behavior
2110        Integer v;
2174          try {
2175 <            assertEquals(inc(v1), h.join());
2176 <            assertEquals(1, r.invocationCount);
2175 >            assertEquals(inc(v1), h5.join());
2176 >            rs[5].assertValue(inc(v1));
2177          } catch (CompletionException ok) {
2178 <            checkCompletedWithWrappedCFException(h, ex);
2179 <            assertEquals(0, r.invocationCount);
2178 >            checkCompletedWithWrappedException(h5, ex);
2179 >            rs[5].assertNotInvoked();
2180          }
2181  
2182 <        checkCompletedWithWrappedCFException(g, ex);
2183 <        checkCompletedNormally(f, v1);
2184 <        }
2185 <    }
2182 >        checkCompletedExceptionally(f, ex);
2183 >        checkCompletedNormally(g, v1);
2184 >        checkCompletedWithWrappedException(h0, ex);
2185 >        checkCompletedWithWrappedException(h1, ex);
2186 >        checkCompletedWithWrappedException(h2, ex);
2187 >        checkCompletedWithWrappedException(h3, ex);
2188 >        checkCompletedWithWrappedException(h4, ex);
2189 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2190 >    }}
2191  
2192 <    public void testApplyToEither_exceptionalCompletion4() {
2192 >    public void testApplyToEither_exceptionalCompletion2() {
2193          for (ExecutionMode m : ExecutionMode.values())
2194 <        for (Integer v1 : new Integer[] { 1, null }) {
2195 <
2194 >        for (boolean fFirst : new boolean[] { true, false })
2195 >        for (Integer v1 : new Integer[] { 1, null })
2196 >    {
2197          final CompletableFuture<Integer> f = new CompletableFuture<>();
2198          final CompletableFuture<Integer> g = new CompletableFuture<>();
2130        final IncFunction r = new IncFunction();
2199          final CFException ex = new CFException();
2200 +        final IncFunction[] rs = new IncFunction[6];
2201 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2202  
2203 <        f.completeExceptionally(ex);
2204 <        g.complete(v1);
2205 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2203 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2204 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2205 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2206 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2207 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2208 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2209  
2210 <        // unspecified behavior
2138 <        Integer v;
2210 >        // unspecified behavior - both source completions available
2211          try {
2212 <            assertEquals(inc(v1), h.join());
2213 <            assertEquals(1, r.invocationCount);
2212 >            assertEquals(inc(v1), h0.join());
2213 >            rs[0].assertValue(inc(v1));
2214          } catch (CompletionException ok) {
2215 <            checkCompletedWithWrappedCFException(h, ex);
2216 <            assertEquals(0, r.invocationCount);
2215 >            checkCompletedWithWrappedException(h0, ex);
2216 >            rs[0].assertNotInvoked();
2217          }
2218 <
2219 <        checkCompletedWithWrappedCFException(f, ex);
2220 <        checkCompletedNormally(g, v1);
2218 >        try {
2219 >            assertEquals(inc(v1), h1.join());
2220 >            rs[1].assertValue(inc(v1));
2221 >        } catch (CompletionException ok) {
2222 >            checkCompletedWithWrappedException(h1, ex);
2223 >            rs[1].assertNotInvoked();
2224          }
2225 <    }
2226 <
2227 <    /**
2228 <     * applyToEither result completes exceptionally if action does
2229 <     */
2230 <    public void testApplyToEither_actionFailed1() {
2231 <        for (ExecutionMode m : ExecutionMode.values())
2232 <        for (Integer v1 : new Integer[] { 1, null })
2233 <        for (Integer v2 : new Integer[] { 2, null }) {
2234 <
2235 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2236 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2237 <        final FailingFunction r = new FailingFunction();
2163 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2164 <
2165 <        f.complete(v1);
2166 <        checkCompletedWithWrappedCFException(h);
2167 <        g.complete(v2);
2168 <        checkCompletedNormally(f, v1);
2169 <        checkCompletedNormally(g, v2);
2225 >        try {
2226 >            assertEquals(inc(v1), h2.join());
2227 >            rs[2].assertValue(inc(v1));
2228 >        } catch (CompletionException ok) {
2229 >            checkCompletedWithWrappedException(h2, ex);
2230 >            rs[2].assertNotInvoked();
2231 >        }
2232 >        try {
2233 >            assertEquals(inc(v1), h3.join());
2234 >            rs[3].assertValue(inc(v1));
2235 >        } catch (CompletionException ok) {
2236 >            checkCompletedWithWrappedException(h3, ex);
2237 >            rs[3].assertNotInvoked();
2238          }
2171    }
2172
2173    public void testApplyToEither_actionFailed2() {
2174        for (ExecutionMode m : ExecutionMode.values())
2175        for (Integer v1 : new Integer[] { 1, null })
2176        for (Integer v2 : new Integer[] { 2, null }) {
2177
2178        final CompletableFuture<Integer> f = new CompletableFuture<>();
2179        final CompletableFuture<Integer> g = new CompletableFuture<>();
2180        final FailingFunction r = new FailingFunction();
2181        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2239  
2183        g.complete(v2);
2184        checkCompletedWithWrappedCFException(h);
2185        f.complete(v1);
2240          checkCompletedNormally(f, v1);
2241 <        checkCompletedNormally(g, v2);
2242 <        }
2189 <    }
2241 >        checkCompletedExceptionally(g, ex);
2242 >    }}
2243  
2244      /**
2245       * applyToEither result completes exceptionally if either source cancelled
2246       */
2247 <    public void testApplyToEither_sourceCancelled1() {
2247 >    public void testApplyToEither_sourceCancelled() {
2248          for (ExecutionMode m : ExecutionMode.values())
2249          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2250 <        for (Integer v1 : new Integer[] { 1, null }) {
2251 <
2250 >        for (Integer v1 : new Integer[] { 1, null })
2251 >    {
2252          final CompletableFuture<Integer> f = new CompletableFuture<>();
2253          final CompletableFuture<Integer> g = new CompletableFuture<>();
2254 <        final IncFunction r = new IncFunction();
2255 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2254 >        final IncFunction[] rs = new IncFunction[6];
2255 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2256  
2257 <        assertTrue(f.cancel(mayInterruptIfRunning));
2258 <        checkCompletedWithWrappedCancellationException(h);
2259 <        g.complete(v1);
2257 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2258 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2259 >        checkIncomplete(h0);
2260 >        checkIncomplete(h1);
2261 >        rs[0].assertNotInvoked();
2262 >        rs[1].assertNotInvoked();
2263 >        f.cancel(mayInterruptIfRunning);
2264 >        checkCompletedWithWrappedCancellationException(h0);
2265 >        checkCompletedWithWrappedCancellationException(h1);
2266 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2267 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2268 >        checkCompletedWithWrappedCancellationException(h2);
2269 >        checkCompletedWithWrappedCancellationException(h3);
2270 >        g.complete(v1);
2271 >
2272 >        // unspecified behavior - both source completions available
2273 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2274 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2275 >        try {
2276 >            assertEquals(inc(v1), h4.join());
2277 >            rs[4].assertValue(inc(v1));
2278 >        } catch (CompletionException ok) {
2279 >            checkCompletedWithWrappedCancellationException(h4);
2280 >            rs[4].assertNotInvoked();
2281 >        }
2282 >        try {
2283 >            assertEquals(inc(v1), h5.join());
2284 >            rs[5].assertValue(inc(v1));
2285 >        } catch (CompletionException ok) {
2286 >            checkCompletedWithWrappedCancellationException(h5);
2287 >            rs[5].assertNotInvoked();
2288 >        }
2289  
2290          checkCancelled(f);
2209        assertEquals(0, r.invocationCount);
2291          checkCompletedNormally(g, v1);
2292 <        checkCompletedWithWrappedCancellationException(h);
2293 <        }
2294 <    }
2292 >        checkCompletedWithWrappedCancellationException(h0);
2293 >        checkCompletedWithWrappedCancellationException(h1);
2294 >        checkCompletedWithWrappedCancellationException(h2);
2295 >        checkCompletedWithWrappedCancellationException(h3);
2296 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2297 >    }}
2298  
2299      public void testApplyToEither_sourceCancelled2() {
2300          for (ExecutionMode m : ExecutionMode.values())
2301          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2302 <        for (Integer v1 : new Integer[] { 1, null }) {
2303 <
2302 >        for (boolean fFirst : new boolean[] { true, false })
2303 >        for (Integer v1 : new Integer[] { 1, null })
2304 >    {
2305          final CompletableFuture<Integer> f = new CompletableFuture<>();
2306          final CompletableFuture<Integer> g = new CompletableFuture<>();
2307 <        final IncFunction r = new IncFunction();
2308 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2307 >        final IncFunction[] rs = new IncFunction[6];
2308 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2309  
2310 <        assertTrue(g.cancel(mayInterruptIfRunning));
2311 <        checkCompletedWithWrappedCancellationException(h);
2312 <        f.complete(v1);
2310 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2311 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2312 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2313 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2314 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2315 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2316  
2317 <        checkCancelled(g);
2318 <        assertEquals(0, r.invocationCount);
2319 <        checkCompletedNormally(f, v1);
2320 <        checkCompletedWithWrappedCancellationException(h);
2317 >        // unspecified behavior - both source completions available
2318 >        try {
2319 >            assertEquals(inc(v1), h0.join());
2320 >            rs[0].assertValue(inc(v1));
2321 >        } catch (CompletionException ok) {
2322 >            checkCompletedWithWrappedCancellationException(h0);
2323 >            rs[0].assertNotInvoked();
2324          }
2234    }
2235
2236    public void testApplyToEither_sourceCancelled3() {
2237        for (ExecutionMode m : ExecutionMode.values())
2238        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2239        for (Integer v1 : new Integer[] { 1, null }) {
2240
2241        final CompletableFuture<Integer> f = new CompletableFuture<>();
2242        final CompletableFuture<Integer> g = new CompletableFuture<>();
2243        final IncFunction r = new IncFunction();
2244
2245        assertTrue(g.cancel(mayInterruptIfRunning));
2246        f.complete(v1);
2247        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2248
2249        // unspecified behavior
2250        Integer v;
2325          try {
2326 <            assertEquals(inc(v1), h.join());
2327 <            assertEquals(1, r.invocationCount);
2326 >            assertEquals(inc(v1), h1.join());
2327 >            rs[1].assertValue(inc(v1));
2328          } catch (CompletionException ok) {
2329 <            checkCompletedWithWrappedCancellationException(h);
2330 <            assertEquals(0, r.invocationCount);
2329 >            checkCompletedWithWrappedCancellationException(h1);
2330 >            rs[1].assertNotInvoked();
2331          }
2332 <
2333 <        checkCancelled(g);
2334 <        checkCompletedNormally(f, v1);
2332 >        try {
2333 >            assertEquals(inc(v1), h2.join());
2334 >            rs[2].assertValue(inc(v1));
2335 >        } catch (CompletionException ok) {
2336 >            checkCompletedWithWrappedCancellationException(h2);
2337 >            rs[2].assertNotInvoked();
2338          }
2262    }
2263
2264    public void testApplyToEither_sourceCancelled4() {
2265        for (ExecutionMode m : ExecutionMode.values())
2266        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 IncFunction r = new IncFunction();
2272
2273        assertTrue(f.cancel(mayInterruptIfRunning));
2274        g.complete(v1);
2275        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2276
2277        // unspecified behavior
2278        Integer v;
2339          try {
2340 <            assertEquals(inc(v1), h.join());
2341 <            assertEquals(1, r.invocationCount);
2340 >            assertEquals(inc(v1), h3.join());
2341 >            rs[3].assertValue(inc(v1));
2342          } catch (CompletionException ok) {
2343 <            checkCompletedWithWrappedCancellationException(h);
2344 <            assertEquals(0, r.invocationCount);
2343 >            checkCompletedWithWrappedCancellationException(h3);
2344 >            rs[3].assertNotInvoked();
2345          }
2346  
2347 <        checkCancelled(f);
2348 <        checkCompletedNormally(g, v1);
2349 <        }
2290 <    }
2347 >        checkCompletedNormally(f, v1);
2348 >        checkCancelled(g);
2349 >    }}
2350  
2351      /**
2352 <     * acceptEither result completes normally after normal completion
2294 <     * of either source
2352 >     * applyToEither result completes exceptionally if action does
2353       */
2354 <    public void testAcceptEither_normalCompletion1() {
2354 >    public void testApplyToEither_actionFailed() {
2355          for (ExecutionMode m : ExecutionMode.values())
2356          for (Integer v1 : new Integer[] { 1, null })
2357 <        for (Integer v2 : new Integer[] { 2, null }) {
2358 <
2357 >        for (Integer v2 : new Integer[] { 2, null })
2358 >    {
2359          final CompletableFuture<Integer> f = new CompletableFuture<>();
2360          final CompletableFuture<Integer> g = new CompletableFuture<>();
2361 <        final IncAction r = new IncAction();
2362 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2361 >        final FailingFunction[] rs = new FailingFunction[6];
2362 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2363  
2364 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2365 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2366          f.complete(v1);
2367 <        checkCompletedNormally(h, null);
2368 <        assertEquals(inc(v1), r.value);
2369 <        g.complete(v2);
2370 <
2371 <        checkCompletedNormally(f, v1);
2372 <        checkCompletedNormally(g, v2);
2373 <        checkCompletedNormally(h, null);
2314 <        }
2315 <    }
2316 <
2317 <    public void testAcceptEither_normalCompletion2() {
2318 <        for (ExecutionMode m : ExecutionMode.values())
2319 <        for (Integer v1 : new Integer[] { 1, null })
2320 <        for (Integer v2 : new Integer[] { 2, null }) {
2321 <
2322 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2323 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 <        final IncAction r = new IncAction();
2325 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2367 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2368 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2369 >        checkCompletedWithWrappedCFException(h0);
2370 >        checkCompletedWithWrappedCFException(h1);
2371 >        checkCompletedWithWrappedCFException(h2);
2372 >        checkCompletedWithWrappedCFException(h3);
2373 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2374  
2375          g.complete(v2);
2376 <        checkCompletedNormally(h, null);
2377 <        assertEquals(inc(v2), r.value);
2378 <        f.complete(v1);
2376 >
2377 >        // unspecified behavior - both source completions available
2378 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2379 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2380 >
2381 >        checkCompletedWithWrappedCFException(h4);
2382 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2383 >                   Objects.equals(v2, rs[4].value));
2384 >        checkCompletedWithWrappedCFException(h5);
2385 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2386 >                   Objects.equals(v2, rs[5].value));
2387  
2388          checkCompletedNormally(f, v1);
2389          checkCompletedNormally(g, v2);
2390 <        checkCompletedNormally(h, null);
2391 <        }
2392 <    }
2393 <    public void testAcceptEither_normalCompletion3() {
2390 >    }}
2391 >
2392 >    /**
2393 >     * acceptEither result completes normally after normal completion
2394 >     * of either source
2395 >     */
2396 >    public void testAcceptEither_normalCompletion() {
2397          for (ExecutionMode m : ExecutionMode.values())
2398          for (Integer v1 : new Integer[] { 1, null })
2399 <        for (Integer v2 : new Integer[] { 2, null }) {
2400 <
2399 >        for (Integer v2 : new Integer[] { 2, null })
2400 >    {
2401          final CompletableFuture<Integer> f = new CompletableFuture<>();
2402          final CompletableFuture<Integer> g = new CompletableFuture<>();
2403 <        final IncAction r = new IncAction();
2403 >        final NoopConsumer[] rs = new NoopConsumer[6];
2404 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2405  
2406 <        f.complete(v1);
2407 <        g.complete(v2);
2408 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2406 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2407 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2408 >        checkIncomplete(h0);
2409 >        checkIncomplete(h1);
2410 >        rs[0].assertNotInvoked();
2411 >        rs[1].assertNotInvoked();
2412 >        f.complete(v1);
2413 >        checkCompletedNormally(h0, null);
2414 >        checkCompletedNormally(h1, null);
2415 >        rs[0].assertValue(v1);
2416 >        rs[1].assertValue(v1);
2417 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2418 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2419 >        checkCompletedNormally(h2, null);
2420 >        checkCompletedNormally(h3, null);
2421 >        rs[2].assertValue(v1);
2422 >        rs[3].assertValue(v1);
2423 >        g.complete(v2);
2424 >
2425 >        // unspecified behavior - both source completions available
2426 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2427 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2428 >        checkCompletedNormally(h4, null);
2429 >        checkCompletedNormally(h5, null);
2430 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2431 >                   Objects.equals(v2, rs[4].value));
2432 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2433 >                   Objects.equals(v2, rs[5].value));
2434  
2350        checkCompletedNormally(h, null);
2435          checkCompletedNormally(f, v1);
2436          checkCompletedNormally(g, v2);
2437 <
2438 <        // unspecified behavior
2439 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2440 <                   Objects.equals(r.value, inc(v2)));
2441 <        }
2442 <    }
2437 >        checkCompletedNormally(h0, null);
2438 >        checkCompletedNormally(h1, null);
2439 >        checkCompletedNormally(h2, null);
2440 >        checkCompletedNormally(h3, null);
2441 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2442 >    }}
2443  
2444      /**
2445       * acceptEither result completes exceptionally after exceptional
2446       * completion of either source
2447       */
2448 <    public void testAcceptEither_exceptionalCompletion1() {
2448 >    public void testAcceptEither_exceptionalCompletion() {
2449          for (ExecutionMode m : ExecutionMode.values())
2450 <        for (Integer v1 : new Integer[] { 1, null }) {
2451 <
2450 >        for (Integer v1 : new Integer[] { 1, null })
2451 >    {
2452          final CompletableFuture<Integer> f = new CompletableFuture<>();
2453          final CompletableFuture<Integer> g = new CompletableFuture<>();
2370        final IncAction r = new IncAction();
2371        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2454          final CFException ex = new CFException();
2455 +        final NoopConsumer[] rs = new NoopConsumer[6];
2456 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2457  
2458 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2459 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2460 +        checkIncomplete(h0);
2461 +        checkIncomplete(h1);
2462 +        rs[0].assertNotInvoked();
2463 +        rs[1].assertNotInvoked();
2464          f.completeExceptionally(ex);
2465 <        checkCompletedWithWrappedCFException(h, ex);
2466 <        g.complete(v1);
2467 <
2468 <        assertEquals(0, r.invocationCount);
2469 <        checkCompletedNormally(g, v1);
2470 <        checkCompletedWithWrappedCFException(f, ex);
2381 <        checkCompletedWithWrappedCFException(h, ex);
2382 <        }
2383 <    }
2384 <
2385 <    public void testAcceptEither_exceptionalCompletion2() {
2386 <        for (ExecutionMode m : ExecutionMode.values())
2387 <        for (Integer v1 : new Integer[] { 1, null }) {
2465 >        checkCompletedWithWrappedException(h0, ex);
2466 >        checkCompletedWithWrappedException(h1, ex);
2467 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2468 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2469 >        checkCompletedWithWrappedException(h2, ex);
2470 >        checkCompletedWithWrappedException(h3, ex);
2471  
2472 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2390 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final IncAction r = new IncAction();
2392 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2393 <        final CFException ex = new CFException();
2394 <
2395 <        g.completeExceptionally(ex);
2396 <        checkCompletedWithWrappedCFException(h, ex);
2397 <        f.complete(v1);
2472 >        g.complete(v1);
2473  
2474 <        assertEquals(0, r.invocationCount);
2475 <        checkCompletedNormally(f, v1);
2476 <        checkCompletedWithWrappedCFException(g, ex);
2477 <        checkCompletedWithWrappedCFException(h, ex);
2474 >        // unspecified behavior - both source completions available
2475 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2476 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2477 >        try {
2478 >            assertNull(h4.join());
2479 >            rs[4].assertValue(v1);
2480 >        } catch (CompletionException ok) {
2481 >            checkCompletedWithWrappedException(h4, ex);
2482 >            rs[4].assertNotInvoked();
2483          }
2404    }
2405
2406    public void testAcceptEither_exceptionalCompletion3() {
2407        for (ExecutionMode m : ExecutionMode.values())
2408        for (Integer v1 : new Integer[] { 1, null }) {
2409
2410        final CompletableFuture<Integer> f = new CompletableFuture<>();
2411        final CompletableFuture<Integer> g = new CompletableFuture<>();
2412        final IncAction r = new IncAction();
2413        final CFException ex = new CFException();
2414
2415        g.completeExceptionally(ex);
2416        f.complete(v1);
2417        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2418
2419        // unspecified behavior
2420        Integer v;
2484          try {
2485 <            assertNull(h.join());
2486 <            assertEquals(1, r.invocationCount);
2424 <            assertEquals(inc(v1), r.value);
2485 >            assertNull(h5.join());
2486 >            rs[5].assertValue(v1);
2487          } catch (CompletionException ok) {
2488 <            checkCompletedWithWrappedCFException(h, ex);
2489 <            assertEquals(0, r.invocationCount);
2488 >            checkCompletedWithWrappedException(h5, ex);
2489 >            rs[5].assertNotInvoked();
2490          }
2491  
2492 <        checkCompletedWithWrappedCFException(g, ex);
2493 <        checkCompletedNormally(f, v1);
2494 <        }
2495 <    }
2492 >        checkCompletedExceptionally(f, ex);
2493 >        checkCompletedNormally(g, v1);
2494 >        checkCompletedWithWrappedException(h0, ex);
2495 >        checkCompletedWithWrappedException(h1, ex);
2496 >        checkCompletedWithWrappedException(h2, ex);
2497 >        checkCompletedWithWrappedException(h3, ex);
2498 >        checkCompletedWithWrappedException(h4, ex);
2499 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2500 >    }}
2501  
2502 <    public void testAcceptEither_exceptionalCompletion4() {
2502 >    public void testAcceptEither_exceptionalCompletion2() {
2503          for (ExecutionMode m : ExecutionMode.values())
2504 <        for (Integer v1 : new Integer[] { 1, null }) {
2505 <
2504 >        for (boolean fFirst : new boolean[] { true, false })
2505 >        for (Integer v1 : new Integer[] { 1, null })
2506 >    {
2507          final CompletableFuture<Integer> f = new CompletableFuture<>();
2508          final CompletableFuture<Integer> g = new CompletableFuture<>();
2441        final IncAction r = new IncAction();
2509          final CFException ex = new CFException();
2510 +        final NoopConsumer[] rs = new NoopConsumer[6];
2511 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2512  
2513 <        f.completeExceptionally(ex);
2514 <        g.complete(v1);
2515 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2513 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2514 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2515 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2516 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2517 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2518 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2519  
2520 <        // unspecified behavior
2449 <        Integer v;
2520 >        // unspecified behavior - both source completions available
2521          try {
2522 <            assertNull(h.join());
2523 <            assertEquals(1, r.invocationCount);
2453 <            assertEquals(inc(v1), r.value);
2522 >            assertEquals(null, h0.join());
2523 >            rs[0].assertValue(v1);
2524          } catch (CompletionException ok) {
2525 <            checkCompletedWithWrappedCFException(h, ex);
2526 <            assertEquals(0, r.invocationCount);
2525 >            checkCompletedWithWrappedException(h0, ex);
2526 >            rs[0].assertNotInvoked();
2527          }
2528 <
2529 <        checkCompletedWithWrappedCFException(f, ex);
2530 <        checkCompletedNormally(g, v1);
2528 >        try {
2529 >            assertEquals(null, h1.join());
2530 >            rs[1].assertValue(v1);
2531 >        } catch (CompletionException ok) {
2532 >            checkCompletedWithWrappedException(h1, ex);
2533 >            rs[1].assertNotInvoked();
2534          }
2535 <    }
2536 <
2537 <    /**
2538 <     * acceptEither result completes exceptionally if action does
2539 <     */
2540 <    public void testAcceptEither_actionFailed1() {
2541 <        for (ExecutionMode m : ExecutionMode.values())
2542 <        for (Integer v1 : new Integer[] { 1, null })
2543 <        for (Integer v2 : new Integer[] { 2, null }) {
2544 <
2545 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2546 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2547 <        final FailingConsumer r = new FailingConsumer();
2475 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2476 <
2477 <        f.complete(v1);
2478 <        checkCompletedWithWrappedCFException(h);
2479 <        g.complete(v2);
2480 <        checkCompletedNormally(f, v1);
2481 <        checkCompletedNormally(g, v2);
2535 >        try {
2536 >            assertEquals(null, h2.join());
2537 >            rs[2].assertValue(v1);
2538 >        } catch (CompletionException ok) {
2539 >            checkCompletedWithWrappedException(h2, ex);
2540 >            rs[2].assertNotInvoked();
2541 >        }
2542 >        try {
2543 >            assertEquals(null, h3.join());
2544 >            rs[3].assertValue(v1);
2545 >        } catch (CompletionException ok) {
2546 >            checkCompletedWithWrappedException(h3, ex);
2547 >            rs[3].assertNotInvoked();
2548          }
2483    }
2484
2485    public void testAcceptEither_actionFailed2() {
2486        for (ExecutionMode m : ExecutionMode.values())
2487        for (Integer v1 : new Integer[] { 1, null })
2488        for (Integer v2 : new Integer[] { 2, null }) {
2489
2490        final CompletableFuture<Integer> f = new CompletableFuture<>();
2491        final CompletableFuture<Integer> g = new CompletableFuture<>();
2492        final FailingConsumer r = new FailingConsumer();
2493        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2549  
2495        g.complete(v2);
2496        checkCompletedWithWrappedCFException(h);
2497        f.complete(v1);
2550          checkCompletedNormally(f, v1);
2551 <        checkCompletedNormally(g, v2);
2552 <        }
2501 <    }
2551 >        checkCompletedExceptionally(g, ex);
2552 >    }}
2553  
2554      /**
2555       * acceptEither result completes exceptionally if either source cancelled
2556       */
2557 <    public void testAcceptEither_sourceCancelled1() {
2557 >    public void testAcceptEither_sourceCancelled() {
2558          for (ExecutionMode m : ExecutionMode.values())
2559          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2560 <        for (Integer v1 : new Integer[] { 1, null }) {
2561 <
2511 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2512 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2513 <        final IncAction r = new IncAction();
2514 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2515 <
2516 <        assertTrue(f.cancel(mayInterruptIfRunning));
2517 <        checkCompletedWithWrappedCancellationException(h);
2518 <        g.complete(v1);
2519 <
2520 <        checkCancelled(f);
2521 <        assertEquals(0, r.invocationCount);
2522 <        checkCompletedNormally(g, v1);
2523 <        checkCompletedWithWrappedCancellationException(h);
2524 <        }
2525 <    }
2526 <
2527 <    public void testAcceptEither_sourceCancelled2() {
2528 <        for (ExecutionMode m : ExecutionMode.values())
2529 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2530 <        for (Integer v1 : new Integer[] { 1, null }) {
2531 <
2560 >        for (Integer v1 : new Integer[] { 1, null })
2561 >    {
2562          final CompletableFuture<Integer> f = new CompletableFuture<>();
2563          final CompletableFuture<Integer> g = new CompletableFuture<>();
2564 <        final IncAction r = new IncAction();
2565 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2536 <
2537 <        assertTrue(g.cancel(mayInterruptIfRunning));
2538 <        checkCompletedWithWrappedCancellationException(h);
2539 <        f.complete(v1);
2540 <
2541 <        checkCancelled(g);
2542 <        assertEquals(0, r.invocationCount);
2543 <        checkCompletedNormally(f, v1);
2544 <        checkCompletedWithWrappedCancellationException(h);
2545 <        }
2546 <    }
2547 <
2548 <    public void testAcceptEither_sourceCancelled3() {
2549 <        for (ExecutionMode m : ExecutionMode.values())
2550 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2551 <        for (Integer v1 : new Integer[] { 1, null }) {
2564 >        final NoopConsumer[] rs = new NoopConsumer[6];
2565 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2566  
2567 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2568 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2569 <        final IncAction r = new IncAction();
2567 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2568 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2569 >        checkIncomplete(h0);
2570 >        checkIncomplete(h1);
2571 >        rs[0].assertNotInvoked();
2572 >        rs[1].assertNotInvoked();
2573 >        f.cancel(mayInterruptIfRunning);
2574 >        checkCompletedWithWrappedCancellationException(h0);
2575 >        checkCompletedWithWrappedCancellationException(h1);
2576 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2577 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2578 >        checkCompletedWithWrappedCancellationException(h2);
2579 >        checkCompletedWithWrappedCancellationException(h3);
2580  
2581 <        assertTrue(g.cancel(mayInterruptIfRunning));
2558 <        f.complete(v1);
2559 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2581 >        g.complete(v1);
2582  
2583 <        // unspecified behavior
2584 <        Integer v;
2583 >        // unspecified behavior - both source completions available
2584 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2585 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2586          try {
2587 <            assertNull(h.join());
2588 <            assertEquals(1, r.invocationCount);
2566 <            assertEquals(inc(v1), r.value);
2587 >            assertNull(h4.join());
2588 >            rs[4].assertValue(v1);
2589          } catch (CompletionException ok) {
2590 <            checkCompletedWithWrappedCancellationException(h);
2591 <            assertEquals(0, r.invocationCount);
2590 >            checkCompletedWithWrappedCancellationException(h4);
2591 >            rs[4].assertNotInvoked();
2592          }
2571
2572        checkCancelled(g);
2573        checkCompletedNormally(f, v1);
2574        }
2575    }
2576
2577    public void testAcceptEither_sourceCancelled4() {
2578        for (ExecutionMode m : ExecutionMode.values())
2579        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2580        for (Integer v1 : new Integer[] { 1, null }) {
2581
2582        final CompletableFuture<Integer> f = new CompletableFuture<>();
2583        final CompletableFuture<Integer> g = new CompletableFuture<>();
2584        final IncAction r = new IncAction();
2585
2586        assertTrue(f.cancel(mayInterruptIfRunning));
2587        g.complete(v1);
2588        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2589
2590        // unspecified behavior
2591        Integer v;
2593          try {
2594 <            assertNull(h.join());
2595 <            assertEquals(1, r.invocationCount);
2595 <            assertEquals(inc(v1), r.value);
2594 >            assertNull(h5.join());
2595 >            rs[5].assertValue(v1);
2596          } catch (CompletionException ok) {
2597 <            checkCompletedWithWrappedCancellationException(h);
2598 <            assertEquals(0, r.invocationCount);
2597 >            checkCompletedWithWrappedCancellationException(h5);
2598 >            rs[5].assertNotInvoked();
2599          }
2600  
2601          checkCancelled(f);
2602          checkCompletedNormally(g, v1);
2603 <        }
2604 <    }
2603 >        checkCompletedWithWrappedCancellationException(h0);
2604 >        checkCompletedWithWrappedCancellationException(h1);
2605 >        checkCompletedWithWrappedCancellationException(h2);
2606 >        checkCompletedWithWrappedCancellationException(h3);
2607 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2608 >    }}
2609  
2610      /**
2611 <     * runAfterEither result completes normally after normal completion
2608 <     * of either source
2611 >     * acceptEither result completes exceptionally if action does
2612       */
2613 <    public void testRunAfterEither_normalCompletion1() {
2613 >    public void testAcceptEither_actionFailed() {
2614          for (ExecutionMode m : ExecutionMode.values())
2615          for (Integer v1 : new Integer[] { 1, null })
2616 <        for (Integer v2 : new Integer[] { 2, null }) {
2617 <
2616 >        for (Integer v2 : new Integer[] { 2, null })
2617 >    {
2618          final CompletableFuture<Integer> f = new CompletableFuture<>();
2619          final CompletableFuture<Integer> g = new CompletableFuture<>();
2620 <        final Noop r = new Noop();
2621 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2620 >        final FailingConsumer[] rs = new FailingConsumer[6];
2621 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2622  
2623 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2624 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2625          f.complete(v1);
2626 <        checkCompletedNormally(h, null);
2627 <        assertEquals(1, r.invocationCount);
2626 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2627 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2628 >        checkCompletedWithWrappedCFException(h0);
2629 >        checkCompletedWithWrappedCFException(h1);
2630 >        checkCompletedWithWrappedCFException(h2);
2631 >        checkCompletedWithWrappedCFException(h3);
2632 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2633 >
2634          g.complete(v2);
2635  
2636 +        // unspecified behavior - both source completions available
2637 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2638 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2639 +
2640 +        checkCompletedWithWrappedCFException(h4);
2641 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2642 +                   Objects.equals(v2, rs[4].value));
2643 +        checkCompletedWithWrappedCFException(h5);
2644 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2645 +                   Objects.equals(v2, rs[5].value));
2646 +
2647          checkCompletedNormally(f, v1);
2648          checkCompletedNormally(g, v2);
2649 <        checkCompletedNormally(h, null);
2628 <        assertEquals(1, r.invocationCount);
2629 <        }
2630 <    }
2649 >    }}
2650  
2651 <    public void testRunAfterEither_normalCompletion2() {
2651 >    /**
2652 >     * runAfterEither result completes normally after normal completion
2653 >     * of either source
2654 >     */
2655 >    public void testRunAfterEither_normalCompletion() {
2656          for (ExecutionMode m : ExecutionMode.values())
2657          for (Integer v1 : new Integer[] { 1, null })
2658 <        for (Integer v2 : new Integer[] { 2, null }) {
2659 <
2658 >        for (Integer v2 : new Integer[] { 2, null })
2659 >    {
2660          final CompletableFuture<Integer> f = new CompletableFuture<>();
2661          final CompletableFuture<Integer> g = new CompletableFuture<>();
2662 <        final Noop r = new Noop();
2663 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2641 <
2642 <        g.complete(v2);
2643 <        checkCompletedNormally(h, null);
2644 <        assertEquals(1, r.invocationCount);
2645 <        f.complete(v1);
2662 >        final Noop[] rs = new Noop[6];
2663 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2664  
2665 <        checkCompletedNormally(f, v1);
2666 <        checkCompletedNormally(g, v2);
2667 <        checkCompletedNormally(h, null);
2668 <        assertEquals(1, r.invocationCount);
2669 <        }
2670 <    }
2671 <    public void testRunAfterEither_normalCompletion3() {
2672 <        for (ExecutionMode m : ExecutionMode.values())
2673 <        for (Integer v1 : new Integer[] { 1, null })
2674 <        for (Integer v2 : new Integer[] { 2, null }) {
2665 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2666 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2667 >        checkIncomplete(h0);
2668 >        checkIncomplete(h1);
2669 >        rs[0].assertNotInvoked();
2670 >        rs[1].assertNotInvoked();
2671 >        f.complete(v1);
2672 >        checkCompletedNormally(h0, null);
2673 >        checkCompletedNormally(h1, null);
2674 >        rs[0].assertInvoked();
2675 >        rs[1].assertInvoked();
2676 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2677 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2678 >        checkCompletedNormally(h2, null);
2679 >        checkCompletedNormally(h3, null);
2680 >        rs[2].assertInvoked();
2681 >        rs[3].assertInvoked();
2682  
2658        final CompletableFuture<Integer> f = new CompletableFuture<>();
2659        final CompletableFuture<Integer> g = new CompletableFuture<>();
2660        final Noop r = new Noop();
2661
2662        f.complete(v1);
2683          g.complete(v2);
2664        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2684  
2685 <        checkCompletedNormally(h, null);
2685 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2686 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2687 >
2688          checkCompletedNormally(f, v1);
2689          checkCompletedNormally(g, v2);
2690 <        assertEquals(1, r.invocationCount);
2691 <        }
2692 <    }
2690 >        checkCompletedNormally(h0, null);
2691 >        checkCompletedNormally(h1, null);
2692 >        checkCompletedNormally(h2, null);
2693 >        checkCompletedNormally(h3, null);
2694 >        checkCompletedNormally(h4, null);
2695 >        checkCompletedNormally(h5, null);
2696 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2697 >    }}
2698  
2699      /**
2700       * runAfterEither result completes exceptionally after exceptional
2701       * completion of either source
2702       */
2703 <    public void testRunAfterEither_exceptionalCompletion1() {
2703 >    public void testRunAfterEither_exceptionalCompletion() {
2704          for (ExecutionMode m : ExecutionMode.values())
2705 <        for (Integer v1 : new Integer[] { 1, null }) {
2706 <
2705 >        for (Integer v1 : new Integer[] { 1, null })
2706 >    {
2707          final CompletableFuture<Integer> f = new CompletableFuture<>();
2708          final CompletableFuture<Integer> g = new CompletableFuture<>();
2683        final Noop r = new Noop();
2684        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2709          final CFException ex = new CFException();
2710 +        final Noop[] rs = new Noop[6];
2711 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2712  
2713 <        f.completeExceptionally(ex);
2714 <        checkCompletedWithWrappedCFException(h, ex);
2715 <        g.complete(v1);
2713 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2714 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2715 >        checkIncomplete(h0);
2716 >        checkIncomplete(h1);
2717 >        rs[0].assertNotInvoked();
2718 >        rs[1].assertNotInvoked();
2719 >        assertTrue(f.completeExceptionally(ex));
2720 >        checkCompletedWithWrappedException(h0, ex);
2721 >        checkCompletedWithWrappedException(h1, ex);
2722 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2723 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2724 >        checkCompletedWithWrappedException(h2, ex);
2725 >        checkCompletedWithWrappedException(h3, ex);
2726 >
2727 >        assertTrue(g.complete(v1));
2728 >
2729 >        // unspecified behavior - both source completions available
2730 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2731 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2732 >        try {
2733 >            assertNull(h4.join());
2734 >            rs[4].assertInvoked();
2735 >        } catch (CompletionException ok) {
2736 >            checkCompletedWithWrappedException(h4, ex);
2737 >            rs[4].assertNotInvoked();
2738 >        }
2739 >        try {
2740 >            assertNull(h5.join());
2741 >            rs[5].assertInvoked();
2742 >        } catch (CompletionException ok) {
2743 >            checkCompletedWithWrappedException(h5, ex);
2744 >            rs[5].assertNotInvoked();
2745 >        }
2746  
2747 <        assertEquals(0, r.invocationCount);
2747 >        checkCompletedExceptionally(f, ex);
2748          checkCompletedNormally(g, v1);
2749 <        checkCompletedWithWrappedCFException(f, ex);
2750 <        checkCompletedWithWrappedCFException(h, ex);
2751 <        }
2752 <    }
2749 >        checkCompletedWithWrappedException(h0, ex);
2750 >        checkCompletedWithWrappedException(h1, ex);
2751 >        checkCompletedWithWrappedException(h2, ex);
2752 >        checkCompletedWithWrappedException(h3, ex);
2753 >        checkCompletedWithWrappedException(h4, ex);
2754 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2755 >    }}
2756  
2757      public void testRunAfterEither_exceptionalCompletion2() {
2758          for (ExecutionMode m : ExecutionMode.values())
2759 <        for (Integer v1 : new Integer[] { 1, null }) {
2760 <
2761 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2703 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2704 <        final Noop r = new Noop();
2705 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2706 <        final CFException ex = new CFException();
2707 <
2708 <        g.completeExceptionally(ex);
2709 <        checkCompletedWithWrappedCFException(h, ex);
2710 <        f.complete(v1);
2711 <
2712 <        assertEquals(0, r.invocationCount);
2713 <        checkCompletedNormally(f, v1);
2714 <        checkCompletedWithWrappedCFException(g, ex);
2715 <        checkCompletedWithWrappedCFException(h, ex);
2716 <        }
2717 <    }
2718 <
2719 <    public void testRunAfterEither_exceptionalCompletion3() {
2720 <        for (ExecutionMode m : ExecutionMode.values())
2721 <        for (Integer v1 : new Integer[] { 1, null }) {
2722 <
2759 >        for (boolean fFirst : new boolean[] { true, false })
2760 >        for (Integer v1 : new Integer[] { 1, null })
2761 >    {
2762          final CompletableFuture<Integer> f = new CompletableFuture<>();
2763          final CompletableFuture<Integer> g = new CompletableFuture<>();
2725        final Noop r = new Noop();
2764          final CFException ex = new CFException();
2765 +        final Noop[] rs = new Noop[6];
2766 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2767  
2768 <        g.completeExceptionally(ex);
2769 <        f.complete(v1);
2770 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2768 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2769 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2770 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2771 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2772 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2773 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2774  
2775 <        // unspecified behavior
2733 <        Integer v;
2775 >        // unspecified behavior - both source completions available
2776          try {
2777 <            assertNull(h.join());
2778 <            assertEquals(1, r.invocationCount);
2777 >            assertEquals(null, h0.join());
2778 >            rs[0].assertInvoked();
2779          } catch (CompletionException ok) {
2780 <            checkCompletedWithWrappedCFException(h, ex);
2781 <            assertEquals(0, r.invocationCount);
2780 >            checkCompletedWithWrappedException(h0, ex);
2781 >            rs[0].assertNotInvoked();
2782          }
2741
2742        checkCompletedWithWrappedCFException(g, ex);
2743        checkCompletedNormally(f, v1);
2744        }
2745    }
2746
2747    public void testRunAfterEither_exceptionalCompletion4() {
2748        for (ExecutionMode m : ExecutionMode.values())
2749        for (Integer v1 : new Integer[] { 1, null }) {
2750
2751        final CompletableFuture<Integer> f = new CompletableFuture<>();
2752        final CompletableFuture<Integer> g = new CompletableFuture<>();
2753        final Noop r = new Noop();
2754        final CFException ex = new CFException();
2755
2756        f.completeExceptionally(ex);
2757        g.complete(v1);
2758        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2759
2760        // unspecified behavior
2761        Integer v;
2783          try {
2784 <            assertNull(h.join());
2785 <            assertEquals(1, r.invocationCount);
2784 >            assertEquals(null, h1.join());
2785 >            rs[1].assertInvoked();
2786          } catch (CompletionException ok) {
2787 <            checkCompletedWithWrappedCFException(h, ex);
2788 <            assertEquals(0, r.invocationCount);
2787 >            checkCompletedWithWrappedException(h1, ex);
2788 >            rs[1].assertNotInvoked();
2789          }
2790 <
2791 <        checkCompletedWithWrappedCFException(f, ex);
2792 <        checkCompletedNormally(g, v1);
2790 >        try {
2791 >            assertEquals(null, h2.join());
2792 >            rs[2].assertInvoked();
2793 >        } catch (CompletionException ok) {
2794 >            checkCompletedWithWrappedException(h2, ex);
2795 >            rs[2].assertNotInvoked();
2796          }
2797 <    }
2798 <
2799 <    /**
2800 <     * runAfterEither result completes exceptionally if action does
2801 <     */
2802 <    public void testRunAfterEither_actionFailed1() {
2779 <        for (ExecutionMode m : ExecutionMode.values())
2780 <        for (Integer v1 : new Integer[] { 1, null })
2781 <        for (Integer v2 : new Integer[] { 2, null }) {
2782 <
2783 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2784 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2785 <        final FailingNoop r = new FailingNoop();
2786 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2787 <
2788 <        f.complete(v1);
2789 <        checkCompletedWithWrappedCFException(h);
2790 <        g.complete(v2);
2791 <        checkCompletedNormally(f, v1);
2792 <        checkCompletedNormally(g, v2);
2797 >        try {
2798 >            assertEquals(null, h3.join());
2799 >            rs[3].assertInvoked();
2800 >        } catch (CompletionException ok) {
2801 >            checkCompletedWithWrappedException(h3, ex);
2802 >            rs[3].assertNotInvoked();
2803          }
2794    }
2804  
2796    public void testRunAfterEither_actionFailed2() {
2797        for (ExecutionMode m : ExecutionMode.values())
2798        for (Integer v1 : new Integer[] { 1, null })
2799        for (Integer v2 : new Integer[] { 2, null }) {
2800
2801        final CompletableFuture<Integer> f = new CompletableFuture<>();
2802        final CompletableFuture<Integer> g = new CompletableFuture<>();
2803        final FailingNoop r = new FailingNoop();
2804        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2805
2806        g.complete(v2);
2807        checkCompletedWithWrappedCFException(h);
2808        f.complete(v1);
2805          checkCompletedNormally(f, v1);
2806 <        checkCompletedNormally(g, v2);
2807 <        }
2812 <    }
2806 >        checkCompletedExceptionally(g, ex);
2807 >    }}
2808  
2809      /**
2810       * runAfterEither result completes exceptionally if either source cancelled
2811       */
2812 <    public void testRunAfterEither_sourceCancelled1() {
2812 >    public void testRunAfterEither_sourceCancelled() {
2813          for (ExecutionMode m : ExecutionMode.values())
2814          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2815 <        for (Integer v1 : new Integer[] { 1, null }) {
2816 <
2822 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2823 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2824 <        final Noop r = new Noop();
2825 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2826 <
2827 <        assertTrue(f.cancel(mayInterruptIfRunning));
2828 <        checkCompletedWithWrappedCancellationException(h);
2829 <        g.complete(v1);
2830 <
2831 <        checkCancelled(f);
2832 <        assertEquals(0, r.invocationCount);
2833 <        checkCompletedNormally(g, v1);
2834 <        checkCompletedWithWrappedCancellationException(h);
2835 <        }
2836 <    }
2837 <
2838 <    public void testRunAfterEither_sourceCancelled2() {
2839 <        for (ExecutionMode m : ExecutionMode.values())
2840 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2841 <        for (Integer v1 : new Integer[] { 1, null }) {
2842 <
2843 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2844 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2845 <        final Noop r = new Noop();
2846 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2847 <
2848 <        assertTrue(g.cancel(mayInterruptIfRunning));
2849 <        checkCompletedWithWrappedCancellationException(h);
2850 <        f.complete(v1);
2851 <
2852 <        checkCancelled(g);
2853 <        assertEquals(0, r.invocationCount);
2854 <        checkCompletedNormally(f, v1);
2855 <        checkCompletedWithWrappedCancellationException(h);
2856 <        }
2857 <    }
2858 <
2859 <    public void testRunAfterEither_sourceCancelled3() {
2860 <        for (ExecutionMode m : ExecutionMode.values())
2861 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2862 <        for (Integer v1 : new Integer[] { 1, null }) {
2863 <
2815 >        for (Integer v1 : new Integer[] { 1, null })
2816 >    {
2817          final CompletableFuture<Integer> f = new CompletableFuture<>();
2818          final CompletableFuture<Integer> g = new CompletableFuture<>();
2819 <        final Noop r = new Noop();
2820 <
2868 <        assertTrue(g.cancel(mayInterruptIfRunning));
2869 <        f.complete(v1);
2870 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2819 >        final Noop[] rs = new Noop[6];
2820 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2821  
2822 <        // unspecified behavior
2823 <        Integer v;
2822 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2823 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2824 >        checkIncomplete(h0);
2825 >        checkIncomplete(h1);
2826 >        rs[0].assertNotInvoked();
2827 >        rs[1].assertNotInvoked();
2828 >        f.cancel(mayInterruptIfRunning);
2829 >        checkCompletedWithWrappedCancellationException(h0);
2830 >        checkCompletedWithWrappedCancellationException(h1);
2831 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2832 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2833 >        checkCompletedWithWrappedCancellationException(h2);
2834 >        checkCompletedWithWrappedCancellationException(h3);
2835 >
2836 >        assertTrue(g.complete(v1));
2837 >
2838 >        // unspecified behavior - both source completions available
2839 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2840 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2841          try {
2842 <            assertNull(h.join());
2843 <            assertEquals(1, r.invocationCount);
2842 >            assertNull(h4.join());
2843 >            rs[4].assertInvoked();
2844          } catch (CompletionException ok) {
2845 <            checkCompletedWithWrappedCancellationException(h);
2846 <            assertEquals(0, r.invocationCount);
2880 <        }
2881 <
2882 <        checkCancelled(g);
2883 <        checkCompletedNormally(f, v1);
2845 >            checkCompletedWithWrappedCancellationException(h4);
2846 >            rs[4].assertNotInvoked();
2847          }
2885    }
2886
2887    public void testRunAfterEither_sourceCancelled4() {
2888        for (ExecutionMode m : ExecutionMode.values())
2889        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2890        for (Integer v1 : new Integer[] { 1, null }) {
2891
2892        final CompletableFuture<Integer> f = new CompletableFuture<>();
2893        final CompletableFuture<Integer> g = new CompletableFuture<>();
2894        final Noop r = new Noop();
2895
2896        assertTrue(f.cancel(mayInterruptIfRunning));
2897        g.complete(v1);
2898        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2899
2900        // unspecified behavior
2901        Integer v;
2848          try {
2849 <            assertNull(h.join());
2850 <            assertEquals(1, r.invocationCount);
2849 >            assertNull(h5.join());
2850 >            rs[5].assertInvoked();
2851          } catch (CompletionException ok) {
2852 <            checkCompletedWithWrappedCancellationException(h);
2853 <            assertEquals(0, r.invocationCount);
2852 >            checkCompletedWithWrappedCancellationException(h5);
2853 >            rs[5].assertNotInvoked();
2854          }
2855  
2856          checkCancelled(f);
2857          checkCompletedNormally(g, v1);
2858 <        }
2859 <    }
2858 >        checkCompletedWithWrappedCancellationException(h0);
2859 >        checkCompletedWithWrappedCancellationException(h1);
2860 >        checkCompletedWithWrappedCancellationException(h2);
2861 >        checkCompletedWithWrappedCancellationException(h3);
2862 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2863 >    }}
2864  
2865      /**
2866 <     * thenCompose result completes normally after normal completion of source
2866 >     * runAfterEither result completes exceptionally if action does
2867       */
2868 <    public void testThenCompose_normalCompletion1() {
2868 >    public void testRunAfterEither_actionFailed() {
2869          for (ExecutionMode m : ExecutionMode.values())
2870 <        for (Integer v1 : new Integer[] { 1, null }) {
2871 <
2870 >        for (Integer v1 : new Integer[] { 1, null })
2871 >        for (Integer v2 : new Integer[] { 2, null })
2872 >    {
2873          final CompletableFuture<Integer> f = new CompletableFuture<>();
2874 <        final CompletableFutureInc r = new CompletableFutureInc();
2875 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2876 <        f.complete(v1);
2877 <        checkCompletedNormally(g, inc(v1));
2874 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2875 >        final FailingRunnable[] rs = new FailingRunnable[6];
2876 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2877 >
2878 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2879 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2880 >        assertTrue(f.complete(v1));
2881 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2882 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2883 >        checkCompletedWithWrappedCFException(h0);
2884 >        checkCompletedWithWrappedCFException(h1);
2885 >        checkCompletedWithWrappedCFException(h2);
2886 >        checkCompletedWithWrappedCFException(h3);
2887 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2888 >        assertTrue(g.complete(v2));
2889 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2890 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2891 >        checkCompletedWithWrappedCFException(h4);
2892 >        checkCompletedWithWrappedCFException(h5);
2893 >
2894          checkCompletedNormally(f, v1);
2895 <        assertEquals(1, r.invocationCount);
2896 <        }
2897 <    }
2895 >        checkCompletedNormally(g, v2);
2896 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2897 >    }}
2898  
2899 <    public void testThenCompose_normalCompletion2() {
2899 >    /**
2900 >     * thenCompose result completes normally after normal completion of source
2901 >     */
2902 >    public void testThenCompose_normalCompletion() {
2903          for (ExecutionMode m : ExecutionMode.values())
2904 <        for (Integer v1 : new Integer[] { 1, null }) {
2905 <
2904 >        for (boolean createIncomplete : new boolean[] { true, false })
2905 >        for (Integer v1 : new Integer[] { 1, null })
2906 >    {
2907          final CompletableFuture<Integer> f = new CompletableFuture<>();
2908 <        final CompletableFutureInc r = new CompletableFutureInc();
2909 <        f.complete(v1);
2910 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2908 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2909 >        if (!createIncomplete) assertTrue(f.complete(v1));
2910 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2911 >        if (createIncomplete) assertTrue(f.complete(v1));
2912 >
2913          checkCompletedNormally(g, inc(v1));
2914          checkCompletedNormally(f, v1);
2915 <        assertEquals(1, r.invocationCount);
2916 <        }
2944 <    }
2915 >        r.assertValue(v1);
2916 >    }}
2917  
2918      /**
2919       * thenCompose result completes exceptionally after exceptional
2920       * completion of source
2921       */
2922 <    public void testThenCompose_exceptionalCompletion1() {
2923 <        for (ExecutionMode m : ExecutionMode.values()) {
2924 <
2922 >    public void testThenCompose_exceptionalCompletion() {
2923 >        for (ExecutionMode m : ExecutionMode.values())
2924 >        for (boolean createIncomplete : new boolean[] { true, false })
2925 >    {
2926          final CFException ex = new CFException();
2927 <        final CompletableFutureInc r = new CompletableFutureInc();
2927 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2928          final CompletableFuture<Integer> f = new CompletableFuture<>();
2929 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2930 <        f.completeExceptionally(ex);
2931 <        checkCompletedWithWrappedCFException(g, ex);
2959 <        checkCompletedWithWrappedCFException(f, ex);
2960 <        }
2961 <    }
2962 <
2963 <    public void testThenCompose_exceptionalCompletion2() {
2964 <        for (ExecutionMode m : ExecutionMode.values()) {
2929 >        if (!createIncomplete) f.completeExceptionally(ex);
2930 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2931 >        if (createIncomplete) f.completeExceptionally(ex);
2932  
2933 <        final CFException ex = new CFException();
2934 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2935 <        f.completeExceptionally(ex);
2936 <        final CompletableFutureInc r = new CompletableFutureInc();
2970 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2971 <        checkCompletedWithWrappedCFException(g, ex);
2972 <        checkCompletedWithWrappedCFException(f, ex);
2973 <        }
2974 <    }
2933 >        checkCompletedWithWrappedException(g, ex);
2934 >        checkCompletedExceptionally(f, ex);
2935 >        r.assertNotInvoked();
2936 >    }}
2937  
2938      /**
2939       * thenCompose result completes exceptionally if action does
2940       */
2941 <    public void testThenCompose_actionFailed1() {
2941 >    public void testThenCompose_actionFailed() {
2942          for (ExecutionMode m : ExecutionMode.values())
2943 <        for (Integer v1 : new Integer[] { 1, null }) {
2944 <
2943 >        for (boolean createIncomplete : new boolean[] { true, false })
2944 >        for (Integer v1 : new Integer[] { 1, null })
2945 >    {
2946          final CompletableFuture<Integer> f = new CompletableFuture<>();
2947          final FailingCompletableFutureFunction r
2948 <            = new FailingCompletableFutureFunction();
2949 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2950 <        f.complete(v1);
2951 <        checkCompletedWithWrappedCFException(g);
2989 <        checkCompletedNormally(f, v1);
2990 <        }
2991 <    }
2948 >            = new FailingCompletableFutureFunction(m);
2949 >        if (!createIncomplete) assertTrue(f.complete(v1));
2950 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2951 >        if (createIncomplete) assertTrue(f.complete(v1));
2952  
2993    public void testThenCompose_actionFailed2() {
2994        for (ExecutionMode m : ExecutionMode.values())
2995        for (Integer v1 : new Integer[] { 1, null }) {
2996
2997        final CompletableFuture<Integer> f = new CompletableFuture<>();
2998        f.complete(v1);
2999        final FailingCompletableFutureFunction r
3000            = new FailingCompletableFutureFunction();
3001        final CompletableFuture<Integer> g = f.thenCompose(r);
2953          checkCompletedWithWrappedCFException(g);
2954          checkCompletedNormally(f, v1);
2955 <        }
3005 <    }
2955 >    }}
2956  
2957      /**
2958       * thenCompose result completes exceptionally if source cancelled
2959       */
2960 <    public void testThenCompose_sourceCancelled1() {
2960 >    public void testThenCompose_sourceCancelled() {
2961          for (ExecutionMode m : ExecutionMode.values())
2962 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2963 <
2962 >        for (boolean createIncomplete : new boolean[] { true, false })
2963 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2964 >    {
2965          final CompletableFuture<Integer> f = new CompletableFuture<>();
2966 <        final CompletableFutureInc r = new CompletableFutureInc();
2967 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2968 <        assertTrue(f.cancel(mayInterruptIfRunning));
2969 <        checkCompletedWithWrappedCancellationException(g);
2970 <        checkCancelled(f);
2966 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2967 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2968 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2969 >        if (createIncomplete) {
2970 >            checkIncomplete(g);
2971 >            assertTrue(f.cancel(mayInterruptIfRunning));
2972          }
3021    }
2973  
3023    public void testThenCompose_sourceCancelled2() {
3024        for (ExecutionMode m : ExecutionMode.values())
3025        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
3026
3027        final CompletableFuture<Integer> f = new CompletableFuture<>();
3028        assertTrue(f.cancel(mayInterruptIfRunning));
3029        final CompletableFutureInc r = new CompletableFutureInc();
3030        final CompletableFuture<Integer> g = f.thenCompose(r);
2974          checkCompletedWithWrappedCancellationException(g);
2975          checkCancelled(f);
2976 <        }
3034 <    }
3035 <
3036 <    // asyncs
3037 <
3038 <    /**
3039 <     * thenRunAsync result completes normally after normal completion of source
3040 <     */
3041 <    public void testThenRunAsync() {
3042 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3043 <        Noop r = new Noop();
3044 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3045 <        f.complete(null);
3046 <        checkCompletedNormally(g, null);
3047 <
3048 <        // reordered version
3049 <        f = new CompletableFuture<>();
3050 <        f.complete(null);
3051 <        r = new Noop();
3052 <        g = f.thenRunAsync(r);
3053 <        checkCompletedNormally(g, null);
3054 <    }
3055 <
3056 <    /**
3057 <     * thenRunAsync result completes exceptionally after exceptional
3058 <     * completion of source
3059 <     */
3060 <    public void testThenRunAsync2() {
3061 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3062 <        Noop r = new Noop();
3063 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3064 <        f.completeExceptionally(new CFException());
3065 <        try {
3066 <            g.join();
3067 <            shouldThrow();
3068 <        } catch (CompletionException success) {}
3069 <        checkCompletedWithWrappedCFException(g);
3070 <    }
3071 <
3072 <    /**
3073 <     * thenRunAsync result completes exceptionally if action does
3074 <     */
3075 <    public void testThenRunAsync3() {
3076 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3077 <        FailingNoop r = new FailingNoop();
3078 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3079 <        f.complete(null);
3080 <        checkCompletedWithWrappedCFException(g);
3081 <    }
3082 <
3083 <    /**
3084 <     * thenRunAsync result completes exceptionally if source cancelled
3085 <     */
3086 <    public void testThenRunAsync4() {
3087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3088 <        Noop r = new Noop();
3089 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3090 <        assertTrue(f.cancel(true));
3091 <        checkCompletedWithWrappedCancellationException(g);
3092 <    }
3093 <
3094 <    /**
3095 <     * thenApplyAsync result completes normally after normal completion of source
3096 <     */
3097 <    public void testThenApplyAsync() {
3098 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3099 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3100 <        f.complete(one);
3101 <        checkCompletedNormally(g, two);
3102 <    }
3103 <
3104 <    /**
3105 <     * thenApplyAsync result completes exceptionally after exceptional
3106 <     * completion of source
3107 <     */
3108 <    public void testThenApplyAsync2() {
3109 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3110 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3111 <        f.completeExceptionally(new CFException());
3112 <        checkCompletedWithWrappedCFException(g);
3113 <    }
3114 <
3115 <    /**
3116 <     * thenApplyAsync result completes exceptionally if action does
3117 <     */
3118 <    public void testThenApplyAsync3() {
3119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3120 <        FailingFunction r = new FailingFunction();
3121 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3122 <        f.complete(null);
3123 <        checkCompletedWithWrappedCFException(g);
3124 <    }
3125 <
3126 <    /**
3127 <     * thenApplyAsync result completes exceptionally if source cancelled
3128 <     */
3129 <    public void testThenApplyAsync4() {
3130 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3131 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3132 <        assertTrue(f.cancel(true));
3133 <        checkCompletedWithWrappedCancellationException(g);
3134 <    }
3135 <
3136 <    /**
3137 <     * thenAcceptAsync result completes normally after normal
3138 <     * completion of source
3139 <     */
3140 <    public void testThenAcceptAsync() {
3141 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3142 <        IncAction r = new IncAction();
3143 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3144 <        f.complete(one);
3145 <        checkCompletedNormally(g, null);
3146 <        assertEquals(r.value, (Integer) 2);
3147 <    }
3148 <
3149 <    /**
3150 <     * thenAcceptAsync result completes exceptionally after exceptional
3151 <     * completion of source
3152 <     */
3153 <    public void testThenAcceptAsync2() {
3154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3155 <        IncAction r = new IncAction();
3156 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3157 <        f.completeExceptionally(new CFException());
3158 <        checkCompletedWithWrappedCFException(g);
3159 <    }
3160 <
3161 <    /**
3162 <     * thenAcceptAsync result completes exceptionally if action does
3163 <     */
3164 <    public void testThenAcceptAsync3() {
3165 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3166 <        FailingConsumer r = new FailingConsumer();
3167 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3168 <        f.complete(null);
3169 <        checkCompletedWithWrappedCFException(g);
3170 <    }
3171 <
3172 <    /**
3173 <     * thenAcceptAsync result completes exceptionally if source cancelled
3174 <     */
3175 <    public void testThenAcceptAsync4() {
3176 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3177 <        IncAction r = new IncAction();
3178 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3179 <        assertTrue(f.cancel(true));
3180 <        checkCompletedWithWrappedCancellationException(g);
3181 <    }
3182 <
3183 <    // async with explicit executors
3184 <
3185 <    /**
3186 <     * thenRunAsync result completes normally after normal completion of source
3187 <     */
3188 <    public void testThenRunAsyncE() {
3189 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3190 <        Noop r = new Noop();
3191 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3192 <        f.complete(null);
3193 <        checkCompletedNormally(g, null);
3194 <
3195 <        // reordered version
3196 <        f = new CompletableFuture<>();
3197 <        f.complete(null);
3198 <        r = new Noop();
3199 <        g = f.thenRunAsync(r, new ThreadExecutor());
3200 <        checkCompletedNormally(g, null);
3201 <    }
3202 <
3203 <    /**
3204 <     * thenRunAsync result completes exceptionally after exceptional
3205 <     * completion of source
3206 <     */
3207 <    public void testThenRunAsync2E() {
3208 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3209 <        Noop r = new Noop();
3210 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3211 <        f.completeExceptionally(new CFException());
3212 <        try {
3213 <            g.join();
3214 <            shouldThrow();
3215 <        } catch (CompletionException success) {}
3216 <        checkCompletedWithWrappedCFException(g);
3217 <    }
3218 <
3219 <    /**
3220 <     * thenRunAsync result completes exceptionally if action does
3221 <     */
3222 <    public void testThenRunAsync3E() {
3223 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3224 <        FailingNoop r = new FailingNoop();
3225 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3226 <        f.complete(null);
3227 <        checkCompletedWithWrappedCFException(g);
3228 <    }
3229 <
3230 <    /**
3231 <     * thenRunAsync result completes exceptionally if source cancelled
3232 <     */
3233 <    public void testThenRunAsync4E() {
3234 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3235 <        Noop r = new Noop();
3236 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3237 <        assertTrue(f.cancel(true));
3238 <        checkCompletedWithWrappedCancellationException(g);
3239 <    }
3240 <
3241 <    /**
3242 <     * thenApplyAsync result completes normally after normal completion of source
3243 <     */
3244 <    public void testThenApplyAsyncE() {
3245 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3246 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3247 <        f.complete(one);
3248 <        checkCompletedNormally(g, two);
3249 <    }
3250 <
3251 <    /**
3252 <     * thenApplyAsync result completes exceptionally after exceptional
3253 <     * completion of source
3254 <     */
3255 <    public void testThenApplyAsync2E() {
3256 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3257 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3258 <        f.completeExceptionally(new CFException());
3259 <        checkCompletedWithWrappedCFException(g);
3260 <    }
3261 <
3262 <    /**
3263 <     * thenApplyAsync result completes exceptionally if action does
3264 <     */
3265 <    public void testThenApplyAsync3E() {
3266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3267 <        FailingFunction r = new FailingFunction();
3268 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3269 <        f.complete(null);
3270 <        checkCompletedWithWrappedCFException(g);
3271 <    }
3272 <
3273 <    /**
3274 <     * thenApplyAsync result completes exceptionally if source cancelled
3275 <     */
3276 <    public void testThenApplyAsync4E() {
3277 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3278 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3279 <        assertTrue(f.cancel(true));
3280 <        checkCompletedWithWrappedCancellationException(g);
3281 <    }
3282 <
3283 <    /**
3284 <     * thenAcceptAsync result completes normally after normal
3285 <     * completion of source
3286 <     */
3287 <    public void testThenAcceptAsyncE() {
3288 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3289 <        IncAction r = new IncAction();
3290 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3291 <        f.complete(one);
3292 <        checkCompletedNormally(g, null);
3293 <        assertEquals(r.value, (Integer) 2);
3294 <    }
3295 <
3296 <    /**
3297 <     * thenAcceptAsync result completes exceptionally after exceptional
3298 <     * completion of source
3299 <     */
3300 <    public void testThenAcceptAsync2E() {
3301 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3302 <        IncAction r = new IncAction();
3303 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3304 <        f.completeExceptionally(new CFException());
3305 <        checkCompletedWithWrappedCFException(g);
3306 <    }
3307 <
3308 <    /**
3309 <     * thenAcceptAsync result completes exceptionally if action does
3310 <     */
3311 <    public void testThenAcceptAsync3E() {
3312 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3313 <        FailingConsumer r = new FailingConsumer();
3314 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3315 <        f.complete(null);
3316 <        checkCompletedWithWrappedCFException(g);
3317 <    }
3318 <
3319 <    /**
3320 <     * thenAcceptAsync result completes exceptionally if source cancelled
3321 <     */
3322 <    public void testThenAcceptAsync4E() {
3323 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3324 <        IncAction r = new IncAction();
3325 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3326 <        assertTrue(f.cancel(true));
3327 <        checkCompletedWithWrappedCancellationException(g);
3328 <    }
2976 >    }}
2977  
2978      // other static methods
2979  
# Line 3343 | Line 2991 | public class CompletableFutureTest exten
2991       * when all components complete normally
2992       */
2993      public void testAllOf_normal() throws Exception {
2994 <        for (int k = 1; k < 20; ++k) {
2995 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2996 <            for (int i = 0; i < k; ++i)
2994 >        for (int k = 1; k < 10; k++) {
2995 >            CompletableFuture<Integer>[] fs
2996 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2997 >            for (int i = 0; i < k; i++)
2998                  fs[i] = new CompletableFuture<>();
2999              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3000 <            for (int i = 0; i < k; ++i) {
3000 >            for (int i = 0; i < k; i++) {
3001                  checkIncomplete(f);
3002                  checkIncomplete(CompletableFuture.allOf(fs));
3003                  fs[i].complete(one);
# Line 3358 | Line 3007 | public class CompletableFutureTest exten
3007          }
3008      }
3009  
3010 +    public void testAllOf_backwards() throws Exception {
3011 +        for (int k = 1; k < 10; k++) {
3012 +            CompletableFuture<Integer>[] fs
3013 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3014 +            for (int i = 0; i < k; i++)
3015 +                fs[i] = new CompletableFuture<>();
3016 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3017 +            for (int i = k - 1; i >= 0; i--) {
3018 +                checkIncomplete(f);
3019 +                checkIncomplete(CompletableFuture.allOf(fs));
3020 +                fs[i].complete(one);
3021 +            }
3022 +            checkCompletedNormally(f, null);
3023 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3024 +        }
3025 +    }
3026 +
3027 +    public void testAllOf_exceptional() throws Exception {
3028 +        for (int k = 1; k < 10; k++) {
3029 +            CompletableFuture<Integer>[] fs
3030 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3031 +            CFException ex = new CFException();
3032 +            for (int i = 0; i < k; i++)
3033 +                fs[i] = new CompletableFuture<>();
3034 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3035 +            for (int i = 0; i < k; i++) {
3036 +                checkIncomplete(f);
3037 +                checkIncomplete(CompletableFuture.allOf(fs));
3038 +                if (i != k/2) {
3039 +                    fs[i].complete(i);
3040 +                    checkCompletedNormally(fs[i], i);
3041 +                } else {
3042 +                    fs[i].completeExceptionally(ex);
3043 +                    checkCompletedExceptionally(fs[i], ex);
3044 +                }
3045 +            }
3046 +            checkCompletedWithWrappedException(f, ex);
3047 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3048 +        }
3049 +    }
3050 +
3051      /**
3052       * anyOf(no component futures) returns an incomplete future
3053       */
3054      public void testAnyOf_empty() throws Exception {
3055 +        for (Integer v1 : new Integer[] { 1, null })
3056 +    {
3057          CompletableFuture<Object> f = CompletableFuture.anyOf();
3058          checkIncomplete(f);
3059 <    }
3059 >
3060 >        f.complete(v1);
3061 >        checkCompletedNormally(f, v1);
3062 >    }}
3063  
3064      /**
3065       * anyOf returns a future completed normally with a value when
3066       * a component future does
3067       */
3068      public void testAnyOf_normal() throws Exception {
3069 <        for (int k = 0; k < 10; ++k) {
3069 >        for (int k = 0; k < 10; k++) {
3070              CompletableFuture[] fs = new CompletableFuture[k];
3071 <            for (int i = 0; i < k; ++i)
3071 >            for (int i = 0; i < k; i++)
3072                  fs[i] = new CompletableFuture<>();
3073              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3074              checkIncomplete(f);
3075 <            for (int i = 0; i < k; ++i) {
3076 <                fs[i].complete(one);
3077 <                checkCompletedNormally(f, one);
3078 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3075 >            for (int i = 0; i < k; i++) {
3076 >                fs[i].complete(i);
3077 >                checkCompletedNormally(f, 0);
3078 >                int x = (int) CompletableFuture.anyOf(fs).join();
3079 >                assertTrue(0 <= x && x <= i);
3080 >            }
3081 >        }
3082 >    }
3083 >    public void testAnyOf_normal_backwards() throws Exception {
3084 >        for (int k = 0; k < 10; k++) {
3085 >            CompletableFuture[] fs = new CompletableFuture[k];
3086 >            for (int i = 0; i < k; i++)
3087 >                fs[i] = new CompletableFuture<>();
3088 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3089 >            checkIncomplete(f);
3090 >            for (int i = k - 1; i >= 0; i--) {
3091 >                fs[i].complete(i);
3092 >                checkCompletedNormally(f, k - 1);
3093 >                int x = (int) CompletableFuture.anyOf(fs).join();
3094 >                assertTrue(i <= x && x <= k - 1);
3095              }
3096          }
3097      }
# Line 3389 | Line 3100 | public class CompletableFutureTest exten
3100       * anyOf result completes exceptionally when any component does.
3101       */
3102      public void testAnyOf_exceptional() throws Exception {
3103 <        for (int k = 0; k < 10; ++k) {
3103 >        for (int k = 0; k < 10; k++) {
3104              CompletableFuture[] fs = new CompletableFuture[k];
3105 <            for (int i = 0; i < k; ++i)
3105 >            CFException[] exs = new CFException[k];
3106 >            for (int i = 0; i < k; i++) {
3107                  fs[i] = new CompletableFuture<>();
3108 +                exs[i] = new CFException();
3109 +            }
3110              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3111              checkIncomplete(f);
3112 <            for (int i = 0; i < k; ++i) {
3113 <                fs[i].completeExceptionally(new CFException());
3114 <                checkCompletedWithWrappedCFException(f);
3112 >            for (int i = 0; i < k; i++) {
3113 >                fs[i].completeExceptionally(exs[i]);
3114 >                checkCompletedWithWrappedException(f, exs[0]);
3115 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3116 >            }
3117 >        }
3118 >    }
3119 >
3120 >    public void testAnyOf_exceptional_backwards() throws Exception {
3121 >        for (int k = 0; k < 10; k++) {
3122 >            CompletableFuture[] fs = new CompletableFuture[k];
3123 >            CFException[] exs = new CFException[k];
3124 >            for (int i = 0; i < k; i++) {
3125 >                fs[i] = new CompletableFuture<>();
3126 >                exs[i] = new CFException();
3127 >            }
3128 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3129 >            checkIncomplete(f);
3130 >            for (int i = k - 1; i >= 0; i--) {
3131 >                fs[i].completeExceptionally(exs[i]);
3132 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3133                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3134              }
3135          }
# Line 3416 | Line 3148 | public class CompletableFutureTest exten
3148          Runnable[] throwingActions = {
3149              () -> CompletableFuture.supplyAsync(null),
3150              () -> CompletableFuture.supplyAsync(null, exec),
3151 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3151 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3152  
3153              () -> CompletableFuture.runAsync(null),
3154              () -> CompletableFuture.runAsync(null, exec),
# Line 3489 | Line 3221 | public class CompletableFutureTest exten
3221  
3222              () -> f.thenCompose(null),
3223              () -> f.thenComposeAsync(null),
3224 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3224 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3225              () -> f.thenComposeAsync(null, exec),
3226  
3227              () -> f.exceptionally(null),
# Line 3521 | Line 3253 | public class CompletableFutureTest exten
3253          assertSame(f, f.toCompletableFuture());
3254      }
3255  
3256 <    /**
3525 <     * whenComplete action executes on normal completion, propagating
3526 <     * source result.
3527 <     */
3528 <    public void testWhenComplete_normalCompletion1() {
3529 <        for (ExecutionMode m : ExecutionMode.values())
3530 <        for (boolean createIncomplete : new boolean[] { true, false })
3531 <        for (Integer v1 : new Integer[] { 1, null })
3532 <    {
3533 <        final AtomicInteger a = new AtomicInteger(0);
3534 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3535 <        if (!createIncomplete) f.complete(v1);
3536 <        final CompletableFuture<Integer> g = m.whenComplete
3537 <            (f,
3538 <             (Integer x, Throwable t) -> {
3539 <                threadAssertSame(x, v1);
3540 <                threadAssertNull(t);
3541 <                a.getAndIncrement();
3542 <            });
3543 <        if (createIncomplete) f.complete(v1);
3256 >    //--- tests of implementation details; not part of official tck ---
3257  
3258 <        checkCompletedNormally(g, v1);
3259 <        checkCompletedNormally(f, v1);
3260 <        assertEquals(1, a.get());
3261 <    }}
3258 >    Object resultOf(CompletableFuture<?> f) {
3259 >        try {
3260 >            java.lang.reflect.Field resultField
3261 >                = CompletableFuture.class.getDeclaredField("result");
3262 >            resultField.setAccessible(true);
3263 >            return resultField.get(f);
3264 >        } catch (Throwable t) { throw new AssertionError(t); }
3265 >    }
3266  
3267 <    /**
3268 <     * whenComplete action executes on exceptional completion, propagating
3552 <     * source result.
3553 <     */
3554 <    public void testWhenComplete_exceptionalCompletion() {
3267 >    public void testExceptionPropagationReusesResultObject() {
3268 >        if (!testImplementationDetails) return;
3269          for (ExecutionMode m : ExecutionMode.values())
3556        for (boolean createIncomplete : new boolean[] { true, false })
3557        for (Integer v1 : new Integer[] { 1, null })
3270      {
3559        final AtomicInteger a = new AtomicInteger(0);
3271          final CFException ex = new CFException();
3272 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3273 <        if (!createIncomplete) f.completeExceptionally(ex);
3563 <        final CompletableFuture<Integer> g = m.whenComplete
3564 <            (f,
3565 <             (Integer x, Throwable t) -> {
3566 <                threadAssertNull(x);
3567 <                threadAssertSame(t, ex);
3568 <                a.getAndIncrement();
3569 <            });
3570 <        if (createIncomplete) f.completeExceptionally(ex);
3571 <        checkCompletedWithWrappedCFException(f, ex);
3572 <        checkCompletedWithWrappedCFException(g, ex);
3573 <        assertEquals(1, a.get());
3574 <    }}
3272 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3273 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3274  
3275 <    /**
3276 <     * whenComplete action executes on cancelled source, propagating
3578 <     * CancellationException.
3579 <     */
3580 <    public void testWhenComplete_sourceCancelled() {
3581 <        for (ExecutionMode m : ExecutionMode.values())
3582 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3583 <        for (boolean createIncomplete : new boolean[] { true, false })
3584 <    {
3585 <        final AtomicInteger a = new AtomicInteger(0);
3586 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3587 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3588 <        final CompletableFuture<Integer> g = m.whenComplete
3589 <            (f,
3590 <             (Integer x, Throwable t) -> {
3591 <                threadAssertNull(x);
3592 <                threadAssertTrue(t instanceof CancellationException);
3593 <                a.getAndIncrement();
3594 <            });
3595 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3275 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3276 >            = new ArrayList<>();
3277  
3278 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3279 <        checkCompletedWithWrappedCancellationException(g);
3280 <        checkCancelled(f);
3600 <        assertEquals(1, a.get());
3601 <    }}
3278 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3279 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3280 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3281  
3282 <    /**
3283 <     * If a whenComplete action throws an exception when triggered by
3284 <     * a normal completion, it completes exceptionally
3606 <     */
3607 <    public void testWhenComplete_actionFailed() {
3608 <        for (boolean createIncomplete : new boolean[] { true, false })
3609 <        for (ExecutionMode m : ExecutionMode.values())
3610 <        for (Integer v1 : new Integer[] { 1, null }) {
3282 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3283 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3284 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3285  
3286 <        final AtomicInteger a = new AtomicInteger(0);
3287 <        final CFException ex = new CFException();
3288 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3615 <        if (!createIncomplete) f.complete(v1);
3616 <        final CompletableFuture<Integer> g = m.whenComplete
3617 <            (f,
3618 <             (Integer x, Throwable t) -> {
3619 <                threadAssertSame(x, v1);
3620 <                threadAssertNull(t);
3621 <                a.getAndIncrement();
3622 <                throw ex;
3623 <            });
3624 <        if (createIncomplete) f.complete(v1);
3625 <        checkCompletedNormally(f, v1);
3626 <        checkCompletedWithWrappedCFException(g, ex);
3627 <        assertEquals(1, a.get());
3628 <        }
3629 <    }
3286 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3287 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3288 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3289  
3290 <    /**
3632 <     * If a whenComplete action throws an exception when triggered by
3633 <     * a source completion that also throws an exception, the source
3634 <     * exception takes precedence.
3635 <     */
3636 <    public void testWhenComplete_actionFailedSourceFailed() {
3637 <        for (boolean createIncomplete : new boolean[] { true, false })
3638 <        for (ExecutionMode m : ExecutionMode.values())
3639 <        for (Integer v1 : new Integer[] { 1, null }) {
3290 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3291  
3292 <        final AtomicInteger a = new AtomicInteger(0);
3642 <        final CFException ex1 = new CFException();
3643 <        final CFException ex2 = new CFException();
3644 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3292 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3293  
3294 <        if (!createIncomplete) f.completeExceptionally(ex1);
3295 <        final CompletableFuture<Integer> g = m.whenComplete
3648 <            (f,
3649 <             (Integer x, Throwable t) -> {
3650 <                threadAssertSame(t, ex1);
3651 <                threadAssertNull(x);
3652 <                a.getAndIncrement();
3653 <                throw ex2;
3654 <            });
3655 <        if (createIncomplete) f.completeExceptionally(ex1);
3294 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3295 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3296  
3297 <        checkCompletedWithWrappedCFException(f, ex1);
3298 <        checkCompletedWithWrappedCFException(g, ex1);
3299 <        assertEquals(1, a.get());
3297 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3298 >                 fun : funs) {
3299 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3300 >            f.completeExceptionally(ex);
3301 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3302 >            checkCompletedWithWrappedException(src, ex);
3303 >            CompletableFuture<?> dep = fun.apply(src);
3304 >            checkCompletedWithWrappedException(dep, ex);
3305 >            assertSame(resultOf(src), resultOf(dep));
3306          }
3307 <    }
3307 >
3308 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3309 >                 fun : funs) {
3310 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3311 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3312 >            CompletableFuture<?> dep = fun.apply(src);
3313 >            f.completeExceptionally(ex);
3314 >            checkCompletedWithWrappedException(src, ex);
3315 >            checkCompletedWithWrappedException(dep, ex);
3316 >            assertSame(resultOf(src), resultOf(dep));
3317 >        }
3318 >
3319 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3320 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3321 >                 fun : funs) {
3322 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3323 >            f.cancel(mayInterruptIfRunning);
3324 >            checkCancelled(f);
3325 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3326 >            checkCompletedWithWrappedCancellationException(src);
3327 >            CompletableFuture<?> dep = fun.apply(src);
3328 >            checkCompletedWithWrappedCancellationException(dep);
3329 >            assertSame(resultOf(src), resultOf(dep));
3330 >        }
3331 >
3332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3333 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3334 >                 fun : funs) {
3335 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3336 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3337 >            CompletableFuture<?> dep = fun.apply(src);
3338 >            f.cancel(mayInterruptIfRunning);
3339 >            checkCancelled(f);
3340 >            checkCompletedWithWrappedCancellationException(src);
3341 >            checkCompletedWithWrappedCancellationException(dep);
3342 >            assertSame(resultOf(src), resultOf(dep));
3343 >        }
3344 >    }}
3345  
3346   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines