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.56 by jsr166, Mon Jun 2 22:20:32 2014 UTC vs.
Revision 1.64 by jsr166, Fri Jun 6 17:08:48 2014 UTC

# 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 <        final ExecutionMode m;
374 <        int invocationCount = 0;
375 <        Integer value;
376 <        IncFunction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
358 <            invocationCount++;
378 >            invoked();
379              return value = inc(x);
380          }
381      }
382 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
383 <        final ExecutionMode m;
384 <        int invocationCount = 0;
385 <        Integer value;
386 <        // Check this action was invoked exactly once when result is computed.
387 <        SubtractAction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
370 <            invocationCount++;
396 >            invoked();
397              value = subtract(x, y);
398          }
399      }
400 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
401 <        final ExecutionMode m;
402 <        int invocationCount = 0;
403 <        Integer value;
404 <        // Check this action was invoked exactly once when result is computed.
379 <        SubtractFunction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
382 <            invocationCount++;
406 >            invoked();
407              return value = subtract(x, y);
408          }
409      }
410 <    static final class Noop implements Runnable {
411 <        final ExecutionMode m;
412 <        int invocationCount = 0;
389 <        Noop(ExecutionMode m) { this.m = m; }
410 >
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413          public void run() {
414 <            m.checkExecutionMode();
392 <            invocationCount++;
414 >            invoked();
415          }
416      }
417  
418 <    static final class FailingSupplier implements Supplier<Integer> {
419 <        final ExecutionMode m;
420 <        int invocationCount = 0;
421 <        FailingSupplier(ExecutionMode m) { this.m = m; }
418 >    class FailingSupplier extends CheckedAction
419 >        implements Supplier<Integer>
420 >    {
421 >        FailingSupplier(ExecutionMode m) { super(m); }
422          public Integer get() {
423 <            m.checkExecutionMode();
402 <            invocationCount++;
423 >            invoked();
424              throw new CFException();
425          }
426      }
427 <    static final class FailingConsumer implements Consumer<Integer> {
428 <        final ExecutionMode m;
429 <        int invocationCount = 0;
430 <        FailingConsumer(ExecutionMode m) { this.m = m; }
427 >
428 >    class FailingConsumer extends CheckedIntegerAction
429 >        implements Consumer<Integer>
430 >    {
431 >        FailingConsumer(ExecutionMode m) { super(m); }
432          public void accept(Integer x) {
433 <            m.checkExecutionMode();
434 <            invocationCount++;
433 >            invoked();
434 >            value = x;
435              throw new CFException();
436          }
437      }
438 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
439 <        final ExecutionMode m;
440 <        int invocationCount = 0;
441 <        FailingBiConsumer(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
445 <            invocationCount++;
444 >            invoked();
445 >            value = subtract(x, y);
446              throw new CFException();
447          }
448      }
449 <    static final class FailingFunction implements Function<Integer, Integer> {
450 <        final ExecutionMode m;
451 <        int invocationCount = 0;
452 <        FailingFunction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
456 <            invocationCount++;
455 >            invoked();
456 >            value = x;
457              throw new CFException();
458          }
459      }
460 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
461 <        final ExecutionMode m;
462 <        int invocationCount = 0;
463 <        FailingBiFunction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
467 <            invocationCount++;
466 >            invoked();
467 >            value = subtract(x, y);
468              throw new CFException();
469          }
470      }
471 <    static final class FailingRunnable implements Runnable {
472 <        final ExecutionMode m;
473 <        int invocationCount = 0;
449 <        FailingRunnable(ExecutionMode m) { this.m = m; }
471 >
472 >    class FailingRunnable extends CheckedAction implements Runnable {
473 >        FailingRunnable(ExecutionMode m) { super(m); }
474          public void run() {
475 <            m.checkExecutionMode();
452 <            invocationCount++;
475 >            invoked();
476              throw new CFException();
477          }
478      }
479  
480 <    static final class CompletableFutureInc
481 <        implements Function<Integer, CompletableFuture<Integer>> {
482 <        final ExecutionMode m;
483 <        int invocationCount = 0;
484 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
487 <            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 <        final ExecutionMode m;
497 <        int invocationCount = 0;
475 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
500 <            invocationCount++;
499 >            invoked();
500 >            value = x;
501              throw new CFException();
502          }
503      }
# Line 496 | Line 518 | public class CompletableFutureTest exten
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 571 | 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 638 | Line 673 | public class CompletableFutureTest exten
673              public void checkExecutionMode() {
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) {
684                  return f.thenRunAsync(a, new ThreadExecutor());
# Line 702 | 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 780 | 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 801 | 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 826 | 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 854 | 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 882 | 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 909 | 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 933 | 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 948 | Line 998 | public class CompletableFutureTest exten
998      /**
999       * runAsync completes after running Runnable
1000       */
1001 <    public void testRunAsync() {
1002 <        Noop r = new Noop(ExecutionMode.ASYNC);
1003 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1004 <        assertNull(f.join());
1005 <        assertEquals(1, r.invocationCount);
1006 <        checkCompletedNormally(f, null);
1007 <    }
1008 <
1009 <    /**
960 <     * runAsync with executor completes after running Runnable
961 <     */
962 <    public void testRunAsync2() {
963 <        Noop r = new Noop(ExecutionMode.EXECUTOR);
964 <        ThreadExecutor exec = new ThreadExecutor();
965 <        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());
967        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 <        FailingRunnable r = new FailingRunnable(ExecutionMode.ASYNC);
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);
999 <        checkCompletedNormally(f, one);
1000 <    }
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(ExecutionMode.ASYNC);
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 1030 | Line 1083 | public class CompletableFutureTest exten
1083  
1084          checkCompletedNormally(g, null);
1085          checkCompletedNormally(f, v1);
1086 <        assertEquals(1, r.invocationCount);
1086 >        r.assertInvoked();
1087      }}
1088  
1089      /**
# Line 1053 | Line 1106 | public class CompletableFutureTest exten
1106  
1107          checkCompletedWithWrappedCFException(g, ex);
1108          checkCompletedWithWrappedCFException(f, ex);
1109 <        assertEquals(0, r.invocationCount);
1109 >        r.assertNotInvoked();
1110      }}
1111  
1112      /**
# Line 1075 | Line 1128 | public class CompletableFutureTest exten
1128  
1129          checkCompletedWithWrappedCancellationException(g);
1130          checkCancelled(f);
1131 <        assertEquals(0, r.invocationCount);
1131 >        r.assertNotInvoked();
1132      }}
1133  
1134      /**
# Line 1118 | Line 1171 | public class CompletableFutureTest exten
1171  
1172          checkCompletedNormally(g, inc(v1));
1173          checkCompletedNormally(f, v1);
1174 <        assertEquals(1, r.invocationCount);
1174 >        r.assertInvoked();
1175      }}
1176  
1177      /**
# Line 1141 | Line 1194 | public class CompletableFutureTest exten
1194  
1195          checkCompletedWithWrappedCFException(g, ex);
1196          checkCompletedWithWrappedCFException(f, ex);
1197 <        assertEquals(0, r.invocationCount);
1197 >        r.assertNotInvoked();
1198      }}
1199  
1200      /**
# Line 1163 | Line 1216 | public class CompletableFutureTest exten
1216  
1217          checkCompletedWithWrappedCancellationException(g);
1218          checkCancelled(f);
1219 <        assertEquals(0, r.invocationCount);
1219 >        r.assertNotInvoked();
1220      }}
1221  
1222      /**
# Line 1196 | Line 1249 | public class CompletableFutureTest exten
1249          for (Integer v1 : new Integer[] { 1, null })
1250      {
1251          final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 <        final IncAction r = new IncAction();
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) {
# Line 1205 | Line 1258 | public class CompletableFutureTest exten
1258          }
1259  
1260          checkCompletedNormally(g, null);
1261 +        r.assertValue(v1);
1262          checkCompletedNormally(f, v1);
1209        assertEquals(1, r.invocationCount);
1210        assertEquals(inc(v1), r.value);
1263      }}
1264  
1265      /**
# Line 1220 | Line 1272 | public class CompletableFutureTest exten
1272      {
1273          final CFException ex = new CFException();
1274          final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 <        final IncAction r = new IncAction();
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) {
# Line 1230 | Line 1282 | public class CompletableFutureTest exten
1282  
1283          checkCompletedWithWrappedCFException(g, ex);
1284          checkCompletedWithWrappedCFException(f, ex);
1285 <        assertEquals(0, r.invocationCount);
1285 >        r.assertNotInvoked();
1286      }}
1287  
1288      /**
1289 <     * thenAccept result completes exceptionally if action does
1289 >     * thenAccept result completes exceptionally if source cancelled
1290       */
1291 <    public void testThenAccept_actionFailed() {
1291 >    public void testThenAccept_sourceCancelled() {
1292          for (ExecutionMode m : ExecutionMode.values())
1293          for (boolean createIncomplete : new boolean[] { true, false })
1294 <        for (Integer v1 : new Integer[] { 1, null })
1294 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1295      {
1296          final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 <        final FailingConsumer r = new FailingConsumer(m);
1298 <        if (!createIncomplete) f.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 <            f.complete(v1);
1302 >            assertTrue(f.cancel(mayInterruptIfRunning));
1303          }
1304  
1305 <        checkCompletedWithWrappedCFException(g);
1306 <        checkCompletedNormally(f, v1);
1305 >        checkCompletedWithWrappedCancellationException(g);
1306 >        checkCancelled(f);
1307 >        r.assertNotInvoked();
1308      }}
1309  
1310      /**
1311 <     * thenAccept result completes exceptionally if source cancelled
1311 >     * thenAccept result completes exceptionally if action does
1312       */
1313 <    public void testThenAccept_sourceCancelled() {
1313 >    public void testThenAccept_actionFailed() {
1314          for (ExecutionMode m : ExecutionMode.values())
1315          for (boolean createIncomplete : new boolean[] { true, false })
1316 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1316 >        for (Integer v1 : new Integer[] { 1, null })
1317      {
1318          final CompletableFuture<Integer> f = new CompletableFuture<>();
1319 <        final IncAction r = new IncAction();
1320 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
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 <            assertTrue(f.cancel(mayInterruptIfRunning));
1324 >            f.complete(v1);
1325          }
1326  
1327 <        checkCompletedWithWrappedCancellationException(g);
1328 <        checkCancelled(f);
1276 <        assertEquals(0, r.invocationCount);
1327 >        checkCompletedWithWrappedCFException(g);
1328 >        checkCompletedNormally(f, v1);
1329      }}
1330  
1331      /**
# Line 1297 | Line 1349 | public class CompletableFutureTest exten
1349          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1350          if (createIncomplete) {
1351              checkIncomplete(h);
1352 <            assertEquals(0, r.invocationCount);
1352 >            r.assertNotInvoked();
1353              if (!fFirst) f.complete(v1); else g.complete(v2);
1354          }
1355  
1356          checkCompletedNormally(h, subtract(v1, v2));
1357          checkCompletedNormally(f, v1);
1358          checkCompletedNormally(g, v2);
1359 <        assertEquals(1, r.invocationCount);
1359 >        r.assertInvoked();
1360      }}
1361  
1362      /**
# Line 1332 | Line 1384 | public class CompletableFutureTest exten
1384          }
1385  
1386          checkCompletedWithWrappedCFException(h, ex);
1387 <        assertEquals(0, r.invocationCount);
1387 >        r.assertNotInvoked();
1388          checkCompletedNormally(fFirst ? f : g, v1);
1389          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1390      }}
1391  
1392      /**
1341     * thenCombine result completes exceptionally if action does
1342     */
1343    public void testThenCombine_actionFailed() {
1344        for (ExecutionMode m : ExecutionMode.values())
1345        for (boolean fFirst : new boolean[] { true, false })
1346        for (Integer v1 : new Integer[] { 1, null })
1347        for (Integer v2 : new Integer[] { 2, null })
1348    {
1349        final CompletableFuture<Integer> f = new CompletableFuture<>();
1350        final CompletableFuture<Integer> g = new CompletableFuture<>();
1351        final FailingBiFunction r = new FailingBiFunction(m);
1352        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1353
1354        if (fFirst) {
1355            f.complete(v1);
1356            g.complete(v2);
1357        } else {
1358            g.complete(v2);
1359            f.complete(v1);
1360        }
1361
1362        checkCompletedWithWrappedCFException(h);
1363        checkCompletedNormally(f, v1);
1364        checkCompletedNormally(g, v2);
1365    }}
1366
1367    /**
1393       * thenCombine result completes exceptionally if either source cancelled
1394       */
1395      public void testThenCombine_sourceCancelled() {
# Line 1389 | Line 1414 | public class CompletableFutureTest exten
1414  
1415          checkCompletedWithWrappedCancellationException(h);
1416          checkCancelled(!fFirst ? f : g);
1417 <        assertEquals(0, r.invocationCount);
1417 >        r.assertNotInvoked();
1418          checkCompletedNormally(fFirst ? f : g, v1);
1419      }}
1420  
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 FailingBiFunction r = new FailingBiFunction(m);
1433 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1434 +
1435 +        if (fFirst) {
1436 +            f.complete(v1);
1437 +            g.complete(v2);
1438 +        } else {
1439 +            g.complete(v2);
1440 +            f.complete(v1);
1441 +        }
1442 +
1443 +        checkCompletedWithWrappedCFException(h);
1444 +        checkCompletedNormally(f, v1);
1445 +        checkCompletedNormally(g, v2);
1446 +    }}
1447 +
1448 +    /**
1449       * thenAcceptBoth result completes normally after normal
1450       * completion of sources
1451       */
# Line 1414 | Line 1466 | public class CompletableFutureTest exten
1466          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1467          if (createIncomplete) {
1468              checkIncomplete(h);
1469 <            assertEquals(0, r.invocationCount);
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 1449 | Line 1501 | public class CompletableFutureTest exten
1501          }
1502  
1503          checkCompletedWithWrappedCFException(h, ex);
1504 <        assertEquals(0, r.invocationCount);
1504 >        r.assertNotInvoked();
1505          checkCompletedNormally(fFirst ? f : g, v1);
1506          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1507      }}
1508  
1509      /**
1458     * thenAcceptBoth result completes exceptionally if action does
1459     */
1460    public void testThenAcceptBoth_actionFailed() {
1461        for (ExecutionMode m : ExecutionMode.values())
1462        for (boolean fFirst : new boolean[] { true, false })
1463        for (Integer v1 : new Integer[] { 1, null })
1464        for (Integer v2 : new Integer[] { 2, null })
1465    {
1466        final CompletableFuture<Integer> f = new CompletableFuture<>();
1467        final CompletableFuture<Integer> g = new CompletableFuture<>();
1468        final FailingBiConsumer r = new FailingBiConsumer(m);
1469        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1470
1471        if (fFirst) {
1472            f.complete(v1);
1473            g.complete(v2);
1474        } else {
1475            g.complete(v2);
1476            f.complete(v1);
1477        }
1478
1479        checkCompletedWithWrappedCFException(h);
1480        checkCompletedNormally(f, v1);
1481        checkCompletedNormally(g, v2);
1482    }}
1483
1484    /**
1510       * thenAcceptBoth result completes exceptionally if either source cancelled
1511       */
1512      public void testThenAcceptBoth_sourceCancelled() {
# Line 1506 | Line 1531 | public class CompletableFutureTest exten
1531  
1532          checkCompletedWithWrappedCancellationException(h);
1533          checkCancelled(!fFirst ? f : g);
1534 <        assertEquals(0, r.invocationCount);
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_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(m);
1550 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1551 +
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);
1562 +        checkCompletedNormally(g, v2);
1563 +    }}
1564 +
1565 +    /**
1566       * runAfterBoth result completes normally after normal
1567       * completion of sources
1568       */
# Line 1531 | Line 1583 | public class CompletableFutureTest exten
1583          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584          if (createIncomplete) {
1585              checkIncomplete(h);
1586 <            assertEquals(0, r.invocationCount);
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 1566 | Line 1618 | public class CompletableFutureTest exten
1618          }
1619  
1620          checkCompletedWithWrappedCFException(h, ex);
1621 <        assertEquals(0, r.invocationCount);
1621 >        r.assertNotInvoked();
1622          checkCompletedNormally(fFirst ? f : g, v1);
1623          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1624      }}
1625  
1626      /**
1575     * runAfterBoth result completes exceptionally if action does
1576     */
1577    public void testRunAfterBoth_actionFailed() {
1578        for (ExecutionMode m : ExecutionMode.values())
1579        for (boolean fFirst : new boolean[] { true, false })
1580        for (Integer v1 : new Integer[] { 1, null })
1581        for (Integer v2 : new Integer[] { 2, null })
1582    {
1583        final CompletableFuture<Integer> f = new CompletableFuture<>();
1584        final CompletableFuture<Integer> g = new CompletableFuture<>();
1585        final FailingRunnable r = new FailingRunnable(m);
1586
1587        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1588        if (fFirst) {
1589            f.complete(v1);
1590            g.complete(v2);
1591        } else {
1592            g.complete(v2);
1593            f.complete(v1);
1594        }
1595        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1596
1597        checkCompletedWithWrappedCFException(h1);
1598        checkCompletedWithWrappedCFException(h2);
1599        checkCompletedNormally(f, v1);
1600        checkCompletedNormally(g, v2);
1601    }}
1602
1603    /**
1627       * runAfterBoth result completes exceptionally if either source cancelled
1628       */
1629      public void testRunAfterBoth_sourceCancelled() {
# Line 1626 | Line 1649 | public class CompletableFutureTest exten
1649  
1650          checkCompletedWithWrappedCancellationException(h);
1651          checkCancelled(!fFirst ? f : g);
1652 <        assertEquals(0, r.invocationCount);
1652 >        r.assertNotInvoked();
1653          checkCompletedNormally(fFirst ? f : g, v1);
1654      }}
1655  
1656      /**
1657 <     * applyToEither result completes normally after normal completion
1635 <     * of either source
1657 >     * runAfterBoth result completes exceptionally if action does
1658       */
1659 <    public void testApplyToEither_normalCompletion() {
1638 <        for (ExecutionMode m : ExecutionMode.values())
1639 <        for (boolean createIncomplete : new boolean[] { true, false })
1640 <        for (boolean fFirst : new boolean[] { true, false })
1641 <        for (Integer v1 : new Integer[] { 1, null })
1642 <        for (Integer v2 : new Integer[] { 2, null })
1643 <    {
1644 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1645 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1646 <        final IncFunction r = new IncFunction(m);
1647 <
1648 <        if (!createIncomplete)
1649 <            if (fFirst) f.complete(v1); else g.complete(v2);
1650 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1651 <        if (createIncomplete) {
1652 <            checkIncomplete(h);
1653 <            assertEquals(0, r.invocationCount);
1654 <            if (fFirst) f.complete(v1); else g.complete(v2);
1655 <        }
1656 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1657 <        if (!fFirst) f.complete(v1); else g.complete(v2);
1658 <
1659 <        checkCompletedNormally(f, v1);
1660 <        checkCompletedNormally(g, v2);
1661 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1662 <    }}
1663 <
1664 <    public void testApplyToEither_normalCompletionBothAvailable() {
1659 >    public void testRunAfterBoth_actionFailed() {
1660          for (ExecutionMode m : ExecutionMode.values())
1661          for (boolean fFirst : new boolean[] { true, false })
1662          for (Integer v1 : new Integer[] { 1, null })
# Line 1669 | Line 1664 | public class CompletableFutureTest exten
1664      {
1665          final CompletableFuture<Integer> f = new CompletableFuture<>();
1666          final CompletableFuture<Integer> g = new CompletableFuture<>();
1667 <        final IncFunction r = new IncFunction(m);
1667 >        final FailingRunnable r1 = new FailingRunnable(m);
1668 >        final FailingRunnable r2 = new FailingRunnable(m);
1669  
1670 +        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1671          if (fFirst) {
1672              f.complete(v1);
1673              g.complete(v2);
# Line 1678 | Line 1675 | public class CompletableFutureTest exten
1675              g.complete(v2);
1676              f.complete(v1);
1677          }
1678 +        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1679  
1680 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1681 <
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682          checkCompletedNormally(f, v1);
1683          checkCompletedNormally(g, v2);
1686
1687        // unspecified behavior
1688        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1689                   Objects.equals(h.join(), inc(v2)));
1690        assertEquals(1, r.invocationCount);
1684      }}
1685  
1686      /**
1687 <     * applyToEither result completes exceptionally after exceptional
1688 <     * completion of either source
1687 >     * applyToEither result completes normally after normal completion
1688 >     * of either source
1689       */
1690 <    public void testApplyToEither_exceptionalCompletion1() {
1690 >    public void testApplyToEither_normalCompletion() {
1691          for (ExecutionMode m : ExecutionMode.values())
1699        for (boolean createIncomplete : new boolean[] { true, false })
1700        for (boolean fFirst : new boolean[] { true, false })
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 CFException ex = new CFException();
1698 <        final IncFunction r = new IncFunction(m);
1697 >        final IncFunction[] rs = new IncFunction[6];
1698 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1699  
1700 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1701 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1702 <        if (createIncomplete) {
1703 <            checkIncomplete(h);
1704 <            assertEquals(0, r.invocationCount);
1705 <            (fFirst ? f : g).completeExceptionally(ex);
1706 <        }
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(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);
1714  
1715 <        checkCompletedWithWrappedCFException(h, ex);
1716 <        (!fFirst ? f : g).complete(v1);
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 <        assertEquals(0, r.invocationCount);
1726 <        checkCompletedNormally(!fFirst ? f : g, v1);
1727 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1728 <        checkCompletedWithWrappedCFException(h, ex);
1725 >        checkCompletedNormally(f, v1);
1726 >        checkCompletedNormally(g, v2);
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 <    public void testApplyToEither_exceptionalCompletion2() {
1734 >    /**
1735 >     * applyToEither result completes exceptionally after exceptional
1736 >     * completion of either source
1737 >     */
1738 >    public void testApplyToEither_exceptionalCompletion() {
1739          for (ExecutionMode m : ExecutionMode.values())
1727        for (boolean reverseArgs : new boolean[] { true, false })
1728        for (boolean fFirst : new boolean[] { true, false })
1740          for (Integer v1 : new Integer[] { 1, null })
1741      {
1742          final CompletableFuture<Integer> f = new CompletableFuture<>();
1743          final CompletableFuture<Integer> g = new CompletableFuture<>();
1733        final IncFunction r1 = new IncFunction(m);
1734        final IncFunction r2 = new IncFunction(m);
1744          final CFException ex = new CFException();
1745 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1746 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1738 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1739 <        if (fFirst) {
1740 <            f.complete(v1);
1741 <            g.completeExceptionally(ex);
1742 <        } else {
1743 <            g.completeExceptionally(ex);
1744 <            f.complete(v1);
1745 <        }
1746 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1745 >        final IncFunction[] rs = new IncFunction[6];
1746 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1747  
1748 <        // unspecified behavior
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(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 >        // 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), h1.join());
1768 <            assertEquals(1, r1.invocationCount);
1767 >            assertEquals(inc(v1), h4.join());
1768 >            rs[4].assertInvoked();
1769          } catch (CompletionException ok) {
1770 <            checkCompletedWithWrappedCFException(h1, ex);
1771 <            assertEquals(0, r1.invocationCount);
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772          }
1756
1773          try {
1774 <            assertEquals(inc(v1), h2.join());
1775 <            assertEquals(1, r2.invocationCount);
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertInvoked();
1776          } catch (CompletionException ok) {
1777 <            checkCompletedWithWrappedCFException(h2, ex);
1778 <            assertEquals(0, r2.invocationCount);
1777 >            checkCompletedWithWrappedCFException(h5, ex);
1778 >            rs[5].assertNotInvoked();
1779          }
1780  
1781 <        checkCompletedWithWrappedCFException(g, ex);
1782 <        checkCompletedNormally(f, v1);
1783 <    }}
1784 <
1785 <    /**
1786 <     * applyToEither result completes exceptionally if action does
1787 <     */
1788 <    public void testApplyToEither_actionFailed1() {
1773 <        for (ExecutionMode m : ExecutionMode.values())
1774 <        for (Integer v1 : new Integer[] { 1, null })
1775 <        for (Integer v2 : new Integer[] { 2, null })
1776 <    {
1777 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1778 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1779 <        final FailingFunction r = new FailingFunction(m);
1780 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1781 <
1782 <        f.complete(v1);
1783 <        checkCompletedWithWrappedCFException(h);
1784 <        g.complete(v2);
1785 <        checkCompletedNormally(f, v1);
1786 <        checkCompletedNormally(g, v2);
1787 <    }}
1788 <
1789 <    public void testApplyToEither_actionFailed2() {
1790 <        for (ExecutionMode m : ExecutionMode.values())
1791 <        for (Integer v1 : new Integer[] { 1, null })
1792 <        for (Integer v2 : new Integer[] { 2, null })
1793 <    {
1794 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1795 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1796 <        final FailingFunction r = new FailingFunction(m);
1797 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1798 <
1799 <        g.complete(v2);
1800 <        checkCompletedWithWrappedCFException(h);
1801 <        f.complete(v1);
1802 <        checkCompletedNormally(f, v1);
1803 <        checkCompletedNormally(g, v2);
1781 >        checkCompletedWithWrappedCFException(f, ex);
1782 >        checkCompletedNormally(g, v1);
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 })
1812        for (boolean createIncomplete : new boolean[] { true, false })
1813        for (boolean fFirst : 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(m);
1802 <
1820 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1821 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1822 <        if (createIncomplete) {
1823 <            checkIncomplete(h);
1824 <            assertEquals(0, r.invocationCount);
1825 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1826 <        }
1827 <
1828 <        checkCompletedWithWrappedCancellationException(h);
1829 <        (!fFirst ? f : g).complete(v1);
1801 >        final IncFunction[] rs = new IncFunction[6];
1802 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1803  
1804 <        assertEquals(0, r.invocationCount);
1805 <        checkCompletedNormally(!fFirst ? f : g, v1);
1806 <        checkCancelled(fFirst ? f : g);
1807 <        checkCompletedWithWrappedCancellationException(h);
1808 <    }}
1809 <
1810 <    public void testApplyToEither_sourceCancelled2() {
1811 <        for (ExecutionMode m : ExecutionMode.values())
1812 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1813 <        for (boolean reverseArgs : new boolean[] { true, false })
1814 <        for (boolean fFirst : new boolean[] { true, false })
1815 <        for (Integer v1 : new Integer[] { 1, null })
1816 <    {
1817 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1845 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1846 <        final IncFunction r1 = new IncFunction(m);
1847 <        final IncFunction r2 = new IncFunction(m);
1848 <        final CFException ex = new CFException();
1849 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1850 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1851 <
1852 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1853 <        if (fFirst) {
1854 <            f.complete(v1);
1855 <            assertTrue(g.cancel(mayInterruptIfRunning));
1856 <        } else {
1857 <            assertTrue(g.cancel(mayInterruptIfRunning));
1858 <            f.complete(v1);
1859 <        }
1860 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
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 <        // unspecified behavior
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), h1.join());
1824 <            assertEquals(1, r1.invocationCount);
1823 >            assertEquals(inc(v1), h4.join());
1824 >            rs[4].assertInvoked();
1825          } catch (CompletionException ok) {
1826 <            checkCompletedWithWrappedCancellationException(h1);
1827 <            assertEquals(0, r1.invocationCount);
1826 >            checkCompletedWithWrappedCancellationException(h4);
1827 >            rs[4].assertNotInvoked();
1828          }
1870
1829          try {
1830 <            assertEquals(inc(v1), h2.join());
1831 <            assertEquals(1, r2.invocationCount);
1830 >            assertEquals(inc(v1), h5.join());
1831 >            rs[5].assertInvoked();
1832          } catch (CompletionException ok) {
1833 <            checkCompletedWithWrappedCancellationException(h2);
1834 <            assertEquals(0, r2.invocationCount);
1833 >            checkCompletedWithWrappedCancellationException(h5);
1834 >            rs[5].assertNotInvoked();
1835          }
1836  
1837 <        checkCancelled(g);
1838 <        checkCompletedNormally(f, v1);
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
1885 <     * 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);
1865 <
1866 <        checkCompletedNormally(f, v1);
1867 <        checkCompletedNormally(g, v2);
1868 <        checkCompletedNormally(h, null);
1905 <    }}
1906 <
1907 <    public void testAcceptEither_normalCompletion2() {
1908 <        for (ExecutionMode m : ExecutionMode.values())
1909 <        for (Integer v1 : new Integer[] { 1, null })
1910 <        for (Integer v2 : new Integer[] { 2, null })
1911 <    {
1912 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1913 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1914 <        final IncAction r = new IncAction();
1915 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
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          g.complete(v2);
1871 <        checkCompletedNormally(h, null);
1872 <        assertEquals(inc(v2), r.value);
1873 <        f.complete(v1);
1871 >
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 >        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);
1924        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);
1938        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<>();
1959        final IncAction r = new IncAction();
1960        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);
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 <        assertEquals(0, r.invocationCount);
1968 <        checkCompletedNormally(g, v1);
1969 <        checkCompletedWithWrappedCFException(f, ex);
1970 <        checkCompletedWithWrappedCFException(h, ex);
1971 <    }}
1972 <
1973 <    public void testAcceptEither_exceptionalCompletion2() {
1974 <        for (ExecutionMode m : ExecutionMode.values())
1975 <        for (Integer v1 : new Integer[] { 1, null })
1976 <    {
1977 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1978 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1979 <        final IncAction r = new IncAction();
1980 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1981 <        final CFException ex = new CFException();
1982 <
1983 <        g.completeExceptionally(ex);
1984 <        checkCompletedWithWrappedCFException(h, ex);
1985 <        f.complete(v1);
1986 <
1987 <        assertEquals(0, r.invocationCount);
1988 <        checkCompletedNormally(f, v1);
1989 <        checkCompletedWithWrappedCFException(g, ex);
1990 <        checkCompletedWithWrappedCFException(h, ex);
1991 <    }}
1992 <
1993 <    public void testAcceptEither_exceptionalCompletion3() {
1994 <        for (ExecutionMode m : ExecutionMode.values())
1995 <        for (Integer v1 : new Integer[] { 1, null })
1996 <    {
1997 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1998 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1999 <        final IncAction r = new IncAction();
2000 <        final CFException ex = new CFException();
2001 <
2002 <        g.completeExceptionally(ex);
2003 <        f.complete(v1);
2004 <        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);
2011 <            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          }
2016
2017        checkCompletedWithWrappedCFException(g, ex);
2018        checkCompletedNormally(f, v1);
2019    }}
2020
2021    public void testAcceptEither_exceptionalCompletion4() {
2022        for (ExecutionMode m : ExecutionMode.values())
2023        for (Integer v1 : new Integer[] { 1, null })
2024    {
2025        final CompletableFuture<Integer> f = new CompletableFuture<>();
2026        final CompletableFuture<Integer> g = new CompletableFuture<>();
2027        final IncAction r = new IncAction();
2028        final CFException ex = new CFException();
2029
2030        f.completeExceptionally(ex);
2031        g.complete(v1);
2032        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2033
2034        // unspecified behavior
2035        Integer v;
1979          try {
1980 <            assertNull(h.join());
1981 <            assertEquals(1, r.invocationCount);
2039 <            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() {
2053 <        for (ExecutionMode m : ExecutionMode.values())
2054 <        for (Integer v1 : new Integer[] { 1, null })
2055 <        for (Integer v2 : new Integer[] { 2, null })
2056 <    {
2057 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2058 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2059 <        final FailingConsumer r = new FailingConsumer(m);
2060 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2061 <
2062 <        f.complete(v1);
2063 <        checkCompletedWithWrappedCFException(h);
2064 <        g.complete(v2);
2065 <        checkCompletedNormally(f, v1);
2066 <        checkCompletedNormally(g, v2);
2067 <    }}
2068 <
2069 <    public void testAcceptEither_actionFailed2() {
2070 <        for (ExecutionMode m : ExecutionMode.values())
2071 <        for (Integer v1 : new Integer[] { 1, null })
2072 <        for (Integer v2 : new Integer[] { 2, null })
2073 <    {
2074 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2075 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2076 <        final FailingConsumer r = new FailingConsumer(m);
2077 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2078 <
2079 <        g.complete(v2);
2080 <        checkCompletedWithWrappedCFException(h);
2081 <        f.complete(v1);
2082 <        checkCompletedNormally(f, v1);
2083 <        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  
2099        assertTrue(f.cancel(mayInterruptIfRunning));
2100        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);
2104        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())
2111        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);
2124 <        assertEquals(0, r.invocationCount);
2125 <        checkCompletedNormally(f, v1);
2126 <        checkCompletedWithWrappedCancellationException(h);
2127 <    }}
2128 <
2129 <    public void testAcceptEither_sourceCancelled3() {
2130 <        for (ExecutionMode m : ExecutionMode.values())
2131 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2132 <        for (Integer v1 : new Integer[] { 1, null })
2133 <    {
2134 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2135 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2136 <        final IncAction r = new IncAction();
2137 <
2138 <        assertTrue(g.cancel(mayInterruptIfRunning));
2139 <        f.complete(v1);
2140 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2077 >        g.complete(v2);
2078  
2079 <        // unspecified behavior
2080 <        Integer v;
2081 <        try {
2082 <            assertNull(h.join());
2083 <            assertEquals(1, r.invocationCount);
2084 <            assertEquals(inc(v1), r.value);
2085 <        } catch (CompletionException ok) {
2086 <            checkCompletedWithWrappedCancellationException(h);
2087 <            assertEquals(0, r.invocationCount);
2088 <        }
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 >        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  
2153        checkCancelled(g);
2090          checkCompletedNormally(f, v1);
2091 <    }}
2156 <
2157 <    public void testAcceptEither_sourceCancelled4() {
2158 <        for (ExecutionMode m : ExecutionMode.values())
2159 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2160 <        for (Integer v1 : new Integer[] { 1, null })
2161 <    {
2162 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2163 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2164 <        final IncAction r = new IncAction();
2165 <
2166 <        assertTrue(f.cancel(mayInterruptIfRunning));
2167 <        g.complete(v1);
2168 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2169 <
2170 <        // unspecified behavior
2171 <        Integer v;
2172 <        try {
2173 <            assertNull(h.join());
2174 <            assertEquals(1, r.invocationCount);
2175 <            assertEquals(inc(v1), r.value);
2176 <        } catch (CompletionException ok) {
2177 <            checkCompletedWithWrappedCancellationException(h);
2178 <            assertEquals(0, r.invocationCount);
2179 <        }
2180 <
2181 <        checkCancelled(f);
2182 <        checkCompletedNormally(g, v1);
2091 >        checkCompletedNormally(g, v2);
2092      }}
2093  
2094      /**
# Line 2198 | Line 2107 | public class CompletableFutureTest exten
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 2219 | Line 2128 | public class CompletableFutureTest exten
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 2244 | 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 2265 | 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 2285 | 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 2308 | 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 2335 | 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 2400 | 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 2420 | 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 2442 | 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 2469 | 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 2495 | Line 2404 | public class CompletableFutureTest exten
2404  
2405          checkCompletedNormally(g, inc(v1));
2406          checkCompletedNormally(f, v1);
2407 <        assertEquals(1, r.invocationCount);
2407 >        r.assertInvoked();
2408      }}
2409  
2410      /**
# Line 2515 | Line 2424 | public class CompletableFutureTest exten
2424  
2425          checkCompletedWithWrappedCFException(g, ex);
2426          checkCompletedWithWrappedCFException(f, ex);
2427 <        assertEquals(0, r.invocationCount);
2427 >        r.assertNotInvoked();
2428      }}
2429  
2430      /**
# Line 2575 | 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 2589 | 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 2647 | 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),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines