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.55 by jsr166, Mon Jun 2 21:41:37 2014 UTC vs.
Revision 1.75 by jsr166, Sat Jun 7 21:14:42 2014 UTC

# Line 105 | 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 131 | 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 218 | 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 261 | 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());
269 <        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);
279 <    }
311 >        checkCompletedExceptionally(f, ex);
312 >        f.complete(v1);
313 >        checkCompletedExceptionally(f, ex);
314 >    }}
315  
316      /**
317       * getNumberOfDependents returns number of dependent tasks
# Line 310 | 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 320 | 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 334 | 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);
341 <    static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> subtract(x, y);
343 <    static final class IncAction implements Consumer<Integer> {
344 <        int invocationCount = 0;
345 <        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 <        final ExecutionMode m;
455 <        int invocationCount = 0;
380 <        Noop(ExecutionMode m) { this.m = m; }
453 >
454 >    class Noop extends CheckedAction implements Runnable {
455 >        Noop(ExecutionMode m) { super(m); }
456          public void run() {
457 <            m.checkExecutionMode();
383 <            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 FailingRunnable 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 534 | Line 643 | public class CompletableFutureTest exten
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 599 | Line 714 | public class CompletableFutureTest exten
714  
715          EXECUTOR {
716              public void checkExecutionMode() {
717 <                //TODO
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) {
# Line 665 | Line 786 | public class CompletableFutureTest exten
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 728 | Line 851 | public class CompletableFutureTest exten
851          assertEquals(0, a.get());
852      }}
853  
731
854      /**
855       * exceptionally action completes with function value on source
856       * exception
# Line 743 | 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 764 | 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 +        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 <        checkCompletedWithWrappedCFException(g, ex2);
1039 >        checkCompletedWithWrappedException(g, ex1);
1040 >        checkCompletedExceptionally(f, ex1);
1041          assertEquals(1, a.get());
1042      }}
1043  
# Line 789 | 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 817 | 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 825 | 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 845 | 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 872 | 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 879 | 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 896 | 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 903 | 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 911 | Line 1183 | public class CompletableFutureTest exten
1183      /**
1184       * runAsync completes after running Runnable
1185       */
1186 <    public void testRunAsync() {
1187 <        Noop r = new Noop(ExecutionMode.ASYNC);
1188 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1189 <        assertNull(f.join());
1190 <        assertEquals(1, r.invocationCount);
1191 <        checkCompletedNormally(f, null);
1192 <    }
1193 <
1194 <    /**
923 <     * runAsync with executor completes after running Runnable
924 <     */
925 <    public void testRunAsync2() {
926 <        Noop r = new Noop(ExecutionMode.EXECUTOR);
927 <        ThreadExecutor exec = new ThreadExecutor();
928 <        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());
930        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 <        FailingRunnable r = new FailingRunnable();
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);
962 <        checkCompletedNormally(f, one);
963 <    }
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  
# Line 993 | Line 1268 | public class CompletableFutureTest exten
1268  
1269          checkCompletedNormally(g, null);
1270          checkCompletedNormally(f, v1);
1271 <        assertEquals(1, r.invocationCount);
1271 >        r.assertInvoked();
1272      }}
1273  
1274      /**
# Line 1014 | Line 1289 | public class CompletableFutureTest exten
1289              f.completeExceptionally(ex);
1290          }
1291  
1292 <        checkCompletedWithWrappedCFException(g, ex);
1293 <        checkCompletedWithWrappedCFException(f, ex);
1294 <        assertEquals(0, r.invocationCount);
1292 >        checkCompletedWithWrappedException(g, ex);
1293 >        checkCompletedExceptionally(f, ex);
1294 >        r.assertNotInvoked();
1295      }}
1296  
1297      /**
# Line 1030 | Line 1305 | public class CompletableFutureTest exten
1305          final CompletableFuture<Integer> f = new CompletableFuture<>();
1306          final Noop r = new Noop(m);
1307          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1308 <        final CompletableFuture<Void> g = f.thenRun(r);
1308 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1309          if (createIncomplete) {
1310              checkIncomplete(g);
1311              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1038 | Line 1313 | public class CompletableFutureTest exten
1313  
1314          checkCompletedWithWrappedCancellationException(g);
1315          checkCancelled(f);
1316 <        assertEquals(0, r.invocationCount);
1316 >        r.assertNotInvoked();
1317      }}
1318  
1319      /**
# Line 1050 | Line 1325 | public class CompletableFutureTest exten
1325          for (Integer v1 : new Integer[] { 1, null })
1326      {
1327          final CompletableFuture<Integer> f = new CompletableFuture<>();
1328 <        final FailingRunnable r = new FailingRunnable();
1328 >        final FailingRunnable r = new FailingRunnable(m);
1329          if (!createIncomplete) f.complete(v1);
1330 <        final CompletableFuture<Void> g = f.thenRun(r);
1330 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1331          if (createIncomplete) {
1332              checkIncomplete(g);
1333              f.complete(v1);
# Line 1071 | Line 1346 | public class CompletableFutureTest exten
1346          for (Integer v1 : new Integer[] { 1, null })
1347      {
1348          final CompletableFuture<Integer> f = new CompletableFuture<>();
1349 <        final IncFunction r = new IncFunction();
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) {
# Line 1081 | Line 1356 | public class CompletableFutureTest exten
1356  
1357          checkCompletedNormally(g, inc(v1));
1358          checkCompletedNormally(f, v1);
1359 <        assertEquals(1, r.invocationCount);
1359 >        r.assertValue(inc(v1));
1360      }}
1361  
1362      /**
# Line 1094 | Line 1369 | public class CompletableFutureTest exten
1369      {
1370          final CFException ex = new CFException();
1371          final CompletableFuture<Integer> f = new CompletableFuture<>();
1372 <        final IncFunction r = new IncFunction();
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) {
# Line 1102 | Line 1377 | public class CompletableFutureTest exten
1377              f.completeExceptionally(ex);
1378          }
1379  
1380 <        checkCompletedWithWrappedCFException(g, ex);
1381 <        checkCompletedWithWrappedCFException(f, ex);
1382 <        assertEquals(0, r.invocationCount);
1380 >        checkCompletedWithWrappedException(g, ex);
1381 >        checkCompletedExceptionally(f, ex);
1382 >        r.assertNotInvoked();
1383      }}
1384  
1385      /**
# Line 1116 | Line 1391 | public class CompletableFutureTest exten
1391          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1392      {
1393          final CompletableFuture<Integer> f = new CompletableFuture<>();
1394 <        final IncFunction r = new IncFunction();
1394 >        final IncFunction r = new IncFunction(m);
1395          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1396 <        final CompletableFuture<Integer> g = f.thenApply(r);
1396 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1397          if (createIncomplete) {
1398              checkIncomplete(g);
1399              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1126 | Line 1401 | public class CompletableFutureTest exten
1401  
1402          checkCompletedWithWrappedCancellationException(g);
1403          checkCancelled(f);
1404 <        assertEquals(0, r.invocationCount);
1404 >        r.assertNotInvoked();
1405      }}
1406  
1407      /**
# Line 1138 | Line 1413 | public class CompletableFutureTest exten
1413          for (Integer v1 : new Integer[] { 1, null })
1414      {
1415          final CompletableFuture<Integer> f = new CompletableFuture<>();
1416 <        final FailingFunction r = new FailingFunction();
1416 >        final FailingFunction r = new FailingFunction(m);
1417          if (!createIncomplete) f.complete(v1);
1418 <        final CompletableFuture<Integer> g = f.thenApply(r);
1418 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1419          if (createIncomplete) {
1420              checkIncomplete(g);
1421              f.complete(v1);
# Line 1159 | Line 1434 | public class CompletableFutureTest exten
1434          for (Integer v1 : new Integer[] { 1, null })
1435      {
1436          final CompletableFuture<Integer> f = new CompletableFuture<>();
1437 <        final IncAction r = new IncAction();
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) {
# Line 1168 | Line 1443 | public class CompletableFutureTest exten
1443          }
1444  
1445          checkCompletedNormally(g, null);
1446 +        r.assertValue(v1);
1447          checkCompletedNormally(f, v1);
1172        assertEquals(1, r.invocationCount);
1173        assertEquals(inc(v1), r.value);
1448      }}
1449  
1450      /**
# Line 1183 | Line 1457 | public class CompletableFutureTest exten
1457      {
1458          final CFException ex = new CFException();
1459          final CompletableFuture<Integer> f = new CompletableFuture<>();
1460 <        final IncAction r = new IncAction();
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) {
# Line 1191 | Line 1465 | public class CompletableFutureTest exten
1465              f.completeExceptionally(ex);
1466          }
1467  
1468 <        checkCompletedWithWrappedCFException(g, ex);
1469 <        checkCompletedWithWrappedCFException(f, ex);
1470 <        assertEquals(0, r.invocationCount);
1468 >        checkCompletedWithWrappedException(g, ex);
1469 >        checkCompletedExceptionally(f, ex);
1470 >        r.assertNotInvoked();
1471      }}
1472  
1473      /**
1474 <     * thenAccept result completes exceptionally if action does
1474 >     * thenAccept result completes exceptionally if source cancelled
1475       */
1476 <    public void testThenAccept_actionFailed() {
1476 >    public void testThenAccept_sourceCancelled() {
1477          for (ExecutionMode m : ExecutionMode.values())
1478          for (boolean createIncomplete : new boolean[] { true, false })
1479 <        for (Integer v1 : new Integer[] { 1, null })
1479 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1480      {
1481          final CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        final FailingConsumer r = new FailingConsumer();
1483 <        if (!createIncomplete) f.complete(v1);
1484 <        final CompletableFuture<Void> g = f.thenAccept(r);
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 <            f.complete(v1);
1487 >            assertTrue(f.cancel(mayInterruptIfRunning));
1488          }
1489  
1490 <        checkCompletedWithWrappedCFException(g);
1491 <        checkCompletedNormally(f, v1);
1490 >        checkCompletedWithWrappedCancellationException(g);
1491 >        checkCancelled(f);
1492 >        r.assertNotInvoked();
1493      }}
1494  
1495      /**
1496 <     * thenAccept result completes exceptionally if source cancelled
1496 >     * thenAccept result completes exceptionally if action does
1497       */
1498 <    public void testThenAccept_sourceCancelled() {
1498 >    public void testThenAccept_actionFailed() {
1499          for (ExecutionMode m : ExecutionMode.values())
1500          for (boolean createIncomplete : new boolean[] { true, false })
1501 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1501 >        for (Integer v1 : new Integer[] { 1, null })
1502      {
1503          final CompletableFuture<Integer> f = new CompletableFuture<>();
1504 <        final IncAction r = new IncAction();
1505 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1506 <        final CompletableFuture<Void> g = f.thenAccept(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 <            assertTrue(f.cancel(mayInterruptIfRunning));
1509 >            f.complete(v1);
1510          }
1511  
1512 <        checkCompletedWithWrappedCancellationException(g);
1513 <        checkCancelled(f);
1239 <        assertEquals(0, r.invocationCount);
1512 >        checkCompletedWithWrappedCFException(g);
1513 >        checkCompletedNormally(f, v1);
1514      }}
1515  
1516      /**
# Line 1252 | Line 1526 | public class CompletableFutureTest exten
1526      {
1527          final CompletableFuture<Integer> f = new CompletableFuture<>();
1528          final CompletableFuture<Integer> g = new CompletableFuture<>();
1529 <        final SubtractFunction r = new SubtractFunction();
1529 >        final SubtractFunction r = new SubtractFunction(m);
1530  
1531          if (fFirst) f.complete(v1); else g.complete(v2);
1532          if (!createIncomplete)
# Line 1260 | Line 1534 | public class CompletableFutureTest exten
1534          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1535          if (createIncomplete) {
1536              checkIncomplete(h);
1537 <            assertEquals(0, r.invocationCount);
1537 >            r.assertNotInvoked();
1538              if (!fFirst) f.complete(v1); else g.complete(v2);
1539          }
1540  
1541          checkCompletedNormally(h, subtract(v1, v2));
1542          checkCompletedNormally(f, v1);
1543          checkCompletedNormally(g, v2);
1544 <        assertEquals(1, r.invocationCount);
1544 >        r.assertValue(subtract(v1, v2));
1545      }}
1546  
1547      /**
# Line 1283 | Line 1557 | public class CompletableFutureTest exten
1557          final CompletableFuture<Integer> f = new CompletableFuture<>();
1558          final CompletableFuture<Integer> g = new CompletableFuture<>();
1559          final CFException ex = new CFException();
1560 <        final SubtractFunction r = new SubtractFunction();
1560 >        final SubtractFunction r = new SubtractFunction(m);
1561  
1562          (fFirst ? f : g).complete(v1);
1563          if (!createIncomplete)
# Line 1294 | Line 1568 | public class CompletableFutureTest exten
1568              (!fFirst ? f : g).completeExceptionally(ex);
1569          }
1570  
1571 <        checkCompletedWithWrappedCFException(h, ex);
1572 <        assertEquals(0, r.invocationCount);
1571 >        checkCompletedWithWrappedException(h, ex);
1572 >        r.assertNotInvoked();
1573          checkCompletedNormally(fFirst ? f : g, v1);
1574 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1301 <    }}
1302 <
1303 <    /**
1304 <     * thenCombine result completes exceptionally if action does
1305 <     */
1306 <    public void testThenCombine_actionFailed() {
1307 <        for (ExecutionMode m : ExecutionMode.values())
1308 <        for (boolean fFirst : new boolean[] { true, false })
1309 <        for (Integer v1 : new Integer[] { 1, null })
1310 <        for (Integer v2 : new Integer[] { 2, null })
1311 <    {
1312 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1313 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1314 <        final FailingBiFunction r = new FailingBiFunction();
1315 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1316 <
1317 <        if (fFirst) {
1318 <            f.complete(v1);
1319 <            g.complete(v2);
1320 <        } else {
1321 <            g.complete(v2);
1322 <            f.complete(v1);
1323 <        }
1324 <
1325 <        checkCompletedWithWrappedCFException(h);
1326 <        checkCompletedNormally(f, v1);
1327 <        checkCompletedNormally(g, v2);
1574 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1575      }}
1576  
1577      /**
# Line 1339 | Line 1586 | public class CompletableFutureTest exten
1586      {
1587          final CompletableFuture<Integer> f = new CompletableFuture<>();
1588          final CompletableFuture<Integer> g = new CompletableFuture<>();
1589 <        final SubtractFunction r = new SubtractFunction();
1589 >        final SubtractFunction r = new SubtractFunction(m);
1590  
1591          (fFirst ? f : g).complete(v1);
1592          if (!createIncomplete)
# Line 1352 | Line 1599 | public class CompletableFutureTest exten
1599  
1600          checkCompletedWithWrappedCancellationException(h);
1601          checkCancelled(!fFirst ? f : g);
1602 <        assertEquals(0, r.invocationCount);
1602 >        r.assertNotInvoked();
1603          checkCompletedNormally(fFirst ? f : g, v1);
1604      }}
1605  
1606      /**
1607 +     * thenCombine result completes exceptionally if action does
1608 +     */
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 FailingBiFunction r = new FailingBiFunction(m);
1618 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1619 +
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 +    /**
1634       * thenAcceptBoth result completes normally after normal
1635       * completion of sources
1636       */
# Line 1369 | Line 1643 | public class CompletableFutureTest exten
1643      {
1644          final CompletableFuture<Integer> f = new CompletableFuture<>();
1645          final CompletableFuture<Integer> g = new CompletableFuture<>();
1646 <        final SubtractAction r = new SubtractAction();
1646 >        final SubtractAction r = new SubtractAction(m);
1647  
1648          if (fFirst) f.complete(v1); else g.complete(v2);
1649          if (!createIncomplete)
# Line 1377 | Line 1651 | public class CompletableFutureTest exten
1651          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1652          if (createIncomplete) {
1653              checkIncomplete(h);
1654 <            assertEquals(0, r.invocationCount);
1654 >            r.assertNotInvoked();
1655              if (!fFirst) f.complete(v1); else g.complete(v2);
1656          }
1657  
1658          checkCompletedNormally(h, null);
1659 <        assertEquals(subtract(v1, v2), r.value);
1659 >        r.assertValue(subtract(v1, v2));
1660          checkCompletedNormally(f, v1);
1661          checkCompletedNormally(g, v2);
1662      }}
# Line 1400 | Line 1674 | public class CompletableFutureTest exten
1674          final CompletableFuture<Integer> f = new CompletableFuture<>();
1675          final CompletableFuture<Integer> g = new CompletableFuture<>();
1676          final CFException ex = new CFException();
1677 <        final SubtractAction r = new SubtractAction();
1677 >        final SubtractAction r = new SubtractAction(m);
1678  
1679          (fFirst ? f : g).complete(v1);
1680          if (!createIncomplete)
# Line 1411 | Line 1685 | public class CompletableFutureTest exten
1685              (!fFirst ? f : g).completeExceptionally(ex);
1686          }
1687  
1688 <        checkCompletedWithWrappedCFException(h, ex);
1689 <        assertEquals(0, r.invocationCount);
1688 >        checkCompletedWithWrappedException(h, ex);
1689 >        r.assertNotInvoked();
1690          checkCompletedNormally(fFirst ? f : g, v1);
1691 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1418 <    }}
1419 <
1420 <    /**
1421 <     * thenAcceptBoth result completes exceptionally if action does
1422 <     */
1423 <    public void testThenAcceptBoth_actionFailed() {
1424 <        for (ExecutionMode m : ExecutionMode.values())
1425 <        for (boolean fFirst : new boolean[] { true, false })
1426 <        for (Integer v1 : new Integer[] { 1, null })
1427 <        for (Integer v2 : new Integer[] { 2, null })
1428 <    {
1429 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1430 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1431 <        final FailingBiConsumer r = new FailingBiConsumer();
1432 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1433 <
1434 <        if (fFirst) {
1435 <            f.complete(v1);
1436 <            g.complete(v2);
1437 <        } else {
1438 <            g.complete(v2);
1439 <            f.complete(v1);
1440 <        }
1441 <
1442 <        checkCompletedWithWrappedCFException(h);
1443 <        checkCompletedNormally(f, v1);
1444 <        checkCompletedNormally(g, v2);
1691 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1692      }}
1693  
1694      /**
# Line 1456 | Line 1703 | public class CompletableFutureTest exten
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          (fFirst ? f : g).complete(v1);
1709          if (!createIncomplete)
# Line 1469 | Line 1716 | public class CompletableFutureTest exten
1716  
1717          checkCompletedWithWrappedCancellationException(h);
1718          checkCancelled(!fFirst ? f : g);
1719 <        assertEquals(0, r.invocationCount);
1719 >        r.assertNotInvoked();
1720          checkCompletedNormally(fFirst ? f : g, v1);
1721      }}
1722  
1723      /**
1724 +     * thenAcceptBoth result completes exceptionally if action does
1725 +     */
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 FailingBiConsumer r = new FailingBiConsumer(m);
1735 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1736 +
1737 +        if (fFirst) {
1738 +            f.complete(v1);
1739 +            g.complete(v2);
1740 +        } else {
1741 +            g.complete(v2);
1742 +            f.complete(v1);
1743 +        }
1744 +
1745 +        checkCompletedWithWrappedCFException(h);
1746 +        checkCompletedNormally(f, v1);
1747 +        checkCompletedNormally(g, v2);
1748 +    }}
1749 +
1750 +    /**
1751       * runAfterBoth result completes normally after normal
1752       * completion of sources
1753       */
# Line 1494 | Line 1768 | public class CompletableFutureTest exten
1768          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1769          if (createIncomplete) {
1770              checkIncomplete(h);
1771 <            assertEquals(0, r.invocationCount);
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 1528 | Line 1802 | public class CompletableFutureTest exten
1802              (!fFirst ? f : g).completeExceptionally(ex);
1803          }
1804  
1805 <        checkCompletedWithWrappedCFException(h, ex);
1806 <        assertEquals(0, r.invocationCount);
1805 >        checkCompletedWithWrappedException(h, ex);
1806 >        r.assertNotInvoked();
1807          checkCompletedNormally(fFirst ? f : g, v1);
1808 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1535 <    }}
1536 <
1537 <    /**
1538 <     * runAfterBoth result completes exceptionally if action does
1539 <     */
1540 <    public void testRunAfterBoth_actionFailed() {
1541 <        for (ExecutionMode m : ExecutionMode.values())
1542 <        for (boolean fFirst : new boolean[] { true, false })
1543 <        for (Integer v1 : new Integer[] { 1, null })
1544 <        for (Integer v2 : new Integer[] { 2, null })
1545 <    {
1546 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1547 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1548 <        final FailingRunnable r = new FailingRunnable();
1549 <
1550 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1551 <        if (fFirst) {
1552 <            f.complete(v1);
1553 <            g.complete(v2);
1554 <        } else {
1555 <            g.complete(v2);
1556 <            f.complete(v1);
1557 <        }
1558 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1559 <
1560 <        checkCompletedWithWrappedCFException(h1);
1561 <        checkCompletedWithWrappedCFException(h2);
1562 <        checkCompletedNormally(f, v1);
1563 <        checkCompletedNormally(g, v2);
1808 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1809      }}
1810  
1811      /**
# Line 1577 | Line 1822 | public class CompletableFutureTest exten
1822          final CompletableFuture<Integer> g = new CompletableFuture<>();
1823          final Noop r = new Noop(m);
1824  
1580
1825          (fFirst ? f : g).complete(v1);
1826          if (!createIncomplete)
1827              assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
# Line 1589 | Line 1833 | public class CompletableFutureTest exten
1833  
1834          checkCompletedWithWrappedCancellationException(h);
1835          checkCancelled(!fFirst ? f : g);
1836 <        assertEquals(0, r.invocationCount);
1836 >        r.assertNotInvoked();
1837          checkCompletedNormally(fFirst ? f : g, v1);
1838      }}
1839  
1840      /**
1841 <     * applyToEither result completes normally after normal completion
1598 <     * of either source
1841 >     * runAfterBoth result completes exceptionally if action does
1842       */
1843 <    public void testApplyToEither_normalCompletion() {
1843 >    public void testRunAfterBoth_actionFailed() {
1844          for (ExecutionMode m : ExecutionMode.values())
1602        for (boolean createIncomplete : 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 IncFunction r = new IncFunction();
1851 >        final FailingRunnable r1 = new FailingRunnable(m);
1852 >        final FailingRunnable r2 = new FailingRunnable(m);
1853  
1854 <        if (!createIncomplete)
1855 <            if (fFirst) f.complete(v1); else g.complete(v2);
1856 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1857 <        if (createIncomplete) {
1858 <            checkIncomplete(h);
1859 <            assertEquals(0, r.invocationCount);
1860 <            if (fFirst) f.complete(v1); else g.complete(v2);
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 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1620 <        if (!fFirst) f.complete(v1); else g.complete(v2);
1862 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1863  
1864 +        checkCompletedWithWrappedCFException(h1);
1865 +        checkCompletedWithWrappedCFException(h2);
1866          checkCompletedNormally(f, v1);
1867          checkCompletedNormally(g, v2);
1624        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1868      }}
1869  
1870 <    public void testApplyToEither_normalCompletionBothAvailable() {
1870 >    /**
1871 >     * applyToEither result completes normally after normal completion
1872 >     * of either source
1873 >     */
1874 >    public void testApplyToEither_normalCompletion() {
1875          for (ExecutionMode m : ExecutionMode.values())
1629        for (boolean fFirst : new boolean[] { true, false })
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();
1881 >        final IncFunction[] rs = new IncFunction[6];
1882 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1883  
1884 <        if (fFirst) {
1885 <            f.complete(v1);
1886 <            g.complete(v2);
1887 <        } else {
1888 <            g.complete(v2);
1889 <            f.complete(v1);
1890 <        }
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(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 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
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 <
1912 <        // unspecified behavior
1913 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1914 <                   Objects.equals(h.join(), inc(v2)));
1915 <        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())
1662        for (boolean createIncomplete : new boolean[] { true, false })
1663        for (boolean fFirst : new boolean[] { true, false })
1924          for (Integer v1 : new Integer[] { 1, null })
1925      {
1926          final CompletableFuture<Integer> f = new CompletableFuture<>();
1927          final CompletableFuture<Integer> g = new CompletableFuture<>();
1928          final CFException ex = new CFException();
1929 <        final IncFunction r = new IncFunction();
1929 >        final IncFunction[] rs = new IncFunction[6];
1930 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1931  
1932 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1933 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1934 <        if (createIncomplete) {
1935 <            checkIncomplete(h);
1936 <            assertEquals(0, r.invocationCount);
1937 <            (fFirst ? f : g).completeExceptionally(ex);
1938 <        }
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 >        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 <        checkCompletedWithWrappedCFException(h, ex);
1948 <        (!fFirst ? f : g).complete(v1);
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 <        assertEquals(0, r.invocationCount);
1966 <        checkCompletedNormally(!fFirst ? f : g, v1);
1967 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1968 <        checkCompletedWithWrappedCFException(h, ex);
1965 >        checkCompletedExceptionally(f, ex);
1966 >        checkCompletedNormally(g, v1);
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())
1690        for (boolean reverseArgs : new boolean[] { true, false })
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<>();
1696        final IncFunction r1 = new IncFunction();
1697        final IncFunction r2 = new IncFunction();
1982          final CFException ex = new CFException();
1983 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1984 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1985 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1983 >        final IncFunction[] rs = new IncFunction[6];
1984 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1985 >
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);
# Line 1706 | Line 1992 | public class CompletableFutureTest exten
1992              g.completeExceptionally(ex);
1993              f.complete(v1);
1994          }
1995 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
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
1998 >        // unspecified behavior - both source completions available
1999 >        try {
2000 >            assertEquals(inc(v1), h0.join());
2001 >            rs[0].assertValue(inc(v1));
2002 >        } catch (CompletionException ok) {
2003 >            checkCompletedWithWrappedException(h0, ex);
2004 >            rs[0].assertNotInvoked();
2005 >        }
2006          try {
2007              assertEquals(inc(v1), h1.join());
2008 <            assertEquals(1, r1.invocationCount);
2008 >            rs[1].assertValue(inc(v1));
2009          } catch (CompletionException ok) {
2010 <            checkCompletedWithWrappedCFException(h1, ex);
2011 <            assertEquals(0, r1.invocationCount);
2010 >            checkCompletedWithWrappedException(h1, ex);
2011 >            rs[1].assertNotInvoked();
2012          }
1719
2013          try {
2014              assertEquals(inc(v1), h2.join());
2015 <            assertEquals(1, r2.invocationCount);
2015 >            rs[2].assertValue(inc(v1));
2016          } catch (CompletionException ok) {
2017 <            checkCompletedWithWrappedCFException(h2, ex);
2018 <            assertEquals(0, r2.invocationCount);
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  
1728        checkCompletedWithWrappedCFException(g, ex);
1729        checkCompletedNormally(f, v1);
1730    }}
1731
1732    /**
1733     * applyToEither result completes exceptionally if action does
1734     */
1735    public void testApplyToEither_actionFailed1() {
1736        for (ExecutionMode m : ExecutionMode.values())
1737        for (Integer v1 : new Integer[] { 1, null })
1738        for (Integer v2 : new Integer[] { 2, null })
1739    {
1740        final CompletableFuture<Integer> f = new CompletableFuture<>();
1741        final CompletableFuture<Integer> g = new CompletableFuture<>();
1742        final FailingFunction r = new FailingFunction();
1743        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1744
1745        f.complete(v1);
1746        checkCompletedWithWrappedCFException(h);
1747        g.complete(v2);
1748        checkCompletedNormally(f, v1);
1749        checkCompletedNormally(g, v2);
1750    }}
1751
1752    public void testApplyToEither_actionFailed2() {
1753        for (ExecutionMode m : ExecutionMode.values())
1754        for (Integer v1 : new Integer[] { 1, null })
1755        for (Integer v2 : new Integer[] { 2, null })
1756    {
1757        final CompletableFuture<Integer> f = new CompletableFuture<>();
1758        final CompletableFuture<Integer> g = new CompletableFuture<>();
1759        final FailingFunction r = new FailingFunction();
1760        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1761
1762        g.complete(v2);
1763        checkCompletedWithWrappedCFException(h);
1764        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 })
1775        for (boolean createIncomplete : new boolean[] { true, false })
1776        for (boolean fFirst : 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();
2042 >        final IncFunction[] rs = new IncFunction[6];
2043 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2044  
2045 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2046 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2047 <        if (createIncomplete) {
2048 <            checkIncomplete(h);
2049 <            assertEquals(0, r.invocationCount);
2050 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2051 <        }
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 <        checkCompletedWithWrappedCancellationException(h);
2061 <        (!fFirst ? f : g).complete(v1);
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 <        assertEquals(0, r.invocationCount);
2079 <        checkCompletedNormally(!fFirst ? f : g, v1);
2080 <        checkCancelled(fFirst ? f : g);
2081 <        checkCompletedWithWrappedCancellationException(h);
2078 >        checkCancelled(f);
2079 >        checkCompletedNormally(g, v1);
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 })
1803        for (boolean reverseArgs : 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 r1 = new IncFunction();
2096 <        final IncFunction r2 = new IncFunction();
1811 <        final CFException ex = new CFException();
1812 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1813 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2095 >        final IncFunction[] rs = new IncFunction[6];
2096 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2097  
2098 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
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 <            assertTrue(g.cancel(mayInterruptIfRunning));
2102 >            g.cancel(mayInterruptIfRunning);
2103          } else {
2104 <            assertTrue(g.cancel(mayInterruptIfRunning));
2104 >            g.cancel(mayInterruptIfRunning);
2105              f.complete(v1);
2106          }
2107 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
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
2110 >        // unspecified behavior - both source completions available
2111 >        try {
2112 >            assertEquals(inc(v1), h0.join());
2113 >            rs[0].assertValue(inc(v1));
2114 >        } catch (CompletionException ok) {
2115 >            checkCompletedWithWrappedCancellationException(h0);
2116 >            rs[0].assertNotInvoked();
2117 >        }
2118          try {
2119              assertEquals(inc(v1), h1.join());
2120 <            assertEquals(1, r1.invocationCount);
2120 >            rs[1].assertValue(inc(v1));
2121          } catch (CompletionException ok) {
2122              checkCompletedWithWrappedCancellationException(h1);
2123 <            assertEquals(0, r1.invocationCount);
2123 >            rs[1].assertNotInvoked();
2124          }
1833
2125          try {
2126              assertEquals(inc(v1), h2.join());
2127 <            assertEquals(1, r2.invocationCount);
2127 >            rs[2].assertValue(inc(v1));
2128          } catch (CompletionException ok) {
2129              checkCompletedWithWrappedCancellationException(h2);
2130 <            assertEquals(0, r2.invocationCount);
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  
1842        checkCancelled(g);
2140          checkCompletedNormally(f, v1);
2141 +        checkCancelled(g);
2142      }}
2143  
2144      /**
2145 <     * acceptEither result completes normally after normal completion
1848 <     * 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);
2163 <
2164 <        checkCompletedNormally(f, v1);
2165 <        checkCompletedNormally(g, v2);
2166 <        checkCompletedNormally(h, null);
1868 <    }}
1869 <
1870 <    public void testAcceptEither_normalCompletion2() {
1871 <        for (ExecutionMode m : ExecutionMode.values())
1872 <        for (Integer v1 : new Integer[] { 1, null })
1873 <        for (Integer v2 : new Integer[] { 2, null })
1874 <    {
1875 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1876 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1877 <        final IncAction r = new IncAction();
1878 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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          g.complete(v2);
2169 <        checkCompletedNormally(h, null);
2170 <        assertEquals(inc(v2), r.value);
2171 <        f.complete(v1);
2169 >
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 >        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);
1887        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);
1901        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<>();
1922        final IncAction r = new IncAction();
1923        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<>();
1942        final IncAction r = new IncAction();
1943        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1944        final CFException ex = new CFException();
1945
1946        g.completeExceptionally(ex);
1947        checkCompletedWithWrappedCFException(h, ex);
1948        f.complete(v1);
1949
1950        assertEquals(0, r.invocationCount);
1951        checkCompletedNormally(f, v1);
1952        checkCompletedWithWrappedCFException(g, ex);
1953        checkCompletedWithWrappedCFException(h, ex);
1954    }}
1955
1956    public void testAcceptEither_exceptionalCompletion3() {
1957        for (ExecutionMode m : ExecutionMode.values())
1958        for (Integer v1 : new Integer[] { 1, null })
1959    {
1960        final CompletableFuture<Integer> f = new CompletableFuture<>();
1961        final CompletableFuture<Integer> g = new CompletableFuture<>();
1962        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
1970 <        Integer v;
2318 >        // unspecified behavior - both source completions available
2319          try {
2320 <            assertNull(h.join());
2321 <            assertEquals(1, r.invocationCount);
1974 <            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          }
1979
1980        checkCompletedWithWrappedCFException(g, ex);
1981        checkCompletedNormally(f, v1);
1982    }}
1983
1984    public void testAcceptEither_exceptionalCompletion4() {
1985        for (ExecutionMode m : ExecutionMode.values())
1986        for (Integer v1 : new Integer[] { 1, null })
1987    {
1988        final CompletableFuture<Integer> f = new CompletableFuture<>();
1989        final CompletableFuture<Integer> g = new CompletableFuture<>();
1990        final IncAction r = new IncAction();
1991        final CFException ex = new CFException();
1992
1993        f.completeExceptionally(ex);
1994        g.complete(v1);
1995        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1996
1997        // unspecified behavior
1998        Integer v;
2326          try {
2327 <            assertNull(h.join());
2328 <            assertEquals(1, r.invocationCount);
2002 <            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  
2008        checkCompletedWithWrappedCFException(f, ex);
2009        checkCompletedNormally(g, v1);
2010    }}
2011
2012    /**
2013     * acceptEither result completes exceptionally if action does
2014     */
2015    public void testAcceptEither_actionFailed1() {
2016        for (ExecutionMode m : ExecutionMode.values())
2017        for (Integer v1 : new Integer[] { 1, null })
2018        for (Integer v2 : new Integer[] { 2, null })
2019    {
2020        final CompletableFuture<Integer> f = new CompletableFuture<>();
2021        final CompletableFuture<Integer> g = new CompletableFuture<>();
2022        final FailingConsumer r = new FailingConsumer();
2023        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2024
2025        f.complete(v1);
2026        checkCompletedWithWrappedCFException(h);
2027        g.complete(v2);
2028        checkCompletedNormally(f, v1);
2029        checkCompletedNormally(g, v2);
2030    }}
2031
2032    public void testAcceptEither_actionFailed2() {
2033        for (ExecutionMode m : ExecutionMode.values())
2034        for (Integer v1 : new Integer[] { 1, null })
2035        for (Integer v2 : new Integer[] { 2, null })
2036    {
2037        final CompletableFuture<Integer> f = new CompletableFuture<>();
2038        final CompletableFuture<Integer> g = new CompletableFuture<>();
2039        final FailingConsumer r = new FailingConsumer();
2040        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2041
2042        g.complete(v2);
2043        checkCompletedWithWrappedCFException(h);
2044        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);
2061 <
2062 <        assertTrue(f.cancel(mayInterruptIfRunning));
2063 <        checkCompletedWithWrappedCancellationException(h);
2064 <        g.complete(v1);
2362 >        final NoopConsumer[] rs = new NoopConsumer[6];
2363 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2364  
2365 <        checkCancelled(f);
2366 <        assertEquals(0, r.invocationCount);
2367 <        checkCompletedNormally(g, v1);
2368 <        checkCompletedWithWrappedCancellationException(h);
2369 <    }}
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 <    public void testAcceptEither_sourceCancelled2() {
2073 <        for (ExecutionMode m : ExecutionMode.values())
2074 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2075 <        for (Integer v1 : new Integer[] { 1, null })
2076 <    {
2077 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2078 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2079 <        final IncAction r = new IncAction();
2080 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2081 <
2082 <        assertTrue(g.cancel(mayInterruptIfRunning));
2083 <        checkCompletedWithWrappedCancellationException(h);
2084 <        f.complete(v1);
2085 <
2086 <        checkCancelled(g);
2087 <        assertEquals(0, r.invocationCount);
2088 <        checkCompletedNormally(f, v1);
2089 <        checkCompletedWithWrappedCancellationException(h);
2090 <    }}
2091 <
2092 <    public void testAcceptEither_sourceCancelled3() {
2093 <        for (ExecutionMode m : ExecutionMode.values())
2094 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2095 <        for (Integer v1 : new Integer[] { 1, null })
2096 <    {
2097 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2098 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2099 <        final IncAction r = new IncAction();
2100 <
2101 <        assertTrue(g.cancel(mayInterruptIfRunning));
2102 <        f.complete(v1);
2103 <        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);
2110 <            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          }
2115
2116        checkCancelled(g);
2117        checkCompletedNormally(f, v1);
2118    }}
2119
2120    public void testAcceptEither_sourceCancelled4() {
2121        for (ExecutionMode m : ExecutionMode.values())
2122        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2123        for (Integer v1 : new Integer[] { 1, null })
2124    {
2125        final CompletableFuture<Integer> f = new CompletableFuture<>();
2126        final CompletableFuture<Integer> g = new CompletableFuture<>();
2127        final IncAction r = new IncAction();
2128
2129        assertTrue(f.cancel(mayInterruptIfRunning));
2130        g.complete(v1);
2131        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2132
2133        // unspecified behavior
2134        Integer v;
2391          try {
2392 <            assertNull(h.join());
2393 <            assertEquals(1, r.invocationCount);
2138 <            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
2150 <     * 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(m);
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 +        // 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 +        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);
2169        checkCompletedNormally(h, null);
2170        assertEquals(1, r.invocationCount);
2447      }}
2448  
2449 <    public void testRunAfterEither_normalCompletion2() {
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(m);
2461 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2460 >        final Noop[] rs = new Noop[6];
2461 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2462  
2463 <        g.complete(v2);
2464 <        checkCompletedNormally(h, null);
2465 <        assertEquals(1, r.invocationCount);
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  
2188        checkCompletedNormally(f, v1);
2189        checkCompletedNormally(g, v2);
2190        checkCompletedNormally(h, null);
2191        assertEquals(1, r.invocationCount);
2192        }}
2193
2194    public void testRunAfterEither_normalCompletion3() {
2195        for (ExecutionMode m : ExecutionMode.values())
2196        for (Integer v1 : new Integer[] { 1, null })
2197        for (Integer v2 : new Integer[] { 2, null })
2198    {
2199        final CompletableFuture<Integer> f = new CompletableFuture<>();
2200        final CompletableFuture<Integer> g = new CompletableFuture<>();
2201        final Noop r = new Noop(m);
2202
2203        f.complete(v1);
2481          g.complete(v2);
2205        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<>();
2223        final Noop r = new Noop(m);
2224        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<>();
2243        final Noop r = new Noop(m);
2244        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2245        final CFException ex = new CFException();
2246
2247        g.completeExceptionally(ex);
2248        checkCompletedWithWrappedCFException(h, ex);
2249        f.complete(v1);
2250
2251        assertEquals(0, r.invocationCount);
2252        checkCompletedNormally(f, v1);
2253        checkCompletedWithWrappedCFException(g, ex);
2254        checkCompletedWithWrappedCFException(h, ex);
2255    }}
2256
2257    public void testRunAfterEither_exceptionalCompletion3() {
2258        for (ExecutionMode m : ExecutionMode.values())
2259        for (Integer v1 : new Integer[] { 1, null })
2260    {
2261        final CompletableFuture<Integer> f = new CompletableFuture<>();
2262        final CompletableFuture<Integer> g = new CompletableFuture<>();
2263        final Noop r = new Noop(m);
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
2579 <        Integer v;
2578 >        // unspecified behavior - both source completions available
2579 >        try {
2580 >            assertEquals(null, h0.join());
2581 >            rs[0].assertInvoked();
2582 >        } catch (CompletionException ok) {
2583 >            checkCompletedWithWrappedException(h0, ex);
2584 >            rs[0].assertNotInvoked();
2585 >        }
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  
2280        checkCompletedWithWrappedCFException(g, ex);
2608          checkCompletedNormally(f, v1);
2609 +        checkCompletedExceptionally(g, ex);
2610      }}
2611  
2612 <    public void testRunAfterEither_exceptionalCompletion4() {
2612 >    /**
2613 >     * runAfterEither result completes exceptionally if either source cancelled
2614 >     */
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(m);
2623 <        final CFException ex = new CFException();
2622 >        final Noop[] rs = new Noop[6];
2623 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2624 >
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  
2293        f.completeExceptionally(ex);
2639          g.complete(v1);
2295        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
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(h4.join());
2646 >            rs[4].assertInvoked();
2647 >        } catch (CompletionException ok) {
2648 >            checkCompletedWithWrappedCancellationException(h4);
2649 >            rs[4].assertNotInvoked();
2650 >        }
2651          try {
2652 <            assertNull(h.join());
2653 <            assertEquals(1, r.invocationCount);
2652 >            assertNull(h5.join());
2653 >            rs[5].assertInvoked();
2654          } catch (CompletionException ok) {
2655 <            checkCompletedWithWrappedCFException(h, ex);
2656 <            assertEquals(0, r.invocationCount);
2655 >            checkCompletedWithWrappedCancellationException(h5);
2656 >            rs[5].assertNotInvoked();
2657          }
2658  
2659 <        checkCompletedWithWrappedCFException(f, ex);
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       * runAfterEither result completes exceptionally if action does
2670       */
2671 <    public void testRunAfterEither_actionFailed1() {
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 CompletableFuture<Integer> g = new CompletableFuture<>();
2678 <        final FailingRunnable r = new FailingRunnable();
2679 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
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 <        checkCompletedWithWrappedCFException(h);
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 <        checkCompletedNormally(f, v1);
2693 <        checkCompletedNormally(g, v2);
2694 <    }}
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  
2331    public void testRunAfterEither_actionFailed2() {
2332        for (ExecutionMode m : ExecutionMode.values())
2333        for (Integer v1 : new Integer[] { 1, null })
2334        for (Integer v2 : new Integer[] { 2, null })
2335    {
2336        final CompletableFuture<Integer> f = new CompletableFuture<>();
2337        final CompletableFuture<Integer> g = new CompletableFuture<>();
2338        final FailingRunnable r = new FailingRunnable();
2339        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2340
2341        g.complete(v2);
2342        checkCompletedWithWrappedCFException(h);
2343        f.complete(v1);
2697          checkCompletedNormally(f, v1);
2698          checkCompletedNormally(g, v2);
2699 <    }}
2347 <
2348 <    /**
2349 <     * runAfterEither result completes exceptionally if either source cancelled
2350 <     */
2351 <    public void testRunAfterEither_sourceCancelled1() {
2352 <        for (ExecutionMode m : ExecutionMode.values())
2353 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2354 <        for (Integer v1 : new Integer[] { 1, null })
2355 <    {
2356 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2357 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2358 <        final Noop r = new Noop(m);
2359 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2360 <
2361 <        assertTrue(f.cancel(mayInterruptIfRunning));
2362 <        checkCompletedWithWrappedCancellationException(h);
2363 <        g.complete(v1);
2364 <
2365 <        checkCancelled(f);
2366 <        assertEquals(0, r.invocationCount);
2367 <        checkCompletedNormally(g, v1);
2368 <        checkCompletedWithWrappedCancellationException(h);
2369 <    }}
2370 <
2371 <    public void testRunAfterEither_sourceCancelled2() {
2372 <        for (ExecutionMode m : ExecutionMode.values())
2373 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2374 <        for (Integer v1 : new Integer[] { 1, null })
2375 <    {
2376 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2377 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2378 <        final Noop r = new Noop(m);
2379 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2380 <
2381 <        assertTrue(g.cancel(mayInterruptIfRunning));
2382 <        checkCompletedWithWrappedCancellationException(h);
2383 <        f.complete(v1);
2384 <
2385 <        checkCancelled(g);
2386 <        assertEquals(0, r.invocationCount);
2387 <        checkCompletedNormally(f, v1);
2388 <        checkCompletedWithWrappedCancellationException(h);
2389 <    }}
2390 <
2391 <    public void testRunAfterEither_sourceCancelled3() {
2392 <        for (ExecutionMode m : ExecutionMode.values())
2393 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2394 <        for (Integer v1 : new Integer[] { 1, null })
2395 <    {
2396 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2397 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2398 <        final Noop r = new Noop(m);
2399 <
2400 <        assertTrue(g.cancel(mayInterruptIfRunning));
2401 <        f.complete(v1);
2402 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2403 <
2404 <        // unspecified behavior
2405 <        Integer v;
2406 <        try {
2407 <            assertNull(h.join());
2408 <            assertEquals(1, r.invocationCount);
2409 <        } catch (CompletionException ok) {
2410 <            checkCompletedWithWrappedCancellationException(h);
2411 <            assertEquals(0, r.invocationCount);
2412 <        }
2413 <
2414 <        checkCancelled(g);
2415 <        checkCompletedNormally(f, v1);
2416 <    }}
2417 <
2418 <    public void testRunAfterEither_sourceCancelled4() {
2419 <        for (ExecutionMode m : ExecutionMode.values())
2420 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2421 <        for (Integer v1 : new Integer[] { 1, null })
2422 <    {
2423 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2424 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2425 <        final Noop r = new Noop(m);
2426 <
2427 <        assertTrue(f.cancel(mayInterruptIfRunning));
2428 <        g.complete(v1);
2429 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2430 <
2431 <        // unspecified behavior
2432 <        Integer v;
2433 <        try {
2434 <            assertNull(h.join());
2435 <            assertEquals(1, r.invocationCount);
2436 <        } catch (CompletionException ok) {
2437 <            checkCompletedWithWrappedCancellationException(h);
2438 <            assertEquals(0, r.invocationCount);
2439 <        }
2440 <
2441 <        checkCancelled(f);
2442 <        checkCompletedNormally(g, v1);
2699 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2700      }}
2701  
2702      /**
# Line 2451 | Line 2708 | public class CompletableFutureTest exten
2708          for (Integer v1 : new Integer[] { 1, null })
2709      {
2710          final CompletableFuture<Integer> f = new CompletableFuture<>();
2711 <        final CompletableFutureInc r = new CompletableFutureInc();
2711 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2712          if (!createIncomplete) f.complete(v1);
2713 <        final CompletableFuture<Integer> g = f.thenCompose(r);
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      /**
# Line 2470 | Line 2727 | public class CompletableFutureTest exten
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          if (!createIncomplete) f.completeExceptionally(ex);
2733 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2733 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2734          if (createIncomplete) f.completeExceptionally(ex);
2735  
2736 <        checkCompletedWithWrappedCFException(g, ex);
2737 <        checkCompletedWithWrappedCFException(f, ex);
2738 <        assertEquals(0, r.invocationCount);
2736 >        checkCompletedWithWrappedException(g, ex);
2737 >        checkCompletedExceptionally(f, ex);
2738 >        r.assertNotInvoked();
2739      }}
2740  
2741      /**
# Line 2491 | Line 2748 | public class CompletableFutureTest exten
2748      {
2749          final CompletableFuture<Integer> f = new CompletableFuture<>();
2750          final FailingCompletableFutureFunction r
2751 <            = new FailingCompletableFutureFunction();
2751 >            = new FailingCompletableFutureFunction(m);
2752          if (!createIncomplete) f.complete(v1);
2753 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2753 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2754          if (createIncomplete) f.complete(v1);
2755  
2756          checkCompletedWithWrappedCFException(g);
# Line 2509 | Line 2766 | public class CompletableFutureTest exten
2766          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2767      {
2768          final CompletableFuture<Integer> f = new CompletableFuture<>();
2769 <        final CompletableFutureInc r = new CompletableFutureInc();
2769 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2770          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2771 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2771 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2772          if (createIncomplete) {
2773              checkIncomplete(g);
2774              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2538 | 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 2552 | 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 2610 | 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 2683 | 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 2715 | Line 2990 | public class CompletableFutureTest exten
2990          assertSame(f, f.toCompletableFuture());
2991      }
2992  
2718    /**
2719     * whenComplete action executes on normal completion, propagating
2720     * source result.
2721     */
2722    public void testWhenComplete_normalCompletion1() {
2723        for (ExecutionMode m : ExecutionMode.values())
2724        for (boolean createIncomplete : new boolean[] { true, false })
2725        for (Integer v1 : new Integer[] { 1, null })
2726    {
2727        final AtomicInteger a = new AtomicInteger(0);
2728        final CompletableFuture<Integer> f = new CompletableFuture<>();
2729        if (!createIncomplete) f.complete(v1);
2730        final CompletableFuture<Integer> g = m.whenComplete
2731            (f,
2732             (Integer x, Throwable t) -> {
2733                threadAssertSame(x, v1);
2734                threadAssertNull(t);
2735                a.getAndIncrement();
2736            });
2737        if (createIncomplete) f.complete(v1);
2738
2739        checkCompletedNormally(g, v1);
2740        checkCompletedNormally(f, v1);
2741        assertEquals(1, a.get());
2742    }}
2743
2744    /**
2745     * whenComplete action executes on exceptional completion, propagating
2746     * source result.
2747     */
2748    public void testWhenComplete_exceptionalCompletion() {
2749        for (ExecutionMode m : ExecutionMode.values())
2750        for (boolean createIncomplete : new boolean[] { true, false })
2751        for (Integer v1 : new Integer[] { 1, null })
2752    {
2753        final AtomicInteger a = new AtomicInteger(0);
2754        final CFException ex = new CFException();
2755        final CompletableFuture<Integer> f = new CompletableFuture<>();
2756        if (!createIncomplete) f.completeExceptionally(ex);
2757        final CompletableFuture<Integer> g = m.whenComplete
2758            (f,
2759             (Integer x, Throwable t) -> {
2760                threadAssertNull(x);
2761                threadAssertSame(t, ex);
2762                a.getAndIncrement();
2763            });
2764        if (createIncomplete) f.completeExceptionally(ex);
2765        checkCompletedWithWrappedCFException(f, ex);
2766        checkCompletedWithWrappedCFException(g, ex);
2767        assertEquals(1, a.get());
2768    }}
2769
2770    /**
2771     * whenComplete action executes on cancelled source, propagating
2772     * CancellationException.
2773     */
2774    public void testWhenComplete_sourceCancelled() {
2775        for (ExecutionMode m : ExecutionMode.values())
2776        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2777        for (boolean createIncomplete : new boolean[] { true, false })
2778    {
2779        final AtomicInteger a = new AtomicInteger(0);
2780        final CompletableFuture<Integer> f = new CompletableFuture<>();
2781        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2782        final CompletableFuture<Integer> g = m.whenComplete
2783            (f,
2784             (Integer x, Throwable t) -> {
2785                threadAssertNull(x);
2786                threadAssertTrue(t instanceof CancellationException);
2787                a.getAndIncrement();
2788            });
2789        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2790
2791        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2792        checkCompletedWithWrappedCancellationException(g);
2793        checkCancelled(f);
2794        assertEquals(1, a.get());
2795    }}
2796
2797    /**
2798     * If a whenComplete action throws an exception when triggered by
2799     * a normal completion, it completes exceptionally
2800     */
2801    public void testWhenComplete_actionFailed() {
2802        for (boolean createIncomplete : new boolean[] { true, false })
2803        for (ExecutionMode m : ExecutionMode.values())
2804        for (Integer v1 : new Integer[] { 1, null })
2805    {
2806        final AtomicInteger a = new AtomicInteger(0);
2807        final CFException ex = new CFException();
2808        final CompletableFuture<Integer> f = new CompletableFuture<>();
2809        if (!createIncomplete) f.complete(v1);
2810        final CompletableFuture<Integer> g = m.whenComplete
2811            (f,
2812             (Integer x, Throwable t) -> {
2813                threadAssertSame(x, v1);
2814                threadAssertNull(t);
2815                a.getAndIncrement();
2816                throw ex;
2817            });
2818        if (createIncomplete) f.complete(v1);
2819        checkCompletedNormally(f, v1);
2820        checkCompletedWithWrappedCFException(g, ex);
2821        assertEquals(1, a.get());
2822    }}
2823
2824    /**
2825     * If a whenComplete action throws an exception when triggered by
2826     * a source completion that also throws an exception, the source
2827     * exception takes precedence.
2828     */
2829    public void testWhenComplete_actionFailedSourceFailed() {
2830        for (boolean createIncomplete : new boolean[] { true, false })
2831        for (ExecutionMode m : ExecutionMode.values())
2832        for (Integer v1 : new Integer[] { 1, null })
2833    {
2834        final AtomicInteger a = new AtomicInteger(0);
2835        final CFException ex1 = new CFException();
2836        final CFException ex2 = new CFException();
2837        final CompletableFuture<Integer> f = new CompletableFuture<>();
2838
2839        if (!createIncomplete) f.completeExceptionally(ex1);
2840        final CompletableFuture<Integer> g = m.whenComplete
2841            (f,
2842             (Integer x, Throwable t) -> {
2843                threadAssertSame(t, ex1);
2844                threadAssertNull(x);
2845                a.getAndIncrement();
2846                throw ex2;
2847            });
2848        if (createIncomplete) f.completeExceptionally(ex1);
2849
2850        checkCompletedWithWrappedCFException(f, ex1);
2851        checkCompletedWithWrappedCFException(g, ex1);
2852        assertEquals(1, a.get());
2853    }}
2854
2993   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines