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.51 by jsr166, Mon Jun 2 19:49:28 2014 UTC vs.
Revision 1.80 by jsr166, Mon Jun 16 17:29:03 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines