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.47 by jsr166, Mon Jun 2 18:21:34 2014 UTC vs.
Revision 1.92 by jsr166, Tue Jun 17 20:50:01 2014 UTC

# Line 17 | Line 17 | import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19   import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 103 | 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 129 | 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 204 | 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 216 | 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 226 | 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 238 | 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 259 | 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());
267 <        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);
277 <    }
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 302 | 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 318 | 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 332 | 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);
339 <    static final BiFunction<Integer, Integer, Integer> subtract =
340 <        (Integer x, Integer y) -> subtract(x, y);
341 <    static final class IncAction implements Consumer<Integer> {
342 <        int invocationCount = 0;
343 <        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 FailingNoop 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 521 | Line 648 | public class CompletableFutureTest exten
648              }
649          },
650  
651 <        DEFAULT_ASYNC {
651 >        ASYNC {
652 >            public void checkExecutionMode() {
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 586 | Line 723 | public class CompletableFutureTest exten
723          },
724  
725          EXECUTOR {
726 +            public void checkExecutionMode() {
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) {
737                  return f.thenRunAsync(a, new ThreadExecutor());
# Line 649 | Line 795 | public class CompletableFutureTest exten
795              }
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 698 | 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  
715
864      /**
865       * exceptionally action completes with function value on source
866       * exception
# Line 727 | 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 748 | 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 769 | 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 801 | 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 809 | 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 829 | 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 856 | 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 863 | 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 876 | 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 895 | 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 <    /**
907 <     * runAsync with executor completes after running Runnable
908 <     */
909 <    public void testRunAsync2() {
910 <        Noop r = new Noop();
911 <        ThreadExecutor exec = new ThreadExecutor();
912 <        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());
914        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 <        FailingNoop r = new FailingNoop();
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);
946 <        checkCompletedNormally(f, one);
947 <    }
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  
1262      /**
1263       * thenRun result completes normally after normal completion of source
1264       */
1265 <    public void testThenRun() {
965 <        CompletableFuture<Integer> f;
966 <        CompletableFuture<Void> g;
967 <        Noop r;
968 <
969 <        f = new CompletableFuture<>();
970 <        g = f.thenRun(r = new Noop());
971 <        f.complete(null);
972 <        checkCompletedNormally(g, null);
973 <        assertEquals(1, r.invocationCount);
974 <
975 <        f = new CompletableFuture<>();
976 <        f.complete(null);
977 <        g = f.thenRun(r = new Noop());
978 <        checkCompletedNormally(g, null);
979 <        assertEquals(1, r.invocationCount);
980 <    }
981 <
982 <    /**
983 <     * thenRun result completes exceptionally after exceptional
984 <     * completion of source
985 <     */
986 <    public void testThenRun2() {
987 <        CompletableFuture<Integer> f;
988 <        CompletableFuture<Void> g;
989 <        Noop r;
990 <
991 <        f = new CompletableFuture<>();
992 <        g = f.thenRun(r = new Noop());
993 <        f.completeExceptionally(new CFException());
994 <        checkCompletedWithWrappedCFException(g);
995 <        assertEquals(0, r.invocationCount);
996 <
997 <        f = new CompletableFuture<>();
998 <        f.completeExceptionally(new CFException());
999 <        g = f.thenRun(r = new Noop());
1000 <        checkCompletedWithWrappedCFException(g);
1001 <        assertEquals(0, r.invocationCount);
1002 <    }
1003 <
1004 <    /**
1005 <     * thenRun result completes exceptionally if action does
1006 <     */
1007 <    public void testThenRun3() {
1008 <        CompletableFuture<Integer> f;
1009 <        CompletableFuture<Void> g;
1010 <        FailingNoop r;
1011 <
1012 <        f = new CompletableFuture<>();
1013 <        g = f.thenRun(r = new FailingNoop());
1014 <        f.complete(null);
1015 <        checkCompletedWithWrappedCFException(g);
1016 <
1017 <        f = new CompletableFuture<>();
1018 <        f.complete(null);
1019 <        g = f.thenRun(r = new FailingNoop());
1020 <        checkCompletedWithWrappedCFException(g);
1021 <    }
1022 <
1023 <    /**
1024 <     * thenRun result completes exceptionally if source cancelled
1025 <     */
1026 <    public void testThenRun4() {
1027 <        CompletableFuture<Integer> f;
1028 <        CompletableFuture<Void> g;
1029 <        Noop r;
1030 <
1031 <        f = new CompletableFuture<>();
1032 <        g = f.thenRun(r = new Noop());
1033 <        assertTrue(f.cancel(true));
1034 <        checkCompletedWithWrappedCancellationException(g);
1035 <
1036 <        f = new CompletableFuture<>();
1037 <        assertTrue(f.cancel(true));
1038 <        g = f.thenRun(r = new Noop());
1039 <        checkCompletedWithWrappedCancellationException(g);
1040 <    }
1041 <
1042 <    /**
1043 <     * thenApply result completes normally after normal completion of source
1044 <     */
1045 <    public void testThenApply() {
1046 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1047 <        CompletableFuture<Integer> g = f.thenApply(inc);
1048 <        f.complete(one);
1049 <        checkCompletedNormally(g, two);
1050 <    }
1051 <
1052 <    /**
1053 <     * thenApply result completes exceptionally after exceptional
1054 <     * completion of source
1055 <     */
1056 <    public void testThenApply2() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        CompletableFuture<Integer> g = f.thenApply(inc);
1059 <        f.completeExceptionally(new CFException());
1060 <        checkCompletedWithWrappedCFException(g);
1061 <    }
1062 <
1063 <    /**
1064 <     * thenApply result completes exceptionally if action does
1065 <     */
1066 <    public void testThenApply3() {
1067 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1068 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1069 <        f.complete(one);
1070 <        checkCompletedWithWrappedCFException(g);
1071 <    }
1072 <
1073 <    /**
1074 <     * thenApply result completes exceptionally if source cancelled
1075 <     */
1076 <    public void testThenApply4() {
1077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1078 <        CompletableFuture<Integer> g = f.thenApply(inc);
1079 <        assertTrue(f.cancel(true));
1080 <        checkCompletedWithWrappedCancellationException(g);
1081 <    }
1082 <
1083 <    /**
1084 <     * thenAccept result completes normally after normal completion of source
1085 <     */
1086 <    public void testThenAccept() {
1087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1088 <        IncAction r = new IncAction();
1089 <        CompletableFuture<Void> g = f.thenAccept(r);
1090 <        f.complete(one);
1091 <        checkCompletedNormally(g, null);
1092 <        assertEquals(r.value, (Integer) 2);
1093 <    }
1094 <
1095 <    /**
1096 <     * thenAccept result completes exceptionally after exceptional
1097 <     * completion of source
1098 <     */
1099 <    public void testThenAccept2() {
1100 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1101 <        IncAction r = new IncAction();
1102 <        CompletableFuture<Void> g = f.thenAccept(r);
1103 <        f.completeExceptionally(new CFException());
1104 <        checkCompletedWithWrappedCFException(g);
1105 <    }
1106 <
1107 <    /**
1108 <     * thenAccept result completes exceptionally if action does
1109 <     */
1110 <    public void testThenAccept3() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1112 <        FailingConsumer r = new FailingConsumer();
1113 <        CompletableFuture<Void> g = f.thenAccept(r);
1114 <        f.complete(one);
1115 <        checkCompletedWithWrappedCFException(g);
1116 <        assertEquals(1, r.invocationCount);
1117 <    }
1118 <
1119 <    /**
1120 <     * thenAccept result completes exceptionally if source cancelled
1121 <     */
1122 <    public void testThenAccept4() {
1123 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1124 <        IncAction r = new IncAction();
1125 <        CompletableFuture<Void> g = f.thenAccept(r);
1126 <        assertTrue(f.cancel(true));
1127 <        checkCompletedWithWrappedCancellationException(g);
1128 <    }
1129 <
1130 <    /**
1131 <     * thenCombine result completes normally after normal completion
1132 <     * of sources
1133 <     */
1134 <    public void testThenCombine_normalCompletion1() {
1135 <        for (boolean createIncomplete : new boolean[] { true, false })
1136 <        for (boolean fFirst : new boolean[] { true, false })
1265 >    public void testThenRun_normalCompletion() {
1266          for (ExecutionMode m : ExecutionMode.values())
1267          for (Integer v1 : new Integer[] { 1, null })
1139        for (Integer v2 : new Integer[] { 2, null })
1268      {
1269          final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1271 <        final SubtractFunction r = new SubtractFunction();
1144 <        CompletableFuture<Integer> h = null;
1145 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1146 <
1147 <        if (fFirst)
1148 <            f.complete(v1);
1149 <        else
1150 <            g.complete(v2);
1151 <        if (createIncomplete) checkIncomplete(h);
1152 <        assertEquals(0, r.invocationCount);
1153 <        if (!fFirst)
1154 <            f.complete(v1);
1155 <        else
1156 <            g.complete(v2);
1157 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1270 >        final Noop[] rs = new Noop[6];
1271 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1272  
1273 <        checkCompletedNormally(h, subtract(v1, v2));
1273 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1274 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1275 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1276 >        checkIncomplete(h0);
1277 >        checkIncomplete(h1);
1278 >        checkIncomplete(h2);
1279 >        assertTrue(f.complete(v1));
1280 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1281 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1282 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1283 >
1284 >        checkCompletedNormally(h0, null);
1285 >        checkCompletedNormally(h1, null);
1286 >        checkCompletedNormally(h2, null);
1287 >        checkCompletedNormally(h3, null);
1288 >        checkCompletedNormally(h4, null);
1289 >        checkCompletedNormally(h5, null);
1290          checkCompletedNormally(f, v1);
1291 <        checkCompletedNormally(g, v2);
1162 <        assertEquals(1, r.invocationCount);
1291 >        for (Noop r : rs) r.assertInvoked();
1292      }}
1293  
1294      /**
1295 <     * thenCombine result completes exceptionally after exceptional
1296 <     * completion of either source
1295 >     * thenRun result completes exceptionally after exceptional
1296 >     * completion of source
1297       */
1298 <    public void testThenCombine_exceptionalCompletion1() {
1298 >    public void testThenRun_exceptionalCompletion() {
1299          for (ExecutionMode m : ExecutionMode.values())
1171        for (Integer v1 : new Integer[] { 1, null })
1300      {
1173        final CompletableFuture<Integer> f = new CompletableFuture<>();
1174        final CompletableFuture<Integer> g = new CompletableFuture<>();
1175        final SubtractFunction r = new SubtractFunction();
1176        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1301          final CFException ex = new CFException();
1178
1179        f.completeExceptionally(ex);
1180        checkIncomplete(h);
1181        g.complete(v1);
1182
1183        checkCompletedWithWrappedCFException(h, ex);
1184        checkCompletedWithWrappedCFException(f, ex);
1185        assertEquals(0, r.invocationCount);
1186        checkCompletedNormally(g, v1);
1187    }}
1188
1189    public void testThenCombine_exceptionalCompletion2() {
1190        for (ExecutionMode m : ExecutionMode.values())
1191        for (Integer v1 : new Integer[] { 1, null })
1192    {
1302          final CompletableFuture<Integer> f = new CompletableFuture<>();
1303 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1304 <        final SubtractFunction r = new SubtractFunction();
1196 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1197 <        final CFException ex = new CFException();
1198 <
1199 <        g.completeExceptionally(ex);
1200 <        checkIncomplete(h);
1201 <        f.complete(v1);
1303 >        final Noop[] rs = new Noop[6];
1304 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1305  
1306 <        checkCompletedWithWrappedCFException(h, ex);
1307 <        checkCompletedWithWrappedCFException(g, ex);
1308 <        assertEquals(0, r.invocationCount);
1309 <        checkCompletedNormally(f, v1);
1306 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1307 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1308 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1309 >        checkIncomplete(h0);
1310 >        checkIncomplete(h1);
1311 >        checkIncomplete(h2);
1312 >        assertTrue(f.completeExceptionally(ex));
1313 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1314 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1315 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1316 >
1317 >        checkCompletedWithWrappedException(h0, ex);
1318 >        checkCompletedWithWrappedException(h1, ex);
1319 >        checkCompletedWithWrappedException(h2, ex);
1320 >        checkCompletedWithWrappedException(h3, ex);
1321 >        checkCompletedWithWrappedException(h4, ex);
1322 >        checkCompletedWithWrappedException(h5, ex);
1323 >        checkCompletedExceptionally(f, ex);
1324 >        for (Noop r : rs) r.assertNotInvoked();
1325      }}
1326  
1327 <    public void testThenCombine_exceptionalCompletion3() {
1327 >    /**
1328 >     * thenRun result completes exceptionally if source cancelled
1329 >     */
1330 >    public void testThenRun_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1332 <        for (Integer v1 : new Integer[] { 1, null })
1332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333      {
1334          final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1336 <        final SubtractFunction r = new SubtractFunction();
1216 <        final CFException ex = new CFException();
1217 <
1218 <        g.completeExceptionally(ex);
1219 <        f.complete(v1);
1220 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337  
1338 <        checkCompletedWithWrappedCFException(h, ex);
1339 <        checkCompletedWithWrappedCFException(g, ex);
1340 <        assertEquals(0, r.invocationCount);
1341 <        checkCompletedNormally(f, v1);
1338 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1339 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1340 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1341 >        checkIncomplete(h0);
1342 >        checkIncomplete(h1);
1343 >        checkIncomplete(h2);
1344 >        assertTrue(f.cancel(mayInterruptIfRunning));
1345 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1346 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1347 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1348 >
1349 >        checkCompletedWithWrappedCancellationException(h0);
1350 >        checkCompletedWithWrappedCancellationException(h1);
1351 >        checkCompletedWithWrappedCancellationException(h2);
1352 >        checkCompletedWithWrappedCancellationException(h3);
1353 >        checkCompletedWithWrappedCancellationException(h4);
1354 >        checkCompletedWithWrappedCancellationException(h5);
1355 >        checkCancelled(f);
1356 >        for (Noop r : rs) r.assertNotInvoked();
1357      }}
1358  
1359 <    public void testThenCombine_exceptionalCompletion4() {
1359 >    /**
1360 >     * thenRun result completes exceptionally if action does
1361 >     */
1362 >    public void testThenRun_actionFailed() {
1363          for (ExecutionMode m : ExecutionMode.values())
1364          for (Integer v1 : new Integer[] { 1, null })
1365      {
1366          final CompletableFuture<Integer> f = new CompletableFuture<>();
1367 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1368 <        final SubtractFunction r = new SubtractFunction();
1235 <        final CFException ex = new CFException();
1367 >        final FailingRunnable[] rs = new FailingRunnable[6];
1368 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369  
1370 <        f.completeExceptionally(ex);
1371 <        g.complete(v1);
1372 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1370 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1371 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1372 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1373 >        assertTrue(f.complete(v1));
1374 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1375 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1376 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1377  
1378 <        checkCompletedWithWrappedCFException(h, ex);
1379 <        checkCompletedWithWrappedCFException(f, ex);
1380 <        assertEquals(0, r.invocationCount);
1381 <        checkCompletedNormally(g, v1);
1378 >        checkCompletedWithWrappedCFException(h0);
1379 >        checkCompletedWithWrappedCFException(h1);
1380 >        checkCompletedWithWrappedCFException(h2);
1381 >        checkCompletedWithWrappedCFException(h3);
1382 >        checkCompletedWithWrappedCFException(h4);
1383 >        checkCompletedWithWrappedCFException(h5);
1384 >        checkCompletedNormally(f, v1);
1385      }}
1386  
1387      /**
1388 <     * thenCombine result completes exceptionally if action does
1388 >     * thenApply result completes normally after normal completion of source
1389       */
1390 <    public void testThenCombine_actionFailed1() {
1390 >    public void testThenApply_normalCompletion() {
1391          for (ExecutionMode m : ExecutionMode.values())
1392          for (Integer v1 : new Integer[] { 1, null })
1253        for (Integer v2 : new Integer[] { 2, null })
1393      {
1394          final CompletableFuture<Integer> f = new CompletableFuture<>();
1395 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1396 <        final FailingBiFunction r = new FailingBiFunction();
1258 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1395 >        final IncFunction[] rs = new IncFunction[4];
1396 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1397  
1398 <        f.complete(v1);
1399 <        checkIncomplete(h);
1400 <        g.complete(v2);
1398 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1399 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1400 >        checkIncomplete(h0);
1401 >        checkIncomplete(h1);
1402 >        assertTrue(f.complete(v1));
1403 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1404 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1405  
1406 <        checkCompletedWithWrappedCFException(h);
1406 >        checkCompletedNormally(h0, inc(v1));
1407 >        checkCompletedNormally(h1, inc(v1));
1408 >        checkCompletedNormally(h2, inc(v1));
1409 >        checkCompletedNormally(h3, inc(v1));
1410          checkCompletedNormally(f, v1);
1411 <        checkCompletedNormally(g, v2);
1411 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1412      }}
1413  
1414 <    public void testThenCombine_actionFailed2() {
1414 >    /**
1415 >     * thenApply result completes exceptionally after exceptional
1416 >     * completion of source
1417 >     */
1418 >    public void testThenApply_exceptionalCompletion() {
1419          for (ExecutionMode m : ExecutionMode.values())
1271        for (Integer v1 : new Integer[] { 1, null })
1272        for (Integer v2 : new Integer[] { 2, null })
1420      {
1421 +        final CFException ex = new CFException();
1422          final CompletableFuture<Integer> f = new CompletableFuture<>();
1423 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1424 <        final FailingBiFunction r = new FailingBiFunction();
1277 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1423 >        final IncFunction[] rs = new IncFunction[4];
1424 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1425  
1426 <        g.complete(v2);
1427 <        checkIncomplete(h);
1428 <        f.complete(v1);
1426 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1427 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1428 >        assertTrue(f.completeExceptionally(ex));
1429 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1430 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1431  
1432 <        checkCompletedWithWrappedCFException(h);
1433 <        checkCompletedNormally(f, v1);
1434 <        checkCompletedNormally(g, v2);
1432 >        checkCompletedWithWrappedException(h0, ex);
1433 >        checkCompletedWithWrappedException(h1, ex);
1434 >        checkCompletedWithWrappedException(h2, ex);
1435 >        checkCompletedWithWrappedException(h3, ex);
1436 >        checkCompletedExceptionally(f, ex);
1437 >        for (IncFunction r : rs) r.assertNotInvoked();
1438      }}
1439  
1440      /**
1441 <     * thenCombine result completes exceptionally if either source cancelled
1441 >     * thenApply result completes exceptionally if source cancelled
1442       */
1443 <    public void testThenCombine_sourceCancelled1() {
1443 >    public void testThenApply_sourceCancelled() {
1444          for (ExecutionMode m : ExecutionMode.values())
1445          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1294        for (Integer v1 : new Integer[] { 1, null })
1446      {
1447          final CompletableFuture<Integer> f = new CompletableFuture<>();
1448 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1449 <        final SubtractFunction r = new SubtractFunction();
1299 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1448 >        final IncFunction[] rs = new IncFunction[4];
1449 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1450  
1451 +        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1452 +        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1453          assertTrue(f.cancel(mayInterruptIfRunning));
1454 <        checkIncomplete(h);
1455 <        g.complete(v1);
1454 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1455 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1456  
1457 <        checkCompletedWithWrappedCancellationException(h);
1457 >        checkCompletedWithWrappedCancellationException(h0);
1458 >        checkCompletedWithWrappedCancellationException(h1);
1459 >        checkCompletedWithWrappedCancellationException(h2);
1460 >        checkCompletedWithWrappedCancellationException(h3);
1461          checkCancelled(f);
1462 <        assertEquals(0, r.invocationCount);
1308 <        checkCompletedNormally(g, v1);
1462 >        for (IncFunction r : rs) r.assertNotInvoked();
1463      }}
1464  
1465 <    public void testThenCombine_sourceCancelled2() {
1465 >    /**
1466 >     * thenApply result completes exceptionally if action does
1467 >     */
1468 >    public void testThenApply_actionFailed() {
1469          for (ExecutionMode m : ExecutionMode.values())
1313        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1470          for (Integer v1 : new Integer[] { 1, null })
1471      {
1472          final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1474 <        final SubtractFunction r = new SubtractFunction();
1319 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1473 >        final FailingFunction[] rs = new FailingFunction[4];
1474 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1475  
1476 <        assertTrue(g.cancel(mayInterruptIfRunning));
1477 <        checkIncomplete(h);
1478 <        f.complete(v1);
1476 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1477 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1478 >        assertTrue(f.complete(v1));
1479 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1480 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1481  
1482 <        checkCompletedWithWrappedCancellationException(h);
1483 <        checkCancelled(g);
1484 <        assertEquals(0, r.invocationCount);
1482 >        checkCompletedWithWrappedCFException(h0);
1483 >        checkCompletedWithWrappedCFException(h1);
1484 >        checkCompletedWithWrappedCFException(h2);
1485 >        checkCompletedWithWrappedCFException(h3);
1486          checkCompletedNormally(f, v1);
1487      }}
1488  
1489 <    public void testThenCombine_sourceCancelled3() {
1489 >    /**
1490 >     * thenAccept result completes normally after normal completion of source
1491 >     */
1492 >    public void testThenAccept_normalCompletion() {
1493          for (ExecutionMode m : ExecutionMode.values())
1333        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1494          for (Integer v1 : new Integer[] { 1, null })
1495      {
1496          final CompletableFuture<Integer> f = new CompletableFuture<>();
1497 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1498 <        final SubtractFunction r = new SubtractFunction();
1497 >        final NoopConsumer[] rs = new NoopConsumer[4];
1498 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1499  
1500 <        assertTrue(g.cancel(mayInterruptIfRunning));
1501 <        f.complete(v1);
1502 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1500 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1501 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1502 >        checkIncomplete(h0);
1503 >        checkIncomplete(h1);
1504 >        assertTrue(f.complete(v1));
1505 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1506 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1507  
1508 <        checkCompletedWithWrappedCancellationException(h);
1509 <        checkCancelled(g);
1510 <        assertEquals(0, r.invocationCount);
1508 >        checkCompletedNormally(h0, null);
1509 >        checkCompletedNormally(h1, null);
1510 >        checkCompletedNormally(h2, null);
1511 >        checkCompletedNormally(h3, null);
1512          checkCompletedNormally(f, v1);
1513 <    }}
1349 <
1350 <    public void testThenCombine_sourceCancelled4() {
1351 <        for (ExecutionMode m : ExecutionMode.values())
1352 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1353 <        for (Integer v1 : new Integer[] { 1, null })
1354 <    {
1355 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1356 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1357 <        final SubtractFunction r = new SubtractFunction();
1358 <
1359 <        assertTrue(f.cancel(mayInterruptIfRunning));
1360 <        g.complete(v1);
1361 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1362 <
1363 <        checkCompletedWithWrappedCancellationException(h);
1364 <        checkCancelled(f);
1365 <        assertEquals(0, r.invocationCount);
1366 <        checkCompletedNormally(g, v1);
1513 >        for (NoopConsumer r : rs) r.assertValue(v1);
1514      }}
1515  
1516      /**
1517 <     * thenAcceptBoth result completes normally after normal
1518 <     * completion of sources
1517 >     * thenAccept result completes exceptionally after exceptional
1518 >     * completion of source
1519       */
1520 <    public void testThenAcceptBoth_normalCompletion1() {
1520 >    public void testThenAccept_exceptionalCompletion() {
1521          for (ExecutionMode m : ExecutionMode.values())
1375        for (Integer v1 : new Integer[] { 1, null })
1376        for (Integer v2 : new Integer[] { 2, null })
1522      {
1523 +        final CFException ex = new CFException();
1524          final CompletableFuture<Integer> f = new CompletableFuture<>();
1525 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1526 <        final SubtractAction r = new SubtractAction();
1381 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1525 >        final NoopConsumer[] rs = new NoopConsumer[4];
1526 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1527  
1528 <        f.complete(v1);
1529 <        checkIncomplete(h);
1530 <        assertEquals(0, r.invocationCount);
1531 <        g.complete(v2);
1528 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1529 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1530 >        assertTrue(f.completeExceptionally(ex));
1531 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1532 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1533  
1534 <        checkCompletedNormally(h, null);
1535 <        assertEquals(subtract(v1, v2), r.value);
1536 <        checkCompletedNormally(f, v1);
1537 <        checkCompletedNormally(g, v2);
1534 >        checkCompletedWithWrappedException(h0, ex);
1535 >        checkCompletedWithWrappedException(h1, ex);
1536 >        checkCompletedWithWrappedException(h2, ex);
1537 >        checkCompletedWithWrappedException(h3, ex);
1538 >        checkCompletedExceptionally(f, ex);
1539 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1540      }}
1541  
1542 <    public void testThenAcceptBoth_normalCompletion2() {
1542 >    /**
1543 >     * thenAccept result completes exceptionally if source cancelled
1544 >     */
1545 >    public void testThenAccept_sourceCancelled() {
1546          for (ExecutionMode m : ExecutionMode.values())
1547 <        for (Integer v1 : new Integer[] { 1, null })
1397 <        for (Integer v2 : new Integer[] { 2, null })
1547 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1548      {
1549          final CompletableFuture<Integer> f = new CompletableFuture<>();
1550 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1551 <        final SubtractAction r = new SubtractAction();
1402 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1550 >        final NoopConsumer[] rs = new NoopConsumer[4];
1551 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1552  
1553 <        g.complete(v2);
1554 <        checkIncomplete(h);
1555 <        assertEquals(0, r.invocationCount);
1556 <        f.complete(v1);
1553 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1554 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1555 >        assertTrue(f.cancel(mayInterruptIfRunning));
1556 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1557 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1558  
1559 <        checkCompletedNormally(h, null);
1560 <        assertEquals(subtract(v1, v2), r.value);
1561 <        checkCompletedNormally(f, v1);
1562 <        checkCompletedNormally(g, v2);
1559 >        checkCompletedWithWrappedCancellationException(h0);
1560 >        checkCompletedWithWrappedCancellationException(h1);
1561 >        checkCompletedWithWrappedCancellationException(h2);
1562 >        checkCompletedWithWrappedCancellationException(h3);
1563 >        checkCancelled(f);
1564 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1565      }}
1566  
1567 <    public void testThenAcceptBoth_normalCompletion3() {
1567 >    /**
1568 >     * thenAccept result completes exceptionally if action does
1569 >     */
1570 >    public void testThenAccept_actionFailed() {
1571          for (ExecutionMode m : ExecutionMode.values())
1572          for (Integer v1 : new Integer[] { 1, null })
1418        for (Integer v2 : new Integer[] { 2, null })
1573      {
1574          final CompletableFuture<Integer> f = new CompletableFuture<>();
1575 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1576 <        final SubtractAction r = new SubtractAction();
1575 >        final FailingConsumer[] rs = new FailingConsumer[4];
1576 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1577  
1578 <        g.complete(v2);
1579 <        f.complete(v1);
1580 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1578 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1579 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1580 >        assertTrue(f.complete(v1));
1581 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1582 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1583  
1584 <        checkCompletedNormally(h, null);
1585 <        assertEquals(subtract(v1, v2), r.value);
1584 >        checkCompletedWithWrappedCFException(h0);
1585 >        checkCompletedWithWrappedCFException(h1);
1586 >        checkCompletedWithWrappedCFException(h2);
1587 >        checkCompletedWithWrappedCFException(h3);
1588          checkCompletedNormally(f, v1);
1431        checkCompletedNormally(g, v2);
1589      }}
1590  
1591 <    public void testThenAcceptBoth_normalCompletion4() {
1591 >    /**
1592 >     * thenCombine result completes normally after normal completion
1593 >     * of sources
1594 >     */
1595 >    public void testThenCombine_normalCompletion() {
1596          for (ExecutionMode m : ExecutionMode.values())
1597 +        for (boolean fFirst : new boolean[] { true, false })
1598          for (Integer v1 : new Integer[] { 1, null })
1599          for (Integer v2 : new Integer[] { 2, null })
1600      {
1601          final CompletableFuture<Integer> f = new CompletableFuture<>();
1602          final CompletableFuture<Integer> g = new CompletableFuture<>();
1603 <        final SubtractAction r = new SubtractAction();
1604 <
1605 <        f.complete(v1);
1606 <        g.complete(v2);
1607 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1608 <
1609 <        checkCompletedNormally(h, null);
1610 <        assertEquals(subtract(v1, v2), r.value);
1603 >        final SubtractFunction r1 = new SubtractFunction(m);
1604 >        final SubtractFunction r2 = new SubtractFunction(m);
1605 >        final SubtractFunction r3 = new SubtractFunction(m);
1606 >
1607 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1608 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1609 >        final Integer w1 =  fFirst ? v1 : v2;
1610 >        final Integer w2 = !fFirst ? v1 : v2;
1611 >
1612 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1613 >        assertTrue(fst.complete(w1));
1614 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1615 >        checkIncomplete(h1);
1616 >        checkIncomplete(h2);
1617 >        r1.assertNotInvoked();
1618 >        r2.assertNotInvoked();
1619 >        assertTrue(snd.complete(w2));
1620 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1621 >
1622 >        checkCompletedNormally(h1, subtract(v1, v2));
1623 >        checkCompletedNormally(h2, subtract(v1, v2));
1624 >        checkCompletedNormally(h3, subtract(v1, v2));
1625 >        r1.assertValue(subtract(v1, v2));
1626 >        r2.assertValue(subtract(v1, v2));
1627 >        r3.assertValue(subtract(v1, v2));
1628          checkCompletedNormally(f, v1);
1629          checkCompletedNormally(g, v2);
1630      }}
1631  
1632      /**
1633 <     * thenAcceptBoth result completes exceptionally after exceptional
1633 >     * thenCombine result completes exceptionally after exceptional
1634       * completion of either source
1635       */
1636 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1458 <        for (ExecutionMode m : ExecutionMode.values())
1459 <        for (Integer v1 : new Integer[] { 1, null })
1460 <    {
1461 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1462 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1463 <        final SubtractAction r = new SubtractAction();
1464 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1465 <        final CFException ex = new CFException();
1466 <
1467 <        f.completeExceptionally(ex);
1468 <        checkIncomplete(h);
1469 <        g.complete(v1);
1470 <
1471 <        checkCompletedWithWrappedCFException(h, ex);
1472 <        checkCompletedWithWrappedCFException(f, ex);
1473 <        assertEquals(0, r.invocationCount);
1474 <        checkCompletedNormally(g, v1);
1475 <    }}
1476 <
1477 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1478 <        for (ExecutionMode m : ExecutionMode.values())
1479 <        for (Integer v1 : new Integer[] { 1, null })
1480 <    {
1481 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1483 <        final SubtractAction r = new SubtractAction();
1484 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1485 <        final CFException ex = new CFException();
1486 <
1487 <        g.completeExceptionally(ex);
1488 <        checkIncomplete(h);
1489 <        f.complete(v1);
1490 <
1491 <        checkCompletedWithWrappedCFException(h, ex);
1492 <        checkCompletedWithWrappedCFException(g, ex);
1493 <        assertEquals(0, r.invocationCount);
1494 <        checkCompletedNormally(f, v1);
1495 <    }}
1496 <
1497 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1636 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1637          for (ExecutionMode m : ExecutionMode.values())
1638 +        for (boolean fFirst : new boolean[] { true, false })
1639 +        for (boolean failFirst : new boolean[] { true, false })
1640          for (Integer v1 : new Integer[] { 1, null })
1641      {
1642          final CompletableFuture<Integer> f = new CompletableFuture<>();
1643          final CompletableFuture<Integer> g = new CompletableFuture<>();
1503        final SubtractAction r = new SubtractAction();
1644          final CFException ex = new CFException();
1645 <
1646 <        g.completeExceptionally(ex);
1647 <        f.complete(v1);
1648 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1649 <
1650 <        checkCompletedWithWrappedCFException(h, ex);
1651 <        checkCompletedWithWrappedCFException(g, ex);
1652 <        assertEquals(0, r.invocationCount);
1653 <        checkCompletedNormally(f, v1);
1645 >        final SubtractFunction r1 = new SubtractFunction(m);
1646 >        final SubtractFunction r2 = new SubtractFunction(m);
1647 >        final SubtractFunction r3 = new SubtractFunction(m);
1648 >
1649 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1650 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1651 >        final Callable<Boolean> complete1 = failFirst ?
1652 >            () -> fst.completeExceptionally(ex) :
1653 >            () -> fst.complete(v1);
1654 >        final Callable<Boolean> complete2 = failFirst ?
1655 >            () -> snd.complete(v1) :
1656 >            () -> snd.completeExceptionally(ex);
1657 >
1658 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1659 >        assertTrue(complete1.call());
1660 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1661 >        checkIncomplete(h1);
1662 >        checkIncomplete(h2);
1663 >        assertTrue(complete2.call());
1664 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1665 >
1666 >        checkCompletedWithWrappedException(h1, ex);
1667 >        checkCompletedWithWrappedException(h2, ex);
1668 >        checkCompletedWithWrappedException(h3, ex);
1669 >        r1.assertNotInvoked();
1670 >        r2.assertNotInvoked();
1671 >        r3.assertNotInvoked();
1672 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1673 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1674      }}
1675  
1676 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1676 >    /**
1677 >     * thenCombine result completes exceptionally if either source cancelled
1678 >     */
1679 >    public void testThenCombine_sourceCancelled() throws Throwable {
1680          for (ExecutionMode m : ExecutionMode.values())
1681 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1682 +        for (boolean fFirst : new boolean[] { true, false })
1683 +        for (boolean failFirst : new boolean[] { true, false })
1684          for (Integer v1 : new Integer[] { 1, null })
1685      {
1686          final CompletableFuture<Integer> f = new CompletableFuture<>();
1687          final CompletableFuture<Integer> g = new CompletableFuture<>();
1688 <        final SubtractAction r = new SubtractAction();
1689 <        final CFException ex = new CFException();
1690 <
1691 <        f.completeExceptionally(ex);
1692 <        g.complete(v1);
1693 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1694 <
1695 <        checkCompletedWithWrappedCFException(h, ex);
1696 <        checkCompletedWithWrappedCFException(f, ex);
1697 <        assertEquals(0, r.invocationCount);
1698 <        checkCompletedNormally(g, v1);
1688 >        final SubtractFunction r1 = new SubtractFunction(m);
1689 >        final SubtractFunction r2 = new SubtractFunction(m);
1690 >        final SubtractFunction r3 = new SubtractFunction(m);
1691 >
1692 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1693 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1694 >        final Callable<Boolean> complete1 = failFirst ?
1695 >            () -> fst.cancel(mayInterruptIfRunning) :
1696 >            () -> fst.complete(v1);
1697 >        final Callable<Boolean> complete2 = failFirst ?
1698 >            () -> snd.complete(v1) :
1699 >            () -> snd.cancel(mayInterruptIfRunning);
1700 >
1701 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1702 >        assertTrue(complete1.call());
1703 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1704 >        checkIncomplete(h1);
1705 >        checkIncomplete(h2);
1706 >        assertTrue(complete2.call());
1707 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1708 >
1709 >        checkCompletedWithWrappedCancellationException(h1);
1710 >        checkCompletedWithWrappedCancellationException(h2);
1711 >        checkCompletedWithWrappedCancellationException(h3);
1712 >        r1.assertNotInvoked();
1713 >        r2.assertNotInvoked();
1714 >        r3.assertNotInvoked();
1715 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1716 >        checkCancelled(failFirst ? fst : snd);
1717      }}
1718  
1719      /**
1720 <     * thenAcceptBoth result completes exceptionally if action does
1720 >     * thenCombine result completes exceptionally if action does
1721       */
1722 <    public void testThenAcceptBoth_actionFailed1() {
1722 >    public void testThenCombine_actionFailed() {
1723          for (ExecutionMode m : ExecutionMode.values())
1724 +        for (boolean fFirst : new boolean[] { true, false })
1725          for (Integer v1 : new Integer[] { 1, null })
1726          for (Integer v2 : new Integer[] { 2, null })
1727      {
1728          final CompletableFuture<Integer> f = new CompletableFuture<>();
1729          final CompletableFuture<Integer> g = new CompletableFuture<>();
1730 <        final FailingBiConsumer r = new FailingBiConsumer();
1731 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1732 <
1733 <        f.complete(v1);
1734 <        checkIncomplete(h);
1735 <        g.complete(v2);
1736 <
1737 <        checkCompletedWithWrappedCFException(h);
1730 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1731 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1732 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1733 >
1734 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1735 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1736 >        final Integer w1 =  fFirst ? v1 : v2;
1737 >        final Integer w2 = !fFirst ? v1 : v2;
1738 >
1739 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1740 >        assertTrue(fst.complete(w1));
1741 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1742 >        assertTrue(snd.complete(w2));
1743 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1744 >
1745 >        checkCompletedWithWrappedCFException(h1);
1746 >        checkCompletedWithWrappedCFException(h2);
1747 >        checkCompletedWithWrappedCFException(h3);
1748 >        r1.assertInvoked();
1749 >        r2.assertInvoked();
1750 >        r3.assertInvoked();
1751          checkCompletedNormally(f, v1);
1752          checkCompletedNormally(g, v2);
1753      }}
1754  
1755 <    public void testThenAcceptBoth_actionFailed2() {
1755 >    /**
1756 >     * thenAcceptBoth result completes normally after normal
1757 >     * completion of sources
1758 >     */
1759 >    public void testThenAcceptBoth_normalCompletion() {
1760          for (ExecutionMode m : ExecutionMode.values())
1761 +        for (boolean fFirst : new boolean[] { true, false })
1762          for (Integer v1 : new Integer[] { 1, null })
1763          for (Integer v2 : new Integer[] { 2, null })
1764      {
1765          final CompletableFuture<Integer> f = new CompletableFuture<>();
1766          final CompletableFuture<Integer> g = new CompletableFuture<>();
1767 <        final FailingBiConsumer r = new FailingBiConsumer();
1768 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1769 <
1770 <        g.complete(v2);
1771 <        checkIncomplete(h);
1772 <        f.complete(v1);
1773 <
1774 <        checkCompletedWithWrappedCFException(h);
1767 >        final SubtractAction r1 = new SubtractAction(m);
1768 >        final SubtractAction r2 = new SubtractAction(m);
1769 >        final SubtractAction r3 = new SubtractAction(m);
1770 >
1771 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1772 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1773 >        final Integer w1 =  fFirst ? v1 : v2;
1774 >        final Integer w2 = !fFirst ? v1 : v2;
1775 >
1776 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1777 >        assertTrue(fst.complete(w1));
1778 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1779 >        checkIncomplete(h1);
1780 >        checkIncomplete(h2);
1781 >        r1.assertNotInvoked();
1782 >        r2.assertNotInvoked();
1783 >        assertTrue(snd.complete(w2));
1784 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1785 >
1786 >        checkCompletedNormally(h1, null);
1787 >        checkCompletedNormally(h2, null);
1788 >        checkCompletedNormally(h3, null);
1789 >        r1.assertValue(subtract(v1, v2));
1790 >        r2.assertValue(subtract(v1, v2));
1791 >        r3.assertValue(subtract(v1, v2));
1792          checkCompletedNormally(f, v1);
1793          checkCompletedNormally(g, v2);
1794      }}
1795  
1796      /**
1797 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1797 >     * thenAcceptBoth result completes exceptionally after exceptional
1798 >     * completion of either source
1799       */
1800 <    public void testThenAcceptBoth_sourceCancelled1() {
1800 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1801          for (ExecutionMode m : ExecutionMode.values())
1802 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1803 <        for (Integer v1 : new Integer[] { 1, null })
1583 <    {
1584 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1585 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1586 <        final SubtractAction r = new SubtractAction();
1587 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1588 <
1589 <        assertTrue(f.cancel(mayInterruptIfRunning));
1590 <        checkIncomplete(h);
1591 <        g.complete(v1);
1592 <
1593 <        checkCompletedWithWrappedCancellationException(h);
1594 <        checkCancelled(f);
1595 <        assertEquals(0, r.invocationCount);
1596 <        checkCompletedNormally(g, v1);
1597 <    }}
1598 <
1599 <    public void testThenAcceptBoth_sourceCancelled2() {
1600 <        for (ExecutionMode m : ExecutionMode.values())
1601 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1602 <        for (Integer v1 : new Integer[] { 1, null })
1603 <    {
1604 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1605 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1606 <        final SubtractAction r = new SubtractAction();
1607 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1608 <
1609 <        assertTrue(g.cancel(mayInterruptIfRunning));
1610 <        checkIncomplete(h);
1611 <        f.complete(v1);
1612 <
1613 <        checkCompletedWithWrappedCancellationException(h);
1614 <        checkCancelled(g);
1615 <        assertEquals(0, r.invocationCount);
1616 <        checkCompletedNormally(f, v1);
1617 <    }}
1618 <
1619 <    public void testThenAcceptBoth_sourceCancelled3() {
1620 <        for (ExecutionMode m : ExecutionMode.values())
1621 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1802 >        for (boolean fFirst : new boolean[] { true, false })
1803 >        for (boolean failFirst : new boolean[] { true, false })
1804          for (Integer v1 : new Integer[] { 1, null })
1805      {
1806          final CompletableFuture<Integer> f = new CompletableFuture<>();
1807          final CompletableFuture<Integer> g = new CompletableFuture<>();
1808 <        final SubtractAction r = new SubtractAction();
1809 <
1810 <        assertTrue(g.cancel(mayInterruptIfRunning));
1811 <        f.complete(v1);
1812 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1813 <
1814 <        checkCompletedWithWrappedCancellationException(h);
1815 <        checkCancelled(g);
1816 <        assertEquals(0, r.invocationCount);
1817 <        checkCompletedNormally(f, v1);
1808 >        final CFException ex = new CFException();
1809 >        final SubtractAction r1 = new SubtractAction(m);
1810 >        final SubtractAction r2 = new SubtractAction(m);
1811 >        final SubtractAction r3 = new SubtractAction(m);
1812 >
1813 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1814 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1815 >        final Callable<Boolean> complete1 = failFirst ?
1816 >            () -> fst.completeExceptionally(ex) :
1817 >            () -> fst.complete(v1);
1818 >        final Callable<Boolean> complete2 = failFirst ?
1819 >            () -> snd.complete(v1) :
1820 >            () -> snd.completeExceptionally(ex);
1821 >
1822 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1823 >        assertTrue(complete1.call());
1824 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1825 >        checkIncomplete(h1);
1826 >        checkIncomplete(h2);
1827 >        assertTrue(complete2.call());
1828 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1829 >
1830 >        checkCompletedWithWrappedException(h1, ex);
1831 >        checkCompletedWithWrappedException(h2, ex);
1832 >        checkCompletedWithWrappedException(h3, ex);
1833 >        r1.assertNotInvoked();
1834 >        r2.assertNotInvoked();
1835 >        r3.assertNotInvoked();
1836 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1837 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1838      }}
1839  
1840 <    public void testThenAcceptBoth_sourceCancelled4() {
1840 >    /**
1841 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1842 >     */
1843 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1844          for (ExecutionMode m : ExecutionMode.values())
1845          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1846 +        for (boolean fFirst : new boolean[] { true, false })
1847 +        for (boolean failFirst : new boolean[] { true, false })
1848          for (Integer v1 : new Integer[] { 1, null })
1849      {
1850          final CompletableFuture<Integer> f = new CompletableFuture<>();
1851          final CompletableFuture<Integer> g = new CompletableFuture<>();
1852 <        final SubtractAction r = new SubtractAction();
1853 <
1854 <        assertTrue(f.cancel(mayInterruptIfRunning));
1855 <        g.complete(v1);
1856 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1857 <
1858 <        checkCompletedWithWrappedCancellationException(h);
1859 <        checkCancelled(f);
1860 <        assertEquals(0, r.invocationCount);
1861 <        checkCompletedNormally(g, v1);
1852 >        final SubtractAction r1 = new SubtractAction(m);
1853 >        final SubtractAction r2 = new SubtractAction(m);
1854 >        final SubtractAction r3 = new SubtractAction(m);
1855 >
1856 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1857 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1858 >        final Callable<Boolean> complete1 = failFirst ?
1859 >            () -> fst.cancel(mayInterruptIfRunning) :
1860 >            () -> fst.complete(v1);
1861 >        final Callable<Boolean> complete2 = failFirst ?
1862 >            () -> snd.complete(v1) :
1863 >            () -> snd.cancel(mayInterruptIfRunning);
1864 >
1865 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1866 >        assertTrue(complete1.call());
1867 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1868 >        checkIncomplete(h1);
1869 >        checkIncomplete(h2);
1870 >        assertTrue(complete2.call());
1871 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1872 >
1873 >        checkCompletedWithWrappedCancellationException(h1);
1874 >        checkCompletedWithWrappedCancellationException(h2);
1875 >        checkCompletedWithWrappedCancellationException(h3);
1876 >        r1.assertNotInvoked();
1877 >        r2.assertNotInvoked();
1878 >        r3.assertNotInvoked();
1879 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1880 >        checkCancelled(failFirst ? fst : snd);
1881      }}
1882  
1883      /**
1884 <     * runAfterBoth result completes normally after normal
1659 <     * completion of sources
1884 >     * thenAcceptBoth result completes exceptionally if action does
1885       */
1886 <    public void testRunAfterBoth_normalCompletion1() {
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 Noop r = new Noop();
1669 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1670 <
1671 <        f.complete(v1);
1672 <        checkIncomplete(h);
1673 <        assertEquals(0, r.invocationCount);
1674 <        g.complete(v2);
1675 <
1676 <        checkCompletedNormally(h, null);
1677 <        assertEquals(1, r.invocationCount);
1678 <        checkCompletedNormally(f, v1);
1679 <        checkCompletedNormally(g, v2);
1680 <    }}
1681 <
1682 <    public void testRunAfterBoth_normalCompletion2() {
1683 <        for (ExecutionMode m : ExecutionMode.values())
1684 <        for (Integer v1 : new Integer[] { 1, null })
1685 <        for (Integer v2 : new Integer[] { 2, null })
1686 <    {
1687 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1688 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1689 <        final Noop r = new Noop();
1690 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1691 <
1692 <        g.complete(v2);
1693 <        checkIncomplete(h);
1694 <        assertEquals(0, r.invocationCount);
1695 <        f.complete(v1);
1696 <
1697 <        checkCompletedNormally(h, null);
1698 <        assertEquals(1, r.invocationCount);
1699 <        checkCompletedNormally(f, v1);
1700 <        checkCompletedNormally(g, v2);
1701 <    }}
1702 <
1703 <    public void testRunAfterBoth_normalCompletion3() {
1886 >    public void testThenAcceptBoth_actionFailed() {
1887          for (ExecutionMode m : ExecutionMode.values())
1888 +        for (boolean fFirst : new boolean[] { true, false })
1889          for (Integer v1 : new Integer[] { 1, null })
1890          for (Integer v2 : new Integer[] { 2, null })
1891      {
1892          final CompletableFuture<Integer> f = new CompletableFuture<>();
1893          final CompletableFuture<Integer> g = new CompletableFuture<>();
1894 <        final Noop r = new Noop();
1895 <
1896 <        g.complete(v2);
1897 <        f.complete(v1);
1898 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1899 <
1900 <        checkCompletedNormally(h, null);
1901 <        assertEquals(1, r.invocationCount);
1894 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1895 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1896 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1897 >
1898 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1899 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1900 >        final Integer w1 =  fFirst ? v1 : v2;
1901 >        final Integer w2 = !fFirst ? v1 : v2;
1902 >
1903 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1904 >        assertTrue(fst.complete(w1));
1905 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1906 >        assertTrue(snd.complete(w2));
1907 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1908 >
1909 >        checkCompletedWithWrappedCFException(h1);
1910 >        checkCompletedWithWrappedCFException(h2);
1911 >        checkCompletedWithWrappedCFException(h3);
1912 >        r1.assertInvoked();
1913 >        r2.assertInvoked();
1914 >        r3.assertInvoked();
1915          checkCompletedNormally(f, v1);
1916          checkCompletedNormally(g, v2);
1917      }}
1918  
1919 <    public void testRunAfterBoth_normalCompletion4() {
1919 >    /**
1920 >     * runAfterBoth result completes normally after normal
1921 >     * completion of sources
1922 >     */
1923 >    public void testRunAfterBoth_normalCompletion() {
1924          for (ExecutionMode m : ExecutionMode.values())
1925 +        for (boolean fFirst : new boolean[] { true, false })
1926          for (Integer v1 : new Integer[] { 1, null })
1927          for (Integer v2 : new Integer[] { 2, null })
1928      {
1929          final CompletableFuture<Integer> f = new CompletableFuture<>();
1930          final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 <        final Noop r = new Noop();
1932 <
1933 <        f.complete(v1);
1934 <        g.complete(v2);
1935 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1936 <
1937 <        checkCompletedNormally(h, null);
1938 <        assertEquals(1, r.invocationCount);
1931 >        final Noop r1 = new Noop(m);
1932 >        final Noop r2 = new Noop(m);
1933 >        final Noop r3 = new Noop(m);
1934 >
1935 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1936 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1937 >        final Integer w1 =  fFirst ? v1 : v2;
1938 >        final Integer w2 = !fFirst ? v1 : v2;
1939 >
1940 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1941 >        assertTrue(fst.complete(w1));
1942 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1943 >        checkIncomplete(h1);
1944 >        checkIncomplete(h2);
1945 >        r1.assertNotInvoked();
1946 >        r2.assertNotInvoked();
1947 >        assertTrue(snd.complete(w2));
1948 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1949 >
1950 >        checkCompletedNormally(h1, null);
1951 >        checkCompletedNormally(h2, null);
1952 >        checkCompletedNormally(h3, null);
1953 >        r1.assertInvoked();
1954 >        r2.assertInvoked();
1955 >        r3.assertInvoked();
1956          checkCompletedNormally(f, v1);
1957          checkCompletedNormally(g, v2);
1958      }}
# Line 1742 | Line 1961 | public class CompletableFutureTest exten
1961       * runAfterBoth result completes exceptionally after exceptional
1962       * completion of either source
1963       */
1964 <    public void testRunAfterBoth_exceptionalCompletion1() {
1746 <        for (ExecutionMode m : ExecutionMode.values())
1747 <        for (Integer v1 : new Integer[] { 1, null })
1748 <    {
1749 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1750 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1751 <        final Noop r = new Noop();
1752 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1753 <        final CFException ex = new CFException();
1754 <
1755 <        f.completeExceptionally(ex);
1756 <        checkIncomplete(h);
1757 <        g.complete(v1);
1758 <
1759 <        checkCompletedWithWrappedCFException(h, ex);
1760 <        checkCompletedWithWrappedCFException(f, ex);
1761 <        assertEquals(0, r.invocationCount);
1762 <        checkCompletedNormally(g, v1);
1763 <    }}
1764 <
1765 <    public void testRunAfterBoth_exceptionalCompletion2() {
1766 <        for (ExecutionMode m : ExecutionMode.values())
1767 <        for (Integer v1 : new Integer[] { 1, null })
1768 <    {
1769 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1770 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1771 <        final Noop r = new Noop();
1772 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1773 <        final CFException ex = new CFException();
1774 <
1775 <        g.completeExceptionally(ex);
1776 <        checkIncomplete(h);
1777 <        f.complete(v1);
1778 <
1779 <        checkCompletedWithWrappedCFException(h, ex);
1780 <        checkCompletedWithWrappedCFException(g, ex);
1781 <        assertEquals(0, r.invocationCount);
1782 <        checkCompletedNormally(f, v1);
1783 <    }}
1784 <
1785 <    public void testRunAfterBoth_exceptionalCompletion3() {
1964 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1965          for (ExecutionMode m : ExecutionMode.values())
1966 +        for (boolean fFirst : new boolean[] { true, false })
1967 +        for (boolean failFirst : new boolean[] { true, false })
1968          for (Integer v1 : new Integer[] { 1, null })
1969      {
1970          final CompletableFuture<Integer> f = new CompletableFuture<>();
1971          final CompletableFuture<Integer> g = new CompletableFuture<>();
1791        final Noop r = new Noop();
1972          final CFException ex = new CFException();
1973 <
1974 <        g.completeExceptionally(ex);
1975 <        f.complete(v1);
1976 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1977 <
1978 <        checkCompletedWithWrappedCFException(h, ex);
1979 <        checkCompletedWithWrappedCFException(g, ex);
1980 <        assertEquals(0, r.invocationCount);
1981 <        checkCompletedNormally(f, v1);
1973 >        final Noop r1 = new Noop(m);
1974 >        final Noop r2 = new Noop(m);
1975 >        final Noop r3 = new Noop(m);
1976 >
1977 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1978 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1979 >        final Callable<Boolean> complete1 = failFirst ?
1980 >            () -> fst.completeExceptionally(ex) :
1981 >            () -> fst.complete(v1);
1982 >        final Callable<Boolean> complete2 = failFirst ?
1983 >            () -> snd.complete(v1) :
1984 >            () -> snd.completeExceptionally(ex);
1985 >
1986 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1987 >        assertTrue(complete1.call());
1988 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1989 >        checkIncomplete(h1);
1990 >        checkIncomplete(h2);
1991 >        assertTrue(complete2.call());
1992 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1993 >
1994 >        checkCompletedWithWrappedException(h1, ex);
1995 >        checkCompletedWithWrappedException(h2, ex);
1996 >        checkCompletedWithWrappedException(h3, ex);
1997 >        r1.assertNotInvoked();
1998 >        r2.assertNotInvoked();
1999 >        r3.assertNotInvoked();
2000 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2001 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2002      }}
2003  
2004 <    public void testRunAfterBoth_exceptionalCompletion4() {
2004 >    /**
2005 >     * runAfterBoth result completes exceptionally if either source cancelled
2006 >     */
2007 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2008          for (ExecutionMode m : ExecutionMode.values())
2009 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2010 +        for (boolean fFirst : new boolean[] { true, false })
2011 +        for (boolean failFirst : new boolean[] { true, false })
2012          for (Integer v1 : new Integer[] { 1, null })
2013      {
2014          final CompletableFuture<Integer> f = new CompletableFuture<>();
2015          final CompletableFuture<Integer> g = new CompletableFuture<>();
2016 <        final Noop r = new Noop();
2017 <        final CFException ex = new CFException();
2018 <
2019 <        f.completeExceptionally(ex);
2020 <        g.complete(v1);
2021 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2022 <
2023 <        checkCompletedWithWrappedCFException(h, ex);
2024 <        checkCompletedWithWrappedCFException(f, ex);
2025 <        assertEquals(0, r.invocationCount);
2026 <        checkCompletedNormally(g, v1);
2016 >        final Noop r1 = new Noop(m);
2017 >        final Noop r2 = new Noop(m);
2018 >        final Noop r3 = new Noop(m);
2019 >
2020 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2021 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2022 >        final Callable<Boolean> complete1 = failFirst ?
2023 >            () -> fst.cancel(mayInterruptIfRunning) :
2024 >            () -> fst.complete(v1);
2025 >        final Callable<Boolean> complete2 = failFirst ?
2026 >            () -> snd.complete(v1) :
2027 >            () -> snd.cancel(mayInterruptIfRunning);
2028 >
2029 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2030 >        assertTrue(complete1.call());
2031 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2032 >        checkIncomplete(h1);
2033 >        checkIncomplete(h2);
2034 >        assertTrue(complete2.call());
2035 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2036 >
2037 >        checkCompletedWithWrappedCancellationException(h1);
2038 >        checkCompletedWithWrappedCancellationException(h2);
2039 >        checkCompletedWithWrappedCancellationException(h3);
2040 >        r1.assertNotInvoked();
2041 >        r2.assertNotInvoked();
2042 >        r3.assertNotInvoked();
2043 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2044 >        checkCancelled(failFirst ? fst : snd);
2045      }}
2046  
2047      /**
2048       * runAfterBoth result completes exceptionally if action does
2049       */
2050 <    public void testRunAfterBoth_actionFailed1() {
1827 <        for (ExecutionMode m : ExecutionMode.values())
1828 <        for (Integer v1 : new Integer[] { 1, null })
1829 <        for (Integer v2 : new Integer[] { 2, null })
1830 <    {
1831 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1832 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1833 <        final FailingNoop r = new FailingNoop();
1834 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1835 <
1836 <        f.complete(v1);
1837 <        checkIncomplete(h);
1838 <        g.complete(v2);
1839 <
1840 <        checkCompletedWithWrappedCFException(h);
1841 <        checkCompletedNormally(f, v1);
1842 <        checkCompletedNormally(g, v2);
1843 <    }}
1844 <
1845 <    public void testRunAfterBoth_actionFailed2() {
2050 >    public void testRunAfterBoth_actionFailed() {
2051          for (ExecutionMode m : ExecutionMode.values())
2052 +        for (boolean fFirst : new boolean[] { true, false })
2053          for (Integer v1 : new Integer[] { 1, null })
2054          for (Integer v2 : new Integer[] { 2, null })
2055      {
2056          final CompletableFuture<Integer> f = new CompletableFuture<>();
2057          final CompletableFuture<Integer> g = new CompletableFuture<>();
2058 <        final FailingNoop r = new FailingNoop();
2059 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2060 <
2061 <        g.complete(v2);
2062 <        checkIncomplete(h);
2063 <        f.complete(v1);
2064 <
2065 <        checkCompletedWithWrappedCFException(h);
2058 >        final FailingRunnable r1 = new FailingRunnable(m);
2059 >        final FailingRunnable r2 = new FailingRunnable(m);
2060 >        final FailingRunnable r3 = new FailingRunnable(m);
2061 >
2062 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2063 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2064 >        final Integer w1 =  fFirst ? v1 : v2;
2065 >        final Integer w2 = !fFirst ? v1 : v2;
2066 >
2067 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2068 >        assertTrue(fst.complete(w1));
2069 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2070 >        assertTrue(snd.complete(w2));
2071 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2072 >
2073 >        checkCompletedWithWrappedCFException(h1);
2074 >        checkCompletedWithWrappedCFException(h2);
2075 >        checkCompletedWithWrappedCFException(h3);
2076 >        r1.assertInvoked();
2077 >        r2.assertInvoked();
2078 >        r3.assertInvoked();
2079          checkCompletedNormally(f, v1);
2080          checkCompletedNormally(g, v2);
2081      }}
2082  
2083      /**
1865     * runAfterBoth result completes exceptionally if either source cancelled
1866     */
1867    public void testRunAfterBoth_sourceCancelled1() {
1868        for (ExecutionMode m : ExecutionMode.values())
1869        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1870        for (Integer v1 : new Integer[] { 1, null })
1871    {
1872        final CompletableFuture<Integer> f = new CompletableFuture<>();
1873        final CompletableFuture<Integer> g = new CompletableFuture<>();
1874        final Noop r = new Noop();
1875        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1876
1877        assertTrue(f.cancel(mayInterruptIfRunning));
1878        checkIncomplete(h);
1879        g.complete(v1);
1880
1881        checkCompletedWithWrappedCancellationException(h);
1882        checkCancelled(f);
1883        assertEquals(0, r.invocationCount);
1884        checkCompletedNormally(g, v1);
1885    }}
1886
1887    public void testRunAfterBoth_sourceCancelled2() {
1888        for (ExecutionMode m : ExecutionMode.values())
1889        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1890        for (Integer v1 : new Integer[] { 1, null })
1891    {
1892        final CompletableFuture<Integer> f = new CompletableFuture<>();
1893        final CompletableFuture<Integer> g = new CompletableFuture<>();
1894        final Noop r = new Noop();
1895        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1896
1897        assertTrue(g.cancel(mayInterruptIfRunning));
1898        checkIncomplete(h);
1899        f.complete(v1);
1900
1901        checkCompletedWithWrappedCancellationException(h);
1902        checkCancelled(g);
1903        assertEquals(0, r.invocationCount);
1904        checkCompletedNormally(f, v1);
1905    }}
1906
1907    public void testRunAfterBoth_sourceCancelled3() {
1908        for (ExecutionMode m : ExecutionMode.values())
1909        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1910        for (Integer v1 : new Integer[] { 1, null })
1911    {
1912        final CompletableFuture<Integer> f = new CompletableFuture<>();
1913        final CompletableFuture<Integer> g = new CompletableFuture<>();
1914        final Noop r = new Noop();
1915
1916        assertTrue(g.cancel(mayInterruptIfRunning));
1917        f.complete(v1);
1918        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1919
1920        checkCompletedWithWrappedCancellationException(h);
1921        checkCancelled(g);
1922        assertEquals(0, r.invocationCount);
1923        checkCompletedNormally(f, v1);
1924    }}
1925
1926    public void testRunAfterBoth_sourceCancelled4() {
1927        for (ExecutionMode m : ExecutionMode.values())
1928        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1929        for (Integer v1 : new Integer[] { 1, null })
1930    {
1931        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932        final CompletableFuture<Integer> g = new CompletableFuture<>();
1933        final Noop r = new Noop();
1934
1935        assertTrue(f.cancel(mayInterruptIfRunning));
1936        g.complete(v1);
1937        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1938
1939        checkCompletedWithWrappedCancellationException(h);
1940        checkCancelled(f);
1941        assertEquals(0, r.invocationCount);
1942        checkCompletedNormally(g, v1);
1943    }}
1944
1945    /**
2084       * applyToEither result completes normally after normal completion
2085       * of either source
2086       */
2087 <    public void testApplyToEither_normalCompletion1() {
2087 >    public void testApplyToEither_normalCompletion() {
2088          for (ExecutionMode m : ExecutionMode.values())
2089          for (Integer v1 : new Integer[] { 1, null })
2090          for (Integer v2 : new Integer[] { 2, null })
2091      {
2092          final CompletableFuture<Integer> f = new CompletableFuture<>();
2093          final CompletableFuture<Integer> g = new CompletableFuture<>();
2094 <        final IncFunction r = new IncFunction();
2095 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2094 >        final IncFunction[] rs = new IncFunction[6];
2095 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2096  
2097 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2098 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2099 +        checkIncomplete(h0);
2100 +        checkIncomplete(h1);
2101 +        rs[0].assertNotInvoked();
2102 +        rs[1].assertNotInvoked();
2103          f.complete(v1);
2104 <        checkCompletedNormally(h, inc(v1));
2104 >        checkCompletedNormally(h0, inc(v1));
2105 >        checkCompletedNormally(h1, inc(v1));
2106 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2107 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2108 >        checkCompletedNormally(h2, inc(v1));
2109 >        checkCompletedNormally(h3, inc(v1));
2110          g.complete(v2);
2111  
2112 <        checkCompletedNormally(f, v1);
2113 <        checkCompletedNormally(g, v2);
2114 <        checkCompletedNormally(h, inc(v1));
2115 <    }}
2116 <
2117 <    public void testApplyToEither_normalCompletion2() {
2118 <        for (ExecutionMode m : ExecutionMode.values())
2119 <        for (Integer v1 : new Integer[] { 1, null })
2120 <        for (Integer v2 : new Integer[] { 2, null })
1972 <    {
1973 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1974 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1975 <        final IncFunction r = new IncFunction();
1976 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1977 <
1978 <        g.complete(v2);
1979 <        checkCompletedNormally(h, inc(v2));
1980 <        f.complete(v1);
1981 <
1982 <        checkCompletedNormally(f, v1);
1983 <        checkCompletedNormally(g, v2);
1984 <        checkCompletedNormally(h, inc(v2));
1985 <        }}
1986 <
1987 <    public void testApplyToEither_normalCompletion3() {
1988 <        for (ExecutionMode m : ExecutionMode.values())
1989 <        for (Integer v1 : new Integer[] { 1, null })
1990 <        for (Integer v2 : new Integer[] { 2, null })
1991 <    {
1992 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1993 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1994 <        final IncFunction r = new IncFunction();
1995 <
1996 <        f.complete(v1);
1997 <        g.complete(v2);
1998 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2112 >        // unspecified behavior - both source completions available
2113 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2114 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2115 >        rs[4].assertValue(h4.join());
2116 >        rs[5].assertValue(h5.join());
2117 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2118 >                   Objects.equals(inc(v2), h4.join()));
2119 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2120 >                   Objects.equals(inc(v2), h5.join()));
2121  
2122          checkCompletedNormally(f, v1);
2123          checkCompletedNormally(g, v2);
2124 <
2125 <        // unspecified behavior
2126 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2127 <                   Objects.equals(h.join(), inc(v2)));
2128 <        assertEquals(1, r.invocationCount);
2124 >        checkCompletedNormally(h0, inc(v1));
2125 >        checkCompletedNormally(h1, inc(v1));
2126 >        checkCompletedNormally(h2, inc(v1));
2127 >        checkCompletedNormally(h3, inc(v1));
2128 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2129      }}
2130  
2131      /**
2132       * applyToEither result completes exceptionally after exceptional
2133       * completion of either source
2134       */
2135 <    public void testApplyToEither_exceptionalCompletion1() {
2135 >    public void testApplyToEither_exceptionalCompletion() {
2136          for (ExecutionMode m : ExecutionMode.values())
2137          for (Integer v1 : new Integer[] { 1, null })
2138      {
2139          final CompletableFuture<Integer> f = new CompletableFuture<>();
2140          final CompletableFuture<Integer> g = new CompletableFuture<>();
2019        final IncFunction r = new IncFunction();
2020        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2141          final CFException ex = new CFException();
2142 +        final IncFunction[] rs = new IncFunction[6];
2143 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2144  
2145 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2146 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2147 +        checkIncomplete(h0);
2148 +        checkIncomplete(h1);
2149 +        rs[0].assertNotInvoked();
2150 +        rs[1].assertNotInvoked();
2151          f.completeExceptionally(ex);
2152 <        checkCompletedWithWrappedCFException(h, ex);
2152 >        checkCompletedWithWrappedException(h0, ex);
2153 >        checkCompletedWithWrappedException(h1, ex);
2154 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2155 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2156 >        checkCompletedWithWrappedException(h2, ex);
2157 >        checkCompletedWithWrappedException(h3, ex);
2158          g.complete(v1);
2159  
2160 <        assertEquals(0, r.invocationCount);
2160 >        // unspecified behavior - both source completions available
2161 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2162 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2163 >        try {
2164 >            assertEquals(inc(v1), h4.join());
2165 >            rs[4].assertValue(inc(v1));
2166 >        } catch (CompletionException ok) {
2167 >            checkCompletedWithWrappedException(h4, ex);
2168 >            rs[4].assertNotInvoked();
2169 >        }
2170 >        try {
2171 >            assertEquals(inc(v1), h5.join());
2172 >            rs[5].assertValue(inc(v1));
2173 >        } catch (CompletionException ok) {
2174 >            checkCompletedWithWrappedException(h5, ex);
2175 >            rs[5].assertNotInvoked();
2176 >        }
2177 >
2178 >        checkCompletedExceptionally(f, ex);
2179          checkCompletedNormally(g, v1);
2180 <        checkCompletedWithWrappedCFException(f, ex);
2181 <        checkCompletedWithWrappedCFException(h, ex);
2180 >        checkCompletedWithWrappedException(h0, ex);
2181 >        checkCompletedWithWrappedException(h1, ex);
2182 >        checkCompletedWithWrappedException(h2, ex);
2183 >        checkCompletedWithWrappedException(h3, ex);
2184 >        checkCompletedWithWrappedException(h4, ex);
2185 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2186      }}
2187  
2188      public void testApplyToEither_exceptionalCompletion2() {
2189          for (ExecutionMode m : ExecutionMode.values())
2190 +        for (boolean fFirst : new boolean[] { true, false })
2191          for (Integer v1 : new Integer[] { 1, null })
2192      {
2193          final CompletableFuture<Integer> f = new CompletableFuture<>();
2194          final CompletableFuture<Integer> g = new CompletableFuture<>();
2039        final IncFunction r = new IncFunction();
2040        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2041        final CFException ex = new CFException();
2042
2043        g.completeExceptionally(ex);
2044        checkCompletedWithWrappedCFException(h, ex);
2045        f.complete(v1);
2046
2047        assertEquals(0, r.invocationCount);
2048        checkCompletedNormally(f, v1);
2049        checkCompletedWithWrappedCFException(g, ex);
2050        checkCompletedWithWrappedCFException(h, ex);
2051    }}
2052
2053    public void testApplyToEither_exceptionalCompletion3() {
2054        for (ExecutionMode m : ExecutionMode.values())
2055        for (Integer v1 : new Integer[] { 1, null })
2056    {
2057        final CompletableFuture<Integer> f = new CompletableFuture<>();
2058        final CompletableFuture<Integer> g = new CompletableFuture<>();
2059        final IncFunction r = new IncFunction();
2195          final CFException ex = new CFException();
2196 +        final IncFunction[] rs = new IncFunction[6];
2197 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2198  
2199 <        g.completeExceptionally(ex);
2200 <        f.complete(v1);
2201 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2199 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2200 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2201 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2202 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2203 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2204 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2205  
2206 <        // unspecified behavior
2067 <        Integer v;
2206 >        // unspecified behavior - both source completions available
2207          try {
2208 <            assertEquals(inc(v1), h.join());
2209 <            assertEquals(1, r.invocationCount);
2208 >            assertEquals(inc(v1), h0.join());
2209 >            rs[0].assertValue(inc(v1));
2210          } catch (CompletionException ok) {
2211 <            checkCompletedWithWrappedCFException(h, ex);
2212 <            assertEquals(0, r.invocationCount);
2211 >            checkCompletedWithWrappedException(h0, ex);
2212 >            rs[0].assertNotInvoked();
2213          }
2075
2076        checkCompletedWithWrappedCFException(g, ex);
2077        checkCompletedNormally(f, v1);
2078    }}
2079
2080    public void testApplyToEither_exceptionalCompletion4() {
2081        for (ExecutionMode m : ExecutionMode.values())
2082        for (Integer v1 : new Integer[] { 1, null })
2083    {
2084        final CompletableFuture<Integer> f = new CompletableFuture<>();
2085        final CompletableFuture<Integer> g = new CompletableFuture<>();
2086        final IncFunction r = new IncFunction();
2087        final CFException ex = new CFException();
2088
2089        f.completeExceptionally(ex);
2090        g.complete(v1);
2091        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2092
2093        // unspecified behavior
2094        Integer v;
2214          try {
2215 <            assertEquals(inc(v1), h.join());
2216 <            assertEquals(1, r.invocationCount);
2215 >            assertEquals(inc(v1), h1.join());
2216 >            rs[1].assertValue(inc(v1));
2217          } catch (CompletionException ok) {
2218 <            checkCompletedWithWrappedCFException(h, ex);
2219 <            assertEquals(0, r.invocationCount);
2218 >            checkCompletedWithWrappedException(h1, ex);
2219 >            rs[1].assertNotInvoked();
2220 >        }
2221 >        try {
2222 >            assertEquals(inc(v1), h2.join());
2223 >            rs[2].assertValue(inc(v1));
2224 >        } catch (CompletionException ok) {
2225 >            checkCompletedWithWrappedException(h2, ex);
2226 >            rs[2].assertNotInvoked();
2227 >        }
2228 >        try {
2229 >            assertEquals(inc(v1), h3.join());
2230 >            rs[3].assertValue(inc(v1));
2231 >        } catch (CompletionException ok) {
2232 >            checkCompletedWithWrappedException(h3, ex);
2233 >            rs[3].assertNotInvoked();
2234          }
2235  
2103        checkCompletedWithWrappedCFException(f, ex);
2104        checkCompletedNormally(g, v1);
2105    }}
2106
2107    /**
2108     * applyToEither result completes exceptionally if action does
2109     */
2110    public void testApplyToEither_actionFailed1() {
2111        for (ExecutionMode m : ExecutionMode.values())
2112        for (Integer v1 : new Integer[] { 1, null })
2113        for (Integer v2 : new Integer[] { 2, null })
2114    {
2115        final CompletableFuture<Integer> f = new CompletableFuture<>();
2116        final CompletableFuture<Integer> g = new CompletableFuture<>();
2117        final FailingFunction r = new FailingFunction();
2118        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2119
2120        f.complete(v1);
2121        checkCompletedWithWrappedCFException(h);
2122        g.complete(v2);
2123        checkCompletedNormally(f, v1);
2124        checkCompletedNormally(g, v2);
2125    }}
2126
2127    public void testApplyToEither_actionFailed2() {
2128        for (ExecutionMode m : ExecutionMode.values())
2129        for (Integer v1 : new Integer[] { 1, null })
2130        for (Integer v2 : new Integer[] { 2, null })
2131    {
2132        final CompletableFuture<Integer> f = new CompletableFuture<>();
2133        final CompletableFuture<Integer> g = new CompletableFuture<>();
2134        final FailingFunction r = new FailingFunction();
2135        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2136
2137        g.complete(v2);
2138        checkCompletedWithWrappedCFException(h);
2139        f.complete(v1);
2236          checkCompletedNormally(f, v1);
2237 <        checkCompletedNormally(g, v2);
2237 >        checkCompletedExceptionally(g, ex);
2238      }}
2239  
2240      /**
2241       * applyToEither result completes exceptionally if either source cancelled
2242       */
2243 <    public void testApplyToEither_sourceCancelled1() {
2243 >    public void testApplyToEither_sourceCancelled() {
2244          for (ExecutionMode m : ExecutionMode.values())
2245          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2246          for (Integer v1 : new Integer[] { 1, null })
2247      {
2248          final CompletableFuture<Integer> f = new CompletableFuture<>();
2249          final CompletableFuture<Integer> g = new CompletableFuture<>();
2250 <        final IncFunction r = new IncFunction();
2251 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2250 >        final IncFunction[] rs = new IncFunction[6];
2251 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2252  
2253 <        assertTrue(f.cancel(mayInterruptIfRunning));
2254 <        checkCompletedWithWrappedCancellationException(h);
2253 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2254 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2255 >        checkIncomplete(h0);
2256 >        checkIncomplete(h1);
2257 >        rs[0].assertNotInvoked();
2258 >        rs[1].assertNotInvoked();
2259 >        f.cancel(mayInterruptIfRunning);
2260 >        checkCompletedWithWrappedCancellationException(h0);
2261 >        checkCompletedWithWrappedCancellationException(h1);
2262 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2263 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2264 >        checkCompletedWithWrappedCancellationException(h2);
2265 >        checkCompletedWithWrappedCancellationException(h3);
2266          g.complete(v1);
2267  
2268 +        // unspecified behavior - both source completions available
2269 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2270 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2271 +        try {
2272 +            assertEquals(inc(v1), h4.join());
2273 +            rs[4].assertValue(inc(v1));
2274 +        } catch (CompletionException ok) {
2275 +            checkCompletedWithWrappedCancellationException(h4);
2276 +            rs[4].assertNotInvoked();
2277 +        }
2278 +        try {
2279 +            assertEquals(inc(v1), h5.join());
2280 +            rs[5].assertValue(inc(v1));
2281 +        } catch (CompletionException ok) {
2282 +            checkCompletedWithWrappedCancellationException(h5);
2283 +            rs[5].assertNotInvoked();
2284 +        }
2285 +
2286          checkCancelled(f);
2162        assertEquals(0, r.invocationCount);
2287          checkCompletedNormally(g, v1);
2288 <        checkCompletedWithWrappedCancellationException(h);
2288 >        checkCompletedWithWrappedCancellationException(h0);
2289 >        checkCompletedWithWrappedCancellationException(h1);
2290 >        checkCompletedWithWrappedCancellationException(h2);
2291 >        checkCompletedWithWrappedCancellationException(h3);
2292 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2293      }}
2294  
2295      public void testApplyToEither_sourceCancelled2() {
2296          for (ExecutionMode m : ExecutionMode.values())
2297          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2298 +        for (boolean fFirst : new boolean[] { true, false })
2299          for (Integer v1 : new Integer[] { 1, null })
2300      {
2301          final CompletableFuture<Integer> f = new CompletableFuture<>();
2302          final CompletableFuture<Integer> g = new CompletableFuture<>();
2303 <        final IncFunction r = new IncFunction();
2304 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2176 <
2177 <        assertTrue(g.cancel(mayInterruptIfRunning));
2178 <        checkCompletedWithWrappedCancellationException(h);
2179 <        f.complete(v1);
2180 <
2181 <        checkCancelled(g);
2182 <        assertEquals(0, r.invocationCount);
2183 <        checkCompletedNormally(f, v1);
2184 <        checkCompletedWithWrappedCancellationException(h);
2185 <    }}
2186 <
2187 <    public void testApplyToEither_sourceCancelled3() {
2188 <        for (ExecutionMode m : ExecutionMode.values())
2189 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2190 <        for (Integer v1 : new Integer[] { 1, null })
2191 <    {
2192 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2193 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2194 <        final IncFunction r = new IncFunction();
2303 >        final IncFunction[] rs = new IncFunction[6];
2304 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2305  
2306 <        assertTrue(g.cancel(mayInterruptIfRunning));
2307 <        f.complete(v1);
2308 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2306 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2307 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2308 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2309 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2310 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2311 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2312  
2313 <        // unspecified behavior
2201 <        Integer v;
2313 >        // unspecified behavior - both source completions available
2314          try {
2315 <            assertEquals(inc(v1), h.join());
2316 <            assertEquals(1, r.invocationCount);
2315 >            assertEquals(inc(v1), h0.join());
2316 >            rs[0].assertValue(inc(v1));
2317          } catch (CompletionException ok) {
2318 <            checkCompletedWithWrappedCancellationException(h);
2319 <            assertEquals(0, r.invocationCount);
2318 >            checkCompletedWithWrappedCancellationException(h0);
2319 >            rs[0].assertNotInvoked();
2320          }
2209
2210        checkCancelled(g);
2211        checkCompletedNormally(f, v1);
2212    }}
2213
2214    public void testApplyToEither_sourceCancelled4() {
2215        for (ExecutionMode m : ExecutionMode.values())
2216        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2217        for (Integer v1 : new Integer[] { 1, null })
2218    {
2219        final CompletableFuture<Integer> f = new CompletableFuture<>();
2220        final CompletableFuture<Integer> g = new CompletableFuture<>();
2221        final IncFunction r = new IncFunction();
2222
2223        assertTrue(f.cancel(mayInterruptIfRunning));
2224        g.complete(v1);
2225        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2226
2227        // unspecified behavior
2228        Integer v;
2321          try {
2322 <            assertEquals(inc(v1), h.join());
2323 <            assertEquals(1, r.invocationCount);
2322 >            assertEquals(inc(v1), h1.join());
2323 >            rs[1].assertValue(inc(v1));
2324          } catch (CompletionException ok) {
2325 <            checkCompletedWithWrappedCancellationException(h);
2326 <            assertEquals(0, r.invocationCount);
2325 >            checkCompletedWithWrappedCancellationException(h1);
2326 >            rs[1].assertNotInvoked();
2327 >        }
2328 >        try {
2329 >            assertEquals(inc(v1), h2.join());
2330 >            rs[2].assertValue(inc(v1));
2331 >        } catch (CompletionException ok) {
2332 >            checkCompletedWithWrappedCancellationException(h2);
2333 >            rs[2].assertNotInvoked();
2334 >        }
2335 >        try {
2336 >            assertEquals(inc(v1), h3.join());
2337 >            rs[3].assertValue(inc(v1));
2338 >        } catch (CompletionException ok) {
2339 >            checkCompletedWithWrappedCancellationException(h3);
2340 >            rs[3].assertNotInvoked();
2341          }
2342  
2343 <        checkCancelled(f);
2344 <        checkCompletedNormally(g, v1);
2343 >        checkCompletedNormally(f, v1);
2344 >        checkCancelled(g);
2345      }}
2346  
2347      /**
2348 <     * acceptEither result completes normally after normal completion
2243 <     * of either source
2348 >     * applyToEither result completes exceptionally if action does
2349       */
2350 <    public void testAcceptEither_normalCompletion1() {
2350 >    public void testApplyToEither_actionFailed() {
2351          for (ExecutionMode m : ExecutionMode.values())
2352          for (Integer v1 : new Integer[] { 1, null })
2353          for (Integer v2 : new Integer[] { 2, null })
2354      {
2355          final CompletableFuture<Integer> f = new CompletableFuture<>();
2356          final CompletableFuture<Integer> g = new CompletableFuture<>();
2357 <        final IncAction r = new IncAction();
2358 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2357 >        final FailingFunction[] rs = new FailingFunction[6];
2358 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2359  
2360 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2361 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2362          f.complete(v1);
2363 <        checkCompletedNormally(h, null);
2364 <        assertEquals(inc(v1), r.value);
2363 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2364 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2365 >        checkCompletedWithWrappedCFException(h0);
2366 >        checkCompletedWithWrappedCFException(h1);
2367 >        checkCompletedWithWrappedCFException(h2);
2368 >        checkCompletedWithWrappedCFException(h3);
2369 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2370 >
2371          g.complete(v2);
2372  
2373 <        checkCompletedNormally(f, v1);
2374 <        checkCompletedNormally(g, v2);
2375 <        checkCompletedNormally(h, null);
2263 <    }}
2373 >        // unspecified behavior - both source completions available
2374 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2375 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2376  
2377 <    public void testAcceptEither_normalCompletion2() {
2378 <        for (ExecutionMode m : ExecutionMode.values())
2379 <        for (Integer v1 : new Integer[] { 1, null })
2380 <        for (Integer v2 : new Integer[] { 2, null })
2381 <    {
2382 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2271 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2272 <        final IncAction r = new IncAction();
2273 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2274 <
2275 <        g.complete(v2);
2276 <        checkCompletedNormally(h, null);
2277 <        assertEquals(inc(v2), r.value);
2278 <        f.complete(v1);
2377 >        checkCompletedWithWrappedCFException(h4);
2378 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2379 >                   Objects.equals(v2, rs[4].value));
2380 >        checkCompletedWithWrappedCFException(h5);
2381 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2382 >                   Objects.equals(v2, rs[5].value));
2383  
2384          checkCompletedNormally(f, v1);
2385          checkCompletedNormally(g, v2);
2282        checkCompletedNormally(h, null);
2386      }}
2387  
2388 <    public void testAcceptEither_normalCompletion3() {
2388 >    /**
2389 >     * acceptEither result completes normally after normal completion
2390 >     * of either source
2391 >     */
2392 >    public void testAcceptEither_normalCompletion() {
2393          for (ExecutionMode m : ExecutionMode.values())
2394          for (Integer v1 : new Integer[] { 1, null })
2395          for (Integer v2 : new Integer[] { 2, null })
2396      {
2397          final CompletableFuture<Integer> f = new CompletableFuture<>();
2398          final CompletableFuture<Integer> g = new CompletableFuture<>();
2399 <        final IncAction r = new IncAction();
2399 >        final NoopConsumer[] rs = new NoopConsumer[6];
2400 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2401  
2402 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2403 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2404 +        checkIncomplete(h0);
2405 +        checkIncomplete(h1);
2406 +        rs[0].assertNotInvoked();
2407 +        rs[1].assertNotInvoked();
2408          f.complete(v1);
2409 +        checkCompletedNormally(h0, null);
2410 +        checkCompletedNormally(h1, null);
2411 +        rs[0].assertValue(v1);
2412 +        rs[1].assertValue(v1);
2413 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2414 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2415 +        checkCompletedNormally(h2, null);
2416 +        checkCompletedNormally(h3, null);
2417 +        rs[2].assertValue(v1);
2418 +        rs[3].assertValue(v1);
2419          g.complete(v2);
2296        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2420  
2421 <        checkCompletedNormally(h, null);
2421 >        // unspecified behavior - both source completions available
2422 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2423 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2424 >        checkCompletedNormally(h4, null);
2425 >        checkCompletedNormally(h5, null);
2426 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2427 >                   Objects.equals(v2, rs[4].value));
2428 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2429 >                   Objects.equals(v2, rs[5].value));
2430 >
2431          checkCompletedNormally(f, v1);
2432          checkCompletedNormally(g, v2);
2433 <
2434 <        // unspecified behavior
2435 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2436 <                   Objects.equals(r.value, inc(v2)));
2433 >        checkCompletedNormally(h0, null);
2434 >        checkCompletedNormally(h1, null);
2435 >        checkCompletedNormally(h2, null);
2436 >        checkCompletedNormally(h3, null);
2437 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2438      }}
2439  
2440      /**
2441       * acceptEither result completes exceptionally after exceptional
2442       * completion of either source
2443       */
2444 <    public void testAcceptEither_exceptionalCompletion1() {
2444 >    public void testAcceptEither_exceptionalCompletion() {
2445          for (ExecutionMode m : ExecutionMode.values())
2446          for (Integer v1 : new Integer[] { 1, null })
2447      {
2448          final CompletableFuture<Integer> f = new CompletableFuture<>();
2449          final CompletableFuture<Integer> g = new CompletableFuture<>();
2317        final IncAction r = new IncAction();
2318        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2450          final CFException ex = new CFException();
2451 +        final NoopConsumer[] rs = new NoopConsumer[6];
2452 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2453  
2454 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2455 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2456 +        checkIncomplete(h0);
2457 +        checkIncomplete(h1);
2458 +        rs[0].assertNotInvoked();
2459 +        rs[1].assertNotInvoked();
2460          f.completeExceptionally(ex);
2461 <        checkCompletedWithWrappedCFException(h, ex);
2461 >        checkCompletedWithWrappedException(h0, ex);
2462 >        checkCompletedWithWrappedException(h1, ex);
2463 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2464 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2465 >        checkCompletedWithWrappedException(h2, ex);
2466 >        checkCompletedWithWrappedException(h3, ex);
2467 >
2468          g.complete(v1);
2469  
2470 <        assertEquals(0, r.invocationCount);
2470 >        // unspecified behavior - both source completions available
2471 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2472 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2473 >        try {
2474 >            assertNull(h4.join());
2475 >            rs[4].assertValue(v1);
2476 >        } catch (CompletionException ok) {
2477 >            checkCompletedWithWrappedException(h4, ex);
2478 >            rs[4].assertNotInvoked();
2479 >        }
2480 >        try {
2481 >            assertNull(h5.join());
2482 >            rs[5].assertValue(v1);
2483 >        } catch (CompletionException ok) {
2484 >            checkCompletedWithWrappedException(h5, ex);
2485 >            rs[5].assertNotInvoked();
2486 >        }
2487 >
2488 >        checkCompletedExceptionally(f, ex);
2489          checkCompletedNormally(g, v1);
2490 <        checkCompletedWithWrappedCFException(f, ex);
2491 <        checkCompletedWithWrappedCFException(h, ex);
2490 >        checkCompletedWithWrappedException(h0, ex);
2491 >        checkCompletedWithWrappedException(h1, ex);
2492 >        checkCompletedWithWrappedException(h2, ex);
2493 >        checkCompletedWithWrappedException(h3, ex);
2494 >        checkCompletedWithWrappedException(h4, ex);
2495 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2496      }}
2497  
2498      public void testAcceptEither_exceptionalCompletion2() {
2499          for (ExecutionMode m : ExecutionMode.values())
2500 +        for (boolean fFirst : new boolean[] { true, false })
2501          for (Integer v1 : new Integer[] { 1, null })
2502      {
2503          final CompletableFuture<Integer> f = new CompletableFuture<>();
2504          final CompletableFuture<Integer> g = new CompletableFuture<>();
2337        final IncAction r = new IncAction();
2338        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2339        final CFException ex = new CFException();
2340
2341        g.completeExceptionally(ex);
2342        checkCompletedWithWrappedCFException(h, ex);
2343        f.complete(v1);
2344
2345        assertEquals(0, r.invocationCount);
2346        checkCompletedNormally(f, v1);
2347        checkCompletedWithWrappedCFException(g, ex);
2348        checkCompletedWithWrappedCFException(h, ex);
2349    }}
2350
2351    public void testAcceptEither_exceptionalCompletion3() {
2352        for (ExecutionMode m : ExecutionMode.values())
2353        for (Integer v1 : new Integer[] { 1, null })
2354    {
2355        final CompletableFuture<Integer> f = new CompletableFuture<>();
2356        final CompletableFuture<Integer> g = new CompletableFuture<>();
2357        final IncAction r = new IncAction();
2505          final CFException ex = new CFException();
2506 +        final NoopConsumer[] rs = new NoopConsumer[6];
2507 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2508  
2509 <        g.completeExceptionally(ex);
2510 <        f.complete(v1);
2511 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2509 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2510 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2511 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2512 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2513 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2514 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2515  
2516 <        // unspecified behavior
2365 <        Integer v;
2516 >        // unspecified behavior - both source completions available
2517          try {
2518 <            assertNull(h.join());
2519 <            assertEquals(1, r.invocationCount);
2369 <            assertEquals(inc(v1), r.value);
2518 >            assertEquals(null, h0.join());
2519 >            rs[0].assertValue(v1);
2520          } catch (CompletionException ok) {
2521 <            checkCompletedWithWrappedCFException(h, ex);
2522 <            assertEquals(0, r.invocationCount);
2521 >            checkCompletedWithWrappedException(h0, ex);
2522 >            rs[0].assertNotInvoked();
2523          }
2374
2375        checkCompletedWithWrappedCFException(g, ex);
2376        checkCompletedNormally(f, v1);
2377    }}
2378
2379    public void testAcceptEither_exceptionalCompletion4() {
2380        for (ExecutionMode m : ExecutionMode.values())
2381        for (Integer v1 : new Integer[] { 1, null })
2382    {
2383        final CompletableFuture<Integer> f = new CompletableFuture<>();
2384        final CompletableFuture<Integer> g = new CompletableFuture<>();
2385        final IncAction r = new IncAction();
2386        final CFException ex = new CFException();
2387
2388        f.completeExceptionally(ex);
2389        g.complete(v1);
2390        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2391
2392        // unspecified behavior
2393        Integer v;
2524          try {
2525 <            assertNull(h.join());
2526 <            assertEquals(1, r.invocationCount);
2397 <            assertEquals(inc(v1), r.value);
2525 >            assertEquals(null, h1.join());
2526 >            rs[1].assertValue(v1);
2527          } catch (CompletionException ok) {
2528 <            checkCompletedWithWrappedCFException(h, ex);
2529 <            assertEquals(0, r.invocationCount);
2528 >            checkCompletedWithWrappedException(h1, ex);
2529 >            rs[1].assertNotInvoked();
2530 >        }
2531 >        try {
2532 >            assertEquals(null, h2.join());
2533 >            rs[2].assertValue(v1);
2534 >        } catch (CompletionException ok) {
2535 >            checkCompletedWithWrappedException(h2, ex);
2536 >            rs[2].assertNotInvoked();
2537 >        }
2538 >        try {
2539 >            assertEquals(null, h3.join());
2540 >            rs[3].assertValue(v1);
2541 >        } catch (CompletionException ok) {
2542 >            checkCompletedWithWrappedException(h3, ex);
2543 >            rs[3].assertNotInvoked();
2544          }
2545  
2403        checkCompletedWithWrappedCFException(f, ex);
2404        checkCompletedNormally(g, v1);
2405    }}
2406
2407    /**
2408     * acceptEither result completes exceptionally if action does
2409     */
2410    public void testAcceptEither_actionFailed1() {
2411        for (ExecutionMode m : ExecutionMode.values())
2412        for (Integer v1 : new Integer[] { 1, null })
2413        for (Integer v2 : new Integer[] { 2, null })
2414    {
2415        final CompletableFuture<Integer> f = new CompletableFuture<>();
2416        final CompletableFuture<Integer> g = new CompletableFuture<>();
2417        final FailingConsumer r = new FailingConsumer();
2418        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2419
2420        f.complete(v1);
2421        checkCompletedWithWrappedCFException(h);
2422        g.complete(v2);
2423        checkCompletedNormally(f, v1);
2424        checkCompletedNormally(g, v2);
2425    }}
2426
2427    public void testAcceptEither_actionFailed2() {
2428        for (ExecutionMode m : ExecutionMode.values())
2429        for (Integer v1 : new Integer[] { 1, null })
2430        for (Integer v2 : new Integer[] { 2, null })
2431    {
2432        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434        final FailingConsumer r = new FailingConsumer();
2435        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2436
2437        g.complete(v2);
2438        checkCompletedWithWrappedCFException(h);
2439        f.complete(v1);
2546          checkCompletedNormally(f, v1);
2547 <        checkCompletedNormally(g, v2);
2547 >        checkCompletedExceptionally(g, ex);
2548      }}
2549  
2550      /**
2551       * acceptEither result completes exceptionally if either source cancelled
2552       */
2553 <    public void testAcceptEither_sourceCancelled1() {
2448 <        for (ExecutionMode m : ExecutionMode.values())
2449 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2450 <        for (Integer v1 : new Integer[] { 1, null })
2451 <    {
2452 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2453 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2454 <        final IncAction r = new IncAction();
2455 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2456 <
2457 <        assertTrue(f.cancel(mayInterruptIfRunning));
2458 <        checkCompletedWithWrappedCancellationException(h);
2459 <        g.complete(v1);
2460 <
2461 <        checkCancelled(f);
2462 <        assertEquals(0, r.invocationCount);
2463 <        checkCompletedNormally(g, v1);
2464 <        checkCompletedWithWrappedCancellationException(h);
2465 <    }}
2466 <
2467 <    public void testAcceptEither_sourceCancelled2() {
2553 >    public void testAcceptEither_sourceCancelled() {
2554          for (ExecutionMode m : ExecutionMode.values())
2555          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2556          for (Integer v1 : new Integer[] { 1, null })
2557      {
2558          final CompletableFuture<Integer> f = new CompletableFuture<>();
2559          final CompletableFuture<Integer> g = new CompletableFuture<>();
2560 <        final IncAction r = new IncAction();
2561 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2560 >        final NoopConsumer[] rs = new NoopConsumer[6];
2561 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2562  
2563 <        assertTrue(g.cancel(mayInterruptIfRunning));
2564 <        checkCompletedWithWrappedCancellationException(h);
2565 <        f.complete(v1);
2563 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2564 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2565 >        checkIncomplete(h0);
2566 >        checkIncomplete(h1);
2567 >        rs[0].assertNotInvoked();
2568 >        rs[1].assertNotInvoked();
2569 >        f.cancel(mayInterruptIfRunning);
2570 >        checkCompletedWithWrappedCancellationException(h0);
2571 >        checkCompletedWithWrappedCancellationException(h1);
2572 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2573 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2574 >        checkCompletedWithWrappedCancellationException(h2);
2575 >        checkCompletedWithWrappedCancellationException(h3);
2576  
2577 <        checkCancelled(g);
2482 <        assertEquals(0, r.invocationCount);
2483 <        checkCompletedNormally(f, v1);
2484 <        checkCompletedWithWrappedCancellationException(h);
2485 <    }}
2486 <
2487 <    public void testAcceptEither_sourceCancelled3() {
2488 <        for (ExecutionMode m : ExecutionMode.values())
2489 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2490 <        for (Integer v1 : new Integer[] { 1, null })
2491 <    {
2492 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2493 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2494 <        final IncAction r = new IncAction();
2495 <
2496 <        assertTrue(g.cancel(mayInterruptIfRunning));
2497 <        f.complete(v1);
2498 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2577 >        g.complete(v1);
2578  
2579 <        // unspecified behavior
2580 <        Integer v;
2579 >        // unspecified behavior - both source completions available
2580 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2581 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2582          try {
2583 <            assertNull(h.join());
2584 <            assertEquals(1, r.invocationCount);
2505 <            assertEquals(inc(v1), r.value);
2583 >            assertNull(h4.join());
2584 >            rs[4].assertValue(v1);
2585          } catch (CompletionException ok) {
2586 <            checkCompletedWithWrappedCancellationException(h);
2587 <            assertEquals(0, r.invocationCount);
2586 >            checkCompletedWithWrappedCancellationException(h4);
2587 >            rs[4].assertNotInvoked();
2588          }
2510
2511        checkCancelled(g);
2512        checkCompletedNormally(f, v1);
2513    }}
2514
2515    public void testAcceptEither_sourceCancelled4() {
2516        for (ExecutionMode m : ExecutionMode.values())
2517        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2518        for (Integer v1 : new Integer[] { 1, null })
2519    {
2520        final CompletableFuture<Integer> f = new CompletableFuture<>();
2521        final CompletableFuture<Integer> g = new CompletableFuture<>();
2522        final IncAction r = new IncAction();
2523
2524        assertTrue(f.cancel(mayInterruptIfRunning));
2525        g.complete(v1);
2526        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2527
2528        // unspecified behavior
2529        Integer v;
2589          try {
2590 <            assertNull(h.join());
2591 <            assertEquals(1, r.invocationCount);
2533 <            assertEquals(inc(v1), r.value);
2590 >            assertNull(h5.join());
2591 >            rs[5].assertValue(v1);
2592          } catch (CompletionException ok) {
2593 <            checkCompletedWithWrappedCancellationException(h);
2594 <            assertEquals(0, r.invocationCount);
2593 >            checkCompletedWithWrappedCancellationException(h5);
2594 >            rs[5].assertNotInvoked();
2595          }
2596  
2597          checkCancelled(f);
2598          checkCompletedNormally(g, v1);
2599 +        checkCompletedWithWrappedCancellationException(h0);
2600 +        checkCompletedWithWrappedCancellationException(h1);
2601 +        checkCompletedWithWrappedCancellationException(h2);
2602 +        checkCompletedWithWrappedCancellationException(h3);
2603 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2604      }}
2605  
2606      /**
2607 <     * runAfterEither result completes normally after normal completion
2545 <     * of either source
2607 >     * acceptEither result completes exceptionally if action does
2608       */
2609 <    public void testRunAfterEither_normalCompletion1() {
2609 >    public void testAcceptEither_actionFailed() {
2610          for (ExecutionMode m : ExecutionMode.values())
2611          for (Integer v1 : new Integer[] { 1, null })
2612          for (Integer v2 : new Integer[] { 2, null })
2613      {
2614          final CompletableFuture<Integer> f = new CompletableFuture<>();
2615          final CompletableFuture<Integer> g = new CompletableFuture<>();
2616 <        final Noop r = new Noop();
2617 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2616 >        final FailingConsumer[] rs = new FailingConsumer[6];
2617 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2618  
2619 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2620 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2621          f.complete(v1);
2622 <        checkCompletedNormally(h, null);
2623 <        assertEquals(1, r.invocationCount);
2622 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2623 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2624 >        checkCompletedWithWrappedCFException(h0);
2625 >        checkCompletedWithWrappedCFException(h1);
2626 >        checkCompletedWithWrappedCFException(h2);
2627 >        checkCompletedWithWrappedCFException(h3);
2628 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2629 >
2630          g.complete(v2);
2631  
2632 <        checkCompletedNormally(f, v1);
2633 <        checkCompletedNormally(g, v2);
2634 <        checkCompletedNormally(h, null);
2565 <        assertEquals(1, r.invocationCount);
2566 <    }}
2632 >        // unspecified behavior - both source completions available
2633 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2634 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2635  
2636 <    public void testRunAfterEither_normalCompletion2() {
2637 <        for (ExecutionMode m : ExecutionMode.values())
2638 <        for (Integer v1 : new Integer[] { 1, null })
2639 <        for (Integer v2 : new Integer[] { 2, null })
2640 <    {
2641 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2574 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2575 <        final Noop r = new Noop();
2576 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2577 <
2578 <        g.complete(v2);
2579 <        checkCompletedNormally(h, null);
2580 <        assertEquals(1, r.invocationCount);
2581 <        f.complete(v1);
2636 >        checkCompletedWithWrappedCFException(h4);
2637 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2638 >                   Objects.equals(v2, rs[4].value));
2639 >        checkCompletedWithWrappedCFException(h5);
2640 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2641 >                   Objects.equals(v2, rs[5].value));
2642  
2643          checkCompletedNormally(f, v1);
2644          checkCompletedNormally(g, v2);
2645 <        checkCompletedNormally(h, null);
2586 <        assertEquals(1, r.invocationCount);
2587 <        }}
2645 >    }}
2646  
2647 <    public void testRunAfterEither_normalCompletion3() {
2647 >    /**
2648 >     * runAfterEither result completes normally after normal completion
2649 >     * of either source
2650 >     */
2651 >    public void testRunAfterEither_normalCompletion() {
2652          for (ExecutionMode m : ExecutionMode.values())
2653          for (Integer v1 : new Integer[] { 1, null })
2654          for (Integer v2 : new Integer[] { 2, null })
2655      {
2656          final CompletableFuture<Integer> f = new CompletableFuture<>();
2657          final CompletableFuture<Integer> g = new CompletableFuture<>();
2658 <        final Noop r = new Noop();
2658 >        final Noop[] rs = new Noop[6];
2659 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2660  
2661 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2662 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2663 +        checkIncomplete(h0);
2664 +        checkIncomplete(h1);
2665 +        rs[0].assertNotInvoked();
2666 +        rs[1].assertNotInvoked();
2667          f.complete(v1);
2668 +        checkCompletedNormally(h0, null);
2669 +        checkCompletedNormally(h1, null);
2670 +        rs[0].assertInvoked();
2671 +        rs[1].assertInvoked();
2672 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2673 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2674 +        checkCompletedNormally(h2, null);
2675 +        checkCompletedNormally(h3, null);
2676 +        rs[2].assertInvoked();
2677 +        rs[3].assertInvoked();
2678 +
2679          g.complete(v2);
2600        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2680  
2681 <        checkCompletedNormally(h, null);
2681 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2682 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2683 >
2684          checkCompletedNormally(f, v1);
2685          checkCompletedNormally(g, v2);
2686 <        assertEquals(1, r.invocationCount);
2686 >        checkCompletedNormally(h0, null);
2687 >        checkCompletedNormally(h1, null);
2688 >        checkCompletedNormally(h2, null);
2689 >        checkCompletedNormally(h3, null);
2690 >        checkCompletedNormally(h4, null);
2691 >        checkCompletedNormally(h5, null);
2692 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2693      }}
2694  
2695      /**
2696       * runAfterEither result completes exceptionally after exceptional
2697       * completion of either source
2698       */
2699 <    public void testRunAfterEither_exceptionalCompletion1() {
2613 <        for (ExecutionMode m : ExecutionMode.values())
2614 <        for (Integer v1 : new Integer[] { 1, null })
2615 <    {
2616 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2617 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2618 <        final Noop r = new Noop();
2619 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2620 <        final CFException ex = new CFException();
2621 <
2622 <        f.completeExceptionally(ex);
2623 <        checkCompletedWithWrappedCFException(h, ex);
2624 <        g.complete(v1);
2625 <
2626 <        assertEquals(0, r.invocationCount);
2627 <        checkCompletedNormally(g, v1);
2628 <        checkCompletedWithWrappedCFException(f, ex);
2629 <        checkCompletedWithWrappedCFException(h, ex);
2630 <    }}
2631 <
2632 <    public void testRunAfterEither_exceptionalCompletion2() {
2699 >    public void testRunAfterEither_exceptionalCompletion() {
2700          for (ExecutionMode m : ExecutionMode.values())
2701          for (Integer v1 : new Integer[] { 1, null })
2702      {
2703          final CompletableFuture<Integer> f = new CompletableFuture<>();
2704          final CompletableFuture<Integer> g = new CompletableFuture<>();
2638        final Noop r = new Noop();
2639        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2705          final CFException ex = new CFException();
2706 +        final Noop[] rs = new Noop[6];
2707 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2708  
2709 <        g.completeExceptionally(ex);
2710 <        checkCompletedWithWrappedCFException(h, ex);
2711 <        f.complete(v1);
2712 <
2713 <        assertEquals(0, r.invocationCount);
2714 <        checkCompletedNormally(f, v1);
2715 <        checkCompletedWithWrappedCFException(g, ex);
2716 <        checkCompletedWithWrappedCFException(h, ex);
2717 <    }}
2718 <
2719 <    public void testRunAfterEither_exceptionalCompletion3() {
2720 <        for (ExecutionMode m : ExecutionMode.values())
2721 <        for (Integer v1 : new Integer[] { 1, null })
2655 <    {
2656 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2657 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2658 <        final Noop r = new Noop();
2659 <        final CFException ex = new CFException();
2709 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2710 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2711 >        checkIncomplete(h0);
2712 >        checkIncomplete(h1);
2713 >        rs[0].assertNotInvoked();
2714 >        rs[1].assertNotInvoked();
2715 >        assertTrue(f.completeExceptionally(ex));
2716 >        checkCompletedWithWrappedException(h0, ex);
2717 >        checkCompletedWithWrappedException(h1, ex);
2718 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2719 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2720 >        checkCompletedWithWrappedException(h2, ex);
2721 >        checkCompletedWithWrappedException(h3, ex);
2722  
2723 <        g.completeExceptionally(ex);
2662 <        f.complete(v1);
2663 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2723 >        assertTrue(g.complete(v1));
2724  
2725 <        // unspecified behavior
2726 <        Integer v;
2725 >        // unspecified behavior - both source completions available
2726 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2727 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2728          try {
2729 <            assertNull(h.join());
2730 <            assertEquals(1, r.invocationCount);
2729 >            assertNull(h4.join());
2730 >            rs[4].assertInvoked();
2731          } catch (CompletionException ok) {
2732 <            checkCompletedWithWrappedCFException(h, ex);
2733 <            assertEquals(0, r.invocationCount);
2732 >            checkCompletedWithWrappedException(h4, ex);
2733 >            rs[4].assertNotInvoked();
2734          }
2674
2675        checkCompletedWithWrappedCFException(g, ex);
2676        checkCompletedNormally(f, v1);
2677    }}
2678
2679    public void testRunAfterEither_exceptionalCompletion4() {
2680        for (ExecutionMode m : ExecutionMode.values())
2681        for (Integer v1 : new Integer[] { 1, null })
2682    {
2683        final CompletableFuture<Integer> f = new CompletableFuture<>();
2684        final CompletableFuture<Integer> g = new CompletableFuture<>();
2685        final Noop r = new Noop();
2686        final CFException ex = new CFException();
2687
2688        f.completeExceptionally(ex);
2689        g.complete(v1);
2690        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2691
2692        // unspecified behavior
2693        Integer v;
2735          try {
2736 <            assertNull(h.join());
2737 <            assertEquals(1, r.invocationCount);
2736 >            assertNull(h5.join());
2737 >            rs[5].assertInvoked();
2738          } catch (CompletionException ok) {
2739 <            checkCompletedWithWrappedCFException(h, ex);
2740 <            assertEquals(0, r.invocationCount);
2739 >            checkCompletedWithWrappedException(h5, ex);
2740 >            rs[5].assertNotInvoked();
2741          }
2742  
2743 <        checkCompletedWithWrappedCFException(f, ex);
2743 >        checkCompletedExceptionally(f, ex);
2744          checkCompletedNormally(g, v1);
2745 +        checkCompletedWithWrappedException(h0, ex);
2746 +        checkCompletedWithWrappedException(h1, ex);
2747 +        checkCompletedWithWrappedException(h2, ex);
2748 +        checkCompletedWithWrappedException(h3, ex);
2749 +        checkCompletedWithWrappedException(h4, ex);
2750 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2751      }}
2752  
2753 <    /**
2707 <     * runAfterEither result completes exceptionally if action does
2708 <     */
2709 <    public void testRunAfterEither_actionFailed1() {
2753 >    public void testRunAfterEither_exceptionalCompletion2() {
2754          for (ExecutionMode m : ExecutionMode.values())
2755 +        for (boolean fFirst : new boolean[] { true, false })
2756          for (Integer v1 : new Integer[] { 1, null })
2712        for (Integer v2 : new Integer[] { 2, null })
2757      {
2758          final CompletableFuture<Integer> f = new CompletableFuture<>();
2759          final CompletableFuture<Integer> g = new CompletableFuture<>();
2760 <        final FailingNoop r = new FailingNoop();
2761 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2760 >        final CFException ex = new CFException();
2761 >        final Noop[] rs = new Noop[6];
2762 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2763  
2764 <        f.complete(v1);
2765 <        checkCompletedWithWrappedCFException(h);
2766 <        g.complete(v2);
2767 <        checkCompletedNormally(f, v1);
2768 <        checkCompletedNormally(g, v2);
2769 <    }}
2764 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2765 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2766 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2767 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2768 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2769 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2770  
2771 <    public void testRunAfterEither_actionFailed2() {
2772 <        for (ExecutionMode m : ExecutionMode.values())
2773 <        for (Integer v1 : new Integer[] { 1, null })
2774 <        for (Integer v2 : new Integer[] { 2, null })
2775 <    {
2776 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2777 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2778 <        final FailingNoop r = new FailingNoop();
2779 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2771 >        // unspecified behavior - both source completions available
2772 >        try {
2773 >            assertEquals(null, h0.join());
2774 >            rs[0].assertInvoked();
2775 >        } catch (CompletionException ok) {
2776 >            checkCompletedWithWrappedException(h0, ex);
2777 >            rs[0].assertNotInvoked();
2778 >        }
2779 >        try {
2780 >            assertEquals(null, h1.join());
2781 >            rs[1].assertInvoked();
2782 >        } catch (CompletionException ok) {
2783 >            checkCompletedWithWrappedException(h1, ex);
2784 >            rs[1].assertNotInvoked();
2785 >        }
2786 >        try {
2787 >            assertEquals(null, h2.join());
2788 >            rs[2].assertInvoked();
2789 >        } catch (CompletionException ok) {
2790 >            checkCompletedWithWrappedException(h2, ex);
2791 >            rs[2].assertNotInvoked();
2792 >        }
2793 >        try {
2794 >            assertEquals(null, h3.join());
2795 >            rs[3].assertInvoked();
2796 >        } catch (CompletionException ok) {
2797 >            checkCompletedWithWrappedException(h3, ex);
2798 >            rs[3].assertNotInvoked();
2799 >        }
2800  
2736        g.complete(v2);
2737        checkCompletedWithWrappedCFException(h);
2738        f.complete(v1);
2801          checkCompletedNormally(f, v1);
2802 <        checkCompletedNormally(g, v2);
2802 >        checkCompletedExceptionally(g, ex);
2803      }}
2804  
2805      /**
2806       * runAfterEither result completes exceptionally if either source cancelled
2807       */
2808 <    public void testRunAfterEither_sourceCancelled1() {
2808 >    public void testRunAfterEither_sourceCancelled() {
2809          for (ExecutionMode m : ExecutionMode.values())
2810          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2811          for (Integer v1 : new Integer[] { 1, null })
2812      {
2813          final CompletableFuture<Integer> f = new CompletableFuture<>();
2814          final CompletableFuture<Integer> g = new CompletableFuture<>();
2815 <        final Noop r = new Noop();
2816 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2815 >        final Noop[] rs = new Noop[6];
2816 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2817  
2818 <        assertTrue(f.cancel(mayInterruptIfRunning));
2819 <        checkCompletedWithWrappedCancellationException(h);
2820 <        g.complete(v1);
2818 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2819 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2820 >        checkIncomplete(h0);
2821 >        checkIncomplete(h1);
2822 >        rs[0].assertNotInvoked();
2823 >        rs[1].assertNotInvoked();
2824 >        f.cancel(mayInterruptIfRunning);
2825 >        checkCompletedWithWrappedCancellationException(h0);
2826 >        checkCompletedWithWrappedCancellationException(h1);
2827 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2828 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2829 >        checkCompletedWithWrappedCancellationException(h2);
2830 >        checkCompletedWithWrappedCancellationException(h3);
2831  
2832 <        checkCancelled(f);
2761 <        assertEquals(0, r.invocationCount);
2762 <        checkCompletedNormally(g, v1);
2763 <        checkCompletedWithWrappedCancellationException(h);
2764 <    }}
2832 >        assertTrue(g.complete(v1));
2833  
2834 <    public void testRunAfterEither_sourceCancelled2() {
2835 <        for (ExecutionMode m : ExecutionMode.values())
2836 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2769 <        for (Integer v1 : new Integer[] { 1, null })
2770 <    {
2771 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2772 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2773 <        final Noop r = new Noop();
2774 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2775 <
2776 <        assertTrue(g.cancel(mayInterruptIfRunning));
2777 <        checkCompletedWithWrappedCancellationException(h);
2778 <        f.complete(v1);
2779 <
2780 <        checkCancelled(g);
2781 <        assertEquals(0, r.invocationCount);
2782 <        checkCompletedNormally(f, v1);
2783 <        checkCompletedWithWrappedCancellationException(h);
2784 <    }}
2785 <
2786 <    public void testRunAfterEither_sourceCancelled3() {
2787 <        for (ExecutionMode m : ExecutionMode.values())
2788 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2789 <        for (Integer v1 : new Integer[] { 1, null })
2790 <    {
2791 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2792 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2793 <        final Noop r = new Noop();
2794 <
2795 <        assertTrue(g.cancel(mayInterruptIfRunning));
2796 <        f.complete(v1);
2797 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2798 <
2799 <        // unspecified behavior
2800 <        Integer v;
2834 >        // unspecified behavior - both source completions available
2835 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2836 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2837          try {
2838 <            assertNull(h.join());
2839 <            assertEquals(1, r.invocationCount);
2838 >            assertNull(h4.join());
2839 >            rs[4].assertInvoked();
2840          } catch (CompletionException ok) {
2841 <            checkCompletedWithWrappedCancellationException(h);
2842 <            assertEquals(0, r.invocationCount);
2841 >            checkCompletedWithWrappedCancellationException(h4);
2842 >            rs[4].assertNotInvoked();
2843          }
2808
2809        checkCancelled(g);
2810        checkCompletedNormally(f, v1);
2811    }}
2812
2813    public void testRunAfterEither_sourceCancelled4() {
2814        for (ExecutionMode m : ExecutionMode.values())
2815        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2816        for (Integer v1 : new Integer[] { 1, null })
2817    {
2818        final CompletableFuture<Integer> f = new CompletableFuture<>();
2819        final CompletableFuture<Integer> g = new CompletableFuture<>();
2820        final Noop r = new Noop();
2821
2822        assertTrue(f.cancel(mayInterruptIfRunning));
2823        g.complete(v1);
2824        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2825
2826        // unspecified behavior
2827        Integer v;
2844          try {
2845 <            assertNull(h.join());
2846 <            assertEquals(1, r.invocationCount);
2845 >            assertNull(h5.join());
2846 >            rs[5].assertInvoked();
2847          } catch (CompletionException ok) {
2848 <            checkCompletedWithWrappedCancellationException(h);
2849 <            assertEquals(0, r.invocationCount);
2848 >            checkCompletedWithWrappedCancellationException(h5);
2849 >            rs[5].assertNotInvoked();
2850          }
2851  
2852          checkCancelled(f);
2853          checkCompletedNormally(g, v1);
2854 +        checkCompletedWithWrappedCancellationException(h0);
2855 +        checkCompletedWithWrappedCancellationException(h1);
2856 +        checkCompletedWithWrappedCancellationException(h2);
2857 +        checkCompletedWithWrappedCancellationException(h3);
2858 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2859      }}
2860  
2861      /**
2862 <     * thenCompose result completes normally after normal completion of source
2862 >     * runAfterEither result completes exceptionally if action does
2863       */
2864 <    public void testThenCompose_normalCompletion1() {
2864 >    public void testRunAfterEither_actionFailed() {
2865          for (ExecutionMode m : ExecutionMode.values())
2866          for (Integer v1 : new Integer[] { 1, null })
2867 +        for (Integer v2 : new Integer[] { 2, null })
2868      {
2869          final CompletableFuture<Integer> f = new CompletableFuture<>();
2870 <        final CompletableFutureInc r = new CompletableFutureInc();
2871 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2872 <        f.complete(v1);
2873 <        checkCompletedNormally(g, inc(v1));
2870 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2871 >        final FailingRunnable[] rs = new FailingRunnable[6];
2872 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2873 >
2874 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2875 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2876 >        assertTrue(f.complete(v1));
2877 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2878 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2879 >        checkCompletedWithWrappedCFException(h0);
2880 >        checkCompletedWithWrappedCFException(h1);
2881 >        checkCompletedWithWrappedCFException(h2);
2882 >        checkCompletedWithWrappedCFException(h3);
2883 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2884 >        assertTrue(g.complete(v2));
2885 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2886 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2887 >        checkCompletedWithWrappedCFException(h4);
2888 >        checkCompletedWithWrappedCFException(h5);
2889 >
2890          checkCompletedNormally(f, v1);
2891 <        assertEquals(1, r.invocationCount);
2891 >        checkCompletedNormally(g, v2);
2892 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2893      }}
2894  
2895 <    public void testThenCompose_normalCompletion2() {
2895 >    /**
2896 >     * thenCompose result completes normally after normal completion of source
2897 >     */
2898 >    public void testThenCompose_normalCompletion() {
2899          for (ExecutionMode m : ExecutionMode.values())
2900 +        for (boolean createIncomplete : new boolean[] { true, false })
2901          for (Integer v1 : new Integer[] { 1, null })
2902      {
2903          final CompletableFuture<Integer> f = new CompletableFuture<>();
2904 <        final CompletableFutureInc r = new CompletableFutureInc();
2905 <        f.complete(v1);
2906 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2904 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2905 >        if (!createIncomplete) assertTrue(f.complete(v1));
2906 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2907 >        if (createIncomplete) assertTrue(f.complete(v1));
2908 >
2909          checkCompletedNormally(g, inc(v1));
2910          checkCompletedNormally(f, v1);
2911 <        assertEquals(1, r.invocationCount);
2911 >        r.assertValue(v1);
2912      }}
2913  
2914      /**
2915       * thenCompose result completes exceptionally after exceptional
2916       * completion of source
2917       */
2918 <    public void testThenCompose_exceptionalCompletion1() {
2918 >    public void testThenCompose_exceptionalCompletion() {
2919          for (ExecutionMode m : ExecutionMode.values())
2920 +        for (boolean createIncomplete : new boolean[] { true, false })
2921      {
2922          final CFException ex = new CFException();
2923 <        final CompletableFutureInc r = new CompletableFutureInc();
2923 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2924          final CompletableFuture<Integer> f = new CompletableFuture<>();
2925 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2926 <        f.completeExceptionally(ex);
2927 <        checkCompletedWithWrappedCFException(g, ex);
2882 <        checkCompletedWithWrappedCFException(f, ex);
2883 <    }}
2925 >        if (!createIncomplete) f.completeExceptionally(ex);
2926 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2927 >        if (createIncomplete) f.completeExceptionally(ex);
2928  
2929 <    public void testThenCompose_exceptionalCompletion2() {
2930 <        for (ExecutionMode m : ExecutionMode.values())
2931 <    {
2888 <        final CFException ex = new CFException();
2889 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2890 <        f.completeExceptionally(ex);
2891 <        final CompletableFutureInc r = new CompletableFutureInc();
2892 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2893 <        checkCompletedWithWrappedCFException(g, ex);
2894 <        checkCompletedWithWrappedCFException(f, ex);
2929 >        checkCompletedWithWrappedException(g, ex);
2930 >        checkCompletedExceptionally(f, ex);
2931 >        r.assertNotInvoked();
2932      }}
2933  
2934      /**
2935       * thenCompose result completes exceptionally if action does
2936       */
2937 <    public void testThenCompose_actionFailed1() {
2937 >    public void testThenCompose_actionFailed() {
2938          for (ExecutionMode m : ExecutionMode.values())
2939 +        for (boolean createIncomplete : new boolean[] { true, false })
2940          for (Integer v1 : new Integer[] { 1, null })
2941      {
2942          final CompletableFuture<Integer> f = new CompletableFuture<>();
2943          final FailingCompletableFutureFunction r
2944 <            = new FailingCompletableFutureFunction();
2945 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2946 <        f.complete(v1);
2947 <        checkCompletedWithWrappedCFException(g);
2910 <        checkCompletedNormally(f, v1);
2911 <    }}
2944 >            = new FailingCompletableFutureFunction(m);
2945 >        if (!createIncomplete) assertTrue(f.complete(v1));
2946 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2947 >        if (createIncomplete) assertTrue(f.complete(v1));
2948  
2913    public void testThenCompose_actionFailed2() {
2914        for (ExecutionMode m : ExecutionMode.values())
2915        for (Integer v1 : new Integer[] { 1, null })
2916    {
2917        final CompletableFuture<Integer> f = new CompletableFuture<>();
2918        f.complete(v1);
2919        final FailingCompletableFutureFunction r
2920            = new FailingCompletableFutureFunction();
2921        final CompletableFuture<Integer> g = f.thenCompose(r);
2949          checkCompletedWithWrappedCFException(g);
2950          checkCompletedNormally(f, v1);
2951      }}
# Line 2926 | Line 2953 | public class CompletableFutureTest exten
2953      /**
2954       * thenCompose result completes exceptionally if source cancelled
2955       */
2956 <    public void testThenCompose_sourceCancelled1() {
2956 >    public void testThenCompose_sourceCancelled() {
2957          for (ExecutionMode m : ExecutionMode.values())
2958 +        for (boolean createIncomplete : new boolean[] { true, false })
2959          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2960      {
2961          final CompletableFuture<Integer> f = new CompletableFuture<>();
2962 <        final CompletableFutureInc r = new CompletableFutureInc();
2963 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2964 <        assertTrue(f.cancel(mayInterruptIfRunning));
2965 <        checkCompletedWithWrappedCancellationException(g);
2966 <        checkCancelled(f);
2967 <    }}
2962 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2963 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2964 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2965 >        if (createIncomplete) {
2966 >            checkIncomplete(g);
2967 >            assertTrue(f.cancel(mayInterruptIfRunning));
2968 >        }
2969  
2941    public void testThenCompose_sourceCancelled2() {
2942        for (ExecutionMode m : ExecutionMode.values())
2943        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2944    {
2945        final CompletableFuture<Integer> f = new CompletableFuture<>();
2946        assertTrue(f.cancel(mayInterruptIfRunning));
2947        final CompletableFutureInc r = new CompletableFutureInc();
2948        final CompletableFuture<Integer> g = f.thenCompose(r);
2970          checkCompletedWithWrappedCancellationException(g);
2971          checkCancelled(f);
2972      }}
2973  
2953    // asyncs
2954
2955    /**
2956     * thenRunAsync result completes normally after normal completion of source
2957     */
2958    public void testThenRunAsync() {
2959        CompletableFuture<Integer> f = new CompletableFuture<>();
2960        Noop r = new Noop();
2961        CompletableFuture<Void> g = f.thenRunAsync(r);
2962        f.complete(null);
2963        checkCompletedNormally(g, null);
2964
2965        // reordered version
2966        f = new CompletableFuture<>();
2967        f.complete(null);
2968        r = new Noop();
2969        g = f.thenRunAsync(r);
2970        checkCompletedNormally(g, null);
2971    }
2972
2973    /**
2974     * thenRunAsync result completes exceptionally after exceptional
2975     * completion of source
2976     */
2977    public void testThenRunAsync2() {
2978        CompletableFuture<Integer> f = new CompletableFuture<>();
2979        Noop r = new Noop();
2980        CompletableFuture<Void> g = f.thenRunAsync(r);
2981        f.completeExceptionally(new CFException());
2982        try {
2983            g.join();
2984            shouldThrow();
2985        } catch (CompletionException success) {}
2986        checkCompletedWithWrappedCFException(g);
2987    }
2988
2989    /**
2990     * thenRunAsync result completes exceptionally if action does
2991     */
2992    public void testThenRunAsync3() {
2993        CompletableFuture<Integer> f = new CompletableFuture<>();
2994        FailingNoop r = new FailingNoop();
2995        CompletableFuture<Void> g = f.thenRunAsync(r);
2996        f.complete(null);
2997        checkCompletedWithWrappedCFException(g);
2998    }
2999
3000    /**
3001     * thenRunAsync result completes exceptionally if source cancelled
3002     */
3003    public void testThenRunAsync4() {
3004        CompletableFuture<Integer> f = new CompletableFuture<>();
3005        Noop r = new Noop();
3006        CompletableFuture<Void> g = f.thenRunAsync(r);
3007        assertTrue(f.cancel(true));
3008        checkCompletedWithWrappedCancellationException(g);
3009    }
3010
3011    /**
3012     * thenApplyAsync result completes normally after normal completion of source
3013     */
3014    public void testThenApplyAsync() {
3015        CompletableFuture<Integer> f = new CompletableFuture<>();
3016        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3017        f.complete(one);
3018        checkCompletedNormally(g, two);
3019    }
3020
3021    /**
3022     * thenApplyAsync result completes exceptionally after exceptional
3023     * completion of source
3024     */
3025    public void testThenApplyAsync2() {
3026        CompletableFuture<Integer> f = new CompletableFuture<>();
3027        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3028        f.completeExceptionally(new CFException());
3029        checkCompletedWithWrappedCFException(g);
3030    }
3031
3032    /**
3033     * thenApplyAsync result completes exceptionally if action does
3034     */
3035    public void testThenApplyAsync3() {
3036        CompletableFuture<Integer> f = new CompletableFuture<>();
3037        FailingFunction r = new FailingFunction();
3038        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3039        f.complete(null);
3040        checkCompletedWithWrappedCFException(g);
3041    }
3042
3043    /**
3044     * thenApplyAsync result completes exceptionally if source cancelled
3045     */
3046    public void testThenApplyAsync4() {
3047        CompletableFuture<Integer> f = new CompletableFuture<>();
3048        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3049        assertTrue(f.cancel(true));
3050        checkCompletedWithWrappedCancellationException(g);
3051    }
3052
3053    /**
3054     * thenAcceptAsync result completes normally after normal
3055     * completion of source
3056     */
3057    public void testThenAcceptAsync() {
3058        CompletableFuture<Integer> f = new CompletableFuture<>();
3059        IncAction r = new IncAction();
3060        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3061        f.complete(one);
3062        checkCompletedNormally(g, null);
3063        assertEquals(r.value, (Integer) 2);
3064    }
3065
3066    /**
3067     * thenAcceptAsync result completes exceptionally after exceptional
3068     * completion of source
3069     */
3070    public void testThenAcceptAsync2() {
3071        CompletableFuture<Integer> f = new CompletableFuture<>();
3072        IncAction r = new IncAction();
3073        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3074        f.completeExceptionally(new CFException());
3075        checkCompletedWithWrappedCFException(g);
3076    }
3077
3078    /**
3079     * thenAcceptAsync result completes exceptionally if action does
3080     */
3081    public void testThenAcceptAsync3() {
3082        CompletableFuture<Integer> f = new CompletableFuture<>();
3083        FailingConsumer r = new FailingConsumer();
3084        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3085        f.complete(null);
3086        checkCompletedWithWrappedCFException(g);
3087    }
3088
3089    /**
3090     * thenAcceptAsync result completes exceptionally if source cancelled
3091     */
3092    public void testThenAcceptAsync4() {
3093        CompletableFuture<Integer> f = new CompletableFuture<>();
3094        IncAction r = new IncAction();
3095        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3096        assertTrue(f.cancel(true));
3097        checkCompletedWithWrappedCancellationException(g);
3098    }
3099
3100    // async with explicit executors
3101
3102    /**
3103     * thenRunAsync result completes normally after normal completion of source
3104     */
3105    public void testThenRunAsyncE() {
3106        CompletableFuture<Integer> f = new CompletableFuture<>();
3107        Noop r = new Noop();
3108        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3109        f.complete(null);
3110        checkCompletedNormally(g, null);
3111
3112        // reordered version
3113        f = new CompletableFuture<>();
3114        f.complete(null);
3115        r = new Noop();
3116        g = f.thenRunAsync(r, new ThreadExecutor());
3117        checkCompletedNormally(g, null);
3118    }
3119
3120    /**
3121     * thenRunAsync result completes exceptionally after exceptional
3122     * completion of source
3123     */
3124    public void testThenRunAsync2E() {
3125        CompletableFuture<Integer> f = new CompletableFuture<>();
3126        Noop r = new Noop();
3127        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3128        f.completeExceptionally(new CFException());
3129        try {
3130            g.join();
3131            shouldThrow();
3132        } catch (CompletionException success) {}
3133        checkCompletedWithWrappedCFException(g);
3134    }
3135
3136    /**
3137     * thenRunAsync result completes exceptionally if action does
3138     */
3139    public void testThenRunAsync3E() {
3140        CompletableFuture<Integer> f = new CompletableFuture<>();
3141        FailingNoop r = new FailingNoop();
3142        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3143        f.complete(null);
3144        checkCompletedWithWrappedCFException(g);
3145    }
3146
3147    /**
3148     * thenRunAsync result completes exceptionally if source cancelled
3149     */
3150    public void testThenRunAsync4E() {
3151        CompletableFuture<Integer> f = new CompletableFuture<>();
3152        Noop r = new Noop();
3153        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3154        assertTrue(f.cancel(true));
3155        checkCompletedWithWrappedCancellationException(g);
3156    }
3157
3158    /**
3159     * thenApplyAsync result completes normally after normal completion of source
3160     */
3161    public void testThenApplyAsyncE() {
3162        CompletableFuture<Integer> f = new CompletableFuture<>();
3163        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3164        f.complete(one);
3165        checkCompletedNormally(g, two);
3166    }
3167
3168    /**
3169     * thenApplyAsync result completes exceptionally after exceptional
3170     * completion of source
3171     */
3172    public void testThenApplyAsync2E() {
3173        CompletableFuture<Integer> f = new CompletableFuture<>();
3174        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3175        f.completeExceptionally(new CFException());
3176        checkCompletedWithWrappedCFException(g);
3177    }
3178
3179    /**
3180     * thenApplyAsync result completes exceptionally if action does
3181     */
3182    public void testThenApplyAsync3E() {
3183        CompletableFuture<Integer> f = new CompletableFuture<>();
3184        FailingFunction r = new FailingFunction();
3185        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3186        f.complete(null);
3187        checkCompletedWithWrappedCFException(g);
3188    }
3189
3190    /**
3191     * thenApplyAsync result completes exceptionally if source cancelled
3192     */
3193    public void testThenApplyAsync4E() {
3194        CompletableFuture<Integer> f = new CompletableFuture<>();
3195        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3196        assertTrue(f.cancel(true));
3197        checkCompletedWithWrappedCancellationException(g);
3198    }
3199
3200    /**
3201     * thenAcceptAsync result completes normally after normal
3202     * completion of source
3203     */
3204    public void testThenAcceptAsyncE() {
3205        CompletableFuture<Integer> f = new CompletableFuture<>();
3206        IncAction r = new IncAction();
3207        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3208        f.complete(one);
3209        checkCompletedNormally(g, null);
3210        assertEquals(r.value, (Integer) 2);
3211    }
3212
3213    /**
3214     * thenAcceptAsync result completes exceptionally after exceptional
3215     * completion of source
3216     */
3217    public void testThenAcceptAsync2E() {
3218        CompletableFuture<Integer> f = new CompletableFuture<>();
3219        IncAction r = new IncAction();
3220        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3221        f.completeExceptionally(new CFException());
3222        checkCompletedWithWrappedCFException(g);
3223    }
3224
3225    /**
3226     * thenAcceptAsync result completes exceptionally if action does
3227     */
3228    public void testThenAcceptAsync3E() {
3229        CompletableFuture<Integer> f = new CompletableFuture<>();
3230        FailingConsumer r = new FailingConsumer();
3231        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3232        f.complete(null);
3233        checkCompletedWithWrappedCFException(g);
3234    }
3235
3236    /**
3237     * thenAcceptAsync result completes exceptionally if source cancelled
3238     */
3239    public void testThenAcceptAsync4E() {
3240        CompletableFuture<Integer> f = new CompletableFuture<>();
3241        IncAction r = new IncAction();
3242        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3243        assertTrue(f.cancel(true));
3244        checkCompletedWithWrappedCancellationException(g);
3245    }
3246
2974      // other static methods
2975  
2976      /**
# Line 3260 | Line 2987 | public class CompletableFutureTest exten
2987       * when all components complete normally
2988       */
2989      public void testAllOf_normal() throws Exception {
2990 <        for (int k = 1; k < 20; ++k) {
2991 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2992 <            for (int i = 0; i < k; ++i)
2990 >        for (int k = 1; k < 10; k++) {
2991 >            CompletableFuture<Integer>[] fs
2992 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2993 >            for (int i = 0; i < k; i++)
2994 >                fs[i] = new CompletableFuture<>();
2995 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2996 >            for (int i = 0; i < k; i++) {
2997 >                checkIncomplete(f);
2998 >                checkIncomplete(CompletableFuture.allOf(fs));
2999 >                fs[i].complete(one);
3000 >            }
3001 >            checkCompletedNormally(f, null);
3002 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3003 >        }
3004 >    }
3005 >
3006 >    public void testAllOf_backwards() throws Exception {
3007 >        for (int k = 1; k < 10; k++) {
3008 >            CompletableFuture<Integer>[] fs
3009 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3010 >            for (int i = 0; i < k; i++)
3011                  fs[i] = new CompletableFuture<>();
3012              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3013 <            for (int i = 0; i < k; ++i) {
3013 >            for (int i = k - 1; i >= 0; i--) {
3014                  checkIncomplete(f);
3015                  checkIncomplete(CompletableFuture.allOf(fs));
3016                  fs[i].complete(one);
# Line 3275 | Line 3020 | public class CompletableFutureTest exten
3020          }
3021      }
3022  
3023 +    public void testAllOf_exceptional() throws Exception {
3024 +        for (int k = 1; k < 10; k++) {
3025 +            CompletableFuture<Integer>[] fs
3026 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3027 +            CFException ex = new CFException();
3028 +            for (int i = 0; i < k; i++)
3029 +                fs[i] = new CompletableFuture<>();
3030 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3031 +            for (int i = 0; i < k; i++) {
3032 +                checkIncomplete(f);
3033 +                checkIncomplete(CompletableFuture.allOf(fs));
3034 +                if (i != k/2) {
3035 +                    fs[i].complete(i);
3036 +                    checkCompletedNormally(fs[i], i);
3037 +                } else {
3038 +                    fs[i].completeExceptionally(ex);
3039 +                    checkCompletedExceptionally(fs[i], ex);
3040 +                }
3041 +            }
3042 +            checkCompletedWithWrappedException(f, ex);
3043 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3044 +        }
3045 +    }
3046 +
3047      /**
3048       * anyOf(no component futures) returns an incomplete future
3049       */
3050      public void testAnyOf_empty() throws Exception {
3051 +        for (Integer v1 : new Integer[] { 1, null })
3052 +    {
3053          CompletableFuture<Object> f = CompletableFuture.anyOf();
3054          checkIncomplete(f);
3055 <    }
3055 >
3056 >        f.complete(v1);
3057 >        checkCompletedNormally(f, v1);
3058 >    }}
3059  
3060      /**
3061       * anyOf returns a future completed normally with a value when
3062       * a component future does
3063       */
3064      public void testAnyOf_normal() throws Exception {
3065 <        for (int k = 0; k < 10; ++k) {
3065 >        for (int k = 0; k < 10; k++) {
3066              CompletableFuture[] fs = new CompletableFuture[k];
3067 <            for (int i = 0; i < k; ++i)
3067 >            for (int i = 0; i < k; i++)
3068                  fs[i] = new CompletableFuture<>();
3069              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3070              checkIncomplete(f);
3071 <            for (int i = 0; i < k; ++i) {
3072 <                fs[i].complete(one);
3073 <                checkCompletedNormally(f, one);
3074 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3071 >            for (int i = 0; i < k; i++) {
3072 >                fs[i].complete(i);
3073 >                checkCompletedNormally(f, 0);
3074 >                int x = (int) CompletableFuture.anyOf(fs).join();
3075 >                assertTrue(0 <= x && x <= i);
3076 >            }
3077 >        }
3078 >    }
3079 >    public void testAnyOf_normal_backwards() throws Exception {
3080 >        for (int k = 0; k < 10; k++) {
3081 >            CompletableFuture[] fs = new CompletableFuture[k];
3082 >            for (int i = 0; i < k; i++)
3083 >                fs[i] = new CompletableFuture<>();
3084 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3085 >            checkIncomplete(f);
3086 >            for (int i = k - 1; i >= 0; i--) {
3087 >                fs[i].complete(i);
3088 >                checkCompletedNormally(f, k - 1);
3089 >                int x = (int) CompletableFuture.anyOf(fs).join();
3090 >                assertTrue(i <= x && x <= k - 1);
3091              }
3092          }
3093      }
# Line 3306 | Line 3096 | public class CompletableFutureTest exten
3096       * anyOf result completes exceptionally when any component does.
3097       */
3098      public void testAnyOf_exceptional() throws Exception {
3099 <        for (int k = 0; k < 10; ++k) {
3099 >        for (int k = 0; k < 10; k++) {
3100 >            CompletableFuture[] fs = new CompletableFuture[k];
3101 >            CFException[] exs = new CFException[k];
3102 >            for (int i = 0; i < k; i++) {
3103 >                fs[i] = new CompletableFuture<>();
3104 >                exs[i] = new CFException();
3105 >            }
3106 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3107 >            checkIncomplete(f);
3108 >            for (int i = 0; i < k; i++) {
3109 >                fs[i].completeExceptionally(exs[i]);
3110 >                checkCompletedWithWrappedException(f, exs[0]);
3111 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3112 >            }
3113 >        }
3114 >    }
3115 >
3116 >    public void testAnyOf_exceptional_backwards() throws Exception {
3117 >        for (int k = 0; k < 10; k++) {
3118              CompletableFuture[] fs = new CompletableFuture[k];
3119 <            for (int i = 0; i < k; ++i)
3119 >            CFException[] exs = new CFException[k];
3120 >            for (int i = 0; i < k; i++) {
3121                  fs[i] = new CompletableFuture<>();
3122 +                exs[i] = new CFException();
3123 +            }
3124              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3125              checkIncomplete(f);
3126 <            for (int i = 0; i < k; ++i) {
3127 <                fs[i].completeExceptionally(new CFException());
3128 <                checkCompletedWithWrappedCFException(f);
3126 >            for (int i = k - 1; i >= 0; i--) {
3127 >                fs[i].completeExceptionally(exs[i]);
3128 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3129                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3130              }
3131          }
# Line 3333 | Line 3144 | public class CompletableFutureTest exten
3144          Runnable[] throwingActions = {
3145              () -> CompletableFuture.supplyAsync(null),
3146              () -> CompletableFuture.supplyAsync(null, exec),
3147 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3147 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3148  
3149              () -> CompletableFuture.runAsync(null),
3150              () -> CompletableFuture.runAsync(null, exec),
# Line 3406 | Line 3217 | public class CompletableFutureTest exten
3217  
3218              () -> f.thenCompose(null),
3219              () -> f.thenComposeAsync(null),
3220 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3220 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3221              () -> f.thenComposeAsync(null, exec),
3222  
3223              () -> f.exceptionally(null),
# Line 3438 | Line 3249 | public class CompletableFutureTest exten
3249          assertSame(f, f.toCompletableFuture());
3250      }
3251  
3252 <    /**
3442 <     * whenComplete action executes on normal completion, propagating
3443 <     * source result.
3444 <     */
3445 <    public void testWhenComplete_normalCompletion1() {
3446 <        for (ExecutionMode m : ExecutionMode.values())
3447 <        for (boolean createIncomplete : new boolean[] { true, false })
3448 <        for (Integer v1 : new Integer[] { 1, null })
3449 <    {
3450 <        final AtomicInteger a = new AtomicInteger(0);
3451 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3452 <        if (!createIncomplete) f.complete(v1);
3453 <        final CompletableFuture<Integer> g = m.whenComplete
3454 <            (f,
3455 <             (Integer x, Throwable t) -> {
3456 <                threadAssertSame(x, v1);
3457 <                threadAssertNull(t);
3458 <                a.getAndIncrement();
3459 <            });
3460 <        if (createIncomplete) f.complete(v1);
3252 >    //--- tests of implementation details; not part of official tck ---
3253  
3254 <        checkCompletedNormally(g, v1);
3255 <        checkCompletedNormally(f, v1);
3256 <        assertEquals(1, a.get());
3257 <    }}
3254 >    Object resultOf(CompletableFuture<?> f) {
3255 >        try {
3256 >            java.lang.reflect.Field resultField
3257 >                = CompletableFuture.class.getDeclaredField("result");
3258 >            resultField.setAccessible(true);
3259 >            return resultField.get(f);
3260 >        } catch (Throwable t) { throw new AssertionError(t); }
3261 >    }
3262  
3263 <    /**
3264 <     * whenComplete action executes on exceptional completion, propagating
3469 <     * source result.
3470 <     */
3471 <    public void testWhenComplete_exceptionalCompletion() {
3263 >    public void testExceptionPropagationReusesResultObject() {
3264 >        if (!testImplementationDetails) return;
3265          for (ExecutionMode m : ExecutionMode.values())
3473        for (boolean createIncomplete : new boolean[] { true, false })
3474        for (Integer v1 : new Integer[] { 1, null })
3266      {
3476        final AtomicInteger a = new AtomicInteger(0);
3267          final CFException ex = new CFException();
3268 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3269 <        if (!createIncomplete) f.completeExceptionally(ex);
3480 <        final CompletableFuture<Integer> g = m.whenComplete
3481 <            (f,
3482 <             (Integer x, Throwable t) -> {
3483 <                threadAssertNull(x);
3484 <                threadAssertSame(t, ex);
3485 <                a.getAndIncrement();
3486 <            });
3487 <        if (createIncomplete) f.completeExceptionally(ex);
3488 <        checkCompletedWithWrappedCFException(f, ex);
3489 <        checkCompletedWithWrappedCFException(g, ex);
3490 <        assertEquals(1, a.get());
3491 <    }}
3268 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3269 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3270  
3271 <    /**
3272 <     * whenComplete action executes on cancelled source, propagating
3495 <     * CancellationException.
3496 <     */
3497 <    public void testWhenComplete_sourceCancelled() {
3498 <        for (ExecutionMode m : ExecutionMode.values())
3499 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3500 <        for (boolean createIncomplete : new boolean[] { true, false })
3501 <    {
3502 <        final AtomicInteger a = new AtomicInteger(0);
3503 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3504 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3505 <        final CompletableFuture<Integer> g = m.whenComplete
3506 <            (f,
3507 <             (Integer x, Throwable t) -> {
3508 <                threadAssertNull(x);
3509 <                threadAssertTrue(t instanceof CancellationException);
3510 <                a.getAndIncrement();
3511 <            });
3512 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3271 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3272 >            = new ArrayList<>();
3273  
3274 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3275 <        checkCompletedWithWrappedCancellationException(g);
3276 <        checkCancelled(f);
3517 <        assertEquals(1, a.get());
3518 <    }}
3274 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3275 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3276 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3277  
3278 <    /**
3279 <     * If a whenComplete action throws an exception when triggered by
3280 <     * a normal completion, it completes exceptionally
3523 <     */
3524 <    public void testWhenComplete_actionFailed() {
3525 <        for (boolean createIncomplete : new boolean[] { true, false })
3526 <        for (ExecutionMode m : ExecutionMode.values())
3527 <        for (Integer v1 : new Integer[] { 1, null })
3528 <    {
3529 <        final AtomicInteger a = new AtomicInteger(0);
3530 <        final CFException ex = new CFException();
3531 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3532 <        if (!createIncomplete) f.complete(v1);
3533 <        final CompletableFuture<Integer> g = m.whenComplete
3534 <            (f,
3535 <             (Integer x, Throwable t) -> {
3536 <                threadAssertSame(x, v1);
3537 <                threadAssertNull(t);
3538 <                a.getAndIncrement();
3539 <                throw ex;
3540 <            });
3541 <        if (createIncomplete) f.complete(v1);
3542 <        checkCompletedNormally(f, v1);
3543 <        checkCompletedWithWrappedCFException(g, ex);
3544 <        assertEquals(1, a.get());
3545 <    }}
3278 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3279 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3280 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3281  
3282 <    /**
3283 <     * If a whenComplete action throws an exception when triggered by
3284 <     * a source completion that also throws an exception, the source
3550 <     * exception takes precedence.
3551 <     */
3552 <    public void testWhenComplete_actionFailedSourceFailed() {
3553 <        for (boolean createIncomplete : new boolean[] { true, false })
3554 <        for (ExecutionMode m : ExecutionMode.values())
3555 <        for (Integer v1 : new Integer[] { 1, null })
3556 <    {
3557 <        final AtomicInteger a = new AtomicInteger(0);
3558 <        final CFException ex1 = new CFException();
3559 <        final CFException ex2 = new CFException();
3560 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3282 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3283 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3284 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3285  
3286 <        if (!createIncomplete) f.completeExceptionally(ex1);
3563 <        final CompletableFuture<Integer> g = m.whenComplete
3564 <            (f,
3565 <             (Integer x, Throwable t) -> {
3566 <                threadAssertSame(t, ex1);
3567 <                threadAssertNull(x);
3568 <                a.getAndIncrement();
3569 <                throw ex2;
3570 <            });
3571 <        if (createIncomplete) f.completeExceptionally(ex1);
3286 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3287  
3288 <        checkCompletedWithWrappedCFException(f, ex1);
3289 <        checkCompletedWithWrappedCFException(g, ex1);
3290 <        assertEquals(1, a.get());
3288 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3289 >
3290 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3291 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3292 >
3293 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3294 >                 fun : funs) {
3295 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3296 >            f.completeExceptionally(ex);
3297 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3298 >            checkCompletedWithWrappedException(src, ex);
3299 >            CompletableFuture<?> dep = fun.apply(src);
3300 >            checkCompletedWithWrappedException(dep, ex);
3301 >            assertSame(resultOf(src), resultOf(dep));
3302 >        }
3303 >
3304 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3305 >                 fun : funs) {
3306 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3307 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3308 >            CompletableFuture<?> dep = fun.apply(src);
3309 >            f.completeExceptionally(ex);
3310 >            checkCompletedWithWrappedException(src, ex);
3311 >            checkCompletedWithWrappedException(dep, ex);
3312 >            assertSame(resultOf(src), resultOf(dep));
3313 >        }
3314 >
3315 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3316 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3317 >                 fun : funs) {
3318 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3319 >            f.cancel(mayInterruptIfRunning);
3320 >            checkCancelled(f);
3321 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3322 >            checkCompletedWithWrappedCancellationException(src);
3323 >            CompletableFuture<?> dep = fun.apply(src);
3324 >            checkCompletedWithWrappedCancellationException(dep);
3325 >            assertSame(resultOf(src), resultOf(dep));
3326 >        }
3327 >
3328 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3329 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3330 >                 fun : funs) {
3331 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3332 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3333 >            CompletableFuture<?> dep = fun.apply(src);
3334 >            f.cancel(mayInterruptIfRunning);
3335 >            checkCancelled(f);
3336 >            checkCompletedWithWrappedCancellationException(src);
3337 >            checkCompletedWithWrappedCancellationException(dep);
3338 >            assertSame(resultOf(src), resultOf(dep));
3339 >        }
3340      }}
3341  
3342   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines