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.74 by jsr166, Fri Jun 6 21:19:22 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 743 | Line 866 | public class CompletableFutureTest exten
866          if (!createIncomplete) f.completeExceptionally(ex);
867          final CompletableFuture<Integer> g = f.exceptionally
868              ((Throwable t) -> {
869 +                ExecutionMode.DEFAULT.checkExecutionMode();
870                  threadAssertSame(t, ex);
871                  a.getAndIncrement();
872                  return v1;
# Line 764 | Line 888 | public class CompletableFutureTest exten
888          if (!createIncomplete) f.completeExceptionally(ex1);
889          final CompletableFuture<Integer> g = f.exceptionally
890              ((Throwable t) -> {
891 +                ExecutionMode.DEFAULT.checkExecutionMode();
892                  threadAssertSame(t, ex1);
893                  a.getAndIncrement();
894                  throw ex2;
895              });
896          if (createIncomplete) f.completeExceptionally(ex1);
897  
898 <        checkCompletedWithWrappedCFException(g, ex2);
898 >        checkCompletedWithWrappedException(g, ex2);
899          assertEquals(1, a.get());
900      }}
901  
# Line 789 | Line 914 | public class CompletableFutureTest exten
914          final CompletableFuture<Integer> g = m.handle
915              (f,
916               (Integer x, Throwable t) -> {
917 +                m.checkExecutionMode();
918                  threadAssertSame(x, v1);
919                  threadAssertNull(t);
920                  a.getAndIncrement();
# Line 817 | Line 943 | public class CompletableFutureTest exten
943          final CompletableFuture<Integer> g = m.handle
944              (f,
945               (Integer x, Throwable t) -> {
946 +                m.checkExecutionMode();
947                  threadAssertNull(x);
948                  threadAssertSame(t, ex);
949                  a.getAndIncrement();
# Line 825 | Line 952 | public class CompletableFutureTest exten
952          if (createIncomplete) f.completeExceptionally(ex);
953  
954          checkCompletedNormally(g, v1);
955 <        checkCompletedWithWrappedCFException(f, ex);
955 >        checkCompletedExceptionally(f, ex);
956          assertEquals(1, a.get());
957      }}
958  
# Line 845 | Line 972 | public class CompletableFutureTest exten
972          final CompletableFuture<Integer> g = m.handle
973              (f,
974               (Integer x, Throwable t) -> {
975 +                m.checkExecutionMode();
976                  threadAssertNull(x);
977                  threadAssertTrue(t instanceof CancellationException);
978                  a.getAndIncrement();
# Line 872 | Line 1000 | public class CompletableFutureTest exten
1000          final CompletableFuture<Integer> g = m.handle
1001              (f,
1002               (Integer x, Throwable t) -> {
1003 +                m.checkExecutionMode();
1004                  threadAssertNull(x);
1005                  threadAssertSame(ex1, t);
1006                  a.getAndIncrement();
# Line 879 | Line 1008 | public class CompletableFutureTest exten
1008              });
1009          if (createIncomplete) f.completeExceptionally(ex1);
1010  
1011 <        checkCompletedWithWrappedCFException(g, ex2);
1012 <        checkCompletedWithWrappedCFException(f, ex1);
1011 >        checkCompletedWithWrappedException(g, ex2);
1012 >        checkCompletedExceptionally(f, ex1);
1013          assertEquals(1, a.get());
1014      }}
1015  
# Line 896 | Line 1025 | public class CompletableFutureTest exten
1025          final CompletableFuture<Integer> g = m.handle
1026              (f,
1027               (Integer x, Throwable t) -> {
1028 +                m.checkExecutionMode();
1029                  threadAssertSame(x, v1);
1030                  threadAssertNull(t);
1031                  a.getAndIncrement();
# Line 903 | Line 1033 | public class CompletableFutureTest exten
1033              });
1034          if (createIncomplete) f.complete(v1);
1035  
1036 <        checkCompletedWithWrappedCFException(g, ex);
1036 >        checkCompletedWithWrappedException(g, ex);
1037          checkCompletedNormally(f, v1);
1038          assertEquals(1, a.get());
1039      }}
# Line 911 | Line 1041 | public class CompletableFutureTest exten
1041      /**
1042       * runAsync completes after running Runnable
1043       */
1044 <    public void testRunAsync() {
1045 <        Noop r = new Noop(ExecutionMode.ASYNC);
1046 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1047 <        assertNull(f.join());
1048 <        assertEquals(1, r.invocationCount);
1049 <        checkCompletedNormally(f, null);
1050 <    }
1051 <
1052 <    /**
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);
1044 >    public void testRunAsync_normalCompletion() {
1045 >        ExecutionMode[] executionModes = {
1046 >            ExecutionMode.ASYNC,
1047 >            ExecutionMode.EXECUTOR,
1048 >        };
1049 >        for (ExecutionMode m : executionModes)
1050 >    {
1051 >        final Noop r = new Noop(m);
1052 >        final CompletableFuture<Void> f = m.runAsync(r);
1053          assertNull(f.join());
930        assertEquals(1, r.invocationCount);
1054          checkCompletedNormally(f, null);
1055 <        assertEquals(1, exec.count.get());
1056 <    }
1055 >        r.assertInvoked();
1056 >    }}
1057  
1058      /**
1059       * failing runAsync completes exceptionally after running Runnable
1060       */
1061 <    public void testRunAsync3() {
1062 <        FailingRunnable r = new FailingRunnable();
1063 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1061 >    public void testRunAsync_exceptionalCompletion() {
1062 >        ExecutionMode[] executionModes = {
1063 >            ExecutionMode.ASYNC,
1064 >            ExecutionMode.EXECUTOR,
1065 >        };
1066 >        for (ExecutionMode m : executionModes)
1067 >    {
1068 >        final FailingRunnable r = new FailingRunnable(m);
1069 >        final CompletableFuture<Void> f = m.runAsync(r);
1070          checkCompletedWithWrappedCFException(f);
1071 <        assertEquals(1, r.invocationCount);
1072 <    }
1071 >        r.assertInvoked();
1072 >    }}
1073  
1074      /**
1075       * supplyAsync completes with result of supplier
1076       */
1077 <    public void testSupplyAsync() {
1078 <        CompletableFuture<Integer> f;
1079 <        f = CompletableFuture.supplyAsync(supplyOne);
1080 <        assertEquals(f.join(), one);
1081 <        checkCompletedNormally(f, one);
1082 <    }
1083 <
1084 <    /**
1085 <     * supplyAsync with executor completes with result of supplier
1086 <     */
1087 <    public void testSupplyAsync2() {
1088 <        CompletableFuture<Integer> f;
1089 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1090 <        assertEquals(f.join(), one);
962 <        checkCompletedNormally(f, one);
963 <    }
1077 >    public void testSupplyAsync_normalCompletion() {
1078 >        ExecutionMode[] executionModes = {
1079 >            ExecutionMode.ASYNC,
1080 >            ExecutionMode.EXECUTOR,
1081 >        };
1082 >        for (ExecutionMode m : executionModes)
1083 >        for (Integer v1 : new Integer[] { 1, null })
1084 >    {
1085 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1086 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1087 >        assertSame(v1, f.join());
1088 >        checkCompletedNormally(f, v1);
1089 >        r.assertInvoked();
1090 >    }}
1091  
1092      /**
1093       * Failing supplyAsync completes exceptionally
1094       */
1095 <    public void testSupplyAsync3() {
1096 <        FailingSupplier r = new FailingSupplier();
1097 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1095 >    public void testSupplyAsync_exceptionalCompletion() {
1096 >        ExecutionMode[] executionModes = {
1097 >            ExecutionMode.ASYNC,
1098 >            ExecutionMode.EXECUTOR,
1099 >        };
1100 >        for (ExecutionMode m : executionModes)
1101 >    {
1102 >        FailingSupplier r = new FailingSupplier(m);
1103 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1104          checkCompletedWithWrappedCFException(f);
1105 <        assertEquals(1, r.invocationCount);
1106 <    }
1105 >        r.assertInvoked();
1106 >    }}
1107  
1108      // seq completion methods
1109  
# Line 993 | Line 1126 | public class CompletableFutureTest exten
1126  
1127          checkCompletedNormally(g, null);
1128          checkCompletedNormally(f, v1);
1129 <        assertEquals(1, r.invocationCount);
1129 >        r.assertInvoked();
1130      }}
1131  
1132      /**
# Line 1014 | Line 1147 | public class CompletableFutureTest exten
1147              f.completeExceptionally(ex);
1148          }
1149  
1150 <        checkCompletedWithWrappedCFException(g, ex);
1151 <        checkCompletedWithWrappedCFException(f, ex);
1152 <        assertEquals(0, r.invocationCount);
1150 >        checkCompletedWithWrappedException(g, ex);
1151 >        checkCompletedExceptionally(f, ex);
1152 >        r.assertNotInvoked();
1153      }}
1154  
1155      /**
# Line 1030 | Line 1163 | public class CompletableFutureTest exten
1163          final CompletableFuture<Integer> f = new CompletableFuture<>();
1164          final Noop r = new Noop(m);
1165          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1166 <        final CompletableFuture<Void> g = f.thenRun(r);
1166 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1167          if (createIncomplete) {
1168              checkIncomplete(g);
1169              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1038 | Line 1171 | public class CompletableFutureTest exten
1171  
1172          checkCompletedWithWrappedCancellationException(g);
1173          checkCancelled(f);
1174 <        assertEquals(0, r.invocationCount);
1174 >        r.assertNotInvoked();
1175      }}
1176  
1177      /**
# Line 1050 | Line 1183 | public class CompletableFutureTest exten
1183          for (Integer v1 : new Integer[] { 1, null })
1184      {
1185          final CompletableFuture<Integer> f = new CompletableFuture<>();
1186 <        final FailingRunnable r = new FailingRunnable();
1186 >        final FailingRunnable r = new FailingRunnable(m);
1187          if (!createIncomplete) f.complete(v1);
1188 <        final CompletableFuture<Void> g = f.thenRun(r);
1188 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1189          if (createIncomplete) {
1190              checkIncomplete(g);
1191              f.complete(v1);
# Line 1071 | Line 1204 | public class CompletableFutureTest exten
1204          for (Integer v1 : new Integer[] { 1, null })
1205      {
1206          final CompletableFuture<Integer> f = new CompletableFuture<>();
1207 <        final IncFunction r = new IncFunction();
1207 >        final IncFunction r = new IncFunction(m);
1208          if (!createIncomplete) f.complete(v1);
1209          final CompletableFuture<Integer> g = m.thenApply(f, r);
1210          if (createIncomplete) {
# Line 1081 | Line 1214 | public class CompletableFutureTest exten
1214  
1215          checkCompletedNormally(g, inc(v1));
1216          checkCompletedNormally(f, v1);
1217 <        assertEquals(1, r.invocationCount);
1217 >        r.assertValue(inc(v1));
1218      }}
1219  
1220      /**
# Line 1094 | Line 1227 | public class CompletableFutureTest exten
1227      {
1228          final CFException ex = new CFException();
1229          final CompletableFuture<Integer> f = new CompletableFuture<>();
1230 <        final IncFunction r = new IncFunction();
1230 >        final IncFunction r = new IncFunction(m);
1231          if (!createIncomplete) f.completeExceptionally(ex);
1232          final CompletableFuture<Integer> g = m.thenApply(f, r);
1233          if (createIncomplete) {
# Line 1102 | Line 1235 | public class CompletableFutureTest exten
1235              f.completeExceptionally(ex);
1236          }
1237  
1238 <        checkCompletedWithWrappedCFException(g, ex);
1239 <        checkCompletedWithWrappedCFException(f, ex);
1240 <        assertEquals(0, r.invocationCount);
1238 >        checkCompletedWithWrappedException(g, ex);
1239 >        checkCompletedExceptionally(f, ex);
1240 >        r.assertNotInvoked();
1241      }}
1242  
1243      /**
# Line 1116 | Line 1249 | public class CompletableFutureTest exten
1249          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1250      {
1251          final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 <        final IncFunction r = new IncFunction();
1252 >        final IncFunction r = new IncFunction(m);
1253          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1254 <        final CompletableFuture<Integer> g = f.thenApply(r);
1254 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1255          if (createIncomplete) {
1256              checkIncomplete(g);
1257              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1126 | Line 1259 | public class CompletableFutureTest exten
1259  
1260          checkCompletedWithWrappedCancellationException(g);
1261          checkCancelled(f);
1262 <        assertEquals(0, r.invocationCount);
1262 >        r.assertNotInvoked();
1263      }}
1264  
1265      /**
# Line 1138 | Line 1271 | public class CompletableFutureTest exten
1271          for (Integer v1 : new Integer[] { 1, null })
1272      {
1273          final CompletableFuture<Integer> f = new CompletableFuture<>();
1274 <        final FailingFunction r = new FailingFunction();
1274 >        final FailingFunction r = new FailingFunction(m);
1275          if (!createIncomplete) f.complete(v1);
1276 <        final CompletableFuture<Integer> g = f.thenApply(r);
1276 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1277          if (createIncomplete) {
1278              checkIncomplete(g);
1279              f.complete(v1);
# Line 1159 | Line 1292 | public class CompletableFutureTest exten
1292          for (Integer v1 : new Integer[] { 1, null })
1293      {
1294          final CompletableFuture<Integer> f = new CompletableFuture<>();
1295 <        final IncAction r = new IncAction();
1295 >        final NoopConsumer r = new NoopConsumer(m);
1296          if (!createIncomplete) f.complete(v1);
1297          final CompletableFuture<Void> g = m.thenAccept(f, r);
1298          if (createIncomplete) {
# Line 1168 | Line 1301 | public class CompletableFutureTest exten
1301          }
1302  
1303          checkCompletedNormally(g, null);
1304 +        r.assertValue(v1);
1305          checkCompletedNormally(f, v1);
1172        assertEquals(1, r.invocationCount);
1173        assertEquals(inc(v1), r.value);
1306      }}
1307  
1308      /**
# Line 1183 | Line 1315 | public class CompletableFutureTest exten
1315      {
1316          final CFException ex = new CFException();
1317          final CompletableFuture<Integer> f = new CompletableFuture<>();
1318 <        final IncAction r = new IncAction();
1318 >        final NoopConsumer r = new NoopConsumer(m);
1319          if (!createIncomplete) f.completeExceptionally(ex);
1320          final CompletableFuture<Void> g = m.thenAccept(f, r);
1321          if (createIncomplete) {
# Line 1191 | Line 1323 | public class CompletableFutureTest exten
1323              f.completeExceptionally(ex);
1324          }
1325  
1326 <        checkCompletedWithWrappedCFException(g, ex);
1327 <        checkCompletedWithWrappedCFException(f, ex);
1328 <        assertEquals(0, r.invocationCount);
1326 >        checkCompletedWithWrappedException(g, ex);
1327 >        checkCompletedExceptionally(f, ex);
1328 >        r.assertNotInvoked();
1329      }}
1330  
1331      /**
1332 <     * thenAccept result completes exceptionally if action does
1332 >     * thenAccept result completes exceptionally if source cancelled
1333       */
1334 <    public void testThenAccept_actionFailed() {
1334 >    public void testThenAccept_sourceCancelled() {
1335          for (ExecutionMode m : ExecutionMode.values())
1336          for (boolean createIncomplete : new boolean[] { true, false })
1337 <        for (Integer v1 : new Integer[] { 1, null })
1337 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1338      {
1339          final CompletableFuture<Integer> f = new CompletableFuture<>();
1340 <        final FailingConsumer r = new FailingConsumer();
1341 <        if (!createIncomplete) f.complete(v1);
1342 <        final CompletableFuture<Void> g = f.thenAccept(r);
1340 >        final NoopConsumer r = new NoopConsumer(m);
1341 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1342 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1343          if (createIncomplete) {
1344              checkIncomplete(g);
1345 <            f.complete(v1);
1345 >            assertTrue(f.cancel(mayInterruptIfRunning));
1346          }
1347  
1348 <        checkCompletedWithWrappedCFException(g);
1349 <        checkCompletedNormally(f, v1);
1348 >        checkCompletedWithWrappedCancellationException(g);
1349 >        checkCancelled(f);
1350 >        r.assertNotInvoked();
1351      }}
1352  
1353      /**
1354 <     * thenAccept result completes exceptionally if source cancelled
1354 >     * thenAccept result completes exceptionally if action does
1355       */
1356 <    public void testThenAccept_sourceCancelled() {
1356 >    public void testThenAccept_actionFailed() {
1357          for (ExecutionMode m : ExecutionMode.values())
1358          for (boolean createIncomplete : new boolean[] { true, false })
1359 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1359 >        for (Integer v1 : new Integer[] { 1, null })
1360      {
1361          final CompletableFuture<Integer> f = new CompletableFuture<>();
1362 <        final IncAction r = new IncAction();
1363 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1364 <        final CompletableFuture<Void> g = f.thenAccept(r);
1362 >        final FailingConsumer r = new FailingConsumer(m);
1363 >        if (!createIncomplete) f.complete(v1);
1364 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1365          if (createIncomplete) {
1366              checkIncomplete(g);
1367 <            assertTrue(f.cancel(mayInterruptIfRunning));
1367 >            f.complete(v1);
1368          }
1369  
1370 <        checkCompletedWithWrappedCancellationException(g);
1371 <        checkCancelled(f);
1239 <        assertEquals(0, r.invocationCount);
1370 >        checkCompletedWithWrappedCFException(g);
1371 >        checkCompletedNormally(f, v1);
1372      }}
1373  
1374      /**
# Line 1252 | Line 1384 | public class CompletableFutureTest exten
1384      {
1385          final CompletableFuture<Integer> f = new CompletableFuture<>();
1386          final CompletableFuture<Integer> g = new CompletableFuture<>();
1387 <        final SubtractFunction r = new SubtractFunction();
1387 >        final SubtractFunction r = new SubtractFunction(m);
1388  
1389          if (fFirst) f.complete(v1); else g.complete(v2);
1390          if (!createIncomplete)
# Line 1260 | Line 1392 | public class CompletableFutureTest exten
1392          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1393          if (createIncomplete) {
1394              checkIncomplete(h);
1395 <            assertEquals(0, r.invocationCount);
1395 >            r.assertNotInvoked();
1396              if (!fFirst) f.complete(v1); else g.complete(v2);
1397          }
1398  
1399          checkCompletedNormally(h, subtract(v1, v2));
1400          checkCompletedNormally(f, v1);
1401          checkCompletedNormally(g, v2);
1402 <        assertEquals(1, r.invocationCount);
1402 >        r.assertValue(subtract(v1, v2));
1403      }}
1404  
1405      /**
# Line 1283 | Line 1415 | public class CompletableFutureTest exten
1415          final CompletableFuture<Integer> f = new CompletableFuture<>();
1416          final CompletableFuture<Integer> g = new CompletableFuture<>();
1417          final CFException ex = new CFException();
1418 <        final SubtractFunction r = new SubtractFunction();
1418 >        final SubtractFunction r = new SubtractFunction(m);
1419  
1420          (fFirst ? f : g).complete(v1);
1421          if (!createIncomplete)
# Line 1294 | Line 1426 | public class CompletableFutureTest exten
1426              (!fFirst ? f : g).completeExceptionally(ex);
1427          }
1428  
1429 <        checkCompletedWithWrappedCFException(h, ex);
1430 <        assertEquals(0, r.invocationCount);
1429 >        checkCompletedWithWrappedException(h, ex);
1430 >        r.assertNotInvoked();
1431          checkCompletedNormally(fFirst ? f : g, v1);
1432 <        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);
1432 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1433      }}
1434  
1435      /**
# Line 1339 | Line 1444 | public class CompletableFutureTest exten
1444      {
1445          final CompletableFuture<Integer> f = new CompletableFuture<>();
1446          final CompletableFuture<Integer> g = new CompletableFuture<>();
1447 <        final SubtractFunction r = new SubtractFunction();
1447 >        final SubtractFunction r = new SubtractFunction(m);
1448  
1449          (fFirst ? f : g).complete(v1);
1450          if (!createIncomplete)
# Line 1352 | Line 1457 | public class CompletableFutureTest exten
1457  
1458          checkCompletedWithWrappedCancellationException(h);
1459          checkCancelled(!fFirst ? f : g);
1460 <        assertEquals(0, r.invocationCount);
1460 >        r.assertNotInvoked();
1461          checkCompletedNormally(fFirst ? f : g, v1);
1462      }}
1463  
1464      /**
1465 +     * thenCombine result completes exceptionally if action does
1466 +     */
1467 +    public void testThenCombine_actionFailed() {
1468 +        for (ExecutionMode m : ExecutionMode.values())
1469 +        for (boolean fFirst : new boolean[] { true, false })
1470 +        for (Integer v1 : new Integer[] { 1, null })
1471 +        for (Integer v2 : new Integer[] { 2, null })
1472 +    {
1473 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1474 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1475 +        final FailingBiFunction r = new FailingBiFunction(m);
1476 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1477 +
1478 +        if (fFirst) {
1479 +            f.complete(v1);
1480 +            g.complete(v2);
1481 +        } else {
1482 +            g.complete(v2);
1483 +            f.complete(v1);
1484 +        }
1485 +
1486 +        checkCompletedWithWrappedCFException(h);
1487 +        checkCompletedNormally(f, v1);
1488 +        checkCompletedNormally(g, v2);
1489 +    }}
1490 +
1491 +    /**
1492       * thenAcceptBoth result completes normally after normal
1493       * completion of sources
1494       */
# Line 1369 | Line 1501 | public class CompletableFutureTest exten
1501      {
1502          final CompletableFuture<Integer> f = new CompletableFuture<>();
1503          final CompletableFuture<Integer> g = new CompletableFuture<>();
1504 <        final SubtractAction r = new SubtractAction();
1504 >        final SubtractAction r = new SubtractAction(m);
1505  
1506          if (fFirst) f.complete(v1); else g.complete(v2);
1507          if (!createIncomplete)
# Line 1377 | Line 1509 | public class CompletableFutureTest exten
1509          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1510          if (createIncomplete) {
1511              checkIncomplete(h);
1512 <            assertEquals(0, r.invocationCount);
1512 >            r.assertNotInvoked();
1513              if (!fFirst) f.complete(v1); else g.complete(v2);
1514          }
1515  
1516          checkCompletedNormally(h, null);
1517 <        assertEquals(subtract(v1, v2), r.value);
1517 >        r.assertValue(subtract(v1, v2));
1518          checkCompletedNormally(f, v1);
1519          checkCompletedNormally(g, v2);
1520      }}
# Line 1400 | Line 1532 | public class CompletableFutureTest exten
1532          final CompletableFuture<Integer> f = new CompletableFuture<>();
1533          final CompletableFuture<Integer> g = new CompletableFuture<>();
1534          final CFException ex = new CFException();
1535 <        final SubtractAction r = new SubtractAction();
1535 >        final SubtractAction r = new SubtractAction(m);
1536  
1537          (fFirst ? f : g).complete(v1);
1538          if (!createIncomplete)
# Line 1411 | Line 1543 | public class CompletableFutureTest exten
1543              (!fFirst ? f : g).completeExceptionally(ex);
1544          }
1545  
1546 <        checkCompletedWithWrappedCFException(h, ex);
1547 <        assertEquals(0, r.invocationCount);
1546 >        checkCompletedWithWrappedException(h, ex);
1547 >        r.assertNotInvoked();
1548          checkCompletedNormally(fFirst ? f : g, v1);
1549 <        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);
1549 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1550      }}
1551  
1552      /**
# Line 1456 | Line 1561 | public class CompletableFutureTest exten
1561      {
1562          final CompletableFuture<Integer> f = new CompletableFuture<>();
1563          final CompletableFuture<Integer> g = new CompletableFuture<>();
1564 <        final SubtractAction r = new SubtractAction();
1564 >        final SubtractAction r = new SubtractAction(m);
1565  
1566          (fFirst ? f : g).complete(v1);
1567          if (!createIncomplete)
# Line 1469 | Line 1574 | public class CompletableFutureTest exten
1574  
1575          checkCompletedWithWrappedCancellationException(h);
1576          checkCancelled(!fFirst ? f : g);
1577 <        assertEquals(0, r.invocationCount);
1577 >        r.assertNotInvoked();
1578          checkCompletedNormally(fFirst ? f : g, v1);
1579      }}
1580  
1581      /**
1582 +     * thenAcceptBoth result completes exceptionally if action does
1583 +     */
1584 +    public void testThenAcceptBoth_actionFailed() {
1585 +        for (ExecutionMode m : ExecutionMode.values())
1586 +        for (boolean fFirst : new boolean[] { true, false })
1587 +        for (Integer v1 : new Integer[] { 1, null })
1588 +        for (Integer v2 : new Integer[] { 2, null })
1589 +    {
1590 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1591 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1592 +        final FailingBiConsumer r = new FailingBiConsumer(m);
1593 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1594 +
1595 +        if (fFirst) {
1596 +            f.complete(v1);
1597 +            g.complete(v2);
1598 +        } else {
1599 +            g.complete(v2);
1600 +            f.complete(v1);
1601 +        }
1602 +
1603 +        checkCompletedWithWrappedCFException(h);
1604 +        checkCompletedNormally(f, v1);
1605 +        checkCompletedNormally(g, v2);
1606 +    }}
1607 +
1608 +    /**
1609       * runAfterBoth result completes normally after normal
1610       * completion of sources
1611       */
# Line 1494 | Line 1626 | public class CompletableFutureTest exten
1626          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1627          if (createIncomplete) {
1628              checkIncomplete(h);
1629 <            assertEquals(0, r.invocationCount);
1629 >            r.assertNotInvoked();
1630              if (!fFirst) f.complete(v1); else g.complete(v2);
1631          }
1632  
1633          checkCompletedNormally(h, null);
1634 <        assertEquals(1, r.invocationCount);
1634 >        r.assertInvoked();
1635          checkCompletedNormally(f, v1);
1636          checkCompletedNormally(g, v2);
1637      }}
# Line 1528 | Line 1660 | public class CompletableFutureTest exten
1660              (!fFirst ? f : g).completeExceptionally(ex);
1661          }
1662  
1663 <        checkCompletedWithWrappedCFException(h, ex);
1664 <        assertEquals(0, r.invocationCount);
1663 >        checkCompletedWithWrappedException(h, ex);
1664 >        r.assertNotInvoked();
1665          checkCompletedNormally(fFirst ? f : g, v1);
1666 <        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);
1666 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1667      }}
1668  
1669      /**
# Line 1589 | Line 1692 | public class CompletableFutureTest exten
1692  
1693          checkCompletedWithWrappedCancellationException(h);
1694          checkCancelled(!fFirst ? f : g);
1695 <        assertEquals(0, r.invocationCount);
1695 >        r.assertNotInvoked();
1696          checkCompletedNormally(fFirst ? f : g, v1);
1697      }}
1698  
1699      /**
1700 <     * applyToEither result completes normally after normal completion
1598 <     * of either source
1700 >     * runAfterBoth result completes exceptionally if action does
1701       */
1702 <    public void testApplyToEither_normalCompletion() {
1702 >    public void testRunAfterBoth_actionFailed() {
1703          for (ExecutionMode m : ExecutionMode.values())
1602        for (boolean createIncomplete : new boolean[] { true, false })
1704          for (boolean fFirst : new boolean[] { true, false })
1705          for (Integer v1 : new Integer[] { 1, null })
1706          for (Integer v2 : new Integer[] { 2, null })
1707      {
1708          final CompletableFuture<Integer> f = new CompletableFuture<>();
1709          final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 <        final IncFunction r = new IncFunction();
1710 >        final FailingRunnable r1 = new FailingRunnable(m);
1711 >        final FailingRunnable r2 = new FailingRunnable(m);
1712  
1713 <        if (!createIncomplete)
1714 <            if (fFirst) f.complete(v1); else g.complete(v2);
1715 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1716 <        if (createIncomplete) {
1717 <            checkIncomplete(h);
1718 <            assertEquals(0, r.invocationCount);
1719 <            if (fFirst) f.complete(v1); else g.complete(v2);
1713 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1714 >        if (fFirst) {
1715 >            f.complete(v1);
1716 >            g.complete(v2);
1717 >        } else {
1718 >            g.complete(v2);
1719 >            f.complete(v1);
1720          }
1721 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1620 <        if (!fFirst) f.complete(v1); else g.complete(v2);
1721 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1722  
1723 +        checkCompletedWithWrappedCFException(h1);
1724 +        checkCompletedWithWrappedCFException(h2);
1725          checkCompletedNormally(f, v1);
1726          checkCompletedNormally(g, v2);
1624        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1727      }}
1728  
1729 <    public void testApplyToEither_normalCompletionBothAvailable() {
1729 >    /**
1730 >     * applyToEither result completes normally after normal completion
1731 >     * of either source
1732 >     */
1733 >    public void testApplyToEither_normalCompletion() {
1734          for (ExecutionMode m : ExecutionMode.values())
1629        for (boolean fFirst : new boolean[] { true, false })
1735          for (Integer v1 : new Integer[] { 1, null })
1736          for (Integer v2 : new Integer[] { 2, null })
1737      {
1738          final CompletableFuture<Integer> f = new CompletableFuture<>();
1739          final CompletableFuture<Integer> g = new CompletableFuture<>();
1740 <        final IncFunction r = new IncFunction();
1740 >        final IncFunction[] rs = new IncFunction[6];
1741 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1742  
1743 <        if (fFirst) {
1744 <            f.complete(v1);
1745 <            g.complete(v2);
1746 <        } else {
1747 <            g.complete(v2);
1748 <            f.complete(v1);
1749 <        }
1743 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1744 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1745 >        checkIncomplete(h0);
1746 >        checkIncomplete(h1);
1747 >        rs[0].assertNotInvoked();
1748 >        rs[1].assertNotInvoked();
1749 >        f.complete(v1);
1750 >        checkCompletedNormally(h0, inc(v1));
1751 >        checkCompletedNormally(h1, inc(v1));
1752 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1753 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1754 >        checkCompletedNormally(h2, inc(v1));
1755 >        checkCompletedNormally(h3, inc(v1));
1756 >        g.complete(v2);
1757  
1758 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1758 >        // unspecified behavior - both source completions available
1759 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1760 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1761 >        rs[4].assertValue(h4.join());
1762 >        rs[5].assertValue(h5.join());
1763 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1764 >                   Objects.equals(inc(v2), h4.join()));
1765 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1766 >                   Objects.equals(inc(v2), h5.join()));
1767  
1768          checkCompletedNormally(f, v1);
1769          checkCompletedNormally(g, v2);
1770 <
1771 <        // unspecified behavior
1772 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1773 <                   Objects.equals(h.join(), inc(v2)));
1774 <        assertEquals(1, r.invocationCount);
1770 >        checkCompletedNormally(h0, inc(v1));
1771 >        checkCompletedNormally(h1, inc(v1));
1772 >        checkCompletedNormally(h2, inc(v1));
1773 >        checkCompletedNormally(h3, inc(v1));
1774 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1775      }}
1776  
1777      /**
1778       * applyToEither result completes exceptionally after exceptional
1779       * completion of either source
1780       */
1781 <    public void testApplyToEither_exceptionalCompletion1() {
1781 >    public void testApplyToEither_exceptionalCompletion() {
1782          for (ExecutionMode m : ExecutionMode.values())
1662        for (boolean createIncomplete : new boolean[] { true, false })
1663        for (boolean fFirst : new boolean[] { true, false })
1783          for (Integer v1 : new Integer[] { 1, null })
1784      {
1785          final CompletableFuture<Integer> f = new CompletableFuture<>();
1786          final CompletableFuture<Integer> g = new CompletableFuture<>();
1787          final CFException ex = new CFException();
1788 <        final IncFunction r = new IncFunction();
1788 >        final IncFunction[] rs = new IncFunction[6];
1789 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1790  
1791 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1792 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1793 <        if (createIncomplete) {
1794 <            checkIncomplete(h);
1795 <            assertEquals(0, r.invocationCount);
1796 <            (fFirst ? f : g).completeExceptionally(ex);
1797 <        }
1791 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1792 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1793 >        checkIncomplete(h0);
1794 >        checkIncomplete(h1);
1795 >        rs[0].assertNotInvoked();
1796 >        rs[1].assertNotInvoked();
1797 >        f.completeExceptionally(ex);
1798 >        checkCompletedWithWrappedException(h0, ex);
1799 >        checkCompletedWithWrappedException(h1, ex);
1800 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1801 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1802 >        checkCompletedWithWrappedException(h2, ex);
1803 >        checkCompletedWithWrappedException(h3, ex);
1804 >        g.complete(v1);
1805  
1806 <        checkCompletedWithWrappedCFException(h, ex);
1807 <        (!fFirst ? f : g).complete(v1);
1806 >        // unspecified behavior - both source completions available
1807 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1808 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1809 >        try {
1810 >            assertEquals(inc(v1), h4.join());
1811 >            rs[4].assertValue(inc(v1));
1812 >        } catch (CompletionException ok) {
1813 >            checkCompletedWithWrappedException(h4, ex);
1814 >            rs[4].assertNotInvoked();
1815 >        }
1816 >        try {
1817 >            assertEquals(inc(v1), h5.join());
1818 >            rs[5].assertValue(inc(v1));
1819 >        } catch (CompletionException ok) {
1820 >            checkCompletedWithWrappedException(h5, ex);
1821 >            rs[5].assertNotInvoked();
1822 >        }
1823  
1824 <        assertEquals(0, r.invocationCount);
1825 <        checkCompletedNormally(!fFirst ? f : g, v1);
1826 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1827 <        checkCompletedWithWrappedCFException(h, ex);
1824 >        checkCompletedExceptionally(f, ex);
1825 >        checkCompletedNormally(g, v1);
1826 >        checkCompletedWithWrappedException(h0, ex);
1827 >        checkCompletedWithWrappedException(h1, ex);
1828 >        checkCompletedWithWrappedException(h2, ex);
1829 >        checkCompletedWithWrappedException(h3, ex);
1830 >        checkCompletedWithWrappedException(h4, ex);
1831 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1832      }}
1833  
1834      public void testApplyToEither_exceptionalCompletion2() {
1835          for (ExecutionMode m : ExecutionMode.values())
1690        for (boolean reverseArgs : new boolean[] { true, false })
1836          for (boolean fFirst : new boolean[] { true, false })
1837          for (Integer v1 : new Integer[] { 1, null })
1838      {
1839          final CompletableFuture<Integer> f = new CompletableFuture<>();
1840          final CompletableFuture<Integer> g = new CompletableFuture<>();
1696        final IncFunction r1 = new IncFunction();
1697        final IncFunction r2 = new IncFunction();
1841          final CFException ex = new CFException();
1842 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1843 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1844 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1842 >        final IncFunction[] rs = new IncFunction[6];
1843 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1844 >
1845 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1846 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1847          if (fFirst) {
1848              f.complete(v1);
1849              g.completeExceptionally(ex);
# Line 1706 | Line 1851 | public class CompletableFutureTest exten
1851              g.completeExceptionally(ex);
1852              f.complete(v1);
1853          }
1854 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1854 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1855 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1856  
1857 <        // unspecified behavior
1857 >        // unspecified behavior - both source completions available
1858 >        try {
1859 >            assertEquals(inc(v1), h0.join());
1860 >            rs[0].assertValue(inc(v1));
1861 >        } catch (CompletionException ok) {
1862 >            checkCompletedWithWrappedException(h0, ex);
1863 >            rs[0].assertNotInvoked();
1864 >        }
1865          try {
1866              assertEquals(inc(v1), h1.join());
1867 <            assertEquals(1, r1.invocationCount);
1867 >            rs[1].assertValue(inc(v1));
1868          } catch (CompletionException ok) {
1869 <            checkCompletedWithWrappedCFException(h1, ex);
1870 <            assertEquals(0, r1.invocationCount);
1869 >            checkCompletedWithWrappedException(h1, ex);
1870 >            rs[1].assertNotInvoked();
1871          }
1719
1872          try {
1873              assertEquals(inc(v1), h2.join());
1874 <            assertEquals(1, r2.invocationCount);
1874 >            rs[2].assertValue(inc(v1));
1875          } catch (CompletionException ok) {
1876 <            checkCompletedWithWrappedCFException(h2, ex);
1877 <            assertEquals(0, r2.invocationCount);
1876 >            checkCompletedWithWrappedException(h2, ex);
1877 >            rs[2].assertNotInvoked();
1878 >        }
1879 >        try {
1880 >            assertEquals(inc(v1), h3.join());
1881 >            rs[3].assertValue(inc(v1));
1882 >        } catch (CompletionException ok) {
1883 >            checkCompletedWithWrappedException(h3, ex);
1884 >            rs[3].assertNotInvoked();
1885          }
1886  
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);
1887          checkCompletedNormally(f, v1);
1888 <        checkCompletedNormally(g, v2);
1888 >        checkCompletedExceptionally(g, ex);
1889      }}
1890  
1891      /**
1892       * applyToEither result completes exceptionally if either source cancelled
1893       */
1894 <    public void testApplyToEither_sourceCancelled1() {
1894 >    public void testApplyToEither_sourceCancelled() {
1895          for (ExecutionMode m : ExecutionMode.values())
1896          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1775        for (boolean createIncomplete : new boolean[] { true, false })
1776        for (boolean fFirst : new boolean[] { true, false })
1897          for (Integer v1 : new Integer[] { 1, null })
1898      {
1899          final CompletableFuture<Integer> f = new CompletableFuture<>();
1900          final CompletableFuture<Integer> g = new CompletableFuture<>();
1901 <        final IncFunction r = new IncFunction();
1901 >        final IncFunction[] rs = new IncFunction[6];
1902 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1903  
1904 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1905 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1906 <        if (createIncomplete) {
1907 <            checkIncomplete(h);
1908 <            assertEquals(0, r.invocationCount);
1909 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1910 <        }
1904 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1905 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1906 >        checkIncomplete(h0);
1907 >        checkIncomplete(h1);
1908 >        rs[0].assertNotInvoked();
1909 >        rs[1].assertNotInvoked();
1910 >        f.cancel(mayInterruptIfRunning);
1911 >        checkCompletedWithWrappedCancellationException(h0);
1912 >        checkCompletedWithWrappedCancellationException(h1);
1913 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1914 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1915 >        checkCompletedWithWrappedCancellationException(h2);
1916 >        checkCompletedWithWrappedCancellationException(h3);
1917 >        g.complete(v1);
1918  
1919 <        checkCompletedWithWrappedCancellationException(h);
1920 <        (!fFirst ? f : g).complete(v1);
1919 >        // unspecified behavior - both source completions available
1920 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1921 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1922 >        try {
1923 >            assertEquals(inc(v1), h4.join());
1924 >            rs[4].assertValue(inc(v1));
1925 >        } catch (CompletionException ok) {
1926 >            checkCompletedWithWrappedCancellationException(h4);
1927 >            rs[4].assertNotInvoked();
1928 >        }
1929 >        try {
1930 >            assertEquals(inc(v1), h5.join());
1931 >            rs[5].assertValue(inc(v1));
1932 >        } catch (CompletionException ok) {
1933 >            checkCompletedWithWrappedCancellationException(h5);
1934 >            rs[5].assertNotInvoked();
1935 >        }
1936  
1937 <        assertEquals(0, r.invocationCount);
1938 <        checkCompletedNormally(!fFirst ? f : g, v1);
1939 <        checkCancelled(fFirst ? f : g);
1940 <        checkCompletedWithWrappedCancellationException(h);
1937 >        checkCancelled(f);
1938 >        checkCompletedNormally(g, v1);
1939 >        checkCompletedWithWrappedCancellationException(h0);
1940 >        checkCompletedWithWrappedCancellationException(h1);
1941 >        checkCompletedWithWrappedCancellationException(h2);
1942 >        checkCompletedWithWrappedCancellationException(h3);
1943 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1944      }}
1945  
1946      public void testApplyToEither_sourceCancelled2() {
1947          for (ExecutionMode m : ExecutionMode.values())
1948          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1803        for (boolean reverseArgs : new boolean[] { true, false })
1949          for (boolean fFirst : new boolean[] { true, false })
1950          for (Integer v1 : new Integer[] { 1, null })
1951      {
1952          final CompletableFuture<Integer> f = new CompletableFuture<>();
1953          final CompletableFuture<Integer> g = new CompletableFuture<>();
1954 <        final IncFunction r1 = new IncFunction();
1955 <        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);
1954 >        final IncFunction[] rs = new IncFunction[6];
1955 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1956  
1957 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1957 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1958 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1959          if (fFirst) {
1960              f.complete(v1);
1961 <            assertTrue(g.cancel(mayInterruptIfRunning));
1961 >            g.cancel(mayInterruptIfRunning);
1962          } else {
1963 <            assertTrue(g.cancel(mayInterruptIfRunning));
1963 >            g.cancel(mayInterruptIfRunning);
1964              f.complete(v1);
1965          }
1966 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1966 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1967 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1968  
1969 <        // unspecified behavior
1969 >        // unspecified behavior - both source completions available
1970 >        try {
1971 >            assertEquals(inc(v1), h0.join());
1972 >            rs[0].assertValue(inc(v1));
1973 >        } catch (CompletionException ok) {
1974 >            checkCompletedWithWrappedCancellationException(h0);
1975 >            rs[0].assertNotInvoked();
1976 >        }
1977          try {
1978              assertEquals(inc(v1), h1.join());
1979 <            assertEquals(1, r1.invocationCount);
1979 >            rs[1].assertValue(inc(v1));
1980          } catch (CompletionException ok) {
1981              checkCompletedWithWrappedCancellationException(h1);
1982 <            assertEquals(0, r1.invocationCount);
1982 >            rs[1].assertNotInvoked();
1983          }
1833
1984          try {
1985              assertEquals(inc(v1), h2.join());
1986 <            assertEquals(1, r2.invocationCount);
1986 >            rs[2].assertValue(inc(v1));
1987          } catch (CompletionException ok) {
1988              checkCompletedWithWrappedCancellationException(h2);
1989 <            assertEquals(0, r2.invocationCount);
1989 >            rs[2].assertNotInvoked();
1990 >        }
1991 >        try {
1992 >            assertEquals(inc(v1), h3.join());
1993 >            rs[3].assertValue(inc(v1));
1994 >        } catch (CompletionException ok) {
1995 >            checkCompletedWithWrappedCancellationException(h3);
1996 >            rs[3].assertNotInvoked();
1997          }
1998  
1842        checkCancelled(g);
1999          checkCompletedNormally(f, v1);
2000 +        checkCancelled(g);
2001      }}
2002  
2003      /**
2004 <     * acceptEither result completes normally after normal completion
1848 <     * of either source
2004 >     * applyToEither result completes exceptionally if action does
2005       */
2006 <    public void testAcceptEither_normalCompletion1() {
2006 >    public void testApplyToEither_actionFailed() {
2007          for (ExecutionMode m : ExecutionMode.values())
2008          for (Integer v1 : new Integer[] { 1, null })
2009          for (Integer v2 : new Integer[] { 2, null })
2010      {
2011          final CompletableFuture<Integer> f = new CompletableFuture<>();
2012          final CompletableFuture<Integer> g = new CompletableFuture<>();
2013 <        final IncAction r = new IncAction();
2014 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2013 >        final FailingFunction[] rs = new FailingFunction[6];
2014 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2015  
2016 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2017 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2018          f.complete(v1);
2019 <        checkCompletedNormally(h, null);
2020 <        assertEquals(inc(v1), r.value);
2021 <        g.complete(v2);
2022 <
2023 <        checkCompletedNormally(f, v1);
2024 <        checkCompletedNormally(g, v2);
2025 <        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);
2019 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2020 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2021 >        checkCompletedWithWrappedCFException(h0);
2022 >        checkCompletedWithWrappedCFException(h1);
2023 >        checkCompletedWithWrappedCFException(h2);
2024 >        checkCompletedWithWrappedCFException(h3);
2025 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2026  
2027          g.complete(v2);
2028 <        checkCompletedNormally(h, null);
2029 <        assertEquals(inc(v2), r.value);
2030 <        f.complete(v1);
2028 >
2029 >        // unspecified behavior - both source completions available
2030 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2031 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2032 >
2033 >        checkCompletedWithWrappedCFException(h4);
2034 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2035 >                   Objects.equals(v2, rs[4].value));
2036 >        checkCompletedWithWrappedCFException(h5);
2037 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2038 >                   Objects.equals(v2, rs[5].value));
2039  
2040          checkCompletedNormally(f, v1);
2041          checkCompletedNormally(g, v2);
1887        checkCompletedNormally(h, null);
2042      }}
2043  
2044 <    public void testAcceptEither_normalCompletion3() {
2044 >    /**
2045 >     * acceptEither result completes normally after normal completion
2046 >     * of either source
2047 >     */
2048 >    public void testAcceptEither_normalCompletion() {
2049          for (ExecutionMode m : ExecutionMode.values())
2050          for (Integer v1 : new Integer[] { 1, null })
2051          for (Integer v2 : new Integer[] { 2, null })
2052      {
2053          final CompletableFuture<Integer> f = new CompletableFuture<>();
2054          final CompletableFuture<Integer> g = new CompletableFuture<>();
2055 <        final IncAction r = new IncAction();
2055 >        final NoopConsumer[] rs = new NoopConsumer[6];
2056 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2057  
2058 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2059 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2060 +        checkIncomplete(h0);
2061 +        checkIncomplete(h1);
2062 +        rs[0].assertNotInvoked();
2063 +        rs[1].assertNotInvoked();
2064          f.complete(v1);
2065 +        checkCompletedNormally(h0, null);
2066 +        checkCompletedNormally(h1, null);
2067 +        rs[0].assertValue(v1);
2068 +        rs[1].assertValue(v1);
2069 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2070 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2071 +        checkCompletedNormally(h2, null);
2072 +        checkCompletedNormally(h3, null);
2073 +        rs[2].assertValue(v1);
2074 +        rs[3].assertValue(v1);
2075          g.complete(v2);
1901        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2076  
2077 <        checkCompletedNormally(h, null);
2077 >        // unspecified behavior - both source completions available
2078 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2079 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2080 >        checkCompletedNormally(h4, null);
2081 >        checkCompletedNormally(h5, null);
2082 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2083 >                   Objects.equals(v2, rs[4].value));
2084 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2085 >                   Objects.equals(v2, rs[5].value));
2086 >
2087          checkCompletedNormally(f, v1);
2088          checkCompletedNormally(g, v2);
2089 <
2090 <        // unspecified behavior
2091 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2092 <                   Objects.equals(r.value, inc(v2)));
2089 >        checkCompletedNormally(h0, null);
2090 >        checkCompletedNormally(h1, null);
2091 >        checkCompletedNormally(h2, null);
2092 >        checkCompletedNormally(h3, null);
2093 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2094      }}
2095  
2096      /**
2097       * acceptEither result completes exceptionally after exceptional
2098       * completion of either source
2099       */
2100 <    public void testAcceptEither_exceptionalCompletion1() {
2100 >    public void testAcceptEither_exceptionalCompletion() {
2101          for (ExecutionMode m : ExecutionMode.values())
2102          for (Integer v1 : new Integer[] { 1, null })
2103      {
2104          final CompletableFuture<Integer> f = new CompletableFuture<>();
2105          final CompletableFuture<Integer> g = new CompletableFuture<>();
1922        final IncAction r = new IncAction();
1923        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2106          final CFException ex = new CFException();
2107 +        final NoopConsumer[] rs = new NoopConsumer[6];
2108 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2109  
2110 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2111 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2112 +        checkIncomplete(h0);
2113 +        checkIncomplete(h1);
2114 +        rs[0].assertNotInvoked();
2115 +        rs[1].assertNotInvoked();
2116          f.completeExceptionally(ex);
2117 <        checkCompletedWithWrappedCFException(h, ex);
2117 >        checkCompletedWithWrappedException(h0, ex);
2118 >        checkCompletedWithWrappedException(h1, ex);
2119 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2120 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2121 >        checkCompletedWithWrappedException(h2, ex);
2122 >        checkCompletedWithWrappedException(h3, ex);
2123 >
2124          g.complete(v1);
2125  
2126 <        assertEquals(0, r.invocationCount);
2126 >        // unspecified behavior - both source completions available
2127 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2128 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2129 >        try {
2130 >            assertNull(h4.join());
2131 >            rs[4].assertValue(v1);
2132 >        } catch (CompletionException ok) {
2133 >            checkCompletedWithWrappedException(h4, ex);
2134 >            rs[4].assertNotInvoked();
2135 >        }
2136 >        try {
2137 >            assertNull(h5.join());
2138 >            rs[5].assertValue(v1);
2139 >        } catch (CompletionException ok) {
2140 >            checkCompletedWithWrappedException(h5, ex);
2141 >            rs[5].assertNotInvoked();
2142 >        }
2143 >
2144 >        checkCompletedExceptionally(f, ex);
2145          checkCompletedNormally(g, v1);
2146 <        checkCompletedWithWrappedCFException(f, ex);
2147 <        checkCompletedWithWrappedCFException(h, ex);
2146 >        checkCompletedWithWrappedException(h0, ex);
2147 >        checkCompletedWithWrappedException(h1, ex);
2148 >        checkCompletedWithWrappedException(h2, ex);
2149 >        checkCompletedWithWrappedException(h3, ex);
2150 >        checkCompletedWithWrappedException(h4, ex);
2151 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2152      }}
2153  
2154      public void testAcceptEither_exceptionalCompletion2() {
2155          for (ExecutionMode m : ExecutionMode.values())
2156 +        for (boolean fFirst : new boolean[] { true, false })
2157          for (Integer v1 : new Integer[] { 1, null })
2158      {
2159          final CompletableFuture<Integer> f = new CompletableFuture<>();
2160          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();
2161          final CFException ex = new CFException();
2162 +        final NoopConsumer[] rs = new NoopConsumer[6];
2163 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2164  
2165 <        g.completeExceptionally(ex);
2166 <        f.complete(v1);
2167 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2165 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2166 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2167 >        if (fFirst) {
2168 >            f.complete(v1);
2169 >            g.completeExceptionally(ex);
2170 >        } else {
2171 >            g.completeExceptionally(ex);
2172 >            f.complete(v1);
2173 >        }
2174 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2175 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2176  
2177 <        // unspecified behavior
1970 <        Integer v;
2177 >        // unspecified behavior - both source completions available
2178          try {
2179 <            assertNull(h.join());
2180 <            assertEquals(1, r.invocationCount);
1974 <            assertEquals(inc(v1), r.value);
2179 >            assertEquals(null, h0.join());
2180 >            rs[0].assertValue(v1);
2181          } catch (CompletionException ok) {
2182 <            checkCompletedWithWrappedCFException(h, ex);
2183 <            assertEquals(0, r.invocationCount);
2182 >            checkCompletedWithWrappedException(h0, ex);
2183 >            rs[0].assertNotInvoked();
2184          }
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;
2185          try {
2186 <            assertNull(h.join());
2187 <            assertEquals(1, r.invocationCount);
2002 <            assertEquals(inc(v1), r.value);
2186 >            assertEquals(null, h1.join());
2187 >            rs[1].assertValue(v1);
2188          } catch (CompletionException ok) {
2189 <            checkCompletedWithWrappedCFException(h, ex);
2190 <            assertEquals(0, r.invocationCount);
2189 >            checkCompletedWithWrappedException(h1, ex);
2190 >            rs[1].assertNotInvoked();
2191 >        }
2192 >        try {
2193 >            assertEquals(null, h2.join());
2194 >            rs[2].assertValue(v1);
2195 >        } catch (CompletionException ok) {
2196 >            checkCompletedWithWrappedException(h2, ex);
2197 >            rs[2].assertNotInvoked();
2198 >        }
2199 >        try {
2200 >            assertEquals(null, h3.join());
2201 >            rs[3].assertValue(v1);
2202 >        } catch (CompletionException ok) {
2203 >            checkCompletedWithWrappedException(h3, ex);
2204 >            rs[3].assertNotInvoked();
2205          }
2206  
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);
2207          checkCompletedNormally(f, v1);
2208 <        checkCompletedNormally(g, v2);
2208 >        checkCompletedExceptionally(g, ex);
2209      }}
2210  
2211      /**
2212       * acceptEither result completes exceptionally if either source cancelled
2213       */
2214 <    public void testAcceptEither_sourceCancelled1() {
2053 <        for (ExecutionMode m : ExecutionMode.values())
2054 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2055 <        for (Integer v1 : new Integer[] { 1, null })
2056 <    {
2057 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2058 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2059 <        final IncAction r = new IncAction();
2060 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2061 <
2062 <        assertTrue(f.cancel(mayInterruptIfRunning));
2063 <        checkCompletedWithWrappedCancellationException(h);
2064 <        g.complete(v1);
2065 <
2066 <        checkCancelled(f);
2067 <        assertEquals(0, r.invocationCount);
2068 <        checkCompletedNormally(g, v1);
2069 <        checkCompletedWithWrappedCancellationException(h);
2070 <    }}
2071 <
2072 <    public void testAcceptEither_sourceCancelled2() {
2214 >    public void testAcceptEither_sourceCancelled() {
2215          for (ExecutionMode m : ExecutionMode.values())
2216          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2217          for (Integer v1 : new Integer[] { 1, null })
2218      {
2219          final CompletableFuture<Integer> f = new CompletableFuture<>();
2220          final CompletableFuture<Integer> g = new CompletableFuture<>();
2221 <        final IncAction r = new IncAction();
2222 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2221 >        final NoopConsumer[] rs = new NoopConsumer[6];
2222 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2223  
2224 <        assertTrue(g.cancel(mayInterruptIfRunning));
2225 <        checkCompletedWithWrappedCancellationException(h);
2226 <        f.complete(v1);
2227 <
2228 <        checkCancelled(g);
2229 <        assertEquals(0, r.invocationCount);
2230 <        checkCompletedNormally(f, v1);
2231 <        checkCompletedWithWrappedCancellationException(h);
2232 <    }}
2233 <
2234 <    public void testAcceptEither_sourceCancelled3() {
2235 <        for (ExecutionMode m : ExecutionMode.values())
2236 <        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();
2224 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2225 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2226 >        checkIncomplete(h0);
2227 >        checkIncomplete(h1);
2228 >        rs[0].assertNotInvoked();
2229 >        rs[1].assertNotInvoked();
2230 >        f.cancel(mayInterruptIfRunning);
2231 >        checkCompletedWithWrappedCancellationException(h0);
2232 >        checkCompletedWithWrappedCancellationException(h1);
2233 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2234 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2235 >        checkCompletedWithWrappedCancellationException(h2);
2236 >        checkCompletedWithWrappedCancellationException(h3);
2237  
2238 <        assertTrue(g.cancel(mayInterruptIfRunning));
2102 <        f.complete(v1);
2103 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2238 >        g.complete(v1);
2239  
2240 <        // unspecified behavior
2241 <        Integer v;
2240 >        // unspecified behavior - both source completions available
2241 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2242 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2243          try {
2244 <            assertNull(h.join());
2245 <            assertEquals(1, r.invocationCount);
2110 <            assertEquals(inc(v1), r.value);
2244 >            assertNull(h4.join());
2245 >            rs[4].assertValue(v1);
2246          } catch (CompletionException ok) {
2247 <            checkCompletedWithWrappedCancellationException(h);
2248 <            assertEquals(0, r.invocationCount);
2247 >            checkCompletedWithWrappedCancellationException(h4);
2248 >            rs[4].assertNotInvoked();
2249          }
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;
2250          try {
2251 <            assertNull(h.join());
2252 <            assertEquals(1, r.invocationCount);
2138 <            assertEquals(inc(v1), r.value);
2251 >            assertNull(h5.join());
2252 >            rs[5].assertValue(v1);
2253          } catch (CompletionException ok) {
2254 <            checkCompletedWithWrappedCancellationException(h);
2255 <            assertEquals(0, r.invocationCount);
2254 >            checkCompletedWithWrappedCancellationException(h5);
2255 >            rs[5].assertNotInvoked();
2256          }
2257  
2258          checkCancelled(f);
2259          checkCompletedNormally(g, v1);
2260 +        checkCompletedWithWrappedCancellationException(h0);
2261 +        checkCompletedWithWrappedCancellationException(h1);
2262 +        checkCompletedWithWrappedCancellationException(h2);
2263 +        checkCompletedWithWrappedCancellationException(h3);
2264 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2265      }}
2266  
2267      /**
2268 <     * runAfterEither result completes normally after normal completion
2150 <     * of either source
2268 >     * acceptEither result completes exceptionally if action does
2269       */
2270 <    public void testRunAfterEither_normalCompletion1() {
2270 >    public void testAcceptEither_actionFailed() {
2271          for (ExecutionMode m : ExecutionMode.values())
2272          for (Integer v1 : new Integer[] { 1, null })
2273          for (Integer v2 : new Integer[] { 2, null })
2274      {
2275          final CompletableFuture<Integer> f = new CompletableFuture<>();
2276          final CompletableFuture<Integer> g = new CompletableFuture<>();
2277 <        final Noop r = new Noop(m);
2278 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2277 >        final FailingConsumer[] rs = new FailingConsumer[6];
2278 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2279  
2280 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2281 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2282          f.complete(v1);
2283 <        checkCompletedNormally(h, null);
2284 <        assertEquals(1, r.invocationCount);
2283 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2284 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2285 >        checkCompletedWithWrappedCFException(h0);
2286 >        checkCompletedWithWrappedCFException(h1);
2287 >        checkCompletedWithWrappedCFException(h2);
2288 >        checkCompletedWithWrappedCFException(h3);
2289 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2290 >
2291          g.complete(v2);
2292  
2293 +        // unspecified behavior - both source completions available
2294 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2295 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2296 +
2297 +        checkCompletedWithWrappedCFException(h4);
2298 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2299 +                   Objects.equals(v2, rs[4].value));
2300 +        checkCompletedWithWrappedCFException(h5);
2301 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2302 +                   Objects.equals(v2, rs[5].value));
2303 +
2304          checkCompletedNormally(f, v1);
2305          checkCompletedNormally(g, v2);
2169        checkCompletedNormally(h, null);
2170        assertEquals(1, r.invocationCount);
2306      }}
2307  
2308 <    public void testRunAfterEither_normalCompletion2() {
2308 >    /**
2309 >     * runAfterEither result completes normally after normal completion
2310 >     * of either source
2311 >     */
2312 >    public void testRunAfterEither_normalCompletion() {
2313          for (ExecutionMode m : ExecutionMode.values())
2314          for (Integer v1 : new Integer[] { 1, null })
2315          for (Integer v2 : new Integer[] { 2, null })
2316      {
2317          final CompletableFuture<Integer> f = new CompletableFuture<>();
2318          final CompletableFuture<Integer> g = new CompletableFuture<>();
2319 <        final Noop r = new Noop(m);
2320 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2319 >        final Noop[] rs = new Noop[6];
2320 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2321  
2322 <        g.complete(v2);
2323 <        checkCompletedNormally(h, null);
2324 <        assertEquals(1, r.invocationCount);
2322 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2323 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2324 >        checkIncomplete(h0);
2325 >        checkIncomplete(h1);
2326 >        rs[0].assertNotInvoked();
2327 >        rs[1].assertNotInvoked();
2328          f.complete(v1);
2329 +        checkCompletedNormally(h0, null);
2330 +        checkCompletedNormally(h1, null);
2331 +        rs[0].assertInvoked();
2332 +        rs[1].assertInvoked();
2333 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2334 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2335 +        checkCompletedNormally(h2, null);
2336 +        checkCompletedNormally(h3, null);
2337 +        rs[2].assertInvoked();
2338 +        rs[3].assertInvoked();
2339  
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);
2340          g.complete(v2);
2205        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2341  
2342 <        checkCompletedNormally(h, null);
2342 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2343 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2344 >
2345          checkCompletedNormally(f, v1);
2346          checkCompletedNormally(g, v2);
2347 <        assertEquals(1, r.invocationCount);
2347 >        checkCompletedNormally(h0, null);
2348 >        checkCompletedNormally(h1, null);
2349 >        checkCompletedNormally(h2, null);
2350 >        checkCompletedNormally(h3, null);
2351 >        checkCompletedNormally(h4, null);
2352 >        checkCompletedNormally(h5, null);
2353 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2354      }}
2355  
2356      /**
2357       * runAfterEither result completes exceptionally after exceptional
2358       * completion of either source
2359       */
2360 <    public void testRunAfterEither_exceptionalCompletion1() {
2360 >    public void testRunAfterEither_exceptionalCompletion() {
2361          for (ExecutionMode m : ExecutionMode.values())
2362          for (Integer v1 : new Integer[] { 1, null })
2363      {
2364          final CompletableFuture<Integer> f = new CompletableFuture<>();
2365          final CompletableFuture<Integer> g = new CompletableFuture<>();
2223        final Noop r = new Noop(m);
2224        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2366          final CFException ex = new CFException();
2367 +        final Noop[] rs = new Noop[6];
2368 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2369  
2370 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2371 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2372 +        checkIncomplete(h0);
2373 +        checkIncomplete(h1);
2374 +        rs[0].assertNotInvoked();
2375 +        rs[1].assertNotInvoked();
2376          f.completeExceptionally(ex);
2377 <        checkCompletedWithWrappedCFException(h, ex);
2377 >        checkCompletedWithWrappedException(h0, ex);
2378 >        checkCompletedWithWrappedException(h1, ex);
2379 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2380 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2381 >        checkCompletedWithWrappedException(h2, ex);
2382 >        checkCompletedWithWrappedException(h3, ex);
2383 >
2384          g.complete(v1);
2385  
2386 <        assertEquals(0, r.invocationCount);
2386 >        // unspecified behavior - both source completions available
2387 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2388 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2389 >        try {
2390 >            assertNull(h4.join());
2391 >            rs[4].assertInvoked();
2392 >        } catch (CompletionException ok) {
2393 >            checkCompletedWithWrappedException(h4, ex);
2394 >            rs[4].assertNotInvoked();
2395 >        }
2396 >        try {
2397 >            assertNull(h5.join());
2398 >            rs[5].assertInvoked();
2399 >        } catch (CompletionException ok) {
2400 >            checkCompletedWithWrappedException(h5, ex);
2401 >            rs[5].assertNotInvoked();
2402 >        }
2403 >
2404 >        checkCompletedExceptionally(f, ex);
2405          checkCompletedNormally(g, v1);
2406 <        checkCompletedWithWrappedCFException(f, ex);
2407 <        checkCompletedWithWrappedCFException(h, ex);
2406 >        checkCompletedWithWrappedException(h0, ex);
2407 >        checkCompletedWithWrappedException(h1, ex);
2408 >        checkCompletedWithWrappedException(h2, ex);
2409 >        checkCompletedWithWrappedException(h3, ex);
2410 >        checkCompletedWithWrappedException(h4, ex);
2411 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2412      }}
2413  
2414      public void testRunAfterEither_exceptionalCompletion2() {
2415          for (ExecutionMode m : ExecutionMode.values())
2416 +        for (boolean fFirst : new boolean[] { true, false })
2417          for (Integer v1 : new Integer[] { 1, null })
2418      {
2419          final CompletableFuture<Integer> f = new CompletableFuture<>();
2420          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);
2421          final CFException ex = new CFException();
2422 +        final Noop[] rs = new Noop[6];
2423 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2424  
2425 <        g.completeExceptionally(ex);
2426 <        f.complete(v1);
2427 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2425 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2426 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2427 >        if (fFirst) {
2428 >            f.complete(v1);
2429 >            g.completeExceptionally(ex);
2430 >        } else {
2431 >            g.completeExceptionally(ex);
2432 >            f.complete(v1);
2433 >        }
2434 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2435 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2436  
2437 <        // unspecified behavior
2438 <        Integer v;
2437 >        // unspecified behavior - both source completions available
2438 >        try {
2439 >            assertEquals(null, h0.join());
2440 >            rs[0].assertInvoked();
2441 >        } catch (CompletionException ok) {
2442 >            checkCompletedWithWrappedException(h0, ex);
2443 >            rs[0].assertNotInvoked();
2444 >        }
2445 >        try {
2446 >            assertEquals(null, h1.join());
2447 >            rs[1].assertInvoked();
2448 >        } catch (CompletionException ok) {
2449 >            checkCompletedWithWrappedException(h1, ex);
2450 >            rs[1].assertNotInvoked();
2451 >        }
2452 >        try {
2453 >            assertEquals(null, h2.join());
2454 >            rs[2].assertInvoked();
2455 >        } catch (CompletionException ok) {
2456 >            checkCompletedWithWrappedException(h2, ex);
2457 >            rs[2].assertNotInvoked();
2458 >        }
2459          try {
2460 <            assertNull(h.join());
2461 <            assertEquals(1, r.invocationCount);
2460 >            assertEquals(null, h3.join());
2461 >            rs[3].assertInvoked();
2462          } catch (CompletionException ok) {
2463 <            checkCompletedWithWrappedCFException(h, ex);
2464 <            assertEquals(0, r.invocationCount);
2463 >            checkCompletedWithWrappedException(h3, ex);
2464 >            rs[3].assertNotInvoked();
2465          }
2466  
2280        checkCompletedWithWrappedCFException(g, ex);
2467          checkCompletedNormally(f, v1);
2468 +        checkCompletedExceptionally(g, ex);
2469      }}
2470  
2471 <    public void testRunAfterEither_exceptionalCompletion4() {
2471 >    /**
2472 >     * runAfterEither result completes exceptionally if either source cancelled
2473 >     */
2474 >    public void testRunAfterEither_sourceCancelled() {
2475          for (ExecutionMode m : ExecutionMode.values())
2476 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2477          for (Integer v1 : new Integer[] { 1, null })
2478      {
2479          final CompletableFuture<Integer> f = new CompletableFuture<>();
2480          final CompletableFuture<Integer> g = new CompletableFuture<>();
2481 <        final Noop r = new Noop(m);
2482 <        final CFException ex = new CFException();
2481 >        final Noop[] rs = new Noop[6];
2482 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2483 >
2484 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2485 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2486 >        checkIncomplete(h0);
2487 >        checkIncomplete(h1);
2488 >        rs[0].assertNotInvoked();
2489 >        rs[1].assertNotInvoked();
2490 >        f.cancel(mayInterruptIfRunning);
2491 >        checkCompletedWithWrappedCancellationException(h0);
2492 >        checkCompletedWithWrappedCancellationException(h1);
2493 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2494 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2495 >        checkCompletedWithWrappedCancellationException(h2);
2496 >        checkCompletedWithWrappedCancellationException(h3);
2497  
2293        f.completeExceptionally(ex);
2498          g.complete(v1);
2295        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2499  
2500 <        // unspecified behavior
2501 <        Integer v;
2500 >        // unspecified behavior - both source completions available
2501 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2502 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2503 >        try {
2504 >            assertNull(h4.join());
2505 >            rs[4].assertInvoked();
2506 >        } catch (CompletionException ok) {
2507 >            checkCompletedWithWrappedCancellationException(h4);
2508 >            rs[4].assertNotInvoked();
2509 >        }
2510          try {
2511 <            assertNull(h.join());
2512 <            assertEquals(1, r.invocationCount);
2511 >            assertNull(h5.join());
2512 >            rs[5].assertInvoked();
2513          } catch (CompletionException ok) {
2514 <            checkCompletedWithWrappedCFException(h, ex);
2515 <            assertEquals(0, r.invocationCount);
2514 >            checkCompletedWithWrappedCancellationException(h5);
2515 >            rs[5].assertNotInvoked();
2516          }
2517  
2518 <        checkCompletedWithWrappedCFException(f, ex);
2518 >        checkCancelled(f);
2519          checkCompletedNormally(g, v1);
2520 +        checkCompletedWithWrappedCancellationException(h0);
2521 +        checkCompletedWithWrappedCancellationException(h1);
2522 +        checkCompletedWithWrappedCancellationException(h2);
2523 +        checkCompletedWithWrappedCancellationException(h3);
2524 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2525      }}
2526  
2527      /**
2528       * runAfterEither result completes exceptionally if action does
2529       */
2530 <    public void testRunAfterEither_actionFailed1() {
2530 >    public void testRunAfterEither_actionFailed() {
2531          for (ExecutionMode m : ExecutionMode.values())
2532          for (Integer v1 : new Integer[] { 1, null })
2533          for (Integer v2 : new Integer[] { 2, null })
2534      {
2535          final CompletableFuture<Integer> f = new CompletableFuture<>();
2536          final CompletableFuture<Integer> g = new CompletableFuture<>();
2537 <        final FailingRunnable r = new FailingRunnable();
2538 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2537 >        final FailingRunnable[] rs = new FailingRunnable[6];
2538 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2539  
2540 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2541 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2542          f.complete(v1);
2543 <        checkCompletedWithWrappedCFException(h);
2543 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2544 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2545 >        checkCompletedWithWrappedCFException(h0);
2546 >        checkCompletedWithWrappedCFException(h1);
2547 >        checkCompletedWithWrappedCFException(h2);
2548 >        checkCompletedWithWrappedCFException(h3);
2549 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2550          g.complete(v2);
2551 <        checkCompletedNormally(f, v1);
2552 <        checkCompletedNormally(g, v2);
2553 <    }}
2554 <
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);
2551 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2552 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2553 >        checkCompletedWithWrappedCFException(h4);
2554 >        checkCompletedWithWrappedCFException(h5);
2555  
2341        g.complete(v2);
2342        checkCompletedWithWrappedCFException(h);
2343        f.complete(v1);
2556          checkCompletedNormally(f, v1);
2557          checkCompletedNormally(g, v2);
2558 <    }}
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);
2558 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2559      }}
2560  
2561      /**
# Line 2451 | Line 2567 | public class CompletableFutureTest exten
2567          for (Integer v1 : new Integer[] { 1, null })
2568      {
2569          final CompletableFuture<Integer> f = new CompletableFuture<>();
2570 <        final CompletableFutureInc r = new CompletableFutureInc();
2570 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2571          if (!createIncomplete) f.complete(v1);
2572 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2572 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2573          if (createIncomplete) f.complete(v1);
2574  
2575          checkCompletedNormally(g, inc(v1));
2576          checkCompletedNormally(f, v1);
2577 <        assertEquals(1, r.invocationCount);
2577 >        r.assertValue(v1);
2578      }}
2579  
2580      /**
# Line 2470 | Line 2586 | public class CompletableFutureTest exten
2586          for (boolean createIncomplete : new boolean[] { true, false })
2587      {
2588          final CFException ex = new CFException();
2589 <        final CompletableFutureInc r = new CompletableFutureInc();
2589 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2590          final CompletableFuture<Integer> f = new CompletableFuture<>();
2591          if (!createIncomplete) f.completeExceptionally(ex);
2592 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2592 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2593          if (createIncomplete) f.completeExceptionally(ex);
2594  
2595 <        checkCompletedWithWrappedCFException(g, ex);
2596 <        checkCompletedWithWrappedCFException(f, ex);
2597 <        assertEquals(0, r.invocationCount);
2595 >        checkCompletedWithWrappedException(g, ex);
2596 >        checkCompletedExceptionally(f, ex);
2597 >        r.assertNotInvoked();
2598      }}
2599  
2600      /**
# Line 2491 | Line 2607 | public class CompletableFutureTest exten
2607      {
2608          final CompletableFuture<Integer> f = new CompletableFuture<>();
2609          final FailingCompletableFutureFunction r
2610 <            = new FailingCompletableFutureFunction();
2610 >            = new FailingCompletableFutureFunction(m);
2611          if (!createIncomplete) f.complete(v1);
2612 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2612 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2613          if (createIncomplete) f.complete(v1);
2614  
2615          checkCompletedWithWrappedCFException(g);
# Line 2509 | Line 2625 | public class CompletableFutureTest exten
2625          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2626      {
2627          final CompletableFuture<Integer> f = new CompletableFuture<>();
2628 <        final CompletableFutureInc r = new CompletableFutureInc();
2628 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2629          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2630 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2630 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2631          if (createIncomplete) {
2632              checkIncomplete(g);
2633              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2538 | Line 2654 | public class CompletableFutureTest exten
2654       */
2655      public void testAllOf_normal() throws Exception {
2656          for (int k = 1; k < 20; ++k) {
2657 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2657 >            CompletableFuture<Integer>[] fs
2658 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2659              for (int i = 0; i < k; ++i)
2660                  fs[i] = new CompletableFuture<>();
2661              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 2552 | Line 2669 | public class CompletableFutureTest exten
2669          }
2670      }
2671  
2672 +    public void testAllOf_backwards() throws Exception {
2673 +        for (int k = 1; k < 20; ++k) {
2674 +            CompletableFuture<Integer>[] fs
2675 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2676 +            for (int i = 0; i < k; ++i)
2677 +                fs[i] = new CompletableFuture<>();
2678 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2679 +            for (int i = k - 1; i >= 0; i--) {
2680 +                checkIncomplete(f);
2681 +                checkIncomplete(CompletableFuture.allOf(fs));
2682 +                fs[i].complete(one);
2683 +            }
2684 +            checkCompletedNormally(f, null);
2685 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2686 +        }
2687 +    }
2688 +
2689      /**
2690       * anyOf(no component futures) returns an incomplete future
2691       */
# Line 2610 | Line 2744 | public class CompletableFutureTest exten
2744          Runnable[] throwingActions = {
2745              () -> CompletableFuture.supplyAsync(null),
2746              () -> CompletableFuture.supplyAsync(null, exec),
2747 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2747 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2748  
2749              () -> CompletableFuture.runAsync(null),
2750              () -> CompletableFuture.runAsync(null, exec),
# Line 2683 | Line 2817 | public class CompletableFutureTest exten
2817  
2818              () -> f.thenCompose(null),
2819              () -> f.thenComposeAsync(null),
2820 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2820 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2821              () -> f.thenComposeAsync(null, exec),
2822  
2823              () -> f.exceptionally(null),
# Line 2730 | Line 2864 | public class CompletableFutureTest exten
2864          final CompletableFuture<Integer> g = m.whenComplete
2865              (f,
2866               (Integer x, Throwable t) -> {
2867 +                m.checkExecutionMode();
2868                  threadAssertSame(x, v1);
2869                  threadAssertNull(t);
2870                  a.getAndIncrement();
# Line 2757 | Line 2892 | public class CompletableFutureTest exten
2892          final CompletableFuture<Integer> g = m.whenComplete
2893              (f,
2894               (Integer x, Throwable t) -> {
2895 +                m.checkExecutionMode();
2896                  threadAssertNull(x);
2897                  threadAssertSame(t, ex);
2898                  a.getAndIncrement();
2899              });
2900          if (createIncomplete) f.completeExceptionally(ex);
2901 <        checkCompletedWithWrappedCFException(f, ex);
2902 <        checkCompletedWithWrappedCFException(g, ex);
2901 >        checkCompletedExceptionally(f, ex);
2902 >        checkCompletedWithWrappedException(g, ex);
2903          assertEquals(1, a.get());
2904      }}
2905  
# Line 2782 | Line 2918 | public class CompletableFutureTest exten
2918          final CompletableFuture<Integer> g = m.whenComplete
2919              (f,
2920               (Integer x, Throwable t) -> {
2921 +                m.checkExecutionMode();
2922                  threadAssertNull(x);
2923                  threadAssertTrue(t instanceof CancellationException);
2924                  a.getAndIncrement();
2925              });
2926          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2927  
2791        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2928          checkCompletedWithWrappedCancellationException(g);
2929          checkCancelled(f);
2930          assertEquals(1, a.get());
# Line 2810 | Line 2946 | public class CompletableFutureTest exten
2946          final CompletableFuture<Integer> g = m.whenComplete
2947              (f,
2948               (Integer x, Throwable t) -> {
2949 +                m.checkExecutionMode();
2950                  threadAssertSame(x, v1);
2951                  threadAssertNull(t);
2952                  a.getAndIncrement();
# Line 2817 | Line 2954 | public class CompletableFutureTest exten
2954              });
2955          if (createIncomplete) f.complete(v1);
2956          checkCompletedNormally(f, v1);
2957 <        checkCompletedWithWrappedCFException(g, ex);
2957 >        checkCompletedWithWrappedException(g, ex);
2958          assertEquals(1, a.get());
2959      }}
2960  
# Line 2840 | Line 2977 | public class CompletableFutureTest exten
2977          final CompletableFuture<Integer> g = m.whenComplete
2978              (f,
2979               (Integer x, Throwable t) -> {
2980 +                m.checkExecutionMode();
2981                  threadAssertSame(t, ex1);
2982                  threadAssertNull(x);
2983                  a.getAndIncrement();
# Line 2847 | Line 2985 | public class CompletableFutureTest exten
2985              });
2986          if (createIncomplete) f.completeExceptionally(ex1);
2987  
2988 <        checkCompletedWithWrappedCFException(f, ex1);
2989 <        checkCompletedWithWrappedCFException(g, ex1);
2988 >        checkCompletedExceptionally(f, ex1);
2989 >        checkCompletedWithWrappedException(g, ex1);
2990          assertEquals(1, a.get());
2991      }}
2992  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines