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.47 by jsr166, Mon Jun 2 18:21:34 2014 UTC vs.
Revision 1.75 by jsr166, Sat Jun 7 21:14:42 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 216 | Line 239 | public class CompletableFutureTest exten
239       */
240      public void testCompleteExceptionally() {
241          CompletableFuture<Integer> f = new CompletableFuture<>();
242 +        CFException ex = new CFException();
243          checkIncomplete(f);
244 <        f.completeExceptionally(new CFException());
245 <        checkCompletedWithWrappedCFException(f);
244 >        f.completeExceptionally(ex);
245 >        checkCompletedExceptionally(f, ex);
246      }
247  
248      /**
# Line 259 | Line 283 | public class CompletableFutureTest exten
283       * obtrudeException forces completion with given exception
284       */
285      public void testObtrudeException() {
286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
287 <        checkIncomplete(f);
288 <        f.complete(one);
289 <        checkCompletedNormally(f, one);
290 <        f.obtrudeException(new CFException());
267 <        checkCompletedWithWrappedCFException(f);
286 >        for (Integer v1 : new Integer[] { 1, null })
287 >    {
288 >        CFException ex;
289 >        CompletableFuture<Integer> f;
290 >
291          f = new CompletableFuture<>();
292 <        f.obtrudeException(new CFException());
293 <        checkCompletedWithWrappedCFException(f);
292 >        f.complete(v1);
293 >        for (int i = 0; i < 2; i++) {
294 >            f.obtrudeException(ex = new CFException());
295 >            checkCompletedExceptionally(f, ex);
296 >        }
297 >
298          f = new CompletableFuture<>();
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 +        f.completeExceptionally(ex = new CFException());
306 +        f.obtrudeValue(v1);
307 +        checkCompletedNormally(f, v1);
308 +        f.obtrudeException(ex = new CFException());
309 +        checkCompletedExceptionally(f, ex);
310          f.completeExceptionally(new CFException());
311 <        f.obtrudeValue(four);
312 <        checkCompletedNormally(f, four);
313 <        f.obtrudeException(new CFException());
314 <        checkCompletedWithWrappedCFException(f);
277 <    }
311 >        checkCompletedExceptionally(f, ex);
312 >        f.complete(v1);
313 >        checkCompletedExceptionally(f, ex);
314 >    }}
315  
316      /**
317       * getNumberOfDependents returns number of dependent tasks
# Line 282 | Line 319 | public class CompletableFutureTest exten
319      public void testGetNumberOfDependents() {
320          CompletableFuture<Integer> f = new CompletableFuture<>();
321          assertEquals(0, f.getNumberOfDependents());
322 <        CompletableFuture g = f.thenRun(new Noop());
322 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
323          assertEquals(1, f.getNumberOfDependents());
324          assertEquals(0, g.getNumberOfDependents());
325 <        CompletableFuture h = f.thenRun(new Noop());
325 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
326          assertEquals(2, f.getNumberOfDependents());
327          f.complete(1);
328          checkCompletedNormally(g, null);
# Line 308 | Line 345 | public class CompletableFutureTest exten
345          f = new CompletableFuture<String>();
346          f.completeExceptionally(new IndexOutOfBoundsException());
347          assertTrue(f.toString().contains("[Completed exceptionally]"));
348 +
349 +        f = new CompletableFuture<String>();
350 +        f.cancel(true);
351 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
352 +
353 +        f = new CompletableFuture<String>();
354 +        f.cancel(false);
355 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
356      }
357  
358      /**
# Line 318 | Line 363 | public class CompletableFutureTest exten
363          checkCompletedNormally(f, "test");
364      }
365  
366 <    // Choose non-commutative actions for better coverage
366 >    abstract class CheckedAction {
367 >        int invocationCount = 0;
368 >        final ExecutionMode m;
369 >        CheckedAction(ExecutionMode m) { this.m = m; }
370 >        void invoked() {
371 >            m.checkExecutionMode();
372 >            assertEquals(0, invocationCount++);
373 >        }
374 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
375 >        void assertInvoked() { assertEquals(1, invocationCount); }
376 >    }
377  
378 <    // A non-commutative function that handles and produces null values as well.
379 <    static Integer subtract(Integer x, Integer y) {
380 <        return (x == null && y == null) ? null :
381 <            ((x == null) ? 42 : x.intValue())
382 <            - ((y == null) ? 99 : y.intValue());
378 >    abstract class CheckedIntegerAction extends CheckedAction {
379 >        Integer value;
380 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
381 >        void assertValue(Integer expected) {
382 >            assertInvoked();
383 >            assertEquals(expected, value);
384 >        }
385 >    }
386 >
387 >    class IntegerSupplier extends CheckedAction
388 >        implements Supplier<Integer>
389 >    {
390 >        final Integer value;
391 >        IntegerSupplier(ExecutionMode m, Integer value) {
392 >            super(m);
393 >            this.value = value;
394 >        }
395 >        public Integer get() {
396 >            invoked();
397 >            return value;
398 >        }
399      }
400  
401      // A function that handles and produces null values as well.
# Line 332 | Line 403 | public class CompletableFutureTest exten
403          return (x == null) ? null : x + 1;
404      }
405  
406 <    static final Supplier<Integer> supplyOne =
407 <        () -> Integer.valueOf(1);
408 <    static final Function<Integer, Integer> inc =
409 <        (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;
406 >    class NoopConsumer extends CheckedIntegerAction
407 >        implements Consumer<Integer>
408 >    {
409 >        NoopConsumer(ExecutionMode m) { super(m); }
410          public void accept(Integer x) {
411 <            invocationCount++;
412 <            value = inc(x);
411 >            invoked();
412 >            value = x;
413          }
414      }
415 <    static final class IncFunction implements Function<Integer,Integer> {
416 <        int invocationCount = 0;
417 <        Integer value;
415 >
416 >    class IncFunction extends CheckedIntegerAction
417 >        implements Function<Integer,Integer>
418 >    {
419 >        IncFunction(ExecutionMode m) { super(m); }
420          public Integer apply(Integer x) {
421 <            invocationCount++;
421 >            invoked();
422              return value = inc(x);
423          }
424      }
425 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
426 <        int invocationCount = 0;
427 <        Integer value;
428 <        // Check this action was invoked exactly once when result is computed.
425 >
426 >    // Choose non-commutative actions for better coverage
427 >    // A non-commutative function that handles and produces null values as well.
428 >    static Integer subtract(Integer x, Integer y) {
429 >        return (x == null && y == null) ? null :
430 >            ((x == null) ? 42 : x.intValue())
431 >            - ((y == null) ? 99 : y.intValue());
432 >    }
433 >
434 >    class SubtractAction extends CheckedIntegerAction
435 >        implements BiConsumer<Integer, Integer>
436 >    {
437 >        SubtractAction(ExecutionMode m) { super(m); }
438          public void accept(Integer x, Integer y) {
439 <            invocationCount++;
439 >            invoked();
440              value = subtract(x, y);
441          }
442      }
443 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
444 <        int invocationCount = 0;
445 <        Integer value;
446 <        // Check this action was invoked exactly once when result is computed.
443 >
444 >    class SubtractFunction extends CheckedIntegerAction
445 >        implements BiFunction<Integer, Integer, Integer>
446 >    {
447 >        SubtractFunction(ExecutionMode m) { super(m); }
448          public Integer apply(Integer x, Integer y) {
449 <            invocationCount++;
449 >            invoked();
450              return value = subtract(x, y);
451          }
452      }
453 <    static final class Noop implements Runnable {
454 <        int invocationCount = 0;
453 >
454 >    class Noop extends CheckedAction implements Runnable {
455 >        Noop(ExecutionMode m) { super(m); }
456          public void run() {
457 <            invocationCount++;
457 >            invoked();
458          }
459      }
460  
461 <    static final class FailingSupplier implements Supplier<Integer> {
462 <        int invocationCount = 0;
461 >    class FailingSupplier extends CheckedAction
462 >        implements Supplier<Integer>
463 >    {
464 >        FailingSupplier(ExecutionMode m) { super(m); }
465          public Integer get() {
466 <            invocationCount++;
466 >            invoked();
467              throw new CFException();
468          }
469      }
470 <    static final class FailingConsumer implements Consumer<Integer> {
471 <        int invocationCount = 0;
470 >
471 >    class FailingConsumer extends CheckedIntegerAction
472 >        implements Consumer<Integer>
473 >    {
474 >        FailingConsumer(ExecutionMode m) { super(m); }
475          public void accept(Integer x) {
476 <            invocationCount++;
476 >            invoked();
477 >            value = x;
478              throw new CFException();
479          }
480      }
481 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
482 <        int invocationCount = 0;
481 >
482 >    class FailingBiConsumer extends CheckedIntegerAction
483 >        implements BiConsumer<Integer, Integer>
484 >    {
485 >        FailingBiConsumer(ExecutionMode m) { super(m); }
486          public void accept(Integer x, Integer y) {
487 <            invocationCount++;
487 >            invoked();
488 >            value = subtract(x, y);
489              throw new CFException();
490          }
491      }
492 <    static final class FailingFunction implements Function<Integer, Integer> {
493 <        int invocationCount = 0;
492 >
493 >    class FailingFunction extends CheckedIntegerAction
494 >        implements Function<Integer, Integer>
495 >    {
496 >        FailingFunction(ExecutionMode m) { super(m); }
497          public Integer apply(Integer x) {
498 <            invocationCount++;
498 >            invoked();
499 >            value = x;
500              throw new CFException();
501          }
502      }
503 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
504 <        int invocationCount = 0;
503 >
504 >    class FailingBiFunction extends CheckedIntegerAction
505 >        implements BiFunction<Integer, Integer, Integer>
506 >    {
507 >        FailingBiFunction(ExecutionMode m) { super(m); }
508          public Integer apply(Integer x, Integer y) {
509 <            invocationCount++;
509 >            invoked();
510 >            value = subtract(x, y);
511              throw new CFException();
512          }
513      }
514 <    static final class FailingNoop implements Runnable {
515 <        int invocationCount = 0;
514 >
515 >    class FailingRunnable extends CheckedAction implements Runnable {
516 >        FailingRunnable(ExecutionMode m) { super(m); }
517          public void run() {
518 <            invocationCount++;
518 >            invoked();
519              throw new CFException();
520          }
521      }
522  
523 <    static final class CompletableFutureInc
524 <        implements Function<Integer, CompletableFuture<Integer>> {
525 <        int invocationCount = 0;
523 >
524 >    class CompletableFutureInc extends CheckedIntegerAction
525 >        implements Function<Integer, CompletableFuture<Integer>>
526 >    {
527 >        CompletableFutureInc(ExecutionMode m) { super(m); }
528          public CompletableFuture<Integer> apply(Integer x) {
529 <            invocationCount++;
529 >            invoked();
530 >            value = x;
531              CompletableFuture<Integer> f = new CompletableFuture<>();
532              f.complete(inc(x));
533              return f;
534          }
535      }
536  
537 <    static final class FailingCompletableFutureFunction
538 <        implements Function<Integer, CompletableFuture<Integer>> {
539 <        int invocationCount = 0;
537 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
538 >        implements Function<Integer, CompletableFuture<Integer>>
539 >    {
540 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
541          public CompletableFuture<Integer> apply(Integer x) {
542 <            invocationCount++;
542 >            invoked();
543 >            value = x;
544              throw new CFException();
545          }
546      }
547  
548      // Used for explicit executor tests
549      static final class ThreadExecutor implements Executor {
550 <        AtomicInteger count = new AtomicInteger(0);
550 >        final AtomicInteger count = new AtomicInteger(0);
551 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
552 >        static boolean startedCurrentThread() {
553 >            return Thread.currentThread().getThreadGroup() == tg;
554 >        }
555  
556          public void execute(Runnable r) {
557              count.getAndIncrement();
558 <            new Thread(r).start();
558 >            new Thread(tg, r).start();
559          }
560      }
561  
562      /**
563       * Permits the testing of parallel code for the 3 different
564 <     * execution modes without repeating all the testing code.
564 >     * execution modes without copy/pasting all the test methods.
565       */
566      enum ExecutionMode {
567          DEFAULT {
568 +            public void checkExecutionMode() {
569 +                assertFalse(ThreadExecutor.startedCurrentThread());
570 +                assertNull(ForkJoinTask.getPool());
571 +            }
572 +            public CompletableFuture<Void> runAsync(Runnable a) {
573 +                throw new UnsupportedOperationException();
574 +            }
575 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
576 +                throw new UnsupportedOperationException();
577 +            }
578              public <T> CompletableFuture<Void> thenRun
579                  (CompletableFuture<T> f, Runnable a) {
580                  return f.thenRun(a);
# Line 521 | Line 638 | public class CompletableFutureTest exten
638              }
639          },
640  
641 <        DEFAULT_ASYNC {
641 >        ASYNC {
642 >            public void checkExecutionMode() {
643 >                assertSame(ForkJoinPool.commonPool(),
644 >                           ForkJoinTask.getPool());
645 >            }
646 >            public CompletableFuture<Void> runAsync(Runnable a) {
647 >                return CompletableFuture.runAsync(a);
648 >            }
649 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
650 >                return CompletableFuture.supplyAsync(a);
651 >            }
652              public <T> CompletableFuture<Void> thenRun
653                  (CompletableFuture<T> f, Runnable a) {
654                  return f.thenRunAsync(a);
# Line 586 | Line 713 | public class CompletableFutureTest exten
713          },
714  
715          EXECUTOR {
716 +            public void checkExecutionMode() {
717 +                assertTrue(ThreadExecutor.startedCurrentThread());
718 +            }
719 +            public CompletableFuture<Void> runAsync(Runnable a) {
720 +                return CompletableFuture.runAsync(a, new ThreadExecutor());
721 +            }
722 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
723 +                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
724 +            }
725              public <T> CompletableFuture<Void> thenRun
726                  (CompletableFuture<T> f, Runnable a) {
727                  return f.thenRunAsync(a, new ThreadExecutor());
# Line 649 | Line 785 | public class CompletableFutureTest exten
785              }
786          };
787  
788 +        public abstract void checkExecutionMode();
789 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
790 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
791          public abstract <T> CompletableFuture<Void> thenRun
792              (CompletableFuture<T> f, Runnable a);
793          public abstract <T> CompletableFuture<Void> thenAccept
# Line 712 | Line 851 | public class CompletableFutureTest exten
851          assertEquals(0, a.get());
852      }}
853  
715
854      /**
855       * exceptionally action completes with function value on source
856       * exception
# Line 727 | Line 865 | public class CompletableFutureTest exten
865          if (!createIncomplete) f.completeExceptionally(ex);
866          final CompletableFuture<Integer> g = f.exceptionally
867              ((Throwable t) -> {
868 +                ExecutionMode.DEFAULT.checkExecutionMode();
869                  threadAssertSame(t, ex);
870                  a.getAndIncrement();
871                  return v1;
# Line 748 | Line 887 | public class CompletableFutureTest exten
887          if (!createIncomplete) f.completeExceptionally(ex1);
888          final CompletableFuture<Integer> g = f.exceptionally
889              ((Throwable t) -> {
890 +                ExecutionMode.DEFAULT.checkExecutionMode();
891                  threadAssertSame(t, ex1);
892                  a.getAndIncrement();
893                  throw ex2;
894              });
895          if (createIncomplete) f.completeExceptionally(ex1);
896  
897 <        checkCompletedWithWrappedCFException(g, ex2);
897 >        checkCompletedWithWrappedException(g, ex2);
898 >        assertEquals(1, a.get());
899 >    }}
900 >
901 >    /**
902 >     * whenComplete action executes on normal completion, propagating
903 >     * source result.
904 >     */
905 >    public void testWhenComplete_normalCompletion1() {
906 >        for (ExecutionMode m : ExecutionMode.values())
907 >        for (boolean createIncomplete : new boolean[] { true, false })
908 >        for (Integer v1 : new Integer[] { 1, null })
909 >    {
910 >        final AtomicInteger a = new AtomicInteger(0);
911 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
912 >        if (!createIncomplete) f.complete(v1);
913 >        final CompletableFuture<Integer> g = m.whenComplete
914 >            (f,
915 >             (Integer x, Throwable t) -> {
916 >                m.checkExecutionMode();
917 >                threadAssertSame(x, v1);
918 >                threadAssertNull(t);
919 >                a.getAndIncrement();
920 >            });
921 >        if (createIncomplete) f.complete(v1);
922 >
923 >        checkCompletedNormally(g, v1);
924 >        checkCompletedNormally(f, v1);
925 >        assertEquals(1, a.get());
926 >    }}
927 >
928 >    /**
929 >     * whenComplete action executes on exceptional completion, propagating
930 >     * source result.
931 >     */
932 >    public void testWhenComplete_exceptionalCompletion() {
933 >        for (ExecutionMode m : ExecutionMode.values())
934 >        for (boolean createIncomplete : new boolean[] { true, false })
935 >        for (Integer v1 : new Integer[] { 1, null })
936 >    {
937 >        final AtomicInteger a = new AtomicInteger(0);
938 >        final CFException ex = new CFException();
939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
940 >        if (!createIncomplete) f.completeExceptionally(ex);
941 >        final CompletableFuture<Integer> g = m.whenComplete
942 >            (f,
943 >             (Integer x, Throwable t) -> {
944 >                m.checkExecutionMode();
945 >                threadAssertNull(x);
946 >                threadAssertSame(t, ex);
947 >                a.getAndIncrement();
948 >            });
949 >        if (createIncomplete) f.completeExceptionally(ex);
950 >
951 >        checkCompletedWithWrappedException(g, ex);
952 >        checkCompletedExceptionally(f, ex);
953 >        assertEquals(1, a.get());
954 >    }}
955 >
956 >    /**
957 >     * whenComplete action executes on cancelled source, propagating
958 >     * CancellationException.
959 >     */
960 >    public void testWhenComplete_sourceCancelled() {
961 >        for (ExecutionMode m : ExecutionMode.values())
962 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
963 >        for (boolean createIncomplete : new boolean[] { true, false })
964 >    {
965 >        final AtomicInteger a = new AtomicInteger(0);
966 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
967 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
968 >        final CompletableFuture<Integer> g = m.whenComplete
969 >            (f,
970 >             (Integer x, Throwable t) -> {
971 >                m.checkExecutionMode();
972 >                threadAssertNull(x);
973 >                threadAssertTrue(t instanceof CancellationException);
974 >                a.getAndIncrement();
975 >            });
976 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
977 >
978 >        checkCompletedWithWrappedCancellationException(g);
979 >        checkCancelled(f);
980 >        assertEquals(1, a.get());
981 >    }}
982 >
983 >    /**
984 >     * If a whenComplete action throws an exception when triggered by
985 >     * a normal completion, it completes exceptionally
986 >     */
987 >    public void testWhenComplete_actionFailed() {
988 >        for (boolean createIncomplete : new boolean[] { true, false })
989 >        for (ExecutionMode m : ExecutionMode.values())
990 >        for (Integer v1 : new Integer[] { 1, null })
991 >    {
992 >        final AtomicInteger a = new AtomicInteger(0);
993 >        final CFException ex = new CFException();
994 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
995 >        if (!createIncomplete) f.complete(v1);
996 >        final CompletableFuture<Integer> g = m.whenComplete
997 >            (f,
998 >             (Integer x, Throwable t) -> {
999 >                m.checkExecutionMode();
1000 >                threadAssertSame(x, v1);
1001 >                threadAssertNull(t);
1002 >                a.getAndIncrement();
1003 >                throw ex;
1004 >            });
1005 >        if (createIncomplete) f.complete(v1);
1006 >
1007 >        checkCompletedWithWrappedException(g, ex);
1008 >        checkCompletedNormally(f, v1);
1009 >        assertEquals(1, a.get());
1010 >    }}
1011 >
1012 >    /**
1013 >     * If a whenComplete action throws an exception when triggered by
1014 >     * a source completion that also throws an exception, the source
1015 >     * exception takes precedence.
1016 >     */
1017 >    public void testWhenComplete_actionFailedSourceFailed() {
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (ExecutionMode m : ExecutionMode.values())
1020 >        for (Integer v1 : new Integer[] { 1, null })
1021 >    {
1022 >        final AtomicInteger a = new AtomicInteger(0);
1023 >        final CFException ex1 = new CFException();
1024 >        final CFException ex2 = new CFException();
1025 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1026 >
1027 >        if (!createIncomplete) f.completeExceptionally(ex1);
1028 >        final CompletableFuture<Integer> g = m.whenComplete
1029 >            (f,
1030 >             (Integer x, Throwable t) -> {
1031 >                m.checkExecutionMode();
1032 >                threadAssertSame(t, ex1);
1033 >                threadAssertNull(x);
1034 >                a.getAndIncrement();
1035 >                throw ex2;
1036 >            });
1037 >        if (createIncomplete) f.completeExceptionally(ex1);
1038 >
1039 >        checkCompletedWithWrappedException(g, ex1);
1040 >        checkCompletedExceptionally(f, ex1);
1041          assertEquals(1, a.get());
1042      }}
1043  
# Line 773 | Line 1056 | public class CompletableFutureTest exten
1056          final CompletableFuture<Integer> g = m.handle
1057              (f,
1058               (Integer x, Throwable t) -> {
1059 +                m.checkExecutionMode();
1060                  threadAssertSame(x, v1);
1061                  threadAssertNull(t);
1062                  a.getAndIncrement();
# Line 801 | Line 1085 | public class CompletableFutureTest exten
1085          final CompletableFuture<Integer> g = m.handle
1086              (f,
1087               (Integer x, Throwable t) -> {
1088 +                m.checkExecutionMode();
1089                  threadAssertNull(x);
1090                  threadAssertSame(t, ex);
1091                  a.getAndIncrement();
# Line 809 | Line 1094 | public class CompletableFutureTest exten
1094          if (createIncomplete) f.completeExceptionally(ex);
1095  
1096          checkCompletedNormally(g, v1);
1097 <        checkCompletedWithWrappedCFException(f, ex);
1097 >        checkCompletedExceptionally(f, ex);
1098          assertEquals(1, a.get());
1099      }}
1100  
# Line 829 | Line 1114 | public class CompletableFutureTest exten
1114          final CompletableFuture<Integer> g = m.handle
1115              (f,
1116               (Integer x, Throwable t) -> {
1117 +                m.checkExecutionMode();
1118                  threadAssertNull(x);
1119                  threadAssertTrue(t instanceof CancellationException);
1120                  a.getAndIncrement();
# Line 856 | Line 1142 | public class CompletableFutureTest exten
1142          final CompletableFuture<Integer> g = m.handle
1143              (f,
1144               (Integer x, Throwable t) -> {
1145 +                m.checkExecutionMode();
1146                  threadAssertNull(x);
1147                  threadAssertSame(ex1, t);
1148                  a.getAndIncrement();
# Line 863 | Line 1150 | public class CompletableFutureTest exten
1150              });
1151          if (createIncomplete) f.completeExceptionally(ex1);
1152  
1153 <        checkCompletedWithWrappedCFException(g, ex2);
1154 <        checkCompletedWithWrappedCFException(f, ex1);
1153 >        checkCompletedWithWrappedException(g, ex2);
1154 >        checkCompletedExceptionally(f, ex1);
1155          assertEquals(1, a.get());
1156      }}
1157  
# Line 880 | Line 1167 | public class CompletableFutureTest exten
1167          final CompletableFuture<Integer> g = m.handle
1168              (f,
1169               (Integer x, Throwable t) -> {
1170 +                m.checkExecutionMode();
1171                  threadAssertSame(x, v1);
1172                  threadAssertNull(t);
1173                  a.getAndIncrement();
# Line 887 | Line 1175 | public class CompletableFutureTest exten
1175              });
1176          if (createIncomplete) f.complete(v1);
1177  
1178 <        checkCompletedWithWrappedCFException(g, ex);
1178 >        checkCompletedWithWrappedException(g, ex);
1179          checkCompletedNormally(f, v1);
1180          assertEquals(1, a.get());
1181      }}
# Line 895 | Line 1183 | public class CompletableFutureTest exten
1183      /**
1184       * runAsync completes after running Runnable
1185       */
1186 <    public void testRunAsync() {
1187 <        Noop r = new Noop();
1188 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1189 <        assertNull(f.join());
1190 <        assertEquals(1, r.invocationCount);
1191 <        checkCompletedNormally(f, null);
1192 <    }
1193 <
1194 <    /**
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);
1186 >    public void testRunAsync_normalCompletion() {
1187 >        ExecutionMode[] executionModes = {
1188 >            ExecutionMode.ASYNC,
1189 >            ExecutionMode.EXECUTOR,
1190 >        };
1191 >        for (ExecutionMode m : executionModes)
1192 >    {
1193 >        final Noop r = new Noop(m);
1194 >        final CompletableFuture<Void> f = m.runAsync(r);
1195          assertNull(f.join());
914        assertEquals(1, r.invocationCount);
1196          checkCompletedNormally(f, null);
1197 <        assertEquals(1, exec.count.get());
1198 <    }
1197 >        r.assertInvoked();
1198 >    }}
1199  
1200      /**
1201       * failing runAsync completes exceptionally after running Runnable
1202       */
1203 <    public void testRunAsync3() {
1204 <        FailingNoop r = new FailingNoop();
1205 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1203 >    public void testRunAsync_exceptionalCompletion() {
1204 >        ExecutionMode[] executionModes = {
1205 >            ExecutionMode.ASYNC,
1206 >            ExecutionMode.EXECUTOR,
1207 >        };
1208 >        for (ExecutionMode m : executionModes)
1209 >    {
1210 >        final FailingRunnable r = new FailingRunnable(m);
1211 >        final CompletableFuture<Void> f = m.runAsync(r);
1212          checkCompletedWithWrappedCFException(f);
1213 <        assertEquals(1, r.invocationCount);
1214 <    }
1213 >        r.assertInvoked();
1214 >    }}
1215  
1216      /**
1217       * supplyAsync completes with result of supplier
1218       */
1219 <    public void testSupplyAsync() {
1220 <        CompletableFuture<Integer> f;
1221 <        f = CompletableFuture.supplyAsync(supplyOne);
1222 <        assertEquals(f.join(), one);
1223 <        checkCompletedNormally(f, one);
1224 <    }
1225 <
1226 <    /**
1227 <     * supplyAsync with executor completes with result of supplier
1228 <     */
1229 <    public void testSupplyAsync2() {
1230 <        CompletableFuture<Integer> f;
1231 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1232 <        assertEquals(f.join(), one);
946 <        checkCompletedNormally(f, one);
947 <    }
1219 >    public void testSupplyAsync_normalCompletion() {
1220 >        ExecutionMode[] executionModes = {
1221 >            ExecutionMode.ASYNC,
1222 >            ExecutionMode.EXECUTOR,
1223 >        };
1224 >        for (ExecutionMode m : executionModes)
1225 >        for (Integer v1 : new Integer[] { 1, null })
1226 >    {
1227 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1228 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1229 >        assertSame(v1, f.join());
1230 >        checkCompletedNormally(f, v1);
1231 >        r.assertInvoked();
1232 >    }}
1233  
1234      /**
1235       * Failing supplyAsync completes exceptionally
1236       */
1237 <    public void testSupplyAsync3() {
1238 <        FailingSupplier r = new FailingSupplier();
1239 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1237 >    public void testSupplyAsync_exceptionalCompletion() {
1238 >        ExecutionMode[] executionModes = {
1239 >            ExecutionMode.ASYNC,
1240 >            ExecutionMode.EXECUTOR,
1241 >        };
1242 >        for (ExecutionMode m : executionModes)
1243 >    {
1244 >        FailingSupplier r = new FailingSupplier(m);
1245 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1246          checkCompletedWithWrappedCFException(f);
1247 <        assertEquals(1, r.invocationCount);
1248 <    }
1247 >        r.assertInvoked();
1248 >    }}
1249  
1250      // seq completion methods
1251  
1252      /**
1253       * thenRun result completes normally after normal completion of source
1254       */
1255 <    public void testThenRun() {
965 <        CompletableFuture<Integer> f;
966 <        CompletableFuture<Void> g;
967 <        Noop r;
968 <
969 <        f = new CompletableFuture<>();
970 <        g = f.thenRun(r = new Noop());
971 <        f.complete(null);
972 <        checkCompletedNormally(g, null);
973 <        assertEquals(1, r.invocationCount);
974 <
975 <        f = new CompletableFuture<>();
976 <        f.complete(null);
977 <        g = f.thenRun(r = new Noop());
978 <        checkCompletedNormally(g, null);
979 <        assertEquals(1, r.invocationCount);
980 <    }
981 <
982 <    /**
983 <     * thenRun result completes exceptionally after exceptional
984 <     * completion of source
985 <     */
986 <    public void testThenRun2() {
987 <        CompletableFuture<Integer> f;
988 <        CompletableFuture<Void> g;
989 <        Noop r;
990 <
991 <        f = new CompletableFuture<>();
992 <        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);
1016 <
1017 <        f = new CompletableFuture<>();
1018 <        f.complete(null);
1019 <        g = f.thenRun(r = new FailingNoop());
1020 <        checkCompletedWithWrappedCFException(g);
1021 <    }
1022 <
1023 <    /**
1024 <     * thenRun result completes exceptionally if source cancelled
1025 <     */
1026 <    public void testThenRun4() {
1027 <        CompletableFuture<Integer> f;
1028 <        CompletableFuture<Void> g;
1029 <        Noop r;
1030 <
1031 <        f = new CompletableFuture<>();
1032 <        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 <    }
1118 <
1119 <    /**
1120 <     * thenAccept result completes exceptionally if source cancelled
1121 <     */
1122 <    public void testThenAccept4() {
1123 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1124 <        IncAction r = new IncAction();
1125 <        CompletableFuture<Void> g = f.thenAccept(r);
1126 <        assertTrue(f.cancel(true));
1127 <        checkCompletedWithWrappedCancellationException(g);
1128 <    }
1129 <
1130 <    /**
1131 <     * thenCombine result completes normally after normal completion
1132 <     * of sources
1133 <     */
1134 <    public void testThenCombine_normalCompletion1() {
1135 <        for (boolean createIncomplete : new boolean[] { true, false })
1136 <        for (boolean fFirst : new boolean[] { true, false })
1255 >    public void testThenRun_normalCompletion() {
1256          for (ExecutionMode m : ExecutionMode.values())
1257 +        for (boolean createIncomplete : new boolean[] { true, false })
1258          for (Integer v1 : new Integer[] { 1, null })
1139        for (Integer v2 : new Integer[] { 2, null })
1259      {
1260          final CompletableFuture<Integer> f = new CompletableFuture<>();
1261 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1262 <        final SubtractFunction r = new SubtractFunction();
1263 <        CompletableFuture<Integer> h = null;
1264 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1265 <
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)
1261 >        final Noop r = new Noop(m);
1262 >        if (!createIncomplete) f.complete(v1);
1263 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1264 >        if (createIncomplete) {
1265 >            checkIncomplete(g);
1266              f.complete(v1);
1267 <        else
1156 <            g.complete(v2);
1157 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1267 >        }
1268  
1269 <        checkCompletedNormally(h, subtract(v1, v2));
1269 >        checkCompletedNormally(g, null);
1270          checkCompletedNormally(f, v1);
1271 <        checkCompletedNormally(g, v2);
1162 <        assertEquals(1, r.invocationCount);
1271 >        r.assertInvoked();
1272      }}
1273  
1274      /**
1275 <     * thenCombine result completes exceptionally after exceptional
1276 <     * completion of either source
1275 >     * thenRun result completes exceptionally after exceptional
1276 >     * completion of source
1277       */
1278 <    public void testThenCombine_exceptionalCompletion1() {
1278 >    public void testThenRun_exceptionalCompletion() {
1279          for (ExecutionMode m : ExecutionMode.values())
1280 <        for (Integer v1 : new Integer[] { 1, null })
1280 >        for (boolean createIncomplete : new boolean[] { true, false })
1281      {
1173        final CompletableFuture<Integer> f = new CompletableFuture<>();
1174        final CompletableFuture<Integer> g = new CompletableFuture<>();
1175        final SubtractFunction r = new SubtractFunction();
1176        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1282          final CFException ex = new CFException();
1178
1179        f.completeExceptionally(ex);
1180        checkIncomplete(h);
1181        g.complete(v1);
1182
1183        checkCompletedWithWrappedCFException(h, ex);
1184        checkCompletedWithWrappedCFException(f, ex);
1185        assertEquals(0, r.invocationCount);
1186        checkCompletedNormally(g, v1);
1187    }}
1188
1189    public void testThenCombine_exceptionalCompletion2() {
1190        for (ExecutionMode m : ExecutionMode.values())
1191        for (Integer v1 : new Integer[] { 1, null })
1192    {
1283          final CompletableFuture<Integer> f = new CompletableFuture<>();
1284 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1285 <        final SubtractFunction r = new SubtractFunction();
1286 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1287 <        final CFException ex = new CFException();
1288 <
1289 <        g.completeExceptionally(ex);
1290 <        checkIncomplete(h);
1201 <        f.complete(v1);
1284 >        final Noop r = new Noop(m);
1285 >        if (!createIncomplete) f.completeExceptionally(ex);
1286 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1287 >        if (createIncomplete) {
1288 >            checkIncomplete(g);
1289 >            f.completeExceptionally(ex);
1290 >        }
1291  
1292 <        checkCompletedWithWrappedCFException(h, ex);
1293 <        checkCompletedWithWrappedCFException(g, ex);
1294 <        assertEquals(0, r.invocationCount);
1206 <        checkCompletedNormally(f, v1);
1292 >        checkCompletedWithWrappedException(g, ex);
1293 >        checkCompletedExceptionally(f, ex);
1294 >        r.assertNotInvoked();
1295      }}
1296  
1297 <    public void testThenCombine_exceptionalCompletion3() {
1297 >    /**
1298 >     * thenRun result completes exceptionally if source cancelled
1299 >     */
1300 >    public void testThenRun_sourceCancelled() {
1301          for (ExecutionMode m : ExecutionMode.values())
1302 <        for (Integer v1 : new Integer[] { 1, null })
1302 >        for (boolean createIncomplete : new boolean[] { true, false })
1303 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1304      {
1305          final CompletableFuture<Integer> f = new CompletableFuture<>();
1306 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1307 <        final SubtractFunction r = new SubtractFunction();
1308 <        final CFException ex = new CFException();
1309 <
1310 <        g.completeExceptionally(ex);
1311 <        f.complete(v1);
1312 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1306 >        final Noop r = new Noop(m);
1307 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1308 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1309 >        if (createIncomplete) {
1310 >            checkIncomplete(g);
1311 >            assertTrue(f.cancel(mayInterruptIfRunning));
1312 >        }
1313  
1314 <        checkCompletedWithWrappedCFException(h, ex);
1315 <        checkCompletedWithWrappedCFException(g, ex);
1316 <        assertEquals(0, r.invocationCount);
1225 <        checkCompletedNormally(f, v1);
1314 >        checkCompletedWithWrappedCancellationException(g);
1315 >        checkCancelled(f);
1316 >        r.assertNotInvoked();
1317      }}
1318  
1319 <    public void testThenCombine_exceptionalCompletion4() {
1319 >    /**
1320 >     * thenRun result completes exceptionally if action does
1321 >     */
1322 >    public void testThenRun_actionFailed() {
1323          for (ExecutionMode m : ExecutionMode.values())
1324 +        for (boolean createIncomplete : new boolean[] { true, false })
1325          for (Integer v1 : new Integer[] { 1, null })
1326      {
1327          final CompletableFuture<Integer> f = new CompletableFuture<>();
1328 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1329 <        final SubtractFunction r = new SubtractFunction();
1330 <        final CFException ex = new CFException();
1331 <
1332 <        f.completeExceptionally(ex);
1333 <        g.complete(v1);
1334 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1328 >        final FailingRunnable r = new FailingRunnable(m);
1329 >        if (!createIncomplete) f.complete(v1);
1330 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1331 >        if (createIncomplete) {
1332 >            checkIncomplete(g);
1333 >            f.complete(v1);
1334 >        }
1335  
1336 <        checkCompletedWithWrappedCFException(h, ex);
1337 <        checkCompletedWithWrappedCFException(f, ex);
1243 <        assertEquals(0, r.invocationCount);
1244 <        checkCompletedNormally(g, v1);
1336 >        checkCompletedWithWrappedCFException(g);
1337 >        checkCompletedNormally(f, v1);
1338      }}
1339  
1340      /**
1341 <     * thenCombine result completes exceptionally if action does
1341 >     * thenApply result completes normally after normal completion of source
1342       */
1343 <    public void testThenCombine_actionFailed1() {
1343 >    public void testThenApply_normalCompletion() {
1344          for (ExecutionMode m : ExecutionMode.values())
1345 +        for (boolean createIncomplete : new boolean[] { true, false })
1346          for (Integer v1 : new Integer[] { 1, null })
1253        for (Integer v2 : new Integer[] { 2, null })
1347      {
1348          final CompletableFuture<Integer> f = new CompletableFuture<>();
1349 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1350 <        final FailingBiFunction r = new FailingBiFunction();
1351 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1352 <
1353 <        f.complete(v1);
1354 <        checkIncomplete(h);
1355 <        g.complete(v2);
1349 >        final IncFunction r = new IncFunction(m);
1350 >        if (!createIncomplete) f.complete(v1);
1351 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1352 >        if (createIncomplete) {
1353 >            checkIncomplete(g);
1354 >            f.complete(v1);
1355 >        }
1356  
1357 <        checkCompletedWithWrappedCFException(h);
1357 >        checkCompletedNormally(g, inc(v1));
1358          checkCompletedNormally(f, v1);
1359 <        checkCompletedNormally(g, v2);
1359 >        r.assertValue(inc(v1));
1360      }}
1361  
1362 <    public void testThenCombine_actionFailed2() {
1362 >    /**
1363 >     * thenApply result completes exceptionally after exceptional
1364 >     * completion of source
1365 >     */
1366 >    public void testThenApply_exceptionalCompletion() {
1367          for (ExecutionMode m : ExecutionMode.values())
1368 <        for (Integer v1 : new Integer[] { 1, null })
1272 <        for (Integer v2 : new Integer[] { 2, null })
1368 >        for (boolean createIncomplete : new boolean[] { true, false })
1369      {
1370 +        final CFException ex = new CFException();
1371          final CompletableFuture<Integer> f = new CompletableFuture<>();
1372 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1373 <        final FailingBiFunction r = new FailingBiFunction();
1374 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1375 <
1376 <        g.complete(v2);
1377 <        checkIncomplete(h);
1378 <        f.complete(v1);
1372 >        final IncFunction r = new IncFunction(m);
1373 >        if (!createIncomplete) f.completeExceptionally(ex);
1374 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1375 >        if (createIncomplete) {
1376 >            checkIncomplete(g);
1377 >            f.completeExceptionally(ex);
1378 >        }
1379  
1380 <        checkCompletedWithWrappedCFException(h);
1381 <        checkCompletedNormally(f, v1);
1382 <        checkCompletedNormally(g, v2);
1380 >        checkCompletedWithWrappedException(g, ex);
1381 >        checkCompletedExceptionally(f, ex);
1382 >        r.assertNotInvoked();
1383      }}
1384  
1385      /**
1386 <     * thenCombine result completes exceptionally if either source cancelled
1386 >     * thenApply result completes exceptionally if source cancelled
1387       */
1388 <    public void testThenCombine_sourceCancelled1() {
1388 >    public void testThenApply_sourceCancelled() {
1389          for (ExecutionMode m : ExecutionMode.values())
1390 +        for (boolean createIncomplete : new boolean[] { true, false })
1391          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1294        for (Integer v1 : new Integer[] { 1, null })
1392      {
1393          final CompletableFuture<Integer> f = new CompletableFuture<>();
1394 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1395 <        final SubtractFunction r = new SubtractFunction();
1396 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1397 <
1398 <        assertTrue(f.cancel(mayInterruptIfRunning));
1399 <        checkIncomplete(h);
1400 <        g.complete(v1);
1394 >        final IncFunction r = new IncFunction(m);
1395 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1396 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1397 >        if (createIncomplete) {
1398 >            checkIncomplete(g);
1399 >            assertTrue(f.cancel(mayInterruptIfRunning));
1400 >        }
1401  
1402 <        checkCompletedWithWrappedCancellationException(h);
1402 >        checkCompletedWithWrappedCancellationException(g);
1403          checkCancelled(f);
1404 <        assertEquals(0, r.invocationCount);
1308 <        checkCompletedNormally(g, v1);
1404 >        r.assertNotInvoked();
1405      }}
1406  
1407 <    public void testThenCombine_sourceCancelled2() {
1407 >    /**
1408 >     * thenApply result completes exceptionally if action does
1409 >     */
1410 >    public void testThenApply_actionFailed() {
1411          for (ExecutionMode m : ExecutionMode.values())
1412 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1412 >        for (boolean createIncomplete : new boolean[] { true, false })
1413          for (Integer v1 : new Integer[] { 1, null })
1414      {
1415          final CompletableFuture<Integer> f = new CompletableFuture<>();
1416 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1417 <        final SubtractFunction r = new SubtractFunction();
1418 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1419 <
1420 <        assertTrue(g.cancel(mayInterruptIfRunning));
1421 <        checkIncomplete(h);
1422 <        f.complete(v1);
1416 >        final FailingFunction r = new FailingFunction(m);
1417 >        if (!createIncomplete) f.complete(v1);
1418 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1419 >        if (createIncomplete) {
1420 >            checkIncomplete(g);
1421 >            f.complete(v1);
1422 >        }
1423  
1424 <        checkCompletedWithWrappedCancellationException(h);
1326 <        checkCancelled(g);
1327 <        assertEquals(0, r.invocationCount);
1424 >        checkCompletedWithWrappedCFException(g);
1425          checkCompletedNormally(f, v1);
1426      }}
1427  
1428 <    public void testThenCombine_sourceCancelled3() {
1428 >    /**
1429 >     * thenAccept result completes normally after normal completion of source
1430 >     */
1431 >    public void testThenAccept_normalCompletion() {
1432          for (ExecutionMode m : ExecutionMode.values())
1433 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1433 >        for (boolean createIncomplete : new boolean[] { true, false })
1434          for (Integer v1 : new Integer[] { 1, null })
1435      {
1436          final CompletableFuture<Integer> f = new CompletableFuture<>();
1437 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1438 <        final SubtractFunction r = new SubtractFunction();
1439 <
1440 <        assertTrue(g.cancel(mayInterruptIfRunning));
1441 <        f.complete(v1);
1442 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1437 >        final NoopConsumer r = new NoopConsumer(m);
1438 >        if (!createIncomplete) f.complete(v1);
1439 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1440 >        if (createIncomplete) {
1441 >            checkIncomplete(g);
1442 >            f.complete(v1);
1443 >        }
1444  
1445 <        checkCompletedWithWrappedCancellationException(h);
1446 <        checkCancelled(g);
1346 <        assertEquals(0, r.invocationCount);
1445 >        checkCompletedNormally(g, null);
1446 >        r.assertValue(v1);
1447          checkCompletedNormally(f, v1);
1448      }}
1449  
1350    public void testThenCombine_sourceCancelled4() {
1351        for (ExecutionMode m : ExecutionMode.values())
1352        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1353        for (Integer v1 : new Integer[] { 1, null })
1354    {
1355        final CompletableFuture<Integer> f = new CompletableFuture<>();
1356        final CompletableFuture<Integer> g = new CompletableFuture<>();
1357        final SubtractFunction r = new SubtractFunction();
1358
1359        assertTrue(f.cancel(mayInterruptIfRunning));
1360        g.complete(v1);
1361        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1362
1363        checkCompletedWithWrappedCancellationException(h);
1364        checkCancelled(f);
1365        assertEquals(0, r.invocationCount);
1366        checkCompletedNormally(g, v1);
1367    }}
1368
1450      /**
1451 <     * thenAcceptBoth result completes normally after normal
1452 <     * completion of sources
1451 >     * thenAccept result completes exceptionally after exceptional
1452 >     * completion of source
1453       */
1454 <    public void testThenAcceptBoth_normalCompletion1() {
1454 >    public void testThenAccept_exceptionalCompletion() {
1455          for (ExecutionMode m : ExecutionMode.values())
1456 <        for (Integer v1 : new Integer[] { 1, null })
1376 <        for (Integer v2 : new Integer[] { 2, null })
1456 >        for (boolean createIncomplete : new boolean[] { true, false })
1457      {
1458 +        final CFException ex = new CFException();
1459          final CompletableFuture<Integer> f = new CompletableFuture<>();
1460 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1461 <        final SubtractAction r = new SubtractAction();
1462 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1463 <
1464 <        f.complete(v1);
1465 <        checkIncomplete(h);
1466 <        assertEquals(0, r.invocationCount);
1386 <        g.complete(v2);
1460 >        final NoopConsumer r = new NoopConsumer(m);
1461 >        if (!createIncomplete) f.completeExceptionally(ex);
1462 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1463 >        if (createIncomplete) {
1464 >            checkIncomplete(g);
1465 >            f.completeExceptionally(ex);
1466 >        }
1467  
1468 <        checkCompletedNormally(h, null);
1469 <        assertEquals(subtract(v1, v2), r.value);
1470 <        checkCompletedNormally(f, v1);
1391 <        checkCompletedNormally(g, v2);
1468 >        checkCompletedWithWrappedException(g, ex);
1469 >        checkCompletedExceptionally(f, ex);
1470 >        r.assertNotInvoked();
1471      }}
1472  
1473 <    public void testThenAcceptBoth_normalCompletion2() {
1473 >    /**
1474 >     * thenAccept result completes exceptionally if source cancelled
1475 >     */
1476 >    public void testThenAccept_sourceCancelled() {
1477          for (ExecutionMode m : ExecutionMode.values())
1478 <        for (Integer v1 : new Integer[] { 1, null })
1479 <        for (Integer v2 : new Integer[] { 2, null })
1478 >        for (boolean createIncomplete : new boolean[] { true, false })
1479 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1480      {
1481          final CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1483 <        final SubtractAction r = new SubtractAction();
1484 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1485 <
1486 <        g.complete(v2);
1487 <        checkIncomplete(h);
1488 <        assertEquals(0, r.invocationCount);
1407 <        f.complete(v1);
1482 >        final NoopConsumer r = new NoopConsumer(m);
1483 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1484 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1485 >        if (createIncomplete) {
1486 >            checkIncomplete(g);
1487 >            assertTrue(f.cancel(mayInterruptIfRunning));
1488 >        }
1489  
1490 <        checkCompletedNormally(h, null);
1491 <        assertEquals(subtract(v1, v2), r.value);
1492 <        checkCompletedNormally(f, v1);
1412 <        checkCompletedNormally(g, v2);
1490 >        checkCompletedWithWrappedCancellationException(g);
1491 >        checkCancelled(f);
1492 >        r.assertNotInvoked();
1493      }}
1494  
1495 <    public void testThenAcceptBoth_normalCompletion3() {
1495 >    /**
1496 >     * thenAccept result completes exceptionally if action does
1497 >     */
1498 >    public void testThenAccept_actionFailed() {
1499          for (ExecutionMode m : ExecutionMode.values())
1500 +        for (boolean createIncomplete : new boolean[] { true, false })
1501          for (Integer v1 : new Integer[] { 1, null })
1418        for (Integer v2 : new Integer[] { 2, null })
1502      {
1503          final CompletableFuture<Integer> f = new CompletableFuture<>();
1504 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1505 <        final SubtractAction r = new SubtractAction();
1506 <
1507 <        g.complete(v2);
1508 <        f.complete(v1);
1509 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1504 >        final FailingConsumer r = new FailingConsumer(m);
1505 >        if (!createIncomplete) f.complete(v1);
1506 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1507 >        if (createIncomplete) {
1508 >            checkIncomplete(g);
1509 >            f.complete(v1);
1510 >        }
1511  
1512 <        checkCompletedNormally(h, null);
1429 <        assertEquals(subtract(v1, v2), r.value);
1512 >        checkCompletedWithWrappedCFException(g);
1513          checkCompletedNormally(f, v1);
1431        checkCompletedNormally(g, v2);
1514      }}
1515  
1516 <    public void testThenAcceptBoth_normalCompletion4() {
1516 >    /**
1517 >     * thenCombine result completes normally after normal completion
1518 >     * of sources
1519 >     */
1520 >    public void testThenCombine_normalCompletion() {
1521          for (ExecutionMode m : ExecutionMode.values())
1522 +        for (boolean createIncomplete : new boolean[] { true, false })
1523 +        for (boolean fFirst : new boolean[] { true, false })
1524          for (Integer v1 : new Integer[] { 1, null })
1525          for (Integer v2 : new Integer[] { 2, null })
1526      {
1527          final CompletableFuture<Integer> f = new CompletableFuture<>();
1528          final CompletableFuture<Integer> g = new CompletableFuture<>();
1529 <        final SubtractAction r = new SubtractAction();
1529 >        final SubtractFunction r = new SubtractFunction(m);
1530  
1531 <        f.complete(v1);
1532 <        g.complete(v2);
1533 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1531 >        if (fFirst) f.complete(v1); else g.complete(v2);
1532 >        if (!createIncomplete)
1533 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1534 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1535 >        if (createIncomplete) {
1536 >            checkIncomplete(h);
1537 >            r.assertNotInvoked();
1538 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1539 >        }
1540  
1541 <        checkCompletedNormally(h, null);
1448 <        assertEquals(subtract(v1, v2), r.value);
1541 >        checkCompletedNormally(h, subtract(v1, v2));
1542          checkCompletedNormally(f, v1);
1543          checkCompletedNormally(g, v2);
1544 +        r.assertValue(subtract(v1, v2));
1545      }}
1546  
1547      /**
1548 <     * thenAcceptBoth result completes exceptionally after exceptional
1548 >     * thenCombine result completes exceptionally after exceptional
1549       * completion of either source
1550       */
1551 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1458 <        for (ExecutionMode m : ExecutionMode.values())
1459 <        for (Integer v1 : new Integer[] { 1, null })
1460 <    {
1461 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1462 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1463 <        final SubtractAction r = new SubtractAction();
1464 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1465 <        final CFException ex = new CFException();
1466 <
1467 <        f.completeExceptionally(ex);
1468 <        checkIncomplete(h);
1469 <        g.complete(v1);
1470 <
1471 <        checkCompletedWithWrappedCFException(h, ex);
1472 <        checkCompletedWithWrappedCFException(f, ex);
1473 <        assertEquals(0, r.invocationCount);
1474 <        checkCompletedNormally(g, v1);
1475 <    }}
1476 <
1477 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1478 <        for (ExecutionMode m : ExecutionMode.values())
1479 <        for (Integer v1 : new Integer[] { 1, null })
1480 <    {
1481 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1483 <        final SubtractAction r = new SubtractAction();
1484 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1485 <        final CFException ex = new CFException();
1486 <
1487 <        g.completeExceptionally(ex);
1488 <        checkIncomplete(h);
1489 <        f.complete(v1);
1490 <
1491 <        checkCompletedWithWrappedCFException(h, ex);
1492 <        checkCompletedWithWrappedCFException(g, ex);
1493 <        assertEquals(0, r.invocationCount);
1494 <        checkCompletedNormally(f, v1);
1495 <    }}
1496 <
1497 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1551 >    public void testThenCombine_exceptionalCompletion() {
1552          for (ExecutionMode m : ExecutionMode.values())
1553 +        for (boolean createIncomplete : new boolean[] { true, false })
1554 +        for (boolean fFirst : new boolean[] { true, false })
1555          for (Integer v1 : new Integer[] { 1, null })
1556      {
1557          final CompletableFuture<Integer> f = new CompletableFuture<>();
1558          final CompletableFuture<Integer> g = new CompletableFuture<>();
1503        final SubtractAction r = new SubtractAction();
1559          final CFException ex = new CFException();
1560 +        final SubtractFunction r = new SubtractFunction(m);
1561  
1562 <        g.completeExceptionally(ex);
1563 <        f.complete(v1);
1564 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1562 >        (fFirst ? f : g).complete(v1);
1563 >        if (!createIncomplete)
1564 >            (!fFirst ? f : g).completeExceptionally(ex);
1565 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1566 >        if (createIncomplete) {
1567 >            checkIncomplete(h);
1568 >            (!fFirst ? f : g).completeExceptionally(ex);
1569 >        }
1570  
1571 <        checkCompletedWithWrappedCFException(h, ex);
1572 <        checkCompletedWithWrappedCFException(g, ex);
1573 <        assertEquals(0, r.invocationCount);
1574 <        checkCompletedNormally(f, v1);
1571 >        checkCompletedWithWrappedException(h, ex);
1572 >        r.assertNotInvoked();
1573 >        checkCompletedNormally(fFirst ? f : g, v1);
1574 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1575      }}
1576  
1577 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1577 >    /**
1578 >     * thenCombine result completes exceptionally if either source cancelled
1579 >     */
1580 >    public void testThenCombine_sourceCancelled() {
1581          for (ExecutionMode m : ExecutionMode.values())
1582 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1583 +        for (boolean createIncomplete : new boolean[] { true, false })
1584 +        for (boolean fFirst : new boolean[] { true, false })
1585          for (Integer v1 : new Integer[] { 1, null })
1586      {
1587          final CompletableFuture<Integer> f = new CompletableFuture<>();
1588          final CompletableFuture<Integer> g = new CompletableFuture<>();
1589 <        final SubtractAction r = new SubtractAction();
1523 <        final CFException ex = new CFException();
1589 >        final SubtractFunction r = new SubtractFunction(m);
1590  
1591 <        f.completeExceptionally(ex);
1592 <        g.complete(v1);
1593 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1591 >        (fFirst ? f : g).complete(v1);
1592 >        if (!createIncomplete)
1593 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1594 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1595 >        if (createIncomplete) {
1596 >            checkIncomplete(h);
1597 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1598 >        }
1599  
1600 <        checkCompletedWithWrappedCFException(h, ex);
1601 <        checkCompletedWithWrappedCFException(f, ex);
1602 <        assertEquals(0, r.invocationCount);
1603 <        checkCompletedNormally(g, v1);
1600 >        checkCompletedWithWrappedCancellationException(h);
1601 >        checkCancelled(!fFirst ? f : g);
1602 >        r.assertNotInvoked();
1603 >        checkCompletedNormally(fFirst ? f : g, v1);
1604      }}
1605  
1606      /**
1607 <     * thenAcceptBoth result completes exceptionally if action does
1607 >     * thenCombine result completes exceptionally if action does
1608       */
1609 <    public void testThenAcceptBoth_actionFailed1() {
1609 >    public void testThenCombine_actionFailed() {
1610          for (ExecutionMode m : ExecutionMode.values())
1611 +        for (boolean fFirst : new boolean[] { true, false })
1612          for (Integer v1 : new Integer[] { 1, null })
1613          for (Integer v2 : new Integer[] { 2, null })
1614      {
1615          final CompletableFuture<Integer> f = new CompletableFuture<>();
1616          final CompletableFuture<Integer> g = new CompletableFuture<>();
1617 <        final FailingBiConsumer r = new FailingBiConsumer();
1618 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1617 >        final FailingBiFunction r = new FailingBiFunction(m);
1618 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1619  
1620 <        f.complete(v1);
1621 <        checkIncomplete(h);
1622 <        g.complete(v2);
1620 >        if (fFirst) {
1621 >            f.complete(v1);
1622 >            g.complete(v2);
1623 >        } else {
1624 >            g.complete(v2);
1625 >            f.complete(v1);
1626 >        }
1627  
1628          checkCompletedWithWrappedCFException(h);
1629          checkCompletedNormally(f, v1);
1630          checkCompletedNormally(g, v2);
1631      }}
1632  
1633 <    public void testThenAcceptBoth_actionFailed2() {
1633 >    /**
1634 >     * thenAcceptBoth result completes normally after normal
1635 >     * completion of sources
1636 >     */
1637 >    public void testThenAcceptBoth_normalCompletion() {
1638          for (ExecutionMode m : ExecutionMode.values())
1639 +        for (boolean createIncomplete : new boolean[] { true, false })
1640 +        for (boolean fFirst : new boolean[] { true, false })
1641          for (Integer v1 : new Integer[] { 1, null })
1642          for (Integer v2 : new Integer[] { 2, null })
1643      {
1644          final CompletableFuture<Integer> f = new CompletableFuture<>();
1645          final CompletableFuture<Integer> g = new CompletableFuture<>();
1646 <        final FailingBiConsumer r = new FailingBiConsumer();
1565 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1646 >        final SubtractAction r = new SubtractAction(m);
1647  
1648 <        g.complete(v2);
1649 <        checkIncomplete(h);
1650 <        f.complete(v1);
1648 >        if (fFirst) f.complete(v1); else g.complete(v2);
1649 >        if (!createIncomplete)
1650 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1651 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1652 >        if (createIncomplete) {
1653 >            checkIncomplete(h);
1654 >            r.assertNotInvoked();
1655 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1656 >        }
1657  
1658 <        checkCompletedWithWrappedCFException(h);
1658 >        checkCompletedNormally(h, null);
1659 >        r.assertValue(subtract(v1, v2));
1660          checkCompletedNormally(f, v1);
1661          checkCompletedNormally(g, v2);
1662      }}
1663  
1664      /**
1665 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1665 >     * thenAcceptBoth result completes exceptionally after exceptional
1666 >     * completion of either source
1667       */
1668 <    public void testThenAcceptBoth_sourceCancelled1() {
1668 >    public void testThenAcceptBoth_exceptionalCompletion() {
1669          for (ExecutionMode m : ExecutionMode.values())
1670 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1671 <        for (Integer v1 : new Integer[] { 1, null })
1583 <    {
1584 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1585 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1586 <        final SubtractAction r = new SubtractAction();
1587 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1588 <
1589 <        assertTrue(f.cancel(mayInterruptIfRunning));
1590 <        checkIncomplete(h);
1591 <        g.complete(v1);
1592 <
1593 <        checkCompletedWithWrappedCancellationException(h);
1594 <        checkCancelled(f);
1595 <        assertEquals(0, r.invocationCount);
1596 <        checkCompletedNormally(g, v1);
1597 <    }}
1598 <
1599 <    public void testThenAcceptBoth_sourceCancelled2() {
1600 <        for (ExecutionMode m : ExecutionMode.values())
1601 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1602 <        for (Integer v1 : new Integer[] { 1, null })
1603 <    {
1604 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1605 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1606 <        final SubtractAction r = new SubtractAction();
1607 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1608 <
1609 <        assertTrue(g.cancel(mayInterruptIfRunning));
1610 <        checkIncomplete(h);
1611 <        f.complete(v1);
1612 <
1613 <        checkCompletedWithWrappedCancellationException(h);
1614 <        checkCancelled(g);
1615 <        assertEquals(0, r.invocationCount);
1616 <        checkCompletedNormally(f, v1);
1617 <    }}
1618 <
1619 <    public void testThenAcceptBoth_sourceCancelled3() {
1620 <        for (ExecutionMode m : ExecutionMode.values())
1621 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1670 >        for (boolean createIncomplete : new boolean[] { true, false })
1671 >        for (boolean fFirst : new boolean[] { true, false })
1672          for (Integer v1 : new Integer[] { 1, null })
1673      {
1674          final CompletableFuture<Integer> f = new CompletableFuture<>();
1675          final CompletableFuture<Integer> g = new CompletableFuture<>();
1676 <        final SubtractAction r = new SubtractAction();
1676 >        final CFException ex = new CFException();
1677 >        final SubtractAction r = new SubtractAction(m);
1678  
1679 <        assertTrue(g.cancel(mayInterruptIfRunning));
1680 <        f.complete(v1);
1679 >        (fFirst ? f : g).complete(v1);
1680 >        if (!createIncomplete)
1681 >            (!fFirst ? f : g).completeExceptionally(ex);
1682          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1683 +        if (createIncomplete) {
1684 +            checkIncomplete(h);
1685 +            (!fFirst ? f : g).completeExceptionally(ex);
1686 +        }
1687  
1688 <        checkCompletedWithWrappedCancellationException(h);
1689 <        checkCancelled(g);
1690 <        assertEquals(0, r.invocationCount);
1691 <        checkCompletedNormally(f, v1);
1688 >        checkCompletedWithWrappedException(h, ex);
1689 >        r.assertNotInvoked();
1690 >        checkCompletedNormally(fFirst ? f : g, v1);
1691 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1692      }}
1693  
1694 <    public void testThenAcceptBoth_sourceCancelled4() {
1694 >    /**
1695 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1696 >     */
1697 >    public void testThenAcceptBoth_sourceCancelled() {
1698          for (ExecutionMode m : ExecutionMode.values())
1699          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1700 +        for (boolean createIncomplete : new boolean[] { true, false })
1701 +        for (boolean fFirst : new boolean[] { true, false })
1702          for (Integer v1 : new Integer[] { 1, null })
1703      {
1704          final CompletableFuture<Integer> f = new CompletableFuture<>();
1705          final CompletableFuture<Integer> g = new CompletableFuture<>();
1706 <        final SubtractAction r = new SubtractAction();
1706 >        final SubtractAction r = new SubtractAction(m);
1707  
1708 <        assertTrue(f.cancel(mayInterruptIfRunning));
1709 <        g.complete(v1);
1708 >        (fFirst ? f : g).complete(v1);
1709 >        if (!createIncomplete)
1710 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1711          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1712 +        if (createIncomplete) {
1713 +            checkIncomplete(h);
1714 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1715 +        }
1716  
1717          checkCompletedWithWrappedCancellationException(h);
1718 <        checkCancelled(f);
1719 <        assertEquals(0, r.invocationCount);
1720 <        checkCompletedNormally(g, v1);
1718 >        checkCancelled(!fFirst ? f : g);
1719 >        r.assertNotInvoked();
1720 >        checkCompletedNormally(fFirst ? f : g, v1);
1721      }}
1722  
1723      /**
1724 <     * runAfterBoth result completes normally after normal
1659 <     * completion of sources
1724 >     * thenAcceptBoth result completes exceptionally if action does
1725       */
1726 <    public void testRunAfterBoth_normalCompletion1() {
1662 <        for (ExecutionMode m : ExecutionMode.values())
1663 <        for (Integer v1 : new Integer[] { 1, null })
1664 <        for (Integer v2 : new Integer[] { 2, null })
1665 <    {
1666 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final Noop r = new Noop();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 <
1671 <        f.complete(v1);
1672 <        checkIncomplete(h);
1673 <        assertEquals(0, r.invocationCount);
1674 <        g.complete(v2);
1675 <
1676 <        checkCompletedNormally(h, null);
1677 <        assertEquals(1, r.invocationCount);
1678 <        checkCompletedNormally(f, v1);
1679 <        checkCompletedNormally(g, v2);
1680 <    }}
1681 <
1682 <    public void testRunAfterBoth_normalCompletion2() {
1683 <        for (ExecutionMode m : ExecutionMode.values())
1684 <        for (Integer v1 : new Integer[] { 1, null })
1685 <        for (Integer v2 : new Integer[] { 2, null })
1686 <    {
1687 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1688 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1689 <        final Noop r = new Noop();
1690 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1691 <
1692 <        g.complete(v2);
1693 <        checkIncomplete(h);
1694 <        assertEquals(0, r.invocationCount);
1695 <        f.complete(v1);
1696 <
1697 <        checkCompletedNormally(h, null);
1698 <        assertEquals(1, r.invocationCount);
1699 <        checkCompletedNormally(f, v1);
1700 <        checkCompletedNormally(g, v2);
1701 <    }}
1702 <
1703 <    public void testRunAfterBoth_normalCompletion3() {
1726 >    public void testThenAcceptBoth_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      {
1732          final CompletableFuture<Integer> f = new CompletableFuture<>();
1733          final CompletableFuture<Integer> g = new CompletableFuture<>();
1734 <        final Noop r = new Noop();
1734 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1735 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1736  
1737 <        g.complete(v2);
1738 <        f.complete(v1);
1739 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1737 >        if (fFirst) {
1738 >            f.complete(v1);
1739 >            g.complete(v2);
1740 >        } else {
1741 >            g.complete(v2);
1742 >            f.complete(v1);
1743 >        }
1744  
1745 <        checkCompletedNormally(h, null);
1717 <        assertEquals(1, r.invocationCount);
1745 >        checkCompletedWithWrappedCFException(h);
1746          checkCompletedNormally(f, v1);
1747          checkCompletedNormally(g, v2);
1748      }}
1749  
1750 <    public void testRunAfterBoth_normalCompletion4() {
1750 >    /**
1751 >     * runAfterBoth result completes normally after normal
1752 >     * completion of sources
1753 >     */
1754 >    public void testRunAfterBoth_normalCompletion() {
1755          for (ExecutionMode m : ExecutionMode.values())
1756 +        for (boolean createIncomplete : new boolean[] { true, false })
1757 +        for (boolean fFirst : new boolean[] { true, false })
1758          for (Integer v1 : new Integer[] { 1, null })
1759          for (Integer v2 : new Integer[] { 2, null })
1760      {
1761          final CompletableFuture<Integer> f = new CompletableFuture<>();
1762          final CompletableFuture<Integer> g = new CompletableFuture<>();
1763 <        final Noop r = new Noop();
1763 >        final Noop r = new Noop(m);
1764  
1765 <        f.complete(v1);
1766 <        g.complete(v2);
1765 >        if (fFirst) f.complete(v1); else g.complete(v2);
1766 >        if (!createIncomplete)
1767 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1768          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1769 +        if (createIncomplete) {
1770 +            checkIncomplete(h);
1771 +            r.assertNotInvoked();
1772 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1773 +        }
1774  
1775          checkCompletedNormally(h, null);
1776 <        assertEquals(1, r.invocationCount);
1776 >        r.assertInvoked();
1777          checkCompletedNormally(f, v1);
1778          checkCompletedNormally(g, v2);
1779      }}
# Line 1742 | Line 1782 | public class CompletableFutureTest exten
1782       * runAfterBoth result completes exceptionally after exceptional
1783       * completion of either source
1784       */
1785 <    public void testRunAfterBoth_exceptionalCompletion1() {
1746 <        for (ExecutionMode m : ExecutionMode.values())
1747 <        for (Integer v1 : new Integer[] { 1, null })
1748 <    {
1749 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1750 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1751 <        final Noop r = new Noop();
1752 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1753 <        final CFException ex = new CFException();
1754 <
1755 <        f.completeExceptionally(ex);
1756 <        checkIncomplete(h);
1757 <        g.complete(v1);
1758 <
1759 <        checkCompletedWithWrappedCFException(h, ex);
1760 <        checkCompletedWithWrappedCFException(f, ex);
1761 <        assertEquals(0, r.invocationCount);
1762 <        checkCompletedNormally(g, v1);
1763 <    }}
1764 <
1765 <    public void testRunAfterBoth_exceptionalCompletion2() {
1766 <        for (ExecutionMode m : ExecutionMode.values())
1767 <        for (Integer v1 : new Integer[] { 1, null })
1768 <    {
1769 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1770 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1771 <        final Noop r = new Noop();
1772 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1773 <        final CFException ex = new CFException();
1774 <
1775 <        g.completeExceptionally(ex);
1776 <        checkIncomplete(h);
1777 <        f.complete(v1);
1778 <
1779 <        checkCompletedWithWrappedCFException(h, ex);
1780 <        checkCompletedWithWrappedCFException(g, ex);
1781 <        assertEquals(0, r.invocationCount);
1782 <        checkCompletedNormally(f, v1);
1783 <    }}
1784 <
1785 <    public void testRunAfterBoth_exceptionalCompletion3() {
1786 <        for (ExecutionMode m : ExecutionMode.values())
1787 <        for (Integer v1 : new Integer[] { 1, null })
1788 <    {
1789 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1790 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1791 <        final Noop r = new Noop();
1792 <        final CFException ex = new CFException();
1793 <
1794 <        g.completeExceptionally(ex);
1795 <        f.complete(v1);
1796 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1797 <
1798 <        checkCompletedWithWrappedCFException(h, ex);
1799 <        checkCompletedWithWrappedCFException(g, ex);
1800 <        assertEquals(0, r.invocationCount);
1801 <        checkCompletedNormally(f, v1);
1802 <    }}
1803 <
1804 <    public void testRunAfterBoth_exceptionalCompletion4() {
1785 >    public void testRunAfterBoth_exceptionalCompletion() {
1786          for (ExecutionMode m : ExecutionMode.values())
1787 +        for (boolean createIncomplete : new boolean[] { true, false })
1788 +        for (boolean fFirst : new boolean[] { true, false })
1789          for (Integer v1 : new Integer[] { 1, null })
1790      {
1791          final CompletableFuture<Integer> f = new CompletableFuture<>();
1792          final CompletableFuture<Integer> g = new CompletableFuture<>();
1810        final Noop r = new Noop();
1793          final CFException ex = new CFException();
1794 +        final Noop r = new Noop(m);
1795  
1796 <        f.completeExceptionally(ex);
1797 <        g.complete(v1);
1798 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1816 <
1817 <        checkCompletedWithWrappedCFException(h, ex);
1818 <        checkCompletedWithWrappedCFException(f, ex);
1819 <        assertEquals(0, r.invocationCount);
1820 <        checkCompletedNormally(g, v1);
1821 <    }}
1822 <
1823 <    /**
1824 <     * runAfterBoth result completes exceptionally if action does
1825 <     */
1826 <    public void testRunAfterBoth_actionFailed1() {
1827 <        for (ExecutionMode m : ExecutionMode.values())
1828 <        for (Integer v1 : new Integer[] { 1, null })
1829 <        for (Integer v2 : new Integer[] { 2, null })
1830 <    {
1831 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1832 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1833 <        final FailingNoop r = new FailingNoop();
1834 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1835 <
1836 <        f.complete(v1);
1837 <        checkIncomplete(h);
1838 <        g.complete(v2);
1839 <
1840 <        checkCompletedWithWrappedCFException(h);
1841 <        checkCompletedNormally(f, v1);
1842 <        checkCompletedNormally(g, v2);
1843 <    }}
1844 <
1845 <    public void testRunAfterBoth_actionFailed2() {
1846 <        for (ExecutionMode m : ExecutionMode.values())
1847 <        for (Integer v1 : new Integer[] { 1, null })
1848 <        for (Integer v2 : new Integer[] { 2, null })
1849 <    {
1850 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1851 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1852 <        final FailingNoop r = new FailingNoop();
1796 >        (fFirst ? f : g).complete(v1);
1797 >        if (!createIncomplete)
1798 >            (!fFirst ? f : g).completeExceptionally(ex);
1799          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1800 +        if (createIncomplete) {
1801 +            checkIncomplete(h);
1802 +            (!fFirst ? f : g).completeExceptionally(ex);
1803 +        }
1804  
1805 <        g.complete(v2);
1806 <        checkIncomplete(h);
1807 <        f.complete(v1);
1808 <
1859 <        checkCompletedWithWrappedCFException(h);
1860 <        checkCompletedNormally(f, v1);
1861 <        checkCompletedNormally(g, v2);
1805 >        checkCompletedWithWrappedException(h, ex);
1806 >        r.assertNotInvoked();
1807 >        checkCompletedNormally(fFirst ? f : g, v1);
1808 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1809      }}
1810  
1811      /**
1812       * runAfterBoth result completes exceptionally if either source cancelled
1813       */
1814 <    public void testRunAfterBoth_sourceCancelled1() {
1814 >    public void testRunAfterBoth_sourceCancelled() {
1815          for (ExecutionMode m : ExecutionMode.values())
1816          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1817 +        for (boolean createIncomplete : new boolean[] { true, false })
1818 +        for (boolean fFirst : new boolean[] { true, false })
1819          for (Integer v1 : new Integer[] { 1, null })
1820      {
1821          final CompletableFuture<Integer> f = new CompletableFuture<>();
1822          final CompletableFuture<Integer> g = new CompletableFuture<>();
1823 <        final Noop r = new Noop();
1875 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1876 <
1877 <        assertTrue(f.cancel(mayInterruptIfRunning));
1878 <        checkIncomplete(h);
1879 <        g.complete(v1);
1823 >        final Noop r = new Noop(m);
1824  
1825 <        checkCompletedWithWrappedCancellationException(h);
1826 <        checkCancelled(f);
1827 <        assertEquals(0, r.invocationCount);
1884 <        checkCompletedNormally(g, v1);
1885 <    }}
1886 <
1887 <    public void testRunAfterBoth_sourceCancelled2() {
1888 <        for (ExecutionMode m : ExecutionMode.values())
1889 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1890 <        for (Integer v1 : new Integer[] { 1, null })
1891 <    {
1892 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1893 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1894 <        final Noop r = new Noop();
1825 >        (fFirst ? f : g).complete(v1);
1826 >        if (!createIncomplete)
1827 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1828          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1829 <
1830 <        assertTrue(g.cancel(mayInterruptIfRunning));
1831 <        checkIncomplete(h);
1832 <        f.complete(v1);
1829 >        if (createIncomplete) {
1830 >            checkIncomplete(h);
1831 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1832 >        }
1833  
1834          checkCompletedWithWrappedCancellationException(h);
1835 <        checkCancelled(g);
1836 <        assertEquals(0, r.invocationCount);
1837 <        checkCompletedNormally(f, v1);
1835 >        checkCancelled(!fFirst ? f : g);
1836 >        r.assertNotInvoked();
1837 >        checkCompletedNormally(fFirst ? f : g, v1);
1838      }}
1839  
1840 <    public void testRunAfterBoth_sourceCancelled3() {
1840 >    /**
1841 >     * runAfterBoth result completes exceptionally if action does
1842 >     */
1843 >    public void testRunAfterBoth_actionFailed() {
1844          for (ExecutionMode m : ExecutionMode.values())
1845 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1845 >        for (boolean fFirst : new boolean[] { true, false })
1846          for (Integer v1 : new Integer[] { 1, null })
1847 +        for (Integer v2 : new Integer[] { 2, null })
1848      {
1849          final CompletableFuture<Integer> f = new CompletableFuture<>();
1850          final CompletableFuture<Integer> g = new CompletableFuture<>();
1851 <        final Noop r = new Noop();
1851 >        final FailingRunnable r1 = new FailingRunnable(m);
1852 >        final FailingRunnable r2 = new FailingRunnable(m);
1853  
1854 <        assertTrue(g.cancel(mayInterruptIfRunning));
1855 <        f.complete(v1);
1856 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1854 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1855 >        if (fFirst) {
1856 >            f.complete(v1);
1857 >            g.complete(v2);
1858 >        } else {
1859 >            g.complete(v2);
1860 >            f.complete(v1);
1861 >        }
1862 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1863  
1864 <        checkCompletedWithWrappedCancellationException(h);
1865 <        checkCancelled(g);
1922 <        assertEquals(0, r.invocationCount);
1864 >        checkCompletedWithWrappedCFException(h1);
1865 >        checkCompletedWithWrappedCFException(h2);
1866          checkCompletedNormally(f, v1);
1867 <    }}
1925 <
1926 <    public void testRunAfterBoth_sourceCancelled4() {
1927 <        for (ExecutionMode m : ExecutionMode.values())
1928 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1929 <        for (Integer v1 : new Integer[] { 1, null })
1930 <    {
1931 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1933 <        final Noop r = new Noop();
1934 <
1935 <        assertTrue(f.cancel(mayInterruptIfRunning));
1936 <        g.complete(v1);
1937 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1938 <
1939 <        checkCompletedWithWrappedCancellationException(h);
1940 <        checkCancelled(f);
1941 <        assertEquals(0, r.invocationCount);
1942 <        checkCompletedNormally(g, v1);
1867 >        checkCompletedNormally(g, v2);
1868      }}
1869  
1870      /**
1871       * applyToEither result completes normally after normal completion
1872       * of either source
1873       */
1874 <    public void testApplyToEither_normalCompletion1() {
1874 >    public void testApplyToEither_normalCompletion() {
1875          for (ExecutionMode m : ExecutionMode.values())
1876          for (Integer v1 : new Integer[] { 1, null })
1877          for (Integer v2 : new Integer[] { 2, null })
1878      {
1879          final CompletableFuture<Integer> f = new CompletableFuture<>();
1880          final CompletableFuture<Integer> g = new CompletableFuture<>();
1881 <        final IncFunction r = new IncFunction();
1882 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1881 >        final IncFunction[] rs = new IncFunction[6];
1882 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1883  
1884 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1885 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1886 +        checkIncomplete(h0);
1887 +        checkIncomplete(h1);
1888 +        rs[0].assertNotInvoked();
1889 +        rs[1].assertNotInvoked();
1890          f.complete(v1);
1891 <        checkCompletedNormally(h, inc(v1));
1891 >        checkCompletedNormally(h0, inc(v1));
1892 >        checkCompletedNormally(h1, inc(v1));
1893 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1894 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1895 >        checkCompletedNormally(h2, inc(v1));
1896 >        checkCompletedNormally(h3, inc(v1));
1897          g.complete(v2);
1898  
1899 <        checkCompletedNormally(f, v1);
1900 <        checkCompletedNormally(g, v2);
1901 <        checkCompletedNormally(h, inc(v1));
1902 <    }}
1903 <
1904 <    public void testApplyToEither_normalCompletion2() {
1905 <        for (ExecutionMode m : ExecutionMode.values())
1906 <        for (Integer v1 : new Integer[] { 1, null })
1907 <        for (Integer v2 : new Integer[] { 2, null })
1972 <    {
1973 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1974 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1975 <        final IncFunction r = new IncFunction();
1976 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1977 <
1978 <        g.complete(v2);
1979 <        checkCompletedNormally(h, inc(v2));
1980 <        f.complete(v1);
1899 >        // unspecified behavior - both source completions available
1900 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1901 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1902 >        rs[4].assertValue(h4.join());
1903 >        rs[5].assertValue(h5.join());
1904 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1905 >                   Objects.equals(inc(v2), h4.join()));
1906 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1907 >                   Objects.equals(inc(v2), h5.join()));
1908  
1909          checkCompletedNormally(f, v1);
1910          checkCompletedNormally(g, v2);
1911 <        checkCompletedNormally(h, inc(v2));
1912 <        }}
1913 <
1914 <    public void testApplyToEither_normalCompletion3() {
1915 <        for (ExecutionMode m : ExecutionMode.values())
1989 <        for (Integer v1 : new Integer[] { 1, null })
1990 <        for (Integer v2 : new Integer[] { 2, null })
1991 <    {
1992 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1993 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1994 <        final IncFunction r = new IncFunction();
1995 <
1996 <        f.complete(v1);
1997 <        g.complete(v2);
1998 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1999 <
2000 <        checkCompletedNormally(f, v1);
2001 <        checkCompletedNormally(g, v2);
2002 <
2003 <        // unspecified behavior
2004 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2005 <                   Objects.equals(h.join(), inc(v2)));
2006 <        assertEquals(1, r.invocationCount);
1911 >        checkCompletedNormally(h0, inc(v1));
1912 >        checkCompletedNormally(h1, inc(v1));
1913 >        checkCompletedNormally(h2, inc(v1));
1914 >        checkCompletedNormally(h3, inc(v1));
1915 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1916      }}
1917  
1918      /**
1919       * applyToEither result completes exceptionally after exceptional
1920       * completion of either source
1921       */
1922 <    public void testApplyToEither_exceptionalCompletion1() {
1922 >    public void testApplyToEither_exceptionalCompletion() {
1923          for (ExecutionMode m : ExecutionMode.values())
1924          for (Integer v1 : new Integer[] { 1, null })
1925      {
1926          final CompletableFuture<Integer> f = new CompletableFuture<>();
1927          final CompletableFuture<Integer> g = new CompletableFuture<>();
2019        final IncFunction r = new IncFunction();
2020        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1928          final CFException ex = new CFException();
1929 +        final IncFunction[] rs = new IncFunction[6];
1930 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1931  
1932 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1933 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1934 +        checkIncomplete(h0);
1935 +        checkIncomplete(h1);
1936 +        rs[0].assertNotInvoked();
1937 +        rs[1].assertNotInvoked();
1938          f.completeExceptionally(ex);
1939 <        checkCompletedWithWrappedCFException(h, ex);
1939 >        checkCompletedWithWrappedException(h0, ex);
1940 >        checkCompletedWithWrappedException(h1, ex);
1941 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1942 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1943 >        checkCompletedWithWrappedException(h2, ex);
1944 >        checkCompletedWithWrappedException(h3, ex);
1945          g.complete(v1);
1946  
1947 <        assertEquals(0, r.invocationCount);
1947 >        // unspecified behavior - both source completions available
1948 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1949 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1950 >        try {
1951 >            assertEquals(inc(v1), h4.join());
1952 >            rs[4].assertValue(inc(v1));
1953 >        } catch (CompletionException ok) {
1954 >            checkCompletedWithWrappedException(h4, ex);
1955 >            rs[4].assertNotInvoked();
1956 >        }
1957 >        try {
1958 >            assertEquals(inc(v1), h5.join());
1959 >            rs[5].assertValue(inc(v1));
1960 >        } catch (CompletionException ok) {
1961 >            checkCompletedWithWrappedException(h5, ex);
1962 >            rs[5].assertNotInvoked();
1963 >        }
1964 >
1965 >        checkCompletedExceptionally(f, ex);
1966          checkCompletedNormally(g, v1);
1967 <        checkCompletedWithWrappedCFException(f, ex);
1968 <        checkCompletedWithWrappedCFException(h, ex);
1967 >        checkCompletedWithWrappedException(h0, ex);
1968 >        checkCompletedWithWrappedException(h1, ex);
1969 >        checkCompletedWithWrappedException(h2, ex);
1970 >        checkCompletedWithWrappedException(h3, ex);
1971 >        checkCompletedWithWrappedException(h4, ex);
1972 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1973      }}
1974  
1975      public void testApplyToEither_exceptionalCompletion2() {
1976          for (ExecutionMode m : ExecutionMode.values())
1977 +        for (boolean fFirst : new boolean[] { true, false })
1978          for (Integer v1 : new Integer[] { 1, null })
1979      {
1980          final CompletableFuture<Integer> f = new CompletableFuture<>();
1981          final CompletableFuture<Integer> g = new CompletableFuture<>();
2039        final IncFunction r = new IncFunction();
2040        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2041        final CFException ex = new CFException();
2042
2043        g.completeExceptionally(ex);
2044        checkCompletedWithWrappedCFException(h, ex);
2045        f.complete(v1);
2046
2047        assertEquals(0, r.invocationCount);
2048        checkCompletedNormally(f, v1);
2049        checkCompletedWithWrappedCFException(g, ex);
2050        checkCompletedWithWrappedCFException(h, ex);
2051    }}
2052
2053    public void testApplyToEither_exceptionalCompletion3() {
2054        for (ExecutionMode m : ExecutionMode.values())
2055        for (Integer v1 : new Integer[] { 1, null })
2056    {
2057        final CompletableFuture<Integer> f = new CompletableFuture<>();
2058        final CompletableFuture<Integer> g = new CompletableFuture<>();
2059        final IncFunction r = new IncFunction();
1982          final CFException ex = new CFException();
1983 +        final IncFunction[] rs = new IncFunction[6];
1984 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1985  
1986 <        g.completeExceptionally(ex);
1987 <        f.complete(v1);
1988 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1986 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1987 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1988 >        if (fFirst) {
1989 >            f.complete(v1);
1990 >            g.completeExceptionally(ex);
1991 >        } else {
1992 >            g.completeExceptionally(ex);
1993 >            f.complete(v1);
1994 >        }
1995 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1996 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1997  
1998 <        // unspecified behavior
2067 <        Integer v;
1998 >        // unspecified behavior - both source completions available
1999          try {
2000 <            assertEquals(inc(v1), h.join());
2001 <            assertEquals(1, r.invocationCount);
2000 >            assertEquals(inc(v1), h0.join());
2001 >            rs[0].assertValue(inc(v1));
2002          } catch (CompletionException ok) {
2003 <            checkCompletedWithWrappedCFException(h, ex);
2004 <            assertEquals(0, r.invocationCount);
2003 >            checkCompletedWithWrappedException(h0, ex);
2004 >            rs[0].assertNotInvoked();
2005          }
2075
2076        checkCompletedWithWrappedCFException(g, ex);
2077        checkCompletedNormally(f, v1);
2078    }}
2079
2080    public void testApplyToEither_exceptionalCompletion4() {
2081        for (ExecutionMode m : ExecutionMode.values())
2082        for (Integer v1 : new Integer[] { 1, null })
2083    {
2084        final CompletableFuture<Integer> f = new CompletableFuture<>();
2085        final CompletableFuture<Integer> g = new CompletableFuture<>();
2086        final IncFunction r = new IncFunction();
2087        final CFException ex = new CFException();
2088
2089        f.completeExceptionally(ex);
2090        g.complete(v1);
2091        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2092
2093        // unspecified behavior
2094        Integer v;
2006          try {
2007 <            assertEquals(inc(v1), h.join());
2008 <            assertEquals(1, r.invocationCount);
2007 >            assertEquals(inc(v1), h1.join());
2008 >            rs[1].assertValue(inc(v1));
2009          } catch (CompletionException ok) {
2010 <            checkCompletedWithWrappedCFException(h, ex);
2011 <            assertEquals(0, r.invocationCount);
2010 >            checkCompletedWithWrappedException(h1, ex);
2011 >            rs[1].assertNotInvoked();
2012 >        }
2013 >        try {
2014 >            assertEquals(inc(v1), h2.join());
2015 >            rs[2].assertValue(inc(v1));
2016 >        } catch (CompletionException ok) {
2017 >            checkCompletedWithWrappedException(h2, ex);
2018 >            rs[2].assertNotInvoked();
2019 >        }
2020 >        try {
2021 >            assertEquals(inc(v1), h3.join());
2022 >            rs[3].assertValue(inc(v1));
2023 >        } catch (CompletionException ok) {
2024 >            checkCompletedWithWrappedException(h3, ex);
2025 >            rs[3].assertNotInvoked();
2026          }
2027  
2103        checkCompletedWithWrappedCFException(f, ex);
2104        checkCompletedNormally(g, v1);
2105    }}
2106
2107    /**
2108     * applyToEither result completes exceptionally if action does
2109     */
2110    public void testApplyToEither_actionFailed1() {
2111        for (ExecutionMode m : ExecutionMode.values())
2112        for (Integer v1 : new Integer[] { 1, null })
2113        for (Integer v2 : new Integer[] { 2, null })
2114    {
2115        final CompletableFuture<Integer> f = new CompletableFuture<>();
2116        final CompletableFuture<Integer> g = new CompletableFuture<>();
2117        final FailingFunction r = new FailingFunction();
2118        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2119
2120        f.complete(v1);
2121        checkCompletedWithWrappedCFException(h);
2122        g.complete(v2);
2123        checkCompletedNormally(f, v1);
2124        checkCompletedNormally(g, v2);
2125    }}
2126
2127    public void testApplyToEither_actionFailed2() {
2128        for (ExecutionMode m : ExecutionMode.values())
2129        for (Integer v1 : new Integer[] { 1, null })
2130        for (Integer v2 : new Integer[] { 2, null })
2131    {
2132        final CompletableFuture<Integer> f = new CompletableFuture<>();
2133        final CompletableFuture<Integer> g = new CompletableFuture<>();
2134        final FailingFunction r = new FailingFunction();
2135        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2136
2137        g.complete(v2);
2138        checkCompletedWithWrappedCFException(h);
2139        f.complete(v1);
2028          checkCompletedNormally(f, v1);
2029 <        checkCompletedNormally(g, v2);
2029 >        checkCompletedExceptionally(g, ex);
2030      }}
2031  
2032      /**
2033       * applyToEither result completes exceptionally if either source cancelled
2034       */
2035 <    public void testApplyToEither_sourceCancelled1() {
2035 >    public void testApplyToEither_sourceCancelled() {
2036          for (ExecutionMode m : ExecutionMode.values())
2037          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2038          for (Integer v1 : new Integer[] { 1, null })
2039      {
2040          final CompletableFuture<Integer> f = new CompletableFuture<>();
2041          final CompletableFuture<Integer> g = new CompletableFuture<>();
2042 <        final IncFunction r = new IncFunction();
2043 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2042 >        final IncFunction[] rs = new IncFunction[6];
2043 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2044  
2045 <        assertTrue(f.cancel(mayInterruptIfRunning));
2046 <        checkCompletedWithWrappedCancellationException(h);
2045 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2046 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2047 >        checkIncomplete(h0);
2048 >        checkIncomplete(h1);
2049 >        rs[0].assertNotInvoked();
2050 >        rs[1].assertNotInvoked();
2051 >        f.cancel(mayInterruptIfRunning);
2052 >        checkCompletedWithWrappedCancellationException(h0);
2053 >        checkCompletedWithWrappedCancellationException(h1);
2054 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2055 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2056 >        checkCompletedWithWrappedCancellationException(h2);
2057 >        checkCompletedWithWrappedCancellationException(h3);
2058          g.complete(v1);
2059  
2060 +        // unspecified behavior - both source completions available
2061 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2062 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2063 +        try {
2064 +            assertEquals(inc(v1), h4.join());
2065 +            rs[4].assertValue(inc(v1));
2066 +        } catch (CompletionException ok) {
2067 +            checkCompletedWithWrappedCancellationException(h4);
2068 +            rs[4].assertNotInvoked();
2069 +        }
2070 +        try {
2071 +            assertEquals(inc(v1), h5.join());
2072 +            rs[5].assertValue(inc(v1));
2073 +        } catch (CompletionException ok) {
2074 +            checkCompletedWithWrappedCancellationException(h5);
2075 +            rs[5].assertNotInvoked();
2076 +        }
2077 +
2078          checkCancelled(f);
2162        assertEquals(0, r.invocationCount);
2079          checkCompletedNormally(g, v1);
2080 <        checkCompletedWithWrappedCancellationException(h);
2080 >        checkCompletedWithWrappedCancellationException(h0);
2081 >        checkCompletedWithWrappedCancellationException(h1);
2082 >        checkCompletedWithWrappedCancellationException(h2);
2083 >        checkCompletedWithWrappedCancellationException(h3);
2084 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2085      }}
2086  
2087      public void testApplyToEither_sourceCancelled2() {
2088          for (ExecutionMode m : ExecutionMode.values())
2089          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2090 +        for (boolean fFirst : new boolean[] { true, false })
2091          for (Integer v1 : new Integer[] { 1, null })
2092      {
2093          final CompletableFuture<Integer> f = new CompletableFuture<>();
2094          final CompletableFuture<Integer> g = new CompletableFuture<>();
2095 <        final IncFunction r = new IncFunction();
2096 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2176 <
2177 <        assertTrue(g.cancel(mayInterruptIfRunning));
2178 <        checkCompletedWithWrappedCancellationException(h);
2179 <        f.complete(v1);
2180 <
2181 <        checkCancelled(g);
2182 <        assertEquals(0, r.invocationCount);
2183 <        checkCompletedNormally(f, v1);
2184 <        checkCompletedWithWrappedCancellationException(h);
2185 <    }}
2186 <
2187 <    public void testApplyToEither_sourceCancelled3() {
2188 <        for (ExecutionMode m : ExecutionMode.values())
2189 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2190 <        for (Integer v1 : new Integer[] { 1, null })
2191 <    {
2192 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2193 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2194 <        final IncFunction r = new IncFunction();
2095 >        final IncFunction[] rs = new IncFunction[6];
2096 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2097  
2098 <        assertTrue(g.cancel(mayInterruptIfRunning));
2099 <        f.complete(v1);
2100 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2098 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2099 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2100 >        if (fFirst) {
2101 >            f.complete(v1);
2102 >            g.cancel(mayInterruptIfRunning);
2103 >        } else {
2104 >            g.cancel(mayInterruptIfRunning);
2105 >            f.complete(v1);
2106 >        }
2107 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2108 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2109  
2110 <        // unspecified behavior
2201 <        Integer v;
2110 >        // unspecified behavior - both source completions available
2111          try {
2112 <            assertEquals(inc(v1), h.join());
2113 <            assertEquals(1, r.invocationCount);
2112 >            assertEquals(inc(v1), h0.join());
2113 >            rs[0].assertValue(inc(v1));
2114          } catch (CompletionException ok) {
2115 <            checkCompletedWithWrappedCancellationException(h);
2116 <            assertEquals(0, r.invocationCount);
2115 >            checkCompletedWithWrappedCancellationException(h0);
2116 >            rs[0].assertNotInvoked();
2117 >        }
2118 >        try {
2119 >            assertEquals(inc(v1), h1.join());
2120 >            rs[1].assertValue(inc(v1));
2121 >        } catch (CompletionException ok) {
2122 >            checkCompletedWithWrappedCancellationException(h1);
2123 >            rs[1].assertNotInvoked();
2124          }
2209
2210        checkCancelled(g);
2211        checkCompletedNormally(f, v1);
2212    }}
2213
2214    public void testApplyToEither_sourceCancelled4() {
2215        for (ExecutionMode m : ExecutionMode.values())
2216        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2217        for (Integer v1 : new Integer[] { 1, null })
2218    {
2219        final CompletableFuture<Integer> f = new CompletableFuture<>();
2220        final CompletableFuture<Integer> g = new CompletableFuture<>();
2221        final IncFunction r = new IncFunction();
2222
2223        assertTrue(f.cancel(mayInterruptIfRunning));
2224        g.complete(v1);
2225        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2226
2227        // unspecified behavior
2228        Integer v;
2125          try {
2126 <            assertEquals(inc(v1), h.join());
2127 <            assertEquals(1, r.invocationCount);
2126 >            assertEquals(inc(v1), h2.join());
2127 >            rs[2].assertValue(inc(v1));
2128          } catch (CompletionException ok) {
2129 <            checkCompletedWithWrappedCancellationException(h);
2130 <            assertEquals(0, r.invocationCount);
2129 >            checkCompletedWithWrappedCancellationException(h2);
2130 >            rs[2].assertNotInvoked();
2131 >        }
2132 >        try {
2133 >            assertEquals(inc(v1), h3.join());
2134 >            rs[3].assertValue(inc(v1));
2135 >        } catch (CompletionException ok) {
2136 >            checkCompletedWithWrappedCancellationException(h3);
2137 >            rs[3].assertNotInvoked();
2138          }
2139  
2140 <        checkCancelled(f);
2141 <        checkCompletedNormally(g, v1);
2140 >        checkCompletedNormally(f, v1);
2141 >        checkCancelled(g);
2142      }}
2143  
2144      /**
2145 <     * acceptEither result completes normally after normal completion
2243 <     * of either source
2145 >     * applyToEither result completes exceptionally if action does
2146       */
2147 <    public void testAcceptEither_normalCompletion1() {
2147 >    public void testApplyToEither_actionFailed() {
2148          for (ExecutionMode m : ExecutionMode.values())
2149          for (Integer v1 : new Integer[] { 1, null })
2150          for (Integer v2 : new Integer[] { 2, null })
2151      {
2152          final CompletableFuture<Integer> f = new CompletableFuture<>();
2153          final CompletableFuture<Integer> g = new CompletableFuture<>();
2154 <        final IncAction r = new IncAction();
2155 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2154 >        final FailingFunction[] rs = new FailingFunction[6];
2155 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2156  
2157 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2158 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2159          f.complete(v1);
2160 <        checkCompletedNormally(h, null);
2161 <        assertEquals(inc(v1), r.value);
2162 <        g.complete(v2);
2160 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2161 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2162 >        checkCompletedWithWrappedCFException(h0);
2163 >        checkCompletedWithWrappedCFException(h1);
2164 >        checkCompletedWithWrappedCFException(h2);
2165 >        checkCompletedWithWrappedCFException(h3);
2166 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2167  
2168 <        checkCompletedNormally(f, v1);
2261 <        checkCompletedNormally(g, v2);
2262 <        checkCompletedNormally(h, null);
2263 <    }}
2168 >        g.complete(v2);
2169  
2170 <    public void testAcceptEither_normalCompletion2() {
2171 <        for (ExecutionMode m : ExecutionMode.values())
2172 <        for (Integer v1 : new Integer[] { 1, null })
2268 <        for (Integer v2 : new Integer[] { 2, null })
2269 <    {
2270 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2271 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2272 <        final IncAction r = new IncAction();
2273 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2170 >        // unspecified behavior - both source completions available
2171 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2172 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2173  
2174 <        g.complete(v2);
2175 <        checkCompletedNormally(h, null);
2176 <        assertEquals(inc(v2), r.value);
2177 <        f.complete(v1);
2174 >        checkCompletedWithWrappedCFException(h4);
2175 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2176 >                   Objects.equals(v2, rs[4].value));
2177 >        checkCompletedWithWrappedCFException(h5);
2178 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2179 >                   Objects.equals(v2, rs[5].value));
2180  
2181          checkCompletedNormally(f, v1);
2182          checkCompletedNormally(g, v2);
2282        checkCompletedNormally(h, null);
2183      }}
2184  
2185 <    public void testAcceptEither_normalCompletion3() {
2185 >    /**
2186 >     * acceptEither result completes normally after normal completion
2187 >     * of either source
2188 >     */
2189 >    public void testAcceptEither_normalCompletion() {
2190          for (ExecutionMode m : ExecutionMode.values())
2191          for (Integer v1 : new Integer[] { 1, null })
2192          for (Integer v2 : new Integer[] { 2, null })
2193      {
2194          final CompletableFuture<Integer> f = new CompletableFuture<>();
2195          final CompletableFuture<Integer> g = new CompletableFuture<>();
2196 <        final IncAction r = new IncAction();
2196 >        final NoopConsumer[] rs = new NoopConsumer[6];
2197 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2198  
2199 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2200 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2201 +        checkIncomplete(h0);
2202 +        checkIncomplete(h1);
2203 +        rs[0].assertNotInvoked();
2204 +        rs[1].assertNotInvoked();
2205          f.complete(v1);
2206 +        checkCompletedNormally(h0, null);
2207 +        checkCompletedNormally(h1, null);
2208 +        rs[0].assertValue(v1);
2209 +        rs[1].assertValue(v1);
2210 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2211 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2212 +        checkCompletedNormally(h2, null);
2213 +        checkCompletedNormally(h3, null);
2214 +        rs[2].assertValue(v1);
2215 +        rs[3].assertValue(v1);
2216          g.complete(v2);
2296        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2217  
2218 <        checkCompletedNormally(h, null);
2218 >        // unspecified behavior - both source completions available
2219 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2220 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2221 >        checkCompletedNormally(h4, null);
2222 >        checkCompletedNormally(h5, null);
2223 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2224 >                   Objects.equals(v2, rs[4].value));
2225 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2226 >                   Objects.equals(v2, rs[5].value));
2227 >
2228          checkCompletedNormally(f, v1);
2229          checkCompletedNormally(g, v2);
2230 <
2231 <        // unspecified behavior
2232 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2233 <                   Objects.equals(r.value, inc(v2)));
2230 >        checkCompletedNormally(h0, null);
2231 >        checkCompletedNormally(h1, null);
2232 >        checkCompletedNormally(h2, null);
2233 >        checkCompletedNormally(h3, null);
2234 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2235      }}
2236  
2237      /**
2238       * acceptEither result completes exceptionally after exceptional
2239       * completion of either source
2240       */
2241 <    public void testAcceptEither_exceptionalCompletion1() {
2241 >    public void testAcceptEither_exceptionalCompletion() {
2242          for (ExecutionMode m : ExecutionMode.values())
2243          for (Integer v1 : new Integer[] { 1, null })
2244      {
2245          final CompletableFuture<Integer> f = new CompletableFuture<>();
2246          final CompletableFuture<Integer> g = new CompletableFuture<>();
2317        final IncAction r = new IncAction();
2318        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2247          final CFException ex = new CFException();
2248 +        final NoopConsumer[] rs = new NoopConsumer[6];
2249 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2250  
2251 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2252 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2253 +        checkIncomplete(h0);
2254 +        checkIncomplete(h1);
2255 +        rs[0].assertNotInvoked();
2256 +        rs[1].assertNotInvoked();
2257          f.completeExceptionally(ex);
2258 <        checkCompletedWithWrappedCFException(h, ex);
2258 >        checkCompletedWithWrappedException(h0, ex);
2259 >        checkCompletedWithWrappedException(h1, ex);
2260 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2261 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2262 >        checkCompletedWithWrappedException(h2, ex);
2263 >        checkCompletedWithWrappedException(h3, ex);
2264 >
2265          g.complete(v1);
2266  
2267 <        assertEquals(0, r.invocationCount);
2267 >        // unspecified behavior - both source completions available
2268 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2269 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2270 >        try {
2271 >            assertNull(h4.join());
2272 >            rs[4].assertValue(v1);
2273 >        } catch (CompletionException ok) {
2274 >            checkCompletedWithWrappedException(h4, ex);
2275 >            rs[4].assertNotInvoked();
2276 >        }
2277 >        try {
2278 >            assertNull(h5.join());
2279 >            rs[5].assertValue(v1);
2280 >        } catch (CompletionException ok) {
2281 >            checkCompletedWithWrappedException(h5, ex);
2282 >            rs[5].assertNotInvoked();
2283 >        }
2284 >
2285 >        checkCompletedExceptionally(f, ex);
2286          checkCompletedNormally(g, v1);
2287 <        checkCompletedWithWrappedCFException(f, ex);
2288 <        checkCompletedWithWrappedCFException(h, ex);
2287 >        checkCompletedWithWrappedException(h0, ex);
2288 >        checkCompletedWithWrappedException(h1, ex);
2289 >        checkCompletedWithWrappedException(h2, ex);
2290 >        checkCompletedWithWrappedException(h3, ex);
2291 >        checkCompletedWithWrappedException(h4, ex);
2292 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2293      }}
2294  
2295      public void testAcceptEither_exceptionalCompletion2() {
2296          for (ExecutionMode m : ExecutionMode.values())
2297 +        for (boolean fFirst : new boolean[] { true, false })
2298          for (Integer v1 : new Integer[] { 1, null })
2299      {
2300          final CompletableFuture<Integer> f = new CompletableFuture<>();
2301          final CompletableFuture<Integer> g = new CompletableFuture<>();
2337        final IncAction r = new IncAction();
2338        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2339        final CFException ex = new CFException();
2340
2341        g.completeExceptionally(ex);
2342        checkCompletedWithWrappedCFException(h, ex);
2343        f.complete(v1);
2344
2345        assertEquals(0, r.invocationCount);
2346        checkCompletedNormally(f, v1);
2347        checkCompletedWithWrappedCFException(g, ex);
2348        checkCompletedWithWrappedCFException(h, ex);
2349    }}
2350
2351    public void testAcceptEither_exceptionalCompletion3() {
2352        for (ExecutionMode m : ExecutionMode.values())
2353        for (Integer v1 : new Integer[] { 1, null })
2354    {
2355        final CompletableFuture<Integer> f = new CompletableFuture<>();
2356        final CompletableFuture<Integer> g = new CompletableFuture<>();
2357        final IncAction r = new IncAction();
2302          final CFException ex = new CFException();
2303 +        final NoopConsumer[] rs = new NoopConsumer[6];
2304 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2305  
2306 <        g.completeExceptionally(ex);
2307 <        f.complete(v1);
2308 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2306 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2307 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2308 >        if (fFirst) {
2309 >            f.complete(v1);
2310 >            g.completeExceptionally(ex);
2311 >        } else {
2312 >            g.completeExceptionally(ex);
2313 >            f.complete(v1);
2314 >        }
2315 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2316 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2317  
2318 <        // unspecified behavior
2365 <        Integer v;
2318 >        // unspecified behavior - both source completions available
2319          try {
2320 <            assertNull(h.join());
2321 <            assertEquals(1, r.invocationCount);
2369 <            assertEquals(inc(v1), r.value);
2320 >            assertEquals(null, h0.join());
2321 >            rs[0].assertValue(v1);
2322          } catch (CompletionException ok) {
2323 <            checkCompletedWithWrappedCFException(h, ex);
2324 <            assertEquals(0, r.invocationCount);
2323 >            checkCompletedWithWrappedException(h0, ex);
2324 >            rs[0].assertNotInvoked();
2325          }
2374
2375        checkCompletedWithWrappedCFException(g, ex);
2376        checkCompletedNormally(f, v1);
2377    }}
2378
2379    public void testAcceptEither_exceptionalCompletion4() {
2380        for (ExecutionMode m : ExecutionMode.values())
2381        for (Integer v1 : new Integer[] { 1, null })
2382    {
2383        final CompletableFuture<Integer> f = new CompletableFuture<>();
2384        final CompletableFuture<Integer> g = new CompletableFuture<>();
2385        final IncAction r = new IncAction();
2386        final CFException ex = new CFException();
2387
2388        f.completeExceptionally(ex);
2389        g.complete(v1);
2390        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2391
2392        // unspecified behavior
2393        Integer v;
2326          try {
2327 <            assertNull(h.join());
2328 <            assertEquals(1, r.invocationCount);
2397 <            assertEquals(inc(v1), r.value);
2327 >            assertEquals(null, h1.join());
2328 >            rs[1].assertValue(v1);
2329          } catch (CompletionException ok) {
2330 <            checkCompletedWithWrappedCFException(h, ex);
2331 <            assertEquals(0, r.invocationCount);
2330 >            checkCompletedWithWrappedException(h1, ex);
2331 >            rs[1].assertNotInvoked();
2332 >        }
2333 >        try {
2334 >            assertEquals(null, h2.join());
2335 >            rs[2].assertValue(v1);
2336 >        } catch (CompletionException ok) {
2337 >            checkCompletedWithWrappedException(h2, ex);
2338 >            rs[2].assertNotInvoked();
2339 >        }
2340 >        try {
2341 >            assertEquals(null, h3.join());
2342 >            rs[3].assertValue(v1);
2343 >        } catch (CompletionException ok) {
2344 >            checkCompletedWithWrappedException(h3, ex);
2345 >            rs[3].assertNotInvoked();
2346          }
2347  
2403        checkCompletedWithWrappedCFException(f, ex);
2404        checkCompletedNormally(g, v1);
2405    }}
2406
2407    /**
2408     * acceptEither result completes exceptionally if action does
2409     */
2410    public void testAcceptEither_actionFailed1() {
2411        for (ExecutionMode m : ExecutionMode.values())
2412        for (Integer v1 : new Integer[] { 1, null })
2413        for (Integer v2 : new Integer[] { 2, null })
2414    {
2415        final CompletableFuture<Integer> f = new CompletableFuture<>();
2416        final CompletableFuture<Integer> g = new CompletableFuture<>();
2417        final FailingConsumer r = new FailingConsumer();
2418        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2419
2420        f.complete(v1);
2421        checkCompletedWithWrappedCFException(h);
2422        g.complete(v2);
2423        checkCompletedNormally(f, v1);
2424        checkCompletedNormally(g, v2);
2425    }}
2426
2427    public void testAcceptEither_actionFailed2() {
2428        for (ExecutionMode m : ExecutionMode.values())
2429        for (Integer v1 : new Integer[] { 1, null })
2430        for (Integer v2 : new Integer[] { 2, null })
2431    {
2432        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434        final FailingConsumer r = new FailingConsumer();
2435        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2436
2437        g.complete(v2);
2438        checkCompletedWithWrappedCFException(h);
2439        f.complete(v1);
2348          checkCompletedNormally(f, v1);
2349 <        checkCompletedNormally(g, v2);
2349 >        checkCompletedExceptionally(g, ex);
2350      }}
2351  
2352      /**
2353       * acceptEither result completes exceptionally if either source cancelled
2354       */
2355 <    public void testAcceptEither_sourceCancelled1() {
2355 >    public void testAcceptEither_sourceCancelled() {
2356          for (ExecutionMode m : ExecutionMode.values())
2357          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2358          for (Integer v1 : new Integer[] { 1, null })
2359      {
2360          final CompletableFuture<Integer> f = new CompletableFuture<>();
2361          final CompletableFuture<Integer> g = new CompletableFuture<>();
2362 <        final IncAction r = new IncAction();
2363 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2362 >        final NoopConsumer[] rs = new NoopConsumer[6];
2363 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2364  
2365 <        assertTrue(f.cancel(mayInterruptIfRunning));
2366 <        checkCompletedWithWrappedCancellationException(h);
2367 <        g.complete(v1);
2368 <
2369 <        checkCancelled(f);
2370 <        assertEquals(0, r.invocationCount);
2371 <        checkCompletedNormally(g, v1);
2372 <        checkCompletedWithWrappedCancellationException(h);
2373 <    }}
2374 <
2375 <    public void testAcceptEither_sourceCancelled2() {
2376 <        for (ExecutionMode m : ExecutionMode.values())
2377 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2470 <        for (Integer v1 : new Integer[] { 1, null })
2471 <    {
2472 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474 <        final IncAction r = new IncAction();
2475 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2365 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2366 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2367 >        checkIncomplete(h0);
2368 >        checkIncomplete(h1);
2369 >        rs[0].assertNotInvoked();
2370 >        rs[1].assertNotInvoked();
2371 >        f.cancel(mayInterruptIfRunning);
2372 >        checkCompletedWithWrappedCancellationException(h0);
2373 >        checkCompletedWithWrappedCancellationException(h1);
2374 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2375 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2376 >        checkCompletedWithWrappedCancellationException(h2);
2377 >        checkCompletedWithWrappedCancellationException(h3);
2378  
2379 <        assertTrue(g.cancel(mayInterruptIfRunning));
2478 <        checkCompletedWithWrappedCancellationException(h);
2479 <        f.complete(v1);
2480 <
2481 <        checkCancelled(g);
2482 <        assertEquals(0, r.invocationCount);
2483 <        checkCompletedNormally(f, v1);
2484 <        checkCompletedWithWrappedCancellationException(h);
2485 <    }}
2486 <
2487 <    public void testAcceptEither_sourceCancelled3() {
2488 <        for (ExecutionMode m : ExecutionMode.values())
2489 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2490 <        for (Integer v1 : new Integer[] { 1, null })
2491 <    {
2492 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2493 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2494 <        final IncAction r = new IncAction();
2495 <
2496 <        assertTrue(g.cancel(mayInterruptIfRunning));
2497 <        f.complete(v1);
2498 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2379 >        g.complete(v1);
2380  
2381 <        // unspecified behavior
2382 <        Integer v;
2381 >        // unspecified behavior - both source completions available
2382 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2383 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2384          try {
2385 <            assertNull(h.join());
2386 <            assertEquals(1, r.invocationCount);
2505 <            assertEquals(inc(v1), r.value);
2385 >            assertNull(h4.join());
2386 >            rs[4].assertValue(v1);
2387          } catch (CompletionException ok) {
2388 <            checkCompletedWithWrappedCancellationException(h);
2389 <            assertEquals(0, r.invocationCount);
2388 >            checkCompletedWithWrappedCancellationException(h4);
2389 >            rs[4].assertNotInvoked();
2390          }
2510
2511        checkCancelled(g);
2512        checkCompletedNormally(f, v1);
2513    }}
2514
2515    public void testAcceptEither_sourceCancelled4() {
2516        for (ExecutionMode m : ExecutionMode.values())
2517        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2518        for (Integer v1 : new Integer[] { 1, null })
2519    {
2520        final CompletableFuture<Integer> f = new CompletableFuture<>();
2521        final CompletableFuture<Integer> g = new CompletableFuture<>();
2522        final IncAction r = new IncAction();
2523
2524        assertTrue(f.cancel(mayInterruptIfRunning));
2525        g.complete(v1);
2526        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2527
2528        // unspecified behavior
2529        Integer v;
2391          try {
2392 <            assertNull(h.join());
2393 <            assertEquals(1, r.invocationCount);
2533 <            assertEquals(inc(v1), r.value);
2392 >            assertNull(h5.join());
2393 >            rs[5].assertValue(v1);
2394          } catch (CompletionException ok) {
2395 <            checkCompletedWithWrappedCancellationException(h);
2396 <            assertEquals(0, r.invocationCount);
2395 >            checkCompletedWithWrappedCancellationException(h5);
2396 >            rs[5].assertNotInvoked();
2397          }
2398  
2399          checkCancelled(f);
2400          checkCompletedNormally(g, v1);
2401 +        checkCompletedWithWrappedCancellationException(h0);
2402 +        checkCompletedWithWrappedCancellationException(h1);
2403 +        checkCompletedWithWrappedCancellationException(h2);
2404 +        checkCompletedWithWrappedCancellationException(h3);
2405 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2406      }}
2407  
2408      /**
2409 <     * runAfterEither result completes normally after normal completion
2545 <     * of either source
2409 >     * acceptEither result completes exceptionally if action does
2410       */
2411 <    public void testRunAfterEither_normalCompletion1() {
2411 >    public void testAcceptEither_actionFailed() {
2412          for (ExecutionMode m : ExecutionMode.values())
2413          for (Integer v1 : new Integer[] { 1, null })
2414          for (Integer v2 : new Integer[] { 2, null })
2415      {
2416          final CompletableFuture<Integer> f = new CompletableFuture<>();
2417          final CompletableFuture<Integer> g = new CompletableFuture<>();
2418 <        final Noop r = new Noop();
2419 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2418 >        final FailingConsumer[] rs = new FailingConsumer[6];
2419 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2420  
2421 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2422 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2423          f.complete(v1);
2424 <        checkCompletedNormally(h, null);
2425 <        assertEquals(1, r.invocationCount);
2424 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2425 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2426 >        checkCompletedWithWrappedCFException(h0);
2427 >        checkCompletedWithWrappedCFException(h1);
2428 >        checkCompletedWithWrappedCFException(h2);
2429 >        checkCompletedWithWrappedCFException(h3);
2430 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2431 >
2432          g.complete(v2);
2433  
2434 <        checkCompletedNormally(f, v1);
2435 <        checkCompletedNormally(g, v2);
2436 <        checkCompletedNormally(h, null);
2565 <        assertEquals(1, r.invocationCount);
2566 <    }}
2434 >        // unspecified behavior - both source completions available
2435 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2436 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2437  
2438 <    public void testRunAfterEither_normalCompletion2() {
2439 <        for (ExecutionMode m : ExecutionMode.values())
2440 <        for (Integer v1 : new Integer[] { 1, null })
2441 <        for (Integer v2 : new Integer[] { 2, null })
2442 <    {
2443 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2574 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2575 <        final Noop r = new Noop();
2576 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2577 <
2578 <        g.complete(v2);
2579 <        checkCompletedNormally(h, null);
2580 <        assertEquals(1, r.invocationCount);
2581 <        f.complete(v1);
2438 >        checkCompletedWithWrappedCFException(h4);
2439 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2440 >                   Objects.equals(v2, rs[4].value));
2441 >        checkCompletedWithWrappedCFException(h5);
2442 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2443 >                   Objects.equals(v2, rs[5].value));
2444  
2445          checkCompletedNormally(f, v1);
2446          checkCompletedNormally(g, v2);
2447 <        checkCompletedNormally(h, null);
2586 <        assertEquals(1, r.invocationCount);
2587 <        }}
2447 >    }}
2448  
2449 <    public void testRunAfterEither_normalCompletion3() {
2449 >    /**
2450 >     * runAfterEither result completes normally after normal completion
2451 >     * of either source
2452 >     */
2453 >    public void testRunAfterEither_normalCompletion() {
2454          for (ExecutionMode m : ExecutionMode.values())
2455          for (Integer v1 : new Integer[] { 1, null })
2456          for (Integer v2 : new Integer[] { 2, null })
2457      {
2458          final CompletableFuture<Integer> f = new CompletableFuture<>();
2459          final CompletableFuture<Integer> g = new CompletableFuture<>();
2460 <        final Noop r = new Noop();
2460 >        final Noop[] rs = new Noop[6];
2461 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2462  
2463 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2464 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2465 +        checkIncomplete(h0);
2466 +        checkIncomplete(h1);
2467 +        rs[0].assertNotInvoked();
2468 +        rs[1].assertNotInvoked();
2469          f.complete(v1);
2470 +        checkCompletedNormally(h0, null);
2471 +        checkCompletedNormally(h1, null);
2472 +        rs[0].assertInvoked();
2473 +        rs[1].assertInvoked();
2474 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2475 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2476 +        checkCompletedNormally(h2, null);
2477 +        checkCompletedNormally(h3, null);
2478 +        rs[2].assertInvoked();
2479 +        rs[3].assertInvoked();
2480 +
2481          g.complete(v2);
2600        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2482  
2483 <        checkCompletedNormally(h, null);
2483 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2484 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2485 >
2486          checkCompletedNormally(f, v1);
2487          checkCompletedNormally(g, v2);
2488 <        assertEquals(1, r.invocationCount);
2488 >        checkCompletedNormally(h0, null);
2489 >        checkCompletedNormally(h1, null);
2490 >        checkCompletedNormally(h2, null);
2491 >        checkCompletedNormally(h3, null);
2492 >        checkCompletedNormally(h4, null);
2493 >        checkCompletedNormally(h5, null);
2494 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2495      }}
2496  
2497      /**
2498       * runAfterEither result completes exceptionally after exceptional
2499       * completion of either source
2500       */
2501 <    public void testRunAfterEither_exceptionalCompletion1() {
2501 >    public void testRunAfterEither_exceptionalCompletion() {
2502          for (ExecutionMode m : ExecutionMode.values())
2503          for (Integer v1 : new Integer[] { 1, null })
2504      {
2505          final CompletableFuture<Integer> f = new CompletableFuture<>();
2506          final CompletableFuture<Integer> g = new CompletableFuture<>();
2618        final Noop r = new Noop();
2619        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2507          final CFException ex = new CFException();
2508 +        final Noop[] rs = new Noop[6];
2509 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2510  
2511 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2512 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2513 +        checkIncomplete(h0);
2514 +        checkIncomplete(h1);
2515 +        rs[0].assertNotInvoked();
2516 +        rs[1].assertNotInvoked();
2517          f.completeExceptionally(ex);
2518 <        checkCompletedWithWrappedCFException(h, ex);
2518 >        checkCompletedWithWrappedException(h0, ex);
2519 >        checkCompletedWithWrappedException(h1, ex);
2520 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2521 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2522 >        checkCompletedWithWrappedException(h2, ex);
2523 >        checkCompletedWithWrappedException(h3, ex);
2524 >
2525          g.complete(v1);
2526  
2527 <        assertEquals(0, r.invocationCount);
2527 >        // unspecified behavior - both source completions available
2528 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2529 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2530 >        try {
2531 >            assertNull(h4.join());
2532 >            rs[4].assertInvoked();
2533 >        } catch (CompletionException ok) {
2534 >            checkCompletedWithWrappedException(h4, ex);
2535 >            rs[4].assertNotInvoked();
2536 >        }
2537 >        try {
2538 >            assertNull(h5.join());
2539 >            rs[5].assertInvoked();
2540 >        } catch (CompletionException ok) {
2541 >            checkCompletedWithWrappedException(h5, ex);
2542 >            rs[5].assertNotInvoked();
2543 >        }
2544 >
2545 >        checkCompletedExceptionally(f, ex);
2546          checkCompletedNormally(g, v1);
2547 <        checkCompletedWithWrappedCFException(f, ex);
2548 <        checkCompletedWithWrappedCFException(h, ex);
2547 >        checkCompletedWithWrappedException(h0, ex);
2548 >        checkCompletedWithWrappedException(h1, ex);
2549 >        checkCompletedWithWrappedException(h2, ex);
2550 >        checkCompletedWithWrappedException(h3, ex);
2551 >        checkCompletedWithWrappedException(h4, ex);
2552 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2553      }}
2554  
2555      public void testRunAfterEither_exceptionalCompletion2() {
2556          for (ExecutionMode m : ExecutionMode.values())
2557 +        for (boolean fFirst : new boolean[] { true, false })
2558          for (Integer v1 : new Integer[] { 1, null })
2559      {
2560          final CompletableFuture<Integer> f = new CompletableFuture<>();
2561          final CompletableFuture<Integer> g = new CompletableFuture<>();
2638        final Noop r = new Noop();
2639        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2640        final CFException ex = new CFException();
2641
2642        g.completeExceptionally(ex);
2643        checkCompletedWithWrappedCFException(h, ex);
2644        f.complete(v1);
2645
2646        assertEquals(0, r.invocationCount);
2647        checkCompletedNormally(f, v1);
2648        checkCompletedWithWrappedCFException(g, ex);
2649        checkCompletedWithWrappedCFException(h, ex);
2650    }}
2651
2652    public void testRunAfterEither_exceptionalCompletion3() {
2653        for (ExecutionMode m : ExecutionMode.values())
2654        for (Integer v1 : new Integer[] { 1, null })
2655    {
2656        final CompletableFuture<Integer> f = new CompletableFuture<>();
2657        final CompletableFuture<Integer> g = new CompletableFuture<>();
2658        final Noop r = new Noop();
2562          final CFException ex = new CFException();
2563 +        final Noop[] rs = new Noop[6];
2564 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2565  
2566 <        g.completeExceptionally(ex);
2567 <        f.complete(v1);
2568 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2566 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2567 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2568 >        if (fFirst) {
2569 >            f.complete(v1);
2570 >            g.completeExceptionally(ex);
2571 >        } else {
2572 >            g.completeExceptionally(ex);
2573 >            f.complete(v1);
2574 >        }
2575 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2576 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2577  
2578 <        // unspecified behavior
2666 <        Integer v;
2578 >        // unspecified behavior - both source completions available
2579          try {
2580 <            assertNull(h.join());
2581 <            assertEquals(1, r.invocationCount);
2580 >            assertEquals(null, h0.join());
2581 >            rs[0].assertInvoked();
2582          } catch (CompletionException ok) {
2583 <            checkCompletedWithWrappedCFException(h, ex);
2584 <            assertEquals(0, r.invocationCount);
2583 >            checkCompletedWithWrappedException(h0, ex);
2584 >            rs[0].assertNotInvoked();
2585          }
2674
2675        checkCompletedWithWrappedCFException(g, ex);
2676        checkCompletedNormally(f, v1);
2677    }}
2678
2679    public void testRunAfterEither_exceptionalCompletion4() {
2680        for (ExecutionMode m : ExecutionMode.values())
2681        for (Integer v1 : new Integer[] { 1, null })
2682    {
2683        final CompletableFuture<Integer> f = new CompletableFuture<>();
2684        final CompletableFuture<Integer> g = new CompletableFuture<>();
2685        final Noop r = new Noop();
2686        final CFException ex = new CFException();
2687
2688        f.completeExceptionally(ex);
2689        g.complete(v1);
2690        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2691
2692        // unspecified behavior
2693        Integer v;
2586          try {
2587 <            assertNull(h.join());
2588 <            assertEquals(1, r.invocationCount);
2587 >            assertEquals(null, h1.join());
2588 >            rs[1].assertInvoked();
2589          } catch (CompletionException ok) {
2590 <            checkCompletedWithWrappedCFException(h, ex);
2591 <            assertEquals(0, r.invocationCount);
2590 >            checkCompletedWithWrappedException(h1, ex);
2591 >            rs[1].assertNotInvoked();
2592 >        }
2593 >        try {
2594 >            assertEquals(null, h2.join());
2595 >            rs[2].assertInvoked();
2596 >        } catch (CompletionException ok) {
2597 >            checkCompletedWithWrappedException(h2, ex);
2598 >            rs[2].assertNotInvoked();
2599 >        }
2600 >        try {
2601 >            assertEquals(null, h3.join());
2602 >            rs[3].assertInvoked();
2603 >        } catch (CompletionException ok) {
2604 >            checkCompletedWithWrappedException(h3, ex);
2605 >            rs[3].assertNotInvoked();
2606          }
2607  
2702        checkCompletedWithWrappedCFException(f, ex);
2703        checkCompletedNormally(g, v1);
2704    }}
2705
2706    /**
2707     * runAfterEither result completes exceptionally if action does
2708     */
2709    public void testRunAfterEither_actionFailed1() {
2710        for (ExecutionMode m : ExecutionMode.values())
2711        for (Integer v1 : new Integer[] { 1, null })
2712        for (Integer v2 : new Integer[] { 2, null })
2713    {
2714        final CompletableFuture<Integer> f = new CompletableFuture<>();
2715        final CompletableFuture<Integer> g = new CompletableFuture<>();
2716        final FailingNoop r = new FailingNoop();
2717        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2718
2719        f.complete(v1);
2720        checkCompletedWithWrappedCFException(h);
2721        g.complete(v2);
2722        checkCompletedNormally(f, v1);
2723        checkCompletedNormally(g, v2);
2724    }}
2725
2726    public void testRunAfterEither_actionFailed2() {
2727        for (ExecutionMode m : ExecutionMode.values())
2728        for (Integer v1 : new Integer[] { 1, null })
2729        for (Integer v2 : new Integer[] { 2, null })
2730    {
2731        final CompletableFuture<Integer> f = new CompletableFuture<>();
2732        final CompletableFuture<Integer> g = new CompletableFuture<>();
2733        final FailingNoop r = new FailingNoop();
2734        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2735
2736        g.complete(v2);
2737        checkCompletedWithWrappedCFException(h);
2738        f.complete(v1);
2608          checkCompletedNormally(f, v1);
2609 <        checkCompletedNormally(g, v2);
2609 >        checkCompletedExceptionally(g, ex);
2610      }}
2611  
2612      /**
2613       * runAfterEither result completes exceptionally if either source cancelled
2614       */
2615 <    public void testRunAfterEither_sourceCancelled1() {
2747 <        for (ExecutionMode m : ExecutionMode.values())
2748 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
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 CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2755 <
2756 <        assertTrue(f.cancel(mayInterruptIfRunning));
2757 <        checkCompletedWithWrappedCancellationException(h);
2758 <        g.complete(v1);
2759 <
2760 <        checkCancelled(f);
2761 <        assertEquals(0, r.invocationCount);
2762 <        checkCompletedNormally(g, v1);
2763 <        checkCompletedWithWrappedCancellationException(h);
2764 <    }}
2765 <
2766 <    public void testRunAfterEither_sourceCancelled2() {
2615 >    public void testRunAfterEither_sourceCancelled() {
2616          for (ExecutionMode m : ExecutionMode.values())
2617          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2618          for (Integer v1 : new Integer[] { 1, null })
2619      {
2620          final CompletableFuture<Integer> f = new CompletableFuture<>();
2621          final CompletableFuture<Integer> g = new CompletableFuture<>();
2622 <        final Noop r = new Noop();
2623 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2775 <
2776 <        assertTrue(g.cancel(mayInterruptIfRunning));
2777 <        checkCompletedWithWrappedCancellationException(h);
2778 <        f.complete(v1);
2622 >        final Noop[] rs = new Noop[6];
2623 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2624  
2625 <        checkCancelled(g);
2626 <        assertEquals(0, r.invocationCount);
2627 <        checkCompletedNormally(f, v1);
2628 <        checkCompletedWithWrappedCancellationException(h);
2629 <    }}
2630 <
2631 <    public void testRunAfterEither_sourceCancelled3() {
2632 <        for (ExecutionMode m : ExecutionMode.values())
2633 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2634 <        for (Integer v1 : new Integer[] { 1, null })
2635 <    {
2636 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2637 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2793 <        final Noop r = new Noop();
2625 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2626 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2627 >        checkIncomplete(h0);
2628 >        checkIncomplete(h1);
2629 >        rs[0].assertNotInvoked();
2630 >        rs[1].assertNotInvoked();
2631 >        f.cancel(mayInterruptIfRunning);
2632 >        checkCompletedWithWrappedCancellationException(h0);
2633 >        checkCompletedWithWrappedCancellationException(h1);
2634 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2635 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2636 >        checkCompletedWithWrappedCancellationException(h2);
2637 >        checkCompletedWithWrappedCancellationException(h3);
2638  
2639 <        assertTrue(g.cancel(mayInterruptIfRunning));
2796 <        f.complete(v1);
2797 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2639 >        g.complete(v1);
2640  
2641 <        // unspecified behavior
2642 <        Integer v;
2641 >        // unspecified behavior - both source completions available
2642 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2643 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2644          try {
2645 <            assertNull(h.join());
2646 <            assertEquals(1, r.invocationCount);
2645 >            assertNull(h4.join());
2646 >            rs[4].assertInvoked();
2647          } catch (CompletionException ok) {
2648 <            checkCompletedWithWrappedCancellationException(h);
2649 <            assertEquals(0, r.invocationCount);
2648 >            checkCompletedWithWrappedCancellationException(h4);
2649 >            rs[4].assertNotInvoked();
2650          }
2808
2809        checkCancelled(g);
2810        checkCompletedNormally(f, v1);
2811    }}
2812
2813    public void testRunAfterEither_sourceCancelled4() {
2814        for (ExecutionMode m : ExecutionMode.values())
2815        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2816        for (Integer v1 : new Integer[] { 1, null })
2817    {
2818        final CompletableFuture<Integer> f = new CompletableFuture<>();
2819        final CompletableFuture<Integer> g = new CompletableFuture<>();
2820        final Noop r = new Noop();
2821
2822        assertTrue(f.cancel(mayInterruptIfRunning));
2823        g.complete(v1);
2824        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2825
2826        // unspecified behavior
2827        Integer v;
2651          try {
2652 <            assertNull(h.join());
2653 <            assertEquals(1, r.invocationCount);
2652 >            assertNull(h5.join());
2653 >            rs[5].assertInvoked();
2654          } catch (CompletionException ok) {
2655 <            checkCompletedWithWrappedCancellationException(h);
2656 <            assertEquals(0, r.invocationCount);
2655 >            checkCompletedWithWrappedCancellationException(h5);
2656 >            rs[5].assertNotInvoked();
2657          }
2658  
2659          checkCancelled(f);
2660          checkCompletedNormally(g, v1);
2661 +        checkCompletedWithWrappedCancellationException(h0);
2662 +        checkCompletedWithWrappedCancellationException(h1);
2663 +        checkCompletedWithWrappedCancellationException(h2);
2664 +        checkCompletedWithWrappedCancellationException(h3);
2665 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2666      }}
2667  
2668      /**
2669 <     * thenCompose result completes normally after normal completion of source
2669 >     * runAfterEither result completes exceptionally if action does
2670       */
2671 <    public void testThenCompose_normalCompletion1() {
2671 >    public void testRunAfterEither_actionFailed() {
2672          for (ExecutionMode m : ExecutionMode.values())
2673          for (Integer v1 : new Integer[] { 1, null })
2674 +        for (Integer v2 : new Integer[] { 2, null })
2675      {
2676          final CompletableFuture<Integer> f = new CompletableFuture<>();
2677 <        final CompletableFutureInc r = new CompletableFutureInc();
2678 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2677 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2678 >        final FailingRunnable[] rs = new FailingRunnable[6];
2679 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2680 >
2681 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2682 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2683          f.complete(v1);
2684 <        checkCompletedNormally(g, inc(v1));
2684 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2685 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2686 >        checkCompletedWithWrappedCFException(h0);
2687 >        checkCompletedWithWrappedCFException(h1);
2688 >        checkCompletedWithWrappedCFException(h2);
2689 >        checkCompletedWithWrappedCFException(h3);
2690 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2691 >        g.complete(v2);
2692 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2693 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2694 >        checkCompletedWithWrappedCFException(h4);
2695 >        checkCompletedWithWrappedCFException(h5);
2696 >
2697          checkCompletedNormally(f, v1);
2698 <        assertEquals(1, r.invocationCount);
2698 >        checkCompletedNormally(g, v2);
2699 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2700      }}
2701  
2702 <    public void testThenCompose_normalCompletion2() {
2702 >    /**
2703 >     * thenCompose result completes normally after normal completion of source
2704 >     */
2705 >    public void testThenCompose_normalCompletion() {
2706          for (ExecutionMode m : ExecutionMode.values())
2707 +        for (boolean createIncomplete : new boolean[] { true, false })
2708          for (Integer v1 : new Integer[] { 1, null })
2709      {
2710          final CompletableFuture<Integer> f = new CompletableFuture<>();
2711 <        final CompletableFutureInc r = new CompletableFutureInc();
2712 <        f.complete(v1);
2713 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2711 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2712 >        if (!createIncomplete) f.complete(v1);
2713 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2714 >        if (createIncomplete) f.complete(v1);
2715 >
2716          checkCompletedNormally(g, inc(v1));
2717          checkCompletedNormally(f, v1);
2718 <        assertEquals(1, r.invocationCount);
2718 >        r.assertValue(v1);
2719      }}
2720  
2721      /**
2722       * thenCompose result completes exceptionally after exceptional
2723       * completion of source
2724       */
2725 <    public void testThenCompose_exceptionalCompletion1() {
2725 >    public void testThenCompose_exceptionalCompletion() {
2726          for (ExecutionMode m : ExecutionMode.values())
2727 +        for (boolean createIncomplete : new boolean[] { true, false })
2728      {
2729          final CFException ex = new CFException();
2730 <        final CompletableFutureInc r = new CompletableFutureInc();
2730 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2731          final CompletableFuture<Integer> f = new CompletableFuture<>();
2732 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2733 <        f.completeExceptionally(ex);
2734 <        checkCompletedWithWrappedCFException(g, ex);
2882 <        checkCompletedWithWrappedCFException(f, ex);
2883 <    }}
2732 >        if (!createIncomplete) f.completeExceptionally(ex);
2733 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2734 >        if (createIncomplete) f.completeExceptionally(ex);
2735  
2736 <    public void testThenCompose_exceptionalCompletion2() {
2737 <        for (ExecutionMode m : ExecutionMode.values())
2738 <    {
2888 <        final CFException ex = new CFException();
2889 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2890 <        f.completeExceptionally(ex);
2891 <        final CompletableFutureInc r = new CompletableFutureInc();
2892 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2893 <        checkCompletedWithWrappedCFException(g, ex);
2894 <        checkCompletedWithWrappedCFException(f, ex);
2736 >        checkCompletedWithWrappedException(g, ex);
2737 >        checkCompletedExceptionally(f, ex);
2738 >        r.assertNotInvoked();
2739      }}
2740  
2741      /**
2742       * thenCompose result completes exceptionally if action does
2743       */
2744 <    public void testThenCompose_actionFailed1() {
2744 >    public void testThenCompose_actionFailed() {
2745          for (ExecutionMode m : ExecutionMode.values())
2746 +        for (boolean createIncomplete : new boolean[] { true, false })
2747          for (Integer v1 : new Integer[] { 1, null })
2748      {
2749          final CompletableFuture<Integer> f = new CompletableFuture<>();
2750          final FailingCompletableFutureFunction r
2751 <            = new FailingCompletableFutureFunction();
2752 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2753 <        f.complete(v1);
2754 <        checkCompletedWithWrappedCFException(g);
2910 <        checkCompletedNormally(f, v1);
2911 <    }}
2751 >            = new FailingCompletableFutureFunction(m);
2752 >        if (!createIncomplete) f.complete(v1);
2753 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2754 >        if (createIncomplete) f.complete(v1);
2755  
2913    public void testThenCompose_actionFailed2() {
2914        for (ExecutionMode m : ExecutionMode.values())
2915        for (Integer v1 : new Integer[] { 1, null })
2916    {
2917        final CompletableFuture<Integer> f = new CompletableFuture<>();
2918        f.complete(v1);
2919        final FailingCompletableFutureFunction r
2920            = new FailingCompletableFutureFunction();
2921        final CompletableFuture<Integer> g = f.thenCompose(r);
2756          checkCompletedWithWrappedCFException(g);
2757          checkCompletedNormally(f, v1);
2758      }}
# Line 2926 | Line 2760 | public class CompletableFutureTest exten
2760      /**
2761       * thenCompose result completes exceptionally if source cancelled
2762       */
2763 <    public void testThenCompose_sourceCancelled1() {
2763 >    public void testThenCompose_sourceCancelled() {
2764          for (ExecutionMode m : ExecutionMode.values())
2765 +        for (boolean createIncomplete : new boolean[] { true, false })
2766          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2767      {
2768          final CompletableFuture<Integer> f = new CompletableFuture<>();
2769 <        final CompletableFutureInc r = new CompletableFutureInc();
2770 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2771 <        assertTrue(f.cancel(mayInterruptIfRunning));
2772 <        checkCompletedWithWrappedCancellationException(g);
2773 <        checkCancelled(f);
2774 <    }}
2769 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2770 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2771 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2772 >        if (createIncomplete) {
2773 >            checkIncomplete(g);
2774 >            assertTrue(f.cancel(mayInterruptIfRunning));
2775 >        }
2776  
2941    public void testThenCompose_sourceCancelled2() {
2942        for (ExecutionMode m : ExecutionMode.values())
2943        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2944    {
2945        final CompletableFuture<Integer> f = new CompletableFuture<>();
2946        assertTrue(f.cancel(mayInterruptIfRunning));
2947        final CompletableFutureInc r = new CompletableFutureInc();
2948        final CompletableFuture<Integer> g = f.thenCompose(r);
2777          checkCompletedWithWrappedCancellationException(g);
2778          checkCancelled(f);
2779      }}
2780  
2953    // asyncs
2954
2955    /**
2956     * thenRunAsync result completes normally after normal completion of source
2957     */
2958    public void testThenRunAsync() {
2959        CompletableFuture<Integer> f = new CompletableFuture<>();
2960        Noop r = new Noop();
2961        CompletableFuture<Void> g = f.thenRunAsync(r);
2962        f.complete(null);
2963        checkCompletedNormally(g, null);
2964
2965        // reordered version
2966        f = new CompletableFuture<>();
2967        f.complete(null);
2968        r = new Noop();
2969        g = f.thenRunAsync(r);
2970        checkCompletedNormally(g, null);
2971    }
2972
2973    /**
2974     * thenRunAsync result completes exceptionally after exceptional
2975     * completion of source
2976     */
2977    public void testThenRunAsync2() {
2978        CompletableFuture<Integer> f = new CompletableFuture<>();
2979        Noop r = new Noop();
2980        CompletableFuture<Void> g = f.thenRunAsync(r);
2981        f.completeExceptionally(new CFException());
2982        try {
2983            g.join();
2984            shouldThrow();
2985        } catch (CompletionException success) {}
2986        checkCompletedWithWrappedCFException(g);
2987    }
2988
2989    /**
2990     * thenRunAsync result completes exceptionally if action does
2991     */
2992    public void testThenRunAsync3() {
2993        CompletableFuture<Integer> f = new CompletableFuture<>();
2994        FailingNoop r = new FailingNoop();
2995        CompletableFuture<Void> g = f.thenRunAsync(r);
2996        f.complete(null);
2997        checkCompletedWithWrappedCFException(g);
2998    }
2999
3000    /**
3001     * thenRunAsync result completes exceptionally if source cancelled
3002     */
3003    public void testThenRunAsync4() {
3004        CompletableFuture<Integer> f = new CompletableFuture<>();
3005        Noop r = new Noop();
3006        CompletableFuture<Void> g = f.thenRunAsync(r);
3007        assertTrue(f.cancel(true));
3008        checkCompletedWithWrappedCancellationException(g);
3009    }
3010
3011    /**
3012     * thenApplyAsync result completes normally after normal completion of source
3013     */
3014    public void testThenApplyAsync() {
3015        CompletableFuture<Integer> f = new CompletableFuture<>();
3016        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3017        f.complete(one);
3018        checkCompletedNormally(g, two);
3019    }
3020
3021    /**
3022     * thenApplyAsync result completes exceptionally after exceptional
3023     * completion of source
3024     */
3025    public void testThenApplyAsync2() {
3026        CompletableFuture<Integer> f = new CompletableFuture<>();
3027        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3028        f.completeExceptionally(new CFException());
3029        checkCompletedWithWrappedCFException(g);
3030    }
3031
3032    /**
3033     * thenApplyAsync result completes exceptionally if action does
3034     */
3035    public void testThenApplyAsync3() {
3036        CompletableFuture<Integer> f = new CompletableFuture<>();
3037        FailingFunction r = new FailingFunction();
3038        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3039        f.complete(null);
3040        checkCompletedWithWrappedCFException(g);
3041    }
3042
3043    /**
3044     * thenApplyAsync result completes exceptionally if source cancelled
3045     */
3046    public void testThenApplyAsync4() {
3047        CompletableFuture<Integer> f = new CompletableFuture<>();
3048        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3049        assertTrue(f.cancel(true));
3050        checkCompletedWithWrappedCancellationException(g);
3051    }
3052
3053    /**
3054     * thenAcceptAsync result completes normally after normal
3055     * completion of source
3056     */
3057    public void testThenAcceptAsync() {
3058        CompletableFuture<Integer> f = new CompletableFuture<>();
3059        IncAction r = new IncAction();
3060        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3061        f.complete(one);
3062        checkCompletedNormally(g, null);
3063        assertEquals(r.value, (Integer) 2);
3064    }
3065
3066    /**
3067     * thenAcceptAsync result completes exceptionally after exceptional
3068     * completion of source
3069     */
3070    public void testThenAcceptAsync2() {
3071        CompletableFuture<Integer> f = new CompletableFuture<>();
3072        IncAction r = new IncAction();
3073        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3074        f.completeExceptionally(new CFException());
3075        checkCompletedWithWrappedCFException(g);
3076    }
3077
3078    /**
3079     * thenAcceptAsync result completes exceptionally if action does
3080     */
3081    public void testThenAcceptAsync3() {
3082        CompletableFuture<Integer> f = new CompletableFuture<>();
3083        FailingConsumer r = new FailingConsumer();
3084        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3085        f.complete(null);
3086        checkCompletedWithWrappedCFException(g);
3087    }
3088
3089    /**
3090     * thenAcceptAsync result completes exceptionally if source cancelled
3091     */
3092    public void testThenAcceptAsync4() {
3093        CompletableFuture<Integer> f = new CompletableFuture<>();
3094        IncAction r = new IncAction();
3095        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3096        assertTrue(f.cancel(true));
3097        checkCompletedWithWrappedCancellationException(g);
3098    }
3099
3100    // async with explicit executors
3101
3102    /**
3103     * thenRunAsync result completes normally after normal completion of source
3104     */
3105    public void testThenRunAsyncE() {
3106        CompletableFuture<Integer> f = new CompletableFuture<>();
3107        Noop r = new Noop();
3108        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3109        f.complete(null);
3110        checkCompletedNormally(g, null);
3111
3112        // reordered version
3113        f = new CompletableFuture<>();
3114        f.complete(null);
3115        r = new Noop();
3116        g = f.thenRunAsync(r, new ThreadExecutor());
3117        checkCompletedNormally(g, null);
3118    }
3119
3120    /**
3121     * thenRunAsync result completes exceptionally after exceptional
3122     * completion of source
3123     */
3124    public void testThenRunAsync2E() {
3125        CompletableFuture<Integer> f = new CompletableFuture<>();
3126        Noop r = new Noop();
3127        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3128        f.completeExceptionally(new CFException());
3129        try {
3130            g.join();
3131            shouldThrow();
3132        } catch (CompletionException success) {}
3133        checkCompletedWithWrappedCFException(g);
3134    }
3135
3136    /**
3137     * thenRunAsync result completes exceptionally if action does
3138     */
3139    public void testThenRunAsync3E() {
3140        CompletableFuture<Integer> f = new CompletableFuture<>();
3141        FailingNoop r = new FailingNoop();
3142        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3143        f.complete(null);
3144        checkCompletedWithWrappedCFException(g);
3145    }
3146
3147    /**
3148     * thenRunAsync result completes exceptionally if source cancelled
3149     */
3150    public void testThenRunAsync4E() {
3151        CompletableFuture<Integer> f = new CompletableFuture<>();
3152        Noop r = new Noop();
3153        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3154        assertTrue(f.cancel(true));
3155        checkCompletedWithWrappedCancellationException(g);
3156    }
3157
3158    /**
3159     * thenApplyAsync result completes normally after normal completion of source
3160     */
3161    public void testThenApplyAsyncE() {
3162        CompletableFuture<Integer> f = new CompletableFuture<>();
3163        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3164        f.complete(one);
3165        checkCompletedNormally(g, two);
3166    }
3167
3168    /**
3169     * thenApplyAsync result completes exceptionally after exceptional
3170     * completion of source
3171     */
3172    public void testThenApplyAsync2E() {
3173        CompletableFuture<Integer> f = new CompletableFuture<>();
3174        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3175        f.completeExceptionally(new CFException());
3176        checkCompletedWithWrappedCFException(g);
3177    }
3178
3179    /**
3180     * thenApplyAsync result completes exceptionally if action does
3181     */
3182    public void testThenApplyAsync3E() {
3183        CompletableFuture<Integer> f = new CompletableFuture<>();
3184        FailingFunction r = new FailingFunction();
3185        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3186        f.complete(null);
3187        checkCompletedWithWrappedCFException(g);
3188    }
3189
3190    /**
3191     * thenApplyAsync result completes exceptionally if source cancelled
3192     */
3193    public void testThenApplyAsync4E() {
3194        CompletableFuture<Integer> f = new CompletableFuture<>();
3195        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3196        assertTrue(f.cancel(true));
3197        checkCompletedWithWrappedCancellationException(g);
3198    }
3199
3200    /**
3201     * thenAcceptAsync result completes normally after normal
3202     * completion of source
3203     */
3204    public void testThenAcceptAsyncE() {
3205        CompletableFuture<Integer> f = new CompletableFuture<>();
3206        IncAction r = new IncAction();
3207        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3208        f.complete(one);
3209        checkCompletedNormally(g, null);
3210        assertEquals(r.value, (Integer) 2);
3211    }
3212
3213    /**
3214     * thenAcceptAsync result completes exceptionally after exceptional
3215     * completion of source
3216     */
3217    public void testThenAcceptAsync2E() {
3218        CompletableFuture<Integer> f = new CompletableFuture<>();
3219        IncAction r = new IncAction();
3220        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3221        f.completeExceptionally(new CFException());
3222        checkCompletedWithWrappedCFException(g);
3223    }
3224
3225    /**
3226     * thenAcceptAsync result completes exceptionally if action does
3227     */
3228    public void testThenAcceptAsync3E() {
3229        CompletableFuture<Integer> f = new CompletableFuture<>();
3230        FailingConsumer r = new FailingConsumer();
3231        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3232        f.complete(null);
3233        checkCompletedWithWrappedCFException(g);
3234    }
3235
3236    /**
3237     * thenAcceptAsync result completes exceptionally if source cancelled
3238     */
3239    public void testThenAcceptAsync4E() {
3240        CompletableFuture<Integer> f = new CompletableFuture<>();
3241        IncAction r = new IncAction();
3242        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3243        assertTrue(f.cancel(true));
3244        checkCompletedWithWrappedCancellationException(g);
3245    }
3246
2781      // other static methods
2782  
2783      /**
# Line 3261 | Line 2795 | public class CompletableFutureTest exten
2795       */
2796      public void testAllOf_normal() throws Exception {
2797          for (int k = 1; k < 20; ++k) {
2798 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2798 >            CompletableFuture<Integer>[] fs
2799 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2800              for (int i = 0; i < k; ++i)
2801                  fs[i] = new CompletableFuture<>();
2802              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3275 | Line 2810 | public class CompletableFutureTest exten
2810          }
2811      }
2812  
2813 +    public void testAllOf_backwards() throws Exception {
2814 +        for (int k = 1; k < 20; ++k) {
2815 +            CompletableFuture<Integer>[] fs
2816 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2817 +            for (int i = 0; i < k; ++i)
2818 +                fs[i] = new CompletableFuture<>();
2819 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2820 +            for (int i = k - 1; i >= 0; i--) {
2821 +                checkIncomplete(f);
2822 +                checkIncomplete(CompletableFuture.allOf(fs));
2823 +                fs[i].complete(one);
2824 +            }
2825 +            checkCompletedNormally(f, null);
2826 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2827 +        }
2828 +    }
2829 +
2830      /**
2831       * anyOf(no component futures) returns an incomplete future
2832       */
# Line 3333 | Line 2885 | public class CompletableFutureTest exten
2885          Runnable[] throwingActions = {
2886              () -> CompletableFuture.supplyAsync(null),
2887              () -> CompletableFuture.supplyAsync(null, exec),
2888 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2888 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2889  
2890              () -> CompletableFuture.runAsync(null),
2891              () -> CompletableFuture.runAsync(null, exec),
# Line 3406 | Line 2958 | public class CompletableFutureTest exten
2958  
2959              () -> f.thenCompose(null),
2960              () -> f.thenComposeAsync(null),
2961 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2961 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2962              () -> f.thenComposeAsync(null, exec),
2963  
2964              () -> f.exceptionally(null),
# Line 3438 | Line 2990 | public class CompletableFutureTest exten
2990          assertSame(f, f.toCompletableFuture());
2991      }
2992  
3441    /**
3442     * whenComplete action executes on normal completion, propagating
3443     * source result.
3444     */
3445    public void testWhenComplete_normalCompletion1() {
3446        for (ExecutionMode m : ExecutionMode.values())
3447        for (boolean createIncomplete : new boolean[] { true, false })
3448        for (Integer v1 : new Integer[] { 1, null })
3449    {
3450        final AtomicInteger a = new AtomicInteger(0);
3451        final CompletableFuture<Integer> f = new CompletableFuture<>();
3452        if (!createIncomplete) f.complete(v1);
3453        final CompletableFuture<Integer> g = m.whenComplete
3454            (f,
3455             (Integer x, Throwable t) -> {
3456                threadAssertSame(x, v1);
3457                threadAssertNull(t);
3458                a.getAndIncrement();
3459            });
3460        if (createIncomplete) f.complete(v1);
3461
3462        checkCompletedNormally(g, v1);
3463        checkCompletedNormally(f, v1);
3464        assertEquals(1, a.get());
3465    }}
3466
3467    /**
3468     * whenComplete action executes on exceptional completion, propagating
3469     * source result.
3470     */
3471    public void testWhenComplete_exceptionalCompletion() {
3472        for (ExecutionMode m : ExecutionMode.values())
3473        for (boolean createIncomplete : new boolean[] { true, false })
3474        for (Integer v1 : new Integer[] { 1, null })
3475    {
3476        final AtomicInteger a = new AtomicInteger(0);
3477        final CFException ex = new CFException();
3478        final CompletableFuture<Integer> f = new CompletableFuture<>();
3479        if (!createIncomplete) f.completeExceptionally(ex);
3480        final CompletableFuture<Integer> g = m.whenComplete
3481            (f,
3482             (Integer x, Throwable t) -> {
3483                threadAssertNull(x);
3484                threadAssertSame(t, ex);
3485                a.getAndIncrement();
3486            });
3487        if (createIncomplete) f.completeExceptionally(ex);
3488        checkCompletedWithWrappedCFException(f, ex);
3489        checkCompletedWithWrappedCFException(g, ex);
3490        assertEquals(1, a.get());
3491    }}
3492
3493    /**
3494     * whenComplete action executes on cancelled source, propagating
3495     * CancellationException.
3496     */
3497    public void testWhenComplete_sourceCancelled() {
3498        for (ExecutionMode m : ExecutionMode.values())
3499        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3500        for (boolean createIncomplete : new boolean[] { true, false })
3501    {
3502        final AtomicInteger a = new AtomicInteger(0);
3503        final CompletableFuture<Integer> f = new CompletableFuture<>();
3504        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3505        final CompletableFuture<Integer> g = m.whenComplete
3506            (f,
3507             (Integer x, Throwable t) -> {
3508                threadAssertNull(x);
3509                threadAssertTrue(t instanceof CancellationException);
3510                a.getAndIncrement();
3511            });
3512        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3513
3514        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3515        checkCompletedWithWrappedCancellationException(g);
3516        checkCancelled(f);
3517        assertEquals(1, a.get());
3518    }}
3519
3520    /**
3521     * If a whenComplete action throws an exception when triggered by
3522     * a normal completion, it completes exceptionally
3523     */
3524    public void testWhenComplete_actionFailed() {
3525        for (boolean createIncomplete : new boolean[] { true, false })
3526        for (ExecutionMode m : ExecutionMode.values())
3527        for (Integer v1 : new Integer[] { 1, null })
3528    {
3529        final AtomicInteger a = new AtomicInteger(0);
3530        final CFException ex = new CFException();
3531        final CompletableFuture<Integer> f = new CompletableFuture<>();
3532        if (!createIncomplete) f.complete(v1);
3533        final CompletableFuture<Integer> g = m.whenComplete
3534            (f,
3535             (Integer x, Throwable t) -> {
3536                threadAssertSame(x, v1);
3537                threadAssertNull(t);
3538                a.getAndIncrement();
3539                throw ex;
3540            });
3541        if (createIncomplete) f.complete(v1);
3542        checkCompletedNormally(f, v1);
3543        checkCompletedWithWrappedCFException(g, ex);
3544        assertEquals(1, a.get());
3545    }}
3546
3547    /**
3548     * If a whenComplete action throws an exception when triggered by
3549     * a source completion that also throws an exception, the source
3550     * exception takes precedence.
3551     */
3552    public void testWhenComplete_actionFailedSourceFailed() {
3553        for (boolean createIncomplete : new boolean[] { true, false })
3554        for (ExecutionMode m : ExecutionMode.values())
3555        for (Integer v1 : new Integer[] { 1, null })
3556    {
3557        final AtomicInteger a = new AtomicInteger(0);
3558        final CFException ex1 = new CFException();
3559        final CFException ex2 = new CFException();
3560        final CompletableFuture<Integer> f = new CompletableFuture<>();
3561
3562        if (!createIncomplete) f.completeExceptionally(ex1);
3563        final CompletableFuture<Integer> g = m.whenComplete
3564            (f,
3565             (Integer x, Throwable t) -> {
3566                threadAssertSame(t, ex1);
3567                threadAssertNull(x);
3568                a.getAndIncrement();
3569                throw ex2;
3570            });
3571        if (createIncomplete) f.completeExceptionally(ex1);
3572
3573        checkCompletedWithWrappedCFException(f, ex1);
3574        checkCompletedWithWrappedCFException(g, ex1);
3575        assertEquals(1, a.get());
3576    }}
3577
2993   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines