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.79 by jsr166, Mon Jun 16 17:08:15 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 206 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 +        for (Integer v1 : new Integer[] { 1, null })
231 +    {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233          checkIncomplete(f);
234 <        f.complete(one);
235 <        checkCompletedNormally(f, one);
236 <    }
234 >        assertTrue(f.complete(v1));
235 >        assertFalse(f.complete(v1));
236 >        checkCompletedNormally(f, v1);
237 >    }}
238  
239      /**
240       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 242 | public class CompletableFutureTest exten
242       */
243      public void testCompleteExceptionally() {
244          CompletableFuture<Integer> f = new CompletableFuture<>();
245 +        CFException ex = new CFException();
246          checkIncomplete(f);
247 <        f.completeExceptionally(new CFException());
248 <        checkCompletedWithWrappedCFException(f);
247 >        f.completeExceptionally(ex);
248 >        checkCompletedExceptionally(f, ex);
249      }
250  
251      /**
# Line 228 | Line 253 | public class CompletableFutureTest exten
253       * methods isDone, isCancelled, join, get, and getNow
254       */
255      public void testCancel() {
256 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
257 +    {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260          assertTrue(f.cancel(true));
261 +        assertTrue(f.cancel(true));
262          checkCancelled(f);
263 <    }
263 >    }}
264  
265      /**
266       * obtrudeValue forces completion with given value
# Line 240 | Line 268 | public class CompletableFutureTest exten
268      public void testObtrudeValue() {
269          CompletableFuture<Integer> f = new CompletableFuture<>();
270          checkIncomplete(f);
271 <        f.complete(one);
271 >        assertTrue(f.complete(one));
272          checkCompletedNormally(f, one);
273          f.obtrudeValue(three);
274          checkCompletedNormally(f, three);
# Line 261 | Line 289 | public class CompletableFutureTest exten
289       * obtrudeException forces completion with given exception
290       */
291      public void testObtrudeException() {
292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
293 <        checkIncomplete(f);
294 <        f.complete(one);
295 <        checkCompletedNormally(f, one);
296 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
292 >        for (Integer v1 : new Integer[] { 1, null })
293 >    {
294 >        CFException ex;
295 >        CompletableFuture<Integer> f;
296 >
297          f = new CompletableFuture<>();
298 <        f.obtrudeException(new CFException());
299 <        checkCompletedWithWrappedCFException(f);
298 >        assertTrue(f.complete(v1));
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 +        for (int i = 0; i < 2; i++) {
306 +            f.obtrudeException(ex = new CFException());
307 +            checkCompletedExceptionally(f, ex);
308 +        }
309 +
310 +        f = new CompletableFuture<>();
311 +        f.completeExceptionally(ex = new CFException());
312 +        f.obtrudeValue(v1);
313 +        checkCompletedNormally(f, v1);
314 +        f.obtrudeException(ex = new CFException());
315 +        checkCompletedExceptionally(f, ex);
316          f.completeExceptionally(new CFException());
317 <        f.obtrudeValue(four);
318 <        checkCompletedNormally(f, four);
319 <        f.obtrudeException(new CFException());
320 <        checkCompletedWithWrappedCFException(f);
279 <    }
317 >        checkCompletedExceptionally(f, ex);
318 >        assertFalse(f.complete(v1));
319 >        checkCompletedExceptionally(f, ex);
320 >    }}
321  
322      /**
323       * getNumberOfDependents returns number of dependent tasks
324       */
325      public void testGetNumberOfDependents() {
326 +        for (ExecutionMode m : ExecutionMode.values())
327 +        for (Integer v1 : new Integer[] { 1, null })
328 +    {
329          CompletableFuture<Integer> f = new CompletableFuture<>();
330          assertEquals(0, f.getNumberOfDependents());
331 <        CompletableFuture g = f.thenRun(new Noop());
331 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
332          assertEquals(1, f.getNumberOfDependents());
333          assertEquals(0, g.getNumberOfDependents());
334 <        CompletableFuture h = f.thenRun(new Noop());
334 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
335          assertEquals(2, f.getNumberOfDependents());
336 <        f.complete(1);
336 >        assertEquals(0, h.getNumberOfDependents());
337 >        assertTrue(f.complete(v1));
338          checkCompletedNormally(g, null);
339 +        checkCompletedNormally(h, null);
340          assertEquals(0, f.getNumberOfDependents());
341          assertEquals(0, g.getNumberOfDependents());
342 <    }
342 >        assertEquals(0, h.getNumberOfDependents());
343 >    }}
344  
345      /**
346       * toString indicates current completion state
# Line 304 | Line 351 | public class CompletableFutureTest exten
351          f = new CompletableFuture<String>();
352          assertTrue(f.toString().contains("[Not completed]"));
353  
354 <        f.complete("foo");
354 >        assertTrue(f.complete("foo"));
355          assertTrue(f.toString().contains("[Completed normally]"));
356  
357          f = new CompletableFuture<String>();
358 <        f.completeExceptionally(new IndexOutOfBoundsException());
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359          assertTrue(f.toString().contains("[Completed exceptionally]"));
360 +
361 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
362 +            f = new CompletableFuture<String>();
363 +            assertTrue(f.cancel(mayInterruptIfRunning));
364 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
365 +        }
366      }
367  
368      /**
# Line 320 | Line 373 | public class CompletableFutureTest exten
373          checkCompletedNormally(f, "test");
374      }
375  
376 <    // Choose non-commutative actions for better coverage
376 >    abstract class CheckedAction {
377 >        int invocationCount = 0;
378 >        final ExecutionMode m;
379 >        CheckedAction(ExecutionMode m) { this.m = m; }
380 >        void invoked() {
381 >            m.checkExecutionMode();
382 >            assertEquals(0, invocationCount++);
383 >        }
384 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
385 >        void assertInvoked() { assertEquals(1, invocationCount); }
386 >    }
387  
388 <    // A non-commutative function that handles and produces null values as well.
389 <    static Integer subtract(Integer x, Integer y) {
390 <        return (x == null && y == null) ? null :
391 <            ((x == null) ? 42 : x.intValue())
392 <            - ((y == null) ? 99 : y.intValue());
388 >    abstract class CheckedIntegerAction extends CheckedAction {
389 >        Integer value;
390 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
391 >        void assertValue(Integer expected) {
392 >            assertInvoked();
393 >            assertEquals(expected, value);
394 >        }
395 >    }
396 >
397 >    class IntegerSupplier extends CheckedAction
398 >        implements Supplier<Integer>
399 >    {
400 >        final Integer value;
401 >        IntegerSupplier(ExecutionMode m, Integer value) {
402 >            super(m);
403 >            this.value = value;
404 >        }
405 >        public Integer get() {
406 >            invoked();
407 >            return value;
408 >        }
409      }
410  
411      // A function that handles and produces null values as well.
# Line 334 | Line 413 | public class CompletableFutureTest exten
413          return (x == null) ? null : x + 1;
414      }
415  
416 <    static final Supplier<Integer> supplyOne =
417 <        () -> Integer.valueOf(1);
418 <    static final Function<Integer, Integer> inc =
419 <        (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;
416 >    class NoopConsumer extends CheckedIntegerAction
417 >        implements Consumer<Integer>
418 >    {
419 >        NoopConsumer(ExecutionMode m) { super(m); }
420          public void accept(Integer x) {
421 <            invocationCount++;
422 <            value = inc(x);
421 >            invoked();
422 >            value = x;
423          }
424      }
425 <    static final class IncFunction implements Function<Integer,Integer> {
426 <        int invocationCount = 0;
427 <        Integer value;
425 >
426 >    class IncFunction extends CheckedIntegerAction
427 >        implements Function<Integer,Integer>
428 >    {
429 >        IncFunction(ExecutionMode m) { super(m); }
430          public Integer apply(Integer x) {
431 <            invocationCount++;
431 >            invoked();
432              return value = inc(x);
433          }
434      }
435 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
436 <        int invocationCount = 0;
437 <        Integer value;
438 <        // Check this action was invoked exactly once when result is computed.
435 >
436 >    // Choose non-commutative actions for better coverage
437 >    // A non-commutative function that handles and produces null values as well.
438 >    static Integer subtract(Integer x, Integer y) {
439 >        return (x == null && y == null) ? null :
440 >            ((x == null) ? 42 : x.intValue())
441 >            - ((y == null) ? 99 : y.intValue());
442 >    }
443 >
444 >    class SubtractAction extends CheckedIntegerAction
445 >        implements BiConsumer<Integer, Integer>
446 >    {
447 >        SubtractAction(ExecutionMode m) { super(m); }
448          public void accept(Integer x, Integer y) {
449 <            invocationCount++;
449 >            invoked();
450              value = subtract(x, y);
451          }
452      }
453 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
454 <        int invocationCount = 0;
455 <        Integer value;
456 <        // Check this action was invoked exactly once when result is computed.
453 >
454 >    class SubtractFunction extends CheckedIntegerAction
455 >        implements BiFunction<Integer, Integer, Integer>
456 >    {
457 >        SubtractFunction(ExecutionMode m) { super(m); }
458          public Integer apply(Integer x, Integer y) {
459 <            invocationCount++;
459 >            invoked();
460              return value = subtract(x, y);
461          }
462      }
463 <    static final class Noop implements Runnable {
464 <        int invocationCount = 0;
463 >
464 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466          public void run() {
467 <            invocationCount++;
467 >            invoked();
468          }
469      }
470  
471 <    static final class FailingSupplier implements Supplier<Integer> {
472 <        int invocationCount = 0;
471 >    class FailingSupplier extends CheckedAction
472 >        implements Supplier<Integer>
473 >    {
474 >        FailingSupplier(ExecutionMode m) { super(m); }
475          public Integer get() {
476 <            invocationCount++;
476 >            invoked();
477              throw new CFException();
478          }
479      }
480 <    static final class FailingConsumer implements Consumer<Integer> {
481 <        int invocationCount = 0;
480 >
481 >    class FailingConsumer extends CheckedIntegerAction
482 >        implements Consumer<Integer>
483 >    {
484 >        FailingConsumer(ExecutionMode m) { super(m); }
485          public void accept(Integer x) {
486 <            invocationCount++;
486 >            invoked();
487 >            value = x;
488              throw new CFException();
489          }
490      }
491 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
492 <        int invocationCount = 0;
491 >
492 >    class FailingBiConsumer extends CheckedIntegerAction
493 >        implements BiConsumer<Integer, Integer>
494 >    {
495 >        FailingBiConsumer(ExecutionMode m) { super(m); }
496          public void accept(Integer x, Integer y) {
497 <            invocationCount++;
497 >            invoked();
498 >            value = subtract(x, y);
499              throw new CFException();
500          }
501      }
502 <    static final class FailingFunction implements Function<Integer, Integer> {
503 <        int invocationCount = 0;
502 >
503 >    class FailingFunction extends CheckedIntegerAction
504 >        implements Function<Integer, Integer>
505 >    {
506 >        FailingFunction(ExecutionMode m) { super(m); }
507          public Integer apply(Integer x) {
508 <            invocationCount++;
508 >            invoked();
509 >            value = x;
510              throw new CFException();
511          }
512      }
513 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
514 <        int invocationCount = 0;
513 >
514 >    class FailingBiFunction extends CheckedIntegerAction
515 >        implements BiFunction<Integer, Integer, Integer>
516 >    {
517 >        FailingBiFunction(ExecutionMode m) { super(m); }
518          public Integer apply(Integer x, Integer y) {
519 <            invocationCount++;
519 >            invoked();
520 >            value = subtract(x, y);
521              throw new CFException();
522          }
523      }
524 <    static final class FailingRunnable implements Runnable {
525 <        int invocationCount = 0;
524 >
525 >    class FailingRunnable extends CheckedAction implements Runnable {
526 >        FailingRunnable(ExecutionMode m) { super(m); }
527          public void run() {
528 <            invocationCount++;
528 >            invoked();
529              throw new CFException();
530          }
531      }
532  
533 <    static final class CompletableFutureInc
534 <        implements Function<Integer, CompletableFuture<Integer>> {
535 <        int invocationCount = 0;
533 >
534 >    class CompletableFutureInc extends CheckedIntegerAction
535 >        implements Function<Integer, CompletableFuture<Integer>>
536 >    {
537 >        CompletableFutureInc(ExecutionMode m) { super(m); }
538          public CompletableFuture<Integer> apply(Integer x) {
539 <            invocationCount++;
539 >            invoked();
540 >            value = x;
541              CompletableFuture<Integer> f = new CompletableFuture<>();
542 <            f.complete(inc(x));
542 >            assertTrue(f.complete(inc(x)));
543              return f;
544          }
545      }
546  
547 <    static final class FailingCompletableFutureFunction
548 <        implements Function<Integer, CompletableFuture<Integer>> {
549 <        int invocationCount = 0;
547 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
548 >        implements Function<Integer, CompletableFuture<Integer>>
549 >    {
550 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
551          public CompletableFuture<Integer> apply(Integer x) {
552 <            invocationCount++;
552 >            invoked();
553 >            value = x;
554              throw new CFException();
555          }
556      }
557  
558      // Used for explicit executor tests
559      static final class ThreadExecutor implements Executor {
560 <        AtomicInteger count = new AtomicInteger(0);
560 >        final AtomicInteger count = new AtomicInteger(0);
561 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
562 >        static boolean startedCurrentThread() {
563 >            return Thread.currentThread().getThreadGroup() == tg;
564 >        }
565  
566          public void execute(Runnable r) {
567              count.getAndIncrement();
568 <            new Thread(r).start();
568 >            new Thread(tg, r).start();
569          }
570      }
571  
572      /**
573       * Permits the testing of parallel code for the 3 different
574 <     * execution modes without repeating all the testing code.
574 >     * execution modes without copy/pasting all the test methods.
575       */
576      enum ExecutionMode {
577          DEFAULT {
578              public void checkExecutionMode() {
579 +                assertFalse(ThreadExecutor.startedCurrentThread());
580                  assertNull(ForkJoinTask.getPool());
581              }
582 +            public CompletableFuture<Void> runAsync(Runnable a) {
583 +                throw new UnsupportedOperationException();
584 +            }
585 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
586 +                throw new UnsupportedOperationException();
587 +            }
588              public <T> CompletableFuture<Void> thenRun
589                  (CompletableFuture<T> f, Runnable a) {
590                  return f.thenRun(a);
# Line 531 | Line 653 | public class CompletableFutureTest exten
653                  assertSame(ForkJoinPool.commonPool(),
654                             ForkJoinTask.getPool());
655              }
656 +            public CompletableFuture<Void> runAsync(Runnable a) {
657 +                return CompletableFuture.runAsync(a);
658 +            }
659 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
660 +                return CompletableFuture.supplyAsync(a);
661 +            }
662              public <T> CompletableFuture<Void> thenRun
663                  (CompletableFuture<T> f, Runnable a) {
664                  return f.thenRunAsync(a);
# Line 596 | Line 724 | public class CompletableFutureTest exten
724  
725          EXECUTOR {
726              public void checkExecutionMode() {
727 <                //TODO
727 >                assertTrue(ThreadExecutor.startedCurrentThread());
728 >            }
729 >            public CompletableFuture<Void> runAsync(Runnable a) {
730 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
731 >            }
732 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
733 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
734              }
735              public <T> CompletableFuture<Void> thenRun
736                  (CompletableFuture<T> f, Runnable a) {
# Line 662 | Line 796 | public class CompletableFutureTest exten
796          };
797  
798          public abstract void checkExecutionMode();
799 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
800 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
801          public abstract <T> CompletableFuture<Void> thenRun
802              (CompletableFuture<T> f, Runnable a);
803          public abstract <T> CompletableFuture<Void> thenAccept
# Line 711 | Line 847 | public class CompletableFutureTest exten
847      {
848          final AtomicInteger a = new AtomicInteger(0);
849          final CompletableFuture<Integer> f = new CompletableFuture<>();
850 <        if (!createIncomplete) f.complete(v1);
850 >        if (!createIncomplete) assertTrue(f.complete(v1));
851          final CompletableFuture<Integer> g = f.exceptionally
852              ((Throwable t) -> {
853                  // Should not be called
854                  a.getAndIncrement();
855                  throw new AssertionError();
856              });
857 <        if (createIncomplete) f.complete(v1);
857 >        if (createIncomplete) assertTrue(f.complete(v1));
858  
859          checkCompletedNormally(g, v1);
860          checkCompletedNormally(f, v1);
861          assertEquals(0, a.get());
862      }}
863  
728
864      /**
865       * exceptionally action completes with function value on source
866       * exception
# Line 740 | Line 875 | public class CompletableFutureTest exten
875          if (!createIncomplete) f.completeExceptionally(ex);
876          final CompletableFuture<Integer> g = f.exceptionally
877              ((Throwable t) -> {
878 +                ExecutionMode.DEFAULT.checkExecutionMode();
879                  threadAssertSame(t, ex);
880                  a.getAndIncrement();
881                  return v1;
# Line 761 | Line 897 | public class CompletableFutureTest exten
897          if (!createIncomplete) f.completeExceptionally(ex1);
898          final CompletableFuture<Integer> g = f.exceptionally
899              ((Throwable t) -> {
900 +                ExecutionMode.DEFAULT.checkExecutionMode();
901                  threadAssertSame(t, ex1);
902                  a.getAndIncrement();
903                  throw ex2;
904              });
905          if (createIncomplete) f.completeExceptionally(ex1);
906  
907 <        checkCompletedWithWrappedCFException(g, ex2);
907 >        checkCompletedWithWrappedException(g, ex2);
908 >        assertEquals(1, a.get());
909 >    }}
910 >
911 >    /**
912 >     * whenComplete action executes on normal completion, propagating
913 >     * source result.
914 >     */
915 >    public void testWhenComplete_normalCompletion1() {
916 >        for (ExecutionMode m : ExecutionMode.values())
917 >        for (boolean createIncomplete : new boolean[] { true, false })
918 >        for (Integer v1 : new Integer[] { 1, null })
919 >    {
920 >        final AtomicInteger a = new AtomicInteger(0);
921 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
922 >        if (!createIncomplete) assertTrue(f.complete(v1));
923 >        final CompletableFuture<Integer> g = m.whenComplete
924 >            (f,
925 >             (Integer x, Throwable t) -> {
926 >                m.checkExecutionMode();
927 >                threadAssertSame(x, v1);
928 >                threadAssertNull(t);
929 >                a.getAndIncrement();
930 >            });
931 >        if (createIncomplete) assertTrue(f.complete(v1));
932 >
933 >        checkCompletedNormally(g, v1);
934 >        checkCompletedNormally(f, v1);
935 >        assertEquals(1, a.get());
936 >    }}
937 >
938 >    /**
939 >     * whenComplete action executes on exceptional completion, propagating
940 >     * source result.
941 >     */
942 >    public void testWhenComplete_exceptionalCompletion() {
943 >        for (ExecutionMode m : ExecutionMode.values())
944 >        for (boolean createIncomplete : new boolean[] { true, false })
945 >        for (Integer v1 : new Integer[] { 1, null })
946 >    {
947 >        final AtomicInteger a = new AtomicInteger(0);
948 >        final CFException ex = new CFException();
949 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
950 >        if (!createIncomplete) f.completeExceptionally(ex);
951 >        final CompletableFuture<Integer> g = m.whenComplete
952 >            (f,
953 >             (Integer x, Throwable t) -> {
954 >                m.checkExecutionMode();
955 >                threadAssertNull(x);
956 >                threadAssertSame(t, ex);
957 >                a.getAndIncrement();
958 >            });
959 >        if (createIncomplete) f.completeExceptionally(ex);
960 >
961 >        checkCompletedWithWrappedException(g, ex);
962 >        checkCompletedExceptionally(f, ex);
963 >        assertEquals(1, a.get());
964 >    }}
965 >
966 >    /**
967 >     * whenComplete action executes on cancelled source, propagating
968 >     * CancellationException.
969 >     */
970 >    public void testWhenComplete_sourceCancelled() {
971 >        for (ExecutionMode m : ExecutionMode.values())
972 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
973 >        for (boolean createIncomplete : new boolean[] { true, false })
974 >    {
975 >        final AtomicInteger a = new AtomicInteger(0);
976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978 >        final CompletableFuture<Integer> g = m.whenComplete
979 >            (f,
980 >             (Integer x, Throwable t) -> {
981 >                m.checkExecutionMode();
982 >                threadAssertNull(x);
983 >                threadAssertTrue(t instanceof CancellationException);
984 >                a.getAndIncrement();
985 >            });
986 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987 >
988 >        checkCompletedWithWrappedCancellationException(g);
989 >        checkCancelled(f);
990 >        assertEquals(1, a.get());
991 >    }}
992 >
993 >    /**
994 >     * If a whenComplete action throws an exception when triggered by
995 >     * a normal completion, it completes exceptionally
996 >     */
997 >    public void testWhenComplete_actionFailed() {
998 >        for (boolean createIncomplete : new boolean[] { true, false })
999 >        for (ExecutionMode m : ExecutionMode.values())
1000 >        for (Integer v1 : new Integer[] { 1, null })
1001 >    {
1002 >        final AtomicInteger a = new AtomicInteger(0);
1003 >        final CFException ex = new CFException();
1004 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1005 >        if (!createIncomplete) assertTrue(f.complete(v1));
1006 >        final CompletableFuture<Integer> g = m.whenComplete
1007 >            (f,
1008 >             (Integer x, Throwable t) -> {
1009 >                m.checkExecutionMode();
1010 >                threadAssertSame(x, v1);
1011 >                threadAssertNull(t);
1012 >                a.getAndIncrement();
1013 >                throw ex;
1014 >            });
1015 >        if (createIncomplete) assertTrue(f.complete(v1));
1016 >
1017 >        checkCompletedWithWrappedException(g, ex);
1018 >        checkCompletedNormally(f, v1);
1019 >        assertEquals(1, a.get());
1020 >    }}
1021 >
1022 >    /**
1023 >     * If a whenComplete action throws an exception when triggered by
1024 >     * a source completion that also throws an exception, the source
1025 >     * exception takes precedence.
1026 >     */
1027 >    public void testWhenComplete_actionFailedSourceFailed() {
1028 >        for (boolean createIncomplete : new boolean[] { true, false })
1029 >        for (ExecutionMode m : ExecutionMode.values())
1030 >        for (Integer v1 : new Integer[] { 1, null })
1031 >    {
1032 >        final AtomicInteger a = new AtomicInteger(0);
1033 >        final CFException ex1 = new CFException();
1034 >        final CFException ex2 = new CFException();
1035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 >
1037 >        if (!createIncomplete) f.completeExceptionally(ex1);
1038 >        final CompletableFuture<Integer> g = m.whenComplete
1039 >            (f,
1040 >             (Integer x, Throwable t) -> {
1041 >                m.checkExecutionMode();
1042 >                threadAssertSame(t, ex1);
1043 >                threadAssertNull(x);
1044 >                a.getAndIncrement();
1045 >                throw ex2;
1046 >            });
1047 >        if (createIncomplete) f.completeExceptionally(ex1);
1048 >
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051          assertEquals(1, a.get());
1052      }}
1053  
# Line 782 | Line 1062 | public class CompletableFutureTest exten
1062      {
1063          final CompletableFuture<Integer> f = new CompletableFuture<>();
1064          final AtomicInteger a = new AtomicInteger(0);
1065 <        if (!createIncomplete) f.complete(v1);
1065 >        if (!createIncomplete) assertTrue(f.complete(v1));
1066          final CompletableFuture<Integer> g = m.handle
1067              (f,
1068               (Integer x, Throwable t) -> {
1069 +                m.checkExecutionMode();
1070                  threadAssertSame(x, v1);
1071                  threadAssertNull(t);
1072                  a.getAndIncrement();
1073                  return inc(v1);
1074              });
1075 <        if (createIncomplete) f.complete(v1);
1075 >        if (createIncomplete) assertTrue(f.complete(v1));
1076  
1077          checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
# Line 814 | Line 1095 | public class CompletableFutureTest exten
1095          final CompletableFuture<Integer> g = m.handle
1096              (f,
1097               (Integer x, Throwable t) -> {
1098 +                m.checkExecutionMode();
1099                  threadAssertNull(x);
1100                  threadAssertSame(t, ex);
1101                  a.getAndIncrement();
# Line 822 | Line 1104 | public class CompletableFutureTest exten
1104          if (createIncomplete) f.completeExceptionally(ex);
1105  
1106          checkCompletedNormally(g, v1);
1107 <        checkCompletedWithWrappedCFException(f, ex);
1107 >        checkCompletedExceptionally(f, ex);
1108          assertEquals(1, a.get());
1109      }}
1110  
# Line 842 | Line 1124 | public class CompletableFutureTest exten
1124          final CompletableFuture<Integer> g = m.handle
1125              (f,
1126               (Integer x, Throwable t) -> {
1127 +                m.checkExecutionMode();
1128                  threadAssertNull(x);
1129                  threadAssertTrue(t instanceof CancellationException);
1130                  a.getAndIncrement();
# Line 869 | Line 1152 | public class CompletableFutureTest exten
1152          final CompletableFuture<Integer> g = m.handle
1153              (f,
1154               (Integer x, Throwable t) -> {
1155 +                m.checkExecutionMode();
1156                  threadAssertNull(x);
1157                  threadAssertSame(ex1, t);
1158                  a.getAndIncrement();
# Line 876 | Line 1160 | public class CompletableFutureTest exten
1160              });
1161          if (createIncomplete) f.completeExceptionally(ex1);
1162  
1163 <        checkCompletedWithWrappedCFException(g, ex2);
1164 <        checkCompletedWithWrappedCFException(f, ex1);
1163 >        checkCompletedWithWrappedException(g, ex2);
1164 >        checkCompletedExceptionally(f, ex1);
1165          assertEquals(1, a.get());
1166      }}
1167  
# Line 889 | Line 1173 | public class CompletableFutureTest exten
1173          final CompletableFuture<Integer> f = new CompletableFuture<>();
1174          final AtomicInteger a = new AtomicInteger(0);
1175          final CFException ex = new CFException();
1176 <        if (!createIncomplete) f.complete(v1);
1176 >        if (!createIncomplete) assertTrue(f.complete(v1));
1177          final CompletableFuture<Integer> g = m.handle
1178              (f,
1179               (Integer x, Throwable t) -> {
1180 +                m.checkExecutionMode();
1181                  threadAssertSame(x, v1);
1182                  threadAssertNull(t);
1183                  a.getAndIncrement();
1184                  throw ex;
1185              });
1186 <        if (createIncomplete) f.complete(v1);
1186 >        if (createIncomplete) assertTrue(f.complete(v1));
1187  
1188 <        checkCompletedWithWrappedCFException(g, ex);
1188 >        checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
1190          assertEquals(1, a.get());
1191      }}
# Line 908 | Line 1193 | public class CompletableFutureTest exten
1193      /**
1194       * runAsync completes after running Runnable
1195       */
1196 <    public void testRunAsync() {
1197 <        Noop r = new Noop();
1198 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1199 <        assertNull(f.join());
1200 <        assertEquals(1, r.invocationCount);
1201 <        checkCompletedNormally(f, null);
1202 <    }
1203 <
1204 <    /**
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);
1196 >    public void testRunAsync_normalCompletion() {
1197 >        ExecutionMode[] executionModes = {
1198 >            ExecutionMode.ASYNC,
1199 >            ExecutionMode.EXECUTOR,
1200 >        };
1201 >        for (ExecutionMode m : executionModes)
1202 >    {
1203 >        final Noop r = new Noop(m);
1204 >        final CompletableFuture<Void> f = m.runAsync(r);
1205          assertNull(f.join());
927        assertEquals(1, r.invocationCount);
1206          checkCompletedNormally(f, null);
1207 <        assertEquals(1, exec.count.get());
1208 <    }
1207 >        r.assertInvoked();
1208 >    }}
1209  
1210      /**
1211       * failing runAsync completes exceptionally after running Runnable
1212       */
1213 <    public void testRunAsync3() {
1214 <        FailingRunnable r = new FailingRunnable();
1215 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1213 >    public void testRunAsync_exceptionalCompletion() {
1214 >        ExecutionMode[] executionModes = {
1215 >            ExecutionMode.ASYNC,
1216 >            ExecutionMode.EXECUTOR,
1217 >        };
1218 >        for (ExecutionMode m : executionModes)
1219 >    {
1220 >        final FailingRunnable r = new FailingRunnable(m);
1221 >        final CompletableFuture<Void> f = m.runAsync(r);
1222          checkCompletedWithWrappedCFException(f);
1223 <        assertEquals(1, r.invocationCount);
1224 <    }
1223 >        r.assertInvoked();
1224 >    }}
1225  
1226      /**
1227       * supplyAsync completes with result of supplier
1228       */
1229 <    public void testSupplyAsync() {
1230 <        CompletableFuture<Integer> f;
1231 <        f = CompletableFuture.supplyAsync(supplyOne);
1232 <        assertEquals(f.join(), one);
1233 <        checkCompletedNormally(f, one);
1234 <    }
1235 <
1236 <    /**
1237 <     * supplyAsync with executor completes with result of supplier
1238 <     */
1239 <    public void testSupplyAsync2() {
1240 <        CompletableFuture<Integer> f;
1241 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1242 <        assertEquals(f.join(), one);
959 <        checkCompletedNormally(f, one);
960 <    }
1229 >    public void testSupplyAsync_normalCompletion() {
1230 >        ExecutionMode[] executionModes = {
1231 >            ExecutionMode.ASYNC,
1232 >            ExecutionMode.EXECUTOR,
1233 >        };
1234 >        for (ExecutionMode m : executionModes)
1235 >        for (Integer v1 : new Integer[] { 1, null })
1236 >    {
1237 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1238 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1239 >        assertSame(v1, f.join());
1240 >        checkCompletedNormally(f, v1);
1241 >        r.assertInvoked();
1242 >    }}
1243  
1244      /**
1245       * Failing supplyAsync completes exceptionally
1246       */
1247 <    public void testSupplyAsync3() {
1248 <        FailingSupplier r = new FailingSupplier();
1249 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1247 >    public void testSupplyAsync_exceptionalCompletion() {
1248 >        ExecutionMode[] executionModes = {
1249 >            ExecutionMode.ASYNC,
1250 >            ExecutionMode.EXECUTOR,
1251 >        };
1252 >        for (ExecutionMode m : executionModes)
1253 >    {
1254 >        FailingSupplier r = new FailingSupplier(m);
1255 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1256          checkCompletedWithWrappedCFException(f);
1257 <        assertEquals(1, r.invocationCount);
1258 <    }
1257 >        r.assertInvoked();
1258 >    }}
1259  
1260      // seq completion methods
1261  
# Line 980 | Line 1268 | public class CompletableFutureTest exten
1268          for (Integer v1 : new Integer[] { 1, null })
1269      {
1270          final CompletableFuture<Integer> f = new CompletableFuture<>();
1271 <        final Noop r = new Noop();
1272 <        if (!createIncomplete) f.complete(v1);
1271 >        final Noop r = new Noop(m);
1272 >        if (!createIncomplete) assertTrue(f.complete(v1));
1273          final CompletableFuture<Void> g = m.thenRun(f, r);
1274          if (createIncomplete) {
1275              checkIncomplete(g);
1276 <            f.complete(v1);
1276 >            assertTrue(f.complete(v1));
1277          }
1278  
1279          checkCompletedNormally(g, null);
1280          checkCompletedNormally(f, v1);
1281 <        assertEquals(1, r.invocationCount);
1281 >        r.assertInvoked();
1282      }}
1283  
1284      /**
# Line 1003 | Line 1291 | public class CompletableFutureTest exten
1291      {
1292          final CFException ex = new CFException();
1293          final CompletableFuture<Integer> f = new CompletableFuture<>();
1294 <        final Noop r = new Noop();
1294 >        final Noop r = new Noop(m);
1295          if (!createIncomplete) f.completeExceptionally(ex);
1296          final CompletableFuture<Void> g = m.thenRun(f, r);
1297          if (createIncomplete) {
# Line 1011 | Line 1299 | public class CompletableFutureTest exten
1299              f.completeExceptionally(ex);
1300          }
1301  
1302 <        checkCompletedWithWrappedCFException(g, ex);
1303 <        checkCompletedWithWrappedCFException(f, ex);
1304 <        assertEquals(0, r.invocationCount);
1302 >        checkCompletedWithWrappedException(g, ex);
1303 >        checkCompletedExceptionally(f, ex);
1304 >        r.assertNotInvoked();
1305      }}
1306  
1307      /**
# Line 1025 | Line 1313 | public class CompletableFutureTest exten
1313          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1314      {
1315          final CompletableFuture<Integer> f = new CompletableFuture<>();
1316 <        final Noop r = new Noop();
1316 >        final Noop r = new Noop(m);
1317          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1318 <        final CompletableFuture<Void> g = f.thenRun(r);
1318 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1319          if (createIncomplete) {
1320              checkIncomplete(g);
1321              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1035 | Line 1323 | public class CompletableFutureTest exten
1323  
1324          checkCompletedWithWrappedCancellationException(g);
1325          checkCancelled(f);
1326 <        assertEquals(0, r.invocationCount);
1326 >        r.assertNotInvoked();
1327      }}
1328  
1329      /**
# Line 1047 | Line 1335 | public class CompletableFutureTest exten
1335          for (Integer v1 : new Integer[] { 1, null })
1336      {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338 <        final FailingRunnable r = new FailingRunnable();
1339 <        if (!createIncomplete) f.complete(v1);
1340 <        final CompletableFuture<Void> g = f.thenRun(r);
1338 >        final FailingRunnable r = new FailingRunnable(m);
1339 >        if (!createIncomplete) assertTrue(f.complete(v1));
1340 >        final CompletableFuture<Void> g = m.thenRun(f, r);
1341          if (createIncomplete) {
1342              checkIncomplete(g);
1343 <            f.complete(v1);
1343 >            assertTrue(f.complete(v1));
1344          }
1345  
1346          checkCompletedWithWrappedCFException(g);
# Line 1068 | Line 1356 | public class CompletableFutureTest exten
1356          for (Integer v1 : new Integer[] { 1, null })
1357      {
1358          final CompletableFuture<Integer> f = new CompletableFuture<>();
1359 <        final IncFunction r = new IncFunction();
1360 <        if (!createIncomplete) f.complete(v1);
1359 >        final IncFunction r = new IncFunction(m);
1360 >        if (!createIncomplete) assertTrue(f.complete(v1));
1361          final CompletableFuture<Integer> g = m.thenApply(f, r);
1362          if (createIncomplete) {
1363              checkIncomplete(g);
1364 <            f.complete(v1);
1364 >            assertTrue(f.complete(v1));
1365          }
1366  
1367          checkCompletedNormally(g, inc(v1));
1368          checkCompletedNormally(f, v1);
1369 <        assertEquals(1, r.invocationCount);
1369 >        r.assertValue(inc(v1));
1370      }}
1371  
1372      /**
# Line 1091 | Line 1379 | public class CompletableFutureTest exten
1379      {
1380          final CFException ex = new CFException();
1381          final CompletableFuture<Integer> f = new CompletableFuture<>();
1382 <        final IncFunction r = new IncFunction();
1382 >        final IncFunction r = new IncFunction(m);
1383          if (!createIncomplete) f.completeExceptionally(ex);
1384          final CompletableFuture<Integer> g = m.thenApply(f, r);
1385          if (createIncomplete) {
# Line 1099 | Line 1387 | public class CompletableFutureTest exten
1387              f.completeExceptionally(ex);
1388          }
1389  
1390 <        checkCompletedWithWrappedCFException(g, ex);
1391 <        checkCompletedWithWrappedCFException(f, ex);
1392 <        assertEquals(0, r.invocationCount);
1390 >        checkCompletedWithWrappedException(g, ex);
1391 >        checkCompletedExceptionally(f, ex);
1392 >        r.assertNotInvoked();
1393      }}
1394  
1395      /**
# Line 1113 | Line 1401 | public class CompletableFutureTest exten
1401          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1402      {
1403          final CompletableFuture<Integer> f = new CompletableFuture<>();
1404 <        final IncFunction r = new IncFunction();
1404 >        final IncFunction r = new IncFunction(m);
1405          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1406 <        final CompletableFuture<Integer> g = f.thenApply(r);
1406 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1407          if (createIncomplete) {
1408              checkIncomplete(g);
1409              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1123 | Line 1411 | public class CompletableFutureTest exten
1411  
1412          checkCompletedWithWrappedCancellationException(g);
1413          checkCancelled(f);
1414 <        assertEquals(0, r.invocationCount);
1414 >        r.assertNotInvoked();
1415      }}
1416  
1417      /**
# Line 1135 | Line 1423 | public class CompletableFutureTest exten
1423          for (Integer v1 : new Integer[] { 1, null })
1424      {
1425          final CompletableFuture<Integer> f = new CompletableFuture<>();
1426 <        final FailingFunction r = new FailingFunction();
1427 <        if (!createIncomplete) f.complete(v1);
1428 <        final CompletableFuture<Integer> g = f.thenApply(r);
1426 >        final FailingFunction r = new FailingFunction(m);
1427 >        if (!createIncomplete) assertTrue(f.complete(v1));
1428 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1429          if (createIncomplete) {
1430              checkIncomplete(g);
1431 <            f.complete(v1);
1431 >            assertTrue(f.complete(v1));
1432          }
1433  
1434          checkCompletedWithWrappedCFException(g);
# Line 1156 | Line 1444 | public class CompletableFutureTest exten
1444          for (Integer v1 : new Integer[] { 1, null })
1445      {
1446          final CompletableFuture<Integer> f = new CompletableFuture<>();
1447 <        final IncAction r = new IncAction();
1448 <        if (!createIncomplete) f.complete(v1);
1447 >        final NoopConsumer r = new NoopConsumer(m);
1448 >        if (!createIncomplete) assertTrue(f.complete(v1));
1449          final CompletableFuture<Void> g = m.thenAccept(f, r);
1450          if (createIncomplete) {
1451              checkIncomplete(g);
1452 <            f.complete(v1);
1452 >            assertTrue(f.complete(v1));
1453          }
1454  
1455          checkCompletedNormally(g, null);
1456 +        r.assertValue(v1);
1457          checkCompletedNormally(f, v1);
1169        assertEquals(1, r.invocationCount);
1170        assertEquals(inc(v1), r.value);
1458      }}
1459  
1460      /**
# Line 1180 | Line 1467 | public class CompletableFutureTest exten
1467      {
1468          final CFException ex = new CFException();
1469          final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        final IncAction r = new IncAction();
1470 >        final NoopConsumer r = new NoopConsumer(m);
1471          if (!createIncomplete) f.completeExceptionally(ex);
1472          final CompletableFuture<Void> g = m.thenAccept(f, r);
1473          if (createIncomplete) {
# Line 1188 | Line 1475 | public class CompletableFutureTest exten
1475              f.completeExceptionally(ex);
1476          }
1477  
1478 <        checkCompletedWithWrappedCFException(g, ex);
1479 <        checkCompletedWithWrappedCFException(f, ex);
1480 <        assertEquals(0, r.invocationCount);
1478 >        checkCompletedWithWrappedException(g, ex);
1479 >        checkCompletedExceptionally(f, ex);
1480 >        r.assertNotInvoked();
1481      }}
1482  
1483      /**
1484 <     * thenAccept result completes exceptionally if action does
1484 >     * thenAccept result completes exceptionally if source cancelled
1485       */
1486 <    public void testThenAccept_actionFailed() {
1486 >    public void testThenAccept_sourceCancelled() {
1487          for (ExecutionMode m : ExecutionMode.values())
1488          for (boolean createIncomplete : new boolean[] { true, false })
1489 <        for (Integer v1 : new Integer[] { 1, null })
1489 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490      {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final FailingConsumer r = new FailingConsumer();
1493 <        if (!createIncomplete) f.complete(v1);
1494 <        final CompletableFuture<Void> g = f.thenAccept(r);
1492 >        final NoopConsumer r = new NoopConsumer(m);
1493 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1494 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1495          if (createIncomplete) {
1496              checkIncomplete(g);
1497 <            f.complete(v1);
1497 >            assertTrue(f.cancel(mayInterruptIfRunning));
1498          }
1499  
1500 <        checkCompletedWithWrappedCFException(g);
1501 <        checkCompletedNormally(f, v1);
1500 >        checkCompletedWithWrappedCancellationException(g);
1501 >        checkCancelled(f);
1502 >        r.assertNotInvoked();
1503      }}
1504  
1505      /**
1506 <     * thenAccept result completes exceptionally if source cancelled
1506 >     * thenAccept result completes exceptionally if action does
1507       */
1508 <    public void testThenAccept_sourceCancelled() {
1508 >    public void testThenAccept_actionFailed() {
1509          for (ExecutionMode m : ExecutionMode.values())
1510          for (boolean createIncomplete : new boolean[] { true, false })
1511 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1511 >        for (Integer v1 : new Integer[] { 1, null })
1512      {
1513          final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 <        final IncAction r = new IncAction();
1515 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1516 <        final CompletableFuture<Void> g = f.thenAccept(r);
1514 >        final FailingConsumer r = new FailingConsumer(m);
1515 >        if (!createIncomplete) f.complete(v1);
1516 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1517          if (createIncomplete) {
1518              checkIncomplete(g);
1519 <            assertTrue(f.cancel(mayInterruptIfRunning));
1519 >            f.complete(v1);
1520          }
1521  
1522 <        checkCompletedWithWrappedCancellationException(g);
1523 <        checkCancelled(f);
1236 <        assertEquals(0, r.invocationCount);
1522 >        checkCompletedWithWrappedCFException(g);
1523 >        checkCompletedNormally(f, v1);
1524      }}
1525  
1526      /**
# Line 1242 | Line 1529 | public class CompletableFutureTest exten
1529       */
1530      public void testThenCombine_normalCompletion() {
1531          for (ExecutionMode m : ExecutionMode.values())
1245        for (boolean createIncomplete : new boolean[] { true, false })
1532          for (boolean fFirst : new boolean[] { true, false })
1533          for (Integer v1 : new Integer[] { 1, null })
1534          for (Integer v2 : new Integer[] { 2, null })
1535      {
1536          final CompletableFuture<Integer> f = new CompletableFuture<>();
1537          final CompletableFuture<Integer> g = new CompletableFuture<>();
1538 <        final SubtractFunction r = new SubtractFunction();
1539 <
1540 <        if (fFirst) f.complete(v1); else g.complete(v2);
1541 <        if (!createIncomplete)
1542 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1543 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1544 <        if (createIncomplete) {
1545 <            checkIncomplete(h);
1546 <            assertEquals(0, r.invocationCount);
1547 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1548 <        }
1549 <
1550 <        checkCompletedNormally(h, subtract(v1, v2));
1538 >        final SubtractFunction r1 = new SubtractFunction(m);
1539 >        final SubtractFunction r2 = new SubtractFunction(m);
1540 >        final SubtractFunction r3 = new SubtractFunction(m);
1541 >
1542 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1543 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1544 >        final Integer w1 =  fFirst ? v1 : v2;
1545 >        final Integer w2 = !fFirst ? v1 : v2;
1546 >
1547 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1548 >        assertTrue(fst.complete(w1));
1549 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1550 >        checkIncomplete(h1);
1551 >        checkIncomplete(h2);
1552 >        r1.assertNotInvoked();
1553 >        r2.assertNotInvoked();
1554 >        assertTrue(snd.complete(w2));
1555 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1556 >
1557 >        checkCompletedNormally(h1, subtract(v1, v2));
1558 >        checkCompletedNormally(h2, subtract(v1, v2));
1559 >        checkCompletedNormally(h3, subtract(v1, v2));
1560 >        r1.assertValue(subtract(v1, v2));
1561 >        r2.assertValue(subtract(v1, v2));
1562 >        r3.assertValue(subtract(v1, v2));
1563          checkCompletedNormally(f, v1);
1564          checkCompletedNormally(g, v2);
1267        assertEquals(1, r.invocationCount);
1565      }}
1566  
1567      /**
1568       * thenCombine result completes exceptionally after exceptional
1569       * completion of either source
1570       */
1571 <    public void testThenCombine_exceptionalCompletion() {
1571 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1572          for (ExecutionMode m : ExecutionMode.values())
1276        for (boolean createIncomplete : new boolean[] { true, false })
1573          for (boolean fFirst : new boolean[] { true, false })
1574 +        for (boolean failFirst : new boolean[] { true, false })
1575          for (Integer v1 : new Integer[] { 1, null })
1576      {
1577          final CompletableFuture<Integer> f = new CompletableFuture<>();
1578          final CompletableFuture<Integer> g = new CompletableFuture<>();
1579          final CFException ex = new CFException();
1580 <        final SubtractFunction r = new SubtractFunction();
1581 <
1582 <        (fFirst ? f : g).complete(v1);
1583 <        if (!createIncomplete)
1584 <            (!fFirst ? f : g).completeExceptionally(ex);
1585 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1586 <        if (createIncomplete) {
1587 <            checkIncomplete(h);
1588 <            (!fFirst ? f : g).completeExceptionally(ex);
1589 <        }
1590 <
1591 <        checkCompletedWithWrappedCFException(h, ex);
1592 <        assertEquals(0, r.invocationCount);
1593 <        checkCompletedNormally(fFirst ? f : g, v1);
1594 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1580 >        final SubtractFunction r1 = new SubtractFunction(m);
1581 >        final SubtractFunction r2 = new SubtractFunction(m);
1582 >        final SubtractFunction r3 = new SubtractFunction(m);
1583 >
1584 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1585 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1586 >        final Callable<Boolean> complete1 = failFirst ?
1587 >            () -> fst.completeExceptionally(ex) :
1588 >            () -> fst.complete(v1);
1589 >        final Callable<Boolean> complete2 = failFirst ?
1590 >            () -> snd.complete(v1) :
1591 >            () -> snd.completeExceptionally(ex);
1592 >
1593 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1594 >        assertTrue(complete1.call());
1595 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1596 >        checkIncomplete(h1);
1597 >        checkIncomplete(h2);
1598 >        assertTrue(complete2.call());
1599 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1600 >
1601 >        checkCompletedWithWrappedException(h1, ex);
1602 >        checkCompletedWithWrappedException(h2, ex);
1603 >        checkCompletedWithWrappedException(h3, ex);
1604 >        r1.assertNotInvoked();
1605 >        r2.assertNotInvoked();
1606 >        r3.assertNotInvoked();
1607 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1608 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1609      }}
1610  
1611      /**
1612 <     * thenCombine result completes exceptionally if action does
1612 >     * thenCombine result completes exceptionally if either source cancelled
1613       */
1614 <    public void testThenCombine_actionFailed() {
1614 >    public void testThenCombine_sourceCancelled() throws Throwable {
1615          for (ExecutionMode m : ExecutionMode.values())
1616 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1617          for (boolean fFirst : new boolean[] { true, false })
1618 +        for (boolean failFirst : new boolean[] { true, false })
1619          for (Integer v1 : new Integer[] { 1, null })
1307        for (Integer v2 : new Integer[] { 2, null })
1620      {
1621          final CompletableFuture<Integer> f = new CompletableFuture<>();
1622          final CompletableFuture<Integer> g = new CompletableFuture<>();
1623 <        final FailingBiFunction r = new FailingBiFunction();
1624 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1625 <
1626 <        if (fFirst) {
1627 <            f.complete(v1);
1628 <            g.complete(v2);
1629 <        } else {
1630 <            g.complete(v2);
1631 <            f.complete(v1);
1632 <        }
1633 <
1634 <        checkCompletedWithWrappedCFException(h);
1635 <        checkCompletedNormally(f, v1);
1636 <        checkCompletedNormally(g, v2);
1623 >        final SubtractFunction r1 = new SubtractFunction(m);
1624 >        final SubtractFunction r2 = new SubtractFunction(m);
1625 >        final SubtractFunction r3 = new SubtractFunction(m);
1626 >
1627 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1628 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1629 >        final Callable<Boolean> complete1 = failFirst ?
1630 >            () -> fst.cancel(mayInterruptIfRunning) :
1631 >            () -> fst.complete(v1);
1632 >        final Callable<Boolean> complete2 = failFirst ?
1633 >            () -> snd.complete(v1) :
1634 >            () -> snd.cancel(mayInterruptIfRunning);
1635 >
1636 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1637 >        assertTrue(complete1.call());
1638 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1639 >        checkIncomplete(h1);
1640 >        checkIncomplete(h2);
1641 >        assertTrue(complete2.call());
1642 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1643 >
1644 >        checkCompletedWithWrappedCancellationException(h1);
1645 >        checkCompletedWithWrappedCancellationException(h2);
1646 >        checkCompletedWithWrappedCancellationException(h3);
1647 >        r1.assertNotInvoked();
1648 >        r2.assertNotInvoked();
1649 >        r3.assertNotInvoked();
1650 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1651 >        checkCancelled(failFirst ? fst : snd);
1652      }}
1653  
1654      /**
1655 <     * thenCombine result completes exceptionally if either source cancelled
1655 >     * thenCombine result completes exceptionally if action does
1656       */
1657 <    public void testThenCombine_sourceCancelled() {
1657 >    public void testThenCombine_actionFailed() {
1658          for (ExecutionMode m : ExecutionMode.values())
1332        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333        for (boolean createIncomplete : new boolean[] { true, false })
1659          for (boolean fFirst : new boolean[] { true, false })
1660          for (Integer v1 : new Integer[] { 1, null })
1661 +        for (Integer v2 : new Integer[] { 2, null })
1662      {
1663          final CompletableFuture<Integer> f = new CompletableFuture<>();
1664          final CompletableFuture<Integer> g = new CompletableFuture<>();
1665 <        final SubtractFunction r = new SubtractFunction();
1666 <
1667 <        (fFirst ? f : g).complete(v1);
1668 <        if (!createIncomplete)
1669 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1670 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1671 <        if (createIncomplete) {
1672 <            checkIncomplete(h);
1673 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1674 <        }
1675 <
1676 <        checkCompletedWithWrappedCancellationException(h);
1677 <        checkCancelled(!fFirst ? f : g);
1678 <        assertEquals(0, r.invocationCount);
1679 <        checkCompletedNormally(fFirst ? f : g, v1);
1665 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1666 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1667 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1668 >
1669 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1670 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1671 >        final Integer w1 =  fFirst ? v1 : v2;
1672 >        final Integer w2 = !fFirst ? v1 : v2;
1673 >
1674 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1675 >        assertTrue(fst.complete(w1));
1676 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1677 >        assertTrue(snd.complete(w2));
1678 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1679 >
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedWithWrappedCFException(h3);
1683 >        checkCompletedNormally(f, v1);
1684 >        checkCompletedNormally(g, v2);
1685      }}
1686  
1687      /**
# Line 1366 | Line 1697 | public class CompletableFutureTest exten
1697      {
1698          final CompletableFuture<Integer> f = new CompletableFuture<>();
1699          final CompletableFuture<Integer> g = new CompletableFuture<>();
1700 <        final SubtractAction r = new SubtractAction();
1700 >        final SubtractAction r = new SubtractAction(m);
1701  
1702 <        if (fFirst) f.complete(v1); else g.complete(v2);
1702 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1703          if (!createIncomplete)
1704 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1704 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1705          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1706          if (createIncomplete) {
1707              checkIncomplete(h);
1708 <            assertEquals(0, r.invocationCount);
1709 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1708 >            r.assertNotInvoked();
1709 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1710          }
1711  
1712          checkCompletedNormally(h, null);
1713 <        assertEquals(subtract(v1, v2), r.value);
1713 >        r.assertValue(subtract(v1, v2));
1714          checkCompletedNormally(f, v1);
1715          checkCompletedNormally(g, v2);
1716      }}
# Line 1397 | Line 1728 | public class CompletableFutureTest exten
1728          final CompletableFuture<Integer> f = new CompletableFuture<>();
1729          final CompletableFuture<Integer> g = new CompletableFuture<>();
1730          final CFException ex = new CFException();
1731 <        final SubtractAction r = new SubtractAction();
1731 >        final SubtractAction r = new SubtractAction(m);
1732  
1733 <        (fFirst ? f : g).complete(v1);
1733 >        assertTrue((fFirst ? f : g).complete(v1));
1734          if (!createIncomplete)
1735 <            (!fFirst ? f : g).completeExceptionally(ex);
1735 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1736          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1737          if (createIncomplete) {
1738              checkIncomplete(h);
1739 <            (!fFirst ? f : g).completeExceptionally(ex);
1739 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1740          }
1741  
1742 <        checkCompletedWithWrappedCFException(h, ex);
1743 <        assertEquals(0, r.invocationCount);
1742 >        checkCompletedWithWrappedException(h, ex);
1743 >        r.assertNotInvoked();
1744          checkCompletedNormally(fFirst ? f : g, v1);
1745 <        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);
1745 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1746      }}
1747  
1748      /**
# Line 1453 | Line 1757 | public class CompletableFutureTest exten
1757      {
1758          final CompletableFuture<Integer> f = new CompletableFuture<>();
1759          final CompletableFuture<Integer> g = new CompletableFuture<>();
1760 <        final SubtractAction r = new SubtractAction();
1760 >        final SubtractAction r = new SubtractAction(m);
1761  
1762 <        (fFirst ? f : g).complete(v1);
1762 >        assertTrue((fFirst ? f : g).complete(v1));
1763          if (!createIncomplete)
1764              assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1765          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
# Line 1466 | Line 1770 | public class CompletableFutureTest exten
1770  
1771          checkCompletedWithWrappedCancellationException(h);
1772          checkCancelled(!fFirst ? f : g);
1773 <        assertEquals(0, r.invocationCount);
1773 >        r.assertNotInvoked();
1774          checkCompletedNormally(fFirst ? f : g, v1);
1775      }}
1776  
1777      /**
1778 <     * runAfterBoth result completes normally after normal
1475 <     * completion of sources
1778 >     * thenAcceptBoth result completes exceptionally if action does
1779       */
1780 <    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() {
1780 >    public void testThenAcceptBoth_actionFailed() {
1781          for (ExecutionMode m : ExecutionMode.values())
1782 +        for (boolean fFirst : new boolean[] { true, false })
1783          for (Integer v1 : new Integer[] { 1, null })
1784          for (Integer v2 : new Integer[] { 2, null })
1785      {
1786          final CompletableFuture<Integer> f = new CompletableFuture<>();
1787          final CompletableFuture<Integer> g = new CompletableFuture<>();
1788 <        final Noop r = new Noop();
1788 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1789 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1790  
1791 <        g.complete(v2);
1792 <        f.complete(v1);
1530 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1791 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1792 >        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1793  
1794 <        checkCompletedNormally(h, null);
1533 <        assertEquals(1, r.invocationCount);
1794 >        checkCompletedWithWrappedCFException(h);
1795          checkCompletedNormally(f, v1);
1796          checkCompletedNormally(g, v2);
1797      }}
1798  
1799 <    public void testRunAfterBoth_normalCompletion4() {
1799 >    /**
1800 >     * runAfterBoth result completes normally after normal
1801 >     * completion of sources
1802 >     */
1803 >    public void testRunAfterBoth_normalCompletion() {
1804          for (ExecutionMode m : ExecutionMode.values())
1805 +        for (boolean createIncomplete : new boolean[] { true, false })
1806 +        for (boolean fFirst : new boolean[] { true, false })
1807          for (Integer v1 : new Integer[] { 1, null })
1808          for (Integer v2 : new Integer[] { 2, null })
1809      {
1810          final CompletableFuture<Integer> f = new CompletableFuture<>();
1811          final CompletableFuture<Integer> g = new CompletableFuture<>();
1812 <        final Noop r = new Noop();
1812 >        final Noop r = new Noop(m);
1813  
1814 <        f.complete(v1);
1815 <        g.complete(v2);
1814 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1815 >        if (!createIncomplete)
1816 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1817          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1818 +        if (createIncomplete) {
1819 +            checkIncomplete(h);
1820 +            r.assertNotInvoked();
1821 +            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1822 +        }
1823  
1824          checkCompletedNormally(h, null);
1825 <        assertEquals(1, r.invocationCount);
1825 >        r.assertInvoked();
1826          checkCompletedNormally(f, v1);
1827          checkCompletedNormally(g, v2);
1828      }}
# Line 1558 | Line 1831 | public class CompletableFutureTest exten
1831       * runAfterBoth result completes exceptionally after exceptional
1832       * completion of either source
1833       */
1834 <    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() {
1834 >    public void testRunAfterBoth_exceptionalCompletion() {
1835          for (ExecutionMode m : ExecutionMode.values())
1836 +        for (boolean createIncomplete : new boolean[] { true, false })
1837 +        for (boolean fFirst : new boolean[] { true, false })
1838          for (Integer v1 : new Integer[] { 1, null })
1839      {
1840          final CompletableFuture<Integer> f = new CompletableFuture<>();
1841          final CompletableFuture<Integer> g = new CompletableFuture<>();
1626        final Noop r = new Noop();
1842          final CFException ex = new CFException();
1843 +        final Noop r = new Noop(m);
1844  
1845 <        f.completeExceptionally(ex);
1846 <        g.complete(v1);
1847 <        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();
1845 >        assertTrue((fFirst ? f : g).complete(v1));
1846 >        if (!createIncomplete)
1847 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1848          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1849 +        if (createIncomplete) {
1850 +            checkIncomplete(h);
1851 +            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1852 +        }
1853  
1854 <        g.complete(v2);
1855 <        checkIncomplete(h);
1856 <        f.complete(v1);
1857 <
1675 <        checkCompletedWithWrappedCFException(h);
1676 <        checkCompletedNormally(f, v1);
1677 <        checkCompletedNormally(g, v2);
1854 >        checkCompletedWithWrappedException(h, ex);
1855 >        r.assertNotInvoked();
1856 >        checkCompletedNormally(fFirst ? f : g, v1);
1857 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1858      }}
1859  
1860      /**
1861       * runAfterBoth result completes exceptionally if either source cancelled
1862       */
1863 <    public void testRunAfterBoth_sourceCancelled1() {
1863 >    public void testRunAfterBoth_sourceCancelled() {
1864          for (ExecutionMode m : ExecutionMode.values())
1865          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1866 +        for (boolean createIncomplete : new boolean[] { true, false })
1867 +        for (boolean fFirst : new boolean[] { true, false })
1868          for (Integer v1 : new Integer[] { 1, null })
1869      {
1870          final CompletableFuture<Integer> f = new CompletableFuture<>();
1871          final CompletableFuture<Integer> g = new CompletableFuture<>();
1872 <        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 <    }}
1872 >        final Noop r = new Noop(m);
1873  
1874 <    public void testRunAfterBoth_sourceCancelled2() {
1875 <        for (ExecutionMode m : ExecutionMode.values())
1876 <        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();
1874 >        assertTrue((fFirst ? f : g).complete(v1));
1875 >        if (!createIncomplete)
1876 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1877          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1878 <
1879 <        assertTrue(g.cancel(mayInterruptIfRunning));
1880 <        checkIncomplete(h);
1881 <        f.complete(v1);
1878 >        if (createIncomplete) {
1879 >            checkIncomplete(h);
1880 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1881 >        }
1882  
1883          checkCompletedWithWrappedCancellationException(h);
1884 <        checkCancelled(g);
1885 <        assertEquals(0, r.invocationCount);
1886 <        checkCompletedNormally(f, v1);
1884 >        checkCancelled(!fFirst ? f : g);
1885 >        r.assertNotInvoked();
1886 >        checkCompletedNormally(fFirst ? f : g, v1);
1887      }}
1888  
1889 <    public void testRunAfterBoth_sourceCancelled3() {
1889 >    /**
1890 >     * runAfterBoth result completes exceptionally if action does
1891 >     */
1892 >    public void testRunAfterBoth_actionFailed() {
1893          for (ExecutionMode m : ExecutionMode.values())
1894 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1894 >        for (boolean fFirst : new boolean[] { true, false })
1895          for (Integer v1 : new Integer[] { 1, null })
1896 +        for (Integer v2 : new Integer[] { 2, null })
1897      {
1898          final CompletableFuture<Integer> f = new CompletableFuture<>();
1899          final CompletableFuture<Integer> g = new CompletableFuture<>();
1900 <        final Noop r = new Noop();
1900 >        final FailingRunnable r1 = new FailingRunnable(m);
1901 >        final FailingRunnable r2 = new FailingRunnable(m);
1902  
1903 <        assertTrue(g.cancel(mayInterruptIfRunning));
1904 <        f.complete(v1);
1905 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1903 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1904 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1905 >        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1906 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1907  
1908 <        checkCompletedWithWrappedCancellationException(h);
1909 <        checkCancelled(g);
1738 <        assertEquals(0, r.invocationCount);
1908 >        checkCompletedWithWrappedCFException(h1);
1909 >        checkCompletedWithWrappedCFException(h2);
1910          checkCompletedNormally(f, v1);
1911 <    }}
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);
1911 >        checkCompletedNormally(g, v2);
1912      }}
1913  
1914      /**
1915       * applyToEither result completes normally after normal completion
1916       * of either source
1917       */
1918 <    public void testApplyToEither_normalCompletion1() {
1918 >    public void testApplyToEither_normalCompletion() {
1919          for (ExecutionMode m : ExecutionMode.values())
1920          for (Integer v1 : new Integer[] { 1, null })
1921          for (Integer v2 : new Integer[] { 2, null })
1922      {
1923          final CompletableFuture<Integer> f = new CompletableFuture<>();
1924          final CompletableFuture<Integer> g = new CompletableFuture<>();
1925 <        final IncFunction r = new IncFunction();
1926 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1925 >        final IncFunction[] rs = new IncFunction[6];
1926 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1927  
1928 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1929 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1930 +        checkIncomplete(h0);
1931 +        checkIncomplete(h1);
1932 +        rs[0].assertNotInvoked();
1933 +        rs[1].assertNotInvoked();
1934          f.complete(v1);
1935 <        checkCompletedNormally(h, inc(v1));
1935 >        checkCompletedNormally(h0, inc(v1));
1936 >        checkCompletedNormally(h1, inc(v1));
1937 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1938 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1939 >        checkCompletedNormally(h2, inc(v1));
1940 >        checkCompletedNormally(h3, inc(v1));
1941          g.complete(v2);
1942  
1943 <        checkCompletedNormally(f, v1);
1944 <        checkCompletedNormally(g, v2);
1945 <        checkCompletedNormally(h, inc(v1));
1946 <    }}
1947 <
1948 <    public void testApplyToEither_normalCompletion2() {
1949 <        for (ExecutionMode m : ExecutionMode.values())
1950 <        for (Integer v1 : new Integer[] { 1, null })
1951 <        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);
1797 <
1798 <        checkCompletedNormally(f, v1);
1799 <        checkCompletedNormally(g, v2);
1800 <        checkCompletedNormally(h, inc(v2));
1801 <        }}
1802 <
1803 <    public void testApplyToEither_normalCompletion3() {
1804 <        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);
1943 >        // unspecified behavior - both source completions available
1944 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1945 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1946 >        rs[4].assertValue(h4.join());
1947 >        rs[5].assertValue(h5.join());
1948 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1949 >                   Objects.equals(inc(v2), h4.join()));
1950 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1951 >                   Objects.equals(inc(v2), h5.join()));
1952  
1953          checkCompletedNormally(f, v1);
1954          checkCompletedNormally(g, v2);
1955 <
1956 <        // unspecified behavior
1957 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1958 <                   Objects.equals(h.join(), inc(v2)));
1959 <        assertEquals(1, r.invocationCount);
1955 >        checkCompletedNormally(h0, inc(v1));
1956 >        checkCompletedNormally(h1, inc(v1));
1957 >        checkCompletedNormally(h2, inc(v1));
1958 >        checkCompletedNormally(h3, inc(v1));
1959 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1960      }}
1961  
1962      /**
1963       * applyToEither result completes exceptionally after exceptional
1964       * completion of either source
1965       */
1966 <    public void testApplyToEither_exceptionalCompletion1() {
1966 >    public void testApplyToEither_exceptionalCompletion() {
1967          for (ExecutionMode m : ExecutionMode.values())
1968          for (Integer v1 : new Integer[] { 1, null })
1969      {
1970          final CompletableFuture<Integer> f = new CompletableFuture<>();
1971          final CompletableFuture<Integer> g = new CompletableFuture<>();
1835        final IncFunction r = new IncFunction();
1836        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1972          final CFException ex = new CFException();
1973 +        final IncFunction[] rs = new IncFunction[6];
1974 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1975  
1976 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1977 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1978 +        checkIncomplete(h0);
1979 +        checkIncomplete(h1);
1980 +        rs[0].assertNotInvoked();
1981 +        rs[1].assertNotInvoked();
1982          f.completeExceptionally(ex);
1983 <        checkCompletedWithWrappedCFException(h, ex);
1983 >        checkCompletedWithWrappedException(h0, ex);
1984 >        checkCompletedWithWrappedException(h1, ex);
1985 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1986 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1987 >        checkCompletedWithWrappedException(h2, ex);
1988 >        checkCompletedWithWrappedException(h3, ex);
1989          g.complete(v1);
1990  
1991 <        assertEquals(0, r.invocationCount);
1991 >        // unspecified behavior - both source completions available
1992 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1993 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1994 >        try {
1995 >            assertEquals(inc(v1), h4.join());
1996 >            rs[4].assertValue(inc(v1));
1997 >        } catch (CompletionException ok) {
1998 >            checkCompletedWithWrappedException(h4, ex);
1999 >            rs[4].assertNotInvoked();
2000 >        }
2001 >        try {
2002 >            assertEquals(inc(v1), h5.join());
2003 >            rs[5].assertValue(inc(v1));
2004 >        } catch (CompletionException ok) {
2005 >            checkCompletedWithWrappedException(h5, ex);
2006 >            rs[5].assertNotInvoked();
2007 >        }
2008 >
2009 >        checkCompletedExceptionally(f, ex);
2010          checkCompletedNormally(g, v1);
2011 <        checkCompletedWithWrappedCFException(f, ex);
2012 <        checkCompletedWithWrappedCFException(h, ex);
2011 >        checkCompletedWithWrappedException(h0, ex);
2012 >        checkCompletedWithWrappedException(h1, ex);
2013 >        checkCompletedWithWrappedException(h2, ex);
2014 >        checkCompletedWithWrappedException(h3, ex);
2015 >        checkCompletedWithWrappedException(h4, ex);
2016 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2017      }}
2018  
2019      public void testApplyToEither_exceptionalCompletion2() {
2020          for (ExecutionMode m : ExecutionMode.values())
2021 +        for (boolean fFirst : new boolean[] { true, false })
2022          for (Integer v1 : new Integer[] { 1, null })
2023      {
2024          final CompletableFuture<Integer> f = new CompletableFuture<>();
2025          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();
2026          final CFException ex = new CFException();
2027 +        final IncFunction[] rs = new IncFunction[6];
2028 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2029  
2030 <        g.completeExceptionally(ex);
2031 <        f.complete(v1);
2032 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2030 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2031 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2032 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2033 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2034 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2035 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2036  
2037 <        // unspecified behavior
1883 <        Integer v;
2037 >        // unspecified behavior - both source completions available
2038          try {
2039 <            assertEquals(inc(v1), h.join());
2040 <            assertEquals(1, r.invocationCount);
2039 >            assertEquals(inc(v1), h0.join());
2040 >            rs[0].assertValue(inc(v1));
2041          } catch (CompletionException ok) {
2042 <            checkCompletedWithWrappedCFException(h, ex);
2043 <            assertEquals(0, r.invocationCount);
2042 >            checkCompletedWithWrappedException(h0, ex);
2043 >            rs[0].assertNotInvoked();
2044          }
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;
2045          try {
2046 <            assertEquals(inc(v1), h.join());
2047 <            assertEquals(1, r.invocationCount);
2046 >            assertEquals(inc(v1), h1.join());
2047 >            rs[1].assertValue(inc(v1));
2048          } catch (CompletionException ok) {
2049 <            checkCompletedWithWrappedCFException(h, ex);
2050 <            assertEquals(0, r.invocationCount);
2049 >            checkCompletedWithWrappedException(h1, ex);
2050 >            rs[1].assertNotInvoked();
2051 >        }
2052 >        try {
2053 >            assertEquals(inc(v1), h2.join());
2054 >            rs[2].assertValue(inc(v1));
2055 >        } catch (CompletionException ok) {
2056 >            checkCompletedWithWrappedException(h2, ex);
2057 >            rs[2].assertNotInvoked();
2058 >        }
2059 >        try {
2060 >            assertEquals(inc(v1), h3.join());
2061 >            rs[3].assertValue(inc(v1));
2062 >        } catch (CompletionException ok) {
2063 >            checkCompletedWithWrappedException(h3, ex);
2064 >            rs[3].assertNotInvoked();
2065          }
2066  
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);
2067          checkCompletedNormally(f, v1);
2068 <        checkCompletedNormally(g, v2);
2068 >        checkCompletedExceptionally(g, ex);
2069      }}
2070  
2071      /**
2072       * applyToEither result completes exceptionally if either source cancelled
2073       */
2074 <    public void testApplyToEither_sourceCancelled1() {
2074 >    public void testApplyToEither_sourceCancelled() {
2075          for (ExecutionMode m : ExecutionMode.values())
2076          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2077          for (Integer v1 : new Integer[] { 1, null })
2078      {
2079          final CompletableFuture<Integer> f = new CompletableFuture<>();
2080          final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 <        final IncFunction r = new IncFunction();
2082 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2081 >        final IncFunction[] rs = new IncFunction[6];
2082 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2083  
2084 <        assertTrue(f.cancel(mayInterruptIfRunning));
2085 <        checkCompletedWithWrappedCancellationException(h);
2084 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2085 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2086 >        checkIncomplete(h0);
2087 >        checkIncomplete(h1);
2088 >        rs[0].assertNotInvoked();
2089 >        rs[1].assertNotInvoked();
2090 >        f.cancel(mayInterruptIfRunning);
2091 >        checkCompletedWithWrappedCancellationException(h0);
2092 >        checkCompletedWithWrappedCancellationException(h1);
2093 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2094 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2095 >        checkCompletedWithWrappedCancellationException(h2);
2096 >        checkCompletedWithWrappedCancellationException(h3);
2097          g.complete(v1);
2098  
2099 +        // unspecified behavior - both source completions available
2100 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2101 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2102 +        try {
2103 +            assertEquals(inc(v1), h4.join());
2104 +            rs[4].assertValue(inc(v1));
2105 +        } catch (CompletionException ok) {
2106 +            checkCompletedWithWrappedCancellationException(h4);
2107 +            rs[4].assertNotInvoked();
2108 +        }
2109 +        try {
2110 +            assertEquals(inc(v1), h5.join());
2111 +            rs[5].assertValue(inc(v1));
2112 +        } catch (CompletionException ok) {
2113 +            checkCompletedWithWrappedCancellationException(h5);
2114 +            rs[5].assertNotInvoked();
2115 +        }
2116 +
2117          checkCancelled(f);
1978        assertEquals(0, r.invocationCount);
2118          checkCompletedNormally(g, v1);
2119 <        checkCompletedWithWrappedCancellationException(h);
2119 >        checkCompletedWithWrappedCancellationException(h0);
2120 >        checkCompletedWithWrappedCancellationException(h1);
2121 >        checkCompletedWithWrappedCancellationException(h2);
2122 >        checkCompletedWithWrappedCancellationException(h3);
2123 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2124      }}
2125  
2126      public void testApplyToEither_sourceCancelled2() {
2127          for (ExecutionMode m : ExecutionMode.values())
2128          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2129 +        for (boolean fFirst : new boolean[] { true, false })
2130          for (Integer v1 : new Integer[] { 1, null })
2131      {
2132          final CompletableFuture<Integer> f = new CompletableFuture<>();
2133          final CompletableFuture<Integer> g = new CompletableFuture<>();
2134 <        final IncFunction r = new IncFunction();
2135 <        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();
2134 >        final IncFunction[] rs = new IncFunction[6];
2135 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2136  
2137 <        assertTrue(g.cancel(mayInterruptIfRunning));
2138 <        f.complete(v1);
2139 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2137 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2138 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2139 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2140 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2141 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2142 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2143  
2144 <        // unspecified behavior
2017 <        Integer v;
2144 >        // unspecified behavior - both source completions available
2145          try {
2146 <            assertEquals(inc(v1), h.join());
2147 <            assertEquals(1, r.invocationCount);
2146 >            assertEquals(inc(v1), h0.join());
2147 >            rs[0].assertValue(inc(v1));
2148          } catch (CompletionException ok) {
2149 <            checkCompletedWithWrappedCancellationException(h);
2150 <            assertEquals(0, r.invocationCount);
2149 >            checkCompletedWithWrappedCancellationException(h0);
2150 >            rs[0].assertNotInvoked();
2151          }
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;
2152          try {
2153 <            assertEquals(inc(v1), h.join());
2154 <            assertEquals(1, r.invocationCount);
2153 >            assertEquals(inc(v1), h1.join());
2154 >            rs[1].assertValue(inc(v1));
2155          } catch (CompletionException ok) {
2156 <            checkCompletedWithWrappedCancellationException(h);
2157 <            assertEquals(0, r.invocationCount);
2156 >            checkCompletedWithWrappedCancellationException(h1);
2157 >            rs[1].assertNotInvoked();
2158 >        }
2159 >        try {
2160 >            assertEquals(inc(v1), h2.join());
2161 >            rs[2].assertValue(inc(v1));
2162 >        } catch (CompletionException ok) {
2163 >            checkCompletedWithWrappedCancellationException(h2);
2164 >            rs[2].assertNotInvoked();
2165 >        }
2166 >        try {
2167 >            assertEquals(inc(v1), h3.join());
2168 >            rs[3].assertValue(inc(v1));
2169 >        } catch (CompletionException ok) {
2170 >            checkCompletedWithWrappedCancellationException(h3);
2171 >            rs[3].assertNotInvoked();
2172          }
2173  
2174 <        checkCancelled(f);
2175 <        checkCompletedNormally(g, v1);
2174 >        checkCompletedNormally(f, v1);
2175 >        checkCancelled(g);
2176      }}
2177  
2178      /**
2179 <     * acceptEither result completes normally after normal completion
2059 <     * of either source
2179 >     * applyToEither result completes exceptionally if action does
2180       */
2181 <    public void testAcceptEither_normalCompletion1() {
2181 >    public void testApplyToEither_actionFailed() {
2182          for (ExecutionMode m : ExecutionMode.values())
2183          for (Integer v1 : new Integer[] { 1, null })
2184          for (Integer v2 : new Integer[] { 2, null })
2185      {
2186          final CompletableFuture<Integer> f = new CompletableFuture<>();
2187          final CompletableFuture<Integer> g = new CompletableFuture<>();
2188 <        final IncAction r = new IncAction();
2189 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2188 >        final FailingFunction[] rs = new FailingFunction[6];
2189 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2190  
2191 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2192 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2193          f.complete(v1);
2194 <        checkCompletedNormally(h, null);
2195 <        assertEquals(inc(v1), r.value);
2194 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2195 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2196 >        checkCompletedWithWrappedCFException(h0);
2197 >        checkCompletedWithWrappedCFException(h1);
2198 >        checkCompletedWithWrappedCFException(h2);
2199 >        checkCompletedWithWrappedCFException(h3);
2200 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2201 >
2202          g.complete(v2);
2203  
2204 <        checkCompletedNormally(f, v1);
2205 <        checkCompletedNormally(g, v2);
2206 <        checkCompletedNormally(h, null);
2079 <    }}
2204 >        // unspecified behavior - both source completions available
2205 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2206 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2207  
2208 <    public void testAcceptEither_normalCompletion2() {
2209 <        for (ExecutionMode m : ExecutionMode.values())
2210 <        for (Integer v1 : new Integer[] { 1, null })
2211 <        for (Integer v2 : new Integer[] { 2, null })
2212 <    {
2213 <        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);
2090 <
2091 <        g.complete(v2);
2092 <        checkCompletedNormally(h, null);
2093 <        assertEquals(inc(v2), r.value);
2094 <        f.complete(v1);
2208 >        checkCompletedWithWrappedCFException(h4);
2209 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2210 >                   Objects.equals(v2, rs[4].value));
2211 >        checkCompletedWithWrappedCFException(h5);
2212 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2213 >                   Objects.equals(v2, rs[5].value));
2214  
2215          checkCompletedNormally(f, v1);
2216          checkCompletedNormally(g, v2);
2098        checkCompletedNormally(h, null);
2217      }}
2218  
2219 <    public void testAcceptEither_normalCompletion3() {
2219 >    /**
2220 >     * acceptEither result completes normally after normal completion
2221 >     * of either source
2222 >     */
2223 >    public void testAcceptEither_normalCompletion() {
2224          for (ExecutionMode m : ExecutionMode.values())
2225          for (Integer v1 : new Integer[] { 1, null })
2226          for (Integer v2 : new Integer[] { 2, null })
2227      {
2228          final CompletableFuture<Integer> f = new CompletableFuture<>();
2229          final CompletableFuture<Integer> g = new CompletableFuture<>();
2230 <        final IncAction r = new IncAction();
2230 >        final NoopConsumer[] rs = new NoopConsumer[6];
2231 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2232  
2233 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2234 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2235 +        checkIncomplete(h0);
2236 +        checkIncomplete(h1);
2237 +        rs[0].assertNotInvoked();
2238 +        rs[1].assertNotInvoked();
2239          f.complete(v1);
2240 +        checkCompletedNormally(h0, null);
2241 +        checkCompletedNormally(h1, null);
2242 +        rs[0].assertValue(v1);
2243 +        rs[1].assertValue(v1);
2244 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2245 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2246 +        checkCompletedNormally(h2, null);
2247 +        checkCompletedNormally(h3, null);
2248 +        rs[2].assertValue(v1);
2249 +        rs[3].assertValue(v1);
2250          g.complete(v2);
2112        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2251  
2252 <        checkCompletedNormally(h, null);
2252 >        // unspecified behavior - both source completions available
2253 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2254 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2255 >        checkCompletedNormally(h4, null);
2256 >        checkCompletedNormally(h5, null);
2257 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2258 >                   Objects.equals(v2, rs[4].value));
2259 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2260 >                   Objects.equals(v2, rs[5].value));
2261 >
2262          checkCompletedNormally(f, v1);
2263          checkCompletedNormally(g, v2);
2264 <
2265 <        // unspecified behavior
2266 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2267 <                   Objects.equals(r.value, inc(v2)));
2264 >        checkCompletedNormally(h0, null);
2265 >        checkCompletedNormally(h1, null);
2266 >        checkCompletedNormally(h2, null);
2267 >        checkCompletedNormally(h3, null);
2268 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2269      }}
2270  
2271      /**
2272       * acceptEither result completes exceptionally after exceptional
2273       * completion of either source
2274       */
2275 <    public void testAcceptEither_exceptionalCompletion1() {
2275 >    public void testAcceptEither_exceptionalCompletion() {
2276          for (ExecutionMode m : ExecutionMode.values())
2277          for (Integer v1 : new Integer[] { 1, null })
2278      {
2279          final CompletableFuture<Integer> f = new CompletableFuture<>();
2280          final CompletableFuture<Integer> g = new CompletableFuture<>();
2133        final IncAction r = new IncAction();
2134        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2281          final CFException ex = new CFException();
2282 +        final NoopConsumer[] rs = new NoopConsumer[6];
2283 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2284  
2285 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2286 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2287 +        checkIncomplete(h0);
2288 +        checkIncomplete(h1);
2289 +        rs[0].assertNotInvoked();
2290 +        rs[1].assertNotInvoked();
2291          f.completeExceptionally(ex);
2292 <        checkCompletedWithWrappedCFException(h, ex);
2292 >        checkCompletedWithWrappedException(h0, ex);
2293 >        checkCompletedWithWrappedException(h1, ex);
2294 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2295 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2296 >        checkCompletedWithWrappedException(h2, ex);
2297 >        checkCompletedWithWrappedException(h3, ex);
2298 >
2299          g.complete(v1);
2300  
2301 <        assertEquals(0, r.invocationCount);
2301 >        // unspecified behavior - both source completions available
2302 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2303 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2304 >        try {
2305 >            assertNull(h4.join());
2306 >            rs[4].assertValue(v1);
2307 >        } catch (CompletionException ok) {
2308 >            checkCompletedWithWrappedException(h4, ex);
2309 >            rs[4].assertNotInvoked();
2310 >        }
2311 >        try {
2312 >            assertNull(h5.join());
2313 >            rs[5].assertValue(v1);
2314 >        } catch (CompletionException ok) {
2315 >            checkCompletedWithWrappedException(h5, ex);
2316 >            rs[5].assertNotInvoked();
2317 >        }
2318 >
2319 >        checkCompletedExceptionally(f, ex);
2320          checkCompletedNormally(g, v1);
2321 <        checkCompletedWithWrappedCFException(f, ex);
2322 <        checkCompletedWithWrappedCFException(h, ex);
2321 >        checkCompletedWithWrappedException(h0, ex);
2322 >        checkCompletedWithWrappedException(h1, ex);
2323 >        checkCompletedWithWrappedException(h2, ex);
2324 >        checkCompletedWithWrappedException(h3, ex);
2325 >        checkCompletedWithWrappedException(h4, ex);
2326 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2327      }}
2328  
2329      public void testAcceptEither_exceptionalCompletion2() {
2330          for (ExecutionMode m : ExecutionMode.values())
2331 +        for (boolean fFirst : new boolean[] { true, false })
2332          for (Integer v1 : new Integer[] { 1, null })
2333      {
2334          final CompletableFuture<Integer> f = new CompletableFuture<>();
2335          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();
2336          final CFException ex = new CFException();
2337 +        final NoopConsumer[] rs = new NoopConsumer[6];
2338 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2339  
2340 <        g.completeExceptionally(ex);
2341 <        f.complete(v1);
2342 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2340 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2341 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2342 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2343 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2344 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2345 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2346  
2347 <        // unspecified behavior
2181 <        Integer v;
2347 >        // unspecified behavior - both source completions available
2348          try {
2349 <            assertNull(h.join());
2350 <            assertEquals(1, r.invocationCount);
2185 <            assertEquals(inc(v1), r.value);
2349 >            assertEquals(null, h0.join());
2350 >            rs[0].assertValue(v1);
2351          } catch (CompletionException ok) {
2352 <            checkCompletedWithWrappedCFException(h, ex);
2353 <            assertEquals(0, r.invocationCount);
2352 >            checkCompletedWithWrappedException(h0, ex);
2353 >            rs[0].assertNotInvoked();
2354          }
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;
2355          try {
2356 <            assertNull(h.join());
2357 <            assertEquals(1, r.invocationCount);
2213 <            assertEquals(inc(v1), r.value);
2356 >            assertEquals(null, h1.join());
2357 >            rs[1].assertValue(v1);
2358          } catch (CompletionException ok) {
2359 <            checkCompletedWithWrappedCFException(h, ex);
2360 <            assertEquals(0, r.invocationCount);
2359 >            checkCompletedWithWrappedException(h1, ex);
2360 >            rs[1].assertNotInvoked();
2361 >        }
2362 >        try {
2363 >            assertEquals(null, h2.join());
2364 >            rs[2].assertValue(v1);
2365 >        } catch (CompletionException ok) {
2366 >            checkCompletedWithWrappedException(h2, ex);
2367 >            rs[2].assertNotInvoked();
2368 >        }
2369 >        try {
2370 >            assertEquals(null, h3.join());
2371 >            rs[3].assertValue(v1);
2372 >        } catch (CompletionException ok) {
2373 >            checkCompletedWithWrappedException(h3, ex);
2374 >            rs[3].assertNotInvoked();
2375          }
2376  
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);
2377          checkCompletedNormally(f, v1);
2378 <        checkCompletedNormally(g, v2);
2378 >        checkCompletedExceptionally(g, ex);
2379      }}
2380  
2381      /**
2382       * acceptEither result completes exceptionally if either source cancelled
2383       */
2384 <    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() {
2384 >    public void testAcceptEither_sourceCancelled() {
2385          for (ExecutionMode m : ExecutionMode.values())
2386          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2387          for (Integer v1 : new Integer[] { 1, null })
2388      {
2389          final CompletableFuture<Integer> f = new CompletableFuture<>();
2390          final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final IncAction r = new IncAction();
2392 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2391 >        final NoopConsumer[] rs = new NoopConsumer[6];
2392 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2393  
2394 <        assertTrue(g.cancel(mayInterruptIfRunning));
2395 <        checkCompletedWithWrappedCancellationException(h);
2396 <        f.complete(v1);
2394 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2395 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2396 >        checkIncomplete(h0);
2397 >        checkIncomplete(h1);
2398 >        rs[0].assertNotInvoked();
2399 >        rs[1].assertNotInvoked();
2400 >        f.cancel(mayInterruptIfRunning);
2401 >        checkCompletedWithWrappedCancellationException(h0);
2402 >        checkCompletedWithWrappedCancellationException(h1);
2403 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2404 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2405 >        checkCompletedWithWrappedCancellationException(h2);
2406 >        checkCompletedWithWrappedCancellationException(h3);
2407  
2408 <        checkCancelled(g);
2298 <        assertEquals(0, r.invocationCount);
2299 <        checkCompletedNormally(f, v1);
2300 <        checkCompletedWithWrappedCancellationException(h);
2301 <    }}
2302 <
2303 <    public void testAcceptEither_sourceCancelled3() {
2304 <        for (ExecutionMode m : ExecutionMode.values())
2305 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2306 <        for (Integer v1 : new Integer[] { 1, null })
2307 <    {
2308 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2309 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2310 <        final IncAction r = new IncAction();
2311 <
2312 <        assertTrue(g.cancel(mayInterruptIfRunning));
2313 <        f.complete(v1);
2314 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2408 >        g.complete(v1);
2409  
2410 <        // unspecified behavior
2411 <        Integer v;
2410 >        // unspecified behavior - both source completions available
2411 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2412 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2413          try {
2414 <            assertNull(h.join());
2415 <            assertEquals(1, r.invocationCount);
2321 <            assertEquals(inc(v1), r.value);
2414 >            assertNull(h4.join());
2415 >            rs[4].assertValue(v1);
2416          } catch (CompletionException ok) {
2417 <            checkCompletedWithWrappedCancellationException(h);
2418 <            assertEquals(0, r.invocationCount);
2417 >            checkCompletedWithWrappedCancellationException(h4);
2418 >            rs[4].assertNotInvoked();
2419          }
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;
2420          try {
2421 <            assertNull(h.join());
2422 <            assertEquals(1, r.invocationCount);
2349 <            assertEquals(inc(v1), r.value);
2421 >            assertNull(h5.join());
2422 >            rs[5].assertValue(v1);
2423          } catch (CompletionException ok) {
2424 <            checkCompletedWithWrappedCancellationException(h);
2425 <            assertEquals(0, r.invocationCount);
2424 >            checkCompletedWithWrappedCancellationException(h5);
2425 >            rs[5].assertNotInvoked();
2426          }
2427  
2428          checkCancelled(f);
2429          checkCompletedNormally(g, v1);
2430 +        checkCompletedWithWrappedCancellationException(h0);
2431 +        checkCompletedWithWrappedCancellationException(h1);
2432 +        checkCompletedWithWrappedCancellationException(h2);
2433 +        checkCompletedWithWrappedCancellationException(h3);
2434 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2435      }}
2436  
2437      /**
2438 <     * runAfterEither result completes normally after normal completion
2361 <     * of either source
2438 >     * acceptEither result completes exceptionally if action does
2439       */
2440 <    public void testRunAfterEither_normalCompletion1() {
2440 >    public void testAcceptEither_actionFailed() {
2441          for (ExecutionMode m : ExecutionMode.values())
2442          for (Integer v1 : new Integer[] { 1, null })
2443          for (Integer v2 : new Integer[] { 2, null })
2444      {
2445          final CompletableFuture<Integer> f = new CompletableFuture<>();
2446          final CompletableFuture<Integer> g = new CompletableFuture<>();
2447 <        final Noop r = new Noop();
2448 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2447 >        final FailingConsumer[] rs = new FailingConsumer[6];
2448 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2449  
2450 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2451 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2452          f.complete(v1);
2453 <        checkCompletedNormally(h, null);
2454 <        assertEquals(1, r.invocationCount);
2453 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2454 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2455 >        checkCompletedWithWrappedCFException(h0);
2456 >        checkCompletedWithWrappedCFException(h1);
2457 >        checkCompletedWithWrappedCFException(h2);
2458 >        checkCompletedWithWrappedCFException(h3);
2459 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2460 >
2461          g.complete(v2);
2462  
2463 <        checkCompletedNormally(f, v1);
2464 <        checkCompletedNormally(g, v2);
2465 <        checkCompletedNormally(h, null);
2381 <        assertEquals(1, r.invocationCount);
2382 <    }}
2463 >        // unspecified behavior - both source completions available
2464 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2465 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2466  
2467 <    public void testRunAfterEither_normalCompletion2() {
2468 <        for (ExecutionMode m : ExecutionMode.values())
2469 <        for (Integer v1 : new Integer[] { 1, null })
2470 <        for (Integer v2 : new Integer[] { 2, null })
2471 <    {
2472 <        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);
2467 >        checkCompletedWithWrappedCFException(h4);
2468 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2469 >                   Objects.equals(v2, rs[4].value));
2470 >        checkCompletedWithWrappedCFException(h5);
2471 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2472 >                   Objects.equals(v2, rs[5].value));
2473  
2474          checkCompletedNormally(f, v1);
2475          checkCompletedNormally(g, v2);
2476 <        checkCompletedNormally(h, null);
2402 <        assertEquals(1, r.invocationCount);
2403 <        }}
2476 >    }}
2477  
2478 <    public void testRunAfterEither_normalCompletion3() {
2478 >    /**
2479 >     * runAfterEither result completes normally after normal completion
2480 >     * of either source
2481 >     */
2482 >    public void testRunAfterEither_normalCompletion() {
2483          for (ExecutionMode m : ExecutionMode.values())
2484          for (Integer v1 : new Integer[] { 1, null })
2485          for (Integer v2 : new Integer[] { 2, null })
2486      {
2487          final CompletableFuture<Integer> f = new CompletableFuture<>();
2488          final CompletableFuture<Integer> g = new CompletableFuture<>();
2489 <        final Noop r = new Noop();
2489 >        final Noop[] rs = new Noop[6];
2490 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2491  
2492 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2493 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2494 +        checkIncomplete(h0);
2495 +        checkIncomplete(h1);
2496 +        rs[0].assertNotInvoked();
2497 +        rs[1].assertNotInvoked();
2498          f.complete(v1);
2499 +        checkCompletedNormally(h0, null);
2500 +        checkCompletedNormally(h1, null);
2501 +        rs[0].assertInvoked();
2502 +        rs[1].assertInvoked();
2503 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2504 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2505 +        checkCompletedNormally(h2, null);
2506 +        checkCompletedNormally(h3, null);
2507 +        rs[2].assertInvoked();
2508 +        rs[3].assertInvoked();
2509 +
2510          g.complete(v2);
2416        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2511  
2512 <        checkCompletedNormally(h, null);
2512 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2513 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2514 >
2515          checkCompletedNormally(f, v1);
2516          checkCompletedNormally(g, v2);
2517 <        assertEquals(1, r.invocationCount);
2517 >        checkCompletedNormally(h0, null);
2518 >        checkCompletedNormally(h1, null);
2519 >        checkCompletedNormally(h2, null);
2520 >        checkCompletedNormally(h3, null);
2521 >        checkCompletedNormally(h4, null);
2522 >        checkCompletedNormally(h5, null);
2523 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2524      }}
2525  
2526      /**
2527       * runAfterEither result completes exceptionally after exceptional
2528       * completion of either source
2529       */
2530 <    public void testRunAfterEither_exceptionalCompletion1() {
2429 <        for (ExecutionMode m : ExecutionMode.values())
2430 <        for (Integer v1 : new Integer[] { 1, null })
2431 <    {
2432 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434 <        final Noop r = new Noop();
2435 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2436 <        final CFException ex = new CFException();
2437 <
2438 <        f.completeExceptionally(ex);
2439 <        checkCompletedWithWrappedCFException(h, ex);
2440 <        g.complete(v1);
2441 <
2442 <        assertEquals(0, r.invocationCount);
2443 <        checkCompletedNormally(g, v1);
2444 <        checkCompletedWithWrappedCFException(f, ex);
2445 <        checkCompletedWithWrappedCFException(h, ex);
2446 <    }}
2447 <
2448 <    public void testRunAfterEither_exceptionalCompletion2() {
2530 >    public void testRunAfterEither_exceptionalCompletion() {
2531          for (ExecutionMode m : ExecutionMode.values())
2532          for (Integer v1 : new Integer[] { 1, null })
2533      {
2534          final CompletableFuture<Integer> f = new CompletableFuture<>();
2535          final CompletableFuture<Integer> g = new CompletableFuture<>();
2454        final Noop r = new Noop();
2455        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2536          final CFException ex = new CFException();
2537 +        final Noop[] rs = new Noop[6];
2538 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2539  
2540 <        g.completeExceptionally(ex);
2541 <        checkCompletedWithWrappedCFException(h, ex);
2542 <        f.complete(v1);
2540 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2541 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2542 >        checkIncomplete(h0);
2543 >        checkIncomplete(h1);
2544 >        rs[0].assertNotInvoked();
2545 >        rs[1].assertNotInvoked();
2546 >        assertTrue(f.completeExceptionally(ex));
2547 >        checkCompletedWithWrappedException(h0, ex);
2548 >        checkCompletedWithWrappedException(h1, ex);
2549 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2550 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2551 >        checkCompletedWithWrappedException(h2, ex);
2552 >        checkCompletedWithWrappedException(h3, ex);
2553  
2554 <        assertEquals(0, r.invocationCount);
2463 <        checkCompletedNormally(f, v1);
2464 <        checkCompletedWithWrappedCFException(g, ex);
2465 <        checkCompletedWithWrappedCFException(h, ex);
2466 <    }}
2554 >        assertTrue(g.complete(v1));
2555  
2556 <    public void testRunAfterEither_exceptionalCompletion3() {
2557 <        for (ExecutionMode m : ExecutionMode.values())
2558 <        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();
2475 <        final CFException ex = new CFException();
2476 <
2477 <        g.completeExceptionally(ex);
2478 <        f.complete(v1);
2479 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2480 <
2481 <        // unspecified behavior
2482 <        Integer v;
2556 >        // unspecified behavior - both source completions available
2557 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2558 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2559          try {
2560 <            assertNull(h.join());
2561 <            assertEquals(1, r.invocationCount);
2560 >            assertNull(h4.join());
2561 >            rs[4].assertInvoked();
2562          } catch (CompletionException ok) {
2563 <            checkCompletedWithWrappedCFException(h, ex);
2564 <            assertEquals(0, r.invocationCount);
2563 >            checkCompletedWithWrappedException(h4, ex);
2564 >            rs[4].assertNotInvoked();
2565          }
2490
2491        checkCompletedWithWrappedCFException(g, ex);
2492        checkCompletedNormally(f, v1);
2493    }}
2494
2495    public void testRunAfterEither_exceptionalCompletion4() {
2496        for (ExecutionMode m : ExecutionMode.values())
2497        for (Integer v1 : new Integer[] { 1, null })
2498    {
2499        final CompletableFuture<Integer> f = new CompletableFuture<>();
2500        final CompletableFuture<Integer> g = new CompletableFuture<>();
2501        final Noop r = new Noop();
2502        final CFException ex = new CFException();
2503
2504        f.completeExceptionally(ex);
2505        g.complete(v1);
2506        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2507
2508        // unspecified behavior
2509        Integer v;
2566          try {
2567 <            assertNull(h.join());
2568 <            assertEquals(1, r.invocationCount);
2567 >            assertNull(h5.join());
2568 >            rs[5].assertInvoked();
2569          } catch (CompletionException ok) {
2570 <            checkCompletedWithWrappedCFException(h, ex);
2571 <            assertEquals(0, r.invocationCount);
2570 >            checkCompletedWithWrappedException(h5, ex);
2571 >            rs[5].assertNotInvoked();
2572          }
2573  
2574 <        checkCompletedWithWrappedCFException(f, ex);
2574 >        checkCompletedExceptionally(f, ex);
2575          checkCompletedNormally(g, v1);
2576 +        checkCompletedWithWrappedException(h0, ex);
2577 +        checkCompletedWithWrappedException(h1, ex);
2578 +        checkCompletedWithWrappedException(h2, ex);
2579 +        checkCompletedWithWrappedException(h3, ex);
2580 +        checkCompletedWithWrappedException(h4, ex);
2581 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2582      }}
2583  
2584 <    /**
2523 <     * runAfterEither result completes exceptionally if action does
2524 <     */
2525 <    public void testRunAfterEither_actionFailed1() {
2584 >    public void testRunAfterEither_exceptionalCompletion2() {
2585          for (ExecutionMode m : ExecutionMode.values())
2586 +        for (boolean fFirst : new boolean[] { true, false })
2587          for (Integer v1 : new Integer[] { 1, null })
2528        for (Integer v2 : new Integer[] { 2, null })
2588      {
2589          final CompletableFuture<Integer> f = new CompletableFuture<>();
2590          final CompletableFuture<Integer> g = new CompletableFuture<>();
2591 <        final FailingRunnable r = new FailingRunnable();
2592 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2591 >        final CFException ex = new CFException();
2592 >        final Noop[] rs = new Noop[6];
2593 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2594  
2595 <        f.complete(v1);
2596 <        checkCompletedWithWrappedCFException(h);
2597 <        g.complete(v2);
2598 <        checkCompletedNormally(f, v1);
2599 <        checkCompletedNormally(g, v2);
2600 <    }}
2595 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2596 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2597 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2598 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2599 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2600 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2601  
2602 <    public void testRunAfterEither_actionFailed2() {
2603 <        for (ExecutionMode m : ExecutionMode.values())
2604 <        for (Integer v1 : new Integer[] { 1, null })
2605 <        for (Integer v2 : new Integer[] { 2, null })
2606 <    {
2607 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2608 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2609 <        final FailingRunnable r = new FailingRunnable();
2610 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2602 >        // unspecified behavior - both source completions available
2603 >        try {
2604 >            assertEquals(null, h0.join());
2605 >            rs[0].assertInvoked();
2606 >        } catch (CompletionException ok) {
2607 >            checkCompletedWithWrappedException(h0, ex);
2608 >            rs[0].assertNotInvoked();
2609 >        }
2610 >        try {
2611 >            assertEquals(null, h1.join());
2612 >            rs[1].assertInvoked();
2613 >        } catch (CompletionException ok) {
2614 >            checkCompletedWithWrappedException(h1, ex);
2615 >            rs[1].assertNotInvoked();
2616 >        }
2617 >        try {
2618 >            assertEquals(null, h2.join());
2619 >            rs[2].assertInvoked();
2620 >        } catch (CompletionException ok) {
2621 >            checkCompletedWithWrappedException(h2, ex);
2622 >            rs[2].assertNotInvoked();
2623 >        }
2624 >        try {
2625 >            assertEquals(null, h3.join());
2626 >            rs[3].assertInvoked();
2627 >        } catch (CompletionException ok) {
2628 >            checkCompletedWithWrappedException(h3, ex);
2629 >            rs[3].assertNotInvoked();
2630 >        }
2631  
2552        g.complete(v2);
2553        checkCompletedWithWrappedCFException(h);
2554        f.complete(v1);
2632          checkCompletedNormally(f, v1);
2633 <        checkCompletedNormally(g, v2);
2633 >        checkCompletedExceptionally(g, ex);
2634      }}
2635  
2636      /**
2637       * runAfterEither result completes exceptionally if either source cancelled
2638       */
2639 <    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() {
2639 >    public void testRunAfterEither_sourceCancelled() {
2640          for (ExecutionMode m : ExecutionMode.values())
2641          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2642          for (Integer v1 : new Integer[] { 1, null })
2643      {
2644          final CompletableFuture<Integer> f = new CompletableFuture<>();
2645          final CompletableFuture<Integer> g = new CompletableFuture<>();
2646 <        final Noop r = new Noop();
2647 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2646 >        final Noop[] rs = new Noop[6];
2647 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2648  
2649 <        assertTrue(g.cancel(mayInterruptIfRunning));
2650 <        checkCompletedWithWrappedCancellationException(h);
2651 <        f.complete(v1);
2649 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2650 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2651 >        checkIncomplete(h0);
2652 >        checkIncomplete(h1);
2653 >        rs[0].assertNotInvoked();
2654 >        rs[1].assertNotInvoked();
2655 >        f.cancel(mayInterruptIfRunning);
2656 >        checkCompletedWithWrappedCancellationException(h0);
2657 >        checkCompletedWithWrappedCancellationException(h1);
2658 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2659 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2660 >        checkCompletedWithWrappedCancellationException(h2);
2661 >        checkCompletedWithWrappedCancellationException(h3);
2662  
2663 <        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();
2663 >        assertTrue(g.complete(v1));
2664  
2665 <        assertTrue(g.cancel(mayInterruptIfRunning));
2666 <        f.complete(v1);
2667 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2668 <
2669 <        // unspecified behavior
2670 <        Integer v;
2665 >        // unspecified behavior - both source completions available
2666 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2667 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2668 >        try {
2669 >            assertNull(h4.join());
2670 >            rs[4].assertInvoked();
2671 >        } catch (CompletionException ok) {
2672 >            checkCompletedWithWrappedCancellationException(h4);
2673 >            rs[4].assertNotInvoked();
2674 >        }
2675          try {
2676 <            assertNull(h.join());
2677 <            assertEquals(1, r.invocationCount);
2676 >            assertNull(h5.join());
2677 >            rs[5].assertInvoked();
2678          } catch (CompletionException ok) {
2679 <            checkCompletedWithWrappedCancellationException(h);
2680 <            assertEquals(0, r.invocationCount);
2679 >            checkCompletedWithWrappedCancellationException(h5);
2680 >            rs[5].assertNotInvoked();
2681          }
2682  
2683 <        checkCancelled(g);
2684 <        checkCompletedNormally(f, v1);
2683 >        checkCancelled(f);
2684 >        checkCompletedNormally(g, v1);
2685 >        checkCompletedWithWrappedCancellationException(h0);
2686 >        checkCompletedWithWrappedCancellationException(h1);
2687 >        checkCompletedWithWrappedCancellationException(h2);
2688 >        checkCompletedWithWrappedCancellationException(h3);
2689 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2690      }}
2691  
2692 <    public void testRunAfterEither_sourceCancelled4() {
2692 >    /**
2693 >     * runAfterEither result completes exceptionally if action does
2694 >     */
2695 >    public void testRunAfterEither_actionFailed() {
2696          for (ExecutionMode m : ExecutionMode.values())
2631        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2697          for (Integer v1 : new Integer[] { 1, null })
2698 +        for (Integer v2 : new Integer[] { 2, null })
2699      {
2700          final CompletableFuture<Integer> f = new CompletableFuture<>();
2701          final CompletableFuture<Integer> g = new CompletableFuture<>();
2702 <        final Noop r = new Noop();
2702 >        final FailingRunnable[] rs = new FailingRunnable[6];
2703 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2704  
2705 <        assertTrue(f.cancel(mayInterruptIfRunning));
2706 <        g.complete(v1);
2707 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2708 <
2709 <        // unspecified behavior
2710 <        Integer v;
2711 <        try {
2712 <            assertNull(h.join());
2713 <            assertEquals(1, r.invocationCount);
2714 <        } catch (CompletionException ok) {
2715 <            checkCompletedWithWrappedCancellationException(h);
2716 <            assertEquals(0, r.invocationCount);
2717 <        }
2705 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2706 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2707 >        assertTrue(f.complete(v1));
2708 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2709 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2710 >        checkCompletedWithWrappedCFException(h0);
2711 >        checkCompletedWithWrappedCFException(h1);
2712 >        checkCompletedWithWrappedCFException(h2);
2713 >        checkCompletedWithWrappedCFException(h3);
2714 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2715 >        assertTrue(g.complete(v2));
2716 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2717 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2718 >        checkCompletedWithWrappedCFException(h4);
2719 >        checkCompletedWithWrappedCFException(h5);
2720  
2721 <        checkCancelled(f);
2722 <        checkCompletedNormally(g, v1);
2721 >        checkCompletedNormally(f, v1);
2722 >        checkCompletedNormally(g, v2);
2723 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2724      }}
2725  
2726      /**
# Line 2662 | Line 2732 | public class CompletableFutureTest exten
2732          for (Integer v1 : new Integer[] { 1, null })
2733      {
2734          final CompletableFuture<Integer> f = new CompletableFuture<>();
2735 <        final CompletableFutureInc r = new CompletableFutureInc();
2736 <        if (!createIncomplete) f.complete(v1);
2737 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2738 <        if (createIncomplete) f.complete(v1);
2735 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2736 >        if (!createIncomplete) assertTrue(f.complete(v1));
2737 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2738 >        if (createIncomplete) assertTrue(f.complete(v1));
2739  
2740          checkCompletedNormally(g, inc(v1));
2741          checkCompletedNormally(f, v1);
2742 <        assertEquals(1, r.invocationCount);
2742 >        r.assertValue(v1);
2743      }}
2744  
2745      /**
# Line 2681 | Line 2751 | public class CompletableFutureTest exten
2751          for (boolean createIncomplete : new boolean[] { true, false })
2752      {
2753          final CFException ex = new CFException();
2754 <        final CompletableFutureInc r = new CompletableFutureInc();
2754 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2755          final CompletableFuture<Integer> f = new CompletableFuture<>();
2756          if (!createIncomplete) f.completeExceptionally(ex);
2757 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2757 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2758          if (createIncomplete) f.completeExceptionally(ex);
2759  
2760 <        checkCompletedWithWrappedCFException(g, ex);
2761 <        checkCompletedWithWrappedCFException(f, ex);
2762 <        assertEquals(0, r.invocationCount);
2760 >        checkCompletedWithWrappedException(g, ex);
2761 >        checkCompletedExceptionally(f, ex);
2762 >        r.assertNotInvoked();
2763      }}
2764  
2765      /**
# Line 2702 | Line 2772 | public class CompletableFutureTest exten
2772      {
2773          final CompletableFuture<Integer> f = new CompletableFuture<>();
2774          final FailingCompletableFutureFunction r
2775 <            = new FailingCompletableFutureFunction();
2776 <        if (!createIncomplete) f.complete(v1);
2777 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2778 <        if (createIncomplete) f.complete(v1);
2775 >            = new FailingCompletableFutureFunction(m);
2776 >        if (!createIncomplete) assertTrue(f.complete(v1));
2777 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2778 >        if (createIncomplete) assertTrue(f.complete(v1));
2779  
2780          checkCompletedWithWrappedCFException(g);
2781          checkCompletedNormally(f, v1);
# Line 2720 | Line 2790 | public class CompletableFutureTest exten
2790          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2791      {
2792          final CompletableFuture<Integer> f = new CompletableFuture<>();
2793 <        final CompletableFutureInc r = new CompletableFutureInc();
2793 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2794          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2795 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2795 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2796          if (createIncomplete) {
2797              checkIncomplete(g);
2798              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2749 | Line 2819 | public class CompletableFutureTest exten
2819       */
2820      public void testAllOf_normal() throws Exception {
2821          for (int k = 1; k < 20; ++k) {
2822 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2822 >            CompletableFuture<Integer>[] fs
2823 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2824              for (int i = 0; i < k; ++i)
2825                  fs[i] = new CompletableFuture<>();
2826              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 2763 | Line 2834 | public class CompletableFutureTest exten
2834          }
2835      }
2836  
2837 +    public void testAllOf_backwards() throws Exception {
2838 +        for (int k = 1; k < 20; ++k) {
2839 +            CompletableFuture<Integer>[] fs
2840 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2841 +            for (int i = 0; i < k; ++i)
2842 +                fs[i] = new CompletableFuture<>();
2843 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2844 +            for (int i = k - 1; i >= 0; i--) {
2845 +                checkIncomplete(f);
2846 +                checkIncomplete(CompletableFuture.allOf(fs));
2847 +                fs[i].complete(one);
2848 +            }
2849 +            checkCompletedNormally(f, null);
2850 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2851 +        }
2852 +    }
2853 +
2854      /**
2855       * anyOf(no component futures) returns an incomplete future
2856       */
# Line 2821 | Line 2909 | public class CompletableFutureTest exten
2909          Runnable[] throwingActions = {
2910              () -> CompletableFuture.supplyAsync(null),
2911              () -> CompletableFuture.supplyAsync(null, exec),
2912 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2912 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2913  
2914              () -> CompletableFuture.runAsync(null),
2915              () -> CompletableFuture.runAsync(null, exec),
# Line 2894 | Line 2982 | public class CompletableFutureTest exten
2982  
2983              () -> f.thenCompose(null),
2984              () -> f.thenComposeAsync(null),
2985 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2985 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2986              () -> f.thenComposeAsync(null, exec),
2987  
2988              () -> f.exceptionally(null),
# Line 2926 | Line 3014 | public class CompletableFutureTest exten
3014          assertSame(f, f.toCompletableFuture());
3015      }
3016  
3017 <    /**
3018 <     * whenComplete action executes on normal completion, propagating
3019 <     * source result.
3020 <     */
3021 <    public void testWhenComplete_normalCompletion1() {
3022 <        for (ExecutionMode m : ExecutionMode.values())
3023 <        for (boolean createIncomplete : new boolean[] { true, false })
3024 <        for (Integer v1 : new Integer[] { 1, null })
3025 <    {
3026 <        final AtomicInteger a = new AtomicInteger(0);
3027 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3028 <        if (!createIncomplete) f.complete(v1);
3029 <        final CompletableFuture<Integer> g = m.whenComplete
3030 <            (f,
3031 <             (Integer x, Throwable t) -> {
3032 <                threadAssertSame(x, v1);
3033 <                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 <    }}
3017 > //     public void testRunAfterEither_resultDeterminedAtTimeOfCreation() {
3018 > //         for (ExecutionMode m : ExecutionMode.values())
3019 > //         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3020 > //         for (Integer v1 : new Integer[] { 1, null })
3021 > //     {
3022 > //         final CompletableFuture<Integer> f = new CompletableFuture<>();
3023 > //         final CompletableFuture<Integer> g = new CompletableFuture<>();
3024 > //         final Noop[] rs = new Noop[2];
3025 > //         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
3026 > //         f.complete(v1);
3027 > //         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3028 > //         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3029 > //         assertTrue(g.cancel(mayInterruptIfRunning));
3030 > //         checkCompletedNormally(h0, null);
3031 > //         checkCompletedNormally(h1, null);
3032 > //         for (Noop r : rs) r.assertInvoked();
3033 > //     }}
3034  
3035   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines