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.54 by jsr166, Mon Jun 2 21:32:24 2014 UTC vs.
Revision 1.72 by jsr166, Fri Jun 6 21:10:34 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 284 | Line 319 | public class CompletableFutureTest exten
319      public void testGetNumberOfDependents() {
320          CompletableFuture<Integer> f = new CompletableFuture<>();
321          assertEquals(0, f.getNumberOfDependents());
322 <        CompletableFuture g = f.thenRun(new Noop());
322 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
323          assertEquals(1, f.getNumberOfDependents());
324          assertEquals(0, g.getNumberOfDependents());
325 <        CompletableFuture h = f.thenRun(new Noop());
325 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
326          assertEquals(2, f.getNumberOfDependents());
327          f.complete(1);
328          checkCompletedNormally(g, null);
# Line 320 | Line 355 | public class CompletableFutureTest exten
355          checkCompletedNormally(f, "test");
356      }
357  
358 <    // Choose non-commutative actions for better coverage
358 >    abstract class CheckedAction {
359 >        int invocationCount = 0;
360 >        final ExecutionMode m;
361 >        CheckedAction(ExecutionMode m) { this.m = m; }
362 >        void invoked() {
363 >            m.checkExecutionMode();
364 >            assertEquals(0, invocationCount++);
365 >        }
366 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
367 >        void assertInvoked() { assertEquals(1, invocationCount); }
368 >    }
369  
370 <    // A non-commutative function that handles and produces null values as well.
371 <    static Integer subtract(Integer x, Integer y) {
372 <        return (x == null && y == null) ? null :
373 <            ((x == null) ? 42 : x.intValue())
374 <            - ((y == null) ? 99 : y.intValue());
370 >    abstract class CheckedIntegerAction extends CheckedAction {
371 >        Integer value;
372 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
373 >        void assertValue(Integer expected) {
374 >            assertInvoked();
375 >            assertEquals(expected, value);
376 >        }
377 >    }
378 >
379 >    class IntegerSupplier extends CheckedAction
380 >        implements Supplier<Integer>
381 >    {
382 >        final Integer value;
383 >        IntegerSupplier(ExecutionMode m, Integer value) {
384 >            super(m);
385 >            this.value = value;
386 >        }
387 >        public Integer get() {
388 >            invoked();
389 >            return value;
390 >        }
391      }
392  
393      // A function that handles and produces null values as well.
# Line 334 | Line 395 | public class CompletableFutureTest exten
395          return (x == null) ? null : x + 1;
396      }
397  
398 <    static final Supplier<Integer> supplyOne =
399 <        () -> Integer.valueOf(1);
400 <    static final Function<Integer, Integer> inc =
401 <        (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;
398 >    class NoopConsumer extends CheckedIntegerAction
399 >        implements Consumer<Integer>
400 >    {
401 >        NoopConsumer(ExecutionMode m) { super(m); }
402          public void accept(Integer x) {
403 <            invocationCount++;
404 <            value = inc(x);
403 >            invoked();
404 >            value = x;
405          }
406      }
407 <    static final class IncFunction implements Function<Integer,Integer> {
408 <        int invocationCount = 0;
409 <        Integer value;
407 >
408 >    class IncFunction extends CheckedIntegerAction
409 >        implements Function<Integer,Integer>
410 >    {
411 >        IncFunction(ExecutionMode m) { super(m); }
412          public Integer apply(Integer x) {
413 <            invocationCount++;
413 >            invoked();
414              return value = inc(x);
415          }
416      }
417 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
418 <        int invocationCount = 0;
419 <        Integer value;
420 <        // Check this action was invoked exactly once when result is computed.
417 >
418 >    // Choose non-commutative actions for better coverage
419 >    // A non-commutative function that handles and produces null values as well.
420 >    static Integer subtract(Integer x, Integer y) {
421 >        return (x == null && y == null) ? null :
422 >            ((x == null) ? 42 : x.intValue())
423 >            - ((y == null) ? 99 : y.intValue());
424 >    }
425 >
426 >    class SubtractAction extends CheckedIntegerAction
427 >        implements BiConsumer<Integer, Integer>
428 >    {
429 >        SubtractAction(ExecutionMode m) { super(m); }
430          public void accept(Integer x, Integer y) {
431 <            invocationCount++;
431 >            invoked();
432              value = subtract(x, y);
433          }
434      }
435 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
436 <        int invocationCount = 0;
437 <        Integer value;
438 <        // Check this action was invoked exactly once when result is computed.
435 >
436 >    class SubtractFunction extends CheckedIntegerAction
437 >        implements BiFunction<Integer, Integer, Integer>
438 >    {
439 >        SubtractFunction(ExecutionMode m) { super(m); }
440          public Integer apply(Integer x, Integer y) {
441 <            invocationCount++;
441 >            invoked();
442              return value = subtract(x, y);
443          }
444      }
445 <    static final class Noop implements Runnable {
446 <        int invocationCount = 0;
445 >
446 >    class Noop extends CheckedAction implements Runnable {
447 >        Noop(ExecutionMode m) { super(m); }
448          public void run() {
449 <            invocationCount++;
449 >            invoked();
450          }
451      }
452  
453 <    static final class FailingSupplier implements Supplier<Integer> {
454 <        int invocationCount = 0;
453 >    class FailingSupplier extends CheckedAction
454 >        implements Supplier<Integer>
455 >    {
456 >        FailingSupplier(ExecutionMode m) { super(m); }
457          public Integer get() {
458 <            invocationCount++;
458 >            invoked();
459              throw new CFException();
460          }
461      }
462 <    static final class FailingConsumer implements Consumer<Integer> {
463 <        int invocationCount = 0;
462 >
463 >    class FailingConsumer extends CheckedIntegerAction
464 >        implements Consumer<Integer>
465 >    {
466 >        FailingConsumer(ExecutionMode m) { super(m); }
467          public void accept(Integer x) {
468 <            invocationCount++;
468 >            invoked();
469 >            value = x;
470              throw new CFException();
471          }
472      }
473 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
474 <        int invocationCount = 0;
473 >
474 >    class FailingBiConsumer extends CheckedIntegerAction
475 >        implements BiConsumer<Integer, Integer>
476 >    {
477 >        FailingBiConsumer(ExecutionMode m) { super(m); }
478          public void accept(Integer x, Integer y) {
479 <            invocationCount++;
479 >            invoked();
480 >            value = subtract(x, y);
481              throw new CFException();
482          }
483      }
484 <    static final class FailingFunction implements Function<Integer, Integer> {
485 <        int invocationCount = 0;
484 >
485 >    class FailingFunction extends CheckedIntegerAction
486 >        implements Function<Integer, Integer>
487 >    {
488 >        FailingFunction(ExecutionMode m) { super(m); }
489          public Integer apply(Integer x) {
490 <            invocationCount++;
490 >            invoked();
491 >            value = x;
492              throw new CFException();
493          }
494      }
495 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
496 <        int invocationCount = 0;
495 >
496 >    class FailingBiFunction extends CheckedIntegerAction
497 >        implements BiFunction<Integer, Integer, Integer>
498 >    {
499 >        FailingBiFunction(ExecutionMode m) { super(m); }
500          public Integer apply(Integer x, Integer y) {
501 <            invocationCount++;
501 >            invoked();
502 >            value = subtract(x, y);
503              throw new CFException();
504          }
505      }
506 <    static final class FailingRunnable implements Runnable {
507 <        int invocationCount = 0;
506 >
507 >    class FailingRunnable extends CheckedAction implements Runnable {
508 >        FailingRunnable(ExecutionMode m) { super(m); }
509          public void run() {
510 <            invocationCount++;
510 >            invoked();
511              throw new CFException();
512          }
513      }
514  
515 <    static final class CompletableFutureInc
516 <        implements Function<Integer, CompletableFuture<Integer>> {
517 <        int invocationCount = 0;
515 >
516 >    class CompletableFutureInc extends CheckedIntegerAction
517 >        implements Function<Integer, CompletableFuture<Integer>>
518 >    {
519 >        CompletableFutureInc(ExecutionMode m) { super(m); }
520          public CompletableFuture<Integer> apply(Integer x) {
521 <            invocationCount++;
521 >            invoked();
522 >            value = x;
523              CompletableFuture<Integer> f = new CompletableFuture<>();
524              f.complete(inc(x));
525              return f;
526          }
527      }
528  
529 <    static final class FailingCompletableFutureFunction
530 <        implements Function<Integer, CompletableFuture<Integer>> {
531 <        int invocationCount = 0;
529 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
530 >        implements Function<Integer, CompletableFuture<Integer>>
531 >    {
532 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
533          public CompletableFuture<Integer> apply(Integer x) {
534 <            invocationCount++;
534 >            invoked();
535 >            value = x;
536              throw new CFException();
537          }
538      }
539  
540      // Used for explicit executor tests
541      static final class ThreadExecutor implements Executor {
542 <        AtomicInteger count = new AtomicInteger(0);
542 >        final AtomicInteger count = new AtomicInteger(0);
543 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
544 >        static boolean startedCurrentThread() {
545 >            return Thread.currentThread().getThreadGroup() == tg;
546 >        }
547  
548          public void execute(Runnable r) {
549              count.getAndIncrement();
550 <            new Thread(r).start();
550 >            new Thread(tg, r).start();
551          }
552      }
553  
554      /**
555       * Permits the testing of parallel code for the 3 different
556 <     * execution modes without repeating all the testing code.
556 >     * execution modes without copy/pasting all the test methods.
557       */
558      enum ExecutionMode {
559          DEFAULT {
560              public void checkExecutionMode() {
561 +                assertFalse(ThreadExecutor.startedCurrentThread());
562                  assertNull(ForkJoinTask.getPool());
563              }
564 +            public CompletableFuture<Void> runAsync(Runnable a) {
565 +                throw new UnsupportedOperationException();
566 +            }
567 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
568 +                throw new UnsupportedOperationException();
569 +            }
570              public <T> CompletableFuture<Void> thenRun
571                  (CompletableFuture<T> f, Runnable a) {
572                  return f.thenRun(a);
# Line 531 | Line 635 | public class CompletableFutureTest exten
635                  assertSame(ForkJoinPool.commonPool(),
636                             ForkJoinTask.getPool());
637              }
638 +            public CompletableFuture<Void> runAsync(Runnable a) {
639 +                return CompletableFuture.runAsync(a);
640 +            }
641 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
642 +                return CompletableFuture.supplyAsync(a);
643 +            }
644              public <T> CompletableFuture<Void> thenRun
645                  (CompletableFuture<T> f, Runnable a) {
646                  return f.thenRunAsync(a);
# Line 596 | Line 706 | public class CompletableFutureTest exten
706  
707          EXECUTOR {
708              public void checkExecutionMode() {
709 <                //TODO
709 >                assertTrue(ThreadExecutor.startedCurrentThread());
710 >            }
711 >            public CompletableFuture<Void> runAsync(Runnable a) {
712 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
713 >            }
714 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
715 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
716              }
717              public <T> CompletableFuture<Void> thenRun
718                  (CompletableFuture<T> f, Runnable a) {
# Line 662 | Line 778 | public class CompletableFutureTest exten
778          };
779  
780          public abstract void checkExecutionMode();
781 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
782 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
783          public abstract <T> CompletableFuture<Void> thenRun
784              (CompletableFuture<T> f, Runnable a);
785          public abstract <T> CompletableFuture<Void> thenAccept
# Line 740 | Line 858 | public class CompletableFutureTest exten
858          if (!createIncomplete) f.completeExceptionally(ex);
859          final CompletableFuture<Integer> g = f.exceptionally
860              ((Throwable t) -> {
861 +                ExecutionMode.DEFAULT.checkExecutionMode();
862                  threadAssertSame(t, ex);
863                  a.getAndIncrement();
864                  return v1;
# Line 761 | Line 880 | public class CompletableFutureTest exten
880          if (!createIncomplete) f.completeExceptionally(ex1);
881          final CompletableFuture<Integer> g = f.exceptionally
882              ((Throwable t) -> {
883 +                ExecutionMode.DEFAULT.checkExecutionMode();
884                  threadAssertSame(t, ex1);
885                  a.getAndIncrement();
886                  throw ex2;
887              });
888          if (createIncomplete) f.completeExceptionally(ex1);
889  
890 <        checkCompletedWithWrappedCFException(g, ex2);
890 >        checkCompletedWithWrappedException(g, ex2);
891          assertEquals(1, a.get());
892      }}
893  
# Line 786 | Line 906 | public class CompletableFutureTest exten
906          final CompletableFuture<Integer> g = m.handle
907              (f,
908               (Integer x, Throwable t) -> {
909 +                m.checkExecutionMode();
910                  threadAssertSame(x, v1);
911                  threadAssertNull(t);
912                  a.getAndIncrement();
# Line 814 | Line 935 | public class CompletableFutureTest exten
935          final CompletableFuture<Integer> g = m.handle
936              (f,
937               (Integer x, Throwable t) -> {
938 +                m.checkExecutionMode();
939                  threadAssertNull(x);
940                  threadAssertSame(t, ex);
941                  a.getAndIncrement();
# Line 822 | Line 944 | public class CompletableFutureTest exten
944          if (createIncomplete) f.completeExceptionally(ex);
945  
946          checkCompletedNormally(g, v1);
947 <        checkCompletedWithWrappedCFException(f, ex);
947 >        checkCompletedExceptionally(f, ex);
948          assertEquals(1, a.get());
949      }}
950  
# Line 842 | Line 964 | public class CompletableFutureTest exten
964          final CompletableFuture<Integer> g = m.handle
965              (f,
966               (Integer x, Throwable t) -> {
967 +                m.checkExecutionMode();
968                  threadAssertNull(x);
969                  threadAssertTrue(t instanceof CancellationException);
970                  a.getAndIncrement();
# Line 869 | Line 992 | public class CompletableFutureTest exten
992          final CompletableFuture<Integer> g = m.handle
993              (f,
994               (Integer x, Throwable t) -> {
995 +                m.checkExecutionMode();
996                  threadAssertNull(x);
997                  threadAssertSame(ex1, t);
998                  a.getAndIncrement();
# Line 876 | Line 1000 | public class CompletableFutureTest exten
1000              });
1001          if (createIncomplete) f.completeExceptionally(ex1);
1002  
1003 <        checkCompletedWithWrappedCFException(g, ex2);
1004 <        checkCompletedWithWrappedCFException(f, ex1);
1003 >        checkCompletedWithWrappedException(g, ex2);
1004 >        checkCompletedExceptionally(f, ex1);
1005          assertEquals(1, a.get());
1006      }}
1007  
# Line 893 | Line 1017 | public class CompletableFutureTest exten
1017          final CompletableFuture<Integer> g = m.handle
1018              (f,
1019               (Integer x, Throwable t) -> {
1020 +                m.checkExecutionMode();
1021                  threadAssertSame(x, v1);
1022                  threadAssertNull(t);
1023                  a.getAndIncrement();
# Line 900 | Line 1025 | public class CompletableFutureTest exten
1025              });
1026          if (createIncomplete) f.complete(v1);
1027  
1028 <        checkCompletedWithWrappedCFException(g, ex);
1028 >        checkCompletedWithWrappedException(g, ex);
1029          checkCompletedNormally(f, v1);
1030          assertEquals(1, a.get());
1031      }}
# Line 908 | Line 1033 | public class CompletableFutureTest exten
1033      /**
1034       * runAsync completes after running Runnable
1035       */
1036 <    public void testRunAsync() {
1037 <        Noop r = new Noop();
1038 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1039 <        assertNull(f.join());
1040 <        assertEquals(1, r.invocationCount);
1041 <        checkCompletedNormally(f, null);
1042 <    }
1043 <
1044 <    /**
920 <     * runAsync with executor completes after running Runnable
921 <     */
922 <    public void testRunAsync2() {
923 <        Noop r = new Noop();
924 <        ThreadExecutor exec = new ThreadExecutor();
925 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1036 >    public void testRunAsync_normalCompletion() {
1037 >        ExecutionMode[] executionModes = {
1038 >            ExecutionMode.ASYNC,
1039 >            ExecutionMode.EXECUTOR,
1040 >        };
1041 >        for (ExecutionMode m : executionModes)
1042 >    {
1043 >        final Noop r = new Noop(m);
1044 >        final CompletableFuture<Void> f = m.runAsync(r);
1045          assertNull(f.join());
927        assertEquals(1, r.invocationCount);
1046          checkCompletedNormally(f, null);
1047 <        assertEquals(1, exec.count.get());
1048 <    }
1047 >        r.assertInvoked();
1048 >    }}
1049  
1050      /**
1051       * failing runAsync completes exceptionally after running Runnable
1052       */
1053 <    public void testRunAsync3() {
1054 <        FailingRunnable r = new FailingRunnable();
1055 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1053 >    public void testRunAsync_exceptionalCompletion() {
1054 >        ExecutionMode[] executionModes = {
1055 >            ExecutionMode.ASYNC,
1056 >            ExecutionMode.EXECUTOR,
1057 >        };
1058 >        for (ExecutionMode m : executionModes)
1059 >    {
1060 >        final FailingRunnable r = new FailingRunnable(m);
1061 >        final CompletableFuture<Void> f = m.runAsync(r);
1062          checkCompletedWithWrappedCFException(f);
1063 <        assertEquals(1, r.invocationCount);
1064 <    }
1063 >        r.assertInvoked();
1064 >    }}
1065  
1066      /**
1067       * supplyAsync completes with result of supplier
1068       */
1069 <    public void testSupplyAsync() {
1070 <        CompletableFuture<Integer> f;
1071 <        f = CompletableFuture.supplyAsync(supplyOne);
1072 <        assertEquals(f.join(), one);
1073 <        checkCompletedNormally(f, one);
1074 <    }
1075 <
1076 <    /**
1077 <     * supplyAsync with executor completes with result of supplier
1078 <     */
1079 <    public void testSupplyAsync2() {
1080 <        CompletableFuture<Integer> f;
1081 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1082 <        assertEquals(f.join(), one);
959 <        checkCompletedNormally(f, one);
960 <    }
1069 >    public void testSupplyAsync_normalCompletion() {
1070 >        ExecutionMode[] executionModes = {
1071 >            ExecutionMode.ASYNC,
1072 >            ExecutionMode.EXECUTOR,
1073 >        };
1074 >        for (ExecutionMode m : executionModes)
1075 >        for (Integer v1 : new Integer[] { 1, null })
1076 >    {
1077 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1078 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1079 >        assertSame(v1, f.join());
1080 >        checkCompletedNormally(f, v1);
1081 >        r.assertInvoked();
1082 >    }}
1083  
1084      /**
1085       * Failing supplyAsync completes exceptionally
1086       */
1087 <    public void testSupplyAsync3() {
1088 <        FailingSupplier r = new FailingSupplier();
1089 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1087 >    public void testSupplyAsync_exceptionalCompletion() {
1088 >        ExecutionMode[] executionModes = {
1089 >            ExecutionMode.ASYNC,
1090 >            ExecutionMode.EXECUTOR,
1091 >        };
1092 >        for (ExecutionMode m : executionModes)
1093 >    {
1094 >        FailingSupplier r = new FailingSupplier(m);
1095 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1096          checkCompletedWithWrappedCFException(f);
1097 <        assertEquals(1, r.invocationCount);
1098 <    }
1097 >        r.assertInvoked();
1098 >    }}
1099  
1100      // seq completion methods
1101  
# Line 980 | Line 1108 | public class CompletableFutureTest exten
1108          for (Integer v1 : new Integer[] { 1, null })
1109      {
1110          final CompletableFuture<Integer> f = new CompletableFuture<>();
1111 <        final Noop r = new Noop();
1111 >        final Noop r = new Noop(m);
1112          if (!createIncomplete) f.complete(v1);
1113          final CompletableFuture<Void> g = m.thenRun(f, r);
1114          if (createIncomplete) {
# Line 990 | Line 1118 | public class CompletableFutureTest exten
1118  
1119          checkCompletedNormally(g, null);
1120          checkCompletedNormally(f, v1);
1121 <        assertEquals(1, r.invocationCount);
1121 >        r.assertInvoked();
1122      }}
1123  
1124      /**
# Line 1003 | Line 1131 | public class CompletableFutureTest exten
1131      {
1132          final CFException ex = new CFException();
1133          final CompletableFuture<Integer> f = new CompletableFuture<>();
1134 <        final Noop r = new Noop();
1134 >        final Noop r = new Noop(m);
1135          if (!createIncomplete) f.completeExceptionally(ex);
1136          final CompletableFuture<Void> g = m.thenRun(f, r);
1137          if (createIncomplete) {
# Line 1011 | Line 1139 | public class CompletableFutureTest exten
1139              f.completeExceptionally(ex);
1140          }
1141  
1142 <        checkCompletedWithWrappedCFException(g, ex);
1143 <        checkCompletedWithWrappedCFException(f, ex);
1144 <        assertEquals(0, r.invocationCount);
1142 >        checkCompletedWithWrappedException(g, ex);
1143 >        checkCompletedExceptionally(f, ex);
1144 >        r.assertNotInvoked();
1145      }}
1146  
1147      /**
# Line 1025 | Line 1153 | public class CompletableFutureTest exten
1153          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1154      {
1155          final CompletableFuture<Integer> f = new CompletableFuture<>();
1156 <        final Noop r = new Noop();
1156 >        final Noop r = new Noop(m);
1157          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1158 <        final CompletableFuture<Void> g = f.thenRun(r);
1158 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1159          if (createIncomplete) {
1160              checkIncomplete(g);
1161              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1035 | Line 1163 | public class CompletableFutureTest exten
1163  
1164          checkCompletedWithWrappedCancellationException(g);
1165          checkCancelled(f);
1166 <        assertEquals(0, r.invocationCount);
1166 >        r.assertNotInvoked();
1167      }}
1168  
1169      /**
# Line 1047 | Line 1175 | public class CompletableFutureTest exten
1175          for (Integer v1 : new Integer[] { 1, null })
1176      {
1177          final CompletableFuture<Integer> f = new CompletableFuture<>();
1178 <        final FailingRunnable r = new FailingRunnable();
1178 >        final FailingRunnable r = new FailingRunnable(m);
1179          if (!createIncomplete) f.complete(v1);
1180 <        final CompletableFuture<Void> g = f.thenRun(r);
1180 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1181          if (createIncomplete) {
1182              checkIncomplete(g);
1183              f.complete(v1);
# Line 1068 | Line 1196 | public class CompletableFutureTest exten
1196          for (Integer v1 : new Integer[] { 1, null })
1197      {
1198          final CompletableFuture<Integer> f = new CompletableFuture<>();
1199 <        final IncFunction r = new IncFunction();
1199 >        final IncFunction r = new IncFunction(m);
1200          if (!createIncomplete) f.complete(v1);
1201          final CompletableFuture<Integer> g = m.thenApply(f, r);
1202          if (createIncomplete) {
# Line 1078 | Line 1206 | public class CompletableFutureTest exten
1206  
1207          checkCompletedNormally(g, inc(v1));
1208          checkCompletedNormally(f, v1);
1209 <        assertEquals(1, r.invocationCount);
1209 >        r.assertValue(inc(v1));
1210      }}
1211  
1212      /**
# Line 1091 | Line 1219 | public class CompletableFutureTest exten
1219      {
1220          final CFException ex = new CFException();
1221          final CompletableFuture<Integer> f = new CompletableFuture<>();
1222 <        final IncFunction r = new IncFunction();
1222 >        final IncFunction r = new IncFunction(m);
1223          if (!createIncomplete) f.completeExceptionally(ex);
1224          final CompletableFuture<Integer> g = m.thenApply(f, r);
1225          if (createIncomplete) {
# Line 1099 | Line 1227 | public class CompletableFutureTest exten
1227              f.completeExceptionally(ex);
1228          }
1229  
1230 <        checkCompletedWithWrappedCFException(g, ex);
1231 <        checkCompletedWithWrappedCFException(f, ex);
1232 <        assertEquals(0, r.invocationCount);
1230 >        checkCompletedWithWrappedException(g, ex);
1231 >        checkCompletedExceptionally(f, ex);
1232 >        r.assertNotInvoked();
1233      }}
1234  
1235      /**
# Line 1113 | Line 1241 | public class CompletableFutureTest exten
1241          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1242      {
1243          final CompletableFuture<Integer> f = new CompletableFuture<>();
1244 <        final IncFunction r = new IncFunction();
1244 >        final IncFunction r = new IncFunction(m);
1245          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1246 <        final CompletableFuture<Integer> g = f.thenApply(r);
1246 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1247          if (createIncomplete) {
1248              checkIncomplete(g);
1249              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1123 | Line 1251 | public class CompletableFutureTest exten
1251  
1252          checkCompletedWithWrappedCancellationException(g);
1253          checkCancelled(f);
1254 <        assertEquals(0, r.invocationCount);
1254 >        r.assertNotInvoked();
1255      }}
1256  
1257      /**
# Line 1135 | Line 1263 | public class CompletableFutureTest exten
1263          for (Integer v1 : new Integer[] { 1, null })
1264      {
1265          final CompletableFuture<Integer> f = new CompletableFuture<>();
1266 <        final FailingFunction r = new FailingFunction();
1266 >        final FailingFunction r = new FailingFunction(m);
1267          if (!createIncomplete) f.complete(v1);
1268 <        final CompletableFuture<Integer> g = f.thenApply(r);
1268 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1269          if (createIncomplete) {
1270              checkIncomplete(g);
1271              f.complete(v1);
# Line 1156 | Line 1284 | public class CompletableFutureTest exten
1284          for (Integer v1 : new Integer[] { 1, null })
1285      {
1286          final CompletableFuture<Integer> f = new CompletableFuture<>();
1287 <        final IncAction r = new IncAction();
1287 >        final NoopConsumer r = new NoopConsumer(m);
1288          if (!createIncomplete) f.complete(v1);
1289          final CompletableFuture<Void> g = m.thenAccept(f, r);
1290          if (createIncomplete) {
# Line 1165 | Line 1293 | public class CompletableFutureTest exten
1293          }
1294  
1295          checkCompletedNormally(g, null);
1296 +        r.assertValue(v1);
1297          checkCompletedNormally(f, v1);
1169        assertEquals(1, r.invocationCount);
1170        assertEquals(inc(v1), r.value);
1298      }}
1299  
1300      /**
# Line 1180 | Line 1307 | public class CompletableFutureTest exten
1307      {
1308          final CFException ex = new CFException();
1309          final CompletableFuture<Integer> f = new CompletableFuture<>();
1310 <        final IncAction r = new IncAction();
1310 >        final NoopConsumer r = new NoopConsumer(m);
1311          if (!createIncomplete) f.completeExceptionally(ex);
1312          final CompletableFuture<Void> g = m.thenAccept(f, r);
1313          if (createIncomplete) {
# Line 1188 | Line 1315 | public class CompletableFutureTest exten
1315              f.completeExceptionally(ex);
1316          }
1317  
1318 <        checkCompletedWithWrappedCFException(g, ex);
1319 <        checkCompletedWithWrappedCFException(f, ex);
1320 <        assertEquals(0, r.invocationCount);
1318 >        checkCompletedWithWrappedException(g, ex);
1319 >        checkCompletedExceptionally(f, ex);
1320 >        r.assertNotInvoked();
1321      }}
1322  
1323      /**
1324 <     * thenAccept result completes exceptionally if action does
1324 >     * thenAccept result completes exceptionally if source cancelled
1325       */
1326 <    public void testThenAccept_actionFailed() {
1326 >    public void testThenAccept_sourceCancelled() {
1327          for (ExecutionMode m : ExecutionMode.values())
1328          for (boolean createIncomplete : new boolean[] { true, false })
1329 <        for (Integer v1 : new Integer[] { 1, null })
1329 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1330      {
1331          final CompletableFuture<Integer> f = new CompletableFuture<>();
1332 <        final FailingConsumer r = new FailingConsumer();
1333 <        if (!createIncomplete) f.complete(v1);
1334 <        final CompletableFuture<Void> g = f.thenAccept(r);
1332 >        final NoopConsumer r = new NoopConsumer(m);
1333 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1334 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1335          if (createIncomplete) {
1336              checkIncomplete(g);
1337 <            f.complete(v1);
1337 >            assertTrue(f.cancel(mayInterruptIfRunning));
1338          }
1339  
1340 <        checkCompletedWithWrappedCFException(g);
1341 <        checkCompletedNormally(f, v1);
1340 >        checkCompletedWithWrappedCancellationException(g);
1341 >        checkCancelled(f);
1342 >        r.assertNotInvoked();
1343      }}
1344  
1345      /**
1346 <     * thenAccept result completes exceptionally if source cancelled
1346 >     * thenAccept result completes exceptionally if action does
1347       */
1348 <    public void testThenAccept_sourceCancelled() {
1348 >    public void testThenAccept_actionFailed() {
1349          for (ExecutionMode m : ExecutionMode.values())
1350          for (boolean createIncomplete : new boolean[] { true, false })
1351 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1351 >        for (Integer v1 : new Integer[] { 1, null })
1352      {
1353          final CompletableFuture<Integer> f = new CompletableFuture<>();
1354 <        final IncAction r = new IncAction();
1355 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1356 <        final CompletableFuture<Void> g = f.thenAccept(r);
1354 >        final FailingConsumer r = new FailingConsumer(m);
1355 >        if (!createIncomplete) f.complete(v1);
1356 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1357          if (createIncomplete) {
1358              checkIncomplete(g);
1359 <            assertTrue(f.cancel(mayInterruptIfRunning));
1359 >            f.complete(v1);
1360          }
1361  
1362 <        checkCompletedWithWrappedCancellationException(g);
1363 <        checkCancelled(f);
1236 <        assertEquals(0, r.invocationCount);
1362 >        checkCompletedWithWrappedCFException(g);
1363 >        checkCompletedNormally(f, v1);
1364      }}
1365  
1366      /**
# Line 1249 | Line 1376 | public class CompletableFutureTest exten
1376      {
1377          final CompletableFuture<Integer> f = new CompletableFuture<>();
1378          final CompletableFuture<Integer> g = new CompletableFuture<>();
1379 <        final SubtractFunction r = new SubtractFunction();
1379 >        final SubtractFunction r = new SubtractFunction(m);
1380  
1381          if (fFirst) f.complete(v1); else g.complete(v2);
1382          if (!createIncomplete)
# Line 1257 | Line 1384 | public class CompletableFutureTest exten
1384          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1385          if (createIncomplete) {
1386              checkIncomplete(h);
1387 <            assertEquals(0, r.invocationCount);
1387 >            r.assertNotInvoked();
1388              if (!fFirst) f.complete(v1); else g.complete(v2);
1389          }
1390  
1391          checkCompletedNormally(h, subtract(v1, v2));
1392          checkCompletedNormally(f, v1);
1393          checkCompletedNormally(g, v2);
1394 <        assertEquals(1, r.invocationCount);
1394 >        r.assertValue(subtract(v1, v2));
1395      }}
1396  
1397      /**
# Line 1280 | Line 1407 | public class CompletableFutureTest exten
1407          final CompletableFuture<Integer> f = new CompletableFuture<>();
1408          final CompletableFuture<Integer> g = new CompletableFuture<>();
1409          final CFException ex = new CFException();
1410 <        final SubtractFunction r = new SubtractFunction();
1410 >        final SubtractFunction r = new SubtractFunction(m);
1411  
1412          (fFirst ? f : g).complete(v1);
1413          if (!createIncomplete)
# Line 1291 | Line 1418 | public class CompletableFutureTest exten
1418              (!fFirst ? f : g).completeExceptionally(ex);
1419          }
1420  
1421 <        checkCompletedWithWrappedCFException(h, ex);
1422 <        assertEquals(0, r.invocationCount);
1421 >        checkCompletedWithWrappedException(h, ex);
1422 >        r.assertNotInvoked();
1423          checkCompletedNormally(fFirst ? f : g, v1);
1424 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1298 <    }}
1299 <
1300 <    /**
1301 <     * thenCombine result completes exceptionally if action does
1302 <     */
1303 <    public void testThenCombine_actionFailed() {
1304 <        for (ExecutionMode m : ExecutionMode.values())
1305 <        for (boolean fFirst : new boolean[] { true, false })
1306 <        for (Integer v1 : new Integer[] { 1, null })
1307 <        for (Integer v2 : new Integer[] { 2, null })
1308 <    {
1309 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1310 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1311 <        final FailingBiFunction r = new FailingBiFunction();
1312 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1313 <
1314 <        if (fFirst) {
1315 <            f.complete(v1);
1316 <            g.complete(v2);
1317 <        } else {
1318 <            g.complete(v2);
1319 <            f.complete(v1);
1320 <        }
1321 <
1322 <        checkCompletedWithWrappedCFException(h);
1323 <        checkCompletedNormally(f, v1);
1324 <        checkCompletedNormally(g, v2);
1424 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1425      }}
1426  
1427      /**
# Line 1336 | Line 1436 | public class CompletableFutureTest exten
1436      {
1437          final CompletableFuture<Integer> f = new CompletableFuture<>();
1438          final CompletableFuture<Integer> g = new CompletableFuture<>();
1439 <        final SubtractFunction r = new SubtractFunction();
1439 >        final SubtractFunction r = new SubtractFunction(m);
1440  
1441          (fFirst ? f : g).complete(v1);
1442          if (!createIncomplete)
# Line 1349 | Line 1449 | public class CompletableFutureTest exten
1449  
1450          checkCompletedWithWrappedCancellationException(h);
1451          checkCancelled(!fFirst ? f : g);
1452 <        assertEquals(0, r.invocationCount);
1452 >        r.assertNotInvoked();
1453          checkCompletedNormally(fFirst ? f : g, v1);
1454      }}
1455  
1456      /**
1457 +     * thenCombine result completes exceptionally if action does
1458 +     */
1459 +    public void testThenCombine_actionFailed() {
1460 +        for (ExecutionMode m : ExecutionMode.values())
1461 +        for (boolean fFirst : new boolean[] { true, false })
1462 +        for (Integer v1 : new Integer[] { 1, null })
1463 +        for (Integer v2 : new Integer[] { 2, null })
1464 +    {
1465 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1466 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1467 +        final FailingBiFunction r = new FailingBiFunction(m);
1468 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1469 +
1470 +        if (fFirst) {
1471 +            f.complete(v1);
1472 +            g.complete(v2);
1473 +        } else {
1474 +            g.complete(v2);
1475 +            f.complete(v1);
1476 +        }
1477 +
1478 +        checkCompletedWithWrappedCFException(h);
1479 +        checkCompletedNormally(f, v1);
1480 +        checkCompletedNormally(g, v2);
1481 +    }}
1482 +
1483 +    /**
1484       * thenAcceptBoth result completes normally after normal
1485       * completion of sources
1486       */
# Line 1366 | Line 1493 | public class CompletableFutureTest exten
1493      {
1494          final CompletableFuture<Integer> f = new CompletableFuture<>();
1495          final CompletableFuture<Integer> g = new CompletableFuture<>();
1496 <        final SubtractAction r = new SubtractAction();
1496 >        final SubtractAction r = new SubtractAction(m);
1497  
1498          if (fFirst) f.complete(v1); else g.complete(v2);
1499          if (!createIncomplete)
# Line 1374 | Line 1501 | public class CompletableFutureTest exten
1501          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1502          if (createIncomplete) {
1503              checkIncomplete(h);
1504 <            assertEquals(0, r.invocationCount);
1504 >            r.assertNotInvoked();
1505              if (!fFirst) f.complete(v1); else g.complete(v2);
1506          }
1507  
1508          checkCompletedNormally(h, null);
1509 <        assertEquals(subtract(v1, v2), r.value);
1509 >        r.assertValue(subtract(v1, v2));
1510          checkCompletedNormally(f, v1);
1511          checkCompletedNormally(g, v2);
1512      }}
# Line 1397 | Line 1524 | public class CompletableFutureTest exten
1524          final CompletableFuture<Integer> f = new CompletableFuture<>();
1525          final CompletableFuture<Integer> g = new CompletableFuture<>();
1526          final CFException ex = new CFException();
1527 <        final SubtractAction r = new SubtractAction();
1527 >        final SubtractAction r = new SubtractAction(m);
1528  
1529          (fFirst ? f : g).complete(v1);
1530          if (!createIncomplete)
# Line 1408 | Line 1535 | public class CompletableFutureTest exten
1535              (!fFirst ? f : g).completeExceptionally(ex);
1536          }
1537  
1538 <        checkCompletedWithWrappedCFException(h, ex);
1539 <        assertEquals(0, r.invocationCount);
1538 >        checkCompletedWithWrappedException(h, ex);
1539 >        r.assertNotInvoked();
1540          checkCompletedNormally(fFirst ? f : g, v1);
1541 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1415 <    }}
1416 <
1417 <    /**
1418 <     * thenAcceptBoth result completes exceptionally if action does
1419 <     */
1420 <    public void testThenAcceptBoth_actionFailed() {
1421 <        for (ExecutionMode m : ExecutionMode.values())
1422 <        for (boolean fFirst : new boolean[] { true, false })
1423 <        for (Integer v1 : new Integer[] { 1, null })
1424 <        for (Integer v2 : new Integer[] { 2, null })
1425 <    {
1426 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1427 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1428 <        final FailingBiConsumer r = new FailingBiConsumer();
1429 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1430 <
1431 <        if (fFirst) {
1432 <            f.complete(v1);
1433 <            g.complete(v2);
1434 <        } else {
1435 <            g.complete(v2);
1436 <            f.complete(v1);
1437 <        }
1438 <
1439 <        checkCompletedWithWrappedCFException(h);
1440 <        checkCompletedNormally(f, v1);
1441 <        checkCompletedNormally(g, v2);
1541 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1542      }}
1543  
1544      /**
# Line 1453 | Line 1553 | public class CompletableFutureTest exten
1553      {
1554          final CompletableFuture<Integer> f = new CompletableFuture<>();
1555          final CompletableFuture<Integer> g = new CompletableFuture<>();
1556 <        final SubtractAction r = new SubtractAction();
1556 >        final SubtractAction r = new SubtractAction(m);
1557  
1558          (fFirst ? f : g).complete(v1);
1559          if (!createIncomplete)
# Line 1466 | Line 1566 | public class CompletableFutureTest exten
1566  
1567          checkCompletedWithWrappedCancellationException(h);
1568          checkCancelled(!fFirst ? f : g);
1569 <        assertEquals(0, r.invocationCount);
1569 >        r.assertNotInvoked();
1570          checkCompletedNormally(fFirst ? f : g, v1);
1571      }}
1572  
1573      /**
1574 +     * thenAcceptBoth result completes exceptionally if action does
1575 +     */
1576 +    public void testThenAcceptBoth_actionFailed() {
1577 +        for (ExecutionMode m : ExecutionMode.values())
1578 +        for (boolean fFirst : new boolean[] { true, false })
1579 +        for (Integer v1 : new Integer[] { 1, null })
1580 +        for (Integer v2 : new Integer[] { 2, null })
1581 +    {
1582 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1583 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1584 +        final FailingBiConsumer r = new FailingBiConsumer(m);
1585 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1586 +
1587 +        if (fFirst) {
1588 +            f.complete(v1);
1589 +            g.complete(v2);
1590 +        } else {
1591 +            g.complete(v2);
1592 +            f.complete(v1);
1593 +        }
1594 +
1595 +        checkCompletedWithWrappedCFException(h);
1596 +        checkCompletedNormally(f, v1);
1597 +        checkCompletedNormally(g, v2);
1598 +    }}
1599 +
1600 +    /**
1601       * runAfterBoth result completes normally after normal
1602       * completion of sources
1603       */
# Line 1483 | Line 1610 | public class CompletableFutureTest exten
1610      {
1611          final CompletableFuture<Integer> f = new CompletableFuture<>();
1612          final CompletableFuture<Integer> g = new CompletableFuture<>();
1613 <        final Noop r = new Noop();
1613 >        final Noop r = new Noop(m);
1614  
1615          if (fFirst) f.complete(v1); else g.complete(v2);
1616          if (!createIncomplete)
# Line 1491 | Line 1618 | public class CompletableFutureTest exten
1618          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1619          if (createIncomplete) {
1620              checkIncomplete(h);
1621 <            assertEquals(0, r.invocationCount);
1621 >            r.assertNotInvoked();
1622              if (!fFirst) f.complete(v1); else g.complete(v2);
1623          }
1624  
1625          checkCompletedNormally(h, null);
1626 <        assertEquals(1, r.invocationCount);
1626 >        r.assertInvoked();
1627          checkCompletedNormally(f, v1);
1628          checkCompletedNormally(g, v2);
1629      }}
# Line 1514 | Line 1641 | public class CompletableFutureTest exten
1641          final CompletableFuture<Integer> f = new CompletableFuture<>();
1642          final CompletableFuture<Integer> g = new CompletableFuture<>();
1643          final CFException ex = new CFException();
1644 <        final Noop r = new Noop();
1644 >        final Noop r = new Noop(m);
1645  
1646          (fFirst ? f : g).complete(v1);
1647          if (!createIncomplete)
# Line 1525 | Line 1652 | public class CompletableFutureTest exten
1652              (!fFirst ? f : g).completeExceptionally(ex);
1653          }
1654  
1655 <        checkCompletedWithWrappedCFException(h, ex);
1656 <        assertEquals(0, r.invocationCount);
1655 >        checkCompletedWithWrappedException(h, ex);
1656 >        r.assertNotInvoked();
1657          checkCompletedNormally(fFirst ? f : g, v1);
1658 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1532 <    }}
1533 <
1534 <    /**
1535 <     * runAfterBoth result completes exceptionally if action does
1536 <     */
1537 <    public void testRunAfterBoth_actionFailed() {
1538 <        for (ExecutionMode m : ExecutionMode.values())
1539 <        for (boolean fFirst : new boolean[] { true, false })
1540 <        for (Integer v1 : new Integer[] { 1, null })
1541 <        for (Integer v2 : new Integer[] { 2, null })
1542 <    {
1543 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1544 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1545 <        final FailingRunnable r = new FailingRunnable();
1546 <
1547 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1548 <        if (fFirst) {
1549 <            f.complete(v1);
1550 <            g.complete(v2);
1551 <        } else {
1552 <            g.complete(v2);
1553 <            f.complete(v1);
1554 <        }
1555 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1556 <
1557 <        checkCompletedWithWrappedCFException(h1);
1558 <        checkCompletedWithWrappedCFException(h2);
1559 <        checkCompletedNormally(f, v1);
1560 <        checkCompletedNormally(g, v2);
1658 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1659      }}
1660  
1661      /**
# Line 1572 | Line 1670 | public class CompletableFutureTest exten
1670      {
1671          final CompletableFuture<Integer> f = new CompletableFuture<>();
1672          final CompletableFuture<Integer> g = new CompletableFuture<>();
1673 <        final Noop r = new Noop();
1673 >        final Noop r = new Noop(m);
1674  
1675  
1676          (fFirst ? f : g).complete(v1);
# Line 1586 | Line 1684 | public class CompletableFutureTest exten
1684  
1685          checkCompletedWithWrappedCancellationException(h);
1686          checkCancelled(!fFirst ? f : g);
1687 <        assertEquals(0, r.invocationCount);
1687 >        r.assertNotInvoked();
1688          checkCompletedNormally(fFirst ? f : g, v1);
1689      }}
1690  
1691      /**
1692 <     * applyToEither result completes normally after normal completion
1595 <     * of either source
1692 >     * runAfterBoth result completes exceptionally if action does
1693       */
1694 <    public void testApplyToEither_normalCompletion() {
1694 >    public void testRunAfterBoth_actionFailed() {
1695          for (ExecutionMode m : ExecutionMode.values())
1599        for (boolean createIncomplete : new boolean[] { true, false })
1696          for (boolean fFirst : new boolean[] { true, false })
1697          for (Integer v1 : new Integer[] { 1, null })
1698          for (Integer v2 : new Integer[] { 2, null })
1699      {
1700          final CompletableFuture<Integer> f = new CompletableFuture<>();
1701          final CompletableFuture<Integer> g = new CompletableFuture<>();
1702 <        final IncFunction r = new IncFunction();
1702 >        final FailingRunnable r1 = new FailingRunnable(m);
1703 >        final FailingRunnable r2 = new FailingRunnable(m);
1704  
1705 <        if (!createIncomplete)
1706 <            if (fFirst) f.complete(v1); else g.complete(v2);
1707 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1708 <        if (createIncomplete) {
1709 <            checkIncomplete(h);
1710 <            assertEquals(0, r.invocationCount);
1711 <            if (fFirst) f.complete(v1); else g.complete(v2);
1705 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1706 >        if (fFirst) {
1707 >            f.complete(v1);
1708 >            g.complete(v2);
1709 >        } else {
1710 >            g.complete(v2);
1711 >            f.complete(v1);
1712          }
1713 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1617 <        if (!fFirst) f.complete(v1); else g.complete(v2);
1713 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1714  
1715 +        checkCompletedWithWrappedCFException(h1);
1716 +        checkCompletedWithWrappedCFException(h2);
1717          checkCompletedNormally(f, v1);
1718          checkCompletedNormally(g, v2);
1621        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1719      }}
1720  
1721 <    public void testApplyToEither_normalCompletionBothAvailable() {
1721 >    /**
1722 >     * applyToEither result completes normally after normal completion
1723 >     * of either source
1724 >     */
1725 >    public void testApplyToEither_normalCompletion() {
1726          for (ExecutionMode m : ExecutionMode.values())
1626        for (boolean fFirst : new boolean[] { true, false })
1727          for (Integer v1 : new Integer[] { 1, null })
1728          for (Integer v2 : new Integer[] { 2, null })
1729      {
1730          final CompletableFuture<Integer> f = new CompletableFuture<>();
1731          final CompletableFuture<Integer> g = new CompletableFuture<>();
1732 <        final IncFunction r = new IncFunction();
1732 >        final IncFunction[] rs = new IncFunction[6];
1733 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1734  
1735 <        if (fFirst) {
1736 <            f.complete(v1);
1737 <            g.complete(v2);
1738 <        } else {
1739 <            g.complete(v2);
1740 <            f.complete(v1);
1741 <        }
1735 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1736 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1737 >        checkIncomplete(h0);
1738 >        checkIncomplete(h1);
1739 >        rs[0].assertNotInvoked();
1740 >        rs[1].assertNotInvoked();
1741 >        f.complete(v1);
1742 >        checkCompletedNormally(h0, inc(v1));
1743 >        checkCompletedNormally(h1, inc(v1));
1744 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1745 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1746 >        checkCompletedNormally(h2, inc(v1));
1747 >        checkCompletedNormally(h3, inc(v1));
1748 >        g.complete(v2);
1749  
1750 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1750 >        // unspecified behavior - both source completions available
1751 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1752 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1753 >        rs[4].assertValue(h4.join());
1754 >        rs[5].assertValue(h5.join());
1755 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1756 >                   Objects.equals(inc(v2), h4.join()));
1757 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1758 >                   Objects.equals(inc(v2), h5.join()));
1759  
1760          checkCompletedNormally(f, v1);
1761          checkCompletedNormally(g, v2);
1762 <
1763 <        // unspecified behavior
1764 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1765 <                   Objects.equals(h.join(), inc(v2)));
1766 <        assertEquals(1, r.invocationCount);
1762 >        checkCompletedNormally(h0, inc(v1));
1763 >        checkCompletedNormally(h1, inc(v1));
1764 >        checkCompletedNormally(h2, inc(v1));
1765 >        checkCompletedNormally(h3, inc(v1));
1766 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1767      }}
1768  
1769      /**
1770       * applyToEither result completes exceptionally after exceptional
1771       * completion of either source
1772       */
1773 <    public void testApplyToEither_exceptionalCompletion1() {
1773 >    public void testApplyToEither_exceptionalCompletion() {
1774          for (ExecutionMode m : ExecutionMode.values())
1659        for (boolean createIncomplete : new boolean[] { true, false })
1660        for (boolean fFirst : new boolean[] { true, false })
1775          for (Integer v1 : new Integer[] { 1, null })
1776      {
1777          final CompletableFuture<Integer> f = new CompletableFuture<>();
1778          final CompletableFuture<Integer> g = new CompletableFuture<>();
1779          final CFException ex = new CFException();
1780 <        final IncFunction r = new IncFunction();
1780 >        final IncFunction[] rs = new IncFunction[6];
1781 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1782  
1783 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1784 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1785 <        if (createIncomplete) {
1786 <            checkIncomplete(h);
1787 <            assertEquals(0, r.invocationCount);
1788 <            (fFirst ? f : g).completeExceptionally(ex);
1789 <        }
1783 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1784 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1785 >        checkIncomplete(h0);
1786 >        checkIncomplete(h1);
1787 >        rs[0].assertNotInvoked();
1788 >        rs[1].assertNotInvoked();
1789 >        f.completeExceptionally(ex);
1790 >        checkCompletedWithWrappedException(h0, ex);
1791 >        checkCompletedWithWrappedException(h1, ex);
1792 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1793 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1794 >        checkCompletedWithWrappedException(h2, ex);
1795 >        checkCompletedWithWrappedException(h3, ex);
1796 >        g.complete(v1);
1797  
1798 <        checkCompletedWithWrappedCFException(h, ex);
1799 <        (!fFirst ? f : g).complete(v1);
1798 >        // unspecified behavior - both source completions available
1799 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1800 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1801 >        try {
1802 >            assertEquals(inc(v1), h4.join());
1803 >            rs[4].assertValue(inc(v1));
1804 >        } catch (CompletionException ok) {
1805 >            checkCompletedWithWrappedException(h4, ex);
1806 >            rs[4].assertNotInvoked();
1807 >        }
1808 >        try {
1809 >            assertEquals(inc(v1), h5.join());
1810 >            rs[5].assertValue(inc(v1));
1811 >        } catch (CompletionException ok) {
1812 >            checkCompletedWithWrappedException(h5, ex);
1813 >            rs[5].assertNotInvoked();
1814 >        }
1815  
1816 <        assertEquals(0, r.invocationCount);
1817 <        checkCompletedNormally(!fFirst ? f : g, v1);
1818 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1819 <        checkCompletedWithWrappedCFException(h, ex);
1816 >        checkCompletedExceptionally(f, ex);
1817 >        checkCompletedNormally(g, v1);
1818 >        checkCompletedWithWrappedException(h0, ex);
1819 >        checkCompletedWithWrappedException(h1, ex);
1820 >        checkCompletedWithWrappedException(h2, ex);
1821 >        checkCompletedWithWrappedException(h3, ex);
1822 >        checkCompletedWithWrappedException(h4, ex);
1823 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1824      }}
1825  
1826      public void testApplyToEither_exceptionalCompletion2() {
1827          for (ExecutionMode m : ExecutionMode.values())
1687        for (boolean reverseArgs : new boolean[] { true, false })
1828          for (boolean fFirst : new boolean[] { true, false })
1829          for (Integer v1 : new Integer[] { 1, null })
1830      {
1831          final CompletableFuture<Integer> f = new CompletableFuture<>();
1832          final CompletableFuture<Integer> g = new CompletableFuture<>();
1693        final IncFunction r1 = new IncFunction();
1694        final IncFunction r2 = new IncFunction();
1833          final CFException ex = new CFException();
1834 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1835 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1836 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1834 >        final IncFunction[] rs = new IncFunction[6];
1835 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1836 >
1837 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1838 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1839          if (fFirst) {
1840              f.complete(v1);
1841              g.completeExceptionally(ex);
# Line 1703 | Line 1843 | public class CompletableFutureTest exten
1843              g.completeExceptionally(ex);
1844              f.complete(v1);
1845          }
1846 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1846 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1847 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1848  
1849 <        // unspecified behavior
1849 >        // unspecified behavior - both source completions available
1850 >        try {
1851 >            assertEquals(inc(v1), h0.join());
1852 >            rs[0].assertValue(inc(v1));
1853 >        } catch (CompletionException ok) {
1854 >            checkCompletedWithWrappedException(h0, ex);
1855 >            rs[0].assertNotInvoked();
1856 >        }
1857          try {
1858              assertEquals(inc(v1), h1.join());
1859 <            assertEquals(1, r1.invocationCount);
1859 >            rs[1].assertValue(inc(v1));
1860          } catch (CompletionException ok) {
1861 <            checkCompletedWithWrappedCFException(h1, ex);
1862 <            assertEquals(0, r1.invocationCount);
1861 >            checkCompletedWithWrappedException(h1, ex);
1862 >            rs[1].assertNotInvoked();
1863          }
1716
1864          try {
1865              assertEquals(inc(v1), h2.join());
1866 <            assertEquals(1, r2.invocationCount);
1866 >            rs[2].assertValue(inc(v1));
1867          } catch (CompletionException ok) {
1868 <            checkCompletedWithWrappedCFException(h2, ex);
1869 <            assertEquals(0, r2.invocationCount);
1868 >            checkCompletedWithWrappedException(h2, ex);
1869 >            rs[2].assertNotInvoked();
1870 >        }
1871 >        try {
1872 >            assertEquals(inc(v1), h3.join());
1873 >            rs[3].assertValue(inc(v1));
1874 >        } catch (CompletionException ok) {
1875 >            checkCompletedWithWrappedException(h3, ex);
1876 >            rs[3].assertNotInvoked();
1877          }
1878  
1725        checkCompletedWithWrappedCFException(g, ex);
1726        checkCompletedNormally(f, v1);
1727    }}
1728
1729    /**
1730     * applyToEither result completes exceptionally if action does
1731     */
1732    public void testApplyToEither_actionFailed1() {
1733        for (ExecutionMode m : ExecutionMode.values())
1734        for (Integer v1 : new Integer[] { 1, null })
1735        for (Integer v2 : new Integer[] { 2, null })
1736    {
1737        final CompletableFuture<Integer> f = new CompletableFuture<>();
1738        final CompletableFuture<Integer> g = new CompletableFuture<>();
1739        final FailingFunction r = new FailingFunction();
1740        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1741
1742        f.complete(v1);
1743        checkCompletedWithWrappedCFException(h);
1744        g.complete(v2);
1745        checkCompletedNormally(f, v1);
1746        checkCompletedNormally(g, v2);
1747    }}
1748
1749    public void testApplyToEither_actionFailed2() {
1750        for (ExecutionMode m : ExecutionMode.values())
1751        for (Integer v1 : new Integer[] { 1, null })
1752        for (Integer v2 : new Integer[] { 2, null })
1753    {
1754        final CompletableFuture<Integer> f = new CompletableFuture<>();
1755        final CompletableFuture<Integer> g = new CompletableFuture<>();
1756        final FailingFunction r = new FailingFunction();
1757        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1758
1759        g.complete(v2);
1760        checkCompletedWithWrappedCFException(h);
1761        f.complete(v1);
1879          checkCompletedNormally(f, v1);
1880 <        checkCompletedNormally(g, v2);
1880 >        checkCompletedExceptionally(g, ex);
1881      }}
1882  
1883      /**
1884       * applyToEither result completes exceptionally if either source cancelled
1885       */
1886 <    public void testApplyToEither_sourceCancelled1() {
1886 >    public void testApplyToEither_sourceCancelled() {
1887          for (ExecutionMode m : ExecutionMode.values())
1888          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1772        for (boolean createIncomplete : new boolean[] { true, false })
1773        for (boolean fFirst : new boolean[] { true, false })
1889          for (Integer v1 : new Integer[] { 1, null })
1890      {
1891          final CompletableFuture<Integer> f = new CompletableFuture<>();
1892          final CompletableFuture<Integer> g = new CompletableFuture<>();
1893 <        final IncFunction r = new IncFunction();
1893 >        final IncFunction[] rs = new IncFunction[6];
1894 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1895  
1896 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1897 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1898 <        if (createIncomplete) {
1899 <            checkIncomplete(h);
1900 <            assertEquals(0, r.invocationCount);
1901 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1902 <        }
1896 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1897 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1898 >        checkIncomplete(h0);
1899 >        checkIncomplete(h1);
1900 >        rs[0].assertNotInvoked();
1901 >        rs[1].assertNotInvoked();
1902 >        f.cancel(mayInterruptIfRunning);
1903 >        checkCompletedWithWrappedCancellationException(h0);
1904 >        checkCompletedWithWrappedCancellationException(h1);
1905 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1906 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1907 >        checkCompletedWithWrappedCancellationException(h2);
1908 >        checkCompletedWithWrappedCancellationException(h3);
1909 >        g.complete(v1);
1910  
1911 <        checkCompletedWithWrappedCancellationException(h);
1912 <        (!fFirst ? f : g).complete(v1);
1911 >        // unspecified behavior - both source completions available
1912 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1913 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1914 >        try {
1915 >            assertEquals(inc(v1), h4.join());
1916 >            rs[4].assertValue(inc(v1));
1917 >        } catch (CompletionException ok) {
1918 >            checkCompletedWithWrappedCancellationException(h4);
1919 >            rs[4].assertNotInvoked();
1920 >        }
1921 >        try {
1922 >            assertEquals(inc(v1), h5.join());
1923 >            rs[5].assertValue(inc(v1));
1924 >        } catch (CompletionException ok) {
1925 >            checkCompletedWithWrappedCancellationException(h5);
1926 >            rs[5].assertNotInvoked();
1927 >        }
1928  
1929 <        assertEquals(0, r.invocationCount);
1930 <        checkCompletedNormally(!fFirst ? f : g, v1);
1931 <        checkCancelled(fFirst ? f : g);
1932 <        checkCompletedWithWrappedCancellationException(h);
1929 >        checkCancelled(f);
1930 >        checkCompletedNormally(g, v1);
1931 >        checkCompletedWithWrappedCancellationException(h0);
1932 >        checkCompletedWithWrappedCancellationException(h1);
1933 >        checkCompletedWithWrappedCancellationException(h2);
1934 >        checkCompletedWithWrappedCancellationException(h3);
1935 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1936      }}
1937  
1938      public void testApplyToEither_sourceCancelled2() {
1939          for (ExecutionMode m : ExecutionMode.values())
1940          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1800        for (boolean reverseArgs : new boolean[] { true, false })
1941          for (boolean fFirst : new boolean[] { true, false })
1942          for (Integer v1 : new Integer[] { 1, null })
1943      {
1944          final CompletableFuture<Integer> f = new CompletableFuture<>();
1945          final CompletableFuture<Integer> g = new CompletableFuture<>();
1946 <        final IncFunction r1 = new IncFunction();
1947 <        final IncFunction r2 = new IncFunction();
1808 <        final CFException ex = new CFException();
1809 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1810 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1946 >        final IncFunction[] rs = new IncFunction[6];
1947 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1948  
1949 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1949 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1950 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1951          if (fFirst) {
1952              f.complete(v1);
1953 <            assertTrue(g.cancel(mayInterruptIfRunning));
1953 >            g.cancel(mayInterruptIfRunning);
1954          } else {
1955 <            assertTrue(g.cancel(mayInterruptIfRunning));
1955 >            g.cancel(mayInterruptIfRunning);
1956              f.complete(v1);
1957          }
1958 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1958 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1959 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1960  
1961 <        // unspecified behavior
1961 >        // unspecified behavior - both source completions available
1962 >        try {
1963 >            assertEquals(inc(v1), h0.join());
1964 >            rs[0].assertValue(inc(v1));
1965 >        } catch (CompletionException ok) {
1966 >            checkCompletedWithWrappedCancellationException(h0);
1967 >            rs[0].assertNotInvoked();
1968 >        }
1969          try {
1970              assertEquals(inc(v1), h1.join());
1971 <            assertEquals(1, r1.invocationCount);
1971 >            rs[1].assertValue(inc(v1));
1972          } catch (CompletionException ok) {
1973              checkCompletedWithWrappedCancellationException(h1);
1974 <            assertEquals(0, r1.invocationCount);
1974 >            rs[1].assertNotInvoked();
1975          }
1830
1976          try {
1977              assertEquals(inc(v1), h2.join());
1978 <            assertEquals(1, r2.invocationCount);
1978 >            rs[2].assertValue(inc(v1));
1979          } catch (CompletionException ok) {
1980              checkCompletedWithWrappedCancellationException(h2);
1981 <            assertEquals(0, r2.invocationCount);
1981 >            rs[2].assertNotInvoked();
1982 >        }
1983 >        try {
1984 >            assertEquals(inc(v1), h3.join());
1985 >            rs[3].assertValue(inc(v1));
1986 >        } catch (CompletionException ok) {
1987 >            checkCompletedWithWrappedCancellationException(h3);
1988 >            rs[3].assertNotInvoked();
1989          }
1990  
1839        checkCancelled(g);
1991          checkCompletedNormally(f, v1);
1992 +        checkCancelled(g);
1993      }}
1994  
1995      /**
1996 <     * acceptEither result completes normally after normal completion
1845 <     * of either source
1996 >     * applyToEither result completes exceptionally if action does
1997       */
1998 <    public void testAcceptEither_normalCompletion1() {
1998 >    public void testApplyToEither_actionFailed() {
1999          for (ExecutionMode m : ExecutionMode.values())
2000          for (Integer v1 : new Integer[] { 1, null })
2001          for (Integer v2 : new Integer[] { 2, null })
2002      {
2003          final CompletableFuture<Integer> f = new CompletableFuture<>();
2004          final CompletableFuture<Integer> g = new CompletableFuture<>();
2005 <        final IncAction r = new IncAction();
2006 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2005 >        final FailingFunction[] rs = new FailingFunction[6];
2006 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2007  
2008 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2009 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2010          f.complete(v1);
2011 <        checkCompletedNormally(h, null);
2012 <        assertEquals(inc(v1), r.value);
2013 <        g.complete(v2);
2014 <
2015 <        checkCompletedNormally(f, v1);
2016 <        checkCompletedNormally(g, v2);
2017 <        checkCompletedNormally(h, null);
1865 <    }}
1866 <
1867 <    public void testAcceptEither_normalCompletion2() {
1868 <        for (ExecutionMode m : ExecutionMode.values())
1869 <        for (Integer v1 : new Integer[] { 1, null })
1870 <        for (Integer v2 : new Integer[] { 2, null })
1871 <    {
1872 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1873 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1874 <        final IncAction r = new IncAction();
1875 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2011 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2012 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2013 >        checkCompletedWithWrappedCFException(h0);
2014 >        checkCompletedWithWrappedCFException(h1);
2015 >        checkCompletedWithWrappedCFException(h2);
2016 >        checkCompletedWithWrappedCFException(h3);
2017 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2018  
2019          g.complete(v2);
2020 <        checkCompletedNormally(h, null);
2021 <        assertEquals(inc(v2), r.value);
2022 <        f.complete(v1);
2020 >
2021 >        // unspecified behavior - both source completions available
2022 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2023 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2024 >
2025 >        checkCompletedWithWrappedCFException(h4);
2026 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2027 >                   Objects.equals(v2, rs[4].value));
2028 >        checkCompletedWithWrappedCFException(h5);
2029 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2030 >                   Objects.equals(v2, rs[5].value));
2031  
2032          checkCompletedNormally(f, v1);
2033          checkCompletedNormally(g, v2);
1884        checkCompletedNormally(h, null);
2034      }}
2035  
2036 <    public void testAcceptEither_normalCompletion3() {
2036 >    /**
2037 >     * acceptEither result completes normally after normal completion
2038 >     * of either source
2039 >     */
2040 >    public void testAcceptEither_normalCompletion() {
2041          for (ExecutionMode m : ExecutionMode.values())
2042          for (Integer v1 : new Integer[] { 1, null })
2043          for (Integer v2 : new Integer[] { 2, null })
2044      {
2045          final CompletableFuture<Integer> f = new CompletableFuture<>();
2046          final CompletableFuture<Integer> g = new CompletableFuture<>();
2047 <        final IncAction r = new IncAction();
2047 >        final NoopConsumer[] rs = new NoopConsumer[6];
2048 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2049  
2050 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2051 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2052 +        checkIncomplete(h0);
2053 +        checkIncomplete(h1);
2054 +        rs[0].assertNotInvoked();
2055 +        rs[1].assertNotInvoked();
2056          f.complete(v1);
2057 +        checkCompletedNormally(h0, null);
2058 +        checkCompletedNormally(h1, null);
2059 +        rs[0].assertValue(v1);
2060 +        rs[1].assertValue(v1);
2061 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2062 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2063 +        checkCompletedNormally(h2, null);
2064 +        checkCompletedNormally(h3, null);
2065 +        rs[2].assertValue(v1);
2066 +        rs[3].assertValue(v1);
2067          g.complete(v2);
1898        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2068  
2069 <        checkCompletedNormally(h, null);
2069 >        // unspecified behavior - both source completions available
2070 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2071 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2072 >        checkCompletedNormally(h4, null);
2073 >        checkCompletedNormally(h5, null);
2074 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2075 >                   Objects.equals(v2, rs[4].value));
2076 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2077 >                   Objects.equals(v2, rs[5].value));
2078 >
2079          checkCompletedNormally(f, v1);
2080          checkCompletedNormally(g, v2);
2081 <
2082 <        // unspecified behavior
2083 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2084 <                   Objects.equals(r.value, inc(v2)));
2081 >        checkCompletedNormally(h0, null);
2082 >        checkCompletedNormally(h1, null);
2083 >        checkCompletedNormally(h2, null);
2084 >        checkCompletedNormally(h3, null);
2085 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2086      }}
2087  
2088      /**
2089       * acceptEither result completes exceptionally after exceptional
2090       * completion of either source
2091       */
2092 <    public void testAcceptEither_exceptionalCompletion1() {
2092 >    public void testAcceptEither_exceptionalCompletion() {
2093          for (ExecutionMode m : ExecutionMode.values())
2094          for (Integer v1 : new Integer[] { 1, null })
2095      {
2096          final CompletableFuture<Integer> f = new CompletableFuture<>();
2097          final CompletableFuture<Integer> g = new CompletableFuture<>();
1919        final IncAction r = new IncAction();
1920        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2098          final CFException ex = new CFException();
2099 +        final NoopConsumer[] rs = new NoopConsumer[6];
2100 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2101  
2102 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2103 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2104 +        checkIncomplete(h0);
2105 +        checkIncomplete(h1);
2106 +        rs[0].assertNotInvoked();
2107 +        rs[1].assertNotInvoked();
2108          f.completeExceptionally(ex);
2109 <        checkCompletedWithWrappedCFException(h, ex);
2109 >        checkCompletedWithWrappedException(h0, ex);
2110 >        checkCompletedWithWrappedException(h1, ex);
2111 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2112 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2113 >        checkCompletedWithWrappedException(h2, ex);
2114 >        checkCompletedWithWrappedException(h3, ex);
2115 >
2116          g.complete(v1);
2117  
2118 <        assertEquals(0, r.invocationCount);
2118 >        // unspecified behavior - both source completions available
2119 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2120 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2121 >        try {
2122 >            assertNull(h4.join());
2123 >            rs[4].assertValue(v1);
2124 >        } catch (CompletionException ok) {
2125 >            checkCompletedWithWrappedException(h4, ex);
2126 >            rs[4].assertNotInvoked();
2127 >        }
2128 >        try {
2129 >            assertNull(h5.join());
2130 >            rs[5].assertValue(v1);
2131 >        } catch (CompletionException ok) {
2132 >            checkCompletedWithWrappedException(h5, ex);
2133 >            rs[5].assertNotInvoked();
2134 >        }
2135 >
2136 >        checkCompletedExceptionally(f, ex);
2137          checkCompletedNormally(g, v1);
2138 <        checkCompletedWithWrappedCFException(f, ex);
2139 <        checkCompletedWithWrappedCFException(h, ex);
2138 >        checkCompletedWithWrappedException(h0, ex);
2139 >        checkCompletedWithWrappedException(h1, ex);
2140 >        checkCompletedWithWrappedException(h2, ex);
2141 >        checkCompletedWithWrappedException(h3, ex);
2142 >        checkCompletedWithWrappedException(h4, ex);
2143 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2144      }}
2145  
2146      public void testAcceptEither_exceptionalCompletion2() {
2147          for (ExecutionMode m : ExecutionMode.values())
2148 +        for (boolean fFirst : new boolean[] { true, false })
2149          for (Integer v1 : new Integer[] { 1, null })
2150      {
2151          final CompletableFuture<Integer> f = new CompletableFuture<>();
2152          final CompletableFuture<Integer> g = new CompletableFuture<>();
1939        final IncAction r = new IncAction();
1940        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1941        final CFException ex = new CFException();
1942
1943        g.completeExceptionally(ex);
1944        checkCompletedWithWrappedCFException(h, ex);
1945        f.complete(v1);
1946
1947        assertEquals(0, r.invocationCount);
1948        checkCompletedNormally(f, v1);
1949        checkCompletedWithWrappedCFException(g, ex);
1950        checkCompletedWithWrappedCFException(h, ex);
1951    }}
1952
1953    public void testAcceptEither_exceptionalCompletion3() {
1954        for (ExecutionMode m : ExecutionMode.values())
1955        for (Integer v1 : new Integer[] { 1, null })
1956    {
1957        final CompletableFuture<Integer> f = new CompletableFuture<>();
1958        final CompletableFuture<Integer> g = new CompletableFuture<>();
1959        final IncAction r = new IncAction();
2153          final CFException ex = new CFException();
2154 +        final NoopConsumer[] rs = new NoopConsumer[6];
2155 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2156  
2157 <        g.completeExceptionally(ex);
2158 <        f.complete(v1);
2159 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2157 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2158 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2159 >        if (fFirst) {
2160 >            f.complete(v1);
2161 >            g.completeExceptionally(ex);
2162 >        } else {
2163 >            g.completeExceptionally(ex);
2164 >            f.complete(v1);
2165 >        }
2166 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2167 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2168  
2169 <        // unspecified behavior
1967 <        Integer v;
2169 >        // unspecified behavior - both source completions available
2170          try {
2171 <            assertNull(h.join());
2172 <            assertEquals(1, r.invocationCount);
1971 <            assertEquals(inc(v1), r.value);
2171 >            assertEquals(null, h0.join());
2172 >            rs[0].assertValue(v1);
2173          } catch (CompletionException ok) {
2174 <            checkCompletedWithWrappedCFException(h, ex);
2175 <            assertEquals(0, r.invocationCount);
2174 >            checkCompletedWithWrappedException(h0, ex);
2175 >            rs[0].assertNotInvoked();
2176          }
1976
1977        checkCompletedWithWrappedCFException(g, ex);
1978        checkCompletedNormally(f, v1);
1979    }}
1980
1981    public void testAcceptEither_exceptionalCompletion4() {
1982        for (ExecutionMode m : ExecutionMode.values())
1983        for (Integer v1 : new Integer[] { 1, null })
1984    {
1985        final CompletableFuture<Integer> f = new CompletableFuture<>();
1986        final CompletableFuture<Integer> g = new CompletableFuture<>();
1987        final IncAction r = new IncAction();
1988        final CFException ex = new CFException();
1989
1990        f.completeExceptionally(ex);
1991        g.complete(v1);
1992        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1993
1994        // unspecified behavior
1995        Integer v;
2177          try {
2178 <            assertNull(h.join());
2179 <            assertEquals(1, r.invocationCount);
1999 <            assertEquals(inc(v1), r.value);
2178 >            assertEquals(null, h1.join());
2179 >            rs[1].assertValue(v1);
2180          } catch (CompletionException ok) {
2181 <            checkCompletedWithWrappedCFException(h, ex);
2182 <            assertEquals(0, r.invocationCount);
2181 >            checkCompletedWithWrappedException(h1, ex);
2182 >            rs[1].assertNotInvoked();
2183 >        }
2184 >        try {
2185 >            assertEquals(null, h2.join());
2186 >            rs[2].assertValue(v1);
2187 >        } catch (CompletionException ok) {
2188 >            checkCompletedWithWrappedException(h2, ex);
2189 >            rs[2].assertNotInvoked();
2190 >        }
2191 >        try {
2192 >            assertEquals(null, h3.join());
2193 >            rs[3].assertValue(v1);
2194 >        } catch (CompletionException ok) {
2195 >            checkCompletedWithWrappedException(h3, ex);
2196 >            rs[3].assertNotInvoked();
2197          }
2198  
2005        checkCompletedWithWrappedCFException(f, ex);
2006        checkCompletedNormally(g, v1);
2007    }}
2008
2009    /**
2010     * acceptEither result completes exceptionally if action does
2011     */
2012    public void testAcceptEither_actionFailed1() {
2013        for (ExecutionMode m : ExecutionMode.values())
2014        for (Integer v1 : new Integer[] { 1, null })
2015        for (Integer v2 : new Integer[] { 2, null })
2016    {
2017        final CompletableFuture<Integer> f = new CompletableFuture<>();
2018        final CompletableFuture<Integer> g = new CompletableFuture<>();
2019        final FailingConsumer r = new FailingConsumer();
2020        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2021
2022        f.complete(v1);
2023        checkCompletedWithWrappedCFException(h);
2024        g.complete(v2);
2025        checkCompletedNormally(f, v1);
2026        checkCompletedNormally(g, v2);
2027    }}
2028
2029    public void testAcceptEither_actionFailed2() {
2030        for (ExecutionMode m : ExecutionMode.values())
2031        for (Integer v1 : new Integer[] { 1, null })
2032        for (Integer v2 : new Integer[] { 2, null })
2033    {
2034        final CompletableFuture<Integer> f = new CompletableFuture<>();
2035        final CompletableFuture<Integer> g = new CompletableFuture<>();
2036        final FailingConsumer r = new FailingConsumer();
2037        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2038
2039        g.complete(v2);
2040        checkCompletedWithWrappedCFException(h);
2041        f.complete(v1);
2199          checkCompletedNormally(f, v1);
2200 <        checkCompletedNormally(g, v2);
2200 >        checkCompletedExceptionally(g, ex);
2201      }}
2202  
2203      /**
2204       * acceptEither result completes exceptionally if either source cancelled
2205       */
2206 <    public void testAcceptEither_sourceCancelled1() {
2050 <        for (ExecutionMode m : ExecutionMode.values())
2051 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2052 <        for (Integer v1 : new Integer[] { 1, null })
2053 <    {
2054 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2055 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2056 <        final IncAction r = new IncAction();
2057 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2058 <
2059 <        assertTrue(f.cancel(mayInterruptIfRunning));
2060 <        checkCompletedWithWrappedCancellationException(h);
2061 <        g.complete(v1);
2062 <
2063 <        checkCancelled(f);
2064 <        assertEquals(0, r.invocationCount);
2065 <        checkCompletedNormally(g, v1);
2066 <        checkCompletedWithWrappedCancellationException(h);
2067 <    }}
2068 <
2069 <    public void testAcceptEither_sourceCancelled2() {
2206 >    public void testAcceptEither_sourceCancelled() {
2207          for (ExecutionMode m : ExecutionMode.values())
2208          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2209          for (Integer v1 : new Integer[] { 1, null })
2210      {
2211          final CompletableFuture<Integer> f = new CompletableFuture<>();
2212          final CompletableFuture<Integer> g = new CompletableFuture<>();
2213 <        final IncAction r = new IncAction();
2214 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2078 <
2079 <        assertTrue(g.cancel(mayInterruptIfRunning));
2080 <        checkCompletedWithWrappedCancellationException(h);
2081 <        f.complete(v1);
2213 >        final NoopConsumer[] rs = new NoopConsumer[6];
2214 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2215  
2216 <        checkCancelled(g);
2217 <        assertEquals(0, r.invocationCount);
2218 <        checkCompletedNormally(f, v1);
2219 <        checkCompletedWithWrappedCancellationException(h);
2220 <    }}
2216 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2217 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2218 >        checkIncomplete(h0);
2219 >        checkIncomplete(h1);
2220 >        rs[0].assertNotInvoked();
2221 >        rs[1].assertNotInvoked();
2222 >        f.cancel(mayInterruptIfRunning);
2223 >        checkCompletedWithWrappedCancellationException(h0);
2224 >        checkCompletedWithWrappedCancellationException(h1);
2225 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2226 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2227 >        checkCompletedWithWrappedCancellationException(h2);
2228 >        checkCompletedWithWrappedCancellationException(h3);
2229  
2230 <    public void testAcceptEither_sourceCancelled3() {
2090 <        for (ExecutionMode m : ExecutionMode.values())
2091 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2092 <        for (Integer v1 : new Integer[] { 1, null })
2093 <    {
2094 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2095 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2096 <        final IncAction r = new IncAction();
2097 <
2098 <        assertTrue(g.cancel(mayInterruptIfRunning));
2099 <        f.complete(v1);
2100 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2230 >        g.complete(v1);
2231  
2232 <        // unspecified behavior
2233 <        Integer v;
2232 >        // unspecified behavior - both source completions available
2233 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2234 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2235          try {
2236 <            assertNull(h.join());
2237 <            assertEquals(1, r.invocationCount);
2107 <            assertEquals(inc(v1), r.value);
2236 >            assertNull(h4.join());
2237 >            rs[4].assertValue(v1);
2238          } catch (CompletionException ok) {
2239 <            checkCompletedWithWrappedCancellationException(h);
2240 <            assertEquals(0, r.invocationCount);
2239 >            checkCompletedWithWrappedCancellationException(h4);
2240 >            rs[4].assertNotInvoked();
2241          }
2112
2113        checkCancelled(g);
2114        checkCompletedNormally(f, v1);
2115    }}
2116
2117    public void testAcceptEither_sourceCancelled4() {
2118        for (ExecutionMode m : ExecutionMode.values())
2119        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2120        for (Integer v1 : new Integer[] { 1, null })
2121    {
2122        final CompletableFuture<Integer> f = new CompletableFuture<>();
2123        final CompletableFuture<Integer> g = new CompletableFuture<>();
2124        final IncAction r = new IncAction();
2125
2126        assertTrue(f.cancel(mayInterruptIfRunning));
2127        g.complete(v1);
2128        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2129
2130        // unspecified behavior
2131        Integer v;
2242          try {
2243 <            assertNull(h.join());
2244 <            assertEquals(1, r.invocationCount);
2135 <            assertEquals(inc(v1), r.value);
2243 >            assertNull(h5.join());
2244 >            rs[5].assertValue(v1);
2245          } catch (CompletionException ok) {
2246 <            checkCompletedWithWrappedCancellationException(h);
2247 <            assertEquals(0, r.invocationCount);
2246 >            checkCompletedWithWrappedCancellationException(h5);
2247 >            rs[5].assertNotInvoked();
2248          }
2249  
2250          checkCancelled(f);
2251          checkCompletedNormally(g, v1);
2252 +        checkCompletedWithWrappedCancellationException(h0);
2253 +        checkCompletedWithWrappedCancellationException(h1);
2254 +        checkCompletedWithWrappedCancellationException(h2);
2255 +        checkCompletedWithWrappedCancellationException(h3);
2256 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2257      }}
2258  
2259      /**
2260 <     * runAfterEither result completes normally after normal completion
2147 <     * of either source
2260 >     * acceptEither result completes exceptionally if action does
2261       */
2262 <    public void testRunAfterEither_normalCompletion1() {
2262 >    public void testAcceptEither_actionFailed() {
2263          for (ExecutionMode m : ExecutionMode.values())
2264          for (Integer v1 : new Integer[] { 1, null })
2265          for (Integer v2 : new Integer[] { 2, null })
2266      {
2267          final CompletableFuture<Integer> f = new CompletableFuture<>();
2268          final CompletableFuture<Integer> g = new CompletableFuture<>();
2269 <        final Noop r = new Noop();
2270 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2269 >        final FailingConsumer[] rs = new FailingConsumer[6];
2270 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2271  
2272 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2273 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2274          f.complete(v1);
2275 <        checkCompletedNormally(h, null);
2276 <        assertEquals(1, r.invocationCount);
2275 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2276 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2277 >        checkCompletedWithWrappedCFException(h0);
2278 >        checkCompletedWithWrappedCFException(h1);
2279 >        checkCompletedWithWrappedCFException(h2);
2280 >        checkCompletedWithWrappedCFException(h3);
2281 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2282 >
2283          g.complete(v2);
2284  
2285 +        // unspecified behavior - both source completions available
2286 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2287 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2288 +
2289 +        checkCompletedWithWrappedCFException(h4);
2290 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2291 +                   Objects.equals(v2, rs[4].value));
2292 +        checkCompletedWithWrappedCFException(h5);
2293 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2294 +                   Objects.equals(v2, rs[5].value));
2295 +
2296          checkCompletedNormally(f, v1);
2297          checkCompletedNormally(g, v2);
2166        checkCompletedNormally(h, null);
2167        assertEquals(1, r.invocationCount);
2298      }}
2299  
2300 <    public void testRunAfterEither_normalCompletion2() {
2300 >    /**
2301 >     * runAfterEither result completes normally after normal completion
2302 >     * of either source
2303 >     */
2304 >    public void testRunAfterEither_normalCompletion() {
2305          for (ExecutionMode m : ExecutionMode.values())
2306          for (Integer v1 : new Integer[] { 1, null })
2307          for (Integer v2 : new Integer[] { 2, null })
2308      {
2309          final CompletableFuture<Integer> f = new CompletableFuture<>();
2310          final CompletableFuture<Integer> g = new CompletableFuture<>();
2311 <        final Noop r = new Noop();
2312 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2311 >        final Noop[] rs = new Noop[6];
2312 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2313  
2314 <        g.complete(v2);
2315 <        checkCompletedNormally(h, null);
2316 <        assertEquals(1, r.invocationCount);
2314 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2315 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2316 >        checkIncomplete(h0);
2317 >        checkIncomplete(h1);
2318 >        rs[0].assertNotInvoked();
2319 >        rs[1].assertNotInvoked();
2320          f.complete(v1);
2321 +        checkCompletedNormally(h0, null);
2322 +        checkCompletedNormally(h1, null);
2323 +        rs[0].assertInvoked();
2324 +        rs[1].assertInvoked();
2325 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2326 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2327 +        checkCompletedNormally(h2, null);
2328 +        checkCompletedNormally(h3, null);
2329 +        rs[2].assertInvoked();
2330 +        rs[3].assertInvoked();
2331  
2185        checkCompletedNormally(f, v1);
2186        checkCompletedNormally(g, v2);
2187        checkCompletedNormally(h, null);
2188        assertEquals(1, r.invocationCount);
2189        }}
2190
2191    public void testRunAfterEither_normalCompletion3() {
2192        for (ExecutionMode m : ExecutionMode.values())
2193        for (Integer v1 : new Integer[] { 1, null })
2194        for (Integer v2 : new Integer[] { 2, null })
2195    {
2196        final CompletableFuture<Integer> f = new CompletableFuture<>();
2197        final CompletableFuture<Integer> g = new CompletableFuture<>();
2198        final Noop r = new Noop();
2199
2200        f.complete(v1);
2332          g.complete(v2);
2202        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2333  
2334 <        checkCompletedNormally(h, null);
2334 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2335 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2336 >
2337          checkCompletedNormally(f, v1);
2338          checkCompletedNormally(g, v2);
2339 <        assertEquals(1, r.invocationCount);
2339 >        checkCompletedNormally(h0, null);
2340 >        checkCompletedNormally(h1, null);
2341 >        checkCompletedNormally(h2, null);
2342 >        checkCompletedNormally(h3, null);
2343 >        checkCompletedNormally(h4, null);
2344 >        checkCompletedNormally(h5, null);
2345 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2346      }}
2347  
2348      /**
2349       * runAfterEither result completes exceptionally after exceptional
2350       * completion of either source
2351       */
2352 <    public void testRunAfterEither_exceptionalCompletion1() {
2352 >    public void testRunAfterEither_exceptionalCompletion() {
2353          for (ExecutionMode m : ExecutionMode.values())
2354          for (Integer v1 : new Integer[] { 1, null })
2355      {
2356          final CompletableFuture<Integer> f = new CompletableFuture<>();
2357          final CompletableFuture<Integer> g = new CompletableFuture<>();
2220        final Noop r = new Noop();
2221        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2358          final CFException ex = new CFException();
2359 +        final Noop[] rs = new Noop[6];
2360 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2361  
2362 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2363 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2364 +        checkIncomplete(h0);
2365 +        checkIncomplete(h1);
2366 +        rs[0].assertNotInvoked();
2367 +        rs[1].assertNotInvoked();
2368          f.completeExceptionally(ex);
2369 <        checkCompletedWithWrappedCFException(h, ex);
2369 >        checkCompletedWithWrappedException(h0, ex);
2370 >        checkCompletedWithWrappedException(h1, ex);
2371 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2372 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2373 >        checkCompletedWithWrappedException(h2, ex);
2374 >        checkCompletedWithWrappedException(h3, ex);
2375 >
2376          g.complete(v1);
2377  
2378 <        assertEquals(0, r.invocationCount);
2378 >        // unspecified behavior - both source completions available
2379 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2380 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2381 >        try {
2382 >            assertNull(h4.join());
2383 >            rs[4].assertInvoked();
2384 >        } catch (CompletionException ok) {
2385 >            checkCompletedWithWrappedException(h4, ex);
2386 >            rs[4].assertNotInvoked();
2387 >        }
2388 >        try {
2389 >            assertNull(h5.join());
2390 >            rs[5].assertInvoked();
2391 >        } catch (CompletionException ok) {
2392 >            checkCompletedWithWrappedException(h5, ex);
2393 >            rs[5].assertNotInvoked();
2394 >        }
2395 >
2396 >        checkCompletedExceptionally(f, ex);
2397          checkCompletedNormally(g, v1);
2398 <        checkCompletedWithWrappedCFException(f, ex);
2399 <        checkCompletedWithWrappedCFException(h, ex);
2398 >        checkCompletedWithWrappedException(h0, ex);
2399 >        checkCompletedWithWrappedException(h1, ex);
2400 >        checkCompletedWithWrappedException(h2, ex);
2401 >        checkCompletedWithWrappedException(h3, ex);
2402 >        checkCompletedWithWrappedException(h4, ex);
2403 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2404      }}
2405  
2406      public void testRunAfterEither_exceptionalCompletion2() {
2407          for (ExecutionMode m : ExecutionMode.values())
2408 +        for (boolean fFirst : new boolean[] { true, false })
2409          for (Integer v1 : new Integer[] { 1, null })
2410      {
2411          final CompletableFuture<Integer> f = new CompletableFuture<>();
2412          final CompletableFuture<Integer> g = new CompletableFuture<>();
2240        final Noop r = new Noop();
2241        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2242        final CFException ex = new CFException();
2243
2244        g.completeExceptionally(ex);
2245        checkCompletedWithWrappedCFException(h, ex);
2246        f.complete(v1);
2247
2248        assertEquals(0, r.invocationCount);
2249        checkCompletedNormally(f, v1);
2250        checkCompletedWithWrappedCFException(g, ex);
2251        checkCompletedWithWrappedCFException(h, ex);
2252    }}
2253
2254    public void testRunAfterEither_exceptionalCompletion3() {
2255        for (ExecutionMode m : ExecutionMode.values())
2256        for (Integer v1 : new Integer[] { 1, null })
2257    {
2258        final CompletableFuture<Integer> f = new CompletableFuture<>();
2259        final CompletableFuture<Integer> g = new CompletableFuture<>();
2260        final Noop r = new Noop();
2413          final CFException ex = new CFException();
2414 +        final Noop[] rs = new Noop[6];
2415 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2416  
2417 <        g.completeExceptionally(ex);
2418 <        f.complete(v1);
2419 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2417 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2418 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2419 >        if (fFirst) {
2420 >            f.complete(v1);
2421 >            g.completeExceptionally(ex);
2422 >        } else {
2423 >            g.completeExceptionally(ex);
2424 >            f.complete(v1);
2425 >        }
2426 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2427 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2428  
2429 <        // unspecified behavior
2430 <        Integer v;
2429 >        // unspecified behavior - both source completions available
2430 >        try {
2431 >            assertEquals(null, h0.join());
2432 >            rs[0].assertInvoked();
2433 >        } catch (CompletionException ok) {
2434 >            checkCompletedWithWrappedException(h0, ex);
2435 >            rs[0].assertNotInvoked();
2436 >        }
2437 >        try {
2438 >            assertEquals(null, h1.join());
2439 >            rs[1].assertInvoked();
2440 >        } catch (CompletionException ok) {
2441 >            checkCompletedWithWrappedException(h1, ex);
2442 >            rs[1].assertNotInvoked();
2443 >        }
2444 >        try {
2445 >            assertEquals(null, h2.join());
2446 >            rs[2].assertInvoked();
2447 >        } catch (CompletionException ok) {
2448 >            checkCompletedWithWrappedException(h2, ex);
2449 >            rs[2].assertNotInvoked();
2450 >        }
2451          try {
2452 <            assertNull(h.join());
2453 <            assertEquals(1, r.invocationCount);
2452 >            assertEquals(null, h3.join());
2453 >            rs[3].assertInvoked();
2454          } catch (CompletionException ok) {
2455 <            checkCompletedWithWrappedCFException(h, ex);
2456 <            assertEquals(0, r.invocationCount);
2455 >            checkCompletedWithWrappedException(h3, ex);
2456 >            rs[3].assertNotInvoked();
2457          }
2458  
2277        checkCompletedWithWrappedCFException(g, ex);
2459          checkCompletedNormally(f, v1);
2460 +        checkCompletedExceptionally(g, ex);
2461      }}
2462  
2463 <    public void testRunAfterEither_exceptionalCompletion4() {
2463 >    /**
2464 >     * runAfterEither result completes exceptionally if either source cancelled
2465 >     */
2466 >    public void testRunAfterEither_sourceCancelled() {
2467          for (ExecutionMode m : ExecutionMode.values())
2468 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2469          for (Integer v1 : new Integer[] { 1, null })
2470      {
2471          final CompletableFuture<Integer> f = new CompletableFuture<>();
2472          final CompletableFuture<Integer> g = new CompletableFuture<>();
2473 <        final Noop r = new Noop();
2474 <        final CFException ex = new CFException();
2473 >        final Noop[] rs = new Noop[6];
2474 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2475 >
2476 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2477 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2478 >        checkIncomplete(h0);
2479 >        checkIncomplete(h1);
2480 >        rs[0].assertNotInvoked();
2481 >        rs[1].assertNotInvoked();
2482 >        f.cancel(mayInterruptIfRunning);
2483 >        checkCompletedWithWrappedCancellationException(h0);
2484 >        checkCompletedWithWrappedCancellationException(h1);
2485 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2486 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2487 >        checkCompletedWithWrappedCancellationException(h2);
2488 >        checkCompletedWithWrappedCancellationException(h3);
2489  
2290        f.completeExceptionally(ex);
2490          g.complete(v1);
2292        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2491  
2492 <        // unspecified behavior
2493 <        Integer v;
2492 >        // unspecified behavior - both source completions available
2493 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2494 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2495 >        try {
2496 >            assertNull(h4.join());
2497 >            rs[4].assertInvoked();
2498 >        } catch (CompletionException ok) {
2499 >            checkCompletedWithWrappedCancellationException(h4);
2500 >            rs[4].assertNotInvoked();
2501 >        }
2502          try {
2503 <            assertNull(h.join());
2504 <            assertEquals(1, r.invocationCount);
2503 >            assertNull(h5.join());
2504 >            rs[5].assertInvoked();
2505          } catch (CompletionException ok) {
2506 <            checkCompletedWithWrappedCFException(h, ex);
2507 <            assertEquals(0, r.invocationCount);
2506 >            checkCompletedWithWrappedCancellationException(h5);
2507 >            rs[5].assertNotInvoked();
2508          }
2509  
2510 <        checkCompletedWithWrappedCFException(f, ex);
2510 >        checkCancelled(f);
2511          checkCompletedNormally(g, v1);
2512 +        checkCompletedWithWrappedCancellationException(h0);
2513 +        checkCompletedWithWrappedCancellationException(h1);
2514 +        checkCompletedWithWrappedCancellationException(h2);
2515 +        checkCompletedWithWrappedCancellationException(h3);
2516 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2517      }}
2518  
2519      /**
2520       * runAfterEither result completes exceptionally if action does
2521       */
2522 <    public void testRunAfterEither_actionFailed1() {
2522 >    public void testRunAfterEither_actionFailed() {
2523          for (ExecutionMode m : ExecutionMode.values())
2524          for (Integer v1 : new Integer[] { 1, null })
2525          for (Integer v2 : new Integer[] { 2, null })
2526      {
2527          final CompletableFuture<Integer> f = new CompletableFuture<>();
2528          final CompletableFuture<Integer> g = new CompletableFuture<>();
2529 <        final FailingRunnable r = new FailingRunnable();
2530 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2529 >        final FailingRunnable[] rs = new FailingRunnable[6];
2530 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2531  
2532 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2533 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2534          f.complete(v1);
2535 <        checkCompletedWithWrappedCFException(h);
2535 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2536 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2537 >        checkCompletedWithWrappedCFException(h0);
2538 >        checkCompletedWithWrappedCFException(h1);
2539 >        checkCompletedWithWrappedCFException(h2);
2540 >        checkCompletedWithWrappedCFException(h3);
2541 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2542          g.complete(v2);
2543 <        checkCompletedNormally(f, v1);
2544 <        checkCompletedNormally(g, v2);
2545 <    }}
2546 <
2328 <    public void testRunAfterEither_actionFailed2() {
2329 <        for (ExecutionMode m : ExecutionMode.values())
2330 <        for (Integer v1 : new Integer[] { 1, null })
2331 <        for (Integer v2 : new Integer[] { 2, null })
2332 <    {
2333 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2334 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2335 <        final FailingRunnable r = new FailingRunnable();
2336 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2543 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2544 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2545 >        checkCompletedWithWrappedCFException(h4);
2546 >        checkCompletedWithWrappedCFException(h5);
2547  
2338        g.complete(v2);
2339        checkCompletedWithWrappedCFException(h);
2340        f.complete(v1);
2548          checkCompletedNormally(f, v1);
2549          checkCompletedNormally(g, v2);
2550 <    }}
2344 <
2345 <    /**
2346 <     * runAfterEither result completes exceptionally if either source cancelled
2347 <     */
2348 <    public void testRunAfterEither_sourceCancelled1() {
2349 <        for (ExecutionMode m : ExecutionMode.values())
2350 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2351 <        for (Integer v1 : new Integer[] { 1, null })
2352 <    {
2353 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2354 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2355 <        final Noop r = new Noop();
2356 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2357 <
2358 <        assertTrue(f.cancel(mayInterruptIfRunning));
2359 <        checkCompletedWithWrappedCancellationException(h);
2360 <        g.complete(v1);
2361 <
2362 <        checkCancelled(f);
2363 <        assertEquals(0, r.invocationCount);
2364 <        checkCompletedNormally(g, v1);
2365 <        checkCompletedWithWrappedCancellationException(h);
2366 <    }}
2367 <
2368 <    public void testRunAfterEither_sourceCancelled2() {
2369 <        for (ExecutionMode m : ExecutionMode.values())
2370 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2371 <        for (Integer v1 : new Integer[] { 1, null })
2372 <    {
2373 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2374 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2375 <        final Noop r = new Noop();
2376 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2377 <
2378 <        assertTrue(g.cancel(mayInterruptIfRunning));
2379 <        checkCompletedWithWrappedCancellationException(h);
2380 <        f.complete(v1);
2381 <
2382 <        checkCancelled(g);
2383 <        assertEquals(0, r.invocationCount);
2384 <        checkCompletedNormally(f, v1);
2385 <        checkCompletedWithWrappedCancellationException(h);
2386 <    }}
2387 <
2388 <    public void testRunAfterEither_sourceCancelled3() {
2389 <        for (ExecutionMode m : ExecutionMode.values())
2390 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2391 <        for (Integer v1 : new Integer[] { 1, null })
2392 <    {
2393 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2394 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2395 <        final Noop r = new Noop();
2396 <
2397 <        assertTrue(g.cancel(mayInterruptIfRunning));
2398 <        f.complete(v1);
2399 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2400 <
2401 <        // unspecified behavior
2402 <        Integer v;
2403 <        try {
2404 <            assertNull(h.join());
2405 <            assertEquals(1, r.invocationCount);
2406 <        } catch (CompletionException ok) {
2407 <            checkCompletedWithWrappedCancellationException(h);
2408 <            assertEquals(0, r.invocationCount);
2409 <        }
2410 <
2411 <        checkCancelled(g);
2412 <        checkCompletedNormally(f, v1);
2413 <    }}
2414 <
2415 <    public void testRunAfterEither_sourceCancelled4() {
2416 <        for (ExecutionMode m : ExecutionMode.values())
2417 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2418 <        for (Integer v1 : new Integer[] { 1, null })
2419 <    {
2420 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2421 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2422 <        final Noop r = new Noop();
2423 <
2424 <        assertTrue(f.cancel(mayInterruptIfRunning));
2425 <        g.complete(v1);
2426 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2427 <
2428 <        // unspecified behavior
2429 <        Integer v;
2430 <        try {
2431 <            assertNull(h.join());
2432 <            assertEquals(1, r.invocationCount);
2433 <        } catch (CompletionException ok) {
2434 <            checkCompletedWithWrappedCancellationException(h);
2435 <            assertEquals(0, r.invocationCount);
2436 <        }
2437 <
2438 <        checkCancelled(f);
2439 <        checkCompletedNormally(g, v1);
2550 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2551      }}
2552  
2553      /**
# Line 2448 | Line 2559 | public class CompletableFutureTest exten
2559          for (Integer v1 : new Integer[] { 1, null })
2560      {
2561          final CompletableFuture<Integer> f = new CompletableFuture<>();
2562 <        final CompletableFutureInc r = new CompletableFutureInc();
2562 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2563          if (!createIncomplete) f.complete(v1);
2564 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2564 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2565          if (createIncomplete) f.complete(v1);
2566  
2567          checkCompletedNormally(g, inc(v1));
2568          checkCompletedNormally(f, v1);
2569 <        assertEquals(1, r.invocationCount);
2569 >        r.assertValue(v1);
2570      }}
2571  
2572      /**
# Line 2467 | Line 2578 | public class CompletableFutureTest exten
2578          for (boolean createIncomplete : new boolean[] { true, false })
2579      {
2580          final CFException ex = new CFException();
2581 <        final CompletableFutureInc r = new CompletableFutureInc();
2581 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2582          final CompletableFuture<Integer> f = new CompletableFuture<>();
2583          if (!createIncomplete) f.completeExceptionally(ex);
2584 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2584 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2585          if (createIncomplete) f.completeExceptionally(ex);
2586  
2587 <        checkCompletedWithWrappedCFException(g, ex);
2588 <        checkCompletedWithWrappedCFException(f, ex);
2589 <        assertEquals(0, r.invocationCount);
2587 >        checkCompletedWithWrappedException(g, ex);
2588 >        checkCompletedExceptionally(f, ex);
2589 >        r.assertNotInvoked();
2590      }}
2591  
2592      /**
# Line 2488 | Line 2599 | public class CompletableFutureTest exten
2599      {
2600          final CompletableFuture<Integer> f = new CompletableFuture<>();
2601          final FailingCompletableFutureFunction r
2602 <            = new FailingCompletableFutureFunction();
2602 >            = new FailingCompletableFutureFunction(m);
2603          if (!createIncomplete) f.complete(v1);
2604 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2604 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2605          if (createIncomplete) f.complete(v1);
2606  
2607          checkCompletedWithWrappedCFException(g);
# Line 2506 | Line 2617 | public class CompletableFutureTest exten
2617          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2618      {
2619          final CompletableFuture<Integer> f = new CompletableFuture<>();
2620 <        final CompletableFutureInc r = new CompletableFutureInc();
2620 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2621          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2622 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2622 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2623          if (createIncomplete) {
2624              checkIncomplete(g);
2625              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2535 | Line 2646 | public class CompletableFutureTest exten
2646       */
2647      public void testAllOf_normal() throws Exception {
2648          for (int k = 1; k < 20; ++k) {
2649 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2649 >            CompletableFuture<Integer>[] fs
2650 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2651              for (int i = 0; i < k; ++i)
2652                  fs[i] = new CompletableFuture<>();
2653              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 2549 | Line 2661 | public class CompletableFutureTest exten
2661          }
2662      }
2663  
2664 +    public void testAllOf_backwards() throws Exception {
2665 +        for (int k = 1; k < 20; ++k) {
2666 +            CompletableFuture<Integer>[] fs
2667 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2668 +            for (int i = 0; i < k; ++i)
2669 +                fs[i] = new CompletableFuture<>();
2670 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2671 +            for (int i = k - 1; i >= 0; i--) {
2672 +                checkIncomplete(f);
2673 +                checkIncomplete(CompletableFuture.allOf(fs));
2674 +                fs[i].complete(one);
2675 +            }
2676 +            checkCompletedNormally(f, null);
2677 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2678 +        }
2679 +    }
2680 +
2681      /**
2682       * anyOf(no component futures) returns an incomplete future
2683       */
# Line 2607 | Line 2736 | public class CompletableFutureTest exten
2736          Runnable[] throwingActions = {
2737              () -> CompletableFuture.supplyAsync(null),
2738              () -> CompletableFuture.supplyAsync(null, exec),
2739 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2739 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2740  
2741              () -> CompletableFuture.runAsync(null),
2742              () -> CompletableFuture.runAsync(null, exec),
# Line 2680 | Line 2809 | public class CompletableFutureTest exten
2809  
2810              () -> f.thenCompose(null),
2811              () -> f.thenComposeAsync(null),
2812 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2812 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2813              () -> f.thenComposeAsync(null, exec),
2814  
2815              () -> f.exceptionally(null),
# Line 2727 | Line 2856 | public class CompletableFutureTest exten
2856          final CompletableFuture<Integer> g = m.whenComplete
2857              (f,
2858               (Integer x, Throwable t) -> {
2859 +                m.checkExecutionMode();
2860                  threadAssertSame(x, v1);
2861                  threadAssertNull(t);
2862                  a.getAndIncrement();
# Line 2754 | Line 2884 | public class CompletableFutureTest exten
2884          final CompletableFuture<Integer> g = m.whenComplete
2885              (f,
2886               (Integer x, Throwable t) -> {
2887 +                m.checkExecutionMode();
2888                  threadAssertNull(x);
2889                  threadAssertSame(t, ex);
2890                  a.getAndIncrement();
2891              });
2892          if (createIncomplete) f.completeExceptionally(ex);
2893 <        checkCompletedWithWrappedCFException(f, ex);
2894 <        checkCompletedWithWrappedCFException(g, ex);
2893 >        checkCompletedExceptionally(f, ex);
2894 >        checkCompletedWithWrappedException(g, ex);
2895          assertEquals(1, a.get());
2896      }}
2897  
# Line 2779 | Line 2910 | public class CompletableFutureTest exten
2910          final CompletableFuture<Integer> g = m.whenComplete
2911              (f,
2912               (Integer x, Throwable t) -> {
2913 +                m.checkExecutionMode();
2914                  threadAssertNull(x);
2915                  threadAssertTrue(t instanceof CancellationException);
2916                  a.getAndIncrement();
2917              });
2918          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2919  
2788        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2920          checkCompletedWithWrappedCancellationException(g);
2921          checkCancelled(f);
2922          assertEquals(1, a.get());
# Line 2807 | Line 2938 | public class CompletableFutureTest exten
2938          final CompletableFuture<Integer> g = m.whenComplete
2939              (f,
2940               (Integer x, Throwable t) -> {
2941 +                m.checkExecutionMode();
2942                  threadAssertSame(x, v1);
2943                  threadAssertNull(t);
2944                  a.getAndIncrement();
# Line 2814 | Line 2946 | public class CompletableFutureTest exten
2946              });
2947          if (createIncomplete) f.complete(v1);
2948          checkCompletedNormally(f, v1);
2949 <        checkCompletedWithWrappedCFException(g, ex);
2949 >        checkCompletedWithWrappedException(g, ex);
2950          assertEquals(1, a.get());
2951      }}
2952  
# Line 2837 | Line 2969 | public class CompletableFutureTest exten
2969          final CompletableFuture<Integer> g = m.whenComplete
2970              (f,
2971               (Integer x, Throwable t) -> {
2972 +                m.checkExecutionMode();
2973                  threadAssertSame(t, ex1);
2974                  threadAssertNull(x);
2975                  a.getAndIncrement();
# Line 2844 | Line 2977 | public class CompletableFutureTest exten
2977              });
2978          if (createIncomplete) f.completeExceptionally(ex1);
2979  
2980 <        checkCompletedWithWrappedCFException(f, ex1);
2981 <        checkCompletedWithWrappedCFException(g, ex1);
2980 >        checkCompletedExceptionally(f, ex1);
2981 >        checkCompletedWithWrappedException(g, ex1);
2982          assertEquals(1, a.get());
2983      }}
2984  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines