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.66 by jsr166, Fri Jun 6 19:19:04 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() {
1659 >    public void testRunAfterBoth_actionFailed() {
1660          for (ExecutionMode m : ExecutionMode.values())
1639        for (boolean createIncomplete : 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 IncFunction r = new IncFunction(m);
1667 >        final FailingRunnable r1 = new FailingRunnable(m);
1668 >        final FailingRunnable r2 = new FailingRunnable(m);
1669  
1670 <        if (!createIncomplete)
1671 <            if (fFirst) f.complete(v1); else g.complete(v2);
1672 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1673 <        if (createIncomplete) {
1674 <            checkIncomplete(h);
1675 <            assertEquals(0, r.invocationCount);
1676 <            if (fFirst) f.complete(v1); else g.complete(v2);
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 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1657 <        if (!fFirst) f.complete(v1); else g.complete(v2);
1678 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1679  
1680 +        checkCompletedWithWrappedCFException(h1);
1681 +        checkCompletedWithWrappedCFException(h2);
1682          checkCompletedNormally(f, v1);
1683          checkCompletedNormally(g, v2);
1661        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1684      }}
1685  
1686 <    public void testApplyToEither_normalCompletionBothAvailable() {
1686 >    /**
1687 >     * applyToEither result completes normally after normal completion
1688 >     * of either source
1689 >     */
1690 >    public void testApplyToEither_normalCompletion() {
1691          for (ExecutionMode m : ExecutionMode.values())
1666        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 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 (fFirst) {
1701 <            f.complete(v1);
1702 <            g.complete(v2);
1703 <        } else {
1704 <            g.complete(v2);
1705 <            f.complete(v1);
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 <        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())
1699        for (boolean createIncomplete : new boolean[] { true, false })
1700        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<>();
1744          final CFException ex = new CFException();
1745 <        final IncFunction r = new IncFunction(m);
1745 >        final IncFunction[] rs = new IncFunction[6];
1746 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1747  
1748 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1749 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1750 <        if (createIncomplete) {
1751 <            checkIncomplete(h);
1752 <            assertEquals(0, r.invocationCount);
1753 <            (fFirst ? f : g).completeExceptionally(ex);
1754 <        }
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 <        checkCompletedWithWrappedCFException(h, ex);
1764 <        (!fFirst ? f : g).complete(v1);
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), h4.join());
1768 >            rs[4].assertValue(inc(v1));
1769 >        } catch (CompletionException ok) {
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772 >        }
1773 >        try {
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertValue(inc(v1));
1776 >        } catch (CompletionException ok) {
1777 >            checkCompletedWithWrappedCFException(h5, ex);
1778 >            rs[5].assertNotInvoked();
1779 >        }
1780  
1781 <        assertEquals(0, r.invocationCount);
1782 <        checkCompletedNormally(!fFirst ? f : g, v1);
1783 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1784 <        checkCompletedWithWrappedCFException(h, ex);
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      public void testApplyToEither_exceptionalCompletion2() {
1792          for (ExecutionMode m : ExecutionMode.values())
1727        for (boolean reverseArgs : new boolean[] { true, false })
1793          for (boolean fFirst : new boolean[] { true, false })
1794          for (Integer v1 : new Integer[] { 1, null })
1795      {
1796          final CompletableFuture<Integer> f = new CompletableFuture<>();
1797          final CompletableFuture<Integer> g = new CompletableFuture<>();
1733        final IncFunction r1 = new IncFunction(m);
1734        final IncFunction r2 = new IncFunction(m);
1798          final CFException ex = new CFException();
1799 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1800 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1801 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1799 >        final IncFunction[] rs = new IncFunction[6];
1800 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1801 >
1802 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1803 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1804          if (fFirst) {
1805              f.complete(v1);
1806              g.completeExceptionally(ex);
# Line 1743 | Line 1808 | public class CompletableFutureTest exten
1808              g.completeExceptionally(ex);
1809              f.complete(v1);
1810          }
1811 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1811 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1812 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1813  
1814 <        // unspecified behavior
1814 >        // unspecified behavior - both source completions available
1815 >        try {
1816 >            assertEquals(inc(v1), h0.join());
1817 >            rs[0].assertValue(inc(v1));
1818 >        } catch (CompletionException ok) {
1819 >            checkCompletedWithWrappedCFException(h0, ex);
1820 >            rs[0].assertNotInvoked();
1821 >        }
1822          try {
1823              assertEquals(inc(v1), h1.join());
1824 <            assertEquals(1, r1.invocationCount);
1824 >            rs[1].assertValue(inc(v1));
1825          } catch (CompletionException ok) {
1826              checkCompletedWithWrappedCFException(h1, ex);
1827 <            assertEquals(0, r1.invocationCount);
1827 >            rs[1].assertNotInvoked();
1828          }
1756
1829          try {
1830              assertEquals(inc(v1), h2.join());
1831 <            assertEquals(1, r2.invocationCount);
1831 >            rs[2].assertValue(inc(v1));
1832          } catch (CompletionException ok) {
1833              checkCompletedWithWrappedCFException(h2, ex);
1834 <            assertEquals(0, r2.invocationCount);
1834 >            rs[2].assertNotInvoked();
1835 >        }
1836 >        try {
1837 >            assertEquals(inc(v1), h3.join());
1838 >            rs[3].assertValue(inc(v1));
1839 >        } catch (CompletionException ok) {
1840 >            checkCompletedWithWrappedCFException(h3, ex);
1841 >            rs[3].assertNotInvoked();
1842          }
1843  
1765        checkCompletedWithWrappedCFException(g, ex);
1766        checkCompletedNormally(f, v1);
1767    }}
1768
1769    /**
1770     * applyToEither result completes exceptionally if action does
1771     */
1772    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);
1844          checkCompletedNormally(f, v1);
1845 <        checkCompletedNormally(g, v2);
1845 >        checkCompletedWithWrappedCFException(g, ex);
1846      }}
1847  
1848      /**
1849       * applyToEither result completes exceptionally if either source cancelled
1850       */
1851 <    public void testApplyToEither_sourceCancelled1() {
1810 <        for (ExecutionMode m : ExecutionMode.values())
1811 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1812 <        for (boolean createIncomplete : new boolean[] { true, false })
1813 <        for (boolean fFirst : new boolean[] { true, false })
1814 <        for (Integer v1 : new Integer[] { 1, null })
1815 <    {
1816 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1817 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1818 <        final IncFunction r = new IncFunction(m);
1819 <
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);
1830 <
1831 <        assertEquals(0, r.invocationCount);
1832 <        checkCompletedNormally(!fFirst ? f : g, v1);
1833 <        checkCancelled(fFirst ? f : g);
1834 <        checkCompletedWithWrappedCancellationException(h);
1835 <    }}
1836 <
1837 <    public void testApplyToEither_sourceCancelled2() {
1851 >    public void testApplyToEither_sourceCancelled() {
1852          for (ExecutionMode m : ExecutionMode.values())
1853          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1840        for (boolean reverseArgs : new boolean[] { true, false })
1841        for (boolean fFirst : new boolean[] { true, false })
1854          for (Integer v1 : new Integer[] { 1, null })
1855      {
1856          final CompletableFuture<Integer> f = new CompletableFuture<>();
1857          final CompletableFuture<Integer> g = new CompletableFuture<>();
1858 <        final IncFunction r1 = new IncFunction(m);
1859 <        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);
1858 >        final IncFunction[] rs = new IncFunction[6];
1859 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1860  
1861 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1862 <        if (fFirst) {
1863 <            f.complete(v1);
1864 <            assertTrue(g.cancel(mayInterruptIfRunning));
1865 <        } else {
1866 <            assertTrue(g.cancel(mayInterruptIfRunning));
1867 <            f.complete(v1);
1868 <        }
1869 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1861 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1862 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1863 >        checkIncomplete(h0);
1864 >        checkIncomplete(h1);
1865 >        rs[0].assertNotInvoked();
1866 >        rs[1].assertNotInvoked();
1867 >        f.cancel(mayInterruptIfRunning);
1868 >        checkCompletedWithWrappedCancellationException(h0);
1869 >        checkCompletedWithWrappedCancellationException(h1);
1870 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1871 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1872 >        checkCompletedWithWrappedCancellationException(h2);
1873 >        checkCompletedWithWrappedCancellationException(h3);
1874 >        g.complete(v1);
1875  
1876 <        // unspecified behavior
1876 >        // unspecified behavior - both source completions available
1877 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1878 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1879          try {
1880 <            assertEquals(inc(v1), h1.join());
1881 <            assertEquals(1, r1.invocationCount);
1880 >            assertEquals(inc(v1), h4.join());
1881 >            rs[4].assertValue(inc(v1));
1882          } catch (CompletionException ok) {
1883 <            checkCompletedWithWrappedCancellationException(h1);
1884 <            assertEquals(0, r1.invocationCount);
1883 >            checkCompletedWithWrappedCancellationException(h4);
1884 >            rs[4].assertNotInvoked();
1885          }
1870
1886          try {
1887 <            assertEquals(inc(v1), h2.join());
1888 <            assertEquals(1, r2.invocationCount);
1887 >            assertEquals(inc(v1), h5.join());
1888 >            rs[5].assertValue(inc(v1));
1889          } catch (CompletionException ok) {
1890 <            checkCompletedWithWrappedCancellationException(h2);
1891 <            assertEquals(0, r2.invocationCount);
1890 >            checkCompletedWithWrappedCancellationException(h5);
1891 >            rs[5].assertNotInvoked();
1892          }
1893  
1894 <        checkCancelled(g);
1895 <        checkCompletedNormally(f, v1);
1894 >        checkCancelled(f);
1895 >        checkCompletedNormally(g, v1);
1896 >        checkCompletedWithWrappedCancellationException(h0);
1897 >        checkCompletedWithWrappedCancellationException(h1);
1898 >        checkCompletedWithWrappedCancellationException(h2);
1899 >        checkCompletedWithWrappedCancellationException(h3);
1900 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1901      }}
1902  
1903      /**
1904 <     * acceptEither result completes normally after normal completion
1885 <     * of either source
1904 >     * applyToEither result completes exceptionally if action does
1905       */
1906 <    public void testAcceptEither_normalCompletion1() {
1906 >    public void testApplyToEither_actionFailed() {
1907          for (ExecutionMode m : ExecutionMode.values())
1908          for (Integer v1 : new Integer[] { 1, null })
1909          for (Integer v2 : new Integer[] { 2, null })
1910      {
1911          final CompletableFuture<Integer> f = new CompletableFuture<>();
1912          final CompletableFuture<Integer> g = new CompletableFuture<>();
1913 <        final IncAction r = new IncAction();
1914 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1913 >        final FailingFunction[] rs = new FailingFunction[6];
1914 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1915  
1916 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1917 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1918          f.complete(v1);
1919 <        checkCompletedNormally(h, null);
1920 <        assertEquals(inc(v1), r.value);
1921 <        g.complete(v2);
1922 <
1923 <        checkCompletedNormally(f, v1);
1924 <        checkCompletedNormally(g, v2);
1925 <        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);
1919 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1920 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1921 >        checkCompletedWithWrappedCFException(h0);
1922 >        checkCompletedWithWrappedCFException(h1);
1923 >        checkCompletedWithWrappedCFException(h2);
1924 >        checkCompletedWithWrappedCFException(h3);
1925 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1926  
1927          g.complete(v2);
1928 <        checkCompletedNormally(h, null);
1929 <        assertEquals(inc(v2), r.value);
1930 <        f.complete(v1);
1928 >
1929 >        // unspecified behavior - both source completions available
1930 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1931 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1932 >
1933 >        checkCompletedWithWrappedCFException(h4);
1934 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1935 >                   Objects.equals(v2, rs[4].value));
1936 >        checkCompletedWithWrappedCFException(h5);
1937 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1938 >                   Objects.equals(v2, rs[5].value));
1939  
1940          checkCompletedNormally(f, v1);
1941          checkCompletedNormally(g, v2);
1924        checkCompletedNormally(h, null);
1942      }}
1943  
1944 <    public void testAcceptEither_normalCompletion3() {
1944 >    /**
1945 >     * acceptEither result completes normally after normal completion
1946 >     * of either source
1947 >     */
1948 >    public void testAcceptEither_normalCompletion() {
1949          for (ExecutionMode m : ExecutionMode.values())
1950          for (Integer v1 : new Integer[] { 1, null })
1951          for (Integer v2 : new Integer[] { 2, null })
1952      {
1953          final CompletableFuture<Integer> f = new CompletableFuture<>();
1954          final CompletableFuture<Integer> g = new CompletableFuture<>();
1955 <        final IncAction r = new IncAction();
1955 >        final NoopConsumer[] rs = new NoopConsumer[6];
1956 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1957  
1958 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1959 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1960 +        checkIncomplete(h0);
1961 +        checkIncomplete(h1);
1962 +        rs[0].assertNotInvoked();
1963 +        rs[1].assertNotInvoked();
1964          f.complete(v1);
1965 +        checkCompletedNormally(h0, null);
1966 +        checkCompletedNormally(h1, null);
1967 +        rs[0].assertValue(v1);
1968 +        rs[1].assertValue(v1);
1969 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1970 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1971 +        checkCompletedNormally(h2, null);
1972 +        checkCompletedNormally(h3, null);
1973 +        rs[2].assertValue(v1);
1974 +        rs[3].assertValue(v1);
1975          g.complete(v2);
1938        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1976  
1977 <        checkCompletedNormally(h, null);
1977 >        // unspecified behavior - both source completions available
1978 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1979 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1980 >        checkCompletedNormally(h4, null);
1981 >        checkCompletedNormally(h5, null);
1982 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1983 >                   Objects.equals(v2, rs[4].value));
1984 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1985 >                   Objects.equals(v2, rs[5].value));
1986 >
1987          checkCompletedNormally(f, v1);
1988          checkCompletedNormally(g, v2);
1989 <
1990 <        // unspecified behavior
1991 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
1992 <                   Objects.equals(r.value, inc(v2)));
1989 >        checkCompletedNormally(h0, null);
1990 >        checkCompletedNormally(h1, null);
1991 >        checkCompletedNormally(h2, null);
1992 >        checkCompletedNormally(h3, null);
1993 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1994      }}
1995  
1996      /**
1997       * acceptEither result completes exceptionally after exceptional
1998       * completion of either source
1999       */
2000 <    public void testAcceptEither_exceptionalCompletion1() {
2000 >    public void testAcceptEither_exceptionalCompletion() {
2001          for (ExecutionMode m : ExecutionMode.values())
2002          for (Integer v1 : new Integer[] { 1, null })
2003      {
2004          final CompletableFuture<Integer> f = new CompletableFuture<>();
2005          final CompletableFuture<Integer> g = new CompletableFuture<>();
1959        final IncAction r = new IncAction();
1960        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2006          final CFException ex = new CFException();
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.completeExceptionally(ex);
2017 <        checkCompletedWithWrappedCFException(h, ex);
2018 <        g.complete(v1);
2019 <
2020 <        assertEquals(0, r.invocationCount);
2021 <        checkCompletedNormally(g, v1);
2022 <        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();
2017 >        checkCompletedWithWrappedCFException(h0, ex);
2018 >        checkCompletedWithWrappedCFException(h1, ex);
2019 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2020 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2021 >        checkCompletedWithWrappedCFException(h2, ex);
2022 >        checkCompletedWithWrappedCFException(h3, ex);
2023  
2024 <        g.completeExceptionally(ex);
2003 <        f.complete(v1);
2004 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2024 >        g.complete(v1);
2025  
2026 <        // unspecified behavior
2027 <        Integer v;
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(h.join());
2031 <            assertEquals(1, r.invocationCount);
2011 <            assertEquals(inc(v1), r.value);
2030 >            assertNull(h4.join());
2031 >            rs[4].assertValue(v1);
2032          } catch (CompletionException ok) {
2033 <            checkCompletedWithWrappedCFException(h, ex);
2034 <            assertEquals(0, r.invocationCount);
2033 >            checkCompletedWithWrappedCFException(h4, ex);
2034 >            rs[4].assertNotInvoked();
2035          }
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;
2036          try {
2037 <            assertNull(h.join());
2038 <            assertEquals(1, r.invocationCount);
2039 <            assertEquals(inc(v1), r.value);
2037 >            assertNull(h5.join());
2038 >            rs[5].assertValue(v1);
2039          } catch (CompletionException ok) {
2040 <            checkCompletedWithWrappedCFException(h, ex);
2041 <            assertEquals(0, r.invocationCount);
2040 >            checkCompletedWithWrappedCFException(h5, ex);
2041 >            rs[5].assertNotInvoked();
2042          }
2043  
2044          checkCompletedWithWrappedCFException(f, ex);
2045          checkCompletedNormally(g, v1);
2046 <    }}
2047 <
2048 <    /**
2049 <     * acceptEither result completes exceptionally if action does
2050 <     */
2051 <    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);
2046 >        checkCompletedWithWrappedCFException(h0, ex);
2047 >        checkCompletedWithWrappedCFException(h1, ex);
2048 >        checkCompletedWithWrappedCFException(h2, ex);
2049 >        checkCompletedWithWrappedCFException(h3, ex);
2050 >        checkCompletedWithWrappedCFException(h4, ex);
2051 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2052      }}
2053  
2054      /**
2055       * acceptEither result completes exceptionally if either source cancelled
2056       */
2057 <    public void testAcceptEither_sourceCancelled1() {
2057 >    public void testAcceptEither_sourceCancelled() {
2058          for (ExecutionMode m : ExecutionMode.values())
2059          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2060          for (Integer v1 : new Integer[] { 1, null })
2061      {
2062          final CompletableFuture<Integer> f = new CompletableFuture<>();
2063          final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 <        final IncAction r = new IncAction();
2065 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2098 <
2099 <        assertTrue(f.cancel(mayInterruptIfRunning));
2100 <        checkCompletedWithWrappedCancellationException(h);
2101 <        g.complete(v1);
2102 <
2103 <        checkCancelled(f);
2104 <        assertEquals(0, r.invocationCount);
2105 <        checkCompletedNormally(g, v1);
2106 <        checkCompletedWithWrappedCancellationException(h);
2107 <    }}
2064 >        final NoopConsumer[] rs = new NoopConsumer[6];
2065 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2066  
2067 <    public void testAcceptEither_sourceCancelled2() {
2068 <        for (ExecutionMode m : ExecutionMode.values())
2069 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2070 <        for (Integer v1 : new Integer[] { 1, null })
2071 <    {
2072 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2073 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2074 <        final IncAction r = new IncAction();
2075 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2067 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2068 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2069 >        checkIncomplete(h0);
2070 >        checkIncomplete(h1);
2071 >        rs[0].assertNotInvoked();
2072 >        rs[1].assertNotInvoked();
2073 >        f.cancel(mayInterruptIfRunning);
2074 >        checkCompletedWithWrappedCancellationException(h0);
2075 >        checkCompletedWithWrappedCancellationException(h1);
2076 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2077 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2078 >        checkCompletedWithWrappedCancellationException(h2);
2079 >        checkCompletedWithWrappedCancellationException(h3);
2080  
2081 <        assertTrue(g.cancel(mayInterruptIfRunning));
2120 <        checkCompletedWithWrappedCancellationException(h);
2121 <        f.complete(v1);
2122 <
2123 <        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);
2081 >        g.complete(v1);
2082  
2083 <        // unspecified behavior
2084 <        Integer v;
2083 >        // unspecified behavior - both source completions available
2084 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2085 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2086          try {
2087 <            assertNull(h.join());
2088 <            assertEquals(1, r.invocationCount);
2147 <            assertEquals(inc(v1), r.value);
2087 >            assertNull(h4.join());
2088 >            rs[4].assertValue(v1);
2089          } catch (CompletionException ok) {
2090 <            checkCompletedWithWrappedCancellationException(h);
2091 <            assertEquals(0, r.invocationCount);
2090 >            checkCompletedWithWrappedCancellationException(h4);
2091 >            rs[4].assertNotInvoked();
2092          }
2152
2153        checkCancelled(g);
2154        checkCompletedNormally(f, v1);
2155    }}
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;
2093          try {
2094 <            assertNull(h.join());
2095 <            assertEquals(1, r.invocationCount);
2175 <            assertEquals(inc(v1), r.value);
2094 >            assertNull(h5.join());
2095 >            rs[5].assertValue(v1);
2096          } catch (CompletionException ok) {
2097 <            checkCompletedWithWrappedCancellationException(h);
2098 <            assertEquals(0, r.invocationCount);
2097 >            checkCompletedWithWrappedCancellationException(h5);
2098 >            rs[5].assertNotInvoked();
2099          }
2100  
2101          checkCancelled(f);
2102          checkCompletedNormally(g, v1);
2103 +        checkCompletedWithWrappedCancellationException(h0);
2104 +        checkCompletedWithWrappedCancellationException(h1);
2105 +        checkCompletedWithWrappedCancellationException(h2);
2106 +        checkCompletedWithWrappedCancellationException(h3);
2107 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2108      }}
2109  
2110      /**
2111 <     * runAfterEither result completes normally after normal completion
2187 <     * of either source
2111 >     * acceptEither result completes exceptionally if action does
2112       */
2113 <    public void testRunAfterEither_normalCompletion1() {
2113 >    public void testAcceptEither_actionFailed() {
2114          for (ExecutionMode m : ExecutionMode.values())
2115          for (Integer v1 : new Integer[] { 1, null })
2116          for (Integer v2 : new Integer[] { 2, null })
2117      {
2118          final CompletableFuture<Integer> f = new CompletableFuture<>();
2119          final CompletableFuture<Integer> g = new CompletableFuture<>();
2120 <        final Noop r = new Noop(m);
2121 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2120 >        final FailingConsumer[] rs = new FailingConsumer[6];
2121 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2122  
2123 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2124 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2125          f.complete(v1);
2126 <        checkCompletedNormally(h, null);
2127 <        assertEquals(1, r.invocationCount);
2126 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2127 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2128 >        checkCompletedWithWrappedCFException(h0);
2129 >        checkCompletedWithWrappedCFException(h1);
2130 >        checkCompletedWithWrappedCFException(h2);
2131 >        checkCompletedWithWrappedCFException(h3);
2132 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2133 >
2134          g.complete(v2);
2135  
2136 +        // unspecified behavior - both source completions available
2137 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2138 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2139 +
2140 +        checkCompletedWithWrappedCFException(h4);
2141 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2142 +                   Objects.equals(v2, rs[4].value));
2143 +        checkCompletedWithWrappedCFException(h5);
2144 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2145 +                   Objects.equals(v2, rs[5].value));
2146 +
2147          checkCompletedNormally(f, v1);
2148          checkCompletedNormally(g, v2);
2206        checkCompletedNormally(h, null);
2207        assertEquals(1, r.invocationCount);
2149      }}
2150  
2151 <    public void testRunAfterEither_normalCompletion2() {
2151 >    /**
2152 >     * runAfterEither result completes normally after normal completion
2153 >     * of either source
2154 >     */
2155 >    public void testRunAfterEither_normalCompletion() {
2156          for (ExecutionMode m : ExecutionMode.values())
2157          for (Integer v1 : new Integer[] { 1, null })
2158          for (Integer v2 : new Integer[] { 2, null })
2159      {
2160          final CompletableFuture<Integer> f = new CompletableFuture<>();
2161          final CompletableFuture<Integer> g = new CompletableFuture<>();
2162 <        final Noop r = new Noop(m);
2163 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2162 >        final Noop[] rs = new Noop[6];
2163 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2164  
2165 <        g.complete(v2);
2166 <        checkCompletedNormally(h, null);
2167 <        assertEquals(1, r.invocationCount);
2165 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2166 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2167 >        checkIncomplete(h0);
2168 >        checkIncomplete(h1);
2169 >        rs[0].assertNotInvoked();
2170 >        rs[1].assertNotInvoked();
2171          f.complete(v1);
2172 +        checkCompletedNormally(h0, null);
2173 +        checkCompletedNormally(h1, null);
2174 +        rs[0].assertInvoked();
2175 +        rs[1].assertInvoked();
2176 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2177 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2178 +        checkCompletedNormally(h2, null);
2179 +        checkCompletedNormally(h3, null);
2180 +        rs[2].assertInvoked();
2181 +        rs[3].assertInvoked();
2182  
2225        checkCompletedNormally(f, v1);
2226        checkCompletedNormally(g, v2);
2227        checkCompletedNormally(h, null);
2228        assertEquals(1, r.invocationCount);
2229        }}
2230
2231    public void testRunAfterEither_normalCompletion3() {
2232        for (ExecutionMode m : ExecutionMode.values())
2233        for (Integer v1 : new Integer[] { 1, null })
2234        for (Integer v2 : new Integer[] { 2, null })
2235    {
2236        final CompletableFuture<Integer> f = new CompletableFuture<>();
2237        final CompletableFuture<Integer> g = new CompletableFuture<>();
2238        final Noop r = new Noop(m);
2239
2240        f.complete(v1);
2183          g.complete(v2);
2242        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2184  
2185 <        checkCompletedNormally(h, null);
2185 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2186 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2187 >
2188          checkCompletedNormally(f, v1);
2189          checkCompletedNormally(g, v2);
2190 <        assertEquals(1, r.invocationCount);
2190 >        checkCompletedNormally(h0, null);
2191 >        checkCompletedNormally(h1, null);
2192 >        checkCompletedNormally(h2, null);
2193 >        checkCompletedNormally(h3, null);
2194 >        checkCompletedNormally(h4, null);
2195 >        checkCompletedNormally(h5, null);
2196 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2197      }}
2198  
2199      /**
2200       * runAfterEither result completes exceptionally after exceptional
2201       * completion of either source
2202       */
2203 <    public void testRunAfterEither_exceptionalCompletion1() {
2203 >    public void testRunAfterEither_exceptionalCompletion() {
2204          for (ExecutionMode m : ExecutionMode.values())
2205          for (Integer v1 : new Integer[] { 1, null })
2206      {
2207          final CompletableFuture<Integer> f = new CompletableFuture<>();
2208          final CompletableFuture<Integer> g = new CompletableFuture<>();
2260        final Noop r = new Noop(m);
2261        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2209          final CFException ex = new CFException();
2210 +        final Noop[] rs = new Noop[6];
2211 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2212  
2213 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2214 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2215 +        checkIncomplete(h0);
2216 +        checkIncomplete(h1);
2217 +        rs[0].assertNotInvoked();
2218 +        rs[1].assertNotInvoked();
2219          f.completeExceptionally(ex);
2220 <        checkCompletedWithWrappedCFException(h, ex);
2221 <        g.complete(v1);
2222 <
2223 <        assertEquals(0, r.invocationCount);
2224 <        checkCompletedNormally(g, v1);
2225 <        checkCompletedWithWrappedCFException(f, ex);
2271 <        checkCompletedWithWrappedCFException(h, ex);
2272 <    }}
2220 >        checkCompletedWithWrappedCFException(h0, ex);
2221 >        checkCompletedWithWrappedCFException(h1, ex);
2222 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2223 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2224 >        checkCompletedWithWrappedCFException(h2, ex);
2225 >        checkCompletedWithWrappedCFException(h3, ex);
2226  
2227 <    public void testRunAfterEither_exceptionalCompletion2() {
2275 <        for (ExecutionMode m : ExecutionMode.values())
2276 <        for (Integer v1 : new Integer[] { 1, null })
2277 <    {
2278 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2280 <        final Noop r = new Noop(m);
2281 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2282 <        final CFException ex = new CFException();
2283 <
2284 <        g.completeExceptionally(ex);
2285 <        checkCompletedWithWrappedCFException(h, ex);
2286 <        f.complete(v1);
2287 <
2288 <        assertEquals(0, r.invocationCount);
2289 <        checkCompletedNormally(f, v1);
2290 <        checkCompletedWithWrappedCFException(g, ex);
2291 <        checkCompletedWithWrappedCFException(h, ex);
2292 <    }}
2293 <
2294 <    public void testRunAfterEither_exceptionalCompletion3() {
2295 <        for (ExecutionMode m : ExecutionMode.values())
2296 <        for (Integer v1 : new Integer[] { 1, null })
2297 <    {
2298 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2299 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2300 <        final Noop r = new Noop(m);
2301 <        final CFException ex = new CFException();
2302 <
2303 <        g.completeExceptionally(ex);
2304 <        f.complete(v1);
2305 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2227 >        g.complete(v1);
2228  
2229 <        // unspecified behavior
2230 <        Integer v;
2229 >        // unspecified behavior - both source completions available
2230 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2231 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2232          try {
2233 <            assertNull(h.join());
2234 <            assertEquals(1, r.invocationCount);
2233 >            assertNull(h4.join());
2234 >            rs[4].assertInvoked();
2235          } catch (CompletionException ok) {
2236 <            checkCompletedWithWrappedCFException(h, ex);
2237 <            assertEquals(0, r.invocationCount);
2236 >            checkCompletedWithWrappedCFException(h4, ex);
2237 >            rs[4].assertNotInvoked();
2238          }
2316
2317        checkCompletedWithWrappedCFException(g, ex);
2318        checkCompletedNormally(f, v1);
2319    }}
2320
2321    public void testRunAfterEither_exceptionalCompletion4() {
2322        for (ExecutionMode m : ExecutionMode.values())
2323        for (Integer v1 : new Integer[] { 1, null })
2324    {
2325        final CompletableFuture<Integer> f = new CompletableFuture<>();
2326        final CompletableFuture<Integer> g = new CompletableFuture<>();
2327        final Noop r = new Noop(m);
2328        final CFException ex = new CFException();
2329
2330        f.completeExceptionally(ex);
2331        g.complete(v1);
2332        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2333
2334        // unspecified behavior
2335        Integer v;
2239          try {
2240 <            assertNull(h.join());
2241 <            assertEquals(1, r.invocationCount);
2240 >            assertNull(h5.join());
2241 >            rs[5].assertInvoked();
2242          } catch (CompletionException ok) {
2243 <            checkCompletedWithWrappedCFException(h, ex);
2244 <            assertEquals(0, r.invocationCount);
2243 >            checkCompletedWithWrappedCFException(h5, ex);
2244 >            rs[5].assertNotInvoked();
2245          }
2246  
2247          checkCompletedWithWrappedCFException(f, ex);
2248          checkCompletedNormally(g, v1);
2249 <    }}
2250 <
2251 <    /**
2252 <     * runAfterEither result completes exceptionally if action does
2253 <     */
2254 <    public void testRunAfterEither_actionFailed1() {
2352 <        for (ExecutionMode m : ExecutionMode.values())
2353 <        for (Integer v1 : new Integer[] { 1, null })
2354 <        for (Integer v2 : new Integer[] { 2, null })
2355 <    {
2356 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2357 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2358 <        final FailingRunnable r = new FailingRunnable(m);
2359 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2360 <
2361 <        f.complete(v1);
2362 <        checkCompletedWithWrappedCFException(h);
2363 <        g.complete(v2);
2364 <        checkCompletedNormally(f, v1);
2365 <        checkCompletedNormally(g, v2);
2366 <    }}
2367 <
2368 <    public void testRunAfterEither_actionFailed2() {
2369 <        for (ExecutionMode m : ExecutionMode.values())
2370 <        for (Integer v1 : new Integer[] { 1, null })
2371 <        for (Integer v2 : new Integer[] { 2, null })
2372 <    {
2373 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2374 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2375 <        final FailingRunnable r = new FailingRunnable(m);
2376 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2377 <
2378 <        g.complete(v2);
2379 <        checkCompletedWithWrappedCFException(h);
2380 <        f.complete(v1);
2381 <        checkCompletedNormally(f, v1);
2382 <        checkCompletedNormally(g, v2);
2249 >        checkCompletedWithWrappedCFException(h0, ex);
2250 >        checkCompletedWithWrappedCFException(h1, ex);
2251 >        checkCompletedWithWrappedCFException(h2, ex);
2252 >        checkCompletedWithWrappedCFException(h3, ex);
2253 >        checkCompletedWithWrappedCFException(h4, ex);
2254 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2255      }}
2256  
2257      /**
2258       * runAfterEither result completes exceptionally if either source cancelled
2259       */
2260 <    public void testRunAfterEither_sourceCancelled1() {
2260 >    public void testRunAfterEither_sourceCancelled() {
2261          for (ExecutionMode m : ExecutionMode.values())
2262          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2263          for (Integer v1 : new Integer[] { 1, null })
2264      {
2265          final CompletableFuture<Integer> f = new CompletableFuture<>();
2266          final CompletableFuture<Integer> g = new CompletableFuture<>();
2267 <        final Noop r = new Noop(m);
2268 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2397 <
2398 <        assertTrue(f.cancel(mayInterruptIfRunning));
2399 <        checkCompletedWithWrappedCancellationException(h);
2400 <        g.complete(v1);
2401 <
2402 <        checkCancelled(f);
2403 <        assertEquals(0, r.invocationCount);
2404 <        checkCompletedNormally(g, v1);
2405 <        checkCompletedWithWrappedCancellationException(h);
2406 <    }}
2407 <
2408 <    public void testRunAfterEither_sourceCancelled2() {
2409 <        for (ExecutionMode m : ExecutionMode.values())
2410 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2411 <        for (Integer v1 : new Integer[] { 1, null })
2412 <    {
2413 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2414 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2415 <        final Noop r = new Noop(m);
2416 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2417 <
2418 <        assertTrue(g.cancel(mayInterruptIfRunning));
2419 <        checkCompletedWithWrappedCancellationException(h);
2420 <        f.complete(v1);
2267 >        final Noop[] rs = new Noop[6];
2268 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2269  
2270 <        checkCancelled(g);
2271 <        assertEquals(0, r.invocationCount);
2272 <        checkCompletedNormally(f, v1);
2273 <        checkCompletedWithWrappedCancellationException(h);
2274 <    }}
2270 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2271 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2272 >        checkIncomplete(h0);
2273 >        checkIncomplete(h1);
2274 >        rs[0].assertNotInvoked();
2275 >        rs[1].assertNotInvoked();
2276 >        f.cancel(mayInterruptIfRunning);
2277 >        checkCompletedWithWrappedCancellationException(h0);
2278 >        checkCompletedWithWrappedCancellationException(h1);
2279 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2280 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2281 >        checkCompletedWithWrappedCancellationException(h2);
2282 >        checkCompletedWithWrappedCancellationException(h3);
2283  
2284 <    public void testRunAfterEither_sourceCancelled3() {
2429 <        for (ExecutionMode m : ExecutionMode.values())
2430 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2431 <        for (Integer v1 : new Integer[] { 1, null })
2432 <    {
2433 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2434 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2435 <        final Noop r = new Noop(m);
2436 <
2437 <        assertTrue(g.cancel(mayInterruptIfRunning));
2438 <        f.complete(v1);
2439 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2284 >        g.complete(v1);
2285  
2286 <        // unspecified behavior
2287 <        Integer v;
2286 >        // unspecified behavior - both source completions available
2287 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2288 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2289 >        try {
2290 >            assertNull(h4.join());
2291 >            rs[4].assertInvoked();
2292 >        } catch (CompletionException ok) {
2293 >            checkCompletedWithWrappedCancellationException(h4);
2294 >            rs[4].assertNotInvoked();
2295 >        }
2296          try {
2297 <            assertNull(h.join());
2298 <            assertEquals(1, r.invocationCount);
2297 >            assertNull(h5.join());
2298 >            rs[5].assertInvoked();
2299          } catch (CompletionException ok) {
2300 <            checkCompletedWithWrappedCancellationException(h);
2301 <            assertEquals(0, r.invocationCount);
2300 >            checkCompletedWithWrappedCancellationException(h5);
2301 >            rs[5].assertNotInvoked();
2302          }
2303  
2304 <        checkCancelled(g);
2305 <        checkCompletedNormally(f, v1);
2304 >        checkCancelled(f);
2305 >        checkCompletedNormally(g, v1);
2306 >        checkCompletedWithWrappedCancellationException(h0);
2307 >        checkCompletedWithWrappedCancellationException(h1);
2308 >        checkCompletedWithWrappedCancellationException(h2);
2309 >        checkCompletedWithWrappedCancellationException(h3);
2310 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2311      }}
2312  
2313 <    public void testRunAfterEither_sourceCancelled4() {
2313 >    /**
2314 >     * runAfterEither result completes exceptionally if action does
2315 >     */
2316 >    public void testRunAfterEither_actionFailed() {
2317          for (ExecutionMode m : ExecutionMode.values())
2457        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2318          for (Integer v1 : new Integer[] { 1, null })
2319 +        for (Integer v2 : new Integer[] { 2, null })
2320      {
2321          final CompletableFuture<Integer> f = new CompletableFuture<>();
2322          final CompletableFuture<Integer> g = new CompletableFuture<>();
2323 <        final Noop r = new Noop(m);
2323 >        final FailingRunnable[] rs = new FailingRunnable[6];
2324 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2325  
2326 <        assertTrue(f.cancel(mayInterruptIfRunning));
2327 <        g.complete(v1);
2328 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2329 <
2330 <        // unspecified behavior
2331 <        Integer v;
2332 <        try {
2333 <            assertNull(h.join());
2334 <            assertEquals(1, r.invocationCount);
2335 <        } catch (CompletionException ok) {
2336 <            checkCompletedWithWrappedCancellationException(h);
2337 <            assertEquals(0, r.invocationCount);
2338 <        }
2326 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2327 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2328 >        f.complete(v1);
2329 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2330 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2331 >        checkCompletedWithWrappedCFException(h0);
2332 >        checkCompletedWithWrappedCFException(h1);
2333 >        checkCompletedWithWrappedCFException(h2);
2334 >        checkCompletedWithWrappedCFException(h3);
2335 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2336 >        g.complete(v2);
2337 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2338 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2339 >        checkCompletedWithWrappedCFException(h4);
2340 >        checkCompletedWithWrappedCFException(h5);
2341  
2342 <        checkCancelled(f);
2343 <        checkCompletedNormally(g, v1);
2342 >        checkCompletedNormally(f, v1);
2343 >        checkCompletedNormally(g, v2);
2344 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2345      }}
2346  
2347      /**
# Line 2495 | Line 2360 | public class CompletableFutureTest exten
2360  
2361          checkCompletedNormally(g, inc(v1));
2362          checkCompletedNormally(f, v1);
2363 <        assertEquals(1, r.invocationCount);
2363 >        r.assertInvoked();
2364      }}
2365  
2366      /**
# Line 2515 | Line 2380 | public class CompletableFutureTest exten
2380  
2381          checkCompletedWithWrappedCFException(g, ex);
2382          checkCompletedWithWrappedCFException(f, ex);
2383 <        assertEquals(0, r.invocationCount);
2383 >        r.assertNotInvoked();
2384      }}
2385  
2386      /**
# Line 2575 | Line 2440 | public class CompletableFutureTest exten
2440       */
2441      public void testAllOf_normal() throws Exception {
2442          for (int k = 1; k < 20; ++k) {
2443 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2443 >            CompletableFuture<Integer>[] fs
2444 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2445              for (int i = 0; i < k; ++i)
2446                  fs[i] = new CompletableFuture<>();
2447              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 2589 | Line 2455 | public class CompletableFutureTest exten
2455          }
2456      }
2457  
2458 +    public void testAllOf_backwards() throws Exception {
2459 +        for (int k = 1; k < 20; ++k) {
2460 +            CompletableFuture<Integer>[] fs
2461 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2462 +            for (int i = 0; i < k; ++i)
2463 +                fs[i] = new CompletableFuture<>();
2464 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2465 +            for (int i = k - 1; i >= 0; i--) {
2466 +                checkIncomplete(f);
2467 +                checkIncomplete(CompletableFuture.allOf(fs));
2468 +                fs[i].complete(one);
2469 +            }
2470 +            checkCompletedNormally(f, null);
2471 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2472 +        }
2473 +    }
2474 +
2475      /**
2476       * anyOf(no component futures) returns an incomplete future
2477       */
# Line 2647 | Line 2530 | public class CompletableFutureTest exten
2530          Runnable[] throwingActions = {
2531              () -> CompletableFuture.supplyAsync(null),
2532              () -> CompletableFuture.supplyAsync(null, exec),
2533 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2533 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2534  
2535              () -> CompletableFuture.runAsync(null),
2536              () -> CompletableFuture.runAsync(null, exec),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines