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.53 by jsr166, Mon Jun 2 20:20:47 2014 UTC vs.
Revision 1.76 by jsr166, Sat Jun 7 21:45:13 2014 UTC

# Line 105 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
108 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 >                                                      Throwable ex) {
110          try {
111              f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
# Line 131 | Line 131 | public class CompletableFutureTest exten
131          } catch (ExecutionException success) {
132              assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 218 | Line 239 | public class CompletableFutureTest exten
239       */
240      public void testCompleteExceptionally() {
241          CompletableFuture<Integer> f = new CompletableFuture<>();
242 +        CFException ex = new CFException();
243          checkIncomplete(f);
244 <        f.completeExceptionally(new CFException());
245 <        checkCompletedWithWrappedCFException(f);
244 >        f.completeExceptionally(ex);
245 >        checkCompletedExceptionally(f, ex);
246      }
247  
248      /**
# Line 261 | Line 283 | public class CompletableFutureTest exten
283       * obtrudeException forces completion with given exception
284       */
285      public void testObtrudeException() {
286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
287 <        checkIncomplete(f);
288 <        f.complete(one);
289 <        checkCompletedNormally(f, one);
290 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
286 >        for (Integer v1 : new Integer[] { 1, null })
287 >    {
288 >        CFException ex;
289 >        CompletableFuture<Integer> f;
290 >
291          f = new CompletableFuture<>();
292 <        f.obtrudeException(new CFException());
293 <        checkCompletedWithWrappedCFException(f);
292 >        f.complete(v1);
293 >        for (int i = 0; i < 2; i++) {
294 >            f.obtrudeException(ex = new CFException());
295 >            checkCompletedExceptionally(f, ex);
296 >        }
297 >
298 >        f = new CompletableFuture<>();
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304          f = new CompletableFuture<>();
305 +        f.completeExceptionally(ex = new CFException());
306 +        f.obtrudeValue(v1);
307 +        checkCompletedNormally(f, v1);
308 +        f.obtrudeException(ex = new CFException());
309 +        checkCompletedExceptionally(f, ex);
310          f.completeExceptionally(new CFException());
311 <        f.obtrudeValue(four);
312 <        checkCompletedNormally(f, four);
313 <        f.obtrudeException(new CFException());
314 <        checkCompletedWithWrappedCFException(f);
279 <    }
311 >        checkCompletedExceptionally(f, ex);
312 >        f.complete(v1);
313 >        checkCompletedExceptionally(f, ex);
314 >    }}
315  
316      /**
317       * getNumberOfDependents returns number of dependent tasks
318       */
319      public void testGetNumberOfDependents() {
320 +        for (ExecutionMode m : ExecutionMode.values())
321 +    {
322          CompletableFuture<Integer> f = new CompletableFuture<>();
323          assertEquals(0, f.getNumberOfDependents());
324 <        CompletableFuture g = f.thenRun(new Noop());
324 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
325          assertEquals(1, f.getNumberOfDependents());
326          assertEquals(0, g.getNumberOfDependents());
327 <        CompletableFuture h = f.thenRun(new Noop());
327 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
328          assertEquals(2, f.getNumberOfDependents());
329 +        assertEquals(0, h.getNumberOfDependents());
330          f.complete(1);
331          checkCompletedNormally(g, null);
332 +        checkCompletedNormally(h, null);
333          assertEquals(0, f.getNumberOfDependents());
334          assertEquals(0, g.getNumberOfDependents());
335 <    }
335 >        assertEquals(0, h.getNumberOfDependents());
336 >    }}
337  
338      /**
339       * toString indicates current completion state
# Line 310 | Line 350 | public class CompletableFutureTest exten
350          f = new CompletableFuture<String>();
351          f.completeExceptionally(new IndexOutOfBoundsException());
352          assertTrue(f.toString().contains("[Completed exceptionally]"));
353 +
354 +        f = new CompletableFuture<String>();
355 +        f.cancel(true);
356 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
357 +
358 +        f = new CompletableFuture<String>();
359 +        f.cancel(false);
360 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
361      }
362  
363      /**
# Line 320 | Line 368 | public class CompletableFutureTest exten
368          checkCompletedNormally(f, "test");
369      }
370  
371 <    // Choose non-commutative actions for better coverage
371 >    abstract class CheckedAction {
372 >        int invocationCount = 0;
373 >        final ExecutionMode m;
374 >        CheckedAction(ExecutionMode m) { this.m = m; }
375 >        void invoked() {
376 >            m.checkExecutionMode();
377 >            assertEquals(0, invocationCount++);
378 >        }
379 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
380 >        void assertInvoked() { assertEquals(1, invocationCount); }
381 >    }
382  
383 <    // A non-commutative function that handles and produces null values as well.
384 <    static Integer subtract(Integer x, Integer y) {
385 <        return (x == null && y == null) ? null :
386 <            ((x == null) ? 42 : x.intValue())
387 <            - ((y == null) ? 99 : y.intValue());
383 >    abstract class CheckedIntegerAction extends CheckedAction {
384 >        Integer value;
385 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
386 >        void assertValue(Integer expected) {
387 >            assertInvoked();
388 >            assertEquals(expected, value);
389 >        }
390 >    }
391 >
392 >    class IntegerSupplier extends CheckedAction
393 >        implements Supplier<Integer>
394 >    {
395 >        final Integer value;
396 >        IntegerSupplier(ExecutionMode m, Integer value) {
397 >            super(m);
398 >            this.value = value;
399 >        }
400 >        public Integer get() {
401 >            invoked();
402 >            return value;
403 >        }
404      }
405  
406      // A function that handles and produces null values as well.
# Line 334 | Line 408 | public class CompletableFutureTest exten
408          return (x == null) ? null : x + 1;
409      }
410  
411 <    static final Supplier<Integer> supplyOne =
412 <        () -> Integer.valueOf(1);
413 <    static final Function<Integer, Integer> inc =
414 <        (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;
411 >    class NoopConsumer extends CheckedIntegerAction
412 >        implements Consumer<Integer>
413 >    {
414 >        NoopConsumer(ExecutionMode m) { super(m); }
415          public void accept(Integer x) {
416 <            invocationCount++;
417 <            value = inc(x);
416 >            invoked();
417 >            value = x;
418          }
419      }
420 <    static final class IncFunction implements Function<Integer,Integer> {
421 <        int invocationCount = 0;
422 <        Integer value;
420 >
421 >    class IncFunction extends CheckedIntegerAction
422 >        implements Function<Integer,Integer>
423 >    {
424 >        IncFunction(ExecutionMode m) { super(m); }
425          public Integer apply(Integer x) {
426 <            invocationCount++;
426 >            invoked();
427              return value = inc(x);
428          }
429      }
430 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
431 <        int invocationCount = 0;
432 <        Integer value;
433 <        // Check this action was invoked exactly once when result is computed.
430 >
431 >    // Choose non-commutative actions for better coverage
432 >    // A non-commutative function that handles and produces null values as well.
433 >    static Integer subtract(Integer x, Integer y) {
434 >        return (x == null && y == null) ? null :
435 >            ((x == null) ? 42 : x.intValue())
436 >            - ((y == null) ? 99 : y.intValue());
437 >    }
438 >
439 >    class SubtractAction extends CheckedIntegerAction
440 >        implements BiConsumer<Integer, Integer>
441 >    {
442 >        SubtractAction(ExecutionMode m) { super(m); }
443          public void accept(Integer x, Integer y) {
444 <            invocationCount++;
444 >            invoked();
445              value = subtract(x, y);
446          }
447      }
448 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
449 <        int invocationCount = 0;
450 <        Integer value;
451 <        // Check this action was invoked exactly once when result is computed.
448 >
449 >    class SubtractFunction extends CheckedIntegerAction
450 >        implements BiFunction<Integer, Integer, Integer>
451 >    {
452 >        SubtractFunction(ExecutionMode m) { super(m); }
453          public Integer apply(Integer x, Integer y) {
454 <            invocationCount++;
454 >            invoked();
455              return value = subtract(x, y);
456          }
457      }
458 <    static final class Noop implements Runnable {
459 <        int invocationCount = 0;
458 >
459 >    class Noop extends CheckedAction implements Runnable {
460 >        Noop(ExecutionMode m) { super(m); }
461          public void run() {
462 <            invocationCount++;
462 >            invoked();
463          }
464      }
465  
466 <    static final class FailingSupplier implements Supplier<Integer> {
467 <        int invocationCount = 0;
466 >    class FailingSupplier extends CheckedAction
467 >        implements Supplier<Integer>
468 >    {
469 >        FailingSupplier(ExecutionMode m) { super(m); }
470          public Integer get() {
471 <            invocationCount++;
471 >            invoked();
472              throw new CFException();
473          }
474      }
475 <    static final class FailingConsumer implements Consumer<Integer> {
476 <        int invocationCount = 0;
475 >
476 >    class FailingConsumer extends CheckedIntegerAction
477 >        implements Consumer<Integer>
478 >    {
479 >        FailingConsumer(ExecutionMode m) { super(m); }
480          public void accept(Integer x) {
481 <            invocationCount++;
481 >            invoked();
482 >            value = x;
483              throw new CFException();
484          }
485      }
486 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
487 <        int invocationCount = 0;
486 >
487 >    class FailingBiConsumer extends CheckedIntegerAction
488 >        implements BiConsumer<Integer, Integer>
489 >    {
490 >        FailingBiConsumer(ExecutionMode m) { super(m); }
491          public void accept(Integer x, Integer y) {
492 <            invocationCount++;
492 >            invoked();
493 >            value = subtract(x, y);
494              throw new CFException();
495          }
496      }
497 <    static final class FailingFunction implements Function<Integer, Integer> {
498 <        int invocationCount = 0;
497 >
498 >    class FailingFunction extends CheckedIntegerAction
499 >        implements Function<Integer, Integer>
500 >    {
501 >        FailingFunction(ExecutionMode m) { super(m); }
502          public Integer apply(Integer x) {
503 <            invocationCount++;
503 >            invoked();
504 >            value = x;
505              throw new CFException();
506          }
507      }
508 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
509 <        int invocationCount = 0;
508 >
509 >    class FailingBiFunction extends CheckedIntegerAction
510 >        implements BiFunction<Integer, Integer, Integer>
511 >    {
512 >        FailingBiFunction(ExecutionMode m) { super(m); }
513          public Integer apply(Integer x, Integer y) {
514 <            invocationCount++;
514 >            invoked();
515 >            value = subtract(x, y);
516              throw new CFException();
517          }
518      }
519 <    static final class FailingRunnable implements Runnable {
520 <        int invocationCount = 0;
519 >
520 >    class FailingRunnable extends CheckedAction implements Runnable {
521 >        FailingRunnable(ExecutionMode m) { super(m); }
522          public void run() {
523 <            invocationCount++;
523 >            invoked();
524              throw new CFException();
525          }
526      }
527  
528 <    static final class CompletableFutureInc
529 <        implements Function<Integer, CompletableFuture<Integer>> {
530 <        int invocationCount = 0;
528 >
529 >    class CompletableFutureInc extends CheckedIntegerAction
530 >        implements Function<Integer, CompletableFuture<Integer>>
531 >    {
532 >        CompletableFutureInc(ExecutionMode m) { super(m); }
533          public CompletableFuture<Integer> apply(Integer x) {
534 <            invocationCount++;
534 >            invoked();
535 >            value = x;
536              CompletableFuture<Integer> f = new CompletableFuture<>();
537              f.complete(inc(x));
538              return f;
539          }
540      }
541  
542 <    static final class FailingCompletableFutureFunction
543 <        implements Function<Integer, CompletableFuture<Integer>> {
544 <        int invocationCount = 0;
542 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
543 >        implements Function<Integer, CompletableFuture<Integer>>
544 >    {
545 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
546          public CompletableFuture<Integer> apply(Integer x) {
547 <            invocationCount++;
547 >            invoked();
548 >            value = x;
549              throw new CFException();
550          }
551      }
552  
553      // Used for explicit executor tests
554      static final class ThreadExecutor implements Executor {
555 <        AtomicInteger count = new AtomicInteger(0);
555 >        final AtomicInteger count = new AtomicInteger(0);
556 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
557 >        static boolean startedCurrentThread() {
558 >            return Thread.currentThread().getThreadGroup() == tg;
559 >        }
560  
561          public void execute(Runnable r) {
562              count.getAndIncrement();
563 <            new Thread(r).start();
563 >            new Thread(tg, r).start();
564          }
565      }
566  
567      /**
568       * Permits the testing of parallel code for the 3 different
569 <     * execution modes without repeating all the testing code.
569 >     * execution modes without copy/pasting all the test methods.
570       */
571      enum ExecutionMode {
572          DEFAULT {
573              public void checkExecutionMode() {
574 +                assertFalse(ThreadExecutor.startedCurrentThread());
575                  assertNull(ForkJoinTask.getPool());
576              }
577 +            public CompletableFuture<Void> runAsync(Runnable a) {
578 +                throw new UnsupportedOperationException();
579 +            }
580 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
581 +                throw new UnsupportedOperationException();
582 +            }
583              public <T> CompletableFuture<Void> thenRun
584                  (CompletableFuture<T> f, Runnable a) {
585                  return f.thenRun(a);
# Line 531 | Line 648 | public class CompletableFutureTest exten
648                  assertSame(ForkJoinPool.commonPool(),
649                             ForkJoinTask.getPool());
650              }
651 +            public CompletableFuture<Void> runAsync(Runnable a) {
652 +                return CompletableFuture.runAsync(a);
653 +            }
654 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
655 +                return CompletableFuture.supplyAsync(a);
656 +            }
657              public <T> CompletableFuture<Void> thenRun
658                  (CompletableFuture<T> f, Runnable a) {
659                  return f.thenRunAsync(a);
# Line 596 | Line 719 | public class CompletableFutureTest exten
719  
720          EXECUTOR {
721              public void checkExecutionMode() {
722 <                //TODO
722 >                assertTrue(ThreadExecutor.startedCurrentThread());
723 >            }
724 >            public CompletableFuture<Void> runAsync(Runnable a) {
725 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
726 >            }
727 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
728 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
729              }
730              public <T> CompletableFuture<Void> thenRun
731                  (CompletableFuture<T> f, Runnable a) {
# Line 662 | Line 791 | public class CompletableFutureTest exten
791          };
792  
793          public abstract void checkExecutionMode();
794 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
795 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
796          public abstract <T> CompletableFuture<Void> thenRun
797              (CompletableFuture<T> f, Runnable a);
798          public abstract <T> CompletableFuture<Void> thenAccept
# Line 725 | Line 856 | public class CompletableFutureTest exten
856          assertEquals(0, a.get());
857      }}
858  
728
859      /**
860       * exceptionally action completes with function value on source
861       * exception
# Line 740 | Line 870 | public class CompletableFutureTest exten
870          if (!createIncomplete) f.completeExceptionally(ex);
871          final CompletableFuture<Integer> g = f.exceptionally
872              ((Throwable t) -> {
873 +                ExecutionMode.DEFAULT.checkExecutionMode();
874                  threadAssertSame(t, ex);
875                  a.getAndIncrement();
876                  return v1;
# Line 761 | Line 892 | public class CompletableFutureTest exten
892          if (!createIncomplete) f.completeExceptionally(ex1);
893          final CompletableFuture<Integer> g = f.exceptionally
894              ((Throwable t) -> {
895 +                ExecutionMode.DEFAULT.checkExecutionMode();
896                  threadAssertSame(t, ex1);
897                  a.getAndIncrement();
898                  throw ex2;
899              });
900          if (createIncomplete) f.completeExceptionally(ex1);
901  
902 <        checkCompletedWithWrappedCFException(g, ex2);
902 >        checkCompletedWithWrappedException(g, ex2);
903 >        assertEquals(1, a.get());
904 >    }}
905 >
906 >    /**
907 >     * whenComplete action executes on normal completion, propagating
908 >     * source result.
909 >     */
910 >    public void testWhenComplete_normalCompletion1() {
911 >        for (ExecutionMode m : ExecutionMode.values())
912 >        for (boolean createIncomplete : new boolean[] { true, false })
913 >        for (Integer v1 : new Integer[] { 1, null })
914 >    {
915 >        final AtomicInteger a = new AtomicInteger(0);
916 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
917 >        if (!createIncomplete) f.complete(v1);
918 >        final CompletableFuture<Integer> g = m.whenComplete
919 >            (f,
920 >             (Integer x, Throwable t) -> {
921 >                m.checkExecutionMode();
922 >                threadAssertSame(x, v1);
923 >                threadAssertNull(t);
924 >                a.getAndIncrement();
925 >            });
926 >        if (createIncomplete) f.complete(v1);
927 >
928 >        checkCompletedNormally(g, v1);
929 >        checkCompletedNormally(f, v1);
930 >        assertEquals(1, a.get());
931 >    }}
932 >
933 >    /**
934 >     * whenComplete action executes on exceptional completion, propagating
935 >     * source result.
936 >     */
937 >    public void testWhenComplete_exceptionalCompletion() {
938 >        for (ExecutionMode m : ExecutionMode.values())
939 >        for (boolean createIncomplete : new boolean[] { true, false })
940 >        for (Integer v1 : new Integer[] { 1, null })
941 >    {
942 >        final AtomicInteger a = new AtomicInteger(0);
943 >        final CFException ex = new CFException();
944 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
945 >        if (!createIncomplete) f.completeExceptionally(ex);
946 >        final CompletableFuture<Integer> g = m.whenComplete
947 >            (f,
948 >             (Integer x, Throwable t) -> {
949 >                m.checkExecutionMode();
950 >                threadAssertNull(x);
951 >                threadAssertSame(t, ex);
952 >                a.getAndIncrement();
953 >            });
954 >        if (createIncomplete) f.completeExceptionally(ex);
955 >
956 >        checkCompletedWithWrappedException(g, ex);
957 >        checkCompletedExceptionally(f, ex);
958 >        assertEquals(1, a.get());
959 >    }}
960 >
961 >    /**
962 >     * whenComplete action executes on cancelled source, propagating
963 >     * CancellationException.
964 >     */
965 >    public void testWhenComplete_sourceCancelled() {
966 >        for (ExecutionMode m : ExecutionMode.values())
967 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
968 >        for (boolean createIncomplete : new boolean[] { true, false })
969 >    {
970 >        final AtomicInteger a = new AtomicInteger(0);
971 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
972 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
973 >        final CompletableFuture<Integer> g = m.whenComplete
974 >            (f,
975 >             (Integer x, Throwable t) -> {
976 >                m.checkExecutionMode();
977 >                threadAssertNull(x);
978 >                threadAssertTrue(t instanceof CancellationException);
979 >                a.getAndIncrement();
980 >            });
981 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
982 >
983 >        checkCompletedWithWrappedCancellationException(g);
984 >        checkCancelled(f);
985 >        assertEquals(1, a.get());
986 >    }}
987 >
988 >    /**
989 >     * If a whenComplete action throws an exception when triggered by
990 >     * a normal completion, it completes exceptionally
991 >     */
992 >    public void testWhenComplete_actionFailed() {
993 >        for (boolean createIncomplete : new boolean[] { true, false })
994 >        for (ExecutionMode m : ExecutionMode.values())
995 >        for (Integer v1 : new Integer[] { 1, null })
996 >    {
997 >        final AtomicInteger a = new AtomicInteger(0);
998 >        final CFException ex = new CFException();
999 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1000 >        if (!createIncomplete) f.complete(v1);
1001 >        final CompletableFuture<Integer> g = m.whenComplete
1002 >            (f,
1003 >             (Integer x, Throwable t) -> {
1004 >                m.checkExecutionMode();
1005 >                threadAssertSame(x, v1);
1006 >                threadAssertNull(t);
1007 >                a.getAndIncrement();
1008 >                throw ex;
1009 >            });
1010 >        if (createIncomplete) f.complete(v1);
1011 >
1012 >        checkCompletedWithWrappedException(g, ex);
1013 >        checkCompletedNormally(f, v1);
1014 >        assertEquals(1, a.get());
1015 >    }}
1016 >
1017 >    /**
1018 >     * If a whenComplete action throws an exception when triggered by
1019 >     * a source completion that also throws an exception, the source
1020 >     * exception takes precedence.
1021 >     */
1022 >    public void testWhenComplete_actionFailedSourceFailed() {
1023 >        for (boolean createIncomplete : new boolean[] { true, false })
1024 >        for (ExecutionMode m : ExecutionMode.values())
1025 >        for (Integer v1 : new Integer[] { 1, null })
1026 >    {
1027 >        final AtomicInteger a = new AtomicInteger(0);
1028 >        final CFException ex1 = new CFException();
1029 >        final CFException ex2 = new CFException();
1030 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1031 >
1032 >        if (!createIncomplete) f.completeExceptionally(ex1);
1033 >        final CompletableFuture<Integer> g = m.whenComplete
1034 >            (f,
1035 >             (Integer x, Throwable t) -> {
1036 >                m.checkExecutionMode();
1037 >                threadAssertSame(t, ex1);
1038 >                threadAssertNull(x);
1039 >                a.getAndIncrement();
1040 >                throw ex2;
1041 >            });
1042 >        if (createIncomplete) f.completeExceptionally(ex1);
1043 >
1044 >        checkCompletedWithWrappedException(g, ex1);
1045 >        checkCompletedExceptionally(f, ex1);
1046          assertEquals(1, a.get());
1047      }}
1048  
# Line 786 | Line 1061 | public class CompletableFutureTest exten
1061          final CompletableFuture<Integer> g = m.handle
1062              (f,
1063               (Integer x, Throwable t) -> {
1064 +                m.checkExecutionMode();
1065                  threadAssertSame(x, v1);
1066                  threadAssertNull(t);
1067                  a.getAndIncrement();
# Line 814 | Line 1090 | public class CompletableFutureTest exten
1090          final CompletableFuture<Integer> g = m.handle
1091              (f,
1092               (Integer x, Throwable t) -> {
1093 +                m.checkExecutionMode();
1094                  threadAssertNull(x);
1095                  threadAssertSame(t, ex);
1096                  a.getAndIncrement();
# Line 822 | Line 1099 | public class CompletableFutureTest exten
1099          if (createIncomplete) f.completeExceptionally(ex);
1100  
1101          checkCompletedNormally(g, v1);
1102 <        checkCompletedWithWrappedCFException(f, ex);
1102 >        checkCompletedExceptionally(f, ex);
1103          assertEquals(1, a.get());
1104      }}
1105  
# Line 842 | Line 1119 | public class CompletableFutureTest exten
1119          final CompletableFuture<Integer> g = m.handle
1120              (f,
1121               (Integer x, Throwable t) -> {
1122 +                m.checkExecutionMode();
1123                  threadAssertNull(x);
1124                  threadAssertTrue(t instanceof CancellationException);
1125                  a.getAndIncrement();
# Line 869 | Line 1147 | public class CompletableFutureTest exten
1147          final CompletableFuture<Integer> g = m.handle
1148              (f,
1149               (Integer x, Throwable t) -> {
1150 +                m.checkExecutionMode();
1151                  threadAssertNull(x);
1152                  threadAssertSame(ex1, t);
1153                  a.getAndIncrement();
# Line 876 | Line 1155 | public class CompletableFutureTest exten
1155              });
1156          if (createIncomplete) f.completeExceptionally(ex1);
1157  
1158 <        checkCompletedWithWrappedCFException(g, ex2);
1159 <        checkCompletedWithWrappedCFException(f, ex1);
1158 >        checkCompletedWithWrappedException(g, ex2);
1159 >        checkCompletedExceptionally(f, ex1);
1160          assertEquals(1, a.get());
1161      }}
1162  
# Line 893 | Line 1172 | public class CompletableFutureTest exten
1172          final CompletableFuture<Integer> g = m.handle
1173              (f,
1174               (Integer x, Throwable t) -> {
1175 +                m.checkExecutionMode();
1176                  threadAssertSame(x, v1);
1177                  threadAssertNull(t);
1178                  a.getAndIncrement();
# Line 900 | Line 1180 | public class CompletableFutureTest exten
1180              });
1181          if (createIncomplete) f.complete(v1);
1182  
1183 <        checkCompletedWithWrappedCFException(g, ex);
1183 >        checkCompletedWithWrappedException(g, ex);
1184          checkCompletedNormally(f, v1);
1185          assertEquals(1, a.get());
1186      }}
# Line 908 | Line 1188 | public class CompletableFutureTest exten
1188      /**
1189       * runAsync completes after running Runnable
1190       */
1191 <    public void testRunAsync() {
1192 <        Noop r = new Noop();
1193 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1194 <        assertNull(f.join());
1195 <        assertEquals(1, r.invocationCount);
1196 <        checkCompletedNormally(f, null);
1197 <    }
1198 <
1199 <    /**
920 <     * runAsync with executor completes after running Runnable
921 <     */
922 <    public void testRunAsync2() {
923 <        Noop r = new Noop();
924 <        ThreadExecutor exec = new ThreadExecutor();
925 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1191 >    public void testRunAsync_normalCompletion() {
1192 >        ExecutionMode[] executionModes = {
1193 >            ExecutionMode.ASYNC,
1194 >            ExecutionMode.EXECUTOR,
1195 >        };
1196 >        for (ExecutionMode m : executionModes)
1197 >    {
1198 >        final Noop r = new Noop(m);
1199 >        final CompletableFuture<Void> f = m.runAsync(r);
1200          assertNull(f.join());
927        assertEquals(1, r.invocationCount);
1201          checkCompletedNormally(f, null);
1202 <        assertEquals(1, exec.count.get());
1203 <    }
1202 >        r.assertInvoked();
1203 >    }}
1204  
1205      /**
1206       * failing runAsync completes exceptionally after running Runnable
1207       */
1208 <    public void testRunAsync3() {
1209 <        FailingRunnable r = new FailingRunnable();
1210 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1208 >    public void testRunAsync_exceptionalCompletion() {
1209 >        ExecutionMode[] executionModes = {
1210 >            ExecutionMode.ASYNC,
1211 >            ExecutionMode.EXECUTOR,
1212 >        };
1213 >        for (ExecutionMode m : executionModes)
1214 >    {
1215 >        final FailingRunnable r = new FailingRunnable(m);
1216 >        final CompletableFuture<Void> f = m.runAsync(r);
1217          checkCompletedWithWrappedCFException(f);
1218 <        assertEquals(1, r.invocationCount);
1219 <    }
1218 >        r.assertInvoked();
1219 >    }}
1220  
1221      /**
1222       * supplyAsync completes with result of supplier
1223       */
1224 <    public void testSupplyAsync() {
1225 <        CompletableFuture<Integer> f;
1226 <        f = CompletableFuture.supplyAsync(supplyOne);
1227 <        assertEquals(f.join(), one);
1228 <        checkCompletedNormally(f, one);
1229 <    }
1230 <
1231 <    /**
1232 <     * supplyAsync with executor completes with result of supplier
1233 <     */
1234 <    public void testSupplyAsync2() {
1235 <        CompletableFuture<Integer> f;
1236 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1237 <        assertEquals(f.join(), one);
959 <        checkCompletedNormally(f, one);
960 <    }
1224 >    public void testSupplyAsync_normalCompletion() {
1225 >        ExecutionMode[] executionModes = {
1226 >            ExecutionMode.ASYNC,
1227 >            ExecutionMode.EXECUTOR,
1228 >        };
1229 >        for (ExecutionMode m : executionModes)
1230 >        for (Integer v1 : new Integer[] { 1, null })
1231 >    {
1232 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1233 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1234 >        assertSame(v1, f.join());
1235 >        checkCompletedNormally(f, v1);
1236 >        r.assertInvoked();
1237 >    }}
1238  
1239      /**
1240       * Failing supplyAsync completes exceptionally
1241       */
1242 <    public void testSupplyAsync3() {
1243 <        FailingSupplier r = new FailingSupplier();
1244 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1242 >    public void testSupplyAsync_exceptionalCompletion() {
1243 >        ExecutionMode[] executionModes = {
1244 >            ExecutionMode.ASYNC,
1245 >            ExecutionMode.EXECUTOR,
1246 >        };
1247 >        for (ExecutionMode m : executionModes)
1248 >    {
1249 >        FailingSupplier r = new FailingSupplier(m);
1250 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1251          checkCompletedWithWrappedCFException(f);
1252 <        assertEquals(1, r.invocationCount);
1253 <    }
1252 >        r.assertInvoked();
1253 >    }}
1254  
1255      // seq completion methods
1256  
# Line 980 | Line 1263 | public class CompletableFutureTest exten
1263          for (Integer v1 : new Integer[] { 1, null })
1264      {
1265          final CompletableFuture<Integer> f = new CompletableFuture<>();
1266 <        final Noop r = new Noop();
1266 >        final Noop r = new Noop(m);
1267          if (!createIncomplete) f.complete(v1);
1268          final CompletableFuture<Void> g = m.thenRun(f, r);
1269          if (createIncomplete) {
# Line 990 | Line 1273 | public class CompletableFutureTest exten
1273  
1274          checkCompletedNormally(g, null);
1275          checkCompletedNormally(f, v1);
1276 <        assertEquals(1, r.invocationCount);
1276 >        r.assertInvoked();
1277      }}
1278  
1279      /**
# Line 1003 | Line 1286 | public class CompletableFutureTest exten
1286      {
1287          final CFException ex = new CFException();
1288          final CompletableFuture<Integer> f = new CompletableFuture<>();
1289 <        final Noop r = new Noop();
1289 >        final Noop r = new Noop(m);
1290          if (!createIncomplete) f.completeExceptionally(ex);
1291          final CompletableFuture<Void> g = m.thenRun(f, r);
1292          if (createIncomplete) {
# Line 1011 | Line 1294 | public class CompletableFutureTest exten
1294              f.completeExceptionally(ex);
1295          }
1296  
1297 <        checkCompletedWithWrappedCFException(g, ex);
1298 <        checkCompletedWithWrappedCFException(f, ex);
1299 <        assertEquals(0, r.invocationCount);
1297 >        checkCompletedWithWrappedException(g, ex);
1298 >        checkCompletedExceptionally(f, ex);
1299 >        r.assertNotInvoked();
1300      }}
1301  
1302      /**
# Line 1025 | Line 1308 | public class CompletableFutureTest exten
1308          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1309      {
1310          final CompletableFuture<Integer> f = new CompletableFuture<>();
1311 <        final Noop r = new Noop();
1311 >        final Noop r = new Noop(m);
1312          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1313 <        final CompletableFuture<Void> g = f.thenRun(r);
1313 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1314          if (createIncomplete) {
1315              checkIncomplete(g);
1316              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1035 | Line 1318 | public class CompletableFutureTest exten
1318  
1319          checkCompletedWithWrappedCancellationException(g);
1320          checkCancelled(f);
1321 <        assertEquals(0, r.invocationCount);
1321 >        r.assertNotInvoked();
1322      }}
1323  
1324      /**
# Line 1047 | Line 1330 | public class CompletableFutureTest exten
1330          for (Integer v1 : new Integer[] { 1, null })
1331      {
1332          final CompletableFuture<Integer> f = new CompletableFuture<>();
1333 <        final FailingRunnable r = new FailingRunnable();
1333 >        final FailingRunnable r = new FailingRunnable(m);
1334          if (!createIncomplete) f.complete(v1);
1335 <        final CompletableFuture<Void> g = f.thenRun(r);
1335 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1336          if (createIncomplete) {
1337              checkIncomplete(g);
1338              f.complete(v1);
# Line 1068 | Line 1351 | public class CompletableFutureTest exten
1351          for (Integer v1 : new Integer[] { 1, null })
1352      {
1353          final CompletableFuture<Integer> f = new CompletableFuture<>();
1354 <        final IncFunction r = new IncFunction();
1354 >        final IncFunction r = new IncFunction(m);
1355          if (!createIncomplete) f.complete(v1);
1356          final CompletableFuture<Integer> g = m.thenApply(f, r);
1357          if (createIncomplete) {
# Line 1078 | Line 1361 | public class CompletableFutureTest exten
1361  
1362          checkCompletedNormally(g, inc(v1));
1363          checkCompletedNormally(f, v1);
1364 <        assertEquals(1, r.invocationCount);
1364 >        r.assertValue(inc(v1));
1365      }}
1366  
1367      /**
# Line 1091 | Line 1374 | public class CompletableFutureTest exten
1374      {
1375          final CFException ex = new CFException();
1376          final CompletableFuture<Integer> f = new CompletableFuture<>();
1377 <        final IncFunction r = new IncFunction();
1377 >        final IncFunction r = new IncFunction(m);
1378          if (!createIncomplete) f.completeExceptionally(ex);
1379          final CompletableFuture<Integer> g = m.thenApply(f, r);
1380          if (createIncomplete) {
# Line 1099 | Line 1382 | public class CompletableFutureTest exten
1382              f.completeExceptionally(ex);
1383          }
1384  
1385 <        checkCompletedWithWrappedCFException(g, ex);
1386 <        checkCompletedWithWrappedCFException(f, ex);
1387 <        assertEquals(0, r.invocationCount);
1385 >        checkCompletedWithWrappedException(g, ex);
1386 >        checkCompletedExceptionally(f, ex);
1387 >        r.assertNotInvoked();
1388      }}
1389  
1390      /**
# Line 1113 | Line 1396 | public class CompletableFutureTest exten
1396          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1397      {
1398          final CompletableFuture<Integer> f = new CompletableFuture<>();
1399 <        final IncFunction r = new IncFunction();
1399 >        final IncFunction r = new IncFunction(m);
1400          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1401 <        final CompletableFuture<Integer> g = f.thenApply(r);
1401 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1402          if (createIncomplete) {
1403              checkIncomplete(g);
1404              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1123 | Line 1406 | public class CompletableFutureTest exten
1406  
1407          checkCompletedWithWrappedCancellationException(g);
1408          checkCancelled(f);
1409 <        assertEquals(0, r.invocationCount);
1409 >        r.assertNotInvoked();
1410      }}
1411  
1412      /**
# Line 1135 | Line 1418 | public class CompletableFutureTest exten
1418          for (Integer v1 : new Integer[] { 1, null })
1419      {
1420          final CompletableFuture<Integer> f = new CompletableFuture<>();
1421 <        final FailingFunction r = new FailingFunction();
1421 >        final FailingFunction r = new FailingFunction(m);
1422          if (!createIncomplete) f.complete(v1);
1423 <        final CompletableFuture<Integer> g = f.thenApply(r);
1423 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1424          if (createIncomplete) {
1425              checkIncomplete(g);
1426              f.complete(v1);
# Line 1156 | Line 1439 | public class CompletableFutureTest exten
1439          for (Integer v1 : new Integer[] { 1, null })
1440      {
1441          final CompletableFuture<Integer> f = new CompletableFuture<>();
1442 <        final IncAction r = new IncAction();
1442 >        final NoopConsumer r = new NoopConsumer(m);
1443          if (!createIncomplete) f.complete(v1);
1444          final CompletableFuture<Void> g = m.thenAccept(f, r);
1445          if (createIncomplete) {
# Line 1165 | Line 1448 | public class CompletableFutureTest exten
1448          }
1449  
1450          checkCompletedNormally(g, null);
1451 +        r.assertValue(v1);
1452          checkCompletedNormally(f, v1);
1169        assertEquals(1, r.invocationCount);
1170        assertEquals(inc(v1), r.value);
1453      }}
1454  
1455      /**
# Line 1180 | Line 1462 | public class CompletableFutureTest exten
1462      {
1463          final CFException ex = new CFException();
1464          final CompletableFuture<Integer> f = new CompletableFuture<>();
1465 <        final IncAction r = new IncAction();
1465 >        final NoopConsumer r = new NoopConsumer(m);
1466          if (!createIncomplete) f.completeExceptionally(ex);
1467          final CompletableFuture<Void> g = m.thenAccept(f, r);
1468          if (createIncomplete) {
# Line 1188 | Line 1470 | public class CompletableFutureTest exten
1470              f.completeExceptionally(ex);
1471          }
1472  
1473 <        checkCompletedWithWrappedCFException(g, ex);
1474 <        checkCompletedWithWrappedCFException(f, ex);
1475 <        assertEquals(0, r.invocationCount);
1473 >        checkCompletedWithWrappedException(g, ex);
1474 >        checkCompletedExceptionally(f, ex);
1475 >        r.assertNotInvoked();
1476      }}
1477  
1478      /**
1479 <     * thenAccept result completes exceptionally if action does
1479 >     * thenAccept result completes exceptionally if source cancelled
1480       */
1481 <    public void testThenAccept_actionFailed() {
1481 >    public void testThenAccept_sourceCancelled() {
1482          for (ExecutionMode m : ExecutionMode.values())
1483          for (boolean createIncomplete : new boolean[] { true, false })
1484 <        for (Integer v1 : new Integer[] { 1, null })
1484 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1485      {
1486          final CompletableFuture<Integer> f = new CompletableFuture<>();
1487 <        final FailingConsumer r = new FailingConsumer();
1488 <        if (!createIncomplete) f.complete(v1);
1489 <        final CompletableFuture<Void> g = f.thenAccept(r);
1487 >        final NoopConsumer r = new NoopConsumer(m);
1488 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1489 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1490          if (createIncomplete) {
1491              checkIncomplete(g);
1492 <            f.complete(v1);
1492 >            assertTrue(f.cancel(mayInterruptIfRunning));
1493          }
1494  
1495 <        checkCompletedWithWrappedCFException(g);
1496 <        checkCompletedNormally(f, v1);
1495 >        checkCompletedWithWrappedCancellationException(g);
1496 >        checkCancelled(f);
1497 >        r.assertNotInvoked();
1498      }}
1499  
1500      /**
1501 <     * thenAccept result completes exceptionally if source cancelled
1501 >     * thenAccept result completes exceptionally if action does
1502       */
1503 <    public void testThenAccept_sourceCancelled() {
1503 >    public void testThenAccept_actionFailed() {
1504          for (ExecutionMode m : ExecutionMode.values())
1505          for (boolean createIncomplete : new boolean[] { true, false })
1506 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1506 >        for (Integer v1 : new Integer[] { 1, null })
1507      {
1508          final CompletableFuture<Integer> f = new CompletableFuture<>();
1509 <        final IncAction r = new IncAction();
1510 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1511 <        final CompletableFuture<Void> g = f.thenAccept(r);
1509 >        final FailingConsumer r = new FailingConsumer(m);
1510 >        if (!createIncomplete) f.complete(v1);
1511 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1512          if (createIncomplete) {
1513              checkIncomplete(g);
1514 <            assertTrue(f.cancel(mayInterruptIfRunning));
1514 >            f.complete(v1);
1515          }
1516  
1517 <        checkCompletedWithWrappedCancellationException(g);
1518 <        checkCancelled(f);
1236 <        assertEquals(0, r.invocationCount);
1517 >        checkCompletedWithWrappedCFException(g);
1518 >        checkCompletedNormally(f, v1);
1519      }}
1520  
1521      /**
# Line 1249 | Line 1531 | public class CompletableFutureTest exten
1531      {
1532          final CompletableFuture<Integer> f = new CompletableFuture<>();
1533          final CompletableFuture<Integer> g = new CompletableFuture<>();
1534 <        final SubtractFunction r = new SubtractFunction();
1534 >        final SubtractFunction r = new SubtractFunction(m);
1535  
1536          if (fFirst) f.complete(v1); else g.complete(v2);
1537          if (!createIncomplete)
# Line 1257 | Line 1539 | public class CompletableFutureTest exten
1539          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1540          if (createIncomplete) {
1541              checkIncomplete(h);
1542 <            assertEquals(0, r.invocationCount);
1542 >            r.assertNotInvoked();
1543              if (!fFirst) f.complete(v1); else g.complete(v2);
1544          }
1545  
1546          checkCompletedNormally(h, subtract(v1, v2));
1547          checkCompletedNormally(f, v1);
1548          checkCompletedNormally(g, v2);
1549 <        assertEquals(1, r.invocationCount);
1549 >        r.assertValue(subtract(v1, v2));
1550      }}
1551  
1552      /**
# Line 1280 | Line 1562 | public class CompletableFutureTest exten
1562          final CompletableFuture<Integer> f = new CompletableFuture<>();
1563          final CompletableFuture<Integer> g = new CompletableFuture<>();
1564          final CFException ex = new CFException();
1565 <        final SubtractFunction r = new SubtractFunction();
1565 >        final SubtractFunction r = new SubtractFunction(m);
1566  
1567          (fFirst ? f : g).complete(v1);
1568          if (!createIncomplete)
# Line 1291 | Line 1573 | public class CompletableFutureTest exten
1573              (!fFirst ? f : g).completeExceptionally(ex);
1574          }
1575  
1576 <        checkCompletedWithWrappedCFException(h, ex);
1577 <        assertEquals(0, r.invocationCount);
1576 >        checkCompletedWithWrappedException(h, ex);
1577 >        r.assertNotInvoked();
1578          checkCompletedNormally(fFirst ? f : g, v1);
1579 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1298 <    }}
1299 <
1300 <    /**
1301 <     * thenCombine result completes exceptionally if action does
1302 <     */
1303 <    public void testThenCombine_actionFailed() {
1304 <        for (ExecutionMode m : ExecutionMode.values())
1305 <        for (boolean fFirst : new boolean[] { true, false })
1306 <        for (Integer v1 : new Integer[] { 1, null })
1307 <        for (Integer v2 : new Integer[] { 2, null })
1308 <    {
1309 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1310 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1311 <        final FailingBiFunction r = new FailingBiFunction();
1312 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1313 <
1314 <        if (fFirst) {
1315 <            f.complete(v1);
1316 <            g.complete(v2);
1317 <        } else {
1318 <            g.complete(v2);
1319 <            f.complete(v1);
1320 <        }
1321 <
1322 <        checkCompletedWithWrappedCFException(h);
1323 <        checkCompletedNormally(f, v1);
1324 <        checkCompletedNormally(g, v2);
1579 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1580      }}
1581  
1582      /**
# Line 1336 | Line 1591 | public class CompletableFutureTest exten
1591      {
1592          final CompletableFuture<Integer> f = new CompletableFuture<>();
1593          final CompletableFuture<Integer> g = new CompletableFuture<>();
1594 <        final SubtractFunction r = new SubtractFunction();
1594 >        final SubtractFunction r = new SubtractFunction(m);
1595  
1596          (fFirst ? f : g).complete(v1);
1597          if (!createIncomplete)
# Line 1349 | Line 1604 | public class CompletableFutureTest exten
1604  
1605          checkCompletedWithWrappedCancellationException(h);
1606          checkCancelled(!fFirst ? f : g);
1607 <        assertEquals(0, r.invocationCount);
1607 >        r.assertNotInvoked();
1608          checkCompletedNormally(fFirst ? f : g, v1);
1609      }}
1610  
1611      /**
1612 +     * thenCombine result completes exceptionally if action does
1613 +     */
1614 +    public void testThenCombine_actionFailed() {
1615 +        for (ExecutionMode m : ExecutionMode.values())
1616 +        for (boolean fFirst : new boolean[] { true, false })
1617 +        for (Integer v1 : new Integer[] { 1, null })
1618 +        for (Integer v2 : new Integer[] { 2, null })
1619 +    {
1620 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1621 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1622 +        final FailingBiFunction r = new FailingBiFunction(m);
1623 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1624 +
1625 +        if (fFirst) {
1626 +            f.complete(v1);
1627 +            g.complete(v2);
1628 +        } else {
1629 +            g.complete(v2);
1630 +            f.complete(v1);
1631 +        }
1632 +
1633 +        checkCompletedWithWrappedCFException(h);
1634 +        checkCompletedNormally(f, v1);
1635 +        checkCompletedNormally(g, v2);
1636 +    }}
1637 +
1638 +    /**
1639       * thenAcceptBoth result completes normally after normal
1640       * completion of sources
1641       */
# Line 1366 | Line 1648 | public class CompletableFutureTest exten
1648      {
1649          final CompletableFuture<Integer> f = new CompletableFuture<>();
1650          final CompletableFuture<Integer> g = new CompletableFuture<>();
1651 <        final SubtractAction r = new SubtractAction();
1651 >        final SubtractAction r = new SubtractAction(m);
1652  
1653          if (fFirst) f.complete(v1); else g.complete(v2);
1654          if (!createIncomplete)
# Line 1374 | Line 1656 | public class CompletableFutureTest exten
1656          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1657          if (createIncomplete) {
1658              checkIncomplete(h);
1659 <            assertEquals(0, r.invocationCount);
1659 >            r.assertNotInvoked();
1660              if (!fFirst) f.complete(v1); else g.complete(v2);
1661          }
1662  
1663          checkCompletedNormally(h, null);
1664 <        assertEquals(subtract(v1, v2), r.value);
1664 >        r.assertValue(subtract(v1, v2));
1665          checkCompletedNormally(f, v1);
1666          checkCompletedNormally(g, v2);
1667      }}
# Line 1397 | Line 1679 | public class CompletableFutureTest exten
1679          final CompletableFuture<Integer> f = new CompletableFuture<>();
1680          final CompletableFuture<Integer> g = new CompletableFuture<>();
1681          final CFException ex = new CFException();
1682 <        final SubtractAction r = new SubtractAction();
1682 >        final SubtractAction r = new SubtractAction(m);
1683  
1684          (fFirst ? f : g).complete(v1);
1685          if (!createIncomplete)
# Line 1408 | Line 1690 | public class CompletableFutureTest exten
1690              (!fFirst ? f : g).completeExceptionally(ex);
1691          }
1692  
1693 <        checkCompletedWithWrappedCFException(h, ex);
1694 <        assertEquals(0, r.invocationCount);
1693 >        checkCompletedWithWrappedException(h, ex);
1694 >        r.assertNotInvoked();
1695          checkCompletedNormally(fFirst ? f : g, v1);
1696 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1415 <    }}
1416 <
1417 <    /**
1418 <     * thenAcceptBoth result completes exceptionally if action does
1419 <     */
1420 <    public void testThenAcceptBoth_actionFailed() {
1421 <        for (ExecutionMode m : ExecutionMode.values())
1422 <        for (boolean fFirst : new boolean[] { true, false })
1423 <        for (Integer v1 : new Integer[] { 1, null })
1424 <        for (Integer v2 : new Integer[] { 2, null })
1425 <    {
1426 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1427 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1428 <        final FailingBiConsumer r = new FailingBiConsumer();
1429 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1430 <
1431 <        if (fFirst) {
1432 <            f.complete(v1);
1433 <            g.complete(v2);
1434 <        } else {
1435 <            g.complete(v2);
1436 <            f.complete(v1);
1437 <        }
1438 <
1439 <        checkCompletedWithWrappedCFException(h);
1440 <        checkCompletedNormally(f, v1);
1441 <        checkCompletedNormally(g, v2);
1696 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1697      }}
1698  
1699      /**
# Line 1453 | Line 1708 | public class CompletableFutureTest exten
1708      {
1709          final CompletableFuture<Integer> f = new CompletableFuture<>();
1710          final CompletableFuture<Integer> g = new CompletableFuture<>();
1711 <        final SubtractAction r = new SubtractAction();
1711 >        final SubtractAction r = new SubtractAction(m);
1712  
1713          (fFirst ? f : g).complete(v1);
1714          if (!createIncomplete)
# Line 1466 | Line 1721 | public class CompletableFutureTest exten
1721  
1722          checkCompletedWithWrappedCancellationException(h);
1723          checkCancelled(!fFirst ? f : g);
1724 <        assertEquals(0, r.invocationCount);
1724 >        r.assertNotInvoked();
1725          checkCompletedNormally(fFirst ? f : g, v1);
1726      }}
1727  
1728      /**
1729 <     * runAfterBoth result completes normally after normal
1475 <     * completion of sources
1729 >     * thenAcceptBoth result completes exceptionally if action does
1730       */
1731 <    public void testRunAfterBoth_normalCompletion1() {
1478 <        for (ExecutionMode m : ExecutionMode.values())
1479 <        for (Integer v1 : new Integer[] { 1, null })
1480 <        for (Integer v2 : new Integer[] { 2, null })
1481 <    {
1482 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1483 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1484 <        final Noop r = new Noop();
1485 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1486 <
1487 <        f.complete(v1);
1488 <        checkIncomplete(h);
1489 <        assertEquals(0, r.invocationCount);
1490 <        g.complete(v2);
1491 <
1492 <        checkCompletedNormally(h, null);
1493 <        assertEquals(1, r.invocationCount);
1494 <        checkCompletedNormally(f, v1);
1495 <        checkCompletedNormally(g, v2);
1496 <    }}
1497 <
1498 <    public void testRunAfterBoth_normalCompletion2() {
1499 <        for (ExecutionMode m : ExecutionMode.values())
1500 <        for (Integer v1 : new Integer[] { 1, null })
1501 <        for (Integer v2 : new Integer[] { 2, null })
1502 <    {
1503 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1504 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1505 <        final Noop r = new Noop();
1506 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1507 <
1508 <        g.complete(v2);
1509 <        checkIncomplete(h);
1510 <        assertEquals(0, r.invocationCount);
1511 <        f.complete(v1);
1512 <
1513 <        checkCompletedNormally(h, null);
1514 <        assertEquals(1, r.invocationCount);
1515 <        checkCompletedNormally(f, v1);
1516 <        checkCompletedNormally(g, v2);
1517 <    }}
1518 <
1519 <    public void testRunAfterBoth_normalCompletion3() {
1731 >    public void testThenAcceptBoth_actionFailed() {
1732          for (ExecutionMode m : ExecutionMode.values())
1733 +        for (boolean fFirst : new boolean[] { true, false })
1734          for (Integer v1 : new Integer[] { 1, null })
1735          for (Integer v2 : new Integer[] { 2, null })
1736      {
1737          final CompletableFuture<Integer> f = new CompletableFuture<>();
1738          final CompletableFuture<Integer> g = new CompletableFuture<>();
1739 <        final Noop r = new Noop();
1739 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1740 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1741  
1742 <        g.complete(v2);
1743 <        f.complete(v1);
1744 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1742 >        if (fFirst) {
1743 >            f.complete(v1);
1744 >            g.complete(v2);
1745 >        } else {
1746 >            g.complete(v2);
1747 >            f.complete(v1);
1748 >        }
1749  
1750 <        checkCompletedNormally(h, null);
1533 <        assertEquals(1, r.invocationCount);
1750 >        checkCompletedWithWrappedCFException(h);
1751          checkCompletedNormally(f, v1);
1752          checkCompletedNormally(g, v2);
1753      }}
1754  
1755 <    public void testRunAfterBoth_normalCompletion4() {
1755 >    /**
1756 >     * runAfterBoth result completes normally after normal
1757 >     * completion of sources
1758 >     */
1759 >    public void testRunAfterBoth_normalCompletion() {
1760          for (ExecutionMode m : ExecutionMode.values())
1761 +        for (boolean createIncomplete : new boolean[] { true, false })
1762 +        for (boolean fFirst : new boolean[] { true, false })
1763          for (Integer v1 : new Integer[] { 1, null })
1764          for (Integer v2 : new Integer[] { 2, null })
1765      {
1766          final CompletableFuture<Integer> f = new CompletableFuture<>();
1767          final CompletableFuture<Integer> g = new CompletableFuture<>();
1768 <        final Noop r = new Noop();
1768 >        final Noop r = new Noop(m);
1769  
1770 <        f.complete(v1);
1771 <        g.complete(v2);
1770 >        if (fFirst) f.complete(v1); else g.complete(v2);
1771 >        if (!createIncomplete)
1772 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1773          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1774 +        if (createIncomplete) {
1775 +            checkIncomplete(h);
1776 +            r.assertNotInvoked();
1777 +            if (!fFirst) f.complete(v1); else g.complete(v2);
1778 +        }
1779  
1780          checkCompletedNormally(h, null);
1781 <        assertEquals(1, r.invocationCount);
1781 >        r.assertInvoked();
1782          checkCompletedNormally(f, v1);
1783          checkCompletedNormally(g, v2);
1784      }}
# Line 1558 | Line 1787 | public class CompletableFutureTest exten
1787       * runAfterBoth result completes exceptionally after exceptional
1788       * completion of either source
1789       */
1790 <    public void testRunAfterBoth_exceptionalCompletion1() {
1562 <        for (ExecutionMode m : ExecutionMode.values())
1563 <        for (Integer v1 : new Integer[] { 1, null })
1564 <    {
1565 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1566 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1567 <        final Noop r = new Noop();
1568 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1569 <        final CFException ex = new CFException();
1570 <
1571 <        f.completeExceptionally(ex);
1572 <        checkIncomplete(h);
1573 <        g.complete(v1);
1574 <
1575 <        checkCompletedWithWrappedCFException(h, ex);
1576 <        checkCompletedWithWrappedCFException(f, ex);
1577 <        assertEquals(0, r.invocationCount);
1578 <        checkCompletedNormally(g, v1);
1579 <    }}
1580 <
1581 <    public void testRunAfterBoth_exceptionalCompletion2() {
1582 <        for (ExecutionMode m : ExecutionMode.values())
1583 <        for (Integer v1 : new Integer[] { 1, null })
1584 <    {
1585 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1586 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1587 <        final Noop r = new Noop();
1588 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1589 <        final CFException ex = new CFException();
1590 <
1591 <        g.completeExceptionally(ex);
1592 <        checkIncomplete(h);
1593 <        f.complete(v1);
1594 <
1595 <        checkCompletedWithWrappedCFException(h, ex);
1596 <        checkCompletedWithWrappedCFException(g, ex);
1597 <        assertEquals(0, r.invocationCount);
1598 <        checkCompletedNormally(f, v1);
1599 <    }}
1600 <
1601 <    public void testRunAfterBoth_exceptionalCompletion3() {
1602 <        for (ExecutionMode m : ExecutionMode.values())
1603 <        for (Integer v1 : new Integer[] { 1, null })
1604 <    {
1605 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1606 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1607 <        final Noop r = new Noop();
1608 <        final CFException ex = new CFException();
1609 <
1610 <        g.completeExceptionally(ex);
1611 <        f.complete(v1);
1612 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1613 <
1614 <        checkCompletedWithWrappedCFException(h, ex);
1615 <        checkCompletedWithWrappedCFException(g, ex);
1616 <        assertEquals(0, r.invocationCount);
1617 <        checkCompletedNormally(f, v1);
1618 <    }}
1619 <
1620 <    public void testRunAfterBoth_exceptionalCompletion4() {
1790 >    public void testRunAfterBoth_exceptionalCompletion() {
1791          for (ExecutionMode m : ExecutionMode.values())
1792 +        for (boolean createIncomplete : 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<>();
1626        final Noop r = new Noop();
1798          final CFException ex = new CFException();
1799 +        final Noop r = new Noop(m);
1800  
1801 <        f.completeExceptionally(ex);
1802 <        g.complete(v1);
1803 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1632 <
1633 <        checkCompletedWithWrappedCFException(h, ex);
1634 <        checkCompletedWithWrappedCFException(f, ex);
1635 <        assertEquals(0, r.invocationCount);
1636 <        checkCompletedNormally(g, v1);
1637 <    }}
1638 <
1639 <    /**
1640 <     * runAfterBoth result completes exceptionally if action does
1641 <     */
1642 <    public void testRunAfterBoth_actionFailed1() {
1643 <        for (ExecutionMode m : ExecutionMode.values())
1644 <        for (Integer v1 : new Integer[] { 1, null })
1645 <        for (Integer v2 : new Integer[] { 2, null })
1646 <    {
1647 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1648 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1649 <        final FailingRunnable r = new FailingRunnable();
1650 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1651 <
1652 <        f.complete(v1);
1653 <        checkIncomplete(h);
1654 <        g.complete(v2);
1655 <
1656 <        checkCompletedWithWrappedCFException(h);
1657 <        checkCompletedNormally(f, v1);
1658 <        checkCompletedNormally(g, v2);
1659 <    }}
1660 <
1661 <    public void testRunAfterBoth_actionFailed2() {
1662 <        for (ExecutionMode m : ExecutionMode.values())
1663 <        for (Integer v1 : new Integer[] { 1, null })
1664 <        for (Integer v2 : new Integer[] { 2, null })
1665 <    {
1666 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1667 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final FailingRunnable r = new FailingRunnable();
1801 >        (fFirst ? f : g).complete(v1);
1802 >        if (!createIncomplete)
1803 >            (!fFirst ? f : g).completeExceptionally(ex);
1804          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1805 +        if (createIncomplete) {
1806 +            checkIncomplete(h);
1807 +            (!fFirst ? f : g).completeExceptionally(ex);
1808 +        }
1809  
1810 <        g.complete(v2);
1811 <        checkIncomplete(h);
1812 <        f.complete(v1);
1813 <
1675 <        checkCompletedWithWrappedCFException(h);
1676 <        checkCompletedNormally(f, v1);
1677 <        checkCompletedNormally(g, v2);
1810 >        checkCompletedWithWrappedException(h, ex);
1811 >        r.assertNotInvoked();
1812 >        checkCompletedNormally(fFirst ? f : g, v1);
1813 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1814      }}
1815  
1816      /**
1817       * runAfterBoth result completes exceptionally if either source cancelled
1818       */
1819 <    public void testRunAfterBoth_sourceCancelled1() {
1819 >    public void testRunAfterBoth_sourceCancelled() {
1820          for (ExecutionMode m : ExecutionMode.values())
1821          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1822 +        for (boolean createIncomplete : new boolean[] { true, false })
1823 +        for (boolean fFirst : new boolean[] { true, false })
1824          for (Integer v1 : new Integer[] { 1, null })
1825      {
1826          final CompletableFuture<Integer> f = new CompletableFuture<>();
1827          final CompletableFuture<Integer> g = new CompletableFuture<>();
1828 <        final Noop r = new Noop();
1691 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1692 <
1693 <        assertTrue(f.cancel(mayInterruptIfRunning));
1694 <        checkIncomplete(h);
1695 <        g.complete(v1);
1696 <
1697 <        checkCompletedWithWrappedCancellationException(h);
1698 <        checkCancelled(f);
1699 <        assertEquals(0, r.invocationCount);
1700 <        checkCompletedNormally(g, v1);
1701 <    }}
1828 >        final Noop r = new Noop(m);
1829  
1830 <    public void testRunAfterBoth_sourceCancelled2() {
1831 <        for (ExecutionMode m : ExecutionMode.values())
1832 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1706 <        for (Integer v1 : new Integer[] { 1, null })
1707 <    {
1708 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1709 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 <        final Noop r = new Noop();
1830 >        (fFirst ? f : g).complete(v1);
1831 >        if (!createIncomplete)
1832 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1833          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1834 <
1835 <        assertTrue(g.cancel(mayInterruptIfRunning));
1836 <        checkIncomplete(h);
1837 <        f.complete(v1);
1834 >        if (createIncomplete) {
1835 >            checkIncomplete(h);
1836 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1837 >        }
1838  
1839          checkCompletedWithWrappedCancellationException(h);
1840 <        checkCancelled(g);
1841 <        assertEquals(0, r.invocationCount);
1842 <        checkCompletedNormally(f, v1);
1840 >        checkCancelled(!fFirst ? f : g);
1841 >        r.assertNotInvoked();
1842 >        checkCompletedNormally(fFirst ? f : g, v1);
1843      }}
1844  
1845 <    public void testRunAfterBoth_sourceCancelled3() {
1845 >    /**
1846 >     * runAfterBoth result completes exceptionally if action does
1847 >     */
1848 >    public void testRunAfterBoth_actionFailed() {
1849          for (ExecutionMode m : ExecutionMode.values())
1850 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1850 >        for (boolean fFirst : new boolean[] { true, false })
1851          for (Integer v1 : new Integer[] { 1, null })
1852 +        for (Integer v2 : new Integer[] { 2, null })
1853      {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856 <        final Noop r = new Noop();
1856 >        final FailingRunnable r1 = new FailingRunnable(m);
1857 >        final FailingRunnable r2 = new FailingRunnable(m);
1858  
1859 <        assertTrue(g.cancel(mayInterruptIfRunning));
1860 <        f.complete(v1);
1861 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1859 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1860 >        if (fFirst) {
1861 >            f.complete(v1);
1862 >            g.complete(v2);
1863 >        } else {
1864 >            g.complete(v2);
1865 >            f.complete(v1);
1866 >        }
1867 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1868  
1869 <        checkCompletedWithWrappedCancellationException(h);
1870 <        checkCancelled(g);
1738 <        assertEquals(0, r.invocationCount);
1869 >        checkCompletedWithWrappedCFException(h1);
1870 >        checkCompletedWithWrappedCFException(h2);
1871          checkCompletedNormally(f, v1);
1872 <    }}
1741 <
1742 <    public void testRunAfterBoth_sourceCancelled4() {
1743 <        for (ExecutionMode m : ExecutionMode.values())
1744 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1745 <        for (Integer v1 : new Integer[] { 1, null })
1746 <    {
1747 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1748 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1749 <        final Noop r = new Noop();
1750 <
1751 <        assertTrue(f.cancel(mayInterruptIfRunning));
1752 <        g.complete(v1);
1753 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1754 <
1755 <        checkCompletedWithWrappedCancellationException(h);
1756 <        checkCancelled(f);
1757 <        assertEquals(0, r.invocationCount);
1758 <        checkCompletedNormally(g, v1);
1872 >        checkCompletedNormally(g, v2);
1873      }}
1874  
1875      /**
1876       * applyToEither result completes normally after normal completion
1877       * of either source
1878       */
1879 <    public void testApplyToEither_normalCompletion1() {
1879 >    public void testApplyToEither_normalCompletion() {
1880          for (ExecutionMode m : ExecutionMode.values())
1881          for (Integer v1 : new Integer[] { 1, null })
1882          for (Integer v2 : new Integer[] { 2, null })
1883      {
1884          final CompletableFuture<Integer> f = new CompletableFuture<>();
1885          final CompletableFuture<Integer> g = new CompletableFuture<>();
1886 <        final IncFunction r = new IncFunction();
1887 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1886 >        final IncFunction[] rs = new IncFunction[6];
1887 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1888  
1889 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1890 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1891 +        checkIncomplete(h0);
1892 +        checkIncomplete(h1);
1893 +        rs[0].assertNotInvoked();
1894 +        rs[1].assertNotInvoked();
1895          f.complete(v1);
1896 <        checkCompletedNormally(h, inc(v1));
1896 >        checkCompletedNormally(h0, inc(v1));
1897 >        checkCompletedNormally(h1, inc(v1));
1898 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1899 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1900 >        checkCompletedNormally(h2, inc(v1));
1901 >        checkCompletedNormally(h3, inc(v1));
1902          g.complete(v2);
1903  
1904 <        checkCompletedNormally(f, v1);
1905 <        checkCompletedNormally(g, v2);
1906 <        checkCompletedNormally(h, inc(v1));
1907 <    }}
1908 <
1909 <    public void testApplyToEither_normalCompletion2() {
1910 <        for (ExecutionMode m : ExecutionMode.values())
1911 <        for (Integer v1 : new Integer[] { 1, null })
1912 <        for (Integer v2 : new Integer[] { 2, null })
1788 <    {
1789 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1790 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1791 <        final IncFunction r = new IncFunction();
1792 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1793 <
1794 <        g.complete(v2);
1795 <        checkCompletedNormally(h, inc(v2));
1796 <        f.complete(v1);
1904 >        // unspecified behavior - both source completions available
1905 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1906 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1907 >        rs[4].assertValue(h4.join());
1908 >        rs[5].assertValue(h5.join());
1909 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1910 >                   Objects.equals(inc(v2), h4.join()));
1911 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1912 >                   Objects.equals(inc(v2), h5.join()));
1913  
1914          checkCompletedNormally(f, v1);
1915          checkCompletedNormally(g, v2);
1916 <        checkCompletedNormally(h, inc(v2));
1917 <        }}
1918 <
1919 <    public void testApplyToEither_normalCompletion3() {
1920 <        for (ExecutionMode m : ExecutionMode.values())
1805 <        for (Integer v1 : new Integer[] { 1, null })
1806 <        for (Integer v2 : new Integer[] { 2, null })
1807 <    {
1808 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1809 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1810 <        final IncFunction r = new IncFunction();
1811 <
1812 <        f.complete(v1);
1813 <        g.complete(v2);
1814 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1815 <
1816 <        checkCompletedNormally(f, v1);
1817 <        checkCompletedNormally(g, v2);
1818 <
1819 <        // unspecified behavior
1820 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1821 <                   Objects.equals(h.join(), inc(v2)));
1822 <        assertEquals(1, r.invocationCount);
1916 >        checkCompletedNormally(h0, inc(v1));
1917 >        checkCompletedNormally(h1, inc(v1));
1918 >        checkCompletedNormally(h2, inc(v1));
1919 >        checkCompletedNormally(h3, inc(v1));
1920 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1921      }}
1922  
1923      /**
1924       * applyToEither result completes exceptionally after exceptional
1925       * completion of either source
1926       */
1927 <    public void testApplyToEither_exceptionalCompletion1() {
1927 >    public void testApplyToEither_exceptionalCompletion() {
1928          for (ExecutionMode m : ExecutionMode.values())
1929          for (Integer v1 : new Integer[] { 1, null })
1930      {
1931          final CompletableFuture<Integer> f = new CompletableFuture<>();
1932          final CompletableFuture<Integer> g = new CompletableFuture<>();
1835        final IncFunction r = new IncFunction();
1836        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1933          final CFException ex = new CFException();
1934 +        final IncFunction[] rs = new IncFunction[6];
1935 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1936  
1937 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1938 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1939 +        checkIncomplete(h0);
1940 +        checkIncomplete(h1);
1941 +        rs[0].assertNotInvoked();
1942 +        rs[1].assertNotInvoked();
1943          f.completeExceptionally(ex);
1944 <        checkCompletedWithWrappedCFException(h, ex);
1944 >        checkCompletedWithWrappedException(h0, ex);
1945 >        checkCompletedWithWrappedException(h1, ex);
1946 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1947 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1948 >        checkCompletedWithWrappedException(h2, ex);
1949 >        checkCompletedWithWrappedException(h3, ex);
1950          g.complete(v1);
1951  
1952 <        assertEquals(0, r.invocationCount);
1952 >        // unspecified behavior - both source completions available
1953 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1954 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1955 >        try {
1956 >            assertEquals(inc(v1), h4.join());
1957 >            rs[4].assertValue(inc(v1));
1958 >        } catch (CompletionException ok) {
1959 >            checkCompletedWithWrappedException(h4, ex);
1960 >            rs[4].assertNotInvoked();
1961 >        }
1962 >        try {
1963 >            assertEquals(inc(v1), h5.join());
1964 >            rs[5].assertValue(inc(v1));
1965 >        } catch (CompletionException ok) {
1966 >            checkCompletedWithWrappedException(h5, ex);
1967 >            rs[5].assertNotInvoked();
1968 >        }
1969 >
1970 >        checkCompletedExceptionally(f, ex);
1971          checkCompletedNormally(g, v1);
1972 <        checkCompletedWithWrappedCFException(f, ex);
1973 <        checkCompletedWithWrappedCFException(h, ex);
1972 >        checkCompletedWithWrappedException(h0, ex);
1973 >        checkCompletedWithWrappedException(h1, ex);
1974 >        checkCompletedWithWrappedException(h2, ex);
1975 >        checkCompletedWithWrappedException(h3, ex);
1976 >        checkCompletedWithWrappedException(h4, ex);
1977 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1978      }}
1979  
1980      public void testApplyToEither_exceptionalCompletion2() {
1981          for (ExecutionMode m : ExecutionMode.values())
1982 +        for (boolean fFirst : new boolean[] { true, false })
1983          for (Integer v1 : new Integer[] { 1, null })
1984      {
1985          final CompletableFuture<Integer> f = new CompletableFuture<>();
1986          final CompletableFuture<Integer> g = new CompletableFuture<>();
1855        final IncFunction r = new IncFunction();
1856        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1857        final CFException ex = new CFException();
1858
1859        g.completeExceptionally(ex);
1860        checkCompletedWithWrappedCFException(h, ex);
1861        f.complete(v1);
1862
1863        assertEquals(0, r.invocationCount);
1864        checkCompletedNormally(f, v1);
1865        checkCompletedWithWrappedCFException(g, ex);
1866        checkCompletedWithWrappedCFException(h, ex);
1867    }}
1868
1869    public void testApplyToEither_exceptionalCompletion3() {
1870        for (ExecutionMode m : ExecutionMode.values())
1871        for (Integer v1 : new Integer[] { 1, null })
1872    {
1873        final CompletableFuture<Integer> f = new CompletableFuture<>();
1874        final CompletableFuture<Integer> g = new CompletableFuture<>();
1875        final IncFunction r = new IncFunction();
1987          final CFException ex = new CFException();
1988 +        final IncFunction[] rs = new IncFunction[6];
1989 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1990  
1991 <        g.completeExceptionally(ex);
1992 <        f.complete(v1);
1993 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1991 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1992 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1993 >        if (fFirst) {
1994 >            f.complete(v1);
1995 >            g.completeExceptionally(ex);
1996 >        } else {
1997 >            g.completeExceptionally(ex);
1998 >            f.complete(v1);
1999 >        }
2000 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2001 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2002  
2003 <        // unspecified behavior
1883 <        Integer v;
2003 >        // unspecified behavior - both source completions available
2004          try {
2005 <            assertEquals(inc(v1), h.join());
2006 <            assertEquals(1, r.invocationCount);
2005 >            assertEquals(inc(v1), h0.join());
2006 >            rs[0].assertValue(inc(v1));
2007          } catch (CompletionException ok) {
2008 <            checkCompletedWithWrappedCFException(h, ex);
2009 <            assertEquals(0, r.invocationCount);
2008 >            checkCompletedWithWrappedException(h0, ex);
2009 >            rs[0].assertNotInvoked();
2010          }
1891
1892        checkCompletedWithWrappedCFException(g, ex);
1893        checkCompletedNormally(f, v1);
1894    }}
1895
1896    public void testApplyToEither_exceptionalCompletion4() {
1897        for (ExecutionMode m : ExecutionMode.values())
1898        for (Integer v1 : new Integer[] { 1, null })
1899    {
1900        final CompletableFuture<Integer> f = new CompletableFuture<>();
1901        final CompletableFuture<Integer> g = new CompletableFuture<>();
1902        final IncFunction r = new IncFunction();
1903        final CFException ex = new CFException();
1904
1905        f.completeExceptionally(ex);
1906        g.complete(v1);
1907        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1908
1909        // unspecified behavior
1910        Integer v;
2011          try {
2012 <            assertEquals(inc(v1), h.join());
2013 <            assertEquals(1, r.invocationCount);
2012 >            assertEquals(inc(v1), h1.join());
2013 >            rs[1].assertValue(inc(v1));
2014          } catch (CompletionException ok) {
2015 <            checkCompletedWithWrappedCFException(h, ex);
2016 <            assertEquals(0, r.invocationCount);
2015 >            checkCompletedWithWrappedException(h1, ex);
2016 >            rs[1].assertNotInvoked();
2017 >        }
2018 >        try {
2019 >            assertEquals(inc(v1), h2.join());
2020 >            rs[2].assertValue(inc(v1));
2021 >        } catch (CompletionException ok) {
2022 >            checkCompletedWithWrappedException(h2, ex);
2023 >            rs[2].assertNotInvoked();
2024 >        }
2025 >        try {
2026 >            assertEquals(inc(v1), h3.join());
2027 >            rs[3].assertValue(inc(v1));
2028 >        } catch (CompletionException ok) {
2029 >            checkCompletedWithWrappedException(h3, ex);
2030 >            rs[3].assertNotInvoked();
2031          }
2032  
1919        checkCompletedWithWrappedCFException(f, ex);
1920        checkCompletedNormally(g, v1);
1921    }}
1922
1923    /**
1924     * applyToEither result completes exceptionally if action does
1925     */
1926    public void testApplyToEither_actionFailed1() {
1927        for (ExecutionMode m : ExecutionMode.values())
1928        for (Integer v1 : new Integer[] { 1, null })
1929        for (Integer v2 : new Integer[] { 2, null })
1930    {
1931        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932        final CompletableFuture<Integer> g = new CompletableFuture<>();
1933        final FailingFunction r = new FailingFunction();
1934        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1935
1936        f.complete(v1);
1937        checkCompletedWithWrappedCFException(h);
1938        g.complete(v2);
1939        checkCompletedNormally(f, v1);
1940        checkCompletedNormally(g, v2);
1941    }}
1942
1943    public void testApplyToEither_actionFailed2() {
1944        for (ExecutionMode m : ExecutionMode.values())
1945        for (Integer v1 : new Integer[] { 1, null })
1946        for (Integer v2 : new Integer[] { 2, null })
1947    {
1948        final CompletableFuture<Integer> f = new CompletableFuture<>();
1949        final CompletableFuture<Integer> g = new CompletableFuture<>();
1950        final FailingFunction r = new FailingFunction();
1951        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1952
1953        g.complete(v2);
1954        checkCompletedWithWrappedCFException(h);
1955        f.complete(v1);
2033          checkCompletedNormally(f, v1);
2034 <        checkCompletedNormally(g, v2);
2034 >        checkCompletedExceptionally(g, ex);
2035      }}
2036  
2037      /**
2038       * applyToEither result completes exceptionally if either source cancelled
2039       */
2040 <    public void testApplyToEither_sourceCancelled1() {
2040 >    public void testApplyToEither_sourceCancelled() {
2041          for (ExecutionMode m : ExecutionMode.values())
2042          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2043          for (Integer v1 : new Integer[] { 1, null })
2044      {
2045          final CompletableFuture<Integer> f = new CompletableFuture<>();
2046          final CompletableFuture<Integer> g = new CompletableFuture<>();
2047 <        final IncFunction r = new IncFunction();
2048 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2047 >        final IncFunction[] rs = new IncFunction[6];
2048 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2049  
2050 <        assertTrue(f.cancel(mayInterruptIfRunning));
2051 <        checkCompletedWithWrappedCancellationException(h);
2050 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2051 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2052 >        checkIncomplete(h0);
2053 >        checkIncomplete(h1);
2054 >        rs[0].assertNotInvoked();
2055 >        rs[1].assertNotInvoked();
2056 >        f.cancel(mayInterruptIfRunning);
2057 >        checkCompletedWithWrappedCancellationException(h0);
2058 >        checkCompletedWithWrappedCancellationException(h1);
2059 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2060 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2061 >        checkCompletedWithWrappedCancellationException(h2);
2062 >        checkCompletedWithWrappedCancellationException(h3);
2063          g.complete(v1);
2064  
2065 +        // unspecified behavior - both source completions available
2066 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2067 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2068 +        try {
2069 +            assertEquals(inc(v1), h4.join());
2070 +            rs[4].assertValue(inc(v1));
2071 +        } catch (CompletionException ok) {
2072 +            checkCompletedWithWrappedCancellationException(h4);
2073 +            rs[4].assertNotInvoked();
2074 +        }
2075 +        try {
2076 +            assertEquals(inc(v1), h5.join());
2077 +            rs[5].assertValue(inc(v1));
2078 +        } catch (CompletionException ok) {
2079 +            checkCompletedWithWrappedCancellationException(h5);
2080 +            rs[5].assertNotInvoked();
2081 +        }
2082 +
2083          checkCancelled(f);
1978        assertEquals(0, r.invocationCount);
2084          checkCompletedNormally(g, v1);
2085 <        checkCompletedWithWrappedCancellationException(h);
2085 >        checkCompletedWithWrappedCancellationException(h0);
2086 >        checkCompletedWithWrappedCancellationException(h1);
2087 >        checkCompletedWithWrappedCancellationException(h2);
2088 >        checkCompletedWithWrappedCancellationException(h3);
2089 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2090      }}
2091  
2092      public void testApplyToEither_sourceCancelled2() {
2093          for (ExecutionMode m : ExecutionMode.values())
2094          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2095 +        for (boolean fFirst : new boolean[] { true, false })
2096          for (Integer v1 : new Integer[] { 1, null })
2097      {
2098          final CompletableFuture<Integer> f = new CompletableFuture<>();
2099          final CompletableFuture<Integer> g = new CompletableFuture<>();
2100 <        final IncFunction r = new IncFunction();
2101 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1992 <
1993 <        assertTrue(g.cancel(mayInterruptIfRunning));
1994 <        checkCompletedWithWrappedCancellationException(h);
1995 <        f.complete(v1);
1996 <
1997 <        checkCancelled(g);
1998 <        assertEquals(0, r.invocationCount);
1999 <        checkCompletedNormally(f, v1);
2000 <        checkCompletedWithWrappedCancellationException(h);
2001 <    }}
2002 <
2003 <    public void testApplyToEither_sourceCancelled3() {
2004 <        for (ExecutionMode m : ExecutionMode.values())
2005 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2006 <        for (Integer v1 : new Integer[] { 1, null })
2007 <    {
2008 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2009 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2010 <        final IncFunction r = new IncFunction();
2100 >        final IncFunction[] rs = new IncFunction[6];
2101 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2102  
2103 <        assertTrue(g.cancel(mayInterruptIfRunning));
2104 <        f.complete(v1);
2105 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2103 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2104 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2105 >        if (fFirst) {
2106 >            f.complete(v1);
2107 >            g.cancel(mayInterruptIfRunning);
2108 >        } else {
2109 >            g.cancel(mayInterruptIfRunning);
2110 >            f.complete(v1);
2111 >        }
2112 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2113 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2114  
2115 <        // unspecified behavior
2017 <        Integer v;
2115 >        // unspecified behavior - both source completions available
2116          try {
2117 <            assertEquals(inc(v1), h.join());
2118 <            assertEquals(1, r.invocationCount);
2117 >            assertEquals(inc(v1), h0.join());
2118 >            rs[0].assertValue(inc(v1));
2119          } catch (CompletionException ok) {
2120 <            checkCompletedWithWrappedCancellationException(h);
2121 <            assertEquals(0, r.invocationCount);
2120 >            checkCompletedWithWrappedCancellationException(h0);
2121 >            rs[0].assertNotInvoked();
2122 >        }
2123 >        try {
2124 >            assertEquals(inc(v1), h1.join());
2125 >            rs[1].assertValue(inc(v1));
2126 >        } catch (CompletionException ok) {
2127 >            checkCompletedWithWrappedCancellationException(h1);
2128 >            rs[1].assertNotInvoked();
2129          }
2025
2026        checkCancelled(g);
2027        checkCompletedNormally(f, v1);
2028    }}
2029
2030    public void testApplyToEither_sourceCancelled4() {
2031        for (ExecutionMode m : ExecutionMode.values())
2032        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2033        for (Integer v1 : new Integer[] { 1, null })
2034    {
2035        final CompletableFuture<Integer> f = new CompletableFuture<>();
2036        final CompletableFuture<Integer> g = new CompletableFuture<>();
2037        final IncFunction r = new IncFunction();
2038
2039        assertTrue(f.cancel(mayInterruptIfRunning));
2040        g.complete(v1);
2041        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2042
2043        // unspecified behavior
2044        Integer v;
2130          try {
2131 <            assertEquals(inc(v1), h.join());
2132 <            assertEquals(1, r.invocationCount);
2131 >            assertEquals(inc(v1), h2.join());
2132 >            rs[2].assertValue(inc(v1));
2133          } catch (CompletionException ok) {
2134 <            checkCompletedWithWrappedCancellationException(h);
2135 <            assertEquals(0, r.invocationCount);
2134 >            checkCompletedWithWrappedCancellationException(h2);
2135 >            rs[2].assertNotInvoked();
2136 >        }
2137 >        try {
2138 >            assertEquals(inc(v1), h3.join());
2139 >            rs[3].assertValue(inc(v1));
2140 >        } catch (CompletionException ok) {
2141 >            checkCompletedWithWrappedCancellationException(h3);
2142 >            rs[3].assertNotInvoked();
2143          }
2144  
2145 <        checkCancelled(f);
2146 <        checkCompletedNormally(g, v1);
2145 >        checkCompletedNormally(f, v1);
2146 >        checkCancelled(g);
2147      }}
2148  
2149      /**
2150 <     * acceptEither result completes normally after normal completion
2059 <     * of either source
2150 >     * applyToEither result completes exceptionally if action does
2151       */
2152 <    public void testAcceptEither_normalCompletion1() {
2152 >    public void testApplyToEither_actionFailed() {
2153          for (ExecutionMode m : ExecutionMode.values())
2154          for (Integer v1 : new Integer[] { 1, null })
2155          for (Integer v2 : new Integer[] { 2, null })
2156      {
2157          final CompletableFuture<Integer> f = new CompletableFuture<>();
2158          final CompletableFuture<Integer> g = new CompletableFuture<>();
2159 <        final IncAction r = new IncAction();
2160 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2159 >        final FailingFunction[] rs = new FailingFunction[6];
2160 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2161  
2162 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2163 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2164          f.complete(v1);
2165 <        checkCompletedNormally(h, null);
2166 <        assertEquals(inc(v1), r.value);
2167 <        g.complete(v2);
2165 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2166 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2167 >        checkCompletedWithWrappedCFException(h0);
2168 >        checkCompletedWithWrappedCFException(h1);
2169 >        checkCompletedWithWrappedCFException(h2);
2170 >        checkCompletedWithWrappedCFException(h3);
2171 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2172  
2173 <        checkCompletedNormally(f, v1);
2077 <        checkCompletedNormally(g, v2);
2078 <        checkCompletedNormally(h, null);
2079 <    }}
2173 >        g.complete(v2);
2174  
2175 <    public void testAcceptEither_normalCompletion2() {
2176 <        for (ExecutionMode m : ExecutionMode.values())
2177 <        for (Integer v1 : new Integer[] { 1, null })
2084 <        for (Integer v2 : new Integer[] { 2, null })
2085 <    {
2086 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2087 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2088 <        final IncAction r = new IncAction();
2089 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2175 >        // unspecified behavior - both source completions available
2176 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2177 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2178  
2179 <        g.complete(v2);
2180 <        checkCompletedNormally(h, null);
2181 <        assertEquals(inc(v2), r.value);
2182 <        f.complete(v1);
2179 >        checkCompletedWithWrappedCFException(h4);
2180 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2181 >                   Objects.equals(v2, rs[4].value));
2182 >        checkCompletedWithWrappedCFException(h5);
2183 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2184 >                   Objects.equals(v2, rs[5].value));
2185  
2186          checkCompletedNormally(f, v1);
2187          checkCompletedNormally(g, v2);
2098        checkCompletedNormally(h, null);
2188      }}
2189  
2190 <    public void testAcceptEither_normalCompletion3() {
2190 >    /**
2191 >     * acceptEither result completes normally after normal completion
2192 >     * of either source
2193 >     */
2194 >    public void testAcceptEither_normalCompletion() {
2195          for (ExecutionMode m : ExecutionMode.values())
2196          for (Integer v1 : new Integer[] { 1, null })
2197          for (Integer v2 : new Integer[] { 2, null })
2198      {
2199          final CompletableFuture<Integer> f = new CompletableFuture<>();
2200          final CompletableFuture<Integer> g = new CompletableFuture<>();
2201 <        final IncAction r = new IncAction();
2201 >        final NoopConsumer[] rs = new NoopConsumer[6];
2202 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2203  
2204 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2205 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2206 +        checkIncomplete(h0);
2207 +        checkIncomplete(h1);
2208 +        rs[0].assertNotInvoked();
2209 +        rs[1].assertNotInvoked();
2210          f.complete(v1);
2211 +        checkCompletedNormally(h0, null);
2212 +        checkCompletedNormally(h1, null);
2213 +        rs[0].assertValue(v1);
2214 +        rs[1].assertValue(v1);
2215 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2216 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2217 +        checkCompletedNormally(h2, null);
2218 +        checkCompletedNormally(h3, null);
2219 +        rs[2].assertValue(v1);
2220 +        rs[3].assertValue(v1);
2221          g.complete(v2);
2112        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2222  
2223 <        checkCompletedNormally(h, null);
2223 >        // unspecified behavior - both source completions available
2224 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2225 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2226 >        checkCompletedNormally(h4, null);
2227 >        checkCompletedNormally(h5, null);
2228 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2229 >                   Objects.equals(v2, rs[4].value));
2230 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2231 >                   Objects.equals(v2, rs[5].value));
2232 >
2233          checkCompletedNormally(f, v1);
2234          checkCompletedNormally(g, v2);
2235 <
2236 <        // unspecified behavior
2237 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2238 <                   Objects.equals(r.value, inc(v2)));
2235 >        checkCompletedNormally(h0, null);
2236 >        checkCompletedNormally(h1, null);
2237 >        checkCompletedNormally(h2, null);
2238 >        checkCompletedNormally(h3, null);
2239 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2240      }}
2241  
2242      /**
2243       * acceptEither result completes exceptionally after exceptional
2244       * completion of either source
2245       */
2246 <    public void testAcceptEither_exceptionalCompletion1() {
2246 >    public void testAcceptEither_exceptionalCompletion() {
2247          for (ExecutionMode m : ExecutionMode.values())
2248          for (Integer v1 : new Integer[] { 1, null })
2249      {
2250          final CompletableFuture<Integer> f = new CompletableFuture<>();
2251          final CompletableFuture<Integer> g = new CompletableFuture<>();
2133        final IncAction r = new IncAction();
2134        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2252          final CFException ex = new CFException();
2253 +        final NoopConsumer[] rs = new NoopConsumer[6];
2254 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2255  
2256 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2257 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2258 +        checkIncomplete(h0);
2259 +        checkIncomplete(h1);
2260 +        rs[0].assertNotInvoked();
2261 +        rs[1].assertNotInvoked();
2262          f.completeExceptionally(ex);
2263 <        checkCompletedWithWrappedCFException(h, ex);
2263 >        checkCompletedWithWrappedException(h0, ex);
2264 >        checkCompletedWithWrappedException(h1, ex);
2265 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2266 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2267 >        checkCompletedWithWrappedException(h2, ex);
2268 >        checkCompletedWithWrappedException(h3, ex);
2269 >
2270          g.complete(v1);
2271  
2272 <        assertEquals(0, r.invocationCount);
2272 >        // unspecified behavior - both source completions available
2273 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2274 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2275 >        try {
2276 >            assertNull(h4.join());
2277 >            rs[4].assertValue(v1);
2278 >        } catch (CompletionException ok) {
2279 >            checkCompletedWithWrappedException(h4, ex);
2280 >            rs[4].assertNotInvoked();
2281 >        }
2282 >        try {
2283 >            assertNull(h5.join());
2284 >            rs[5].assertValue(v1);
2285 >        } catch (CompletionException ok) {
2286 >            checkCompletedWithWrappedException(h5, ex);
2287 >            rs[5].assertNotInvoked();
2288 >        }
2289 >
2290 >        checkCompletedExceptionally(f, ex);
2291          checkCompletedNormally(g, v1);
2292 <        checkCompletedWithWrappedCFException(f, ex);
2293 <        checkCompletedWithWrappedCFException(h, ex);
2292 >        checkCompletedWithWrappedException(h0, ex);
2293 >        checkCompletedWithWrappedException(h1, ex);
2294 >        checkCompletedWithWrappedException(h2, ex);
2295 >        checkCompletedWithWrappedException(h3, ex);
2296 >        checkCompletedWithWrappedException(h4, ex);
2297 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2298      }}
2299  
2300      public void testAcceptEither_exceptionalCompletion2() {
2301          for (ExecutionMode m : ExecutionMode.values())
2302 +        for (boolean fFirst : new boolean[] { true, false })
2303          for (Integer v1 : new Integer[] { 1, null })
2304      {
2305          final CompletableFuture<Integer> f = new CompletableFuture<>();
2306          final CompletableFuture<Integer> g = new CompletableFuture<>();
2153        final IncAction r = new IncAction();
2154        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2155        final CFException ex = new CFException();
2156
2157        g.completeExceptionally(ex);
2158        checkCompletedWithWrappedCFException(h, ex);
2159        f.complete(v1);
2160
2161        assertEquals(0, r.invocationCount);
2162        checkCompletedNormally(f, v1);
2163        checkCompletedWithWrappedCFException(g, ex);
2164        checkCompletedWithWrappedCFException(h, ex);
2165    }}
2166
2167    public void testAcceptEither_exceptionalCompletion3() {
2168        for (ExecutionMode m : ExecutionMode.values())
2169        for (Integer v1 : new Integer[] { 1, null })
2170    {
2171        final CompletableFuture<Integer> f = new CompletableFuture<>();
2172        final CompletableFuture<Integer> g = new CompletableFuture<>();
2173        final IncAction r = new IncAction();
2307          final CFException ex = new CFException();
2308 +        final NoopConsumer[] rs = new NoopConsumer[6];
2309 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2310  
2311 <        g.completeExceptionally(ex);
2312 <        f.complete(v1);
2313 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2311 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2312 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2313 >        if (fFirst) {
2314 >            f.complete(v1);
2315 >            g.completeExceptionally(ex);
2316 >        } else {
2317 >            g.completeExceptionally(ex);
2318 >            f.complete(v1);
2319 >        }
2320 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2321 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2322  
2323 <        // unspecified behavior
2181 <        Integer v;
2323 >        // unspecified behavior - both source completions available
2324          try {
2325 <            assertNull(h.join());
2326 <            assertEquals(1, r.invocationCount);
2185 <            assertEquals(inc(v1), r.value);
2325 >            assertEquals(null, h0.join());
2326 >            rs[0].assertValue(v1);
2327          } catch (CompletionException ok) {
2328 <            checkCompletedWithWrappedCFException(h, ex);
2329 <            assertEquals(0, r.invocationCount);
2328 >            checkCompletedWithWrappedException(h0, ex);
2329 >            rs[0].assertNotInvoked();
2330          }
2190
2191        checkCompletedWithWrappedCFException(g, ex);
2192        checkCompletedNormally(f, v1);
2193    }}
2194
2195    public void testAcceptEither_exceptionalCompletion4() {
2196        for (ExecutionMode m : ExecutionMode.values())
2197        for (Integer v1 : new Integer[] { 1, null })
2198    {
2199        final CompletableFuture<Integer> f = new CompletableFuture<>();
2200        final CompletableFuture<Integer> g = new CompletableFuture<>();
2201        final IncAction r = new IncAction();
2202        final CFException ex = new CFException();
2203
2204        f.completeExceptionally(ex);
2205        g.complete(v1);
2206        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2207
2208        // unspecified behavior
2209        Integer v;
2331          try {
2332 <            assertNull(h.join());
2333 <            assertEquals(1, r.invocationCount);
2213 <            assertEquals(inc(v1), r.value);
2332 >            assertEquals(null, h1.join());
2333 >            rs[1].assertValue(v1);
2334          } catch (CompletionException ok) {
2335 <            checkCompletedWithWrappedCFException(h, ex);
2336 <            assertEquals(0, r.invocationCount);
2335 >            checkCompletedWithWrappedException(h1, ex);
2336 >            rs[1].assertNotInvoked();
2337 >        }
2338 >        try {
2339 >            assertEquals(null, h2.join());
2340 >            rs[2].assertValue(v1);
2341 >        } catch (CompletionException ok) {
2342 >            checkCompletedWithWrappedException(h2, ex);
2343 >            rs[2].assertNotInvoked();
2344 >        }
2345 >        try {
2346 >            assertEquals(null, h3.join());
2347 >            rs[3].assertValue(v1);
2348 >        } catch (CompletionException ok) {
2349 >            checkCompletedWithWrappedException(h3, ex);
2350 >            rs[3].assertNotInvoked();
2351          }
2352  
2219        checkCompletedWithWrappedCFException(f, ex);
2220        checkCompletedNormally(g, v1);
2221    }}
2222
2223    /**
2224     * acceptEither result completes exceptionally if action does
2225     */
2226    public void testAcceptEither_actionFailed1() {
2227        for (ExecutionMode m : ExecutionMode.values())
2228        for (Integer v1 : new Integer[] { 1, null })
2229        for (Integer v2 : new Integer[] { 2, null })
2230    {
2231        final CompletableFuture<Integer> f = new CompletableFuture<>();
2232        final CompletableFuture<Integer> g = new CompletableFuture<>();
2233        final FailingConsumer r = new FailingConsumer();
2234        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2235
2236        f.complete(v1);
2237        checkCompletedWithWrappedCFException(h);
2238        g.complete(v2);
2239        checkCompletedNormally(f, v1);
2240        checkCompletedNormally(g, v2);
2241    }}
2242
2243    public void testAcceptEither_actionFailed2() {
2244        for (ExecutionMode m : ExecutionMode.values())
2245        for (Integer v1 : new Integer[] { 1, null })
2246        for (Integer v2 : new Integer[] { 2, null })
2247    {
2248        final CompletableFuture<Integer> f = new CompletableFuture<>();
2249        final CompletableFuture<Integer> g = new CompletableFuture<>();
2250        final FailingConsumer r = new FailingConsumer();
2251        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2252
2253        g.complete(v2);
2254        checkCompletedWithWrappedCFException(h);
2255        f.complete(v1);
2353          checkCompletedNormally(f, v1);
2354 <        checkCompletedNormally(g, v2);
2354 >        checkCompletedExceptionally(g, ex);
2355      }}
2356  
2357      /**
2358       * acceptEither result completes exceptionally if either source cancelled
2359       */
2360 <    public void testAcceptEither_sourceCancelled1() {
2264 <        for (ExecutionMode m : ExecutionMode.values())
2265 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2266 <        for (Integer v1 : new Integer[] { 1, null })
2267 <    {
2268 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2269 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2270 <        final IncAction r = new IncAction();
2271 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2272 <
2273 <        assertTrue(f.cancel(mayInterruptIfRunning));
2274 <        checkCompletedWithWrappedCancellationException(h);
2275 <        g.complete(v1);
2276 <
2277 <        checkCancelled(f);
2278 <        assertEquals(0, r.invocationCount);
2279 <        checkCompletedNormally(g, v1);
2280 <        checkCompletedWithWrappedCancellationException(h);
2281 <    }}
2282 <
2283 <    public void testAcceptEither_sourceCancelled2() {
2360 >    public void testAcceptEither_sourceCancelled() {
2361          for (ExecutionMode m : ExecutionMode.values())
2362          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2363          for (Integer v1 : new Integer[] { 1, null })
2364      {
2365          final CompletableFuture<Integer> f = new CompletableFuture<>();
2366          final CompletableFuture<Integer> g = new CompletableFuture<>();
2367 <        final IncAction r = new IncAction();
2368 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2292 <
2293 <        assertTrue(g.cancel(mayInterruptIfRunning));
2294 <        checkCompletedWithWrappedCancellationException(h);
2295 <        f.complete(v1);
2296 <
2297 <        checkCancelled(g);
2298 <        assertEquals(0, r.invocationCount);
2299 <        checkCompletedNormally(f, v1);
2300 <        checkCompletedWithWrappedCancellationException(h);
2301 <    }}
2367 >        final NoopConsumer[] rs = new NoopConsumer[6];
2368 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2369  
2370 <    public void testAcceptEither_sourceCancelled3() {
2371 <        for (ExecutionMode m : ExecutionMode.values())
2372 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2373 <        for (Integer v1 : new Integer[] { 1, null })
2374 <    {
2375 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2376 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2377 <        final IncAction r = new IncAction();
2370 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2371 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2372 >        checkIncomplete(h0);
2373 >        checkIncomplete(h1);
2374 >        rs[0].assertNotInvoked();
2375 >        rs[1].assertNotInvoked();
2376 >        f.cancel(mayInterruptIfRunning);
2377 >        checkCompletedWithWrappedCancellationException(h0);
2378 >        checkCompletedWithWrappedCancellationException(h1);
2379 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2380 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2381 >        checkCompletedWithWrappedCancellationException(h2);
2382 >        checkCompletedWithWrappedCancellationException(h3);
2383  
2384 <        assertTrue(g.cancel(mayInterruptIfRunning));
2313 <        f.complete(v1);
2314 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2384 >        g.complete(v1);
2385  
2386 <        // unspecified behavior
2387 <        Integer v;
2386 >        // unspecified behavior - both source completions available
2387 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2388 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2389          try {
2390 <            assertNull(h.join());
2391 <            assertEquals(1, r.invocationCount);
2321 <            assertEquals(inc(v1), r.value);
2390 >            assertNull(h4.join());
2391 >            rs[4].assertValue(v1);
2392          } catch (CompletionException ok) {
2393 <            checkCompletedWithWrappedCancellationException(h);
2394 <            assertEquals(0, r.invocationCount);
2393 >            checkCompletedWithWrappedCancellationException(h4);
2394 >            rs[4].assertNotInvoked();
2395          }
2326
2327        checkCancelled(g);
2328        checkCompletedNormally(f, v1);
2329    }}
2330
2331    public void testAcceptEither_sourceCancelled4() {
2332        for (ExecutionMode m : ExecutionMode.values())
2333        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2334        for (Integer v1 : new Integer[] { 1, null })
2335    {
2336        final CompletableFuture<Integer> f = new CompletableFuture<>();
2337        final CompletableFuture<Integer> g = new CompletableFuture<>();
2338        final IncAction r = new IncAction();
2339
2340        assertTrue(f.cancel(mayInterruptIfRunning));
2341        g.complete(v1);
2342        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343
2344        // unspecified behavior
2345        Integer v;
2396          try {
2397 <            assertNull(h.join());
2398 <            assertEquals(1, r.invocationCount);
2349 <            assertEquals(inc(v1), r.value);
2397 >            assertNull(h5.join());
2398 >            rs[5].assertValue(v1);
2399          } catch (CompletionException ok) {
2400 <            checkCompletedWithWrappedCancellationException(h);
2401 <            assertEquals(0, r.invocationCount);
2400 >            checkCompletedWithWrappedCancellationException(h5);
2401 >            rs[5].assertNotInvoked();
2402          }
2403  
2404          checkCancelled(f);
2405          checkCompletedNormally(g, v1);
2406 +        checkCompletedWithWrappedCancellationException(h0);
2407 +        checkCompletedWithWrappedCancellationException(h1);
2408 +        checkCompletedWithWrappedCancellationException(h2);
2409 +        checkCompletedWithWrappedCancellationException(h3);
2410 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2411      }}
2412  
2413      /**
2414 <     * runAfterEither result completes normally after normal completion
2361 <     * of either source
2414 >     * acceptEither result completes exceptionally if action does
2415       */
2416 <    public void testRunAfterEither_normalCompletion1() {
2416 >    public void testAcceptEither_actionFailed() {
2417          for (ExecutionMode m : ExecutionMode.values())
2418          for (Integer v1 : new Integer[] { 1, null })
2419          for (Integer v2 : new Integer[] { 2, null })
2420      {
2421          final CompletableFuture<Integer> f = new CompletableFuture<>();
2422          final CompletableFuture<Integer> g = new CompletableFuture<>();
2423 <        final Noop r = new Noop();
2424 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2423 >        final FailingConsumer[] rs = new FailingConsumer[6];
2424 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2425  
2426 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2427 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2428          f.complete(v1);
2429 <        checkCompletedNormally(h, null);
2430 <        assertEquals(1, r.invocationCount);
2429 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2430 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2431 >        checkCompletedWithWrappedCFException(h0);
2432 >        checkCompletedWithWrappedCFException(h1);
2433 >        checkCompletedWithWrappedCFException(h2);
2434 >        checkCompletedWithWrappedCFException(h3);
2435 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2436 >
2437          g.complete(v2);
2438  
2439 <        checkCompletedNormally(f, v1);
2440 <        checkCompletedNormally(g, v2);
2441 <        checkCompletedNormally(h, null);
2381 <        assertEquals(1, r.invocationCount);
2382 <    }}
2439 >        // unspecified behavior - both source completions available
2440 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2441 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2442  
2443 <    public void testRunAfterEither_normalCompletion2() {
2444 <        for (ExecutionMode m : ExecutionMode.values())
2445 <        for (Integer v1 : new Integer[] { 1, null })
2446 <        for (Integer v2 : new Integer[] { 2, null })
2447 <    {
2448 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2390 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final Noop r = new Noop();
2392 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2393 <
2394 <        g.complete(v2);
2395 <        checkCompletedNormally(h, null);
2396 <        assertEquals(1, r.invocationCount);
2397 <        f.complete(v1);
2443 >        checkCompletedWithWrappedCFException(h4);
2444 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2445 >                   Objects.equals(v2, rs[4].value));
2446 >        checkCompletedWithWrappedCFException(h5);
2447 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2448 >                   Objects.equals(v2, rs[5].value));
2449  
2450          checkCompletedNormally(f, v1);
2451          checkCompletedNormally(g, v2);
2452 <        checkCompletedNormally(h, null);
2402 <        assertEquals(1, r.invocationCount);
2403 <        }}
2452 >    }}
2453  
2454 <    public void testRunAfterEither_normalCompletion3() {
2454 >    /**
2455 >     * runAfterEither result completes normally after normal completion
2456 >     * of either source
2457 >     */
2458 >    public void testRunAfterEither_normalCompletion() {
2459          for (ExecutionMode m : ExecutionMode.values())
2460          for (Integer v1 : new Integer[] { 1, null })
2461          for (Integer v2 : new Integer[] { 2, null })
2462      {
2463          final CompletableFuture<Integer> f = new CompletableFuture<>();
2464          final CompletableFuture<Integer> g = new CompletableFuture<>();
2465 <        final Noop r = new Noop();
2465 >        final Noop[] rs = new Noop[6];
2466 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2467  
2468 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2469 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2470 +        checkIncomplete(h0);
2471 +        checkIncomplete(h1);
2472 +        rs[0].assertNotInvoked();
2473 +        rs[1].assertNotInvoked();
2474          f.complete(v1);
2475 +        checkCompletedNormally(h0, null);
2476 +        checkCompletedNormally(h1, null);
2477 +        rs[0].assertInvoked();
2478 +        rs[1].assertInvoked();
2479 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2480 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2481 +        checkCompletedNormally(h2, null);
2482 +        checkCompletedNormally(h3, null);
2483 +        rs[2].assertInvoked();
2484 +        rs[3].assertInvoked();
2485 +
2486          g.complete(v2);
2416        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2487  
2488 <        checkCompletedNormally(h, null);
2488 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2489 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2490 >
2491          checkCompletedNormally(f, v1);
2492          checkCompletedNormally(g, v2);
2493 <        assertEquals(1, r.invocationCount);
2493 >        checkCompletedNormally(h0, null);
2494 >        checkCompletedNormally(h1, null);
2495 >        checkCompletedNormally(h2, null);
2496 >        checkCompletedNormally(h3, null);
2497 >        checkCompletedNormally(h4, null);
2498 >        checkCompletedNormally(h5, null);
2499 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2500      }}
2501  
2502      /**
2503       * runAfterEither result completes exceptionally after exceptional
2504       * completion of either source
2505       */
2506 <    public void testRunAfterEither_exceptionalCompletion1() {
2506 >    public void testRunAfterEither_exceptionalCompletion() {
2507          for (ExecutionMode m : ExecutionMode.values())
2508          for (Integer v1 : new Integer[] { 1, null })
2509      {
2510          final CompletableFuture<Integer> f = new CompletableFuture<>();
2511          final CompletableFuture<Integer> g = new CompletableFuture<>();
2434        final Noop r = new Noop();
2435        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2512          final CFException ex = new CFException();
2513 +        final Noop[] rs = new Noop[6];
2514 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2515  
2516 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2517 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2518 +        checkIncomplete(h0);
2519 +        checkIncomplete(h1);
2520 +        rs[0].assertNotInvoked();
2521 +        rs[1].assertNotInvoked();
2522          f.completeExceptionally(ex);
2523 <        checkCompletedWithWrappedCFException(h, ex);
2523 >        checkCompletedWithWrappedException(h0, ex);
2524 >        checkCompletedWithWrappedException(h1, ex);
2525 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2526 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2527 >        checkCompletedWithWrappedException(h2, ex);
2528 >        checkCompletedWithWrappedException(h3, ex);
2529 >
2530          g.complete(v1);
2531  
2532 <        assertEquals(0, r.invocationCount);
2532 >        // unspecified behavior - both source completions available
2533 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2534 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2535 >        try {
2536 >            assertNull(h4.join());
2537 >            rs[4].assertInvoked();
2538 >        } catch (CompletionException ok) {
2539 >            checkCompletedWithWrappedException(h4, ex);
2540 >            rs[4].assertNotInvoked();
2541 >        }
2542 >        try {
2543 >            assertNull(h5.join());
2544 >            rs[5].assertInvoked();
2545 >        } catch (CompletionException ok) {
2546 >            checkCompletedWithWrappedException(h5, ex);
2547 >            rs[5].assertNotInvoked();
2548 >        }
2549 >
2550 >        checkCompletedExceptionally(f, ex);
2551          checkCompletedNormally(g, v1);
2552 <        checkCompletedWithWrappedCFException(f, ex);
2553 <        checkCompletedWithWrappedCFException(h, ex);
2552 >        checkCompletedWithWrappedException(h0, ex);
2553 >        checkCompletedWithWrappedException(h1, ex);
2554 >        checkCompletedWithWrappedException(h2, ex);
2555 >        checkCompletedWithWrappedException(h3, ex);
2556 >        checkCompletedWithWrappedException(h4, ex);
2557 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2558      }}
2559  
2560      public void testRunAfterEither_exceptionalCompletion2() {
2561          for (ExecutionMode m : ExecutionMode.values())
2562 +        for (boolean fFirst : new boolean[] { true, false })
2563          for (Integer v1 : new Integer[] { 1, null })
2564      {
2565          final CompletableFuture<Integer> f = new CompletableFuture<>();
2566          final CompletableFuture<Integer> g = new CompletableFuture<>();
2454        final Noop r = new Noop();
2455        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456        final CFException ex = new CFException();
2457
2458        g.completeExceptionally(ex);
2459        checkCompletedWithWrappedCFException(h, ex);
2460        f.complete(v1);
2461
2462        assertEquals(0, r.invocationCount);
2463        checkCompletedNormally(f, v1);
2464        checkCompletedWithWrappedCFException(g, ex);
2465        checkCompletedWithWrappedCFException(h, ex);
2466    }}
2467
2468    public void testRunAfterEither_exceptionalCompletion3() {
2469        for (ExecutionMode m : ExecutionMode.values())
2470        for (Integer v1 : new Integer[] { 1, null })
2471    {
2472        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474        final Noop r = new Noop();
2567          final CFException ex = new CFException();
2568 +        final Noop[] rs = new Noop[6];
2569 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2570  
2571 <        g.completeExceptionally(ex);
2572 <        f.complete(v1);
2573 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2571 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2572 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2573 >        if (fFirst) {
2574 >            f.complete(v1);
2575 >            g.completeExceptionally(ex);
2576 >        } else {
2577 >            g.completeExceptionally(ex);
2578 >            f.complete(v1);
2579 >        }
2580 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2581 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2582  
2583 <        // unspecified behavior
2584 <        Integer v;
2583 >        // unspecified behavior - both source completions available
2584 >        try {
2585 >            assertEquals(null, h0.join());
2586 >            rs[0].assertInvoked();
2587 >        } catch (CompletionException ok) {
2588 >            checkCompletedWithWrappedException(h0, ex);
2589 >            rs[0].assertNotInvoked();
2590 >        }
2591          try {
2592 <            assertNull(h.join());
2593 <            assertEquals(1, r.invocationCount);
2592 >            assertEquals(null, h1.join());
2593 >            rs[1].assertInvoked();
2594          } catch (CompletionException ok) {
2595 <            checkCompletedWithWrappedCFException(h, ex);
2596 <            assertEquals(0, r.invocationCount);
2595 >            checkCompletedWithWrappedException(h1, ex);
2596 >            rs[1].assertNotInvoked();
2597 >        }
2598 >        try {
2599 >            assertEquals(null, h2.join());
2600 >            rs[2].assertInvoked();
2601 >        } catch (CompletionException ok) {
2602 >            checkCompletedWithWrappedException(h2, ex);
2603 >            rs[2].assertNotInvoked();
2604 >        }
2605 >        try {
2606 >            assertEquals(null, h3.join());
2607 >            rs[3].assertInvoked();
2608 >        } catch (CompletionException ok) {
2609 >            checkCompletedWithWrappedException(h3, ex);
2610 >            rs[3].assertNotInvoked();
2611          }
2612  
2491        checkCompletedWithWrappedCFException(g, ex);
2613          checkCompletedNormally(f, v1);
2614 +        checkCompletedExceptionally(g, ex);
2615      }}
2616  
2617 <    public void testRunAfterEither_exceptionalCompletion4() {
2617 >    /**
2618 >     * runAfterEither result completes exceptionally if either source cancelled
2619 >     */
2620 >    public void testRunAfterEither_sourceCancelled() {
2621          for (ExecutionMode m : ExecutionMode.values())
2622 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2623          for (Integer v1 : new Integer[] { 1, null })
2624      {
2625          final CompletableFuture<Integer> f = new CompletableFuture<>();
2626          final CompletableFuture<Integer> g = new CompletableFuture<>();
2627 <        final Noop r = new Noop();
2628 <        final CFException ex = new CFException();
2627 >        final Noop[] rs = new Noop[6];
2628 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2629 >
2630 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2631 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2632 >        checkIncomplete(h0);
2633 >        checkIncomplete(h1);
2634 >        rs[0].assertNotInvoked();
2635 >        rs[1].assertNotInvoked();
2636 >        f.cancel(mayInterruptIfRunning);
2637 >        checkCompletedWithWrappedCancellationException(h0);
2638 >        checkCompletedWithWrappedCancellationException(h1);
2639 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2640 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2641 >        checkCompletedWithWrappedCancellationException(h2);
2642 >        checkCompletedWithWrappedCancellationException(h3);
2643  
2504        f.completeExceptionally(ex);
2644          g.complete(v1);
2506        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2645  
2646 <        // unspecified behavior
2647 <        Integer v;
2646 >        // unspecified behavior - both source completions available
2647 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2648 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2649          try {
2650 <            assertNull(h.join());
2651 <            assertEquals(1, r.invocationCount);
2650 >            assertNull(h4.join());
2651 >            rs[4].assertInvoked();
2652          } catch (CompletionException ok) {
2653 <            checkCompletedWithWrappedCFException(h, ex);
2654 <            assertEquals(0, r.invocationCount);
2653 >            checkCompletedWithWrappedCancellationException(h4);
2654 >            rs[4].assertNotInvoked();
2655 >        }
2656 >        try {
2657 >            assertNull(h5.join());
2658 >            rs[5].assertInvoked();
2659 >        } catch (CompletionException ok) {
2660 >            checkCompletedWithWrappedCancellationException(h5);
2661 >            rs[5].assertNotInvoked();
2662          }
2663  
2664 <        checkCompletedWithWrappedCFException(f, ex);
2664 >        checkCancelled(f);
2665          checkCompletedNormally(g, v1);
2666 +        checkCompletedWithWrappedCancellationException(h0);
2667 +        checkCompletedWithWrappedCancellationException(h1);
2668 +        checkCompletedWithWrappedCancellationException(h2);
2669 +        checkCompletedWithWrappedCancellationException(h3);
2670 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2671      }}
2672  
2673      /**
2674       * runAfterEither result completes exceptionally if action does
2675       */
2676 <    public void testRunAfterEither_actionFailed1() {
2676 >    public void testRunAfterEither_actionFailed() {
2677          for (ExecutionMode m : ExecutionMode.values())
2678          for (Integer v1 : new Integer[] { 1, null })
2679          for (Integer v2 : new Integer[] { 2, null })
2680      {
2681          final CompletableFuture<Integer> f = new CompletableFuture<>();
2682          final CompletableFuture<Integer> g = new CompletableFuture<>();
2683 <        final FailingRunnable r = new FailingRunnable();
2684 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2683 >        final FailingRunnable[] rs = new FailingRunnable[6];
2684 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2685  
2686 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2687 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2688          f.complete(v1);
2689 <        checkCompletedWithWrappedCFException(h);
2689 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2690 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2691 >        checkCompletedWithWrappedCFException(h0);
2692 >        checkCompletedWithWrappedCFException(h1);
2693 >        checkCompletedWithWrappedCFException(h2);
2694 >        checkCompletedWithWrappedCFException(h3);
2695 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2696          g.complete(v2);
2697 <        checkCompletedNormally(f, v1);
2698 <        checkCompletedNormally(g, v2);
2699 <    }}
2697 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2698 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2699 >        checkCompletedWithWrappedCFException(h4);
2700 >        checkCompletedWithWrappedCFException(h5);
2701  
2542    public void testRunAfterEither_actionFailed2() {
2543        for (ExecutionMode m : ExecutionMode.values())
2544        for (Integer v1 : new Integer[] { 1, null })
2545        for (Integer v2 : new Integer[] { 2, null })
2546    {
2547        final CompletableFuture<Integer> f = new CompletableFuture<>();
2548        final CompletableFuture<Integer> g = new CompletableFuture<>();
2549        final FailingRunnable r = new FailingRunnable();
2550        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2551
2552        g.complete(v2);
2553        checkCompletedWithWrappedCFException(h);
2554        f.complete(v1);
2702          checkCompletedNormally(f, v1);
2703          checkCompletedNormally(g, v2);
2704 <    }}
2558 <
2559 <    /**
2560 <     * runAfterEither result completes exceptionally if either source cancelled
2561 <     */
2562 <    public void testRunAfterEither_sourceCancelled1() {
2563 <        for (ExecutionMode m : ExecutionMode.values())
2564 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2565 <        for (Integer v1 : new Integer[] { 1, null })
2566 <    {
2567 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2568 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2569 <        final Noop r = new Noop();
2570 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2571 <
2572 <        assertTrue(f.cancel(mayInterruptIfRunning));
2573 <        checkCompletedWithWrappedCancellationException(h);
2574 <        g.complete(v1);
2575 <
2576 <        checkCancelled(f);
2577 <        assertEquals(0, r.invocationCount);
2578 <        checkCompletedNormally(g, v1);
2579 <        checkCompletedWithWrappedCancellationException(h);
2580 <    }}
2581 <
2582 <    public void testRunAfterEither_sourceCancelled2() {
2583 <        for (ExecutionMode m : ExecutionMode.values())
2584 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2585 <        for (Integer v1 : new Integer[] { 1, null })
2586 <    {
2587 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2588 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2589 <        final Noop r = new Noop();
2590 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2591 <
2592 <        assertTrue(g.cancel(mayInterruptIfRunning));
2593 <        checkCompletedWithWrappedCancellationException(h);
2594 <        f.complete(v1);
2595 <
2596 <        checkCancelled(g);
2597 <        assertEquals(0, r.invocationCount);
2598 <        checkCompletedNormally(f, v1);
2599 <        checkCompletedWithWrappedCancellationException(h);
2600 <    }}
2601 <
2602 <    public void testRunAfterEither_sourceCancelled3() {
2603 <        for (ExecutionMode m : ExecutionMode.values())
2604 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2605 <        for (Integer v1 : new Integer[] { 1, null })
2606 <    {
2607 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2608 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2609 <        final Noop r = new Noop();
2610 <
2611 <        assertTrue(g.cancel(mayInterruptIfRunning));
2612 <        f.complete(v1);
2613 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2614 <
2615 <        // unspecified behavior
2616 <        Integer v;
2617 <        try {
2618 <            assertNull(h.join());
2619 <            assertEquals(1, r.invocationCount);
2620 <        } catch (CompletionException ok) {
2621 <            checkCompletedWithWrappedCancellationException(h);
2622 <            assertEquals(0, r.invocationCount);
2623 <        }
2624 <
2625 <        checkCancelled(g);
2626 <        checkCompletedNormally(f, v1);
2627 <    }}
2628 <
2629 <    public void testRunAfterEither_sourceCancelled4() {
2630 <        for (ExecutionMode m : ExecutionMode.values())
2631 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2632 <        for (Integer v1 : new Integer[] { 1, null })
2633 <    {
2634 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2635 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2636 <        final Noop r = new Noop();
2637 <
2638 <        assertTrue(f.cancel(mayInterruptIfRunning));
2639 <        g.complete(v1);
2640 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2641 <
2642 <        // unspecified behavior
2643 <        Integer v;
2644 <        try {
2645 <            assertNull(h.join());
2646 <            assertEquals(1, r.invocationCount);
2647 <        } catch (CompletionException ok) {
2648 <            checkCompletedWithWrappedCancellationException(h);
2649 <            assertEquals(0, r.invocationCount);
2650 <        }
2651 <
2652 <        checkCancelled(f);
2653 <        checkCompletedNormally(g, v1);
2704 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2705      }}
2706  
2707      /**
# Line 2662 | Line 2713 | public class CompletableFutureTest exten
2713          for (Integer v1 : new Integer[] { 1, null })
2714      {
2715          final CompletableFuture<Integer> f = new CompletableFuture<>();
2716 <        final CompletableFutureInc r = new CompletableFutureInc();
2716 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2717          if (!createIncomplete) f.complete(v1);
2718 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2718 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2719          if (createIncomplete) f.complete(v1);
2720  
2721          checkCompletedNormally(g, inc(v1));
2722          checkCompletedNormally(f, v1);
2723 <        assertEquals(1, r.invocationCount);
2723 >        r.assertValue(v1);
2724      }}
2725  
2726      /**
# Line 2681 | Line 2732 | public class CompletableFutureTest exten
2732          for (boolean createIncomplete : new boolean[] { true, false })
2733      {
2734          final CFException ex = new CFException();
2735 <        final CompletableFutureInc r = new CompletableFutureInc();
2735 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2736          final CompletableFuture<Integer> f = new CompletableFuture<>();
2737          if (!createIncomplete) f.completeExceptionally(ex);
2738 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2738 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2739          if (createIncomplete) f.completeExceptionally(ex);
2740  
2741 <        checkCompletedWithWrappedCFException(g, ex);
2742 <        checkCompletedWithWrappedCFException(f, ex);
2743 <        assertEquals(0, r.invocationCount);
2741 >        checkCompletedWithWrappedException(g, ex);
2742 >        checkCompletedExceptionally(f, ex);
2743 >        r.assertNotInvoked();
2744      }}
2745  
2746      /**
# Line 2702 | Line 2753 | public class CompletableFutureTest exten
2753      {
2754          final CompletableFuture<Integer> f = new CompletableFuture<>();
2755          final FailingCompletableFutureFunction r
2756 <            = new FailingCompletableFutureFunction();
2756 >            = new FailingCompletableFutureFunction(m);
2757          if (!createIncomplete) f.complete(v1);
2758 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2758 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2759          if (createIncomplete) f.complete(v1);
2760  
2761          checkCompletedWithWrappedCFException(g);
# Line 2720 | Line 2771 | public class CompletableFutureTest exten
2771          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2772      {
2773          final CompletableFuture<Integer> f = new CompletableFuture<>();
2774 <        final CompletableFutureInc r = new CompletableFutureInc();
2774 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2775          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2776 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2776 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2777          if (createIncomplete) {
2778              checkIncomplete(g);
2779              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2749 | Line 2800 | public class CompletableFutureTest exten
2800       */
2801      public void testAllOf_normal() throws Exception {
2802          for (int k = 1; k < 20; ++k) {
2803 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2803 >            CompletableFuture<Integer>[] fs
2804 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2805              for (int i = 0; i < k; ++i)
2806                  fs[i] = new CompletableFuture<>();
2807              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 2763 | Line 2815 | public class CompletableFutureTest exten
2815          }
2816      }
2817  
2818 +    public void testAllOf_backwards() throws Exception {
2819 +        for (int k = 1; k < 20; ++k) {
2820 +            CompletableFuture<Integer>[] fs
2821 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2822 +            for (int i = 0; i < k; ++i)
2823 +                fs[i] = new CompletableFuture<>();
2824 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2825 +            for (int i = k - 1; i >= 0; i--) {
2826 +                checkIncomplete(f);
2827 +                checkIncomplete(CompletableFuture.allOf(fs));
2828 +                fs[i].complete(one);
2829 +            }
2830 +            checkCompletedNormally(f, null);
2831 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2832 +        }
2833 +    }
2834 +
2835      /**
2836       * anyOf(no component futures) returns an incomplete future
2837       */
# Line 2821 | Line 2890 | public class CompletableFutureTest exten
2890          Runnable[] throwingActions = {
2891              () -> CompletableFuture.supplyAsync(null),
2892              () -> CompletableFuture.supplyAsync(null, exec),
2893 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2893 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2894  
2895              () -> CompletableFuture.runAsync(null),
2896              () -> CompletableFuture.runAsync(null, exec),
# Line 2894 | Line 2963 | public class CompletableFutureTest exten
2963  
2964              () -> f.thenCompose(null),
2965              () -> f.thenComposeAsync(null),
2966 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2966 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2967              () -> f.thenComposeAsync(null, exec),
2968  
2969              () -> f.exceptionally(null),
# Line 2926 | Line 2995 | public class CompletableFutureTest exten
2995          assertSame(f, f.toCompletableFuture());
2996      }
2997  
2929    /**
2930     * whenComplete action executes on normal completion, propagating
2931     * source result.
2932     */
2933    public void testWhenComplete_normalCompletion1() {
2934        for (ExecutionMode m : ExecutionMode.values())
2935        for (boolean createIncomplete : new boolean[] { true, false })
2936        for (Integer v1 : new Integer[] { 1, null })
2937    {
2938        final AtomicInteger a = new AtomicInteger(0);
2939        final CompletableFuture<Integer> f = new CompletableFuture<>();
2940        if (!createIncomplete) f.complete(v1);
2941        final CompletableFuture<Integer> g = m.whenComplete
2942            (f,
2943             (Integer x, Throwable t) -> {
2944                threadAssertSame(x, v1);
2945                threadAssertNull(t);
2946                a.getAndIncrement();
2947            });
2948        if (createIncomplete) f.complete(v1);
2949
2950        checkCompletedNormally(g, v1);
2951        checkCompletedNormally(f, v1);
2952        assertEquals(1, a.get());
2953    }}
2954
2955    /**
2956     * whenComplete action executes on exceptional completion, propagating
2957     * source result.
2958     */
2959    public void testWhenComplete_exceptionalCompletion() {
2960        for (ExecutionMode m : ExecutionMode.values())
2961        for (boolean createIncomplete : new boolean[] { true, false })
2962        for (Integer v1 : new Integer[] { 1, null })
2963    {
2964        final AtomicInteger a = new AtomicInteger(0);
2965        final CFException ex = new CFException();
2966        final CompletableFuture<Integer> f = new CompletableFuture<>();
2967        if (!createIncomplete) f.completeExceptionally(ex);
2968        final CompletableFuture<Integer> g = m.whenComplete
2969            (f,
2970             (Integer x, Throwable t) -> {
2971                threadAssertNull(x);
2972                threadAssertSame(t, ex);
2973                a.getAndIncrement();
2974            });
2975        if (createIncomplete) f.completeExceptionally(ex);
2976        checkCompletedWithWrappedCFException(f, ex);
2977        checkCompletedWithWrappedCFException(g, ex);
2978        assertEquals(1, a.get());
2979    }}
2980
2981    /**
2982     * whenComplete action executes on cancelled source, propagating
2983     * CancellationException.
2984     */
2985    public void testWhenComplete_sourceCancelled() {
2986        for (ExecutionMode m : ExecutionMode.values())
2987        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2988        for (boolean createIncomplete : new boolean[] { true, false })
2989    {
2990        final AtomicInteger a = new AtomicInteger(0);
2991        final CompletableFuture<Integer> f = new CompletableFuture<>();
2992        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2993        final CompletableFuture<Integer> g = m.whenComplete
2994            (f,
2995             (Integer x, Throwable t) -> {
2996                threadAssertNull(x);
2997                threadAssertTrue(t instanceof CancellationException);
2998                a.getAndIncrement();
2999            });
3000        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3001
3002        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3003        checkCompletedWithWrappedCancellationException(g);
3004        checkCancelled(f);
3005        assertEquals(1, a.get());
3006    }}
3007
3008    /**
3009     * If a whenComplete action throws an exception when triggered by
3010     * a normal completion, it completes exceptionally
3011     */
3012    public void testWhenComplete_actionFailed() {
3013        for (boolean createIncomplete : new boolean[] { true, false })
3014        for (ExecutionMode m : ExecutionMode.values())
3015        for (Integer v1 : new Integer[] { 1, null })
3016    {
3017        final AtomicInteger a = new AtomicInteger(0);
3018        final CFException ex = new CFException();
3019        final CompletableFuture<Integer> f = new CompletableFuture<>();
3020        if (!createIncomplete) f.complete(v1);
3021        final CompletableFuture<Integer> g = m.whenComplete
3022            (f,
3023             (Integer x, Throwable t) -> {
3024                threadAssertSame(x, v1);
3025                threadAssertNull(t);
3026                a.getAndIncrement();
3027                throw ex;
3028            });
3029        if (createIncomplete) f.complete(v1);
3030        checkCompletedNormally(f, v1);
3031        checkCompletedWithWrappedCFException(g, ex);
3032        assertEquals(1, a.get());
3033    }}
3034
3035    /**
3036     * If a whenComplete action throws an exception when triggered by
3037     * a source completion that also throws an exception, the source
3038     * exception takes precedence.
3039     */
3040    public void testWhenComplete_actionFailedSourceFailed() {
3041        for (boolean createIncomplete : new boolean[] { true, false })
3042        for (ExecutionMode m : ExecutionMode.values())
3043        for (Integer v1 : new Integer[] { 1, null })
3044    {
3045        final AtomicInteger a = new AtomicInteger(0);
3046        final CFException ex1 = new CFException();
3047        final CFException ex2 = new CFException();
3048        final CompletableFuture<Integer> f = new CompletableFuture<>();
3049
3050        if (!createIncomplete) f.completeExceptionally(ex1);
3051        final CompletableFuture<Integer> g = m.whenComplete
3052            (f,
3053             (Integer x, Throwable t) -> {
3054                threadAssertSame(t, ex1);
3055                threadAssertNull(x);
3056                a.getAndIncrement();
3057                throw ex2;
3058            });
3059        if (createIncomplete) f.completeExceptionally(ex1);
3060
3061        checkCompletedWithWrappedCFException(f, ex1);
3062        checkCompletedWithWrappedCFException(g, ex1);
3063        assertEquals(1, a.get());
3064    }}
3065
2998   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines