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.48 by jsr166, Mon Jun 2 19:07:14 2014 UTC vs.
Revision 1.93 by jsr166, Tue Jun 17 21:09:56 2014 UTC

# Line 105 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
108 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 >                                                      Throwable ex) {
110          try {
111              f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
# Line 131 | Line 131 | public class CompletableFutureTest exten
131          } catch (ExecutionException success) {
132              assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 206 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 +        for (Integer v1 : new Integer[] { 1, null })
231 +    {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233          checkIncomplete(f);
234 <        f.complete(one);
235 <        checkCompletedNormally(f, one);
236 <    }
234 >        assertTrue(f.complete(v1));
235 >        assertFalse(f.complete(v1));
236 >        checkCompletedNormally(f, v1);
237 >    }}
238  
239      /**
240       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 242 | public class CompletableFutureTest exten
242       */
243      public void testCompleteExceptionally() {
244          CompletableFuture<Integer> f = new CompletableFuture<>();
245 +        CFException ex = new CFException();
246          checkIncomplete(f);
247 <        f.completeExceptionally(new CFException());
248 <        checkCompletedWithWrappedCFException(f);
247 >        f.completeExceptionally(ex);
248 >        checkCompletedExceptionally(f, ex);
249      }
250  
251      /**
# Line 228 | Line 253 | public class CompletableFutureTest exten
253       * methods isDone, isCancelled, join, get, and getNow
254       */
255      public void testCancel() {
256 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
257 +    {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260          assertTrue(f.cancel(true));
261 +        assertTrue(f.cancel(true));
262          checkCancelled(f);
263 <    }
263 >    }}
264  
265      /**
266       * obtrudeValue forces completion with given value
# Line 240 | Line 268 | public class CompletableFutureTest exten
268      public void testObtrudeValue() {
269          CompletableFuture<Integer> f = new CompletableFuture<>();
270          checkIncomplete(f);
271 <        f.complete(one);
271 >        assertTrue(f.complete(one));
272          checkCompletedNormally(f, one);
273          f.obtrudeValue(three);
274          checkCompletedNormally(f, three);
# Line 261 | Line 289 | public class CompletableFutureTest exten
289       * obtrudeException forces completion with given exception
290       */
291      public void testObtrudeException() {
292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
293 <        checkIncomplete(f);
294 <        f.complete(one);
295 <        checkCompletedNormally(f, one);
296 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
292 >        for (Integer v1 : new Integer[] { 1, null })
293 >    {
294 >        CFException ex;
295 >        CompletableFuture<Integer> f;
296 >
297          f = new CompletableFuture<>();
298 <        f.obtrudeException(new CFException());
299 <        checkCompletedWithWrappedCFException(f);
298 >        assertTrue(f.complete(v1));
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304 >        f = new CompletableFuture<>();
305 >        for (int i = 0; i < 2; i++) {
306 >            f.obtrudeException(ex = new CFException());
307 >            checkCompletedExceptionally(f, ex);
308 >        }
309 >
310          f = new CompletableFuture<>();
311 +        f.completeExceptionally(ex = new CFException());
312 +        f.obtrudeValue(v1);
313 +        checkCompletedNormally(f, v1);
314 +        f.obtrudeException(ex = new CFException());
315 +        checkCompletedExceptionally(f, ex);
316          f.completeExceptionally(new CFException());
317 <        f.obtrudeValue(four);
318 <        checkCompletedNormally(f, four);
319 <        f.obtrudeException(new CFException());
320 <        checkCompletedWithWrappedCFException(f);
279 <    }
317 >        checkCompletedExceptionally(f, ex);
318 >        assertFalse(f.complete(v1));
319 >        checkCompletedExceptionally(f, ex);
320 >    }}
321  
322      /**
323       * getNumberOfDependents returns number of dependent tasks
324       */
325      public void testGetNumberOfDependents() {
326 +        for (ExecutionMode m : ExecutionMode.values())
327 +        for (Integer v1 : new Integer[] { 1, null })
328 +    {
329          CompletableFuture<Integer> f = new CompletableFuture<>();
330          assertEquals(0, f.getNumberOfDependents());
331 <        CompletableFuture g = f.thenRun(new Noop());
331 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
332          assertEquals(1, f.getNumberOfDependents());
333          assertEquals(0, g.getNumberOfDependents());
334 <        CompletableFuture h = f.thenRun(new Noop());
334 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
335          assertEquals(2, f.getNumberOfDependents());
336 <        f.complete(1);
336 >        assertEquals(0, h.getNumberOfDependents());
337 >        assertTrue(f.complete(v1));
338          checkCompletedNormally(g, null);
339 +        checkCompletedNormally(h, null);
340          assertEquals(0, f.getNumberOfDependents());
341          assertEquals(0, g.getNumberOfDependents());
342 <    }
342 >        assertEquals(0, h.getNumberOfDependents());
343 >    }}
344  
345      /**
346       * toString indicates current completion state
# Line 304 | Line 351 | public class CompletableFutureTest exten
351          f = new CompletableFuture<String>();
352          assertTrue(f.toString().contains("[Not completed]"));
353  
354 <        f.complete("foo");
354 >        assertTrue(f.complete("foo"));
355          assertTrue(f.toString().contains("[Completed normally]"));
356  
357          f = new CompletableFuture<String>();
358 <        f.completeExceptionally(new IndexOutOfBoundsException());
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359          assertTrue(f.toString().contains("[Completed exceptionally]"));
360 +
361 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
362 +            f = new CompletableFuture<String>();
363 +            assertTrue(f.cancel(mayInterruptIfRunning));
364 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
365 +        }
366      }
367  
368      /**
# Line 320 | Line 373 | public class CompletableFutureTest exten
373          checkCompletedNormally(f, "test");
374      }
375  
376 <    // Choose non-commutative actions for better coverage
376 >    abstract class CheckedAction {
377 >        int invocationCount = 0;
378 >        final ExecutionMode m;
379 >        CheckedAction(ExecutionMode m) { this.m = m; }
380 >        void invoked() {
381 >            m.checkExecutionMode();
382 >            assertEquals(0, invocationCount++);
383 >        }
384 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
385 >        void assertInvoked() { assertEquals(1, invocationCount); }
386 >    }
387  
388 <    // A non-commutative function that handles and produces null values as well.
389 <    static Integer subtract(Integer x, Integer y) {
390 <        return (x == null && y == null) ? null :
391 <            ((x == null) ? 42 : x.intValue())
392 <            - ((y == null) ? 99 : y.intValue());
388 >    abstract class CheckedIntegerAction extends CheckedAction {
389 >        Integer value;
390 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
391 >        void assertValue(Integer expected) {
392 >            assertInvoked();
393 >            assertEquals(expected, value);
394 >        }
395 >    }
396 >
397 >    class IntegerSupplier extends CheckedAction
398 >        implements Supplier<Integer>
399 >    {
400 >        final Integer value;
401 >        IntegerSupplier(ExecutionMode m, Integer value) {
402 >            super(m);
403 >            this.value = value;
404 >        }
405 >        public Integer get() {
406 >            invoked();
407 >            return value;
408 >        }
409      }
410  
411      // A function that handles and produces null values as well.
# Line 334 | Line 413 | public class CompletableFutureTest exten
413          return (x == null) ? null : x + 1;
414      }
415  
416 <    static final Supplier<Integer> supplyOne =
417 <        () -> Integer.valueOf(1);
418 <    static final Function<Integer, Integer> inc =
419 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
341 <    static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> subtract(x, y);
343 <    static final class IncAction implements Consumer<Integer> {
344 <        int invocationCount = 0;
345 <        Integer value;
416 >    class NoopConsumer extends CheckedIntegerAction
417 >        implements Consumer<Integer>
418 >    {
419 >        NoopConsumer(ExecutionMode m) { super(m); }
420          public void accept(Integer x) {
421 <            invocationCount++;
422 <            value = inc(x);
421 >            invoked();
422 >            value = x;
423          }
424      }
425 <    static final class IncFunction implements Function<Integer,Integer> {
426 <        int invocationCount = 0;
427 <        Integer value;
425 >
426 >    class IncFunction extends CheckedIntegerAction
427 >        implements Function<Integer,Integer>
428 >    {
429 >        IncFunction(ExecutionMode m) { super(m); }
430          public Integer apply(Integer x) {
431 <            invocationCount++;
431 >            invoked();
432              return value = inc(x);
433          }
434      }
435 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
436 <        int invocationCount = 0;
437 <        Integer value;
438 <        // Check this action was invoked exactly once when result is computed.
435 >
436 >    // Choose non-commutative actions for better coverage
437 >    // A non-commutative function that handles and produces null values as well.
438 >    static Integer subtract(Integer x, Integer y) {
439 >        return (x == null && y == null) ? null :
440 >            ((x == null) ? 42 : x.intValue())
441 >            - ((y == null) ? 99 : y.intValue());
442 >    }
443 >
444 >    class SubtractAction extends CheckedIntegerAction
445 >        implements BiConsumer<Integer, Integer>
446 >    {
447 >        SubtractAction(ExecutionMode m) { super(m); }
448          public void accept(Integer x, Integer y) {
449 <            invocationCount++;
449 >            invoked();
450              value = subtract(x, y);
451          }
452      }
453 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
454 <        int invocationCount = 0;
455 <        Integer value;
456 <        // Check this action was invoked exactly once when result is computed.
453 >
454 >    class SubtractFunction extends CheckedIntegerAction
455 >        implements BiFunction<Integer, Integer, Integer>
456 >    {
457 >        SubtractFunction(ExecutionMode m) { super(m); }
458          public Integer apply(Integer x, Integer y) {
459 <            invocationCount++;
459 >            invoked();
460              return value = subtract(x, y);
461          }
462      }
463 <    static final class Noop implements Runnable {
464 <        int invocationCount = 0;
463 >
464 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466          public void run() {
467 <            invocationCount++;
467 >            invoked();
468          }
469      }
470  
471 <    static final class FailingSupplier implements Supplier<Integer> {
472 <        int invocationCount = 0;
471 >    class FailingSupplier extends CheckedAction
472 >        implements Supplier<Integer>
473 >    {
474 >        FailingSupplier(ExecutionMode m) { super(m); }
475          public Integer get() {
476 <            invocationCount++;
476 >            invoked();
477              throw new CFException();
478          }
479      }
480 <    static final class FailingConsumer implements Consumer<Integer> {
481 <        int invocationCount = 0;
480 >
481 >    class FailingConsumer extends CheckedIntegerAction
482 >        implements Consumer<Integer>
483 >    {
484 >        FailingConsumer(ExecutionMode m) { super(m); }
485          public void accept(Integer x) {
486 <            invocationCount++;
486 >            invoked();
487 >            value = x;
488              throw new CFException();
489          }
490      }
491 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
492 <        int invocationCount = 0;
491 >
492 >    class FailingBiConsumer extends CheckedIntegerAction
493 >        implements BiConsumer<Integer, Integer>
494 >    {
495 >        FailingBiConsumer(ExecutionMode m) { super(m); }
496          public void accept(Integer x, Integer y) {
497 <            invocationCount++;
497 >            invoked();
498 >            value = subtract(x, y);
499              throw new CFException();
500          }
501      }
502 <    static final class FailingFunction implements Function<Integer, Integer> {
503 <        int invocationCount = 0;
502 >
503 >    class FailingFunction extends CheckedIntegerAction
504 >        implements Function<Integer, Integer>
505 >    {
506 >        FailingFunction(ExecutionMode m) { super(m); }
507          public Integer apply(Integer x) {
508 <            invocationCount++;
508 >            invoked();
509 >            value = x;
510              throw new CFException();
511          }
512      }
513 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
514 <        int invocationCount = 0;
513 >
514 >    class FailingBiFunction extends CheckedIntegerAction
515 >        implements BiFunction<Integer, Integer, Integer>
516 >    {
517 >        FailingBiFunction(ExecutionMode m) { super(m); }
518          public Integer apply(Integer x, Integer y) {
519 <            invocationCount++;
519 >            invoked();
520 >            value = subtract(x, y);
521              throw new CFException();
522          }
523      }
524 <    static final class 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 531 | Line 653 | public class CompletableFutureTest exten
653                  assertSame(ForkJoinPool.commonPool(),
654                             ForkJoinTask.getPool());
655              }
656 +            public CompletableFuture<Void> runAsync(Runnable a) {
657 +                return CompletableFuture.runAsync(a);
658 +            }
659 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
660 +                return CompletableFuture.supplyAsync(a);
661 +            }
662              public <T> CompletableFuture<Void> thenRun
663                  (CompletableFuture<T> f, Runnable a) {
664                  return f.thenRunAsync(a);
# Line 596 | Line 724 | public class CompletableFutureTest exten
724  
725          EXECUTOR {
726              public void checkExecutionMode() {
727 <                //TODO
727 >                assertTrue(ThreadExecutor.startedCurrentThread());
728 >            }
729 >            public CompletableFuture<Void> runAsync(Runnable a) {
730 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
731 >            }
732 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
733 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
734              }
735              public <T> CompletableFuture<Void> thenRun
736                  (CompletableFuture<T> f, Runnable a) {
# Line 662 | Line 796 | public class CompletableFutureTest exten
796          };
797  
798          public abstract void checkExecutionMode();
799 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
800 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
801          public abstract <T> CompletableFuture<Void> thenRun
802              (CompletableFuture<T> f, Runnable a);
803          public abstract <T> CompletableFuture<Void> thenAccept
# Line 711 | Line 847 | public class CompletableFutureTest exten
847      {
848          final AtomicInteger a = new AtomicInteger(0);
849          final CompletableFuture<Integer> f = new CompletableFuture<>();
850 <        if (!createIncomplete) f.complete(v1);
850 >        if (!createIncomplete) assertTrue(f.complete(v1));
851          final CompletableFuture<Integer> g = f.exceptionally
852              ((Throwable t) -> {
853                  // Should not be called
854                  a.getAndIncrement();
855                  throw new AssertionError();
856              });
857 <        if (createIncomplete) f.complete(v1);
857 >        if (createIncomplete) assertTrue(f.complete(v1));
858  
859          checkCompletedNormally(g, v1);
860          checkCompletedNormally(f, v1);
861          assertEquals(0, a.get());
862      }}
863  
728
864      /**
865       * exceptionally action completes with function value on source
866       * exception
# Line 740 | Line 875 | public class CompletableFutureTest exten
875          if (!createIncomplete) f.completeExceptionally(ex);
876          final CompletableFuture<Integer> g = f.exceptionally
877              ((Throwable t) -> {
878 +                ExecutionMode.DEFAULT.checkExecutionMode();
879                  threadAssertSame(t, ex);
880                  a.getAndIncrement();
881                  return v1;
# Line 761 | Line 897 | public class CompletableFutureTest exten
897          if (!createIncomplete) f.completeExceptionally(ex1);
898          final CompletableFuture<Integer> g = f.exceptionally
899              ((Throwable t) -> {
900 +                ExecutionMode.DEFAULT.checkExecutionMode();
901                  threadAssertSame(t, ex1);
902                  a.getAndIncrement();
903                  throw ex2;
904              });
905          if (createIncomplete) f.completeExceptionally(ex1);
906  
907 <        checkCompletedWithWrappedCFException(g, ex2);
907 >        checkCompletedWithWrappedException(g, ex2);
908 >        assertEquals(1, a.get());
909 >    }}
910 >
911 >    /**
912 >     * whenComplete action executes on normal completion, propagating
913 >     * source result.
914 >     */
915 >    public void testWhenComplete_normalCompletion1() {
916 >        for (ExecutionMode m : ExecutionMode.values())
917 >        for (boolean createIncomplete : new boolean[] { true, false })
918 >        for (Integer v1 : new Integer[] { 1, null })
919 >    {
920 >        final AtomicInteger a = new AtomicInteger(0);
921 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
922 >        if (!createIncomplete) assertTrue(f.complete(v1));
923 >        final CompletableFuture<Integer> g = m.whenComplete
924 >            (f,
925 >             (Integer x, Throwable t) -> {
926 >                m.checkExecutionMode();
927 >                threadAssertSame(x, v1);
928 >                threadAssertNull(t);
929 >                a.getAndIncrement();
930 >            });
931 >        if (createIncomplete) assertTrue(f.complete(v1));
932 >
933 >        checkCompletedNormally(g, v1);
934 >        checkCompletedNormally(f, v1);
935 >        assertEquals(1, a.get());
936 >    }}
937 >
938 >    /**
939 >     * whenComplete action executes on exceptional completion, propagating
940 >     * source result.
941 >     */
942 >    public void testWhenComplete_exceptionalCompletion() {
943 >        for (ExecutionMode m : ExecutionMode.values())
944 >        for (boolean createIncomplete : new boolean[] { true, false })
945 >        for (Integer v1 : new Integer[] { 1, null })
946 >    {
947 >        final AtomicInteger a = new AtomicInteger(0);
948 >        final CFException ex = new CFException();
949 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
950 >        if (!createIncomplete) f.completeExceptionally(ex);
951 >        final CompletableFuture<Integer> g = m.whenComplete
952 >            (f,
953 >             (Integer x, Throwable t) -> {
954 >                m.checkExecutionMode();
955 >                threadAssertNull(x);
956 >                threadAssertSame(t, ex);
957 >                a.getAndIncrement();
958 >            });
959 >        if (createIncomplete) f.completeExceptionally(ex);
960 >
961 >        checkCompletedWithWrappedException(g, ex);
962 >        checkCompletedExceptionally(f, ex);
963 >        assertEquals(1, a.get());
964 >    }}
965 >
966 >    /**
967 >     * whenComplete action executes on cancelled source, propagating
968 >     * CancellationException.
969 >     */
970 >    public void testWhenComplete_sourceCancelled() {
971 >        for (ExecutionMode m : ExecutionMode.values())
972 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
973 >        for (boolean createIncomplete : new boolean[] { true, false })
974 >    {
975 >        final AtomicInteger a = new AtomicInteger(0);
976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978 >        final CompletableFuture<Integer> g = m.whenComplete
979 >            (f,
980 >             (Integer x, Throwable t) -> {
981 >                m.checkExecutionMode();
982 >                threadAssertNull(x);
983 >                threadAssertTrue(t instanceof CancellationException);
984 >                a.getAndIncrement();
985 >            });
986 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987 >
988 >        checkCompletedWithWrappedCancellationException(g);
989 >        checkCancelled(f);
990 >        assertEquals(1, a.get());
991 >    }}
992 >
993 >    /**
994 >     * If a whenComplete action throws an exception when triggered by
995 >     * a normal completion, it completes exceptionally
996 >     */
997 >    public void testWhenComplete_actionFailed() {
998 >        for (boolean createIncomplete : new boolean[] { true, false })
999 >        for (ExecutionMode m : ExecutionMode.values())
1000 >        for (Integer v1 : new Integer[] { 1, null })
1001 >    {
1002 >        final AtomicInteger a = new AtomicInteger(0);
1003 >        final CFException ex = new CFException();
1004 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1005 >        if (!createIncomplete) assertTrue(f.complete(v1));
1006 >        final CompletableFuture<Integer> g = m.whenComplete
1007 >            (f,
1008 >             (Integer x, Throwable t) -> {
1009 >                m.checkExecutionMode();
1010 >                threadAssertSame(x, v1);
1011 >                threadAssertNull(t);
1012 >                a.getAndIncrement();
1013 >                throw ex;
1014 >            });
1015 >        if (createIncomplete) assertTrue(f.complete(v1));
1016 >
1017 >        checkCompletedWithWrappedException(g, ex);
1018 >        checkCompletedNormally(f, v1);
1019 >        assertEquals(1, a.get());
1020 >    }}
1021 >
1022 >    /**
1023 >     * If a whenComplete action throws an exception when triggered by
1024 >     * a source completion that also throws an exception, the source
1025 >     * exception takes precedence.
1026 >     */
1027 >    public void testWhenComplete_actionFailedSourceFailed() {
1028 >        for (boolean createIncomplete : new boolean[] { true, false })
1029 >        for (ExecutionMode m : ExecutionMode.values())
1030 >        for (Integer v1 : new Integer[] { 1, null })
1031 >    {
1032 >        final AtomicInteger a = new AtomicInteger(0);
1033 >        final CFException ex1 = new CFException();
1034 >        final CFException ex2 = new CFException();
1035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 >
1037 >        if (!createIncomplete) f.completeExceptionally(ex1);
1038 >        final CompletableFuture<Integer> g = m.whenComplete
1039 >            (f,
1040 >             (Integer x, Throwable t) -> {
1041 >                m.checkExecutionMode();
1042 >                threadAssertSame(t, ex1);
1043 >                threadAssertNull(x);
1044 >                a.getAndIncrement();
1045 >                throw ex2;
1046 >            });
1047 >        if (createIncomplete) f.completeExceptionally(ex1);
1048 >
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051          assertEquals(1, a.get());
1052      }}
1053  
# Line 782 | Line 1062 | public class CompletableFutureTest exten
1062      {
1063          final CompletableFuture<Integer> f = new CompletableFuture<>();
1064          final AtomicInteger a = new AtomicInteger(0);
1065 <        if (!createIncomplete) f.complete(v1);
1065 >        if (!createIncomplete) assertTrue(f.complete(v1));
1066          final CompletableFuture<Integer> g = m.handle
1067              (f,
1068               (Integer x, Throwable t) -> {
1069 +                m.checkExecutionMode();
1070                  threadAssertSame(x, v1);
1071                  threadAssertNull(t);
1072                  a.getAndIncrement();
1073                  return inc(v1);
1074              });
1075 <        if (createIncomplete) f.complete(v1);
1075 >        if (createIncomplete) assertTrue(f.complete(v1));
1076  
1077          checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
# Line 814 | Line 1095 | public class CompletableFutureTest exten
1095          final CompletableFuture<Integer> g = m.handle
1096              (f,
1097               (Integer x, Throwable t) -> {
1098 +                m.checkExecutionMode();
1099                  threadAssertNull(x);
1100                  threadAssertSame(t, ex);
1101                  a.getAndIncrement();
# Line 822 | Line 1104 | public class CompletableFutureTest exten
1104          if (createIncomplete) f.completeExceptionally(ex);
1105  
1106          checkCompletedNormally(g, v1);
1107 <        checkCompletedWithWrappedCFException(f, ex);
1107 >        checkCompletedExceptionally(f, ex);
1108          assertEquals(1, a.get());
1109      }}
1110  
# Line 842 | Line 1124 | public class CompletableFutureTest exten
1124          final CompletableFuture<Integer> g = m.handle
1125              (f,
1126               (Integer x, Throwable t) -> {
1127 +                m.checkExecutionMode();
1128                  threadAssertNull(x);
1129                  threadAssertTrue(t instanceof CancellationException);
1130                  a.getAndIncrement();
# Line 869 | Line 1152 | public class CompletableFutureTest exten
1152          final CompletableFuture<Integer> g = m.handle
1153              (f,
1154               (Integer x, Throwable t) -> {
1155 +                m.checkExecutionMode();
1156                  threadAssertNull(x);
1157                  threadAssertSame(ex1, t);
1158                  a.getAndIncrement();
# Line 876 | Line 1160 | public class CompletableFutureTest exten
1160              });
1161          if (createIncomplete) f.completeExceptionally(ex1);
1162  
1163 <        checkCompletedWithWrappedCFException(g, ex2);
1164 <        checkCompletedWithWrappedCFException(f, ex1);
1163 >        checkCompletedWithWrappedException(g, ex2);
1164 >        checkCompletedExceptionally(f, ex1);
1165          assertEquals(1, a.get());
1166      }}
1167  
# Line 889 | Line 1173 | public class CompletableFutureTest exten
1173          final CompletableFuture<Integer> f = new CompletableFuture<>();
1174          final AtomicInteger a = new AtomicInteger(0);
1175          final CFException ex = new CFException();
1176 <        if (!createIncomplete) f.complete(v1);
1176 >        if (!createIncomplete) assertTrue(f.complete(v1));
1177          final CompletableFuture<Integer> g = m.handle
1178              (f,
1179               (Integer x, Throwable t) -> {
1180 +                m.checkExecutionMode();
1181                  threadAssertSame(x, v1);
1182                  threadAssertNull(t);
1183                  a.getAndIncrement();
1184                  throw ex;
1185              });
1186 <        if (createIncomplete) f.complete(v1);
1186 >        if (createIncomplete) assertTrue(f.complete(v1));
1187  
1188 <        checkCompletedWithWrappedCFException(g, ex);
1188 >        checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
1190          assertEquals(1, a.get());
1191      }}
# Line 908 | Line 1193 | public class CompletableFutureTest exten
1193      /**
1194       * runAsync completes after running Runnable
1195       */
1196 <    public void testRunAsync() {
1197 <        Noop r = new Noop();
1198 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1199 <        assertNull(f.join());
1200 <        assertEquals(1, r.invocationCount);
1201 <        checkCompletedNormally(f, null);
1202 <    }
1203 <
1204 <    /**
920 <     * runAsync with executor completes after running Runnable
921 <     */
922 <    public void testRunAsync2() {
923 <        Noop r = new Noop();
924 <        ThreadExecutor exec = new ThreadExecutor();
925 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1196 >    public void testRunAsync_normalCompletion() {
1197 >        ExecutionMode[] executionModes = {
1198 >            ExecutionMode.ASYNC,
1199 >            ExecutionMode.EXECUTOR,
1200 >        };
1201 >        for (ExecutionMode m : executionModes)
1202 >    {
1203 >        final Noop r = new Noop(m);
1204 >        final CompletableFuture<Void> f = m.runAsync(r);
1205          assertNull(f.join());
927        assertEquals(1, r.invocationCount);
1206          checkCompletedNormally(f, null);
1207 <        assertEquals(1, exec.count.get());
1208 <    }
1207 >        r.assertInvoked();
1208 >    }}
1209  
1210      /**
1211       * failing runAsync completes exceptionally after running Runnable
1212       */
1213 <    public void testRunAsync3() {
1214 <        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);
959 <        checkCompletedNormally(f, one);
960 <    }
1229 >    public void testSupplyAsync_normalCompletion() {
1230 >        ExecutionMode[] executionModes = {
1231 >            ExecutionMode.ASYNC,
1232 >            ExecutionMode.EXECUTOR,
1233 >        };
1234 >        for (ExecutionMode m : executionModes)
1235 >        for (Integer v1 : new Integer[] { 1, null })
1236 >    {
1237 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1238 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1239 >        assertSame(v1, f.join());
1240 >        checkCompletedNormally(f, v1);
1241 >        r.assertInvoked();
1242 >    }}
1243  
1244      /**
1245       * Failing supplyAsync completes exceptionally
1246       */
1247 <    public void testSupplyAsync3() {
1248 <        FailingSupplier r = new FailingSupplier();
1249 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1247 >    public void testSupplyAsync_exceptionalCompletion() {
1248 >        ExecutionMode[] executionModes = {
1249 >            ExecutionMode.ASYNC,
1250 >            ExecutionMode.EXECUTOR,
1251 >        };
1252 >        for (ExecutionMode m : executionModes)
1253 >    {
1254 >        FailingSupplier r = new FailingSupplier(m);
1255 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1256          checkCompletedWithWrappedCFException(f);
1257 <        assertEquals(1, r.invocationCount);
1258 <    }
1257 >        r.assertInvoked();
1258 >    }}
1259  
1260      // seq completion methods
1261  
# Line 976 | Line 1264 | public class CompletableFutureTest exten
1264       */
1265      public void testThenRun_normalCompletion() {
1266          for (ExecutionMode m : ExecutionMode.values())
979        for (boolean createIncomplete : new boolean[] { true, false })
1267          for (Integer v1 : new Integer[] { 1, null })
1268      {
1269          final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 <        final Noop r = new Noop();
1271 <        if (!createIncomplete) f.complete(v1);
985 <        final CompletableFuture<Void> g = m.thenRun(f, r);
986 <        if (createIncomplete) f.complete(v1);
1270 >        final Noop[] rs = new Noop[6];
1271 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1272  
1273 <        checkCompletedNormally(g, null);
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 <        assertEquals(1, r.invocationCount);
1291 >        for (Noop r : rs) r.assertInvoked();
1292      }}
1293  
1294      /**
# Line 996 | Line 1297 | public class CompletableFutureTest exten
1297       */
1298      public void testThenRun_exceptionalCompletion() {
1299          for (ExecutionMode m : ExecutionMode.values())
999        for (boolean createIncomplete : new boolean[] { true, false })
1300      {
1301          final CFException ex = new CFException();
1302          final CompletableFuture<Integer> f = new CompletableFuture<>();
1303 <        final Noop r = new Noop();
1304 <        if (!createIncomplete) f.completeExceptionally(ex);
1005 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1006 <        if (createIncomplete) f.completeExceptionally(ex);
1303 >        final Noop[] rs = new Noop[6];
1304 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1305  
1306 <        checkCompletedWithWrappedCFException(g, ex);
1307 <        checkCompletedWithWrappedCFException(f, ex);
1308 <        assertEquals(0, r.invocationCount);
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      /**
# Line 1015 | Line 1329 | public class CompletableFutureTest exten
1329       */
1330      public void testThenRun_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1018        for (boolean createIncomplete : new boolean[] { true, false })
1332          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333      {
1334          final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 <        final Noop r = new Noop();
1336 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1024 <        final CompletableFuture<Void> g = f.thenRun(r);
1025 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337  
1338 <        checkCompletedWithWrappedCancellationException(g);
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 <        assertEquals(0, r.invocationCount);
1356 >        for (Noop r : rs) r.assertNotInvoked();
1357      }}
1358  
1359      /**
# Line 1034 | Line 1361 | public class CompletableFutureTest exten
1361       */
1362      public void testThenRun_actionFailed() {
1363          for (ExecutionMode m : ExecutionMode.values())
1037        for (boolean createIncomplete : new boolean[] { true, false })
1364          for (Integer v1 : new Integer[] { 1, null })
1365      {
1366          final CompletableFuture<Integer> f = new CompletableFuture<>();
1367 <        final FailingNoop r = new FailingNoop();
1368 <        if (!createIncomplete) f.complete(v1);
1043 <        final CompletableFuture<Void> g = f.thenRun(r);
1044 <        if (createIncomplete) f.complete(v1);
1367 >        final FailingRunnable[] rs = new FailingRunnable[6];
1368 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369  
1370 <        checkCompletedWithWrappedCFException(g);
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(h0);
1379 >        checkCompletedWithWrappedCFException(h1);
1380 >        checkCompletedWithWrappedCFException(h2);
1381 >        checkCompletedWithWrappedCFException(h3);
1382 >        checkCompletedWithWrappedCFException(h4);
1383 >        checkCompletedWithWrappedCFException(h5);
1384          checkCompletedNormally(f, v1);
1385      }}
1386  
1387      /**
1388       * thenApply result completes normally after normal completion of source
1389       */
1390 <    public void testThenApply() {
1054 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1055 <        CompletableFuture<Integer> g = f.thenApply(inc);
1056 <        f.complete(one);
1057 <        checkCompletedNormally(g, two);
1058 <    }
1059 <
1060 <    /**
1061 <     * thenApply result completes exceptionally after exceptional
1062 <     * completion of source
1063 <     */
1064 <    public void testThenApply2() {
1065 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1066 <        CompletableFuture<Integer> g = f.thenApply(inc);
1067 <        f.completeExceptionally(new CFException());
1068 <        checkCompletedWithWrappedCFException(g);
1069 <    }
1070 <
1071 <    /**
1072 <     * thenApply result completes exceptionally if action does
1073 <     */
1074 <    public void testThenApply3() {
1075 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1076 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1077 <        f.complete(one);
1078 <        checkCompletedWithWrappedCFException(g);
1079 <    }
1080 <
1081 <    /**
1082 <     * thenApply result completes exceptionally if source cancelled
1083 <     */
1084 <    public void testThenApply4() {
1085 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1086 <        CompletableFuture<Integer> g = f.thenApply(inc);
1087 <        assertTrue(f.cancel(true));
1088 <        checkCompletedWithWrappedCancellationException(g);
1089 <    }
1090 <
1091 <    /**
1092 <     * thenAccept result completes normally after normal completion of source
1093 <     */
1094 <    public void testThenAccept() {
1095 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1096 <        IncAction r = new IncAction();
1097 <        CompletableFuture<Void> g = f.thenAccept(r);
1098 <        f.complete(one);
1099 <        checkCompletedNormally(g, null);
1100 <        assertEquals(r.value, (Integer) 2);
1101 <    }
1102 <
1103 <    /**
1104 <     * thenAccept result completes exceptionally after exceptional
1105 <     * completion of source
1106 <     */
1107 <    public void testThenAccept2() {
1108 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1109 <        IncAction r = new IncAction();
1110 <        CompletableFuture<Void> g = f.thenAccept(r);
1111 <        f.completeExceptionally(new CFException());
1112 <        checkCompletedWithWrappedCFException(g);
1113 <    }
1114 <
1115 <    /**
1116 <     * thenAccept result completes exceptionally if action does
1117 <     */
1118 <    public void testThenAccept3() {
1119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1120 <        FailingConsumer r = new FailingConsumer();
1121 <        CompletableFuture<Void> g = f.thenAccept(r);
1122 <        f.complete(one);
1123 <        checkCompletedWithWrappedCFException(g);
1124 <        assertEquals(1, r.invocationCount);
1125 <    }
1126 <
1127 <    /**
1128 <     * thenAccept result completes exceptionally if source cancelled
1129 <     */
1130 <    public void testThenAccept4() {
1131 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1132 <        IncAction r = new IncAction();
1133 <        CompletableFuture<Void> g = f.thenAccept(r);
1134 <        assertTrue(f.cancel(true));
1135 <        checkCompletedWithWrappedCancellationException(g);
1136 <    }
1137 <
1138 <    /**
1139 <     * thenCombine result completes normally after normal completion
1140 <     * of sources
1141 <     */
1142 <    public void testThenCombine_normalCompletion1() {
1143 <        for (boolean createIncomplete : new boolean[] { true, false })
1144 <        for (boolean fFirst : new boolean[] { true, false })
1390 >    public void testThenApply_normalCompletion() {
1391          for (ExecutionMode m : ExecutionMode.values())
1392          for (Integer v1 : new Integer[] { 1, null })
1147        for (Integer v2 : new Integer[] { 2, null })
1393      {
1394          final CompletableFuture<Integer> f = new CompletableFuture<>();
1395 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1396 <        final SubtractFunction r = new SubtractFunction();
1397 <        CompletableFuture<Integer> h = null;
1398 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1399 <
1400 <        if (fFirst)
1401 <            f.complete(v1);
1402 <        else
1403 <            g.complete(v2);
1404 <        if (createIncomplete) checkIncomplete(h);
1160 <        assertEquals(0, r.invocationCount);
1161 <        if (!fFirst)
1162 <            f.complete(v1);
1163 <        else
1164 <            g.complete(v2);
1165 <        if (!createIncomplete) 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 >        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 <        checkCompletedNormally(h, subtract(v1, v2));
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);
1170 <        assertEquals(1, r.invocationCount);
1411 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1412      }}
1413  
1414      /**
1415 <     * thenCombine result completes exceptionally after exceptional
1416 <     * completion of either source
1415 >     * thenApply result completes exceptionally after exceptional
1416 >     * completion of source
1417       */
1418 <    public void testThenCombine_exceptionalCompletion1() {
1418 >    public void testThenApply_exceptionalCompletion() {
1419          for (ExecutionMode m : ExecutionMode.values())
1179        for (Integer v1 : new Integer[] { 1, null })
1420      {
1181        final CompletableFuture<Integer> f = new CompletableFuture<>();
1182        final CompletableFuture<Integer> g = new CompletableFuture<>();
1183        final SubtractFunction r = new SubtractFunction();
1184        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1421          final CFException ex = new CFException();
1186
1187        f.completeExceptionally(ex);
1188        checkIncomplete(h);
1189        g.complete(v1);
1190
1191        checkCompletedWithWrappedCFException(h, ex);
1192        checkCompletedWithWrappedCFException(f, ex);
1193        assertEquals(0, r.invocationCount);
1194        checkCompletedNormally(g, v1);
1195    }}
1196
1197    public void testThenCombine_exceptionalCompletion2() {
1198        for (ExecutionMode m : ExecutionMode.values())
1199        for (Integer v1 : new Integer[] { 1, null })
1200    {
1201        final CompletableFuture<Integer> f = new CompletableFuture<>();
1202        final CompletableFuture<Integer> g = new CompletableFuture<>();
1203        final SubtractFunction r = new SubtractFunction();
1204        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1205        final CFException ex = new CFException();
1206
1207        g.completeExceptionally(ex);
1208        checkIncomplete(h);
1209        f.complete(v1);
1210
1211        checkCompletedWithWrappedCFException(h, ex);
1212        checkCompletedWithWrappedCFException(g, ex);
1213        assertEquals(0, r.invocationCount);
1214        checkCompletedNormally(f, v1);
1215    }}
1216
1217    public void testThenCombine_exceptionalCompletion3() {
1218        for (ExecutionMode m : ExecutionMode.values())
1219        for (Integer v1 : new Integer[] { 1, null })
1220    {
1422          final CompletableFuture<Integer> f = new CompletableFuture<>();
1423 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1424 <        final SubtractFunction r = new SubtractFunction();
1224 <        final CFException ex = new CFException();
1423 >        final IncFunction[] rs = new IncFunction[4];
1424 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1425  
1426 <        g.completeExceptionally(ex);
1427 <        f.complete(v1);
1428 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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, ex);
1433 <        checkCompletedWithWrappedCFException(g, ex);
1434 <        assertEquals(0, r.invocationCount);
1435 <        checkCompletedNormally(f, v1);
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 <    public void testThenCombine_exceptionalCompletion4() {
1440 >    /**
1441 >     * thenApply result completes exceptionally if source cancelled
1442 >     */
1443 >    public void testThenApply_sourceCancelled() {
1444          for (ExecutionMode m : ExecutionMode.values())
1445 <        for (Integer v1 : new Integer[] { 1, null })
1445 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1446      {
1447          final CompletableFuture<Integer> f = new CompletableFuture<>();
1448 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1449 <        final SubtractFunction r = new SubtractFunction();
1243 <        final CFException ex = new CFException();
1448 >        final IncFunction[] rs = new IncFunction[4];
1449 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1450  
1451 <        f.completeExceptionally(ex);
1452 <        g.complete(v1);
1453 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1455 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1456  
1457 <        checkCompletedWithWrappedCFException(h, ex);
1458 <        checkCompletedWithWrappedCFException(f, ex);
1459 <        assertEquals(0, r.invocationCount);
1460 <        checkCompletedNormally(g, v1);
1457 >        checkCompletedWithWrappedCancellationException(h0);
1458 >        checkCompletedWithWrappedCancellationException(h1);
1459 >        checkCompletedWithWrappedCancellationException(h2);
1460 >        checkCompletedWithWrappedCancellationException(h3);
1461 >        checkCancelled(f);
1462 >        for (IncFunction r : rs) r.assertNotInvoked();
1463      }}
1464  
1465      /**
1466 <     * thenCombine result completes exceptionally if action does
1466 >     * thenApply result completes exceptionally if action does
1467       */
1468 <    public void testThenCombine_actionFailed1() {
1468 >    public void testThenApply_actionFailed() {
1469          for (ExecutionMode m : ExecutionMode.values())
1470          for (Integer v1 : new Integer[] { 1, null })
1261        for (Integer v2 : new Integer[] { 2, null })
1471      {
1472          final CompletableFuture<Integer> f = new CompletableFuture<>();
1473 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1474 <        final FailingBiFunction r = new FailingBiFunction();
1266 <        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 <        f.complete(v1);
1477 <        checkIncomplete(h);
1478 <        g.complete(v2);
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 <        checkCompletedWithWrappedCFException(h);
1482 >        checkCompletedWithWrappedCFException(h0);
1483 >        checkCompletedWithWrappedCFException(h1);
1484 >        checkCompletedWithWrappedCFException(h2);
1485 >        checkCompletedWithWrappedCFException(h3);
1486          checkCompletedNormally(f, v1);
1274        checkCompletedNormally(g, v2);
1275    }}
1276
1277    public void testThenCombine_actionFailed2() {
1278        for (ExecutionMode m : ExecutionMode.values())
1279        for (Integer v1 : new Integer[] { 1, null })
1280        for (Integer v2 : new Integer[] { 2, null })
1281    {
1282        final CompletableFuture<Integer> f = new CompletableFuture<>();
1283        final CompletableFuture<Integer> g = new CompletableFuture<>();
1284        final FailingBiFunction r = new FailingBiFunction();
1285        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1286
1287        g.complete(v2);
1288        checkIncomplete(h);
1289        f.complete(v1);
1290
1291        checkCompletedWithWrappedCFException(h);
1292        checkCompletedNormally(f, v1);
1293        checkCompletedNormally(g, v2);
1487      }}
1488  
1489      /**
1490 <     * thenCombine result completes exceptionally if either source cancelled
1490 >     * thenAccept result completes normally after normal completion of source
1491       */
1492 <    public void testThenCombine_sourceCancelled1() {
1300 <        for (ExecutionMode m : ExecutionMode.values())
1301 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1302 <        for (Integer v1 : new Integer[] { 1, null })
1303 <    {
1304 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1305 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1306 <        final SubtractFunction r = new SubtractFunction();
1307 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1308 <
1309 <        assertTrue(f.cancel(mayInterruptIfRunning));
1310 <        checkIncomplete(h);
1311 <        g.complete(v1);
1312 <
1313 <        checkCompletedWithWrappedCancellationException(h);
1314 <        checkCancelled(f);
1315 <        assertEquals(0, r.invocationCount);
1316 <        checkCompletedNormally(g, v1);
1317 <    }}
1318 <
1319 <    public void testThenCombine_sourceCancelled2() {
1492 >    public void testThenAccept_normalCompletion() {
1493          for (ExecutionMode m : ExecutionMode.values())
1321        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();
1327 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        checkIncomplete(h);
1502 <        f.complete(v1);
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 +        for (NoopConsumer r : rs) r.assertValue(v1);
1514      }}
1515  
1516 <    public void testThenCombine_sourceCancelled3() {
1516 >    /**
1517 >     * thenAccept result completes exceptionally after exceptional
1518 >     * completion of source
1519 >     */
1520 >    public void testThenAccept_exceptionalCompletion() {
1521          for (ExecutionMode m : ExecutionMode.values())
1341        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1342        for (Integer v1 : new Integer[] { 1, null })
1522      {
1523 +        final CFException ex = new CFException();
1524          final CompletableFuture<Integer> f = new CompletableFuture<>();
1525 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1526 <        final SubtractFunction r = new SubtractFunction();
1525 >        final NoopConsumer[] rs = new NoopConsumer[4];
1526 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1527  
1528 <        assertTrue(g.cancel(mayInterruptIfRunning));
1529 <        f.complete(v1);
1530 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
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 <        checkCompletedWithWrappedCancellationException(h);
1535 <        checkCancelled(g);
1536 <        assertEquals(0, r.invocationCount);
1537 <        checkCompletedNormally(f, v1);
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 testThenCombine_sourceCancelled4() {
1542 >    /**
1543 >     * thenAccept result completes exceptionally if source cancelled
1544 >     */
1545 >    public void testThenAccept_sourceCancelled() {
1546          for (ExecutionMode m : ExecutionMode.values())
1547          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1361        for (Integer v1 : new Integer[] { 1, null })
1548      {
1549          final CompletableFuture<Integer> f = new CompletableFuture<>();
1550 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1551 <        final SubtractFunction r = new SubtractFunction();
1550 >        final NoopConsumer[] rs = new NoopConsumer[4];
1551 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1552  
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 <        g.complete(v1);
1557 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1556 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1557 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1558  
1559 <        checkCompletedWithWrappedCancellationException(h);
1559 >        checkCompletedWithWrappedCancellationException(h0);
1560 >        checkCompletedWithWrappedCancellationException(h1);
1561 >        checkCompletedWithWrappedCancellationException(h2);
1562 >        checkCompletedWithWrappedCancellationException(h3);
1563          checkCancelled(f);
1564 <        assertEquals(0, r.invocationCount);
1374 <        checkCompletedNormally(g, v1);
1564 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1565      }}
1566  
1567      /**
1568 <     * thenAcceptBoth result completes normally after normal
1379 <     * completion of sources
1568 >     * thenAccept result completes exceptionally if action does
1569       */
1570 <    public void testThenAcceptBoth_normalCompletion1() {
1570 >    public void testThenAccept_actionFailed() {
1571          for (ExecutionMode m : ExecutionMode.values())
1572          for (Integer v1 : new Integer[] { 1, null })
1384        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();
1389 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1575 >        final FailingConsumer[] rs = new FailingConsumer[4];
1576 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1577  
1578 <        f.complete(v1);
1579 <        checkIncomplete(h);
1580 <        assertEquals(0, r.invocationCount);
1581 <        g.complete(v2);
1582 <
1396 <        checkCompletedNormally(h, null);
1397 <        assertEquals(subtract(v1, v2), r.value);
1398 <        checkCompletedNormally(f, v1);
1399 <        checkCompletedNormally(g, v2);
1400 <    }}
1401 <
1402 <    public void testThenAcceptBoth_normalCompletion2() {
1403 <        for (ExecutionMode m : ExecutionMode.values())
1404 <        for (Integer v1 : new Integer[] { 1, null })
1405 <        for (Integer v2 : new Integer[] { 2, null })
1406 <    {
1407 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1408 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1409 <        final SubtractAction r = new SubtractAction();
1410 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1411 <
1412 <        g.complete(v2);
1413 <        checkIncomplete(h);
1414 <        assertEquals(0, r.invocationCount);
1415 <        f.complete(v1);
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);
1420        checkCompletedNormally(g, v2);
1589      }}
1590  
1591 <    public void testThenAcceptBoth_normalCompletion3() {
1592 <        for (ExecutionMode m : ExecutionMode.values())
1593 <        for (Integer v1 : new Integer[] { 1, null })
1594 <        for (Integer v2 : new Integer[] { 2, null })
1595 <    {
1428 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1429 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1430 <        final SubtractAction r = new SubtractAction();
1431 <
1432 <        g.complete(v2);
1433 <        f.complete(v1);
1434 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1435 <
1436 <        checkCompletedNormally(h, null);
1437 <        assertEquals(subtract(v1, v2), r.value);
1438 <        checkCompletedNormally(f, v1);
1439 <        checkCompletedNormally(g, v2);
1440 <    }}
1441 <
1442 <    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 <
1451 <        f.complete(v1);
1452 <        g.complete(v2);
1453 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1603 >        final SubtractFunction[] rs = new SubtractFunction[6];
1604 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1605  
1606 <        checkCompletedNormally(h, null);
1607 <        assertEquals(subtract(v1, v2), r.value);
1606 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1607 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1608 >        final Integer w1 =  fFirst ? v1 : v2;
1609 >        final Integer w2 = !fFirst ? v1 : v2;
1610 >
1611 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1612 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1613 >        assertTrue(fst.complete(w1));
1614 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1615 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1616 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1617 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1618 >        checkCompletedNormally(h1, subtract(w1, w1));
1619 >        checkCompletedNormally(h3, subtract(w1, w1));
1620 >        rs[1].assertValue(subtract(w1, w1));
1621 >        rs[3].assertValue(subtract(w1, w1));
1622 >        assertTrue(snd.complete(w2));
1623 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1624 >
1625 >        checkCompletedNormally(h0, subtract(v1, v2));
1626 >        checkCompletedNormally(h2, subtract(v1, v2));
1627 >        checkCompletedNormally(h4, subtract(v1, v2));
1628 >        rs[0].assertValue(subtract(v1, v2));
1629 >        rs[2].assertValue(subtract(v1, v2));
1630 >        rs[4].assertValue(subtract(v1, v2));
1631 >      
1632          checkCompletedNormally(f, v1);
1633          checkCompletedNormally(g, v2);
1634      }}
1635  
1636      /**
1637 <     * thenAcceptBoth result completes exceptionally after exceptional
1637 >     * thenCombine result completes exceptionally after exceptional
1638       * completion of either source
1639       */
1640 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1466 <        for (ExecutionMode m : ExecutionMode.values())
1467 <        for (Integer v1 : new Integer[] { 1, null })
1468 <    {
1469 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1471 <        final SubtractAction r = new SubtractAction();
1472 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1473 <        final CFException ex = new CFException();
1474 <
1475 <        f.completeExceptionally(ex);
1476 <        checkIncomplete(h);
1477 <        g.complete(v1);
1478 <
1479 <        checkCompletedWithWrappedCFException(h, ex);
1480 <        checkCompletedWithWrappedCFException(f, ex);
1481 <        assertEquals(0, r.invocationCount);
1482 <        checkCompletedNormally(g, v1);
1483 <    }}
1484 <
1485 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1640 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1641          for (ExecutionMode m : ExecutionMode.values())
1642 +        for (boolean fFirst : new boolean[] { true, false })
1643 +        for (boolean failFirst : new boolean[] { true, false })
1644          for (Integer v1 : new Integer[] { 1, null })
1645      {
1646          final CompletableFuture<Integer> f = new CompletableFuture<>();
1647          final CompletableFuture<Integer> g = new CompletableFuture<>();
1491        final SubtractAction r = new SubtractAction();
1492        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1648          final CFException ex = new CFException();
1649 <
1650 <        g.completeExceptionally(ex);
1651 <        checkIncomplete(h);
1652 <        f.complete(v1);
1653 <
1654 <        checkCompletedWithWrappedCFException(h, ex);
1655 <        checkCompletedWithWrappedCFException(g, ex);
1656 <        assertEquals(0, r.invocationCount);
1657 <        checkCompletedNormally(f, v1);
1649 >        final SubtractFunction r1 = new SubtractFunction(m);
1650 >        final SubtractFunction r2 = new SubtractFunction(m);
1651 >        final SubtractFunction r3 = new SubtractFunction(m);
1652 >
1653 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1654 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1655 >        final Callable<Boolean> complete1 = failFirst ?
1656 >            () -> fst.completeExceptionally(ex) :
1657 >            () -> fst.complete(v1);
1658 >        final Callable<Boolean> complete2 = failFirst ?
1659 >            () -> snd.complete(v1) :
1660 >            () -> snd.completeExceptionally(ex);
1661 >
1662 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1663 >        assertTrue(complete1.call());
1664 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1665 >        checkIncomplete(h1);
1666 >        checkIncomplete(h2);
1667 >        assertTrue(complete2.call());
1668 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1669 >
1670 >        checkCompletedWithWrappedException(h1, ex);
1671 >        checkCompletedWithWrappedException(h2, ex);
1672 >        checkCompletedWithWrappedException(h3, ex);
1673 >        r1.assertNotInvoked();
1674 >        r2.assertNotInvoked();
1675 >        r3.assertNotInvoked();
1676 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1677 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1678      }}
1679  
1680 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1681 <        for (ExecutionMode m : ExecutionMode.values())
1682 <        for (Integer v1 : new Integer[] { 1, null })
1683 <    {
1509 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1510 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1511 <        final SubtractAction r = new SubtractAction();
1512 <        final CFException ex = new CFException();
1513 <
1514 <        g.completeExceptionally(ex);
1515 <        f.complete(v1);
1516 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1517 <
1518 <        checkCompletedWithWrappedCFException(h, ex);
1519 <        checkCompletedWithWrappedCFException(g, ex);
1520 <        assertEquals(0, r.invocationCount);
1521 <        checkCompletedNormally(f, v1);
1522 <    }}
1523 <
1524 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1680 >    /**
1681 >     * thenCombine result completes exceptionally if either source cancelled
1682 >     */
1683 >    public void testThenCombine_sourceCancelled() throws Throwable {
1684          for (ExecutionMode m : ExecutionMode.values())
1685 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1686 +        for (boolean fFirst : new boolean[] { true, false })
1687 +        for (boolean failFirst : new boolean[] { true, false })
1688          for (Integer v1 : new Integer[] { 1, null })
1689      {
1690          final CompletableFuture<Integer> f = new CompletableFuture<>();
1691          final CompletableFuture<Integer> g = new CompletableFuture<>();
1692 <        final SubtractAction r = new SubtractAction();
1693 <        final CFException ex = new CFException();
1694 <
1695 <        f.completeExceptionally(ex);
1696 <        g.complete(v1);
1697 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1698 <
1699 <        checkCompletedWithWrappedCFException(h, ex);
1700 <        checkCompletedWithWrappedCFException(f, ex);
1701 <        assertEquals(0, r.invocationCount);
1702 <        checkCompletedNormally(g, v1);
1692 >        final SubtractFunction r1 = new SubtractFunction(m);
1693 >        final SubtractFunction r2 = new SubtractFunction(m);
1694 >        final SubtractFunction r3 = new SubtractFunction(m);
1695 >
1696 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1697 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1698 >        final Callable<Boolean> complete1 = failFirst ?
1699 >            () -> fst.cancel(mayInterruptIfRunning) :
1700 >            () -> fst.complete(v1);
1701 >        final Callable<Boolean> complete2 = failFirst ?
1702 >            () -> snd.complete(v1) :
1703 >            () -> snd.cancel(mayInterruptIfRunning);
1704 >
1705 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1706 >        assertTrue(complete1.call());
1707 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1708 >        checkIncomplete(h1);
1709 >        checkIncomplete(h2);
1710 >        assertTrue(complete2.call());
1711 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1712 >
1713 >        checkCompletedWithWrappedCancellationException(h1);
1714 >        checkCompletedWithWrappedCancellationException(h2);
1715 >        checkCompletedWithWrappedCancellationException(h3);
1716 >        r1.assertNotInvoked();
1717 >        r2.assertNotInvoked();
1718 >        r3.assertNotInvoked();
1719 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1720 >        checkCancelled(failFirst ? fst : snd);
1721      }}
1722  
1723      /**
1724 <     * thenAcceptBoth result completes exceptionally if action does
1724 >     * thenCombine result completes exceptionally if action does
1725       */
1726 <    public void testThenAcceptBoth_actionFailed1() {
1726 >    public void testThenCombine_actionFailed() {
1727          for (ExecutionMode m : ExecutionMode.values())
1728 +        for (boolean fFirst : new boolean[] { true, false })
1729          for (Integer v1 : new Integer[] { 1, null })
1730          for (Integer v2 : new Integer[] { 2, null })
1731      {
1732          final CompletableFuture<Integer> f = new CompletableFuture<>();
1733          final CompletableFuture<Integer> g = new CompletableFuture<>();
1734 <        final FailingBiConsumer r = new FailingBiConsumer();
1735 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1736 <
1737 <        f.complete(v1);
1738 <        checkIncomplete(h);
1739 <        g.complete(v2);
1740 <
1741 <        checkCompletedWithWrappedCFException(h);
1734 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1735 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1736 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1737 >
1738 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1739 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1740 >        final Integer w1 =  fFirst ? v1 : v2;
1741 >        final Integer w2 = !fFirst ? v1 : v2;
1742 >
1743 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1744 >        assertTrue(fst.complete(w1));
1745 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1746 >        assertTrue(snd.complete(w2));
1747 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1748 >
1749 >        checkCompletedWithWrappedCFException(h1);
1750 >        checkCompletedWithWrappedCFException(h2);
1751 >        checkCompletedWithWrappedCFException(h3);
1752 >        r1.assertInvoked();
1753 >        r2.assertInvoked();
1754 >        r3.assertInvoked();
1755          checkCompletedNormally(f, v1);
1756          checkCompletedNormally(g, v2);
1757      }}
1758  
1759 <    public void testThenAcceptBoth_actionFailed2() {
1759 >    /**
1760 >     * thenAcceptBoth result completes normally after normal
1761 >     * completion of sources
1762 >     */
1763 >    public void testThenAcceptBoth_normalCompletion() {
1764          for (ExecutionMode m : ExecutionMode.values())
1765 +        for (boolean fFirst : new boolean[] { true, false })
1766          for (Integer v1 : new Integer[] { 1, null })
1767          for (Integer v2 : new Integer[] { 2, null })
1768      {
1769          final CompletableFuture<Integer> f = new CompletableFuture<>();
1770          final CompletableFuture<Integer> g = new CompletableFuture<>();
1771 <        final FailingBiConsumer r = new FailingBiConsumer();
1772 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1773 <
1774 <        g.complete(v2);
1775 <        checkIncomplete(h);
1776 <        f.complete(v1);
1777 <
1778 <        checkCompletedWithWrappedCFException(h);
1771 >        final SubtractAction r1 = new SubtractAction(m);
1772 >        final SubtractAction r2 = new SubtractAction(m);
1773 >        final SubtractAction r3 = new SubtractAction(m);
1774 >
1775 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1776 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1777 >        final Integer w1 =  fFirst ? v1 : v2;
1778 >        final Integer w2 = !fFirst ? v1 : v2;
1779 >
1780 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1781 >        assertTrue(fst.complete(w1));
1782 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1783 >        checkIncomplete(h1);
1784 >        checkIncomplete(h2);
1785 >        r1.assertNotInvoked();
1786 >        r2.assertNotInvoked();
1787 >        assertTrue(snd.complete(w2));
1788 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1789 >
1790 >        checkCompletedNormally(h1, null);
1791 >        checkCompletedNormally(h2, null);
1792 >        checkCompletedNormally(h3, null);
1793 >        r1.assertValue(subtract(v1, v2));
1794 >        r2.assertValue(subtract(v1, v2));
1795 >        r3.assertValue(subtract(v1, v2));
1796          checkCompletedNormally(f, v1);
1797          checkCompletedNormally(g, v2);
1798      }}
1799  
1800      /**
1801 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1801 >     * thenAcceptBoth result completes exceptionally after exceptional
1802 >     * completion of either source
1803       */
1804 <    public void testThenAcceptBoth_sourceCancelled1() {
1588 <        for (ExecutionMode m : ExecutionMode.values())
1589 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1590 <        for (Integer v1 : new Integer[] { 1, null })
1591 <    {
1592 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1593 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1594 <        final SubtractAction r = new SubtractAction();
1595 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1596 <
1597 <        assertTrue(f.cancel(mayInterruptIfRunning));
1598 <        checkIncomplete(h);
1599 <        g.complete(v1);
1600 <
1601 <        checkCompletedWithWrappedCancellationException(h);
1602 <        checkCancelled(f);
1603 <        assertEquals(0, r.invocationCount);
1604 <        checkCompletedNormally(g, v1);
1605 <    }}
1606 <
1607 <    public void testThenAcceptBoth_sourceCancelled2() {
1608 <        for (ExecutionMode m : ExecutionMode.values())
1609 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1610 <        for (Integer v1 : new Integer[] { 1, null })
1611 <    {
1612 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1613 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1614 <        final SubtractAction r = new SubtractAction();
1615 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1616 <
1617 <        assertTrue(g.cancel(mayInterruptIfRunning));
1618 <        checkIncomplete(h);
1619 <        f.complete(v1);
1620 <
1621 <        checkCompletedWithWrappedCancellationException(h);
1622 <        checkCancelled(g);
1623 <        assertEquals(0, r.invocationCount);
1624 <        checkCompletedNormally(f, v1);
1625 <    }}
1626 <
1627 <    public void testThenAcceptBoth_sourceCancelled3() {
1804 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1805          for (ExecutionMode m : ExecutionMode.values())
1806 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1806 >        for (boolean fFirst : new boolean[] { true, false })
1807 >        for (boolean failFirst : new boolean[] { true, false })
1808          for (Integer v1 : new Integer[] { 1, null })
1809      {
1810          final CompletableFuture<Integer> f = new CompletableFuture<>();
1811          final CompletableFuture<Integer> g = new CompletableFuture<>();
1812 <        final SubtractAction r = new SubtractAction();
1813 <
1814 <        assertTrue(g.cancel(mayInterruptIfRunning));
1815 <        f.complete(v1);
1816 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1817 <
1818 <        checkCompletedWithWrappedCancellationException(h);
1819 <        checkCancelled(g);
1820 <        assertEquals(0, r.invocationCount);
1821 <        checkCompletedNormally(f, v1);
1812 >        final CFException ex = new CFException();
1813 >        final SubtractAction r1 = new SubtractAction(m);
1814 >        final SubtractAction r2 = new SubtractAction(m);
1815 >        final SubtractAction r3 = new SubtractAction(m);
1816 >
1817 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1818 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1819 >        final Callable<Boolean> complete1 = failFirst ?
1820 >            () -> fst.completeExceptionally(ex) :
1821 >            () -> fst.complete(v1);
1822 >        final Callable<Boolean> complete2 = failFirst ?
1823 >            () -> snd.complete(v1) :
1824 >            () -> snd.completeExceptionally(ex);
1825 >
1826 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1827 >        assertTrue(complete1.call());
1828 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1829 >        checkIncomplete(h1);
1830 >        checkIncomplete(h2);
1831 >        assertTrue(complete2.call());
1832 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1833 >
1834 >        checkCompletedWithWrappedException(h1, ex);
1835 >        checkCompletedWithWrappedException(h2, ex);
1836 >        checkCompletedWithWrappedException(h3, ex);
1837 >        r1.assertNotInvoked();
1838 >        r2.assertNotInvoked();
1839 >        r3.assertNotInvoked();
1840 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1841 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1842      }}
1843  
1844 <    public void testThenAcceptBoth_sourceCancelled4() {
1844 >    /**
1845 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1846 >     */
1847 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1848          for (ExecutionMode m : ExecutionMode.values())
1849          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1850 +        for (boolean fFirst : new boolean[] { true, false })
1851 +        for (boolean failFirst : new boolean[] { true, false })
1852          for (Integer v1 : new Integer[] { 1, null })
1853      {
1854          final CompletableFuture<Integer> f = new CompletableFuture<>();
1855          final CompletableFuture<Integer> g = new CompletableFuture<>();
1856 <        final SubtractAction r = new SubtractAction();
1857 <
1858 <        assertTrue(f.cancel(mayInterruptIfRunning));
1859 <        g.complete(v1);
1860 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1861 <
1862 <        checkCompletedWithWrappedCancellationException(h);
1863 <        checkCancelled(f);
1864 <        assertEquals(0, r.invocationCount);
1865 <        checkCompletedNormally(g, v1);
1856 >        final SubtractAction r1 = new SubtractAction(m);
1857 >        final SubtractAction r2 = new SubtractAction(m);
1858 >        final SubtractAction r3 = new SubtractAction(m);
1859 >
1860 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1861 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1862 >        final Callable<Boolean> complete1 = failFirst ?
1863 >            () -> fst.cancel(mayInterruptIfRunning) :
1864 >            () -> fst.complete(v1);
1865 >        final Callable<Boolean> complete2 = failFirst ?
1866 >            () -> snd.complete(v1) :
1867 >            () -> snd.cancel(mayInterruptIfRunning);
1868 >
1869 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1870 >        assertTrue(complete1.call());
1871 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1872 >        checkIncomplete(h1);
1873 >        checkIncomplete(h2);
1874 >        assertTrue(complete2.call());
1875 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1876 >
1877 >        checkCompletedWithWrappedCancellationException(h1);
1878 >        checkCompletedWithWrappedCancellationException(h2);
1879 >        checkCompletedWithWrappedCancellationException(h3);
1880 >        r1.assertNotInvoked();
1881 >        r2.assertNotInvoked();
1882 >        r3.assertNotInvoked();
1883 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1884 >        checkCancelled(failFirst ? fst : snd);
1885      }}
1886  
1887      /**
1888 <     * runAfterBoth result completes normally after normal
1667 <     * completion of sources
1888 >     * thenAcceptBoth result completes exceptionally if action does
1889       */
1890 <    public void testRunAfterBoth_normalCompletion1() {
1670 <        for (ExecutionMode m : ExecutionMode.values())
1671 <        for (Integer v1 : new Integer[] { 1, null })
1672 <        for (Integer v2 : new Integer[] { 2, null })
1673 <    {
1674 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1675 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1676 <        final Noop r = new Noop();
1677 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1678 <
1679 <        f.complete(v1);
1680 <        checkIncomplete(h);
1681 <        assertEquals(0, r.invocationCount);
1682 <        g.complete(v2);
1683 <
1684 <        checkCompletedNormally(h, null);
1685 <        assertEquals(1, r.invocationCount);
1686 <        checkCompletedNormally(f, v1);
1687 <        checkCompletedNormally(g, v2);
1688 <    }}
1689 <
1690 <    public void testRunAfterBoth_normalCompletion2() {
1691 <        for (ExecutionMode m : ExecutionMode.values())
1692 <        for (Integer v1 : new Integer[] { 1, null })
1693 <        for (Integer v2 : new Integer[] { 2, null })
1694 <    {
1695 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1696 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final Noop r = new Noop();
1698 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1699 <
1700 <        g.complete(v2);
1701 <        checkIncomplete(h);
1702 <        assertEquals(0, r.invocationCount);
1703 <        f.complete(v1);
1704 <
1705 <        checkCompletedNormally(h, null);
1706 <        assertEquals(1, r.invocationCount);
1707 <        checkCompletedNormally(f, v1);
1708 <        checkCompletedNormally(g, v2);
1709 <    }}
1710 <
1711 <    public void testRunAfterBoth_normalCompletion3() {
1890 >    public void testThenAcceptBoth_actionFailed() {
1891          for (ExecutionMode m : ExecutionMode.values())
1892 +        for (boolean fFirst : new boolean[] { true, false })
1893          for (Integer v1 : new Integer[] { 1, null })
1894          for (Integer v2 : new Integer[] { 2, null })
1895      {
1896          final CompletableFuture<Integer> f = new CompletableFuture<>();
1897          final CompletableFuture<Integer> g = new CompletableFuture<>();
1898 <        final Noop r = new Noop();
1899 <
1900 <        g.complete(v2);
1901 <        f.complete(v1);
1902 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1903 <
1904 <        checkCompletedNormally(h, null);
1905 <        assertEquals(1, r.invocationCount);
1898 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1899 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1900 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1901 >
1902 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1903 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1904 >        final Integer w1 =  fFirst ? v1 : v2;
1905 >        final Integer w2 = !fFirst ? v1 : v2;
1906 >
1907 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1908 >        assertTrue(fst.complete(w1));
1909 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1910 >        assertTrue(snd.complete(w2));
1911 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1912 >
1913 >        checkCompletedWithWrappedCFException(h1);
1914 >        checkCompletedWithWrappedCFException(h2);
1915 >        checkCompletedWithWrappedCFException(h3);
1916 >        r1.assertInvoked();
1917 >        r2.assertInvoked();
1918 >        r3.assertInvoked();
1919          checkCompletedNormally(f, v1);
1920          checkCompletedNormally(g, v2);
1921      }}
1922  
1923 <    public void testRunAfterBoth_normalCompletion4() {
1923 >    /**
1924 >     * runAfterBoth result completes normally after normal
1925 >     * completion of sources
1926 >     */
1927 >    public void testRunAfterBoth_normalCompletion() {
1928          for (ExecutionMode m : ExecutionMode.values())
1929 +        for (boolean fFirst : new boolean[] { true, false })
1930          for (Integer v1 : new Integer[] { 1, null })
1931          for (Integer v2 : new Integer[] { 2, null })
1932      {
1933          final CompletableFuture<Integer> f = new CompletableFuture<>();
1934          final CompletableFuture<Integer> g = new CompletableFuture<>();
1935 <        final Noop r = new Noop();
1936 <
1937 <        f.complete(v1);
1938 <        g.complete(v2);
1939 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1940 <
1941 <        checkCompletedNormally(h, null);
1942 <        assertEquals(1, r.invocationCount);
1935 >        final Noop r1 = new Noop(m);
1936 >        final Noop r2 = new Noop(m);
1937 >        final Noop r3 = new Noop(m);
1938 >
1939 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1940 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1941 >        final Integer w1 =  fFirst ? v1 : v2;
1942 >        final Integer w2 = !fFirst ? v1 : v2;
1943 >
1944 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1945 >        assertTrue(fst.complete(w1));
1946 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1947 >        checkIncomplete(h1);
1948 >        checkIncomplete(h2);
1949 >        r1.assertNotInvoked();
1950 >        r2.assertNotInvoked();
1951 >        assertTrue(snd.complete(w2));
1952 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1953 >
1954 >        checkCompletedNormally(h1, null);
1955 >        checkCompletedNormally(h2, null);
1956 >        checkCompletedNormally(h3, null);
1957 >        r1.assertInvoked();
1958 >        r2.assertInvoked();
1959 >        r3.assertInvoked();
1960          checkCompletedNormally(f, v1);
1961          checkCompletedNormally(g, v2);
1962      }}
# Line 1750 | Line 1965 | public class CompletableFutureTest exten
1965       * runAfterBoth result completes exceptionally after exceptional
1966       * completion of either source
1967       */
1968 <    public void testRunAfterBoth_exceptionalCompletion1() {
1754 <        for (ExecutionMode m : ExecutionMode.values())
1755 <        for (Integer v1 : new Integer[] { 1, null })
1756 <    {
1757 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1758 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1759 <        final Noop r = new Noop();
1760 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1761 <        final CFException ex = new CFException();
1762 <
1763 <        f.completeExceptionally(ex);
1764 <        checkIncomplete(h);
1765 <        g.complete(v1);
1766 <
1767 <        checkCompletedWithWrappedCFException(h, ex);
1768 <        checkCompletedWithWrappedCFException(f, ex);
1769 <        assertEquals(0, r.invocationCount);
1770 <        checkCompletedNormally(g, v1);
1771 <    }}
1772 <
1773 <    public void testRunAfterBoth_exceptionalCompletion2() {
1774 <        for (ExecutionMode m : ExecutionMode.values())
1775 <        for (Integer v1 : new Integer[] { 1, null })
1776 <    {
1777 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1778 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1779 <        final Noop r = new Noop();
1780 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1781 <        final CFException ex = new CFException();
1782 <
1783 <        g.completeExceptionally(ex);
1784 <        checkIncomplete(h);
1785 <        f.complete(v1);
1786 <
1787 <        checkCompletedWithWrappedCFException(h, ex);
1788 <        checkCompletedWithWrappedCFException(g, ex);
1789 <        assertEquals(0, r.invocationCount);
1790 <        checkCompletedNormally(f, v1);
1791 <    }}
1792 <
1793 <    public void testRunAfterBoth_exceptionalCompletion3() {
1968 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1969          for (ExecutionMode m : ExecutionMode.values())
1970 +        for (boolean fFirst : new boolean[] { true, false })
1971 +        for (boolean failFirst : new boolean[] { true, false })
1972          for (Integer v1 : new Integer[] { 1, null })
1973      {
1974          final CompletableFuture<Integer> f = new CompletableFuture<>();
1975          final CompletableFuture<Integer> g = new CompletableFuture<>();
1799        final Noop r = new Noop();
1976          final CFException ex = new CFException();
1977 <
1978 <        g.completeExceptionally(ex);
1979 <        f.complete(v1);
1980 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1981 <
1982 <        checkCompletedWithWrappedCFException(h, ex);
1983 <        checkCompletedWithWrappedCFException(g, ex);
1984 <        assertEquals(0, r.invocationCount);
1985 <        checkCompletedNormally(f, v1);
1977 >        final Noop r1 = new Noop(m);
1978 >        final Noop r2 = new Noop(m);
1979 >        final Noop r3 = new Noop(m);
1980 >
1981 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1982 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1983 >        final Callable<Boolean> complete1 = failFirst ?
1984 >            () -> fst.completeExceptionally(ex) :
1985 >            () -> fst.complete(v1);
1986 >        final Callable<Boolean> complete2 = failFirst ?
1987 >            () -> snd.complete(v1) :
1988 >            () -> snd.completeExceptionally(ex);
1989 >
1990 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1991 >        assertTrue(complete1.call());
1992 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1993 >        checkIncomplete(h1);
1994 >        checkIncomplete(h2);
1995 >        assertTrue(complete2.call());
1996 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1997 >
1998 >        checkCompletedWithWrappedException(h1, ex);
1999 >        checkCompletedWithWrappedException(h2, ex);
2000 >        checkCompletedWithWrappedException(h3, ex);
2001 >        r1.assertNotInvoked();
2002 >        r2.assertNotInvoked();
2003 >        r3.assertNotInvoked();
2004 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2005 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2006      }}
2007  
2008 <    public void testRunAfterBoth_exceptionalCompletion4() {
2008 >    /**
2009 >     * runAfterBoth result completes exceptionally if either source cancelled
2010 >     */
2011 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2012          for (ExecutionMode m : ExecutionMode.values())
2013 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2014 +        for (boolean fFirst : new boolean[] { true, false })
2015 +        for (boolean failFirst : new boolean[] { true, false })
2016          for (Integer v1 : new Integer[] { 1, null })
2017      {
2018          final CompletableFuture<Integer> f = new CompletableFuture<>();
2019          final CompletableFuture<Integer> g = new CompletableFuture<>();
2020 <        final Noop r = new Noop();
2021 <        final CFException ex = new CFException();
2022 <
2023 <        f.completeExceptionally(ex);
2024 <        g.complete(v1);
2025 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2026 <
2027 <        checkCompletedWithWrappedCFException(h, ex);
2028 <        checkCompletedWithWrappedCFException(f, ex);
2029 <        assertEquals(0, r.invocationCount);
2030 <        checkCompletedNormally(g, v1);
2020 >        final Noop r1 = new Noop(m);
2021 >        final Noop r2 = new Noop(m);
2022 >        final Noop r3 = new Noop(m);
2023 >
2024 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2025 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2026 >        final Callable<Boolean> complete1 = failFirst ?
2027 >            () -> fst.cancel(mayInterruptIfRunning) :
2028 >            () -> fst.complete(v1);
2029 >        final Callable<Boolean> complete2 = failFirst ?
2030 >            () -> snd.complete(v1) :
2031 >            () -> snd.cancel(mayInterruptIfRunning);
2032 >
2033 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2034 >        assertTrue(complete1.call());
2035 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2036 >        checkIncomplete(h1);
2037 >        checkIncomplete(h2);
2038 >        assertTrue(complete2.call());
2039 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2040 >
2041 >        checkCompletedWithWrappedCancellationException(h1);
2042 >        checkCompletedWithWrappedCancellationException(h2);
2043 >        checkCompletedWithWrappedCancellationException(h3);
2044 >        r1.assertNotInvoked();
2045 >        r2.assertNotInvoked();
2046 >        r3.assertNotInvoked();
2047 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2048 >        checkCancelled(failFirst ? fst : snd);
2049      }}
2050  
2051      /**
2052       * runAfterBoth result completes exceptionally if action does
2053       */
2054 <    public void testRunAfterBoth_actionFailed1() {
1835 <        for (ExecutionMode m : ExecutionMode.values())
1836 <        for (Integer v1 : new Integer[] { 1, null })
1837 <        for (Integer v2 : new Integer[] { 2, null })
1838 <    {
1839 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1840 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1841 <        final FailingNoop r = new FailingNoop();
1842 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1843 <
1844 <        f.complete(v1);
1845 <        checkIncomplete(h);
1846 <        g.complete(v2);
1847 <
1848 <        checkCompletedWithWrappedCFException(h);
1849 <        checkCompletedNormally(f, v1);
1850 <        checkCompletedNormally(g, v2);
1851 <    }}
1852 <
1853 <    public void testRunAfterBoth_actionFailed2() {
2054 >    public void testRunAfterBoth_actionFailed() {
2055          for (ExecutionMode m : ExecutionMode.values())
2056 +        for (boolean fFirst : new boolean[] { true, false })
2057          for (Integer v1 : new Integer[] { 1, null })
2058          for (Integer v2 : new Integer[] { 2, null })
2059      {
2060          final CompletableFuture<Integer> f = new CompletableFuture<>();
2061          final CompletableFuture<Integer> g = new CompletableFuture<>();
2062 <        final FailingNoop r = new FailingNoop();
2063 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2064 <
2065 <        g.complete(v2);
2066 <        checkIncomplete(h);
2067 <        f.complete(v1);
2068 <
2069 <        checkCompletedWithWrappedCFException(h);
2062 >        final FailingRunnable r1 = new FailingRunnable(m);
2063 >        final FailingRunnable r2 = new FailingRunnable(m);
2064 >        final FailingRunnable r3 = new FailingRunnable(m);
2065 >
2066 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2067 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2068 >        final Integer w1 =  fFirst ? v1 : v2;
2069 >        final Integer w2 = !fFirst ? v1 : v2;
2070 >
2071 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2072 >        assertTrue(fst.complete(w1));
2073 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2074 >        assertTrue(snd.complete(w2));
2075 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2076 >
2077 >        checkCompletedWithWrappedCFException(h1);
2078 >        checkCompletedWithWrappedCFException(h2);
2079 >        checkCompletedWithWrappedCFException(h3);
2080 >        r1.assertInvoked();
2081 >        r2.assertInvoked();
2082 >        r3.assertInvoked();
2083          checkCompletedNormally(f, v1);
2084          checkCompletedNormally(g, v2);
2085      }}
2086  
2087      /**
1873     * runAfterBoth result completes exceptionally if either source cancelled
1874     */
1875    public void testRunAfterBoth_sourceCancelled1() {
1876        for (ExecutionMode m : ExecutionMode.values())
1877        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1878        for (Integer v1 : new Integer[] { 1, null })
1879    {
1880        final CompletableFuture<Integer> f = new CompletableFuture<>();
1881        final CompletableFuture<Integer> g = new CompletableFuture<>();
1882        final Noop r = new Noop();
1883        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1884
1885        assertTrue(f.cancel(mayInterruptIfRunning));
1886        checkIncomplete(h);
1887        g.complete(v1);
1888
1889        checkCompletedWithWrappedCancellationException(h);
1890        checkCancelled(f);
1891        assertEquals(0, r.invocationCount);
1892        checkCompletedNormally(g, v1);
1893    }}
1894
1895    public void testRunAfterBoth_sourceCancelled2() {
1896        for (ExecutionMode m : ExecutionMode.values())
1897        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1898        for (Integer v1 : new Integer[] { 1, null })
1899    {
1900        final CompletableFuture<Integer> f = new CompletableFuture<>();
1901        final CompletableFuture<Integer> g = new CompletableFuture<>();
1902        final Noop r = new Noop();
1903        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1904
1905        assertTrue(g.cancel(mayInterruptIfRunning));
1906        checkIncomplete(h);
1907        f.complete(v1);
1908
1909        checkCompletedWithWrappedCancellationException(h);
1910        checkCancelled(g);
1911        assertEquals(0, r.invocationCount);
1912        checkCompletedNormally(f, v1);
1913    }}
1914
1915    public void testRunAfterBoth_sourceCancelled3() {
1916        for (ExecutionMode m : ExecutionMode.values())
1917        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1918        for (Integer v1 : new Integer[] { 1, null })
1919    {
1920        final CompletableFuture<Integer> f = new CompletableFuture<>();
1921        final CompletableFuture<Integer> g = new CompletableFuture<>();
1922        final Noop r = new Noop();
1923
1924        assertTrue(g.cancel(mayInterruptIfRunning));
1925        f.complete(v1);
1926        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1927
1928        checkCompletedWithWrappedCancellationException(h);
1929        checkCancelled(g);
1930        assertEquals(0, r.invocationCount);
1931        checkCompletedNormally(f, v1);
1932    }}
1933
1934    public void testRunAfterBoth_sourceCancelled4() {
1935        for (ExecutionMode m : ExecutionMode.values())
1936        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1937        for (Integer v1 : new Integer[] { 1, null })
1938    {
1939        final CompletableFuture<Integer> f = new CompletableFuture<>();
1940        final CompletableFuture<Integer> g = new CompletableFuture<>();
1941        final Noop r = new Noop();
1942
1943        assertTrue(f.cancel(mayInterruptIfRunning));
1944        g.complete(v1);
1945        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1946
1947        checkCompletedWithWrappedCancellationException(h);
1948        checkCancelled(f);
1949        assertEquals(0, r.invocationCount);
1950        checkCompletedNormally(g, v1);
1951    }}
1952
1953    /**
2088       * applyToEither result completes normally after normal completion
2089       * of either source
2090       */
2091 <    public void testApplyToEither_normalCompletion1() {
2091 >    public void testApplyToEither_normalCompletion() {
2092          for (ExecutionMode m : ExecutionMode.values())
2093          for (Integer v1 : new Integer[] { 1, null })
2094          for (Integer v2 : new Integer[] { 2, null })
2095      {
2096          final CompletableFuture<Integer> f = new CompletableFuture<>();
2097          final CompletableFuture<Integer> g = new CompletableFuture<>();
2098 <        final IncFunction r = new IncFunction();
2099 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2098 >        final IncFunction[] rs = new IncFunction[6];
2099 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2100  
2101 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2102 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2103 +        checkIncomplete(h0);
2104 +        checkIncomplete(h1);
2105 +        rs[0].assertNotInvoked();
2106 +        rs[1].assertNotInvoked();
2107          f.complete(v1);
2108 <        checkCompletedNormally(h, inc(v1));
2108 >        checkCompletedNormally(h0, inc(v1));
2109 >        checkCompletedNormally(h1, inc(v1));
2110 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2111 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2112 >        checkCompletedNormally(h2, inc(v1));
2113 >        checkCompletedNormally(h3, inc(v1));
2114          g.complete(v2);
2115  
2116 <        checkCompletedNormally(f, v1);
2117 <        checkCompletedNormally(g, v2);
2118 <        checkCompletedNormally(h, inc(v1));
2119 <    }}
2120 <
2121 <    public void testApplyToEither_normalCompletion2() {
2122 <        for (ExecutionMode m : ExecutionMode.values())
2123 <        for (Integer v1 : new Integer[] { 1, null })
2124 <        for (Integer v2 : new Integer[] { 2, null })
1980 <    {
1981 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1982 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1983 <        final IncFunction r = new IncFunction();
1984 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1985 <
1986 <        g.complete(v2);
1987 <        checkCompletedNormally(h, inc(v2));
1988 <        f.complete(v1);
2116 >        // unspecified behavior - both source completions available
2117 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2118 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2119 >        rs[4].assertValue(h4.join());
2120 >        rs[5].assertValue(h5.join());
2121 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2122 >                   Objects.equals(inc(v2), h4.join()));
2123 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2124 >                   Objects.equals(inc(v2), h5.join()));
2125  
2126          checkCompletedNormally(f, v1);
2127          checkCompletedNormally(g, v2);
2128 <        checkCompletedNormally(h, inc(v2));
2129 <        }}
2130 <
2131 <    public void testApplyToEither_normalCompletion3() {
2132 <        for (ExecutionMode m : ExecutionMode.values())
1997 <        for (Integer v1 : new Integer[] { 1, null })
1998 <        for (Integer v2 : new Integer[] { 2, null })
1999 <    {
2000 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2001 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2002 <        final IncFunction r = new IncFunction();
2003 <
2004 <        f.complete(v1);
2005 <        g.complete(v2);
2006 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2007 <
2008 <        checkCompletedNormally(f, v1);
2009 <        checkCompletedNormally(g, v2);
2010 <
2011 <        // unspecified behavior
2012 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2013 <                   Objects.equals(h.join(), inc(v2)));
2014 <        assertEquals(1, r.invocationCount);
2128 >        checkCompletedNormally(h0, inc(v1));
2129 >        checkCompletedNormally(h1, inc(v1));
2130 >        checkCompletedNormally(h2, inc(v1));
2131 >        checkCompletedNormally(h3, inc(v1));
2132 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2133      }}
2134  
2135      /**
2136       * applyToEither result completes exceptionally after exceptional
2137       * completion of either source
2138       */
2139 <    public void testApplyToEither_exceptionalCompletion1() {
2139 >    public void testApplyToEither_exceptionalCompletion() {
2140          for (ExecutionMode m : ExecutionMode.values())
2141          for (Integer v1 : new Integer[] { 1, null })
2142      {
2143          final CompletableFuture<Integer> f = new CompletableFuture<>();
2144          final CompletableFuture<Integer> g = new CompletableFuture<>();
2027        final IncFunction r = new IncFunction();
2028        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2145          final CFException ex = new CFException();
2146 +        final IncFunction[] rs = new IncFunction[6];
2147 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2148  
2149 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2150 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2151 +        checkIncomplete(h0);
2152 +        checkIncomplete(h1);
2153 +        rs[0].assertNotInvoked();
2154 +        rs[1].assertNotInvoked();
2155          f.completeExceptionally(ex);
2156 <        checkCompletedWithWrappedCFException(h, ex);
2156 >        checkCompletedWithWrappedException(h0, ex);
2157 >        checkCompletedWithWrappedException(h1, ex);
2158 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2159 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2160 >        checkCompletedWithWrappedException(h2, ex);
2161 >        checkCompletedWithWrappedException(h3, ex);
2162          g.complete(v1);
2163  
2164 <        assertEquals(0, r.invocationCount);
2164 >        // unspecified behavior - both source completions available
2165 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2166 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2167 >        try {
2168 >            assertEquals(inc(v1), h4.join());
2169 >            rs[4].assertValue(inc(v1));
2170 >        } catch (CompletionException ok) {
2171 >            checkCompletedWithWrappedException(h4, ex);
2172 >            rs[4].assertNotInvoked();
2173 >        }
2174 >        try {
2175 >            assertEquals(inc(v1), h5.join());
2176 >            rs[5].assertValue(inc(v1));
2177 >        } catch (CompletionException ok) {
2178 >            checkCompletedWithWrappedException(h5, ex);
2179 >            rs[5].assertNotInvoked();
2180 >        }
2181 >
2182 >        checkCompletedExceptionally(f, ex);
2183          checkCompletedNormally(g, v1);
2184 <        checkCompletedWithWrappedCFException(f, ex);
2185 <        checkCompletedWithWrappedCFException(h, ex);
2184 >        checkCompletedWithWrappedException(h0, ex);
2185 >        checkCompletedWithWrappedException(h1, ex);
2186 >        checkCompletedWithWrappedException(h2, ex);
2187 >        checkCompletedWithWrappedException(h3, ex);
2188 >        checkCompletedWithWrappedException(h4, ex);
2189 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2190      }}
2191  
2192      public void testApplyToEither_exceptionalCompletion2() {
2193          for (ExecutionMode m : ExecutionMode.values())
2194 +        for (boolean fFirst : new boolean[] { true, false })
2195          for (Integer v1 : new Integer[] { 1, null })
2196      {
2197          final CompletableFuture<Integer> f = new CompletableFuture<>();
2198          final CompletableFuture<Integer> g = new CompletableFuture<>();
2047        final IncFunction r = new IncFunction();
2048        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2049        final CFException ex = new CFException();
2050
2051        g.completeExceptionally(ex);
2052        checkCompletedWithWrappedCFException(h, ex);
2053        f.complete(v1);
2054
2055        assertEquals(0, r.invocationCount);
2056        checkCompletedNormally(f, v1);
2057        checkCompletedWithWrappedCFException(g, ex);
2058        checkCompletedWithWrappedCFException(h, ex);
2059    }}
2060
2061    public void testApplyToEither_exceptionalCompletion3() {
2062        for (ExecutionMode m : ExecutionMode.values())
2063        for (Integer v1 : new Integer[] { 1, null })
2064    {
2065        final CompletableFuture<Integer> f = new CompletableFuture<>();
2066        final CompletableFuture<Integer> g = new CompletableFuture<>();
2067        final IncFunction r = new IncFunction();
2199          final CFException ex = new CFException();
2200 +        final IncFunction[] rs = new IncFunction[6];
2201 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2202  
2203 <        g.completeExceptionally(ex);
2204 <        f.complete(v1);
2205 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2203 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2204 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2205 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2206 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2207 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2208 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2209  
2210 <        // unspecified behavior
2075 <        Integer v;
2210 >        // unspecified behavior - both source completions available
2211          try {
2212 <            assertEquals(inc(v1), h.join());
2213 <            assertEquals(1, r.invocationCount);
2212 >            assertEquals(inc(v1), h0.join());
2213 >            rs[0].assertValue(inc(v1));
2214          } catch (CompletionException ok) {
2215 <            checkCompletedWithWrappedCFException(h, ex);
2216 <            assertEquals(0, r.invocationCount);
2215 >            checkCompletedWithWrappedException(h0, ex);
2216 >            rs[0].assertNotInvoked();
2217          }
2083
2084        checkCompletedWithWrappedCFException(g, ex);
2085        checkCompletedNormally(f, v1);
2086    }}
2087
2088    public void testApplyToEither_exceptionalCompletion4() {
2089        for (ExecutionMode m : ExecutionMode.values())
2090        for (Integer v1 : new Integer[] { 1, null })
2091    {
2092        final CompletableFuture<Integer> f = new CompletableFuture<>();
2093        final CompletableFuture<Integer> g = new CompletableFuture<>();
2094        final IncFunction r = new IncFunction();
2095        final CFException ex = new CFException();
2096
2097        f.completeExceptionally(ex);
2098        g.complete(v1);
2099        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2100
2101        // unspecified behavior
2102        Integer v;
2218          try {
2219 <            assertEquals(inc(v1), h.join());
2220 <            assertEquals(1, r.invocationCount);
2219 >            assertEquals(inc(v1), h1.join());
2220 >            rs[1].assertValue(inc(v1));
2221          } catch (CompletionException ok) {
2222 <            checkCompletedWithWrappedCFException(h, ex);
2223 <            assertEquals(0, r.invocationCount);
2222 >            checkCompletedWithWrappedException(h1, ex);
2223 >            rs[1].assertNotInvoked();
2224 >        }
2225 >        try {
2226 >            assertEquals(inc(v1), h2.join());
2227 >            rs[2].assertValue(inc(v1));
2228 >        } catch (CompletionException ok) {
2229 >            checkCompletedWithWrappedException(h2, ex);
2230 >            rs[2].assertNotInvoked();
2231 >        }
2232 >        try {
2233 >            assertEquals(inc(v1), h3.join());
2234 >            rs[3].assertValue(inc(v1));
2235 >        } catch (CompletionException ok) {
2236 >            checkCompletedWithWrappedException(h3, ex);
2237 >            rs[3].assertNotInvoked();
2238          }
2239  
2111        checkCompletedWithWrappedCFException(f, ex);
2112        checkCompletedNormally(g, v1);
2113    }}
2114
2115    /**
2116     * applyToEither result completes exceptionally if action does
2117     */
2118    public void testApplyToEither_actionFailed1() {
2119        for (ExecutionMode m : ExecutionMode.values())
2120        for (Integer v1 : new Integer[] { 1, null })
2121        for (Integer v2 : new Integer[] { 2, null })
2122    {
2123        final CompletableFuture<Integer> f = new CompletableFuture<>();
2124        final CompletableFuture<Integer> g = new CompletableFuture<>();
2125        final FailingFunction r = new FailingFunction();
2126        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2127
2128        f.complete(v1);
2129        checkCompletedWithWrappedCFException(h);
2130        g.complete(v2);
2131        checkCompletedNormally(f, v1);
2132        checkCompletedNormally(g, v2);
2133    }}
2134
2135    public void testApplyToEither_actionFailed2() {
2136        for (ExecutionMode m : ExecutionMode.values())
2137        for (Integer v1 : new Integer[] { 1, null })
2138        for (Integer v2 : new Integer[] { 2, null })
2139    {
2140        final CompletableFuture<Integer> f = new CompletableFuture<>();
2141        final CompletableFuture<Integer> g = new CompletableFuture<>();
2142        final FailingFunction r = new FailingFunction();
2143        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2144
2145        g.complete(v2);
2146        checkCompletedWithWrappedCFException(h);
2147        f.complete(v1);
2240          checkCompletedNormally(f, v1);
2241 <        checkCompletedNormally(g, v2);
2241 >        checkCompletedExceptionally(g, ex);
2242      }}
2243  
2244      /**
2245       * applyToEither result completes exceptionally if either source cancelled
2246       */
2247 <    public void testApplyToEither_sourceCancelled1() {
2247 >    public void testApplyToEither_sourceCancelled() {
2248          for (ExecutionMode m : ExecutionMode.values())
2249          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2250          for (Integer v1 : new Integer[] { 1, null })
2251      {
2252          final CompletableFuture<Integer> f = new CompletableFuture<>();
2253          final CompletableFuture<Integer> g = new CompletableFuture<>();
2254 <        final IncFunction r = new IncFunction();
2255 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2254 >        final IncFunction[] rs = new IncFunction[6];
2255 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2256  
2257 <        assertTrue(f.cancel(mayInterruptIfRunning));
2258 <        checkCompletedWithWrappedCancellationException(h);
2257 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2258 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2259 >        checkIncomplete(h0);
2260 >        checkIncomplete(h1);
2261 >        rs[0].assertNotInvoked();
2262 >        rs[1].assertNotInvoked();
2263 >        f.cancel(mayInterruptIfRunning);
2264 >        checkCompletedWithWrappedCancellationException(h0);
2265 >        checkCompletedWithWrappedCancellationException(h1);
2266 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2267 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2268 >        checkCompletedWithWrappedCancellationException(h2);
2269 >        checkCompletedWithWrappedCancellationException(h3);
2270          g.complete(v1);
2271  
2272 +        // unspecified behavior - both source completions available
2273 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2274 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2275 +        try {
2276 +            assertEquals(inc(v1), h4.join());
2277 +            rs[4].assertValue(inc(v1));
2278 +        } catch (CompletionException ok) {
2279 +            checkCompletedWithWrappedCancellationException(h4);
2280 +            rs[4].assertNotInvoked();
2281 +        }
2282 +        try {
2283 +            assertEquals(inc(v1), h5.join());
2284 +            rs[5].assertValue(inc(v1));
2285 +        } catch (CompletionException ok) {
2286 +            checkCompletedWithWrappedCancellationException(h5);
2287 +            rs[5].assertNotInvoked();
2288 +        }
2289 +
2290          checkCancelled(f);
2170        assertEquals(0, r.invocationCount);
2291          checkCompletedNormally(g, v1);
2292 <        checkCompletedWithWrappedCancellationException(h);
2292 >        checkCompletedWithWrappedCancellationException(h0);
2293 >        checkCompletedWithWrappedCancellationException(h1);
2294 >        checkCompletedWithWrappedCancellationException(h2);
2295 >        checkCompletedWithWrappedCancellationException(h3);
2296 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2297      }}
2298  
2299      public void testApplyToEither_sourceCancelled2() {
2300          for (ExecutionMode m : ExecutionMode.values())
2301          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2302 +        for (boolean fFirst : new boolean[] { true, false })
2303          for (Integer v1 : new Integer[] { 1, null })
2304      {
2305          final CompletableFuture<Integer> f = new CompletableFuture<>();
2306          final CompletableFuture<Integer> g = new CompletableFuture<>();
2307 <        final IncFunction r = new IncFunction();
2308 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2184 <
2185 <        assertTrue(g.cancel(mayInterruptIfRunning));
2186 <        checkCompletedWithWrappedCancellationException(h);
2187 <        f.complete(v1);
2188 <
2189 <        checkCancelled(g);
2190 <        assertEquals(0, r.invocationCount);
2191 <        checkCompletedNormally(f, v1);
2192 <        checkCompletedWithWrappedCancellationException(h);
2193 <    }}
2194 <
2195 <    public void testApplyToEither_sourceCancelled3() {
2196 <        for (ExecutionMode m : ExecutionMode.values())
2197 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2198 <        for (Integer v1 : new Integer[] { 1, null })
2199 <    {
2200 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2201 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2202 <        final IncFunction r = new IncFunction();
2307 >        final IncFunction[] rs = new IncFunction[6];
2308 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2309  
2310 <        assertTrue(g.cancel(mayInterruptIfRunning));
2311 <        f.complete(v1);
2312 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2310 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2311 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2312 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2313 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2314 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2315 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2316  
2317 <        // unspecified behavior
2209 <        Integer v;
2317 >        // unspecified behavior - both source completions available
2318          try {
2319 <            assertEquals(inc(v1), h.join());
2320 <            assertEquals(1, r.invocationCount);
2319 >            assertEquals(inc(v1), h0.join());
2320 >            rs[0].assertValue(inc(v1));
2321          } catch (CompletionException ok) {
2322 <            checkCompletedWithWrappedCancellationException(h);
2323 <            assertEquals(0, r.invocationCount);
2322 >            checkCompletedWithWrappedCancellationException(h0);
2323 >            rs[0].assertNotInvoked();
2324 >        }
2325 >        try {
2326 >            assertEquals(inc(v1), h1.join());
2327 >            rs[1].assertValue(inc(v1));
2328 >        } catch (CompletionException ok) {
2329 >            checkCompletedWithWrappedCancellationException(h1);
2330 >            rs[1].assertNotInvoked();
2331 >        }
2332 >        try {
2333 >            assertEquals(inc(v1), h2.join());
2334 >            rs[2].assertValue(inc(v1));
2335 >        } catch (CompletionException ok) {
2336 >            checkCompletedWithWrappedCancellationException(h2);
2337 >            rs[2].assertNotInvoked();
2338          }
2217
2218        checkCancelled(g);
2219        checkCompletedNormally(f, v1);
2220    }}
2221
2222    public void testApplyToEither_sourceCancelled4() {
2223        for (ExecutionMode m : ExecutionMode.values())
2224        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2225        for (Integer v1 : new Integer[] { 1, null })
2226    {
2227        final CompletableFuture<Integer> f = new CompletableFuture<>();
2228        final CompletableFuture<Integer> g = new CompletableFuture<>();
2229        final IncFunction r = new IncFunction();
2230
2231        assertTrue(f.cancel(mayInterruptIfRunning));
2232        g.complete(v1);
2233        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2234
2235        // unspecified behavior
2236        Integer v;
2339          try {
2340 <            assertEquals(inc(v1), h.join());
2341 <            assertEquals(1, r.invocationCount);
2340 >            assertEquals(inc(v1), h3.join());
2341 >            rs[3].assertValue(inc(v1));
2342          } catch (CompletionException ok) {
2343 <            checkCompletedWithWrappedCancellationException(h);
2344 <            assertEquals(0, r.invocationCount);
2343 >            checkCompletedWithWrappedCancellationException(h3);
2344 >            rs[3].assertNotInvoked();
2345          }
2346  
2347 <        checkCancelled(f);
2348 <        checkCompletedNormally(g, v1);
2347 >        checkCompletedNormally(f, v1);
2348 >        checkCancelled(g);
2349      }}
2350  
2351      /**
2352 <     * acceptEither result completes normally after normal completion
2251 <     * of either source
2352 >     * applyToEither result completes exceptionally if action does
2353       */
2354 <    public void testAcceptEither_normalCompletion1() {
2354 >    public void testApplyToEither_actionFailed() {
2355          for (ExecutionMode m : ExecutionMode.values())
2356          for (Integer v1 : new Integer[] { 1, null })
2357          for (Integer v2 : new Integer[] { 2, null })
2358      {
2359          final CompletableFuture<Integer> f = new CompletableFuture<>();
2360          final CompletableFuture<Integer> g = new CompletableFuture<>();
2361 <        final IncAction r = new IncAction();
2362 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2361 >        final FailingFunction[] rs = new FailingFunction[6];
2362 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2363  
2364 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2365 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2366          f.complete(v1);
2367 <        checkCompletedNormally(h, null);
2368 <        assertEquals(inc(v1), r.value);
2367 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2368 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2369 >        checkCompletedWithWrappedCFException(h0);
2370 >        checkCompletedWithWrappedCFException(h1);
2371 >        checkCompletedWithWrappedCFException(h2);
2372 >        checkCompletedWithWrappedCFException(h3);
2373 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2374 >
2375          g.complete(v2);
2376  
2377 <        checkCompletedNormally(f, v1);
2378 <        checkCompletedNormally(g, v2);
2379 <        checkCompletedNormally(h, null);
2271 <    }}
2377 >        // unspecified behavior - both source completions available
2378 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2379 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2380  
2381 <    public void testAcceptEither_normalCompletion2() {
2382 <        for (ExecutionMode m : ExecutionMode.values())
2383 <        for (Integer v1 : new Integer[] { 1, null })
2384 <        for (Integer v2 : new Integer[] { 2, null })
2385 <    {
2386 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2279 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2280 <        final IncAction r = new IncAction();
2281 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2282 <
2283 <        g.complete(v2);
2284 <        checkCompletedNormally(h, null);
2285 <        assertEquals(inc(v2), r.value);
2286 <        f.complete(v1);
2381 >        checkCompletedWithWrappedCFException(h4);
2382 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2383 >                   Objects.equals(v2, rs[4].value));
2384 >        checkCompletedWithWrappedCFException(h5);
2385 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2386 >                   Objects.equals(v2, rs[5].value));
2387  
2388          checkCompletedNormally(f, v1);
2389          checkCompletedNormally(g, v2);
2290        checkCompletedNormally(h, null);
2390      }}
2391  
2392 <    public void testAcceptEither_normalCompletion3() {
2392 >    /**
2393 >     * acceptEither result completes normally after normal completion
2394 >     * of either source
2395 >     */
2396 >    public void testAcceptEither_normalCompletion() {
2397          for (ExecutionMode m : ExecutionMode.values())
2398          for (Integer v1 : new Integer[] { 1, null })
2399          for (Integer v2 : new Integer[] { 2, null })
2400      {
2401          final CompletableFuture<Integer> f = new CompletableFuture<>();
2402          final CompletableFuture<Integer> g = new CompletableFuture<>();
2403 <        final IncAction r = new IncAction();
2403 >        final NoopConsumer[] rs = new NoopConsumer[6];
2404 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2405  
2406 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2407 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2408 +        checkIncomplete(h0);
2409 +        checkIncomplete(h1);
2410 +        rs[0].assertNotInvoked();
2411 +        rs[1].assertNotInvoked();
2412          f.complete(v1);
2413 +        checkCompletedNormally(h0, null);
2414 +        checkCompletedNormally(h1, null);
2415 +        rs[0].assertValue(v1);
2416 +        rs[1].assertValue(v1);
2417 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2418 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2419 +        checkCompletedNormally(h2, null);
2420 +        checkCompletedNormally(h3, null);
2421 +        rs[2].assertValue(v1);
2422 +        rs[3].assertValue(v1);
2423          g.complete(v2);
2304        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2424  
2425 <        checkCompletedNormally(h, null);
2425 >        // unspecified behavior - both source completions available
2426 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2427 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2428 >        checkCompletedNormally(h4, null);
2429 >        checkCompletedNormally(h5, null);
2430 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2431 >                   Objects.equals(v2, rs[4].value));
2432 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2433 >                   Objects.equals(v2, rs[5].value));
2434 >
2435          checkCompletedNormally(f, v1);
2436          checkCompletedNormally(g, v2);
2437 <
2438 <        // unspecified behavior
2439 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2440 <                   Objects.equals(r.value, inc(v2)));
2437 >        checkCompletedNormally(h0, null);
2438 >        checkCompletedNormally(h1, null);
2439 >        checkCompletedNormally(h2, null);
2440 >        checkCompletedNormally(h3, null);
2441 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2442      }}
2443  
2444      /**
2445       * acceptEither result completes exceptionally after exceptional
2446       * completion of either source
2447       */
2448 <    public void testAcceptEither_exceptionalCompletion1() {
2448 >    public void testAcceptEither_exceptionalCompletion() {
2449          for (ExecutionMode m : ExecutionMode.values())
2450          for (Integer v1 : new Integer[] { 1, null })
2451      {
2452          final CompletableFuture<Integer> f = new CompletableFuture<>();
2453          final CompletableFuture<Integer> g = new CompletableFuture<>();
2325        final IncAction r = new IncAction();
2326        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2454          final CFException ex = new CFException();
2455 +        final NoopConsumer[] rs = new NoopConsumer[6];
2456 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2457  
2458 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2459 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2460 +        checkIncomplete(h0);
2461 +        checkIncomplete(h1);
2462 +        rs[0].assertNotInvoked();
2463 +        rs[1].assertNotInvoked();
2464          f.completeExceptionally(ex);
2465 <        checkCompletedWithWrappedCFException(h, ex);
2465 >        checkCompletedWithWrappedException(h0, ex);
2466 >        checkCompletedWithWrappedException(h1, ex);
2467 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2468 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2469 >        checkCompletedWithWrappedException(h2, ex);
2470 >        checkCompletedWithWrappedException(h3, ex);
2471 >
2472          g.complete(v1);
2473  
2474 <        assertEquals(0, r.invocationCount);
2474 >        // unspecified behavior - both source completions available
2475 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2476 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2477 >        try {
2478 >            assertNull(h4.join());
2479 >            rs[4].assertValue(v1);
2480 >        } catch (CompletionException ok) {
2481 >            checkCompletedWithWrappedException(h4, ex);
2482 >            rs[4].assertNotInvoked();
2483 >        }
2484 >        try {
2485 >            assertNull(h5.join());
2486 >            rs[5].assertValue(v1);
2487 >        } catch (CompletionException ok) {
2488 >            checkCompletedWithWrappedException(h5, ex);
2489 >            rs[5].assertNotInvoked();
2490 >        }
2491 >
2492 >        checkCompletedExceptionally(f, ex);
2493          checkCompletedNormally(g, v1);
2494 <        checkCompletedWithWrappedCFException(f, ex);
2495 <        checkCompletedWithWrappedCFException(h, ex);
2494 >        checkCompletedWithWrappedException(h0, ex);
2495 >        checkCompletedWithWrappedException(h1, ex);
2496 >        checkCompletedWithWrappedException(h2, ex);
2497 >        checkCompletedWithWrappedException(h3, ex);
2498 >        checkCompletedWithWrappedException(h4, ex);
2499 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2500      }}
2501  
2502      public void testAcceptEither_exceptionalCompletion2() {
2503          for (ExecutionMode m : ExecutionMode.values())
2504 +        for (boolean fFirst : new boolean[] { true, false })
2505          for (Integer v1 : new Integer[] { 1, null })
2506      {
2507          final CompletableFuture<Integer> f = new CompletableFuture<>();
2508          final CompletableFuture<Integer> g = new CompletableFuture<>();
2345        final IncAction r = new IncAction();
2346        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2347        final CFException ex = new CFException();
2348
2349        g.completeExceptionally(ex);
2350        checkCompletedWithWrappedCFException(h, ex);
2351        f.complete(v1);
2352
2353        assertEquals(0, r.invocationCount);
2354        checkCompletedNormally(f, v1);
2355        checkCompletedWithWrappedCFException(g, ex);
2356        checkCompletedWithWrappedCFException(h, ex);
2357    }}
2358
2359    public void testAcceptEither_exceptionalCompletion3() {
2360        for (ExecutionMode m : ExecutionMode.values())
2361        for (Integer v1 : new Integer[] { 1, null })
2362    {
2363        final CompletableFuture<Integer> f = new CompletableFuture<>();
2364        final CompletableFuture<Integer> g = new CompletableFuture<>();
2365        final IncAction r = new IncAction();
2509          final CFException ex = new CFException();
2510 +        final NoopConsumer[] rs = new NoopConsumer[6];
2511 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2512  
2513 <        g.completeExceptionally(ex);
2514 <        f.complete(v1);
2515 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2513 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2514 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2515 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2516 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2517 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2518 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2519  
2520 <        // unspecified behavior
2373 <        Integer v;
2520 >        // unspecified behavior - both source completions available
2521          try {
2522 <            assertNull(h.join());
2523 <            assertEquals(1, r.invocationCount);
2377 <            assertEquals(inc(v1), r.value);
2522 >            assertEquals(null, h0.join());
2523 >            rs[0].assertValue(v1);
2524          } catch (CompletionException ok) {
2525 <            checkCompletedWithWrappedCFException(h, ex);
2526 <            assertEquals(0, r.invocationCount);
2525 >            checkCompletedWithWrappedException(h0, ex);
2526 >            rs[0].assertNotInvoked();
2527          }
2382
2383        checkCompletedWithWrappedCFException(g, ex);
2384        checkCompletedNormally(f, v1);
2385    }}
2386
2387    public void testAcceptEither_exceptionalCompletion4() {
2388        for (ExecutionMode m : ExecutionMode.values())
2389        for (Integer v1 : new Integer[] { 1, null })
2390    {
2391        final CompletableFuture<Integer> f = new CompletableFuture<>();
2392        final CompletableFuture<Integer> g = new CompletableFuture<>();
2393        final IncAction r = new IncAction();
2394        final CFException ex = new CFException();
2395
2396        f.completeExceptionally(ex);
2397        g.complete(v1);
2398        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2399
2400        // unspecified behavior
2401        Integer v;
2528          try {
2529 <            assertNull(h.join());
2530 <            assertEquals(1, r.invocationCount);
2405 <            assertEquals(inc(v1), r.value);
2529 >            assertEquals(null, h1.join());
2530 >            rs[1].assertValue(v1);
2531          } catch (CompletionException ok) {
2532 <            checkCompletedWithWrappedCFException(h, ex);
2533 <            assertEquals(0, r.invocationCount);
2532 >            checkCompletedWithWrappedException(h1, ex);
2533 >            rs[1].assertNotInvoked();
2534 >        }
2535 >        try {
2536 >            assertEquals(null, h2.join());
2537 >            rs[2].assertValue(v1);
2538 >        } catch (CompletionException ok) {
2539 >            checkCompletedWithWrappedException(h2, ex);
2540 >            rs[2].assertNotInvoked();
2541 >        }
2542 >        try {
2543 >            assertEquals(null, h3.join());
2544 >            rs[3].assertValue(v1);
2545 >        } catch (CompletionException ok) {
2546 >            checkCompletedWithWrappedException(h3, ex);
2547 >            rs[3].assertNotInvoked();
2548          }
2549  
2411        checkCompletedWithWrappedCFException(f, ex);
2412        checkCompletedNormally(g, v1);
2413    }}
2414
2415    /**
2416     * acceptEither result completes exceptionally if action does
2417     */
2418    public void testAcceptEither_actionFailed1() {
2419        for (ExecutionMode m : ExecutionMode.values())
2420        for (Integer v1 : new Integer[] { 1, null })
2421        for (Integer v2 : new Integer[] { 2, null })
2422    {
2423        final CompletableFuture<Integer> f = new CompletableFuture<>();
2424        final CompletableFuture<Integer> g = new CompletableFuture<>();
2425        final FailingConsumer r = new FailingConsumer();
2426        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2427
2428        f.complete(v1);
2429        checkCompletedWithWrappedCFException(h);
2430        g.complete(v2);
2431        checkCompletedNormally(f, v1);
2432        checkCompletedNormally(g, v2);
2433    }}
2434
2435    public void testAcceptEither_actionFailed2() {
2436        for (ExecutionMode m : ExecutionMode.values())
2437        for (Integer v1 : new Integer[] { 1, null })
2438        for (Integer v2 : new Integer[] { 2, null })
2439    {
2440        final CompletableFuture<Integer> f = new CompletableFuture<>();
2441        final CompletableFuture<Integer> g = new CompletableFuture<>();
2442        final FailingConsumer r = new FailingConsumer();
2443        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2444
2445        g.complete(v2);
2446        checkCompletedWithWrappedCFException(h);
2447        f.complete(v1);
2550          checkCompletedNormally(f, v1);
2551 <        checkCompletedNormally(g, v2);
2551 >        checkCompletedExceptionally(g, ex);
2552      }}
2553  
2554      /**
2555       * acceptEither result completes exceptionally if either source cancelled
2556       */
2557 <    public void testAcceptEither_sourceCancelled1() {
2557 >    public void testAcceptEither_sourceCancelled() {
2558          for (ExecutionMode m : ExecutionMode.values())
2559          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2560          for (Integer v1 : new Integer[] { 1, null })
2561      {
2562          final CompletableFuture<Integer> f = new CompletableFuture<>();
2563          final CompletableFuture<Integer> g = new CompletableFuture<>();
2564 <        final IncAction r = new IncAction();
2565 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2564 >        final NoopConsumer[] rs = new NoopConsumer[6];
2565 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2566  
2567 <        assertTrue(f.cancel(mayInterruptIfRunning));
2568 <        checkCompletedWithWrappedCancellationException(h);
2569 <        g.complete(v1);
2567 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2568 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2569 >        checkIncomplete(h0);
2570 >        checkIncomplete(h1);
2571 >        rs[0].assertNotInvoked();
2572 >        rs[1].assertNotInvoked();
2573 >        f.cancel(mayInterruptIfRunning);
2574 >        checkCompletedWithWrappedCancellationException(h0);
2575 >        checkCompletedWithWrappedCancellationException(h1);
2576 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2577 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2578 >        checkCompletedWithWrappedCancellationException(h2);
2579 >        checkCompletedWithWrappedCancellationException(h3);
2580  
2581 <        checkCancelled(f);
2470 <        assertEquals(0, r.invocationCount);
2471 <        checkCompletedNormally(g, v1);
2472 <        checkCompletedWithWrappedCancellationException(h);
2473 <    }}
2474 <
2475 <    public void testAcceptEither_sourceCancelled2() {
2476 <        for (ExecutionMode m : ExecutionMode.values())
2477 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2478 <        for (Integer v1 : new Integer[] { 1, null })
2479 <    {
2480 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2481 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2482 <        final IncAction r = new IncAction();
2483 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2484 <
2485 <        assertTrue(g.cancel(mayInterruptIfRunning));
2486 <        checkCompletedWithWrappedCancellationException(h);
2487 <        f.complete(v1);
2488 <
2489 <        checkCancelled(g);
2490 <        assertEquals(0, r.invocationCount);
2491 <        checkCompletedNormally(f, v1);
2492 <        checkCompletedWithWrappedCancellationException(h);
2493 <    }}
2494 <
2495 <    public void testAcceptEither_sourceCancelled3() {
2496 <        for (ExecutionMode m : ExecutionMode.values())
2497 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2498 <        for (Integer v1 : new Integer[] { 1, null })
2499 <    {
2500 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2501 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2502 <        final IncAction r = new IncAction();
2503 <
2504 <        assertTrue(g.cancel(mayInterruptIfRunning));
2505 <        f.complete(v1);
2506 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2581 >        g.complete(v1);
2582  
2583 <        // unspecified behavior
2584 <        Integer v;
2583 >        // unspecified behavior - both source completions available
2584 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2585 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2586          try {
2587 <            assertNull(h.join());
2588 <            assertEquals(1, r.invocationCount);
2513 <            assertEquals(inc(v1), r.value);
2587 >            assertNull(h4.join());
2588 >            rs[4].assertValue(v1);
2589          } catch (CompletionException ok) {
2590 <            checkCompletedWithWrappedCancellationException(h);
2591 <            assertEquals(0, r.invocationCount);
2590 >            checkCompletedWithWrappedCancellationException(h4);
2591 >            rs[4].assertNotInvoked();
2592          }
2518
2519        checkCancelled(g);
2520        checkCompletedNormally(f, v1);
2521    }}
2522
2523    public void testAcceptEither_sourceCancelled4() {
2524        for (ExecutionMode m : ExecutionMode.values())
2525        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2526        for (Integer v1 : new Integer[] { 1, null })
2527    {
2528        final CompletableFuture<Integer> f = new CompletableFuture<>();
2529        final CompletableFuture<Integer> g = new CompletableFuture<>();
2530        final IncAction r = new IncAction();
2531
2532        assertTrue(f.cancel(mayInterruptIfRunning));
2533        g.complete(v1);
2534        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2535
2536        // unspecified behavior
2537        Integer v;
2593          try {
2594 <            assertNull(h.join());
2595 <            assertEquals(1, r.invocationCount);
2541 <            assertEquals(inc(v1), r.value);
2594 >            assertNull(h5.join());
2595 >            rs[5].assertValue(v1);
2596          } catch (CompletionException ok) {
2597 <            checkCompletedWithWrappedCancellationException(h);
2598 <            assertEquals(0, r.invocationCount);
2597 >            checkCompletedWithWrappedCancellationException(h5);
2598 >            rs[5].assertNotInvoked();
2599          }
2600  
2601          checkCancelled(f);
2602          checkCompletedNormally(g, v1);
2603 +        checkCompletedWithWrappedCancellationException(h0);
2604 +        checkCompletedWithWrappedCancellationException(h1);
2605 +        checkCompletedWithWrappedCancellationException(h2);
2606 +        checkCompletedWithWrappedCancellationException(h3);
2607 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2608      }}
2609  
2610      /**
2611 <     * runAfterEither result completes normally after normal completion
2553 <     * of either source
2611 >     * acceptEither result completes exceptionally if action does
2612       */
2613 <    public void testRunAfterEither_normalCompletion1() {
2613 >    public void testAcceptEither_actionFailed() {
2614          for (ExecutionMode m : ExecutionMode.values())
2615          for (Integer v1 : new Integer[] { 1, null })
2616          for (Integer v2 : new Integer[] { 2, null })
2617      {
2618          final CompletableFuture<Integer> f = new CompletableFuture<>();
2619          final CompletableFuture<Integer> g = new CompletableFuture<>();
2620 <        final Noop r = new Noop();
2621 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2620 >        final FailingConsumer[] rs = new FailingConsumer[6];
2621 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2622  
2623 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2624 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2625          f.complete(v1);
2626 <        checkCompletedNormally(h, null);
2627 <        assertEquals(1, r.invocationCount);
2628 <        g.complete(v2);
2626 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2627 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2628 >        checkCompletedWithWrappedCFException(h0);
2629 >        checkCompletedWithWrappedCFException(h1);
2630 >        checkCompletedWithWrappedCFException(h2);
2631 >        checkCompletedWithWrappedCFException(h3);
2632 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2633  
2634 <        checkCompletedNormally(f, v1);
2571 <        checkCompletedNormally(g, v2);
2572 <        checkCompletedNormally(h, null);
2573 <        assertEquals(1, r.invocationCount);
2574 <    }}
2634 >        g.complete(v2);
2635  
2636 <    public void testRunAfterEither_normalCompletion2() {
2637 <        for (ExecutionMode m : ExecutionMode.values())
2638 <        for (Integer v1 : new Integer[] { 1, null })
2579 <        for (Integer v2 : new Integer[] { 2, null })
2580 <    {
2581 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2582 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2583 <        final Noop r = new Noop();
2584 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2636 >        // unspecified behavior - both source completions available
2637 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2638 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2639  
2640 <        g.complete(v2);
2641 <        checkCompletedNormally(h, null);
2642 <        assertEquals(1, r.invocationCount);
2643 <        f.complete(v1);
2640 >        checkCompletedWithWrappedCFException(h4);
2641 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2642 >                   Objects.equals(v2, rs[4].value));
2643 >        checkCompletedWithWrappedCFException(h5);
2644 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2645 >                   Objects.equals(v2, rs[5].value));
2646  
2647          checkCompletedNormally(f, v1);
2648          checkCompletedNormally(g, v2);
2649 <        checkCompletedNormally(h, null);
2594 <        assertEquals(1, r.invocationCount);
2595 <        }}
2649 >    }}
2650  
2651 <    public void testRunAfterEither_normalCompletion3() {
2651 >    /**
2652 >     * runAfterEither result completes normally after normal completion
2653 >     * of either source
2654 >     */
2655 >    public void testRunAfterEither_normalCompletion() {
2656          for (ExecutionMode m : ExecutionMode.values())
2657          for (Integer v1 : new Integer[] { 1, null })
2658          for (Integer v2 : new Integer[] { 2, null })
2659      {
2660          final CompletableFuture<Integer> f = new CompletableFuture<>();
2661          final CompletableFuture<Integer> g = new CompletableFuture<>();
2662 <        final Noop r = new Noop();
2662 >        final Noop[] rs = new Noop[6];
2663 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2664  
2665 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2666 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2667 +        checkIncomplete(h0);
2668 +        checkIncomplete(h1);
2669 +        rs[0].assertNotInvoked();
2670 +        rs[1].assertNotInvoked();
2671          f.complete(v1);
2672 +        checkCompletedNormally(h0, null);
2673 +        checkCompletedNormally(h1, null);
2674 +        rs[0].assertInvoked();
2675 +        rs[1].assertInvoked();
2676 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2677 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2678 +        checkCompletedNormally(h2, null);
2679 +        checkCompletedNormally(h3, null);
2680 +        rs[2].assertInvoked();
2681 +        rs[3].assertInvoked();
2682 +
2683          g.complete(v2);
2608        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2684  
2685 <        checkCompletedNormally(h, null);
2685 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2686 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2687 >
2688          checkCompletedNormally(f, v1);
2689          checkCompletedNormally(g, v2);
2690 <        assertEquals(1, r.invocationCount);
2690 >        checkCompletedNormally(h0, null);
2691 >        checkCompletedNormally(h1, null);
2692 >        checkCompletedNormally(h2, null);
2693 >        checkCompletedNormally(h3, null);
2694 >        checkCompletedNormally(h4, null);
2695 >        checkCompletedNormally(h5, null);
2696 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2697      }}
2698  
2699      /**
2700       * runAfterEither result completes exceptionally after exceptional
2701       * completion of either source
2702       */
2703 <    public void testRunAfterEither_exceptionalCompletion1() {
2703 >    public void testRunAfterEither_exceptionalCompletion() {
2704          for (ExecutionMode m : ExecutionMode.values())
2705          for (Integer v1 : new Integer[] { 1, null })
2706      {
2707          final CompletableFuture<Integer> f = new CompletableFuture<>();
2708          final CompletableFuture<Integer> g = new CompletableFuture<>();
2626        final Noop r = new Noop();
2627        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2709          final CFException ex = new CFException();
2710 +        final Noop[] rs = new Noop[6];
2711 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2712  
2713 <        f.completeExceptionally(ex);
2714 <        checkCompletedWithWrappedCFException(h, ex);
2715 <        g.complete(v1);
2713 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2714 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2715 >        checkIncomplete(h0);
2716 >        checkIncomplete(h1);
2717 >        rs[0].assertNotInvoked();
2718 >        rs[1].assertNotInvoked();
2719 >        assertTrue(f.completeExceptionally(ex));
2720 >        checkCompletedWithWrappedException(h0, ex);
2721 >        checkCompletedWithWrappedException(h1, ex);
2722 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2723 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2724 >        checkCompletedWithWrappedException(h2, ex);
2725 >        checkCompletedWithWrappedException(h3, ex);
2726  
2727 <        assertEquals(0, r.invocationCount);
2635 <        checkCompletedNormally(g, v1);
2636 <        checkCompletedWithWrappedCFException(f, ex);
2637 <        checkCompletedWithWrappedCFException(h, ex);
2638 <    }}
2727 >        assertTrue(g.complete(v1));
2728  
2729 <    public void testRunAfterEither_exceptionalCompletion2() {
2730 <        for (ExecutionMode m : ExecutionMode.values())
2731 <        for (Integer v1 : new Integer[] { 1, null })
2643 <    {
2644 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2645 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2646 <        final Noop r = new Noop();
2647 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2648 <        final CFException ex = new CFException();
2649 <
2650 <        g.completeExceptionally(ex);
2651 <        checkCompletedWithWrappedCFException(h, ex);
2652 <        f.complete(v1);
2653 <
2654 <        assertEquals(0, r.invocationCount);
2655 <        checkCompletedNormally(f, v1);
2656 <        checkCompletedWithWrappedCFException(g, ex);
2657 <        checkCompletedWithWrappedCFException(h, ex);
2658 <    }}
2659 <
2660 <    public void testRunAfterEither_exceptionalCompletion3() {
2661 <        for (ExecutionMode m : ExecutionMode.values())
2662 <        for (Integer v1 : new Integer[] { 1, null })
2663 <    {
2664 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2666 <        final Noop r = new Noop();
2667 <        final CFException ex = new CFException();
2668 <
2669 <        g.completeExceptionally(ex);
2670 <        f.complete(v1);
2671 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2672 <
2673 <        // unspecified behavior
2674 <        Integer v;
2729 >        // unspecified behavior - both source completions available
2730 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2731 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2732          try {
2733 <            assertNull(h.join());
2734 <            assertEquals(1, r.invocationCount);
2733 >            assertNull(h4.join());
2734 >            rs[4].assertInvoked();
2735          } catch (CompletionException ok) {
2736 <            checkCompletedWithWrappedCFException(h, ex);
2737 <            assertEquals(0, r.invocationCount);
2736 >            checkCompletedWithWrappedException(h4, ex);
2737 >            rs[4].assertNotInvoked();
2738          }
2682
2683        checkCompletedWithWrappedCFException(g, ex);
2684        checkCompletedNormally(f, v1);
2685    }}
2686
2687    public void testRunAfterEither_exceptionalCompletion4() {
2688        for (ExecutionMode m : ExecutionMode.values())
2689        for (Integer v1 : new Integer[] { 1, null })
2690    {
2691        final CompletableFuture<Integer> f = new CompletableFuture<>();
2692        final CompletableFuture<Integer> g = new CompletableFuture<>();
2693        final Noop r = new Noop();
2694        final CFException ex = new CFException();
2695
2696        f.completeExceptionally(ex);
2697        g.complete(v1);
2698        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2699
2700        // unspecified behavior
2701        Integer v;
2739          try {
2740 <            assertNull(h.join());
2741 <            assertEquals(1, r.invocationCount);
2740 >            assertNull(h5.join());
2741 >            rs[5].assertInvoked();
2742          } catch (CompletionException ok) {
2743 <            checkCompletedWithWrappedCFException(h, ex);
2744 <            assertEquals(0, r.invocationCount);
2743 >            checkCompletedWithWrappedException(h5, ex);
2744 >            rs[5].assertNotInvoked();
2745          }
2746  
2747 <        checkCompletedWithWrappedCFException(f, ex);
2747 >        checkCompletedExceptionally(f, ex);
2748          checkCompletedNormally(g, v1);
2749 +        checkCompletedWithWrappedException(h0, ex);
2750 +        checkCompletedWithWrappedException(h1, ex);
2751 +        checkCompletedWithWrappedException(h2, ex);
2752 +        checkCompletedWithWrappedException(h3, ex);
2753 +        checkCompletedWithWrappedException(h4, ex);
2754 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2755      }}
2756  
2757 <    /**
2715 <     * runAfterEither result completes exceptionally if action does
2716 <     */
2717 <    public void testRunAfterEither_actionFailed1() {
2757 >    public void testRunAfterEither_exceptionalCompletion2() {
2758          for (ExecutionMode m : ExecutionMode.values())
2759 +        for (boolean fFirst : new boolean[] { true, false })
2760          for (Integer v1 : new Integer[] { 1, null })
2720        for (Integer v2 : new Integer[] { 2, null })
2761      {
2762          final CompletableFuture<Integer> f = new CompletableFuture<>();
2763          final CompletableFuture<Integer> g = new CompletableFuture<>();
2764 <        final FailingNoop r = new FailingNoop();
2765 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2764 >        final CFException ex = new CFException();
2765 >        final Noop[] rs = new Noop[6];
2766 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2767  
2768 <        f.complete(v1);
2769 <        checkCompletedWithWrappedCFException(h);
2770 <        g.complete(v2);
2771 <        checkCompletedNormally(f, v1);
2772 <        checkCompletedNormally(g, v2);
2773 <    }}
2768 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2769 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2770 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2771 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2772 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2773 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2774  
2775 <    public void testRunAfterEither_actionFailed2() {
2776 <        for (ExecutionMode m : ExecutionMode.values())
2777 <        for (Integer v1 : new Integer[] { 1, null })
2778 <        for (Integer v2 : new Integer[] { 2, null })
2779 <    {
2780 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2781 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2782 <        final FailingNoop r = new FailingNoop();
2783 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2775 >        // unspecified behavior - both source completions available
2776 >        try {
2777 >            assertEquals(null, h0.join());
2778 >            rs[0].assertInvoked();
2779 >        } catch (CompletionException ok) {
2780 >            checkCompletedWithWrappedException(h0, ex);
2781 >            rs[0].assertNotInvoked();
2782 >        }
2783 >        try {
2784 >            assertEquals(null, h1.join());
2785 >            rs[1].assertInvoked();
2786 >        } catch (CompletionException ok) {
2787 >            checkCompletedWithWrappedException(h1, ex);
2788 >            rs[1].assertNotInvoked();
2789 >        }
2790 >        try {
2791 >            assertEquals(null, h2.join());
2792 >            rs[2].assertInvoked();
2793 >        } catch (CompletionException ok) {
2794 >            checkCompletedWithWrappedException(h2, ex);
2795 >            rs[2].assertNotInvoked();
2796 >        }
2797 >        try {
2798 >            assertEquals(null, h3.join());
2799 >            rs[3].assertInvoked();
2800 >        } catch (CompletionException ok) {
2801 >            checkCompletedWithWrappedException(h3, ex);
2802 >            rs[3].assertNotInvoked();
2803 >        }
2804  
2744        g.complete(v2);
2745        checkCompletedWithWrappedCFException(h);
2746        f.complete(v1);
2805          checkCompletedNormally(f, v1);
2806 <        checkCompletedNormally(g, v2);
2806 >        checkCompletedExceptionally(g, ex);
2807      }}
2808  
2809      /**
2810       * runAfterEither result completes exceptionally if either source cancelled
2811       */
2812 <    public void testRunAfterEither_sourceCancelled1() {
2812 >    public void testRunAfterEither_sourceCancelled() {
2813          for (ExecutionMode m : ExecutionMode.values())
2814          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2815          for (Integer v1 : new Integer[] { 1, null })
2816      {
2817          final CompletableFuture<Integer> f = new CompletableFuture<>();
2818          final CompletableFuture<Integer> g = new CompletableFuture<>();
2819 <        final Noop r = new Noop();
2820 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2819 >        final Noop[] rs = new Noop[6];
2820 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2821  
2822 <        assertTrue(f.cancel(mayInterruptIfRunning));
2823 <        checkCompletedWithWrappedCancellationException(h);
2824 <        g.complete(v1);
2822 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2823 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2824 >        checkIncomplete(h0);
2825 >        checkIncomplete(h1);
2826 >        rs[0].assertNotInvoked();
2827 >        rs[1].assertNotInvoked();
2828 >        f.cancel(mayInterruptIfRunning);
2829 >        checkCompletedWithWrappedCancellationException(h0);
2830 >        checkCompletedWithWrappedCancellationException(h1);
2831 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2832 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2833 >        checkCompletedWithWrappedCancellationException(h2);
2834 >        checkCompletedWithWrappedCancellationException(h3);
2835  
2836 <        checkCancelled(f);
2769 <        assertEquals(0, r.invocationCount);
2770 <        checkCompletedNormally(g, v1);
2771 <        checkCompletedWithWrappedCancellationException(h);
2772 <    }}
2836 >        assertTrue(g.complete(v1));
2837  
2838 <    public void testRunAfterEither_sourceCancelled2() {
2839 <        for (ExecutionMode m : ExecutionMode.values())
2840 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2841 <        for (Integer v1 : new Integer[] { 1, null })
2842 <    {
2843 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2844 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2845 <        final Noop r = new Noop();
2846 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2847 <
2784 <        assertTrue(g.cancel(mayInterruptIfRunning));
2785 <        checkCompletedWithWrappedCancellationException(h);
2786 <        f.complete(v1);
2787 <
2788 <        checkCancelled(g);
2789 <        assertEquals(0, r.invocationCount);
2790 <        checkCompletedNormally(f, v1);
2791 <        checkCompletedWithWrappedCancellationException(h);
2792 <    }}
2793 <
2794 <    public void testRunAfterEither_sourceCancelled3() {
2795 <        for (ExecutionMode m : ExecutionMode.values())
2796 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2797 <        for (Integer v1 : new Integer[] { 1, null })
2798 <    {
2799 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2801 <        final Noop r = new Noop();
2802 <
2803 <        assertTrue(g.cancel(mayInterruptIfRunning));
2804 <        f.complete(v1);
2805 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2806 <
2807 <        // unspecified behavior
2808 <        Integer v;
2838 >        // unspecified behavior - both source completions available
2839 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2840 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2841 >        try {
2842 >            assertNull(h4.join());
2843 >            rs[4].assertInvoked();
2844 >        } catch (CompletionException ok) {
2845 >            checkCompletedWithWrappedCancellationException(h4);
2846 >            rs[4].assertNotInvoked();
2847 >        }
2848          try {
2849 <            assertNull(h.join());
2850 <            assertEquals(1, r.invocationCount);
2849 >            assertNull(h5.join());
2850 >            rs[5].assertInvoked();
2851          } catch (CompletionException ok) {
2852 <            checkCompletedWithWrappedCancellationException(h);
2853 <            assertEquals(0, r.invocationCount);
2852 >            checkCompletedWithWrappedCancellationException(h5);
2853 >            rs[5].assertNotInvoked();
2854          }
2855  
2856 <        checkCancelled(g);
2857 <        checkCompletedNormally(f, v1);
2856 >        checkCancelled(f);
2857 >        checkCompletedNormally(g, v1);
2858 >        checkCompletedWithWrappedCancellationException(h0);
2859 >        checkCompletedWithWrappedCancellationException(h1);
2860 >        checkCompletedWithWrappedCancellationException(h2);
2861 >        checkCompletedWithWrappedCancellationException(h3);
2862 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2863      }}
2864  
2865 <    public void testRunAfterEither_sourceCancelled4() {
2865 >    /**
2866 >     * runAfterEither result completes exceptionally if action does
2867 >     */
2868 >    public void testRunAfterEither_actionFailed() {
2869          for (ExecutionMode m : ExecutionMode.values())
2823        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2870          for (Integer v1 : new Integer[] { 1, null })
2871 +        for (Integer v2 : new Integer[] { 2, null })
2872      {
2873          final CompletableFuture<Integer> f = new CompletableFuture<>();
2874          final CompletableFuture<Integer> g = new CompletableFuture<>();
2875 <        final Noop r = new Noop();
2875 >        final FailingRunnable[] rs = new FailingRunnable[6];
2876 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2877  
2878 <        assertTrue(f.cancel(mayInterruptIfRunning));
2879 <        g.complete(v1);
2880 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2878 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2879 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2880 >        assertTrue(f.complete(v1));
2881 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2882 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2883 >        checkCompletedWithWrappedCFException(h0);
2884 >        checkCompletedWithWrappedCFException(h1);
2885 >        checkCompletedWithWrappedCFException(h2);
2886 >        checkCompletedWithWrappedCFException(h3);
2887 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2888 >        assertTrue(g.complete(v2));
2889 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2890 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2891 >        checkCompletedWithWrappedCFException(h4);
2892 >        checkCompletedWithWrappedCFException(h5);
2893  
2894 <        // unspecified behavior
2895 <        Integer v;
2896 <        try {
2837 <            assertNull(h.join());
2838 <            assertEquals(1, r.invocationCount);
2839 <        } catch (CompletionException ok) {
2840 <            checkCompletedWithWrappedCancellationException(h);
2841 <            assertEquals(0, r.invocationCount);
2842 <        }
2843 <
2844 <        checkCancelled(f);
2845 <        checkCompletedNormally(g, v1);
2894 >        checkCompletedNormally(f, v1);
2895 >        checkCompletedNormally(g, v2);
2896 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2897      }}
2898  
2899      /**
# Line 2854 | Line 2905 | public class CompletableFutureTest exten
2905          for (Integer v1 : new Integer[] { 1, null })
2906      {
2907          final CompletableFuture<Integer> f = new CompletableFuture<>();
2908 <        final CompletableFutureInc r = new CompletableFutureInc();
2909 <        if (!createIncomplete) f.complete(v1);
2910 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2911 <        if (createIncomplete) f.complete(v1);
2908 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2909 >        if (!createIncomplete) assertTrue(f.complete(v1));
2910 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2911 >        if (createIncomplete) assertTrue(f.complete(v1));
2912  
2913          checkCompletedNormally(g, inc(v1));
2914          checkCompletedNormally(f, v1);
2915 <        assertEquals(1, r.invocationCount);
2915 >        r.assertValue(v1);
2916      }}
2917  
2918      /**
# Line 2873 | Line 2924 | public class CompletableFutureTest exten
2924          for (boolean createIncomplete : new boolean[] { true, false })
2925      {
2926          final CFException ex = new CFException();
2927 <        final CompletableFutureInc r = new CompletableFutureInc();
2927 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2928          final CompletableFuture<Integer> f = new CompletableFuture<>();
2929          if (!createIncomplete) f.completeExceptionally(ex);
2930 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2930 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2931          if (createIncomplete) f.completeExceptionally(ex);
2932  
2933 <        checkCompletedWithWrappedCFException(g, ex);
2934 <        checkCompletedWithWrappedCFException(f, ex);
2935 <        assertEquals(0, r.invocationCount);
2933 >        checkCompletedWithWrappedException(g, ex);
2934 >        checkCompletedExceptionally(f, ex);
2935 >        r.assertNotInvoked();
2936      }}
2937  
2938      /**
# Line 2894 | Line 2945 | public class CompletableFutureTest exten
2945      {
2946          final CompletableFuture<Integer> f = new CompletableFuture<>();
2947          final FailingCompletableFutureFunction r
2948 <            = new FailingCompletableFutureFunction();
2949 <        if (!createIncomplete) f.complete(v1);
2950 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2951 <        if (createIncomplete) f.complete(v1);
2948 >            = new FailingCompletableFutureFunction(m);
2949 >        if (!createIncomplete) assertTrue(f.complete(v1));
2950 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2951 >        if (createIncomplete) assertTrue(f.complete(v1));
2952  
2953          checkCompletedWithWrappedCFException(g);
2954          checkCompletedNormally(f, v1);
# Line 2912 | Line 2963 | public class CompletableFutureTest exten
2963          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2964      {
2965          final CompletableFuture<Integer> f = new CompletableFuture<>();
2966 <        final CompletableFutureInc r = new CompletableFutureInc();
2966 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2967          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2968 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2969 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2968 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2969 >        if (createIncomplete) {
2970 >            checkIncomplete(g);
2971 >            assertTrue(f.cancel(mayInterruptIfRunning));
2972 >        }
2973  
2974          checkCompletedWithWrappedCancellationException(g);
2975          checkCancelled(f);
2976      }}
2977  
2924    // asyncs
2925
2926    /**
2927     * thenApplyAsync result completes normally after normal completion of source
2928     */
2929    public void testThenApplyAsync() {
2930        CompletableFuture<Integer> f = new CompletableFuture<>();
2931        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2932        f.complete(one);
2933        checkCompletedNormally(g, two);
2934    }
2935
2936    /**
2937     * thenApplyAsync result completes exceptionally after exceptional
2938     * completion of source
2939     */
2940    public void testThenApplyAsync2() {
2941        CompletableFuture<Integer> f = new CompletableFuture<>();
2942        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2943        f.completeExceptionally(new CFException());
2944        checkCompletedWithWrappedCFException(g);
2945    }
2946
2947    /**
2948     * thenApplyAsync result completes exceptionally if action does
2949     */
2950    public void testThenApplyAsync3() {
2951        CompletableFuture<Integer> f = new CompletableFuture<>();
2952        FailingFunction r = new FailingFunction();
2953        CompletableFuture<Integer> g = f.thenApplyAsync(r);
2954        f.complete(null);
2955        checkCompletedWithWrappedCFException(g);
2956    }
2957
2958    /**
2959     * thenApplyAsync result completes exceptionally if source cancelled
2960     */
2961    public void testThenApplyAsync4() {
2962        CompletableFuture<Integer> f = new CompletableFuture<>();
2963        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
2964        assertTrue(f.cancel(true));
2965        checkCompletedWithWrappedCancellationException(g);
2966    }
2967
2968    /**
2969     * thenAcceptAsync result completes normally after normal
2970     * completion of source
2971     */
2972    public void testThenAcceptAsync() {
2973        CompletableFuture<Integer> f = new CompletableFuture<>();
2974        IncAction r = new IncAction();
2975        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2976        f.complete(one);
2977        checkCompletedNormally(g, null);
2978        assertEquals(r.value, (Integer) 2);
2979    }
2980
2981    /**
2982     * thenAcceptAsync result completes exceptionally after exceptional
2983     * completion of source
2984     */
2985    public void testThenAcceptAsync2() {
2986        CompletableFuture<Integer> f = new CompletableFuture<>();
2987        IncAction r = new IncAction();
2988        CompletableFuture<Void> g = f.thenAcceptAsync(r);
2989        f.completeExceptionally(new CFException());
2990        checkCompletedWithWrappedCFException(g);
2991    }
2992
2993    /**
2994     * thenAcceptAsync result completes exceptionally if action does
2995     */
2996    public void testThenAcceptAsync3() {
2997        CompletableFuture<Integer> f = new CompletableFuture<>();
2998        FailingConsumer r = new FailingConsumer();
2999        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3000        f.complete(null);
3001        checkCompletedWithWrappedCFException(g);
3002    }
3003
3004    /**
3005     * thenAcceptAsync result completes exceptionally if source cancelled
3006     */
3007    public void testThenAcceptAsync4() {
3008        CompletableFuture<Integer> f = new CompletableFuture<>();
3009        IncAction r = new IncAction();
3010        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3011        assertTrue(f.cancel(true));
3012        checkCompletedWithWrappedCancellationException(g);
3013    }
3014
3015    // async with explicit executors
3016
3017    /**
3018     * thenApplyAsync result completes normally after normal completion of source
3019     */
3020    public void testThenApplyAsyncE() {
3021        CompletableFuture<Integer> f = new CompletableFuture<>();
3022        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3023        f.complete(one);
3024        checkCompletedNormally(g, two);
3025    }
3026
3027    /**
3028     * thenApplyAsync result completes exceptionally after exceptional
3029     * completion of source
3030     */
3031    public void testThenApplyAsync2E() {
3032        CompletableFuture<Integer> f = new CompletableFuture<>();
3033        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3034        f.completeExceptionally(new CFException());
3035        checkCompletedWithWrappedCFException(g);
3036    }
3037
3038    /**
3039     * thenApplyAsync result completes exceptionally if action does
3040     */
3041    public void testThenApplyAsync3E() {
3042        CompletableFuture<Integer> f = new CompletableFuture<>();
3043        FailingFunction r = new FailingFunction();
3044        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3045        f.complete(null);
3046        checkCompletedWithWrappedCFException(g);
3047    }
3048
3049    /**
3050     * thenApplyAsync result completes exceptionally if source cancelled
3051     */
3052    public void testThenApplyAsync4E() {
3053        CompletableFuture<Integer> f = new CompletableFuture<>();
3054        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3055        assertTrue(f.cancel(true));
3056        checkCompletedWithWrappedCancellationException(g);
3057    }
3058
3059    /**
3060     * thenAcceptAsync result completes normally after normal
3061     * completion of source
3062     */
3063    public void testThenAcceptAsyncE() {
3064        CompletableFuture<Integer> f = new CompletableFuture<>();
3065        IncAction r = new IncAction();
3066        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3067        f.complete(one);
3068        checkCompletedNormally(g, null);
3069        assertEquals(r.value, (Integer) 2);
3070    }
3071
3072    /**
3073     * thenAcceptAsync result completes exceptionally after exceptional
3074     * completion of source
3075     */
3076    public void testThenAcceptAsync2E() {
3077        CompletableFuture<Integer> f = new CompletableFuture<>();
3078        IncAction r = new IncAction();
3079        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3080        f.completeExceptionally(new CFException());
3081        checkCompletedWithWrappedCFException(g);
3082    }
3083
3084    /**
3085     * thenAcceptAsync result completes exceptionally if action does
3086     */
3087    public void testThenAcceptAsync3E() {
3088        CompletableFuture<Integer> f = new CompletableFuture<>();
3089        FailingConsumer r = new FailingConsumer();
3090        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3091        f.complete(null);
3092        checkCompletedWithWrappedCFException(g);
3093    }
3094
3095    /**
3096     * thenAcceptAsync result completes exceptionally if source cancelled
3097     */
3098    public void testThenAcceptAsync4E() {
3099        CompletableFuture<Integer> f = new CompletableFuture<>();
3100        IncAction r = new IncAction();
3101        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3102        assertTrue(f.cancel(true));
3103        checkCompletedWithWrappedCancellationException(g);
3104    }
3105
2978      // other static methods
2979  
2980      /**
# Line 3119 | Line 2991 | public class CompletableFutureTest exten
2991       * when all components complete normally
2992       */
2993      public void testAllOf_normal() throws Exception {
2994 <        for (int k = 1; k < 20; ++k) {
2995 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2996 <            for (int i = 0; i < k; ++i)
2994 >        for (int k = 1; k < 10; k++) {
2995 >            CompletableFuture<Integer>[] fs
2996 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2997 >            for (int i = 0; i < k; i++)
2998 >                fs[i] = new CompletableFuture<>();
2999 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3000 >            for (int i = 0; i < k; i++) {
3001 >                checkIncomplete(f);
3002 >                checkIncomplete(CompletableFuture.allOf(fs));
3003 >                fs[i].complete(one);
3004 >            }
3005 >            checkCompletedNormally(f, null);
3006 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3007 >        }
3008 >    }
3009 >
3010 >    public void testAllOf_backwards() throws Exception {
3011 >        for (int k = 1; k < 10; k++) {
3012 >            CompletableFuture<Integer>[] fs
3013 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3014 >            for (int i = 0; i < k; i++)
3015                  fs[i] = new CompletableFuture<>();
3016              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3017 <            for (int i = 0; i < k; ++i) {
3017 >            for (int i = k - 1; i >= 0; i--) {
3018                  checkIncomplete(f);
3019                  checkIncomplete(CompletableFuture.allOf(fs));
3020                  fs[i].complete(one);
# Line 3134 | Line 3024 | public class CompletableFutureTest exten
3024          }
3025      }
3026  
3027 +    public void testAllOf_exceptional() throws Exception {
3028 +        for (int k = 1; k < 10; k++) {
3029 +            CompletableFuture<Integer>[] fs
3030 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3031 +            CFException ex = new CFException();
3032 +            for (int i = 0; i < k; i++)
3033 +                fs[i] = new CompletableFuture<>();
3034 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3035 +            for (int i = 0; i < k; i++) {
3036 +                checkIncomplete(f);
3037 +                checkIncomplete(CompletableFuture.allOf(fs));
3038 +                if (i != k/2) {
3039 +                    fs[i].complete(i);
3040 +                    checkCompletedNormally(fs[i], i);
3041 +                } else {
3042 +                    fs[i].completeExceptionally(ex);
3043 +                    checkCompletedExceptionally(fs[i], ex);
3044 +                }
3045 +            }
3046 +            checkCompletedWithWrappedException(f, ex);
3047 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3048 +        }
3049 +    }
3050 +
3051      /**
3052       * anyOf(no component futures) returns an incomplete future
3053       */
3054      public void testAnyOf_empty() throws Exception {
3055 +        for (Integer v1 : new Integer[] { 1, null })
3056 +    {
3057          CompletableFuture<Object> f = CompletableFuture.anyOf();
3058          checkIncomplete(f);
3059 <    }
3059 >
3060 >        f.complete(v1);
3061 >        checkCompletedNormally(f, v1);
3062 >    }}
3063  
3064      /**
3065       * anyOf returns a future completed normally with a value when
3066       * a component future does
3067       */
3068      public void testAnyOf_normal() throws Exception {
3069 <        for (int k = 0; k < 10; ++k) {
3069 >        for (int k = 0; k < 10; k++) {
3070              CompletableFuture[] fs = new CompletableFuture[k];
3071 <            for (int i = 0; i < k; ++i)
3071 >            for (int i = 0; i < k; i++)
3072                  fs[i] = new CompletableFuture<>();
3073              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3074              checkIncomplete(f);
3075 <            for (int i = 0; i < k; ++i) {
3076 <                fs[i].complete(one);
3077 <                checkCompletedNormally(f, one);
3078 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3075 >            for (int i = 0; i < k; i++) {
3076 >                fs[i].complete(i);
3077 >                checkCompletedNormally(f, 0);
3078 >                int x = (int) CompletableFuture.anyOf(fs).join();
3079 >                assertTrue(0 <= x && x <= i);
3080 >            }
3081 >        }
3082 >    }
3083 >    public void testAnyOf_normal_backwards() throws Exception {
3084 >        for (int k = 0; k < 10; k++) {
3085 >            CompletableFuture[] fs = new CompletableFuture[k];
3086 >            for (int i = 0; i < k; i++)
3087 >                fs[i] = new CompletableFuture<>();
3088 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3089 >            checkIncomplete(f);
3090 >            for (int i = k - 1; i >= 0; i--) {
3091 >                fs[i].complete(i);
3092 >                checkCompletedNormally(f, k - 1);
3093 >                int x = (int) CompletableFuture.anyOf(fs).join();
3094 >                assertTrue(i <= x && x <= k - 1);
3095              }
3096          }
3097      }
# Line 3165 | Line 3100 | public class CompletableFutureTest exten
3100       * anyOf result completes exceptionally when any component does.
3101       */
3102      public void testAnyOf_exceptional() throws Exception {
3103 <        for (int k = 0; k < 10; ++k) {
3103 >        for (int k = 0; k < 10; k++) {
3104              CompletableFuture[] fs = new CompletableFuture[k];
3105 <            for (int i = 0; i < k; ++i)
3105 >            CFException[] exs = new CFException[k];
3106 >            for (int i = 0; i < k; i++) {
3107                  fs[i] = new CompletableFuture<>();
3108 +                exs[i] = new CFException();
3109 +            }
3110              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3111              checkIncomplete(f);
3112 <            for (int i = 0; i < k; ++i) {
3113 <                fs[i].completeExceptionally(new CFException());
3114 <                checkCompletedWithWrappedCFException(f);
3112 >            for (int i = 0; i < k; i++) {
3113 >                fs[i].completeExceptionally(exs[i]);
3114 >                checkCompletedWithWrappedException(f, exs[0]);
3115 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3116 >            }
3117 >        }
3118 >    }
3119 >
3120 >    public void testAnyOf_exceptional_backwards() throws Exception {
3121 >        for (int k = 0; k < 10; k++) {
3122 >            CompletableFuture[] fs = new CompletableFuture[k];
3123 >            CFException[] exs = new CFException[k];
3124 >            for (int i = 0; i < k; i++) {
3125 >                fs[i] = new CompletableFuture<>();
3126 >                exs[i] = new CFException();
3127 >            }
3128 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3129 >            checkIncomplete(f);
3130 >            for (int i = k - 1; i >= 0; i--) {
3131 >                fs[i].completeExceptionally(exs[i]);
3132 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3133                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3134              }
3135          }
# Line 3192 | Line 3148 | public class CompletableFutureTest exten
3148          Runnable[] throwingActions = {
3149              () -> CompletableFuture.supplyAsync(null),
3150              () -> CompletableFuture.supplyAsync(null, exec),
3151 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3151 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3152  
3153              () -> CompletableFuture.runAsync(null),
3154              () -> CompletableFuture.runAsync(null, exec),
# Line 3265 | Line 3221 | public class CompletableFutureTest exten
3221  
3222              () -> f.thenCompose(null),
3223              () -> f.thenComposeAsync(null),
3224 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3224 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3225              () -> f.thenComposeAsync(null, exec),
3226  
3227              () -> f.exceptionally(null),
# Line 3297 | Line 3253 | public class CompletableFutureTest exten
3253          assertSame(f, f.toCompletableFuture());
3254      }
3255  
3256 <    /**
3301 <     * whenComplete action executes on normal completion, propagating
3302 <     * source result.
3303 <     */
3304 <    public void testWhenComplete_normalCompletion1() {
3305 <        for (ExecutionMode m : ExecutionMode.values())
3306 <        for (boolean createIncomplete : new boolean[] { true, false })
3307 <        for (Integer v1 : new Integer[] { 1, null })
3308 <    {
3309 <        final AtomicInteger a = new AtomicInteger(0);
3310 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3311 <        if (!createIncomplete) f.complete(v1);
3312 <        final CompletableFuture<Integer> g = m.whenComplete
3313 <            (f,
3314 <             (Integer x, Throwable t) -> {
3315 <                threadAssertSame(x, v1);
3316 <                threadAssertNull(t);
3317 <                a.getAndIncrement();
3318 <            });
3319 <        if (createIncomplete) f.complete(v1);
3256 >    //--- tests of implementation details; not part of official tck ---
3257  
3258 <        checkCompletedNormally(g, v1);
3259 <        checkCompletedNormally(f, v1);
3260 <        assertEquals(1, a.get());
3261 <    }}
3258 >    Object resultOf(CompletableFuture<?> f) {
3259 >        try {
3260 >            java.lang.reflect.Field resultField
3261 >                = CompletableFuture.class.getDeclaredField("result");
3262 >            resultField.setAccessible(true);
3263 >            return resultField.get(f);
3264 >        } catch (Throwable t) { throw new AssertionError(t); }
3265 >    }
3266  
3267 <    /**
3268 <     * whenComplete action executes on exceptional completion, propagating
3328 <     * source result.
3329 <     */
3330 <    public void testWhenComplete_exceptionalCompletion() {
3267 >    public void testExceptionPropagationReusesResultObject() {
3268 >        if (!testImplementationDetails) return;
3269          for (ExecutionMode m : ExecutionMode.values())
3332        for (boolean createIncomplete : new boolean[] { true, false })
3333        for (Integer v1 : new Integer[] { 1, null })
3270      {
3335        final AtomicInteger a = new AtomicInteger(0);
3271          final CFException ex = new CFException();
3272 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3273 <        if (!createIncomplete) f.completeExceptionally(ex);
3339 <        final CompletableFuture<Integer> g = m.whenComplete
3340 <            (f,
3341 <             (Integer x, Throwable t) -> {
3342 <                threadAssertNull(x);
3343 <                threadAssertSame(t, ex);
3344 <                a.getAndIncrement();
3345 <            });
3346 <        if (createIncomplete) f.completeExceptionally(ex);
3347 <        checkCompletedWithWrappedCFException(f, ex);
3348 <        checkCompletedWithWrappedCFException(g, ex);
3349 <        assertEquals(1, a.get());
3350 <    }}
3272 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3273 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3274  
3275 <    /**
3276 <     * whenComplete action executes on cancelled source, propagating
3354 <     * CancellationException.
3355 <     */
3356 <    public void testWhenComplete_sourceCancelled() {
3357 <        for (ExecutionMode m : ExecutionMode.values())
3358 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3359 <        for (boolean createIncomplete : new boolean[] { true, false })
3360 <    {
3361 <        final AtomicInteger a = new AtomicInteger(0);
3362 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3363 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3364 <        final CompletableFuture<Integer> g = m.whenComplete
3365 <            (f,
3366 <             (Integer x, Throwable t) -> {
3367 <                threadAssertNull(x);
3368 <                threadAssertTrue(t instanceof CancellationException);
3369 <                a.getAndIncrement();
3370 <            });
3371 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3275 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3276 >            = new ArrayList<>();
3277  
3278 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3279 <        checkCompletedWithWrappedCancellationException(g);
3280 <        checkCancelled(f);
3376 <        assertEquals(1, a.get());
3377 <    }}
3278 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3279 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3280 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3281  
3282 <    /**
3283 <     * If a whenComplete action throws an exception when triggered by
3284 <     * a normal completion, it completes exceptionally
3382 <     */
3383 <    public void testWhenComplete_actionFailed() {
3384 <        for (boolean createIncomplete : new boolean[] { true, false })
3385 <        for (ExecutionMode m : ExecutionMode.values())
3386 <        for (Integer v1 : new Integer[] { 1, null })
3387 <    {
3388 <        final AtomicInteger a = new AtomicInteger(0);
3389 <        final CFException ex = new CFException();
3390 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3391 <        if (!createIncomplete) f.complete(v1);
3392 <        final CompletableFuture<Integer> g = m.whenComplete
3393 <            (f,
3394 <             (Integer x, Throwable t) -> {
3395 <                threadAssertSame(x, v1);
3396 <                threadAssertNull(t);
3397 <                a.getAndIncrement();
3398 <                throw ex;
3399 <            });
3400 <        if (createIncomplete) f.complete(v1);
3401 <        checkCompletedNormally(f, v1);
3402 <        checkCompletedWithWrappedCFException(g, ex);
3403 <        assertEquals(1, a.get());
3404 <    }}
3282 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3283 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3284 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3285  
3286 <    /**
3287 <     * If a whenComplete action throws an exception when triggered by
3288 <     * a source completion that also throws an exception, the source
3409 <     * exception takes precedence.
3410 <     */
3411 <    public void testWhenComplete_actionFailedSourceFailed() {
3412 <        for (boolean createIncomplete : new boolean[] { true, false })
3413 <        for (ExecutionMode m : ExecutionMode.values())
3414 <        for (Integer v1 : new Integer[] { 1, null })
3415 <    {
3416 <        final AtomicInteger a = new AtomicInteger(0);
3417 <        final CFException ex1 = new CFException();
3418 <        final CFException ex2 = new CFException();
3419 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3286 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3287 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3288 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3289  
3290 <        if (!createIncomplete) f.completeExceptionally(ex1);
3422 <        final CompletableFuture<Integer> g = m.whenComplete
3423 <            (f,
3424 <             (Integer x, Throwable t) -> {
3425 <                threadAssertSame(t, ex1);
3426 <                threadAssertNull(x);
3427 <                a.getAndIncrement();
3428 <                throw ex2;
3429 <            });
3430 <        if (createIncomplete) f.completeExceptionally(ex1);
3290 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3291  
3292 <        checkCompletedWithWrappedCFException(f, ex1);
3293 <        checkCompletedWithWrappedCFException(g, ex1);
3294 <        assertEquals(1, a.get());
3292 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3293 >
3294 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3295 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3296 >
3297 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3298 >                 fun : funs) {
3299 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3300 >            f.completeExceptionally(ex);
3301 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3302 >            checkCompletedWithWrappedException(src, ex);
3303 >            CompletableFuture<?> dep = fun.apply(src);
3304 >            checkCompletedWithWrappedException(dep, ex);
3305 >            assertSame(resultOf(src), resultOf(dep));
3306 >        }
3307 >
3308 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3309 >                 fun : funs) {
3310 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3311 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3312 >            CompletableFuture<?> dep = fun.apply(src);
3313 >            f.completeExceptionally(ex);
3314 >            checkCompletedWithWrappedException(src, ex);
3315 >            checkCompletedWithWrappedException(dep, ex);
3316 >            assertSame(resultOf(src), resultOf(dep));
3317 >        }
3318 >
3319 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3320 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3321 >                 fun : funs) {
3322 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3323 >            f.cancel(mayInterruptIfRunning);
3324 >            checkCancelled(f);
3325 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3326 >            checkCompletedWithWrappedCancellationException(src);
3327 >            CompletableFuture<?> dep = fun.apply(src);
3328 >            checkCompletedWithWrappedCancellationException(dep);
3329 >            assertSame(resultOf(src), resultOf(dep));
3330 >        }
3331 >
3332 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3333 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3334 >                 fun : funs) {
3335 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3336 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3337 >            CompletableFuture<?> dep = fun.apply(src);
3338 >            f.cancel(mayInterruptIfRunning);
3339 >            checkCancelled(f);
3340 >            checkCompletedWithWrappedCancellationException(src);
3341 >            checkCompletedWithWrappedCancellationException(dep);
3342 >            assertSame(resultOf(src), resultOf(dep));
3343 >        }
3344      }}
3345  
3346   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines