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.48 by jsr166, Mon Jun 2 19:07:14 2014 UTC vs.
Revision 1.64 by jsr166, Fri Jun 6 17:08:48 2014 UTC

# Line 284 | Line 284 | public class CompletableFutureTest exten
284      public void testGetNumberOfDependents() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286          assertEquals(0, f.getNumberOfDependents());
287 <        CompletableFuture g = f.thenRun(new Noop());
287 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
288          assertEquals(1, f.getNumberOfDependents());
289          assertEquals(0, g.getNumberOfDependents());
290 <        CompletableFuture h = f.thenRun(new Noop());
290 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
291          assertEquals(2, f.getNumberOfDependents());
292          f.complete(1);
293          checkCompletedNormally(g, null);
# Line 320 | Line 320 | public class CompletableFutureTest exten
320          checkCompletedNormally(f, "test");
321      }
322  
323 <    // Choose non-commutative actions for better coverage
323 >    abstract class CheckedAction {
324 >        int invocationCount = 0;
325 >        final ExecutionMode m;
326 >        CheckedAction(ExecutionMode m) { this.m = m; }
327 >        void invoked() {
328 >            m.checkExecutionMode();
329 >            assertEquals(0, invocationCount++);
330 >        }
331 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
332 >        void assertInvoked() { assertEquals(1, invocationCount); }
333 >    }
334  
335 <    // A non-commutative function that handles and produces null values as well.
336 <    static Integer subtract(Integer x, Integer y) {
337 <        return (x == null && y == null) ? null :
338 <            ((x == null) ? 42 : x.intValue())
339 <            - ((y == null) ? 99 : y.intValue());
335 >    abstract class CheckedIntegerAction extends CheckedAction {
336 >        Integer value;
337 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
338 >        void assertValue(Integer expected) {
339 >            assertInvoked();
340 >            assertEquals(expected, value);
341 >        }
342 >    }
343 >
344 >    class IntegerSupplier extends CheckedAction
345 >        implements Supplier<Integer>
346 >    {
347 >        final Integer value;
348 >        IntegerSupplier(ExecutionMode m, Integer value) {
349 >            super(m);
350 >            this.value = value;
351 >        }
352 >        public Integer get() {
353 >            invoked();
354 >            return value;
355 >        }
356      }
357  
358      // A function that handles and produces null values as well.
# Line 334 | Line 360 | public class CompletableFutureTest exten
360          return (x == null) ? null : x + 1;
361      }
362  
363 <    static final Supplier<Integer> supplyOne =
364 <        () -> Integer.valueOf(1);
365 <    static final Function<Integer, Integer> inc =
366 <        (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;
363 >    class NoopConsumer extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        NoopConsumer(ExecutionMode m) { super(m); }
367          public void accept(Integer x) {
368 <            invocationCount++;
369 <            value = inc(x);
368 >            invoked();
369 >            value = x;
370          }
371      }
372 <    static final class IncFunction implements Function<Integer,Integer> {
373 <        int invocationCount = 0;
374 <        Integer value;
372 >
373 >    class IncFunction extends CheckedIntegerAction
374 >        implements Function<Integer,Integer>
375 >    {
376 >        IncFunction(ExecutionMode m) { super(m); }
377          public Integer apply(Integer x) {
378 <            invocationCount++;
378 >            invoked();
379              return value = inc(x);
380          }
381      }
382 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
383 <        int invocationCount = 0;
384 <        Integer value;
385 <        // Check this action was invoked exactly once when result is computed.
382 >
383 >    // Choose non-commutative actions for better coverage
384 >    // A non-commutative function that handles and produces null values as well.
385 >    static Integer subtract(Integer x, Integer y) {
386 >        return (x == null && y == null) ? null :
387 >            ((x == null) ? 42 : x.intValue())
388 >            - ((y == null) ? 99 : y.intValue());
389 >    }
390 >
391 >    class SubtractAction extends CheckedIntegerAction
392 >        implements BiConsumer<Integer, Integer>
393 >    {
394 >        SubtractAction(ExecutionMode m) { super(m); }
395          public void accept(Integer x, Integer y) {
396 <            invocationCount++;
396 >            invoked();
397              value = subtract(x, y);
398          }
399      }
400 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
401 <        int invocationCount = 0;
402 <        Integer value;
403 <        // Check this action was invoked exactly once when result is computed.
400 >
401 >    class SubtractFunction extends CheckedIntegerAction
402 >        implements BiFunction<Integer, Integer, Integer>
403 >    {
404 >        SubtractFunction(ExecutionMode m) { super(m); }
405          public Integer apply(Integer x, Integer y) {
406 <            invocationCount++;
406 >            invoked();
407              return value = subtract(x, y);
408          }
409      }
410 <    static final class Noop implements Runnable {
411 <        int invocationCount = 0;
410 >
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413          public void run() {
414 <            invocationCount++;
414 >            invoked();
415          }
416      }
417  
418 <    static final class FailingSupplier implements Supplier<Integer> {
419 <        int invocationCount = 0;
418 >    class FailingSupplier extends CheckedAction
419 >        implements Supplier<Integer>
420 >    {
421 >        FailingSupplier(ExecutionMode m) { super(m); }
422          public Integer get() {
423 <            invocationCount++;
423 >            invoked();
424              throw new CFException();
425          }
426      }
427 <    static final class FailingConsumer implements Consumer<Integer> {
428 <        int invocationCount = 0;
427 >
428 >    class FailingConsumer extends CheckedIntegerAction
429 >        implements Consumer<Integer>
430 >    {
431 >        FailingConsumer(ExecutionMode m) { super(m); }
432          public void accept(Integer x) {
433 <            invocationCount++;
433 >            invoked();
434 >            value = x;
435              throw new CFException();
436          }
437      }
438 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
439 <        int invocationCount = 0;
438 >
439 >    class FailingBiConsumer extends CheckedIntegerAction
440 >        implements BiConsumer<Integer, Integer>
441 >    {
442 >        FailingBiConsumer(ExecutionMode m) { super(m); }
443          public void accept(Integer x, Integer y) {
444 <            invocationCount++;
444 >            invoked();
445 >            value = subtract(x, y);
446              throw new CFException();
447          }
448      }
449 <    static final class FailingFunction implements Function<Integer, Integer> {
450 <        int invocationCount = 0;
449 >
450 >    class FailingFunction extends CheckedIntegerAction
451 >        implements Function<Integer, Integer>
452 >    {
453 >        FailingFunction(ExecutionMode m) { super(m); }
454          public Integer apply(Integer x) {
455 <            invocationCount++;
455 >            invoked();
456 >            value = x;
457              throw new CFException();
458          }
459      }
460 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
461 <        int invocationCount = 0;
460 >
461 >    class FailingBiFunction extends CheckedIntegerAction
462 >        implements BiFunction<Integer, Integer, Integer>
463 >    {
464 >        FailingBiFunction(ExecutionMode m) { super(m); }
465          public Integer apply(Integer x, Integer y) {
466 <            invocationCount++;
466 >            invoked();
467 >            value = subtract(x, y);
468              throw new CFException();
469          }
470      }
471 <    static final class FailingNoop implements Runnable {
472 <        int invocationCount = 0;
471 >
472 >    class FailingRunnable extends CheckedAction implements Runnable {
473 >        FailingRunnable(ExecutionMode m) { super(m); }
474          public void run() {
475 <            invocationCount++;
475 >            invoked();
476              throw new CFException();
477          }
478      }
479  
480 <    static final class CompletableFutureInc
481 <        implements Function<Integer, CompletableFuture<Integer>> {
482 <        int invocationCount = 0;
480 >
481 >    class CompletableFutureInc extends CheckedIntegerAction
482 >        implements Function<Integer, CompletableFuture<Integer>>
483 >    {
484 >        CompletableFutureInc(ExecutionMode m) { super(m); }
485          public CompletableFuture<Integer> apply(Integer x) {
486 <            invocationCount++;
486 >            invoked();
487 >            value = x;
488              CompletableFuture<Integer> f = new CompletableFuture<>();
489              f.complete(inc(x));
490              return f;
491          }
492      }
493  
494 <    static final class FailingCompletableFutureFunction
495 <        implements Function<Integer, CompletableFuture<Integer>> {
496 <        int invocationCount = 0;
494 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
495 >        implements Function<Integer, CompletableFuture<Integer>>
496 >    {
497 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
498          public CompletableFuture<Integer> apply(Integer x) {
499 <            invocationCount++;
499 >            invoked();
500 >            value = x;
501              throw new CFException();
502          }
503      }
504  
505      // Used for explicit executor tests
506      static final class ThreadExecutor implements Executor {
507 <        AtomicInteger count = new AtomicInteger(0);
507 >        final AtomicInteger count = new AtomicInteger(0);
508 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
509 >        static boolean startedCurrentThread() {
510 >            return Thread.currentThread().getThreadGroup() == tg;
511 >        }
512  
513          public void execute(Runnable r) {
514              count.getAndIncrement();
515 <            new Thread(r).start();
515 >            new Thread(tg, r).start();
516          }
517      }
518  
519      /**
520       * Permits the testing of parallel code for the 3 different
521 <     * execution modes without repeating all the testing code.
521 >     * execution modes without copy/pasting all the test methods.
522       */
523      enum ExecutionMode {
524          DEFAULT {
525              public void checkExecutionMode() {
526 +                assertFalse(ThreadExecutor.startedCurrentThread());
527                  assertNull(ForkJoinTask.getPool());
528              }
529 +            public CompletableFuture<Void> runAsync(Runnable a) {
530 +                throw new UnsupportedOperationException();
531 +            }
532 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
533 +                throw new UnsupportedOperationException();
534 +            }
535              public <T> CompletableFuture<Void> thenRun
536                  (CompletableFuture<T> f, Runnable a) {
537                  return f.thenRun(a);
# Line 531 | Line 600 | public class CompletableFutureTest exten
600                  assertSame(ForkJoinPool.commonPool(),
601                             ForkJoinTask.getPool());
602              }
603 +            public CompletableFuture<Void> runAsync(Runnable a) {
604 +                return CompletableFuture.runAsync(a);
605 +            }
606 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
607 +                return CompletableFuture.supplyAsync(a);
608 +            }
609              public <T> CompletableFuture<Void> thenRun
610                  (CompletableFuture<T> f, Runnable a) {
611                  return f.thenRunAsync(a);
# Line 596 | Line 671 | public class CompletableFutureTest exten
671  
672          EXECUTOR {
673              public void checkExecutionMode() {
674 <                //TODO
674 >                assertTrue(ThreadExecutor.startedCurrentThread());
675 >            }
676 >            public CompletableFuture<Void> runAsync(Runnable a) {
677 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
678 >            }
679 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
680 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
681              }
682              public <T> CompletableFuture<Void> thenRun
683                  (CompletableFuture<T> f, Runnable a) {
# Line 662 | Line 743 | public class CompletableFutureTest exten
743          };
744  
745          public abstract void checkExecutionMode();
746 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
747 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
748          public abstract <T> CompletableFuture<Void> thenRun
749              (CompletableFuture<T> f, Runnable a);
750          public abstract <T> CompletableFuture<Void> thenAccept
# Line 740 | Line 823 | public class CompletableFutureTest exten
823          if (!createIncomplete) f.completeExceptionally(ex);
824          final CompletableFuture<Integer> g = f.exceptionally
825              ((Throwable t) -> {
826 +                ExecutionMode.DEFAULT.checkExecutionMode();
827                  threadAssertSame(t, ex);
828                  a.getAndIncrement();
829                  return v1;
# Line 761 | Line 845 | public class CompletableFutureTest exten
845          if (!createIncomplete) f.completeExceptionally(ex1);
846          final CompletableFuture<Integer> g = f.exceptionally
847              ((Throwable t) -> {
848 +                ExecutionMode.DEFAULT.checkExecutionMode();
849                  threadAssertSame(t, ex1);
850                  a.getAndIncrement();
851                  throw ex2;
# Line 786 | Line 871 | public class CompletableFutureTest exten
871          final CompletableFuture<Integer> g = m.handle
872              (f,
873               (Integer x, Throwable t) -> {
874 +                m.checkExecutionMode();
875                  threadAssertSame(x, v1);
876                  threadAssertNull(t);
877                  a.getAndIncrement();
# Line 814 | Line 900 | public class CompletableFutureTest exten
900          final CompletableFuture<Integer> g = m.handle
901              (f,
902               (Integer x, Throwable t) -> {
903 +                m.checkExecutionMode();
904                  threadAssertNull(x);
905                  threadAssertSame(t, ex);
906                  a.getAndIncrement();
# Line 842 | Line 929 | public class CompletableFutureTest exten
929          final CompletableFuture<Integer> g = m.handle
930              (f,
931               (Integer x, Throwable t) -> {
932 +                m.checkExecutionMode();
933                  threadAssertNull(x);
934                  threadAssertTrue(t instanceof CancellationException);
935                  a.getAndIncrement();
# Line 869 | Line 957 | public class CompletableFutureTest exten
957          final CompletableFuture<Integer> g = m.handle
958              (f,
959               (Integer x, Throwable t) -> {
960 +                m.checkExecutionMode();
961                  threadAssertNull(x);
962                  threadAssertSame(ex1, t);
963                  a.getAndIncrement();
# Line 893 | Line 982 | public class CompletableFutureTest exten
982          final CompletableFuture<Integer> g = m.handle
983              (f,
984               (Integer x, Throwable t) -> {
985 +                m.checkExecutionMode();
986                  threadAssertSame(x, v1);
987                  threadAssertNull(t);
988                  a.getAndIncrement();
# Line 908 | Line 998 | public class CompletableFutureTest exten
998      /**
999       * runAsync completes after running Runnable
1000       */
1001 <    public void testRunAsync() {
1002 <        Noop r = new Noop();
1003 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1004 <        assertNull(f.join());
1005 <        assertEquals(1, r.invocationCount);
1006 <        checkCompletedNormally(f, null);
1007 <    }
1008 <
1009 <    /**
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);
1001 >    public void testRunAsync_normalCompletion() {
1002 >        ExecutionMode[] executionModes = {
1003 >            ExecutionMode.ASYNC,
1004 >            ExecutionMode.EXECUTOR,
1005 >        };
1006 >        for (ExecutionMode m : executionModes)
1007 >    {
1008 >        final Noop r = new Noop(m);
1009 >        final CompletableFuture<Void> f = m.runAsync(r);
1010          assertNull(f.join());
927        assertEquals(1, r.invocationCount);
1011          checkCompletedNormally(f, null);
1012 <        assertEquals(1, exec.count.get());
1013 <    }
1012 >        r.assertInvoked();
1013 >    }}
1014  
1015      /**
1016       * failing runAsync completes exceptionally after running Runnable
1017       */
1018 <    public void testRunAsync3() {
1019 <        FailingNoop r = new FailingNoop();
1020 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1018 >    public void testRunAsync_exceptionalCompletion() {
1019 >        ExecutionMode[] executionModes = {
1020 >            ExecutionMode.ASYNC,
1021 >            ExecutionMode.EXECUTOR,
1022 >        };
1023 >        for (ExecutionMode m : executionModes)
1024 >    {
1025 >        final FailingRunnable r = new FailingRunnable(m);
1026 >        final CompletableFuture<Void> f = m.runAsync(r);
1027          checkCompletedWithWrappedCFException(f);
1028 <        assertEquals(1, r.invocationCount);
1029 <    }
1028 >        r.assertInvoked();
1029 >    }}
1030  
1031      /**
1032       * supplyAsync completes with result of supplier
1033       */
1034 <    public void testSupplyAsync() {
1035 <        CompletableFuture<Integer> f;
1036 <        f = CompletableFuture.supplyAsync(supplyOne);
1037 <        assertEquals(f.join(), one);
1038 <        checkCompletedNormally(f, one);
1039 <    }
1040 <
1041 <    /**
1042 <     * supplyAsync with executor completes with result of supplier
1043 <     */
1044 <    public void testSupplyAsync2() {
1045 <        CompletableFuture<Integer> f;
1046 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1047 <        assertEquals(f.join(), one);
959 <        checkCompletedNormally(f, one);
960 <    }
1034 >    public void testSupplyAsync_normalCompletion() {
1035 >        ExecutionMode[] executionModes = {
1036 >            ExecutionMode.ASYNC,
1037 >            ExecutionMode.EXECUTOR,
1038 >        };
1039 >        for (ExecutionMode m : executionModes)
1040 >        for (Integer v1 : new Integer[] { 1, null })
1041 >    {
1042 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1043 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1044 >        assertSame(v1, f.join());
1045 >        checkCompletedNormally(f, v1);
1046 >        r.assertInvoked();
1047 >    }}
1048  
1049      /**
1050       * Failing supplyAsync completes exceptionally
1051       */
1052 <    public void testSupplyAsync3() {
1053 <        FailingSupplier r = new FailingSupplier();
1054 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1052 >    public void testSupplyAsync_exceptionalCompletion() {
1053 >        ExecutionMode[] executionModes = {
1054 >            ExecutionMode.ASYNC,
1055 >            ExecutionMode.EXECUTOR,
1056 >        };
1057 >        for (ExecutionMode m : executionModes)
1058 >    {
1059 >        FailingSupplier r = new FailingSupplier(m);
1060 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1061          checkCompletedWithWrappedCFException(f);
1062 <        assertEquals(1, r.invocationCount);
1063 <    }
1062 >        r.assertInvoked();
1063 >    }}
1064  
1065      // seq completion methods
1066  
# Line 980 | Line 1073 | public class CompletableFutureTest exten
1073          for (Integer v1 : new Integer[] { 1, null })
1074      {
1075          final CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        final Noop r = new Noop();
1076 >        final Noop r = new Noop(m);
1077          if (!createIncomplete) f.complete(v1);
1078          final CompletableFuture<Void> g = m.thenRun(f, r);
1079 <        if (createIncomplete) f.complete(v1);
1079 >        if (createIncomplete) {
1080 >            checkIncomplete(g);
1081 >            f.complete(v1);
1082 >        }
1083  
1084          checkCompletedNormally(g, null);
1085          checkCompletedNormally(f, v1);
1086 <        assertEquals(1, r.invocationCount);
1086 >        r.assertInvoked();
1087      }}
1088  
1089      /**
# Line 1000 | Line 1096 | public class CompletableFutureTest exten
1096      {
1097          final CFException ex = new CFException();
1098          final CompletableFuture<Integer> f = new CompletableFuture<>();
1099 <        final Noop r = new Noop();
1099 >        final Noop r = new Noop(m);
1100          if (!createIncomplete) f.completeExceptionally(ex);
1101          final CompletableFuture<Void> g = m.thenRun(f, r);
1102 <        if (createIncomplete) f.completeExceptionally(ex);
1102 >        if (createIncomplete) {
1103 >            checkIncomplete(g);
1104 >            f.completeExceptionally(ex);
1105 >        }
1106  
1107          checkCompletedWithWrappedCFException(g, ex);
1108          checkCompletedWithWrappedCFException(f, ex);
1109 <        assertEquals(0, r.invocationCount);
1109 >        r.assertNotInvoked();
1110      }}
1111  
1112      /**
# Line 1019 | Line 1118 | public class CompletableFutureTest exten
1118          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1119      {
1120          final CompletableFuture<Integer> f = new CompletableFuture<>();
1121 <        final Noop r = new Noop();
1121 >        final Noop r = new Noop(m);
1122          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 <        final CompletableFuture<Void> g = f.thenRun(r);
1124 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1123 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1124 >        if (createIncomplete) {
1125 >            checkIncomplete(g);
1126 >            assertTrue(f.cancel(mayInterruptIfRunning));
1127 >        }
1128  
1129          checkCompletedWithWrappedCancellationException(g);
1130          checkCancelled(f);
1131 <        assertEquals(0, r.invocationCount);
1131 >        r.assertNotInvoked();
1132      }}
1133  
1134      /**
# Line 1038 | Line 1140 | public class CompletableFutureTest exten
1140          for (Integer v1 : new Integer[] { 1, null })
1141      {
1142          final CompletableFuture<Integer> f = new CompletableFuture<>();
1143 <        final FailingNoop r = new FailingNoop();
1143 >        final FailingRunnable r = new FailingRunnable(m);
1144          if (!createIncomplete) f.complete(v1);
1145 <        final CompletableFuture<Void> g = f.thenRun(r);
1146 <        if (createIncomplete) f.complete(v1);
1145 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1146 >        if (createIncomplete) {
1147 >            checkIncomplete(g);
1148 >            f.complete(v1);
1149 >        }
1150  
1151          checkCompletedWithWrappedCFException(g);
1152          checkCompletedNormally(f, v1);
# Line 1050 | Line 1155 | public class CompletableFutureTest exten
1155      /**
1156       * thenApply result completes normally after normal completion of source
1157       */
1158 <    public void testThenApply() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1055 <        CompletableFuture<Integer> g = f.thenApply(inc);
1056 <        f.complete(one);
1057 <        checkCompletedNormally(g, two);
1058 <    }
1059 <
1060 <    /**
1061 <     * thenApply result completes exceptionally after exceptional
1062 <     * completion of source
1063 <     */
1064 <    public void testThenApply2() {
1065 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1066 <        CompletableFuture<Integer> g = f.thenApply(inc);
1067 <        f.completeExceptionally(new CFException());
1068 <        checkCompletedWithWrappedCFException(g);
1069 <    }
1070 <
1071 <    /**
1072 <     * thenApply result completes exceptionally if action does
1073 <     */
1074 <    public void testThenApply3() {
1075 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1077 <        f.complete(one);
1078 <        checkCompletedWithWrappedCFException(g);
1079 <    }
1080 <
1081 <    /**
1082 <     * thenApply result completes exceptionally if source cancelled
1083 <     */
1084 <    public void testThenApply4() {
1085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1086 <        CompletableFuture<Integer> g = f.thenApply(inc);
1087 <        assertTrue(f.cancel(true));
1088 <        checkCompletedWithWrappedCancellationException(g);
1089 <    }
1090 <
1091 <    /**
1092 <     * thenAccept result completes normally after normal completion of source
1093 <     */
1094 <    public void testThenAccept() {
1095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1096 <        IncAction r = new IncAction();
1097 <        CompletableFuture<Void> g = f.thenAccept(r);
1098 <        f.complete(one);
1099 <        checkCompletedNormally(g, null);
1100 <        assertEquals(r.value, (Integer) 2);
1101 <    }
1102 <
1103 <    /**
1104 <     * thenAccept result completes exceptionally after exceptional
1105 <     * completion of source
1106 <     */
1107 <    public void testThenAccept2() {
1108 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1109 <        IncAction r = new IncAction();
1110 <        CompletableFuture<Void> g = f.thenAccept(r);
1111 <        f.completeExceptionally(new CFException());
1112 <        checkCompletedWithWrappedCFException(g);
1113 <    }
1114 <
1115 <    /**
1116 <     * thenAccept result completes exceptionally if action does
1117 <     */
1118 <    public void testThenAccept3() {
1119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1120 <        FailingConsumer r = new FailingConsumer();
1121 <        CompletableFuture<Void> g = f.thenAccept(r);
1122 <        f.complete(one);
1123 <        checkCompletedWithWrappedCFException(g);
1124 <        assertEquals(1, r.invocationCount);
1125 <    }
1126 <
1127 <    /**
1128 <     * thenAccept result completes exceptionally if source cancelled
1129 <     */
1130 <    public void testThenAccept4() {
1131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1132 <        IncAction r = new IncAction();
1133 <        CompletableFuture<Void> g = f.thenAccept(r);
1134 <        assertTrue(f.cancel(true));
1135 <        checkCompletedWithWrappedCancellationException(g);
1136 <    }
1137 <
1138 <    /**
1139 <     * thenCombine result completes normally after normal completion
1140 <     * of sources
1141 <     */
1142 <    public void testThenCombine_normalCompletion1() {
1143 <        for (boolean createIncomplete : new boolean[] { true, false })
1144 <        for (boolean fFirst : new boolean[] { true, false })
1158 >    public void testThenApply_normalCompletion() {
1159          for (ExecutionMode m : ExecutionMode.values())
1160 +        for (boolean createIncomplete : new boolean[] { true, false })
1161          for (Integer v1 : new Integer[] { 1, null })
1147        for (Integer v2 : new Integer[] { 2, null })
1162      {
1163          final CompletableFuture<Integer> f = new CompletableFuture<>();
1164 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1165 <        final SubtractFunction r = new SubtractFunction();
1166 <        CompletableFuture<Integer> h = null;
1167 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1168 <
1155 <        if (fFirst)
1156 <            f.complete(v1);
1157 <        else
1158 <            g.complete(v2);
1159 <        if (createIncomplete) checkIncomplete(h);
1160 <        assertEquals(0, r.invocationCount);
1161 <        if (!fFirst)
1164 >        final IncFunction r = new IncFunction(m);
1165 >        if (!createIncomplete) f.complete(v1);
1166 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1167 >        if (createIncomplete) {
1168 >            checkIncomplete(g);
1169              f.complete(v1);
1170 <        else
1164 <            g.complete(v2);
1165 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1170 >        }
1171  
1172 <        checkCompletedNormally(h, subtract(v1, v2));
1172 >        checkCompletedNormally(g, inc(v1));
1173          checkCompletedNormally(f, v1);
1174 <        checkCompletedNormally(g, v2);
1170 <        assertEquals(1, r.invocationCount);
1174 >        r.assertInvoked();
1175      }}
1176  
1177      /**
1178 <     * thenCombine result completes exceptionally after exceptional
1179 <     * completion of either source
1178 >     * thenApply result completes exceptionally after exceptional
1179 >     * completion of source
1180       */
1181 <    public void testThenCombine_exceptionalCompletion1() {
1181 >    public void testThenApply_exceptionalCompletion() {
1182          for (ExecutionMode m : ExecutionMode.values())
1183 <        for (Integer v1 : new Integer[] { 1, null })
1183 >        for (boolean createIncomplete : new boolean[] { true, false })
1184      {
1181        final CompletableFuture<Integer> f = new CompletableFuture<>();
1182        final CompletableFuture<Integer> g = new CompletableFuture<>();
1183        final SubtractFunction r = new SubtractFunction();
1184        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1185          final CFException ex = new CFException();
1186
1187        f.completeExceptionally(ex);
1188        checkIncomplete(h);
1189        g.complete(v1);
1190
1191        checkCompletedWithWrappedCFException(h, ex);
1192        checkCompletedWithWrappedCFException(f, ex);
1193        assertEquals(0, r.invocationCount);
1194        checkCompletedNormally(g, v1);
1195    }}
1196
1197    public void testThenCombine_exceptionalCompletion2() {
1198        for (ExecutionMode m : ExecutionMode.values())
1199        for (Integer v1 : new Integer[] { 1, null })
1200    {
1186          final CompletableFuture<Integer> f = new CompletableFuture<>();
1187 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1188 <        final SubtractFunction r = new SubtractFunction();
1189 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1190 <        final CFException ex = new CFException();
1191 <
1192 <        g.completeExceptionally(ex);
1193 <        checkIncomplete(h);
1209 <        f.complete(v1);
1187 >        final IncFunction r = new IncFunction(m);
1188 >        if (!createIncomplete) f.completeExceptionally(ex);
1189 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1190 >        if (createIncomplete) {
1191 >            checkIncomplete(g);
1192 >            f.completeExceptionally(ex);
1193 >        }
1194  
1211        checkCompletedWithWrappedCFException(h, ex);
1195          checkCompletedWithWrappedCFException(g, ex);
1196 <        assertEquals(0, r.invocationCount);
1197 <        checkCompletedNormally(f, v1);
1196 >        checkCompletedWithWrappedCFException(f, ex);
1197 >        r.assertNotInvoked();
1198      }}
1199  
1200 <    public void testThenCombine_exceptionalCompletion3() {
1200 >    /**
1201 >     * thenApply result completes exceptionally if source cancelled
1202 >     */
1203 >    public void testThenApply_sourceCancelled() {
1204          for (ExecutionMode m : ExecutionMode.values())
1205 <        for (Integer v1 : new Integer[] { 1, null })
1205 >        for (boolean createIncomplete : new boolean[] { true, false })
1206 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1207      {
1208          final CompletableFuture<Integer> f = new CompletableFuture<>();
1209 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1210 <        final SubtractFunction r = new SubtractFunction();
1211 <        final CFException ex = new CFException();
1212 <
1213 <        g.completeExceptionally(ex);
1214 <        f.complete(v1);
1215 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1209 >        final IncFunction r = new IncFunction(m);
1210 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1211 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1212 >        if (createIncomplete) {
1213 >            checkIncomplete(g);
1214 >            assertTrue(f.cancel(mayInterruptIfRunning));
1215 >        }
1216  
1217 <        checkCompletedWithWrappedCFException(h, ex);
1218 <        checkCompletedWithWrappedCFException(g, ex);
1219 <        assertEquals(0, r.invocationCount);
1233 <        checkCompletedNormally(f, v1);
1217 >        checkCompletedWithWrappedCancellationException(g);
1218 >        checkCancelled(f);
1219 >        r.assertNotInvoked();
1220      }}
1221  
1222 <    public void testThenCombine_exceptionalCompletion4() {
1222 >    /**
1223 >     * thenApply result completes exceptionally if action does
1224 >     */
1225 >    public void testThenApply_actionFailed() {
1226          for (ExecutionMode m : ExecutionMode.values())
1227 +        for (boolean createIncomplete : new boolean[] { true, false })
1228          for (Integer v1 : new Integer[] { 1, null })
1229      {
1230          final CompletableFuture<Integer> f = new CompletableFuture<>();
1231 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1232 <        final SubtractFunction r = new SubtractFunction();
1233 <        final CFException ex = new CFException();
1234 <
1235 <        f.completeExceptionally(ex);
1236 <        g.complete(v1);
1237 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1231 >        final FailingFunction r = new FailingFunction(m);
1232 >        if (!createIncomplete) f.complete(v1);
1233 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1234 >        if (createIncomplete) {
1235 >            checkIncomplete(g);
1236 >            f.complete(v1);
1237 >        }
1238  
1239 <        checkCompletedWithWrappedCFException(h, ex);
1240 <        checkCompletedWithWrappedCFException(f, ex);
1251 <        assertEquals(0, r.invocationCount);
1252 <        checkCompletedNormally(g, v1);
1239 >        checkCompletedWithWrappedCFException(g);
1240 >        checkCompletedNormally(f, v1);
1241      }}
1242  
1243      /**
1244 <     * thenCombine result completes exceptionally if action does
1244 >     * thenAccept result completes normally after normal completion of source
1245       */
1246 <    public void testThenCombine_actionFailed1() {
1246 >    public void testThenAccept_normalCompletion() {
1247          for (ExecutionMode m : ExecutionMode.values())
1248 +        for (boolean createIncomplete : new boolean[] { true, false })
1249          for (Integer v1 : new Integer[] { 1, null })
1261        for (Integer v2 : new Integer[] { 2, null })
1250      {
1251          final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1253 <        final FailingBiFunction r = new FailingBiFunction();
1254 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1255 <
1256 <        f.complete(v1);
1257 <        checkIncomplete(h);
1258 <        g.complete(v2);
1252 >        final NoopConsumer r = new NoopConsumer(m);
1253 >        if (!createIncomplete) f.complete(v1);
1254 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1255 >        if (createIncomplete) {
1256 >            checkIncomplete(g);
1257 >            f.complete(v1);
1258 >        }
1259  
1260 <        checkCompletedWithWrappedCFException(h);
1260 >        checkCompletedNormally(g, null);
1261 >        r.assertValue(v1);
1262          checkCompletedNormally(f, v1);
1274        checkCompletedNormally(g, v2);
1263      }}
1264  
1265 <    public void testThenCombine_actionFailed2() {
1265 >    /**
1266 >     * thenAccept result completes exceptionally after exceptional
1267 >     * completion of source
1268 >     */
1269 >    public void testThenAccept_exceptionalCompletion() {
1270          for (ExecutionMode m : ExecutionMode.values())
1271 <        for (Integer v1 : new Integer[] { 1, null })
1280 <        for (Integer v2 : new Integer[] { 2, null })
1271 >        for (boolean createIncomplete : new boolean[] { true, false })
1272      {
1273 +        final CFException ex = new CFException();
1274          final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1276 <        final FailingBiFunction r = new FailingBiFunction();
1277 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1278 <
1279 <        g.complete(v2);
1280 <        checkIncomplete(h);
1281 <        f.complete(v1);
1275 >        final NoopConsumer r = new NoopConsumer(m);
1276 >        if (!createIncomplete) f.completeExceptionally(ex);
1277 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1278 >        if (createIncomplete) {
1279 >            checkIncomplete(g);
1280 >            f.completeExceptionally(ex);
1281 >        }
1282  
1283 <        checkCompletedWithWrappedCFException(h);
1284 <        checkCompletedNormally(f, v1);
1285 <        checkCompletedNormally(g, v2);
1283 >        checkCompletedWithWrappedCFException(g, ex);
1284 >        checkCompletedWithWrappedCFException(f, ex);
1285 >        r.assertNotInvoked();
1286      }}
1287  
1288      /**
1289 <     * thenCombine result completes exceptionally if either source cancelled
1289 >     * thenAccept result completes exceptionally if source cancelled
1290       */
1291 <    public void testThenCombine_sourceCancelled1() {
1291 >    public void testThenAccept_sourceCancelled() {
1292          for (ExecutionMode m : ExecutionMode.values())
1293 +        for (boolean createIncomplete : new boolean[] { true, false })
1294          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1302        for (Integer v1 : new Integer[] { 1, null })
1295      {
1296          final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1298 <        final SubtractFunction r = new SubtractFunction();
1299 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1300 <
1301 <        assertTrue(f.cancel(mayInterruptIfRunning));
1302 <        checkIncomplete(h);
1303 <        g.complete(v1);
1297 >        final NoopConsumer r = new NoopConsumer(m);
1298 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1300 >        if (createIncomplete) {
1301 >            checkIncomplete(g);
1302 >            assertTrue(f.cancel(mayInterruptIfRunning));
1303 >        }
1304  
1305 <        checkCompletedWithWrappedCancellationException(h);
1305 >        checkCompletedWithWrappedCancellationException(g);
1306          checkCancelled(f);
1307 <        assertEquals(0, r.invocationCount);
1316 <        checkCompletedNormally(g, v1);
1307 >        r.assertNotInvoked();
1308      }}
1309  
1310 <    public void testThenCombine_sourceCancelled2() {
1310 >    /**
1311 >     * thenAccept result completes exceptionally if action does
1312 >     */
1313 >    public void testThenAccept_actionFailed() {
1314          for (ExecutionMode m : ExecutionMode.values())
1315 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1315 >        for (boolean createIncomplete : new boolean[] { true, false })
1316          for (Integer v1 : new Integer[] { 1, null })
1317      {
1318          final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1320 <        final SubtractFunction r = new SubtractFunction();
1321 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1322 <
1323 <        assertTrue(g.cancel(mayInterruptIfRunning));
1324 <        checkIncomplete(h);
1325 <        f.complete(v1);
1319 >        final FailingConsumer r = new FailingConsumer(m);
1320 >        if (!createIncomplete) f.complete(v1);
1321 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1322 >        if (createIncomplete) {
1323 >            checkIncomplete(g);
1324 >            f.complete(v1);
1325 >        }
1326  
1327 <        checkCompletedWithWrappedCancellationException(h);
1334 <        checkCancelled(g);
1335 <        assertEquals(0, r.invocationCount);
1327 >        checkCompletedWithWrappedCFException(g);
1328          checkCompletedNormally(f, v1);
1329      }}
1330  
1331 <    public void testThenCombine_sourceCancelled3() {
1331 >    /**
1332 >     * thenCombine result completes normally after normal completion
1333 >     * of sources
1334 >     */
1335 >    public void testThenCombine_normalCompletion() {
1336          for (ExecutionMode m : ExecutionMode.values())
1337 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1337 >        for (boolean createIncomplete : new boolean[] { true, false })
1338 >        for (boolean fFirst : new boolean[] { true, false })
1339          for (Integer v1 : new Integer[] { 1, null })
1340 +        for (Integer v2 : new Integer[] { 2, null })
1341      {
1342          final CompletableFuture<Integer> f = new CompletableFuture<>();
1343          final CompletableFuture<Integer> g = new CompletableFuture<>();
1344 <        final SubtractFunction r = new SubtractFunction();
1344 >        final SubtractFunction r = new SubtractFunction(m);
1345  
1346 <        assertTrue(g.cancel(mayInterruptIfRunning));
1347 <        f.complete(v1);
1346 >        if (fFirst) f.complete(v1); else g.complete(v2);
1347 >        if (!createIncomplete)
1348 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1349          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1350 +        if (createIncomplete) {
1351 +            checkIncomplete(h);
1352 +            r.assertNotInvoked();
1353 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1354 +        }
1355  
1356 <        checkCompletedWithWrappedCancellationException(h);
1353 <        checkCancelled(g);
1354 <        assertEquals(0, r.invocationCount);
1356 >        checkCompletedNormally(h, subtract(v1, v2));
1357          checkCompletedNormally(f, v1);
1358 +        checkCompletedNormally(g, v2);
1359 +        r.assertInvoked();
1360      }}
1361  
1362 <    public void testThenCombine_sourceCancelled4() {
1362 >    /**
1363 >     * thenCombine result completes exceptionally after exceptional
1364 >     * completion of either source
1365 >     */
1366 >    public void testThenCombine_exceptionalCompletion() {
1367          for (ExecutionMode m : ExecutionMode.values())
1368 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1368 >        for (boolean createIncomplete : new boolean[] { true, false })
1369 >        for (boolean fFirst : new boolean[] { true, false })
1370          for (Integer v1 : new Integer[] { 1, null })
1371      {
1372          final CompletableFuture<Integer> f = new CompletableFuture<>();
1373          final CompletableFuture<Integer> g = new CompletableFuture<>();
1374 <        final SubtractFunction r = new SubtractFunction();
1374 >        final CFException ex = new CFException();
1375 >        final SubtractFunction r = new SubtractFunction(m);
1376  
1377 <        assertTrue(f.cancel(mayInterruptIfRunning));
1378 <        g.complete(v1);
1377 >        (fFirst ? f : g).complete(v1);
1378 >        if (!createIncomplete)
1379 >            (!fFirst ? f : g).completeExceptionally(ex);
1380          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1381 +        if (createIncomplete) {
1382 +            checkIncomplete(h);
1383 +            (!fFirst ? f : g).completeExceptionally(ex);
1384 +        }
1385  
1386 <        checkCompletedWithWrappedCancellationException(h);
1387 <        checkCancelled(f);
1388 <        assertEquals(0, r.invocationCount);
1389 <        checkCompletedNormally(g, v1);
1386 >        checkCompletedWithWrappedCFException(h, ex);
1387 >        r.assertNotInvoked();
1388 >        checkCompletedNormally(fFirst ? f : g, v1);
1389 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1390      }}
1391  
1392      /**
1393 <     * thenAcceptBoth result completes normally after normal
1379 <     * completion of sources
1393 >     * thenCombine result completes exceptionally if either source cancelled
1394       */
1395 <    public void testThenAcceptBoth_normalCompletion1() {
1382 <        for (ExecutionMode m : ExecutionMode.values())
1383 <        for (Integer v1 : new Integer[] { 1, null })
1384 <        for (Integer v2 : new Integer[] { 2, null })
1385 <    {
1386 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1387 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1388 <        final SubtractAction r = new SubtractAction();
1389 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1390 <
1391 <        f.complete(v1);
1392 <        checkIncomplete(h);
1393 <        assertEquals(0, r.invocationCount);
1394 <        g.complete(v2);
1395 <
1396 <        checkCompletedNormally(h, null);
1397 <        assertEquals(subtract(v1, v2), r.value);
1398 <        checkCompletedNormally(f, v1);
1399 <        checkCompletedNormally(g, v2);
1400 <    }}
1401 <
1402 <    public void testThenAcceptBoth_normalCompletion2() {
1395 >    public void testThenCombine_sourceCancelled() {
1396          for (ExecutionMode m : ExecutionMode.values())
1397 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1398 +        for (boolean createIncomplete : new boolean[] { true, false })
1399 +        for (boolean fFirst : new boolean[] { true, false })
1400          for (Integer v1 : new Integer[] { 1, null })
1405        for (Integer v2 : new Integer[] { 2, null })
1401      {
1402          final CompletableFuture<Integer> f = new CompletableFuture<>();
1403          final CompletableFuture<Integer> g = new CompletableFuture<>();
1404 <        final SubtractAction r = new SubtractAction();
1410 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1404 >        final SubtractFunction r = new SubtractFunction(m);
1405  
1406 <        g.complete(v2);
1407 <        checkIncomplete(h);
1408 <        assertEquals(0, r.invocationCount);
1409 <        f.complete(v1);
1406 >        (fFirst ? f : g).complete(v1);
1407 >        if (!createIncomplete)
1408 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1409 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1410 >        if (createIncomplete) {
1411 >            checkIncomplete(h);
1412 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1413 >        }
1414  
1415 <        checkCompletedNormally(h, null);
1416 <        assertEquals(subtract(v1, v2), r.value);
1417 <        checkCompletedNormally(f, v1);
1418 <        checkCompletedNormally(g, v2);
1415 >        checkCompletedWithWrappedCancellationException(h);
1416 >        checkCancelled(!fFirst ? f : g);
1417 >        r.assertNotInvoked();
1418 >        checkCompletedNormally(fFirst ? f : g, v1);
1419      }}
1420  
1421 <    public void testThenAcceptBoth_normalCompletion3() {
1421 >    /**
1422 >     * thenCombine result completes exceptionally if action does
1423 >     */
1424 >    public void testThenCombine_actionFailed() {
1425          for (ExecutionMode m : ExecutionMode.values())
1426 +        for (boolean fFirst : new boolean[] { true, false })
1427          for (Integer v1 : new Integer[] { 1, null })
1428          for (Integer v2 : new Integer[] { 2, null })
1429      {
1430          final CompletableFuture<Integer> f = new CompletableFuture<>();
1431          final CompletableFuture<Integer> g = new CompletableFuture<>();
1432 <        final SubtractAction r = new SubtractAction();
1432 >        final FailingBiFunction r = new FailingBiFunction(m);
1433 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1434  
1435 <        g.complete(v2);
1436 <        f.complete(v1);
1437 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1435 >        if (fFirst) {
1436 >            f.complete(v1);
1437 >            g.complete(v2);
1438 >        } else {
1439 >            g.complete(v2);
1440 >            f.complete(v1);
1441 >        }
1442  
1443 <        checkCompletedNormally(h, null);
1437 <        assertEquals(subtract(v1, v2), r.value);
1443 >        checkCompletedWithWrappedCFException(h);
1444          checkCompletedNormally(f, v1);
1445          checkCompletedNormally(g, v2);
1446      }}
1447  
1448 <    public void testThenAcceptBoth_normalCompletion4() {
1448 >    /**
1449 >     * thenAcceptBoth result completes normally after normal
1450 >     * completion of sources
1451 >     */
1452 >    public void testThenAcceptBoth_normalCompletion() {
1453          for (ExecutionMode m : ExecutionMode.values())
1454 +        for (boolean createIncomplete : new boolean[] { true, false })
1455 +        for (boolean fFirst : new boolean[] { true, false })
1456          for (Integer v1 : new Integer[] { 1, null })
1457          for (Integer v2 : new Integer[] { 2, null })
1458      {
1459          final CompletableFuture<Integer> f = new CompletableFuture<>();
1460          final CompletableFuture<Integer> g = new CompletableFuture<>();
1461 <        final SubtractAction r = new SubtractAction();
1461 >        final SubtractAction r = new SubtractAction(m);
1462  
1463 <        f.complete(v1);
1464 <        g.complete(v2);
1463 >        if (fFirst) f.complete(v1); else g.complete(v2);
1464 >        if (!createIncomplete)
1465 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1466          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1467 +        if (createIncomplete) {
1468 +            checkIncomplete(h);
1469 +            r.assertNotInvoked();
1470 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1471 +        }
1472  
1473          checkCompletedNormally(h, null);
1474 <        assertEquals(subtract(v1, v2), r.value);
1474 >        r.assertValue(subtract(v1, v2));
1475          checkCompletedNormally(f, v1);
1476          checkCompletedNormally(g, v2);
1477      }}
# Line 1462 | Line 1480 | public class CompletableFutureTest exten
1480       * thenAcceptBoth result completes exceptionally after exceptional
1481       * completion of either source
1482       */
1483 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1466 <        for (ExecutionMode m : ExecutionMode.values())
1467 <        for (Integer v1 : new Integer[] { 1, null })
1468 <    {
1469 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471 <        final SubtractAction r = new SubtractAction();
1472 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1473 <        final CFException ex = new CFException();
1474 <
1475 <        f.completeExceptionally(ex);
1476 <        checkIncomplete(h);
1477 <        g.complete(v1);
1478 <
1479 <        checkCompletedWithWrappedCFException(h, ex);
1480 <        checkCompletedWithWrappedCFException(f, ex);
1481 <        assertEquals(0, r.invocationCount);
1482 <        checkCompletedNormally(g, v1);
1483 <    }}
1484 <
1485 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1486 <        for (ExecutionMode m : ExecutionMode.values())
1487 <        for (Integer v1 : new Integer[] { 1, null })
1488 <    {
1489 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1490 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1491 <        final SubtractAction r = new SubtractAction();
1492 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1493 <        final CFException ex = new CFException();
1494 <
1495 <        g.completeExceptionally(ex);
1496 <        checkIncomplete(h);
1497 <        f.complete(v1);
1498 <
1499 <        checkCompletedWithWrappedCFException(h, ex);
1500 <        checkCompletedWithWrappedCFException(g, ex);
1501 <        assertEquals(0, r.invocationCount);
1502 <        checkCompletedNormally(f, v1);
1503 <    }}
1504 <
1505 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1483 >    public void testThenAcceptBoth_exceptionalCompletion() {
1484          for (ExecutionMode m : ExecutionMode.values())
1485 +        for (boolean createIncomplete : new boolean[] { true, false })
1486 +        for (boolean fFirst : new boolean[] { true, false })
1487          for (Integer v1 : new Integer[] { 1, null })
1488      {
1489          final CompletableFuture<Integer> f = new CompletableFuture<>();
1490          final CompletableFuture<Integer> g = new CompletableFuture<>();
1511        final SubtractAction r = new SubtractAction();
1491          final CFException ex = new CFException();
1492 +        final SubtractAction r = new SubtractAction(m);
1493  
1494 <        g.completeExceptionally(ex);
1495 <        f.complete(v1);
1494 >        (fFirst ? f : g).complete(v1);
1495 >        if (!createIncomplete)
1496 >            (!fFirst ? f : g).completeExceptionally(ex);
1497          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1498 +        if (createIncomplete) {
1499 +            checkIncomplete(h);
1500 +            (!fFirst ? f : g).completeExceptionally(ex);
1501 +        }
1502  
1503          checkCompletedWithWrappedCFException(h, ex);
1504 <        checkCompletedWithWrappedCFException(g, ex);
1505 <        assertEquals(0, r.invocationCount);
1506 <        checkCompletedNormally(f, v1);
1504 >        r.assertNotInvoked();
1505 >        checkCompletedNormally(fFirst ? f : g, v1);
1506 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1507      }}
1508  
1509 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1509 >    /**
1510 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1511 >     */
1512 >    public void testThenAcceptBoth_sourceCancelled() {
1513          for (ExecutionMode m : ExecutionMode.values())
1514 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1515 +        for (boolean createIncomplete : new boolean[] { true, false })
1516 +        for (boolean fFirst : new boolean[] { true, false })
1517          for (Integer v1 : new Integer[] { 1, null })
1518      {
1519          final CompletableFuture<Integer> f = new CompletableFuture<>();
1520          final CompletableFuture<Integer> g = new CompletableFuture<>();
1521 <        final SubtractAction r = new SubtractAction();
1531 <        final CFException ex = new CFException();
1521 >        final SubtractAction r = new SubtractAction(m);
1522  
1523 <        f.completeExceptionally(ex);
1524 <        g.complete(v1);
1523 >        (fFirst ? f : g).complete(v1);
1524 >        if (!createIncomplete)
1525 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1526          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1527 +        if (createIncomplete) {
1528 +            checkIncomplete(h);
1529 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1530 +        }
1531  
1532 <        checkCompletedWithWrappedCFException(h, ex);
1533 <        checkCompletedWithWrappedCFException(f, ex);
1534 <        assertEquals(0, r.invocationCount);
1535 <        checkCompletedNormally(g, v1);
1532 >        checkCompletedWithWrappedCancellationException(h);
1533 >        checkCancelled(!fFirst ? f : g);
1534 >        r.assertNotInvoked();
1535 >        checkCompletedNormally(fFirst ? f : g, v1);
1536      }}
1537  
1538      /**
1539       * thenAcceptBoth result completes exceptionally if action does
1540       */
1541 <    public void testThenAcceptBoth_actionFailed1() {
1547 <        for (ExecutionMode m : ExecutionMode.values())
1548 <        for (Integer v1 : new Integer[] { 1, null })
1549 <        for (Integer v2 : new Integer[] { 2, null })
1550 <    {
1551 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1552 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1553 <        final FailingBiConsumer r = new FailingBiConsumer();
1554 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1555 <
1556 <        f.complete(v1);
1557 <        checkIncomplete(h);
1558 <        g.complete(v2);
1559 <
1560 <        checkCompletedWithWrappedCFException(h);
1561 <        checkCompletedNormally(f, v1);
1562 <        checkCompletedNormally(g, v2);
1563 <    }}
1564 <
1565 <    public void testThenAcceptBoth_actionFailed2() {
1541 >    public void testThenAcceptBoth_actionFailed() {
1542          for (ExecutionMode m : ExecutionMode.values())
1543 +        for (boolean fFirst : new boolean[] { true, false })
1544          for (Integer v1 : new Integer[] { 1, null })
1545          for (Integer v2 : new Integer[] { 2, null })
1546      {
1547          final CompletableFuture<Integer> f = new CompletableFuture<>();
1548          final CompletableFuture<Integer> g = new CompletableFuture<>();
1549 <        final FailingBiConsumer r = new FailingBiConsumer();
1549 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1550          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551  
1552 <        g.complete(v2);
1553 <        checkIncomplete(h);
1554 <        f.complete(v1);
1552 >        if (fFirst) {
1553 >            f.complete(v1);
1554 >            g.complete(v2);
1555 >        } else {
1556 >            g.complete(v2);
1557 >            f.complete(v1);
1558 >        }
1559  
1560          checkCompletedWithWrappedCFException(h);
1561          checkCompletedNormally(f, v1);
# Line 1582 | Line 1563 | public class CompletableFutureTest exten
1563      }}
1564  
1565      /**
1585     * thenAcceptBoth result completes exceptionally if either source cancelled
1586     */
1587    public void testThenAcceptBoth_sourceCancelled1() {
1588        for (ExecutionMode m : ExecutionMode.values())
1589        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1590        for (Integer v1 : new Integer[] { 1, null })
1591    {
1592        final CompletableFuture<Integer> f = new CompletableFuture<>();
1593        final CompletableFuture<Integer> g = new CompletableFuture<>();
1594        final SubtractAction r = new SubtractAction();
1595        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1596
1597        assertTrue(f.cancel(mayInterruptIfRunning));
1598        checkIncomplete(h);
1599        g.complete(v1);
1600
1601        checkCompletedWithWrappedCancellationException(h);
1602        checkCancelled(f);
1603        assertEquals(0, r.invocationCount);
1604        checkCompletedNormally(g, v1);
1605    }}
1606
1607    public void testThenAcceptBoth_sourceCancelled2() {
1608        for (ExecutionMode m : ExecutionMode.values())
1609        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1610        for (Integer v1 : new Integer[] { 1, null })
1611    {
1612        final CompletableFuture<Integer> f = new CompletableFuture<>();
1613        final CompletableFuture<Integer> g = new CompletableFuture<>();
1614        final SubtractAction r = new SubtractAction();
1615        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1616
1617        assertTrue(g.cancel(mayInterruptIfRunning));
1618        checkIncomplete(h);
1619        f.complete(v1);
1620
1621        checkCompletedWithWrappedCancellationException(h);
1622        checkCancelled(g);
1623        assertEquals(0, r.invocationCount);
1624        checkCompletedNormally(f, v1);
1625    }}
1626
1627    public void testThenAcceptBoth_sourceCancelled3() {
1628        for (ExecutionMode m : ExecutionMode.values())
1629        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1630        for (Integer v1 : new Integer[] { 1, null })
1631    {
1632        final CompletableFuture<Integer> f = new CompletableFuture<>();
1633        final CompletableFuture<Integer> g = new CompletableFuture<>();
1634        final SubtractAction r = new SubtractAction();
1635
1636        assertTrue(g.cancel(mayInterruptIfRunning));
1637        f.complete(v1);
1638        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1639
1640        checkCompletedWithWrappedCancellationException(h);
1641        checkCancelled(g);
1642        assertEquals(0, r.invocationCount);
1643        checkCompletedNormally(f, v1);
1644    }}
1645
1646    public void testThenAcceptBoth_sourceCancelled4() {
1647        for (ExecutionMode m : ExecutionMode.values())
1648        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1649        for (Integer v1 : new Integer[] { 1, null })
1650    {
1651        final CompletableFuture<Integer> f = new CompletableFuture<>();
1652        final CompletableFuture<Integer> g = new CompletableFuture<>();
1653        final SubtractAction r = new SubtractAction();
1654
1655        assertTrue(f.cancel(mayInterruptIfRunning));
1656        g.complete(v1);
1657        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1658
1659        checkCompletedWithWrappedCancellationException(h);
1660        checkCancelled(f);
1661        assertEquals(0, r.invocationCount);
1662        checkCompletedNormally(g, v1);
1663    }}
1664
1665    /**
1566       * runAfterBoth result completes normally after normal
1567       * completion of sources
1568       */
1569 <    public void testRunAfterBoth_normalCompletion1() {
1670 <        for (ExecutionMode m : ExecutionMode.values())
1671 <        for (Integer v1 : new Integer[] { 1, null })
1672 <        for (Integer v2 : new Integer[] { 2, null })
1673 <    {
1674 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1675 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1676 <        final Noop r = new Noop();
1677 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1678 <
1679 <        f.complete(v1);
1680 <        checkIncomplete(h);
1681 <        assertEquals(0, r.invocationCount);
1682 <        g.complete(v2);
1683 <
1684 <        checkCompletedNormally(h, null);
1685 <        assertEquals(1, r.invocationCount);
1686 <        checkCompletedNormally(f, v1);
1687 <        checkCompletedNormally(g, v2);
1688 <    }}
1689 <
1690 <    public void testRunAfterBoth_normalCompletion2() {
1691 <        for (ExecutionMode m : ExecutionMode.values())
1692 <        for (Integer v1 : new Integer[] { 1, null })
1693 <        for (Integer v2 : new Integer[] { 2, null })
1694 <    {
1695 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1696 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final Noop r = new Noop();
1698 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1699 <
1700 <        g.complete(v2);
1701 <        checkIncomplete(h);
1702 <        assertEquals(0, r.invocationCount);
1703 <        f.complete(v1);
1704 <
1705 <        checkCompletedNormally(h, null);
1706 <        assertEquals(1, r.invocationCount);
1707 <        checkCompletedNormally(f, v1);
1708 <        checkCompletedNormally(g, v2);
1709 <    }}
1710 <
1711 <    public void testRunAfterBoth_normalCompletion3() {
1712 <        for (ExecutionMode m : ExecutionMode.values())
1713 <        for (Integer v1 : new Integer[] { 1, null })
1714 <        for (Integer v2 : new Integer[] { 2, null })
1715 <    {
1716 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1717 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1718 <        final Noop r = new Noop();
1719 <
1720 <        g.complete(v2);
1721 <        f.complete(v1);
1722 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1723 <
1724 <        checkCompletedNormally(h, null);
1725 <        assertEquals(1, r.invocationCount);
1726 <        checkCompletedNormally(f, v1);
1727 <        checkCompletedNormally(g, v2);
1728 <    }}
1729 <
1730 <    public void testRunAfterBoth_normalCompletion4() {
1569 >    public void testRunAfterBoth_normalCompletion() {
1570          for (ExecutionMode m : ExecutionMode.values())
1571 +        for (boolean createIncomplete : new boolean[] { true, false })
1572 +        for (boolean fFirst : new boolean[] { true, false })
1573          for (Integer v1 : new Integer[] { 1, null })
1574          for (Integer v2 : new Integer[] { 2, null })
1575      {
1576          final CompletableFuture<Integer> f = new CompletableFuture<>();
1577          final CompletableFuture<Integer> g = new CompletableFuture<>();
1578 <        final Noop r = new Noop();
1578 >        final Noop r = new Noop(m);
1579  
1580 <        f.complete(v1);
1581 <        g.complete(v2);
1580 >        if (fFirst) f.complete(v1); else g.complete(v2);
1581 >        if (!createIncomplete)
1582 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1583          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584 +        if (createIncomplete) {
1585 +            checkIncomplete(h);
1586 +            r.assertNotInvoked();
1587 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1588 +        }
1589  
1590          checkCompletedNormally(h, null);
1591 <        assertEquals(1, r.invocationCount);
1591 >        r.assertInvoked();
1592          checkCompletedNormally(f, v1);
1593          checkCompletedNormally(g, v2);
1594      }}
# Line 1750 | Line 1597 | public class CompletableFutureTest exten
1597       * runAfterBoth result completes exceptionally after exceptional
1598       * completion of either source
1599       */
1600 <    public void testRunAfterBoth_exceptionalCompletion1() {
1754 <        for (ExecutionMode m : ExecutionMode.values())
1755 <        for (Integer v1 : new Integer[] { 1, null })
1756 <    {
1757 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1758 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1759 <        final Noop r = new Noop();
1760 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1761 <        final CFException ex = new CFException();
1762 <
1763 <        f.completeExceptionally(ex);
1764 <        checkIncomplete(h);
1765 <        g.complete(v1);
1766 <
1767 <        checkCompletedWithWrappedCFException(h, ex);
1768 <        checkCompletedWithWrappedCFException(f, ex);
1769 <        assertEquals(0, r.invocationCount);
1770 <        checkCompletedNormally(g, v1);
1771 <    }}
1772 <
1773 <    public void testRunAfterBoth_exceptionalCompletion2() {
1774 <        for (ExecutionMode m : ExecutionMode.values())
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 Noop r = new Noop();
1780 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1781 <        final CFException ex = new CFException();
1782 <
1783 <        g.completeExceptionally(ex);
1784 <        checkIncomplete(h);
1785 <        f.complete(v1);
1786 <
1787 <        checkCompletedWithWrappedCFException(h, ex);
1788 <        checkCompletedWithWrappedCFException(g, ex);
1789 <        assertEquals(0, r.invocationCount);
1790 <        checkCompletedNormally(f, v1);
1791 <    }}
1792 <
1793 <    public void testRunAfterBoth_exceptionalCompletion3() {
1794 <        for (ExecutionMode m : ExecutionMode.values())
1795 <        for (Integer v1 : new Integer[] { 1, null })
1796 <    {
1797 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1798 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1799 <        final Noop r = new Noop();
1800 <        final CFException ex = new CFException();
1801 <
1802 <        g.completeExceptionally(ex);
1803 <        f.complete(v1);
1804 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1805 <
1806 <        checkCompletedWithWrappedCFException(h, ex);
1807 <        checkCompletedWithWrappedCFException(g, ex);
1808 <        assertEquals(0, r.invocationCount);
1809 <        checkCompletedNormally(f, v1);
1810 <    }}
1811 <
1812 <    public void testRunAfterBoth_exceptionalCompletion4() {
1600 >    public void testRunAfterBoth_exceptionalCompletion() {
1601          for (ExecutionMode m : ExecutionMode.values())
1602 +        for (boolean createIncomplete : new boolean[] { true, false })
1603 +        for (boolean fFirst : new boolean[] { true, false })
1604          for (Integer v1 : new Integer[] { 1, null })
1605      {
1606          final CompletableFuture<Integer> f = new CompletableFuture<>();
1607          final CompletableFuture<Integer> g = new CompletableFuture<>();
1818        final Noop r = new Noop();
1608          final CFException ex = new CFException();
1609 +        final Noop r = new Noop(m);
1610  
1611 <        f.completeExceptionally(ex);
1612 <        g.complete(v1);
1611 >        (fFirst ? f : g).complete(v1);
1612 >        if (!createIncomplete)
1613 >            (!fFirst ? f : g).completeExceptionally(ex);
1614          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1615 +        if (createIncomplete) {
1616 +            checkIncomplete(h);
1617 +            (!fFirst ? f : g).completeExceptionally(ex);
1618 +        }
1619  
1620          checkCompletedWithWrappedCFException(h, ex);
1621 <        checkCompletedWithWrappedCFException(f, ex);
1622 <        assertEquals(0, r.invocationCount);
1623 <        checkCompletedNormally(g, v1);
1829 <    }}
1830 <
1831 <    /**
1832 <     * runAfterBoth result completes exceptionally if action does
1833 <     */
1834 <    public void testRunAfterBoth_actionFailed1() {
1835 <        for (ExecutionMode m : ExecutionMode.values())
1836 <        for (Integer v1 : new Integer[] { 1, null })
1837 <        for (Integer v2 : new Integer[] { 2, null })
1838 <    {
1839 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1840 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1841 <        final FailingNoop r = new FailingNoop();
1842 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1843 <
1844 <        f.complete(v1);
1845 <        checkIncomplete(h);
1846 <        g.complete(v2);
1847 <
1848 <        checkCompletedWithWrappedCFException(h);
1849 <        checkCompletedNormally(f, v1);
1850 <        checkCompletedNormally(g, v2);
1851 <    }}
1852 <
1853 <    public void testRunAfterBoth_actionFailed2() {
1854 <        for (ExecutionMode m : ExecutionMode.values())
1855 <        for (Integer v1 : new Integer[] { 1, null })
1856 <        for (Integer v2 : new Integer[] { 2, null })
1857 <    {
1858 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1859 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1860 <        final FailingNoop r = new FailingNoop();
1861 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1862 <
1863 <        g.complete(v2);
1864 <        checkIncomplete(h);
1865 <        f.complete(v1);
1866 <
1867 <        checkCompletedWithWrappedCFException(h);
1868 <        checkCompletedNormally(f, v1);
1869 <        checkCompletedNormally(g, v2);
1621 >        r.assertNotInvoked();
1622 >        checkCompletedNormally(fFirst ? f : g, v1);
1623 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1624      }}
1625  
1626      /**
1627       * runAfterBoth result completes exceptionally if either source cancelled
1628       */
1629 <    public void testRunAfterBoth_sourceCancelled1() {
1629 >    public void testRunAfterBoth_sourceCancelled() {
1630          for (ExecutionMode m : ExecutionMode.values())
1631          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1632 +        for (boolean createIncomplete : new boolean[] { true, false })
1633 +        for (boolean fFirst : new boolean[] { true, false })
1634          for (Integer v1 : new Integer[] { 1, null })
1635      {
1636          final CompletableFuture<Integer> f = new CompletableFuture<>();
1637          final CompletableFuture<Integer> g = new CompletableFuture<>();
1638 <        final Noop r = new Noop();
1883 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1638 >        final Noop r = new Noop(m);
1639  
1885        assertTrue(f.cancel(mayInterruptIfRunning));
1886        checkIncomplete(h);
1887        g.complete(v1);
1888
1889        checkCompletedWithWrappedCancellationException(h);
1890        checkCancelled(f);
1891        assertEquals(0, r.invocationCount);
1892        checkCompletedNormally(g, v1);
1893    }}
1640  
1641 <    public void testRunAfterBoth_sourceCancelled2() {
1642 <        for (ExecutionMode m : ExecutionMode.values())
1643 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1898 <        for (Integer v1 : new Integer[] { 1, null })
1899 <    {
1900 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1901 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1902 <        final Noop r = new Noop();
1641 >        (fFirst ? f : g).complete(v1);
1642 >        if (!createIncomplete)
1643 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1644          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1645 <
1646 <        assertTrue(g.cancel(mayInterruptIfRunning));
1647 <        checkIncomplete(h);
1648 <        f.complete(v1);
1645 >        if (createIncomplete) {
1646 >            checkIncomplete(h);
1647 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1648 >        }
1649  
1650          checkCompletedWithWrappedCancellationException(h);
1651 <        checkCancelled(g);
1652 <        assertEquals(0, r.invocationCount);
1653 <        checkCompletedNormally(f, v1);
1651 >        checkCancelled(!fFirst ? f : g);
1652 >        r.assertNotInvoked();
1653 >        checkCompletedNormally(fFirst ? f : g, v1);
1654      }}
1655  
1656 <    public void testRunAfterBoth_sourceCancelled3() {
1656 >    /**
1657 >     * runAfterBoth result completes exceptionally if action does
1658 >     */
1659 >    public void testRunAfterBoth_actionFailed() {
1660          for (ExecutionMode m : ExecutionMode.values())
1661 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1661 >        for (boolean fFirst : new boolean[] { true, false })
1662          for (Integer v1 : new Integer[] { 1, null })
1663 +        for (Integer v2 : new Integer[] { 2, null })
1664      {
1665          final CompletableFuture<Integer> f = new CompletableFuture<>();
1666          final CompletableFuture<Integer> g = new CompletableFuture<>();
1667 <        final Noop r = new Noop();
1667 >        final FailingRunnable r1 = new FailingRunnable(m);
1668 >        final FailingRunnable r2 = new FailingRunnable(m);
1669  
1670 <        assertTrue(g.cancel(mayInterruptIfRunning));
1671 <        f.complete(v1);
1672 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1671 >        if (fFirst) {
1672 >            f.complete(v1);
1673 >            g.complete(v2);
1674 >        } else {
1675 >            g.complete(v2);
1676 >            f.complete(v1);
1677 >        }
1678 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1679  
1680 <        checkCompletedWithWrappedCancellationException(h);
1681 <        checkCancelled(g);
1930 <        assertEquals(0, r.invocationCount);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682          checkCompletedNormally(f, v1);
1683 <    }}
1933 <
1934 <    public void testRunAfterBoth_sourceCancelled4() {
1935 <        for (ExecutionMode m : ExecutionMode.values())
1936 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1937 <        for (Integer v1 : new Integer[] { 1, null })
1938 <    {
1939 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1940 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1941 <        final Noop r = new Noop();
1942 <
1943 <        assertTrue(f.cancel(mayInterruptIfRunning));
1944 <        g.complete(v1);
1945 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1946 <
1947 <        checkCompletedWithWrappedCancellationException(h);
1948 <        checkCancelled(f);
1949 <        assertEquals(0, r.invocationCount);
1950 <        checkCompletedNormally(g, v1);
1683 >        checkCompletedNormally(g, v2);
1684      }}
1685  
1686      /**
1687       * applyToEither result completes normally after normal completion
1688       * of either source
1689       */
1690 <    public void testApplyToEither_normalCompletion1() {
1690 >    public void testApplyToEither_normalCompletion() {
1691          for (ExecutionMode m : ExecutionMode.values())
1692          for (Integer v1 : new Integer[] { 1, null })
1693          for (Integer v2 : new Integer[] { 2, null })
1694      {
1695          final CompletableFuture<Integer> f = new CompletableFuture<>();
1696          final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final IncFunction r = new IncFunction();
1698 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1697 >        final IncFunction[] rs = new IncFunction[6];
1698 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1699  
1700 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1701 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1702 +        checkIncomplete(h0);
1703 +        checkIncomplete(h1);
1704 +        rs[0].assertNotInvoked();
1705 +        rs[1].assertNotInvoked();
1706          f.complete(v1);
1707 <        checkCompletedNormally(h, inc(v1));
1708 <        g.complete(v2);
1709 <
1710 <        checkCompletedNormally(f, v1);
1711 <        checkCompletedNormally(g, v2);
1712 <        checkCompletedNormally(h, inc(v1));
1974 <    }}
1975 <
1976 <    public void testApplyToEither_normalCompletion2() {
1977 <        for (ExecutionMode m : ExecutionMode.values())
1978 <        for (Integer v1 : new Integer[] { 1, null })
1979 <        for (Integer v2 : new Integer[] { 2, null })
1980 <    {
1981 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1982 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1983 <        final IncFunction r = new IncFunction();
1984 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1985 <
1707 >        checkCompletedNormally(h0, inc(v1));
1708 >        checkCompletedNormally(h1, inc(v1));
1709 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1710 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1711 >        checkCompletedNormally(h2, inc(v1));
1712 >        checkCompletedNormally(h3, inc(v1));
1713          g.complete(v2);
1987        checkCompletedNormally(h, inc(v2));
1988        f.complete(v1);
1714  
1715 <        checkCompletedNormally(f, v1);
1716 <        checkCompletedNormally(g, v2);
1717 <        checkCompletedNormally(h, inc(v2));
1718 <        }}
1719 <
1720 <    public void testApplyToEither_normalCompletion3() {
1721 <        for (ExecutionMode m : ExecutionMode.values())
1722 <        for (Integer v1 : new Integer[] { 1, null })
1723 <        for (Integer v2 : new Integer[] { 2, null })
1999 <    {
2000 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 <        final IncFunction r = new IncFunction();
2003 <
2004 <        f.complete(v1);
2005 <        g.complete(v2);
2006 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1715 >        // unspecified behavior - both source completions available
1716 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1717 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1718 >        rs[4].assertValue(h4.join());
1719 >        rs[5].assertValue(h5.join());
1720 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1721 >                   Objects.equals(inc(v2), h4.join()));
1722 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1723 >                   Objects.equals(inc(v2), h5.join()));
1724  
1725          checkCompletedNormally(f, v1);
1726          checkCompletedNormally(g, v2);
1727 <
1728 <        // unspecified behavior
1729 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1730 <                   Objects.equals(h.join(), inc(v2)));
1731 <        assertEquals(1, r.invocationCount);
1727 >        checkCompletedNormally(h0, inc(v1));
1728 >        checkCompletedNormally(h1, inc(v1));
1729 >        checkCompletedNormally(h2, inc(v1));
1730 >        checkCompletedNormally(h3, inc(v1));
1731 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1732      }}
1733  
1734      /**
1735       * applyToEither result completes exceptionally after exceptional
1736       * completion of either source
1737       */
1738 <    public void testApplyToEither_exceptionalCompletion1() {
1738 >    public void testApplyToEither_exceptionalCompletion() {
1739          for (ExecutionMode m : ExecutionMode.values())
1740          for (Integer v1 : new Integer[] { 1, null })
1741      {
1742          final CompletableFuture<Integer> f = new CompletableFuture<>();
1743          final CompletableFuture<Integer> g = new CompletableFuture<>();
2027        final IncFunction r = new IncFunction();
2028        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1744          final CFException ex = new CFException();
1745 +        final IncFunction[] rs = new IncFunction[6];
1746 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1747  
1748 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1749 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1750 +        checkIncomplete(h0);
1751 +        checkIncomplete(h1);
1752 +        rs[0].assertNotInvoked();
1753 +        rs[1].assertNotInvoked();
1754          f.completeExceptionally(ex);
1755 <        checkCompletedWithWrappedCFException(h, ex);
1755 >        checkCompletedWithWrappedCFException(h0, ex);
1756 >        checkCompletedWithWrappedCFException(h1, ex);
1757 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1758 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1759 >        checkCompletedWithWrappedCFException(h2, ex);
1760 >        checkCompletedWithWrappedCFException(h3, ex);
1761          g.complete(v1);
1762  
1763 <        assertEquals(0, r.invocationCount);
1764 <        checkCompletedNormally(g, v1);
1765 <        checkCompletedWithWrappedCFException(f, ex);
2038 <        checkCompletedWithWrappedCFException(h, ex);
2039 <    }}
2040 <
2041 <    public void testApplyToEither_exceptionalCompletion2() {
2042 <        for (ExecutionMode m : ExecutionMode.values())
2043 <        for (Integer v1 : new Integer[] { 1, null })
2044 <    {
2045 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2046 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2047 <        final IncFunction r = new IncFunction();
2048 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2049 <        final CFException ex = new CFException();
2050 <
2051 <        g.completeExceptionally(ex);
2052 <        checkCompletedWithWrappedCFException(h, ex);
2053 <        f.complete(v1);
2054 <
2055 <        assertEquals(0, r.invocationCount);
2056 <        checkCompletedNormally(f, v1);
2057 <        checkCompletedWithWrappedCFException(g, ex);
2058 <        checkCompletedWithWrappedCFException(h, ex);
2059 <    }}
2060 <
2061 <    public void testApplyToEither_exceptionalCompletion3() {
2062 <        for (ExecutionMode m : ExecutionMode.values())
2063 <        for (Integer v1 : new Integer[] { 1, null })
2064 <    {
2065 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2066 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2067 <        final IncFunction r = new IncFunction();
2068 <        final CFException ex = new CFException();
2069 <
2070 <        g.completeExceptionally(ex);
2071 <        f.complete(v1);
2072 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2073 <
2074 <        // unspecified behavior
2075 <        Integer v;
1763 >        // unspecified behavior - both source completions available
1764 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1765 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1766          try {
1767 <            assertEquals(inc(v1), h.join());
1768 <            assertEquals(1, r.invocationCount);
1767 >            assertEquals(inc(v1), h4.join());
1768 >            rs[4].assertInvoked();
1769          } catch (CompletionException ok) {
1770 <            checkCompletedWithWrappedCFException(h, ex);
1771 <            assertEquals(0, r.invocationCount);
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772          }
2083
2084        checkCompletedWithWrappedCFException(g, ex);
2085        checkCompletedNormally(f, v1);
2086    }}
2087
2088    public void testApplyToEither_exceptionalCompletion4() {
2089        for (ExecutionMode m : ExecutionMode.values())
2090        for (Integer v1 : new Integer[] { 1, null })
2091    {
2092        final CompletableFuture<Integer> f = new CompletableFuture<>();
2093        final CompletableFuture<Integer> g = new CompletableFuture<>();
2094        final IncFunction r = new IncFunction();
2095        final CFException ex = new CFException();
2096
2097        f.completeExceptionally(ex);
2098        g.complete(v1);
2099        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2100
2101        // unspecified behavior
2102        Integer v;
1773          try {
1774 <            assertEquals(inc(v1), h.join());
1775 <            assertEquals(1, r.invocationCount);
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertInvoked();
1776          } catch (CompletionException ok) {
1777 <            checkCompletedWithWrappedCFException(h, ex);
1778 <            assertEquals(0, r.invocationCount);
1777 >            checkCompletedWithWrappedCFException(h5, ex);
1778 >            rs[5].assertNotInvoked();
1779          }
1780  
1781          checkCompletedWithWrappedCFException(f, ex);
1782          checkCompletedNormally(g, v1);
1783 <    }}
1784 <
1785 <    /**
1786 <     * applyToEither result completes exceptionally if action does
1787 <     */
1788 <    public void testApplyToEither_actionFailed1() {
2119 <        for (ExecutionMode m : ExecutionMode.values())
2120 <        for (Integer v1 : new Integer[] { 1, null })
2121 <        for (Integer v2 : new Integer[] { 2, null })
2122 <    {
2123 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2124 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2125 <        final FailingFunction r = new FailingFunction();
2126 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2127 <
2128 <        f.complete(v1);
2129 <        checkCompletedWithWrappedCFException(h);
2130 <        g.complete(v2);
2131 <        checkCompletedNormally(f, v1);
2132 <        checkCompletedNormally(g, v2);
2133 <    }}
2134 <
2135 <    public void testApplyToEither_actionFailed2() {
2136 <        for (ExecutionMode m : ExecutionMode.values())
2137 <        for (Integer v1 : new Integer[] { 1, null })
2138 <        for (Integer v2 : new Integer[] { 2, null })
2139 <    {
2140 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2141 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2142 <        final FailingFunction r = new FailingFunction();
2143 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2144 <
2145 <        g.complete(v2);
2146 <        checkCompletedWithWrappedCFException(h);
2147 <        f.complete(v1);
2148 <        checkCompletedNormally(f, v1);
2149 <        checkCompletedNormally(g, v2);
1783 >        checkCompletedWithWrappedCFException(h0, ex);
1784 >        checkCompletedWithWrappedCFException(h1, ex);
1785 >        checkCompletedWithWrappedCFException(h2, ex);
1786 >        checkCompletedWithWrappedCFException(h3, ex);
1787 >        checkCompletedWithWrappedCFException(h4, ex);
1788 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1789      }}
1790  
1791      /**
1792       * applyToEither result completes exceptionally if either source cancelled
1793       */
1794 <    public void testApplyToEither_sourceCancelled1() {
1794 >    public void testApplyToEither_sourceCancelled() {
1795          for (ExecutionMode m : ExecutionMode.values())
1796          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1797          for (Integer v1 : new Integer[] { 1, null })
1798      {
1799          final CompletableFuture<Integer> f = new CompletableFuture<>();
1800          final CompletableFuture<Integer> g = new CompletableFuture<>();
1801 <        final IncFunction r = new IncFunction();
1802 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1801 >        final IncFunction[] rs = new IncFunction[6];
1802 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1803  
1804 <        assertTrue(f.cancel(mayInterruptIfRunning));
1805 <        checkCompletedWithWrappedCancellationException(h);
1804 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1805 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1806 >        checkIncomplete(h0);
1807 >        checkIncomplete(h1);
1808 >        rs[0].assertNotInvoked();
1809 >        rs[1].assertNotInvoked();
1810 >        f.cancel(mayInterruptIfRunning);
1811 >        checkCompletedWithWrappedCancellationException(h0);
1812 >        checkCompletedWithWrappedCancellationException(h1);
1813 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1814 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1815 >        checkCompletedWithWrappedCancellationException(h2);
1816 >        checkCompletedWithWrappedCancellationException(h3);
1817          g.complete(v1);
1818  
1819 <        checkCancelled(f);
1820 <        assertEquals(0, r.invocationCount);
1821 <        checkCompletedNormally(g, v1);
2172 <        checkCompletedWithWrappedCancellationException(h);
2173 <    }}
2174 <
2175 <    public void testApplyToEither_sourceCancelled2() {
2176 <        for (ExecutionMode m : ExecutionMode.values())
2177 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2178 <        for (Integer v1 : new Integer[] { 1, null })
2179 <    {
2180 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2181 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2182 <        final IncFunction r = new IncFunction();
2183 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2184 <
2185 <        assertTrue(g.cancel(mayInterruptIfRunning));
2186 <        checkCompletedWithWrappedCancellationException(h);
2187 <        f.complete(v1);
2188 <
2189 <        checkCancelled(g);
2190 <        assertEquals(0, r.invocationCount);
2191 <        checkCompletedNormally(f, v1);
2192 <        checkCompletedWithWrappedCancellationException(h);
2193 <    }}
2194 <
2195 <    public void testApplyToEither_sourceCancelled3() {
2196 <        for (ExecutionMode m : ExecutionMode.values())
2197 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2198 <        for (Integer v1 : new Integer[] { 1, null })
2199 <    {
2200 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2201 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2202 <        final IncFunction r = new IncFunction();
2203 <
2204 <        assertTrue(g.cancel(mayInterruptIfRunning));
2205 <        f.complete(v1);
2206 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2207 <
2208 <        // unspecified behavior
2209 <        Integer v;
1819 >        // unspecified behavior - both source completions available
1820 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1821 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1822          try {
1823 <            assertEquals(inc(v1), h.join());
1824 <            assertEquals(1, r.invocationCount);
1823 >            assertEquals(inc(v1), h4.join());
1824 >            rs[4].assertInvoked();
1825          } catch (CompletionException ok) {
1826 <            checkCompletedWithWrappedCancellationException(h);
1827 <            assertEquals(0, r.invocationCount);
1826 >            checkCompletedWithWrappedCancellationException(h4);
1827 >            rs[4].assertNotInvoked();
1828          }
2217
2218        checkCancelled(g);
2219        checkCompletedNormally(f, v1);
2220    }}
2221
2222    public void testApplyToEither_sourceCancelled4() {
2223        for (ExecutionMode m : ExecutionMode.values())
2224        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2225        for (Integer v1 : new Integer[] { 1, null })
2226    {
2227        final CompletableFuture<Integer> f = new CompletableFuture<>();
2228        final CompletableFuture<Integer> g = new CompletableFuture<>();
2229        final IncFunction r = new IncFunction();
2230
2231        assertTrue(f.cancel(mayInterruptIfRunning));
2232        g.complete(v1);
2233        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2234
2235        // unspecified behavior
2236        Integer v;
1829          try {
1830 <            assertEquals(inc(v1), h.join());
1831 <            assertEquals(1, r.invocationCount);
1830 >            assertEquals(inc(v1), h5.join());
1831 >            rs[5].assertInvoked();
1832          } catch (CompletionException ok) {
1833 <            checkCompletedWithWrappedCancellationException(h);
1834 <            assertEquals(0, r.invocationCount);
1833 >            checkCompletedWithWrappedCancellationException(h5);
1834 >            rs[5].assertNotInvoked();
1835          }
1836  
1837          checkCancelled(f);
1838          checkCompletedNormally(g, v1);
1839 +        checkCompletedWithWrappedCancellationException(h0);
1840 +        checkCompletedWithWrappedCancellationException(h1);
1841 +        checkCompletedWithWrappedCancellationException(h2);
1842 +        checkCompletedWithWrappedCancellationException(h3);
1843 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1844      }}
1845  
1846      /**
1847 <     * acceptEither result completes normally after normal completion
2251 <     * of either source
1847 >     * applyToEither result completes exceptionally if action does
1848       */
1849 <    public void testAcceptEither_normalCompletion1() {
1849 >    public void testApplyToEither_actionFailed() {
1850          for (ExecutionMode m : ExecutionMode.values())
1851          for (Integer v1 : new Integer[] { 1, null })
1852          for (Integer v2 : new Integer[] { 2, null })
1853      {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856 <        final IncAction r = new IncAction();
1857 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1856 >        final FailingFunction[] rs = new FailingFunction[6];
1857 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1858  
1859 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1860 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1861          f.complete(v1);
1862 <        checkCompletedNormally(h, null);
1863 <        assertEquals(inc(v1), r.value);
1864 <        g.complete(v2);
1862 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1863 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1864 >        checkCompletedWithWrappedCFException(h0);
1865 >        checkCompletedWithWrappedCFException(h1);
1866 >        checkCompletedWithWrappedCFException(h2);
1867 >        checkCompletedWithWrappedCFException(h3);
1868 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1869  
1870 <        checkCompletedNormally(f, v1);
2269 <        checkCompletedNormally(g, v2);
2270 <        checkCompletedNormally(h, null);
2271 <    }}
1870 >        g.complete(v2);
1871  
1872 <    public void testAcceptEither_normalCompletion2() {
1873 <        for (ExecutionMode m : ExecutionMode.values())
1874 <        for (Integer v1 : new Integer[] { 1, null })
2276 <        for (Integer v2 : new Integer[] { 2, null })
2277 <    {
2278 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2280 <        final IncAction r = new IncAction();
2281 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1872 >        // unspecified behavior - both source completions available
1873 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1874 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1875  
1876 <        g.complete(v2);
1877 <        checkCompletedNormally(h, null);
1878 <        assertEquals(inc(v2), r.value);
1879 <        f.complete(v1);
1876 >        checkCompletedWithWrappedCFException(h4);
1877 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1878 >                   Objects.equals(v2, rs[4].value));
1879 >        checkCompletedWithWrappedCFException(h5);
1880 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1881 >                   Objects.equals(v2, rs[5].value));
1882  
1883          checkCompletedNormally(f, v1);
1884          checkCompletedNormally(g, v2);
2290        checkCompletedNormally(h, null);
1885      }}
1886  
1887 <    public void testAcceptEither_normalCompletion3() {
1887 >    /**
1888 >     * acceptEither result completes normally after normal completion
1889 >     * of either source
1890 >     */
1891 >    public void testAcceptEither_normalCompletion() {
1892          for (ExecutionMode m : ExecutionMode.values())
1893          for (Integer v1 : new Integer[] { 1, null })
1894          for (Integer v2 : new Integer[] { 2, null })
1895      {
1896          final CompletableFuture<Integer> f = new CompletableFuture<>();
1897          final CompletableFuture<Integer> g = new CompletableFuture<>();
1898 <        final IncAction r = new IncAction();
1898 >        final NoopConsumer[] rs = new NoopConsumer[6];
1899 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1900  
1901 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1902 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1903 +        checkIncomplete(h0);
1904 +        checkIncomplete(h1);
1905 +        rs[0].assertNotInvoked();
1906 +        rs[1].assertNotInvoked();
1907          f.complete(v1);
1908 +        checkCompletedNormally(h0, null);
1909 +        checkCompletedNormally(h1, null);
1910 +        rs[0].assertValue(v1);
1911 +        rs[1].assertValue(v1);
1912 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1913 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1914 +        checkCompletedNormally(h2, null);
1915 +        checkCompletedNormally(h3, null);
1916 +        rs[2].assertValue(v1);
1917 +        rs[3].assertValue(v1);
1918          g.complete(v2);
2304        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1919  
1920 <        checkCompletedNormally(h, null);
1920 >        // unspecified behavior - both source completions available
1921 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1922 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1923 >        checkCompletedNormally(h4, null);
1924 >        checkCompletedNormally(h5, null);
1925 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1926 >                   Objects.equals(v2, rs[4].value));
1927 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1928 >                   Objects.equals(v2, rs[5].value));
1929 >
1930          checkCompletedNormally(f, v1);
1931          checkCompletedNormally(g, v2);
1932 <
1933 <        // unspecified behavior
1934 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
1935 <                   Objects.equals(r.value, inc(v2)));
1932 >        checkCompletedNormally(h0, null);
1933 >        checkCompletedNormally(h1, null);
1934 >        checkCompletedNormally(h2, null);
1935 >        checkCompletedNormally(h3, null);
1936 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1937      }}
1938  
1939      /**
1940       * acceptEither result completes exceptionally after exceptional
1941       * completion of either source
1942       */
1943 <    public void testAcceptEither_exceptionalCompletion1() {
1943 >    public void testAcceptEither_exceptionalCompletion() {
1944          for (ExecutionMode m : ExecutionMode.values())
1945          for (Integer v1 : new Integer[] { 1, null })
1946      {
1947          final CompletableFuture<Integer> f = new CompletableFuture<>();
1948          final CompletableFuture<Integer> g = new CompletableFuture<>();
2325        final IncAction r = new IncAction();
2326        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1949          final CFException ex = new CFException();
1950 +        final NoopConsumer[] rs = new NoopConsumer[6];
1951 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1952  
1953 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1954 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1955 +        checkIncomplete(h0);
1956 +        checkIncomplete(h1);
1957 +        rs[0].assertNotInvoked();
1958 +        rs[1].assertNotInvoked();
1959          f.completeExceptionally(ex);
1960 <        checkCompletedWithWrappedCFException(h, ex);
1961 <        g.complete(v1);
1962 <
1963 <        assertEquals(0, r.invocationCount);
1964 <        checkCompletedNormally(g, v1);
1965 <        checkCompletedWithWrappedCFException(f, ex);
2336 <        checkCompletedWithWrappedCFException(h, ex);
2337 <    }}
2338 <
2339 <    public void testAcceptEither_exceptionalCompletion2() {
2340 <        for (ExecutionMode m : ExecutionMode.values())
2341 <        for (Integer v1 : new Integer[] { 1, null })
2342 <    {
2343 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2344 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2345 <        final IncAction r = new IncAction();
2346 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2347 <        final CFException ex = new CFException();
2348 <
2349 <        g.completeExceptionally(ex);
2350 <        checkCompletedWithWrappedCFException(h, ex);
2351 <        f.complete(v1);
2352 <
2353 <        assertEquals(0, r.invocationCount);
2354 <        checkCompletedNormally(f, v1);
2355 <        checkCompletedWithWrappedCFException(g, ex);
2356 <        checkCompletedWithWrappedCFException(h, ex);
2357 <    }}
2358 <
2359 <    public void testAcceptEither_exceptionalCompletion3() {
2360 <        for (ExecutionMode m : ExecutionMode.values())
2361 <        for (Integer v1 : new Integer[] { 1, null })
2362 <    {
2363 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2364 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2365 <        final IncAction r = new IncAction();
2366 <        final CFException ex = new CFException();
1960 >        checkCompletedWithWrappedCFException(h0, ex);
1961 >        checkCompletedWithWrappedCFException(h1, ex);
1962 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1963 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1964 >        checkCompletedWithWrappedCFException(h2, ex);
1965 >        checkCompletedWithWrappedCFException(h3, ex);
1966  
1967 <        g.completeExceptionally(ex);
2369 <        f.complete(v1);
2370 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1967 >        g.complete(v1);
1968  
1969 <        // unspecified behavior
1970 <        Integer v;
1969 >        // unspecified behavior - both source completions available
1970 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1971 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1972          try {
1973 <            assertNull(h.join());
1974 <            assertEquals(1, r.invocationCount);
2377 <            assertEquals(inc(v1), r.value);
1973 >            assertNull(h4.join());
1974 >            rs[4].assertValue(v1);
1975          } catch (CompletionException ok) {
1976 <            checkCompletedWithWrappedCFException(h, ex);
1977 <            assertEquals(0, r.invocationCount);
1976 >            checkCompletedWithWrappedCFException(h4, ex);
1977 >            rs[4].assertNotInvoked();
1978          }
2382
2383        checkCompletedWithWrappedCFException(g, ex);
2384        checkCompletedNormally(f, v1);
2385    }}
2386
2387    public void testAcceptEither_exceptionalCompletion4() {
2388        for (ExecutionMode m : ExecutionMode.values())
2389        for (Integer v1 : new Integer[] { 1, null })
2390    {
2391        final CompletableFuture<Integer> f = new CompletableFuture<>();
2392        final CompletableFuture<Integer> g = new CompletableFuture<>();
2393        final IncAction r = new IncAction();
2394        final CFException ex = new CFException();
2395
2396        f.completeExceptionally(ex);
2397        g.complete(v1);
2398        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2399
2400        // unspecified behavior
2401        Integer v;
1979          try {
1980 <            assertNull(h.join());
1981 <            assertEquals(1, r.invocationCount);
2405 <            assertEquals(inc(v1), r.value);
1980 >            assertNull(h5.join());
1981 >            rs[5].assertValue(v1);
1982          } catch (CompletionException ok) {
1983 <            checkCompletedWithWrappedCFException(h, ex);
1984 <            assertEquals(0, r.invocationCount);
1983 >            checkCompletedWithWrappedCFException(h5, ex);
1984 >            rs[5].assertNotInvoked();
1985          }
1986  
1987          checkCompletedWithWrappedCFException(f, ex);
1988          checkCompletedNormally(g, v1);
1989 <    }}
1990 <
1991 <    /**
1992 <     * acceptEither result completes exceptionally if action does
1993 <     */
1994 <    public void testAcceptEither_actionFailed1() {
2419 <        for (ExecutionMode m : ExecutionMode.values())
2420 <        for (Integer v1 : new Integer[] { 1, null })
2421 <        for (Integer v2 : new Integer[] { 2, null })
2422 <    {
2423 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2424 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2425 <        final FailingConsumer r = new FailingConsumer();
2426 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2427 <
2428 <        f.complete(v1);
2429 <        checkCompletedWithWrappedCFException(h);
2430 <        g.complete(v2);
2431 <        checkCompletedNormally(f, v1);
2432 <        checkCompletedNormally(g, v2);
2433 <    }}
2434 <
2435 <    public void testAcceptEither_actionFailed2() {
2436 <        for (ExecutionMode m : ExecutionMode.values())
2437 <        for (Integer v1 : new Integer[] { 1, null })
2438 <        for (Integer v2 : new Integer[] { 2, null })
2439 <    {
2440 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442 <        final FailingConsumer r = new FailingConsumer();
2443 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444 <
2445 <        g.complete(v2);
2446 <        checkCompletedWithWrappedCFException(h);
2447 <        f.complete(v1);
2448 <        checkCompletedNormally(f, v1);
2449 <        checkCompletedNormally(g, v2);
1989 >        checkCompletedWithWrappedCFException(h0, ex);
1990 >        checkCompletedWithWrappedCFException(h1, ex);
1991 >        checkCompletedWithWrappedCFException(h2, ex);
1992 >        checkCompletedWithWrappedCFException(h3, ex);
1993 >        checkCompletedWithWrappedCFException(h4, ex);
1994 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1995      }}
1996  
1997      /**
1998       * acceptEither result completes exceptionally if either source cancelled
1999       */
2000 <    public void testAcceptEither_sourceCancelled1() {
2000 >    public void testAcceptEither_sourceCancelled() {
2001          for (ExecutionMode m : ExecutionMode.values())
2002          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2003          for (Integer v1 : new Integer[] { 1, null })
2004      {
2005          final CompletableFuture<Integer> f = new CompletableFuture<>();
2006          final CompletableFuture<Integer> g = new CompletableFuture<>();
2007 <        final IncAction r = new IncAction();
2008 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2007 >        final NoopConsumer[] rs = new NoopConsumer[6];
2008 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2009 >
2010 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2011 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2012 >        checkIncomplete(h0);
2013 >        checkIncomplete(h1);
2014 >        rs[0].assertNotInvoked();
2015 >        rs[1].assertNotInvoked();
2016 >        f.cancel(mayInterruptIfRunning);
2017 >        checkCompletedWithWrappedCancellationException(h0);
2018 >        checkCompletedWithWrappedCancellationException(h1);
2019 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2020 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2021 >        checkCompletedWithWrappedCancellationException(h2);
2022 >        checkCompletedWithWrappedCancellationException(h3);
2023  
2465        assertTrue(f.cancel(mayInterruptIfRunning));
2466        checkCompletedWithWrappedCancellationException(h);
2024          g.complete(v1);
2025  
2026 +        // unspecified behavior - both source completions available
2027 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2028 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2029 +        try {
2030 +            assertNull(h4.join());
2031 +            rs[4].assertValue(v1);
2032 +        } catch (CompletionException ok) {
2033 +            checkCompletedWithWrappedCancellationException(h4);
2034 +            rs[4].assertNotInvoked();
2035 +        }
2036 +        try {
2037 +            assertNull(h5.join());
2038 +            rs[5].assertValue(v1);
2039 +        } catch (CompletionException ok) {
2040 +            checkCompletedWithWrappedCancellationException(h5);
2041 +            rs[5].assertNotInvoked();
2042 +        }
2043 +
2044          checkCancelled(f);
2470        assertEquals(0, r.invocationCount);
2045          checkCompletedNormally(g, v1);
2046 <        checkCompletedWithWrappedCancellationException(h);
2046 >        checkCompletedWithWrappedCancellationException(h0);
2047 >        checkCompletedWithWrappedCancellationException(h1);
2048 >        checkCompletedWithWrappedCancellationException(h2);
2049 >        checkCompletedWithWrappedCancellationException(h3);
2050 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2051      }}
2052  
2053 <    public void testAcceptEither_sourceCancelled2() {
2053 >    /**
2054 >     * acceptEither result completes exceptionally if action does
2055 >     */
2056 >    public void testAcceptEither_actionFailed() {
2057          for (ExecutionMode m : ExecutionMode.values())
2477        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2058          for (Integer v1 : new Integer[] { 1, null })
2059 +        for (Integer v2 : new Integer[] { 2, null })
2060      {
2061          final CompletableFuture<Integer> f = new CompletableFuture<>();
2062          final CompletableFuture<Integer> g = new CompletableFuture<>();
2063 <        final IncAction r = new IncAction();
2064 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2063 >        final FailingConsumer[] rs = new FailingConsumer[6];
2064 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2065  
2066 <        assertTrue(g.cancel(mayInterruptIfRunning));
2067 <        checkCompletedWithWrappedCancellationException(h);
2066 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2067 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2068          f.complete(v1);
2069 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2070 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2071 +        checkCompletedWithWrappedCFException(h0);
2072 +        checkCompletedWithWrappedCFException(h1);
2073 +        checkCompletedWithWrappedCFException(h2);
2074 +        checkCompletedWithWrappedCFException(h3);
2075 +        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2076  
2077 <        checkCancelled(g);
2490 <        assertEquals(0, r.invocationCount);
2491 <        checkCompletedNormally(f, v1);
2492 <        checkCompletedWithWrappedCancellationException(h);
2493 <    }}
2494 <
2495 <    public void testAcceptEither_sourceCancelled3() {
2496 <        for (ExecutionMode m : ExecutionMode.values())
2497 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2498 <        for (Integer v1 : new Integer[] { 1, null })
2499 <    {
2500 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2501 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2502 <        final IncAction r = new IncAction();
2077 >        g.complete(v2);
2078  
2079 <        assertTrue(g.cancel(mayInterruptIfRunning));
2080 <        f.complete(v1);
2081 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2079 >        // unspecified behavior - both source completions available
2080 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2081 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2082  
2083 <        // unspecified behavior
2084 <        Integer v;
2085 <        try {
2086 <            assertNull(h.join());
2087 <            assertEquals(1, r.invocationCount);
2088 <            assertEquals(inc(v1), r.value);
2514 <        } catch (CompletionException ok) {
2515 <            checkCompletedWithWrappedCancellationException(h);
2516 <            assertEquals(0, r.invocationCount);
2517 <        }
2083 >        checkCompletedWithWrappedCFException(h4);
2084 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2085 >                   Objects.equals(v2, rs[4].value));
2086 >        checkCompletedWithWrappedCFException(h5);
2087 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2088 >                   Objects.equals(v2, rs[5].value));
2089  
2519        checkCancelled(g);
2090          checkCompletedNormally(f, v1);
2091 <    }}
2522 <
2523 <    public void testAcceptEither_sourceCancelled4() {
2524 <        for (ExecutionMode m : ExecutionMode.values())
2525 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2526 <        for (Integer v1 : new Integer[] { 1, null })
2527 <    {
2528 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2529 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2530 <        final IncAction r = new IncAction();
2531 <
2532 <        assertTrue(f.cancel(mayInterruptIfRunning));
2533 <        g.complete(v1);
2534 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2535 <
2536 <        // unspecified behavior
2537 <        Integer v;
2538 <        try {
2539 <            assertNull(h.join());
2540 <            assertEquals(1, r.invocationCount);
2541 <            assertEquals(inc(v1), r.value);
2542 <        } catch (CompletionException ok) {
2543 <            checkCompletedWithWrappedCancellationException(h);
2544 <            assertEquals(0, r.invocationCount);
2545 <        }
2546 <
2547 <        checkCancelled(f);
2548 <        checkCompletedNormally(g, v1);
2091 >        checkCompletedNormally(g, v2);
2092      }}
2093  
2094      /**
# Line 2559 | Line 2102 | public class CompletableFutureTest exten
2102      {
2103          final CompletableFuture<Integer> f = new CompletableFuture<>();
2104          final CompletableFuture<Integer> g = new CompletableFuture<>();
2105 <        final Noop r = new Noop();
2105 >        final Noop r = new Noop(m);
2106          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2107  
2108          f.complete(v1);
2109          checkCompletedNormally(h, null);
2110 <        assertEquals(1, r.invocationCount);
2110 >        r.assertInvoked();
2111          g.complete(v2);
2112  
2113          checkCompletedNormally(f, v1);
2114          checkCompletedNormally(g, v2);
2115          checkCompletedNormally(h, null);
2116 <        assertEquals(1, r.invocationCount);
2116 >        r.assertInvoked();
2117      }}
2118  
2119      public void testRunAfterEither_normalCompletion2() {
# Line 2580 | Line 2123 | public class CompletableFutureTest exten
2123      {
2124          final CompletableFuture<Integer> f = new CompletableFuture<>();
2125          final CompletableFuture<Integer> g = new CompletableFuture<>();
2126 <        final Noop r = new Noop();
2126 >        final Noop r = new Noop(m);
2127          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2128  
2129          g.complete(v2);
2130          checkCompletedNormally(h, null);
2131 <        assertEquals(1, r.invocationCount);
2131 >        r.assertInvoked();
2132          f.complete(v1);
2133  
2134          checkCompletedNormally(f, v1);
2135          checkCompletedNormally(g, v2);
2136          checkCompletedNormally(h, null);
2137 <        assertEquals(1, r.invocationCount);
2137 >        r.assertInvoked();
2138          }}
2139  
2140      public void testRunAfterEither_normalCompletion3() {
# Line 2601 | Line 2144 | public class CompletableFutureTest exten
2144      {
2145          final CompletableFuture<Integer> f = new CompletableFuture<>();
2146          final CompletableFuture<Integer> g = new CompletableFuture<>();
2147 <        final Noop r = new Noop();
2147 >        final Noop r = new Noop(m);
2148  
2149          f.complete(v1);
2150          g.complete(v2);
# Line 2610 | Line 2153 | public class CompletableFutureTest exten
2153          checkCompletedNormally(h, null);
2154          checkCompletedNormally(f, v1);
2155          checkCompletedNormally(g, v2);
2156 <        assertEquals(1, r.invocationCount);
2156 >        r.assertInvoked();
2157      }}
2158  
2159      /**
# Line 2623 | Line 2166 | public class CompletableFutureTest exten
2166      {
2167          final CompletableFuture<Integer> f = new CompletableFuture<>();
2168          final CompletableFuture<Integer> g = new CompletableFuture<>();
2169 <        final Noop r = new Noop();
2169 >        final Noop r = new Noop(m);
2170          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2171          final CFException ex = new CFException();
2172  
# Line 2631 | Line 2174 | public class CompletableFutureTest exten
2174          checkCompletedWithWrappedCFException(h, ex);
2175          g.complete(v1);
2176  
2177 <        assertEquals(0, r.invocationCount);
2177 >        r.assertNotInvoked();
2178          checkCompletedNormally(g, v1);
2179          checkCompletedWithWrappedCFException(f, ex);
2180          checkCompletedWithWrappedCFException(h, ex);
# Line 2643 | Line 2186 | public class CompletableFutureTest exten
2186      {
2187          final CompletableFuture<Integer> f = new CompletableFuture<>();
2188          final CompletableFuture<Integer> g = new CompletableFuture<>();
2189 <        final Noop r = new Noop();
2189 >        final Noop r = new Noop(m);
2190          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2191          final CFException ex = new CFException();
2192  
# Line 2651 | Line 2194 | public class CompletableFutureTest exten
2194          checkCompletedWithWrappedCFException(h, ex);
2195          f.complete(v1);
2196  
2197 <        assertEquals(0, r.invocationCount);
2197 >        r.assertNotInvoked();
2198          checkCompletedNormally(f, v1);
2199          checkCompletedWithWrappedCFException(g, ex);
2200          checkCompletedWithWrappedCFException(h, ex);
# Line 2663 | Line 2206 | public class CompletableFutureTest exten
2206      {
2207          final CompletableFuture<Integer> f = new CompletableFuture<>();
2208          final CompletableFuture<Integer> g = new CompletableFuture<>();
2209 <        final Noop r = new Noop();
2209 >        final Noop r = new Noop(m);
2210          final CFException ex = new CFException();
2211  
2212          g.completeExceptionally(ex);
# Line 2674 | Line 2217 | public class CompletableFutureTest exten
2217          Integer v;
2218          try {
2219              assertNull(h.join());
2220 <            assertEquals(1, r.invocationCount);
2220 >            r.assertInvoked();
2221          } catch (CompletionException ok) {
2222              checkCompletedWithWrappedCFException(h, ex);
2223 <            assertEquals(0, r.invocationCount);
2223 >            r.assertNotInvoked();
2224          }
2225  
2226          checkCompletedWithWrappedCFException(g, ex);
# Line 2690 | Line 2233 | public class CompletableFutureTest exten
2233      {
2234          final CompletableFuture<Integer> f = new CompletableFuture<>();
2235          final CompletableFuture<Integer> g = new CompletableFuture<>();
2236 <        final Noop r = new Noop();
2236 >        final Noop r = new Noop(m);
2237          final CFException ex = new CFException();
2238  
2239          f.completeExceptionally(ex);
# Line 2701 | Line 2244 | public class CompletableFutureTest exten
2244          Integer v;
2245          try {
2246              assertNull(h.join());
2247 <            assertEquals(1, r.invocationCount);
2247 >            r.assertInvoked();
2248          } catch (CompletionException ok) {
2249              checkCompletedWithWrappedCFException(h, ex);
2250 <            assertEquals(0, r.invocationCount);
2250 >            r.assertNotInvoked();
2251          }
2252  
2253          checkCompletedWithWrappedCFException(f, ex);
# Line 2721 | Line 2264 | public class CompletableFutureTest exten
2264      {
2265          final CompletableFuture<Integer> f = new CompletableFuture<>();
2266          final CompletableFuture<Integer> g = new CompletableFuture<>();
2267 <        final FailingNoop r = new FailingNoop();
2267 >        final FailingRunnable r = new FailingRunnable(m);
2268          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2269  
2270          f.complete(v1);
# Line 2738 | Line 2281 | public class CompletableFutureTest exten
2281      {
2282          final CompletableFuture<Integer> f = new CompletableFuture<>();
2283          final CompletableFuture<Integer> g = new CompletableFuture<>();
2284 <        final FailingNoop r = new FailingNoop();
2284 >        final FailingRunnable r = new FailingRunnable(m);
2285          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2286  
2287          g.complete(v2);
# Line 2758 | Line 2301 | public class CompletableFutureTest exten
2301      {
2302          final CompletableFuture<Integer> f = new CompletableFuture<>();
2303          final CompletableFuture<Integer> g = new CompletableFuture<>();
2304 <        final Noop r = new Noop();
2304 >        final Noop r = new Noop(m);
2305          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2306  
2307          assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2766 | Line 2309 | public class CompletableFutureTest exten
2309          g.complete(v1);
2310  
2311          checkCancelled(f);
2312 <        assertEquals(0, r.invocationCount);
2312 >        r.assertNotInvoked();
2313          checkCompletedNormally(g, v1);
2314          checkCompletedWithWrappedCancellationException(h);
2315      }}
# Line 2778 | Line 2321 | public class CompletableFutureTest exten
2321      {
2322          final CompletableFuture<Integer> f = new CompletableFuture<>();
2323          final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 <        final Noop r = new Noop();
2324 >        final Noop r = new Noop(m);
2325          final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2326  
2327          assertTrue(g.cancel(mayInterruptIfRunning));
# Line 2786 | Line 2329 | public class CompletableFutureTest exten
2329          f.complete(v1);
2330  
2331          checkCancelled(g);
2332 <        assertEquals(0, r.invocationCount);
2332 >        r.assertNotInvoked();
2333          checkCompletedNormally(f, v1);
2334          checkCompletedWithWrappedCancellationException(h);
2335      }}
# Line 2798 | Line 2341 | public class CompletableFutureTest exten
2341      {
2342          final CompletableFuture<Integer> f = new CompletableFuture<>();
2343          final CompletableFuture<Integer> g = new CompletableFuture<>();
2344 <        final Noop r = new Noop();
2344 >        final Noop r = new Noop(m);
2345  
2346          assertTrue(g.cancel(mayInterruptIfRunning));
2347          f.complete(v1);
# Line 2808 | Line 2351 | public class CompletableFutureTest exten
2351          Integer v;
2352          try {
2353              assertNull(h.join());
2354 <            assertEquals(1, r.invocationCount);
2354 >            r.assertInvoked();
2355          } catch (CompletionException ok) {
2356              checkCompletedWithWrappedCancellationException(h);
2357 <            assertEquals(0, r.invocationCount);
2357 >            r.assertNotInvoked();
2358          }
2359  
2360          checkCancelled(g);
# Line 2825 | Line 2368 | public class CompletableFutureTest exten
2368      {
2369          final CompletableFuture<Integer> f = new CompletableFuture<>();
2370          final CompletableFuture<Integer> g = new CompletableFuture<>();
2371 <        final Noop r = new Noop();
2371 >        final Noop r = new Noop(m);
2372  
2373          assertTrue(f.cancel(mayInterruptIfRunning));
2374          g.complete(v1);
# Line 2835 | Line 2378 | public class CompletableFutureTest exten
2378          Integer v;
2379          try {
2380              assertNull(h.join());
2381 <            assertEquals(1, r.invocationCount);
2381 >            r.assertInvoked();
2382          } catch (CompletionException ok) {
2383              checkCompletedWithWrappedCancellationException(h);
2384 <            assertEquals(0, r.invocationCount);
2384 >            r.assertNotInvoked();
2385          }
2386  
2387          checkCancelled(f);
# Line 2854 | Line 2397 | public class CompletableFutureTest exten
2397          for (Integer v1 : new Integer[] { 1, null })
2398      {
2399          final CompletableFuture<Integer> f = new CompletableFuture<>();
2400 <        final CompletableFutureInc r = new CompletableFutureInc();
2400 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2401          if (!createIncomplete) f.complete(v1);
2402 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2402 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2403          if (createIncomplete) f.complete(v1);
2404  
2405          checkCompletedNormally(g, inc(v1));
2406          checkCompletedNormally(f, v1);
2407 <        assertEquals(1, r.invocationCount);
2407 >        r.assertInvoked();
2408      }}
2409  
2410      /**
# Line 2873 | Line 2416 | public class CompletableFutureTest exten
2416          for (boolean createIncomplete : new boolean[] { true, false })
2417      {
2418          final CFException ex = new CFException();
2419 <        final CompletableFutureInc r = new CompletableFutureInc();
2419 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2420          final CompletableFuture<Integer> f = new CompletableFuture<>();
2421          if (!createIncomplete) f.completeExceptionally(ex);
2422 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2422 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2423          if (createIncomplete) f.completeExceptionally(ex);
2424  
2425          checkCompletedWithWrappedCFException(g, ex);
2426          checkCompletedWithWrappedCFException(f, ex);
2427 <        assertEquals(0, r.invocationCount);
2427 >        r.assertNotInvoked();
2428      }}
2429  
2430      /**
# Line 2894 | Line 2437 | public class CompletableFutureTest exten
2437      {
2438          final CompletableFuture<Integer> f = new CompletableFuture<>();
2439          final FailingCompletableFutureFunction r
2440 <            = new FailingCompletableFutureFunction();
2440 >            = new FailingCompletableFutureFunction(m);
2441          if (!createIncomplete) f.complete(v1);
2442 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2442 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2443          if (createIncomplete) f.complete(v1);
2444  
2445          checkCompletedWithWrappedCFException(g);
# Line 2912 | Line 2455 | public class CompletableFutureTest exten
2455          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2456      {
2457          final CompletableFuture<Integer> f = new CompletableFuture<>();
2458 <        final CompletableFutureInc r = new CompletableFutureInc();
2458 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2459          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2460 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2461 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2460 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2461 >        if (createIncomplete) {
2462 >            checkIncomplete(g);
2463 >            assertTrue(f.cancel(mayInterruptIfRunning));
2464 >        }
2465  
2466          checkCompletedWithWrappedCancellationException(g);
2467          checkCancelled(f);
2468      }}
2469  
2924    // asyncs
2925
2926    /**
2927     * thenApplyAsync result completes normally after normal completion of source
2928     */
2929    public void testThenApplyAsync() {
2930        CompletableFuture<Integer> f = new CompletableFuture<>();
2931        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2932        f.complete(one);
2933        checkCompletedNormally(g, two);
2934    }
2935
2936    /**
2937     * thenApplyAsync result completes exceptionally after exceptional
2938     * completion of source
2939     */
2940    public void testThenApplyAsync2() {
2941        CompletableFuture<Integer> f = new CompletableFuture<>();
2942        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2943        f.completeExceptionally(new CFException());
2944        checkCompletedWithWrappedCFException(g);
2945    }
2946
2947    /**
2948     * thenApplyAsync result completes exceptionally if action does
2949     */
2950    public void testThenApplyAsync3() {
2951        CompletableFuture<Integer> f = new CompletableFuture<>();
2952        FailingFunction r = new FailingFunction();
2953        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2954        f.complete(null);
2955        checkCompletedWithWrappedCFException(g);
2956    }
2957
2958    /**
2959     * thenApplyAsync result completes exceptionally if source cancelled
2960     */
2961    public void testThenApplyAsync4() {
2962        CompletableFuture<Integer> f = new CompletableFuture<>();
2963        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2964        assertTrue(f.cancel(true));
2965        checkCompletedWithWrappedCancellationException(g);
2966    }
2967
2968    /**
2969     * thenAcceptAsync result completes normally after normal
2970     * completion of source
2971     */
2972    public void testThenAcceptAsync() {
2973        CompletableFuture<Integer> f = new CompletableFuture<>();
2974        IncAction r = new IncAction();
2975        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2976        f.complete(one);
2977        checkCompletedNormally(g, null);
2978        assertEquals(r.value, (Integer) 2);
2979    }
2980
2981    /**
2982     * thenAcceptAsync result completes exceptionally after exceptional
2983     * completion of source
2984     */
2985    public void testThenAcceptAsync2() {
2986        CompletableFuture<Integer> f = new CompletableFuture<>();
2987        IncAction r = new IncAction();
2988        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989        f.completeExceptionally(new CFException());
2990        checkCompletedWithWrappedCFException(g);
2991    }
2992
2993    /**
2994     * thenAcceptAsync result completes exceptionally if action does
2995     */
2996    public void testThenAcceptAsync3() {
2997        CompletableFuture<Integer> f = new CompletableFuture<>();
2998        FailingConsumer r = new FailingConsumer();
2999        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000        f.complete(null);
3001        checkCompletedWithWrappedCFException(g);
3002    }
3003
3004    /**
3005     * thenAcceptAsync result completes exceptionally if source cancelled
3006     */
3007    public void testThenAcceptAsync4() {
3008        CompletableFuture<Integer> f = new CompletableFuture<>();
3009        IncAction r = new IncAction();
3010        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3011        assertTrue(f.cancel(true));
3012        checkCompletedWithWrappedCancellationException(g);
3013    }
3014
3015    // async with explicit executors
3016
3017    /**
3018     * thenApplyAsync result completes normally after normal completion of source
3019     */
3020    public void testThenApplyAsyncE() {
3021        CompletableFuture<Integer> f = new CompletableFuture<>();
3022        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3023        f.complete(one);
3024        checkCompletedNormally(g, two);
3025    }
3026
3027    /**
3028     * thenApplyAsync result completes exceptionally after exceptional
3029     * completion of source
3030     */
3031    public void testThenApplyAsync2E() {
3032        CompletableFuture<Integer> f = new CompletableFuture<>();
3033        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3034        f.completeExceptionally(new CFException());
3035        checkCompletedWithWrappedCFException(g);
3036    }
3037
3038    /**
3039     * thenApplyAsync result completes exceptionally if action does
3040     */
3041    public void testThenApplyAsync3E() {
3042        CompletableFuture<Integer> f = new CompletableFuture<>();
3043        FailingFunction r = new FailingFunction();
3044        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3045        f.complete(null);
3046        checkCompletedWithWrappedCFException(g);
3047    }
3048
3049    /**
3050     * thenApplyAsync result completes exceptionally if source cancelled
3051     */
3052    public void testThenApplyAsync4E() {
3053        CompletableFuture<Integer> f = new CompletableFuture<>();
3054        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3055        assertTrue(f.cancel(true));
3056        checkCompletedWithWrappedCancellationException(g);
3057    }
3058
3059    /**
3060     * thenAcceptAsync result completes normally after normal
3061     * completion of source
3062     */
3063    public void testThenAcceptAsyncE() {
3064        CompletableFuture<Integer> f = new CompletableFuture<>();
3065        IncAction r = new IncAction();
3066        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3067        f.complete(one);
3068        checkCompletedNormally(g, null);
3069        assertEquals(r.value, (Integer) 2);
3070    }
3071
3072    /**
3073     * thenAcceptAsync result completes exceptionally after exceptional
3074     * completion of source
3075     */
3076    public void testThenAcceptAsync2E() {
3077        CompletableFuture<Integer> f = new CompletableFuture<>();
3078        IncAction r = new IncAction();
3079        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3080        f.completeExceptionally(new CFException());
3081        checkCompletedWithWrappedCFException(g);
3082    }
3083
3084    /**
3085     * thenAcceptAsync result completes exceptionally if action does
3086     */
3087    public void testThenAcceptAsync3E() {
3088        CompletableFuture<Integer> f = new CompletableFuture<>();
3089        FailingConsumer r = new FailingConsumer();
3090        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3091        f.complete(null);
3092        checkCompletedWithWrappedCFException(g);
3093    }
3094
3095    /**
3096     * thenAcceptAsync result completes exceptionally if source cancelled
3097     */
3098    public void testThenAcceptAsync4E() {
3099        CompletableFuture<Integer> f = new CompletableFuture<>();
3100        IncAction r = new IncAction();
3101        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3102        assertTrue(f.cancel(true));
3103        checkCompletedWithWrappedCancellationException(g);
3104    }
3105
2470      // other static methods
2471  
2472      /**
# Line 3120 | Line 2484 | public class CompletableFutureTest exten
2484       */
2485      public void testAllOf_normal() throws Exception {
2486          for (int k = 1; k < 20; ++k) {
2487 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2487 >            CompletableFuture<Integer>[] fs
2488 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2489              for (int i = 0; i < k; ++i)
2490                  fs[i] = new CompletableFuture<>();
2491              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3134 | Line 2499 | public class CompletableFutureTest exten
2499          }
2500      }
2501  
2502 +    public void testAllOf_backwards() throws Exception {
2503 +        for (int k = 1; k < 20; ++k) {
2504 +            CompletableFuture<Integer>[] fs
2505 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2506 +            for (int i = 0; i < k; ++i)
2507 +                fs[i] = new CompletableFuture<>();
2508 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2509 +            for (int i = k - 1; i >= 0; i--) {
2510 +                checkIncomplete(f);
2511 +                checkIncomplete(CompletableFuture.allOf(fs));
2512 +                fs[i].complete(one);
2513 +            }
2514 +            checkCompletedNormally(f, null);
2515 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2516 +        }
2517 +    }
2518 +
2519      /**
2520       * anyOf(no component futures) returns an incomplete future
2521       */
# Line 3192 | Line 2574 | public class CompletableFutureTest exten
2574          Runnable[] throwingActions = {
2575              () -> CompletableFuture.supplyAsync(null),
2576              () -> CompletableFuture.supplyAsync(null, exec),
2577 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2577 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2578  
2579              () -> CompletableFuture.runAsync(null),
2580              () -> CompletableFuture.runAsync(null, exec),
# Line 3265 | Line 2647 | public class CompletableFutureTest exten
2647  
2648              () -> f.thenCompose(null),
2649              () -> f.thenComposeAsync(null),
2650 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2650 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2651              () -> f.thenComposeAsync(null, exec),
2652  
2653              () -> f.exceptionally(null),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines