ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.53 by jsr166, Mon Jun 2 20:20:47 2014 UTC vs.
Revision 1.90 by jsr166, Tue Jun 17 18:09:28 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 976 | Line 1264 | public class CompletableFutureTest exten
1264       */
1265      public void testThenRun_normalCompletion() {
1266          for (ExecutionMode m : ExecutionMode.values())
979        for (boolean createIncomplete : new boolean[] { true, false })
1267          for (Integer v1 : new Integer[] { 1, null })
1268      {
1269          final CompletableFuture<Integer> f = new CompletableFuture<>();
1270 <        final Noop r = new Noop();
1271 <        if (!createIncomplete) f.complete(v1);
985 <        final CompletableFuture<Void> g = m.thenRun(f, r);
986 <        if (createIncomplete) {
987 <            checkIncomplete(g);
988 <            f.complete(v1);
989 <        }
1270 >        final Noop[] rs = new Noop[6];
1271 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1272  
1273 <        checkCompletedNormally(g, null);
1273 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1274 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1275 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1276 >        checkIncomplete(h0);
1277 >        checkIncomplete(h1);
1278 >        checkIncomplete(h2);
1279 >        assertTrue(f.complete(v1));
1280 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1281 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1282 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1283 >
1284 >        checkCompletedNormally(h0, null);
1285 >        checkCompletedNormally(h1, null);
1286 >        checkCompletedNormally(h2, null);
1287 >        checkCompletedNormally(h3, null);
1288 >        checkCompletedNormally(h4, null);
1289 >        checkCompletedNormally(h5, null);
1290          checkCompletedNormally(f, v1);
1291 <        assertEquals(1, r.invocationCount);
1291 >        for (Noop r : rs) r.assertInvoked();
1292      }}
1293  
1294      /**
# Line 999 | Line 1297 | public class CompletableFutureTest exten
1297       */
1298      public void testThenRun_exceptionalCompletion() {
1299          for (ExecutionMode m : ExecutionMode.values())
1002        for (boolean createIncomplete : new boolean[] { true, false })
1300      {
1301          final CFException ex = new CFException();
1302          final CompletableFuture<Integer> f = new CompletableFuture<>();
1303 <        final Noop r = new Noop();
1304 <        if (!createIncomplete) f.completeExceptionally(ex);
1008 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1009 <        if (createIncomplete) {
1010 <            checkIncomplete(g);
1011 <            f.completeExceptionally(ex);
1012 <        }
1303 >        final Noop[] rs = new Noop[6];
1304 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1305  
1306 <        checkCompletedWithWrappedCFException(g, ex);
1307 <        checkCompletedWithWrappedCFException(f, ex);
1308 <        assertEquals(0, r.invocationCount);
1306 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1307 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1308 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1309 >        checkIncomplete(h0);
1310 >        checkIncomplete(h1);
1311 >        checkIncomplete(h2);
1312 >        assertTrue(f.completeExceptionally(ex));
1313 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1314 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1315 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1316 >
1317 >        checkCompletedWithWrappedException(h0, ex);
1318 >        checkCompletedWithWrappedException(h1, ex);
1319 >        checkCompletedWithWrappedException(h2, ex);
1320 >        checkCompletedWithWrappedException(h3, ex);
1321 >        checkCompletedWithWrappedException(h4, ex);
1322 >        checkCompletedWithWrappedException(h5, ex);
1323 >        checkCompletedExceptionally(f, ex);
1324 >        for (Noop r : rs) r.assertNotInvoked();
1325      }}
1326  
1327      /**
# Line 1021 | Line 1329 | public class CompletableFutureTest exten
1329       */
1330      public void testThenRun_sourceCancelled() {
1331          for (ExecutionMode m : ExecutionMode.values())
1024        for (boolean createIncomplete : new boolean[] { true, false })
1332          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333      {
1334          final CompletableFuture<Integer> f = new CompletableFuture<>();
1335 <        final Noop r = new Noop();
1336 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1030 <        final CompletableFuture<Void> g = f.thenRun(r);
1031 <        if (createIncomplete) {
1032 <            checkIncomplete(g);
1033 <            assertTrue(f.cancel(mayInterruptIfRunning));
1034 <        }
1335 >        final Noop[] rs = new Noop[6];
1336 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1337  
1338 <        checkCompletedWithWrappedCancellationException(g);
1338 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1339 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1340 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1341 >        checkIncomplete(h0);
1342 >        checkIncomplete(h1);
1343 >        checkIncomplete(h2);
1344 >        assertTrue(f.cancel(mayInterruptIfRunning));
1345 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1346 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1347 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1348 >
1349 >        checkCompletedWithWrappedCancellationException(h0);
1350 >        checkCompletedWithWrappedCancellationException(h1);
1351 >        checkCompletedWithWrappedCancellationException(h2);
1352 >        checkCompletedWithWrappedCancellationException(h3);
1353 >        checkCompletedWithWrappedCancellationException(h4);
1354 >        checkCompletedWithWrappedCancellationException(h5);
1355          checkCancelled(f);
1356 <        assertEquals(0, r.invocationCount);
1356 >        for (Noop r : rs) r.assertNotInvoked();
1357      }}
1358  
1359      /**
# Line 1043 | Line 1361 | public class CompletableFutureTest exten
1361       */
1362      public void testThenRun_actionFailed() {
1363          for (ExecutionMode m : ExecutionMode.values())
1046        for (boolean createIncomplete : new boolean[] { true, false })
1364          for (Integer v1 : new Integer[] { 1, null })
1365      {
1366          final CompletableFuture<Integer> f = new CompletableFuture<>();
1367 <        final FailingRunnable r = new FailingRunnable();
1368 <        if (!createIncomplete) f.complete(v1);
1052 <        final CompletableFuture<Void> g = f.thenRun(r);
1053 <        if (createIncomplete) {
1054 <            checkIncomplete(g);
1055 <            f.complete(v1);
1056 <        }
1367 >        final FailingRunnable[] rs = new FailingRunnable[6];
1368 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1369  
1370 <        checkCompletedWithWrappedCFException(g);
1370 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1371 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1372 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1373 >        final FailingRunnable r = new FailingRunnable(m);
1374 >        assertTrue(f.complete(v1));
1375 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1376 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1377 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1378 >
1379 >        checkCompletedWithWrappedCFException(h0);
1380 >        checkCompletedWithWrappedCFException(h1);
1381 >        checkCompletedWithWrappedCFException(h2);
1382 >        checkCompletedWithWrappedCFException(h3);
1383 >        checkCompletedWithWrappedCFException(h4);
1384 >        checkCompletedWithWrappedCFException(h5);
1385          checkCompletedNormally(f, v1);
1386      }}
1387  
# Line 1068 | Line 1394 | public class CompletableFutureTest exten
1394          for (Integer v1 : new Integer[] { 1, null })
1395      {
1396          final CompletableFuture<Integer> f = new CompletableFuture<>();
1397 <        final IncFunction r = new IncFunction();
1398 <        if (!createIncomplete) f.complete(v1);
1397 >        final IncFunction r = new IncFunction(m);
1398 >        if (!createIncomplete) assertTrue(f.complete(v1));
1399          final CompletableFuture<Integer> g = m.thenApply(f, r);
1400          if (createIncomplete) {
1401              checkIncomplete(g);
1402 <            f.complete(v1);
1402 >            assertTrue(f.complete(v1));
1403          }
1404  
1405          checkCompletedNormally(g, inc(v1));
1406          checkCompletedNormally(f, v1);
1407 <        assertEquals(1, r.invocationCount);
1407 >        r.assertValue(inc(v1));
1408      }}
1409  
1410      /**
# Line 1091 | Line 1417 | public class CompletableFutureTest exten
1417      {
1418          final CFException ex = new CFException();
1419          final CompletableFuture<Integer> f = new CompletableFuture<>();
1420 <        final IncFunction r = new IncFunction();
1420 >        final IncFunction r = new IncFunction(m);
1421          if (!createIncomplete) f.completeExceptionally(ex);
1422          final CompletableFuture<Integer> g = m.thenApply(f, r);
1423          if (createIncomplete) {
# Line 1099 | Line 1425 | public class CompletableFutureTest exten
1425              f.completeExceptionally(ex);
1426          }
1427  
1428 <        checkCompletedWithWrappedCFException(g, ex);
1429 <        checkCompletedWithWrappedCFException(f, ex);
1430 <        assertEquals(0, r.invocationCount);
1428 >        checkCompletedWithWrappedException(g, ex);
1429 >        checkCompletedExceptionally(f, ex);
1430 >        r.assertNotInvoked();
1431      }}
1432  
1433      /**
# Line 1113 | Line 1439 | public class CompletableFutureTest exten
1439          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1440      {
1441          final CompletableFuture<Integer> f = new CompletableFuture<>();
1442 <        final IncFunction r = new IncFunction();
1442 >        final IncFunction r = new IncFunction(m);
1443          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1444 <        final CompletableFuture<Integer> g = f.thenApply(r);
1444 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1445          if (createIncomplete) {
1446              checkIncomplete(g);
1447              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 1123 | Line 1449 | public class CompletableFutureTest exten
1449  
1450          checkCompletedWithWrappedCancellationException(g);
1451          checkCancelled(f);
1452 <        assertEquals(0, r.invocationCount);
1452 >        r.assertNotInvoked();
1453      }}
1454  
1455      /**
# Line 1135 | Line 1461 | public class CompletableFutureTest exten
1461          for (Integer v1 : new Integer[] { 1, null })
1462      {
1463          final CompletableFuture<Integer> f = new CompletableFuture<>();
1464 <        final FailingFunction r = new FailingFunction();
1465 <        if (!createIncomplete) f.complete(v1);
1466 <        final CompletableFuture<Integer> g = f.thenApply(r);
1464 >        final FailingFunction r = new FailingFunction(m);
1465 >        if (!createIncomplete) assertTrue(f.complete(v1));
1466 >        final CompletableFuture<Integer> g = m.thenApply(f, r);
1467          if (createIncomplete) {
1468              checkIncomplete(g);
1469 <            f.complete(v1);
1469 >            assertTrue(f.complete(v1));
1470          }
1471  
1472          checkCompletedWithWrappedCFException(g);
# Line 1156 | Line 1482 | public class CompletableFutureTest exten
1482          for (Integer v1 : new Integer[] { 1, null })
1483      {
1484          final CompletableFuture<Integer> f = new CompletableFuture<>();
1485 <        final IncAction r = new IncAction();
1486 <        if (!createIncomplete) f.complete(v1);
1485 >        final NoopConsumer r = new NoopConsumer(m);
1486 >        if (!createIncomplete) assertTrue(f.complete(v1));
1487          final CompletableFuture<Void> g = m.thenAccept(f, r);
1488          if (createIncomplete) {
1489              checkIncomplete(g);
1490 <            f.complete(v1);
1490 >            assertTrue(f.complete(v1));
1491          }
1492  
1493          checkCompletedNormally(g, null);
1494 +        r.assertValue(v1);
1495          checkCompletedNormally(f, v1);
1169        assertEquals(1, r.invocationCount);
1170        assertEquals(inc(v1), r.value);
1496      }}
1497  
1498      /**
# Line 1180 | Line 1505 | public class CompletableFutureTest exten
1505      {
1506          final CFException ex = new CFException();
1507          final CompletableFuture<Integer> f = new CompletableFuture<>();
1508 <        final IncAction r = new IncAction();
1508 >        final NoopConsumer r = new NoopConsumer(m);
1509          if (!createIncomplete) f.completeExceptionally(ex);
1510          final CompletableFuture<Void> g = m.thenAccept(f, r);
1511          if (createIncomplete) {
# Line 1188 | Line 1513 | public class CompletableFutureTest exten
1513              f.completeExceptionally(ex);
1514          }
1515  
1516 <        checkCompletedWithWrappedCFException(g, ex);
1517 <        checkCompletedWithWrappedCFException(f, ex);
1518 <        assertEquals(0, r.invocationCount);
1516 >        checkCompletedWithWrappedException(g, ex);
1517 >        checkCompletedExceptionally(f, ex);
1518 >        r.assertNotInvoked();
1519      }}
1520  
1521      /**
1522 <     * thenAccept result completes exceptionally if action does
1522 >     * thenAccept result completes exceptionally if source cancelled
1523       */
1524 <    public void testThenAccept_actionFailed() {
1524 >    public void testThenAccept_sourceCancelled() {
1525          for (ExecutionMode m : ExecutionMode.values())
1526          for (boolean createIncomplete : new boolean[] { true, false })
1527 <        for (Integer v1 : new Integer[] { 1, null })
1527 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1528      {
1529          final CompletableFuture<Integer> f = new CompletableFuture<>();
1530 <        final FailingConsumer r = new FailingConsumer();
1531 <        if (!createIncomplete) f.complete(v1);
1532 <        final CompletableFuture<Void> g = f.thenAccept(r);
1530 >        final NoopConsumer r = new NoopConsumer(m);
1531 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1532 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1533          if (createIncomplete) {
1534              checkIncomplete(g);
1535 <            f.complete(v1);
1535 >            assertTrue(f.cancel(mayInterruptIfRunning));
1536          }
1537  
1538 <        checkCompletedWithWrappedCFException(g);
1539 <        checkCompletedNormally(f, v1);
1538 >        checkCompletedWithWrappedCancellationException(g);
1539 >        checkCancelled(f);
1540 >        r.assertNotInvoked();
1541      }}
1542  
1543      /**
1544 <     * thenAccept result completes exceptionally if source cancelled
1544 >     * thenAccept result completes exceptionally if action does
1545       */
1546 <    public void testThenAccept_sourceCancelled() {
1546 >    public void testThenAccept_actionFailed() {
1547          for (ExecutionMode m : ExecutionMode.values())
1548          for (boolean createIncomplete : new boolean[] { true, false })
1549 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1549 >        for (Integer v1 : new Integer[] { 1, null })
1550      {
1551          final CompletableFuture<Integer> f = new CompletableFuture<>();
1552 <        final IncAction r = new IncAction();
1553 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1554 <        final CompletableFuture<Void> g = f.thenAccept(r);
1552 >        final FailingConsumer r = new FailingConsumer(m);
1553 >        if (!createIncomplete) f.complete(v1);
1554 >        final CompletableFuture<Void> g = m.thenAccept(f, r);
1555          if (createIncomplete) {
1556              checkIncomplete(g);
1557 <            assertTrue(f.cancel(mayInterruptIfRunning));
1557 >            f.complete(v1);
1558          }
1559  
1560 <        checkCompletedWithWrappedCancellationException(g);
1561 <        checkCancelled(f);
1236 <        assertEquals(0, r.invocationCount);
1560 >        checkCompletedWithWrappedCFException(g);
1561 >        checkCompletedNormally(f, v1);
1562      }}
1563  
1564      /**
# Line 1242 | Line 1567 | public class CompletableFutureTest exten
1567       */
1568      public void testThenCombine_normalCompletion() {
1569          for (ExecutionMode m : ExecutionMode.values())
1245        for (boolean createIncomplete : new boolean[] { true, false })
1570          for (boolean fFirst : new boolean[] { true, false })
1571          for (Integer v1 : new Integer[] { 1, null })
1572          for (Integer v2 : new Integer[] { 2, null })
1573      {
1574          final CompletableFuture<Integer> f = new CompletableFuture<>();
1575          final CompletableFuture<Integer> g = new CompletableFuture<>();
1576 <        final SubtractFunction r = new SubtractFunction();
1577 <
1578 <        if (fFirst) f.complete(v1); else g.complete(v2);
1579 <        if (!createIncomplete)
1580 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1581 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1582 <        if (createIncomplete) {
1583 <            checkIncomplete(h);
1584 <            assertEquals(0, r.invocationCount);
1585 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1586 <        }
1587 <
1588 <        checkCompletedNormally(h, subtract(v1, v2));
1576 >        final SubtractFunction r1 = new SubtractFunction(m);
1577 >        final SubtractFunction r2 = new SubtractFunction(m);
1578 >        final SubtractFunction r3 = new SubtractFunction(m);
1579 >
1580 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1581 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1582 >        final Integer w1 =  fFirst ? v1 : v2;
1583 >        final Integer w2 = !fFirst ? v1 : v2;
1584 >
1585 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1586 >        assertTrue(fst.complete(w1));
1587 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1588 >        checkIncomplete(h1);
1589 >        checkIncomplete(h2);
1590 >        r1.assertNotInvoked();
1591 >        r2.assertNotInvoked();
1592 >        assertTrue(snd.complete(w2));
1593 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1594 >
1595 >        checkCompletedNormally(h1, subtract(v1, v2));
1596 >        checkCompletedNormally(h2, subtract(v1, v2));
1597 >        checkCompletedNormally(h3, subtract(v1, v2));
1598 >        r1.assertValue(subtract(v1, v2));
1599 >        r2.assertValue(subtract(v1, v2));
1600 >        r3.assertValue(subtract(v1, v2));
1601          checkCompletedNormally(f, v1);
1602          checkCompletedNormally(g, v2);
1267        assertEquals(1, r.invocationCount);
1603      }}
1604  
1605      /**
1606       * thenCombine result completes exceptionally after exceptional
1607       * completion of either source
1608       */
1609 <    public void testThenCombine_exceptionalCompletion() {
1609 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1610          for (ExecutionMode m : ExecutionMode.values())
1276        for (boolean createIncomplete : new boolean[] { true, false })
1611          for (boolean fFirst : new boolean[] { true, false })
1612 +        for (boolean failFirst : new boolean[] { true, false })
1613          for (Integer v1 : new Integer[] { 1, null })
1614      {
1615          final CompletableFuture<Integer> f = new CompletableFuture<>();
1616          final CompletableFuture<Integer> g = new CompletableFuture<>();
1617          final CFException ex = new CFException();
1618 <        final SubtractFunction r = new SubtractFunction();
1619 <
1620 <        (fFirst ? f : g).complete(v1);
1621 <        if (!createIncomplete)
1622 <            (!fFirst ? f : g).completeExceptionally(ex);
1623 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1624 <        if (createIncomplete) {
1625 <            checkIncomplete(h);
1626 <            (!fFirst ? f : g).completeExceptionally(ex);
1627 <        }
1628 <
1629 <        checkCompletedWithWrappedCFException(h, ex);
1630 <        assertEquals(0, r.invocationCount);
1631 <        checkCompletedNormally(fFirst ? f : g, v1);
1632 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1618 >        final SubtractFunction r1 = new SubtractFunction(m);
1619 >        final SubtractFunction r2 = new SubtractFunction(m);
1620 >        final SubtractFunction r3 = new SubtractFunction(m);
1621 >
1622 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1623 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1624 >        final Callable<Boolean> complete1 = failFirst ?
1625 >            () -> fst.completeExceptionally(ex) :
1626 >            () -> fst.complete(v1);
1627 >        final Callable<Boolean> complete2 = failFirst ?
1628 >            () -> snd.complete(v1) :
1629 >            () -> snd.completeExceptionally(ex);
1630 >
1631 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1632 >        assertTrue(complete1.call());
1633 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1634 >        checkIncomplete(h1);
1635 >        checkIncomplete(h2);
1636 >        assertTrue(complete2.call());
1637 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1638 >
1639 >        checkCompletedWithWrappedException(h1, ex);
1640 >        checkCompletedWithWrappedException(h2, ex);
1641 >        checkCompletedWithWrappedException(h3, ex);
1642 >        r1.assertNotInvoked();
1643 >        r2.assertNotInvoked();
1644 >        r3.assertNotInvoked();
1645 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1646 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1647      }}
1648  
1649      /**
1650 <     * thenCombine result completes exceptionally if action does
1650 >     * thenCombine result completes exceptionally if either source cancelled
1651       */
1652 <    public void testThenCombine_actionFailed() {
1652 >    public void testThenCombine_sourceCancelled() throws Throwable {
1653          for (ExecutionMode m : ExecutionMode.values())
1654 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1655          for (boolean fFirst : new boolean[] { true, false })
1656 +        for (boolean failFirst : new boolean[] { true, false })
1657          for (Integer v1 : new Integer[] { 1, null })
1307        for (Integer v2 : new Integer[] { 2, null })
1658      {
1659          final CompletableFuture<Integer> f = new CompletableFuture<>();
1660          final CompletableFuture<Integer> g = new CompletableFuture<>();
1661 <        final FailingBiFunction r = new FailingBiFunction();
1662 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1663 <
1664 <        if (fFirst) {
1665 <            f.complete(v1);
1666 <            g.complete(v2);
1667 <        } else {
1668 <            g.complete(v2);
1669 <            f.complete(v1);
1670 <        }
1671 <
1672 <        checkCompletedWithWrappedCFException(h);
1673 <        checkCompletedNormally(f, v1);
1674 <        checkCompletedNormally(g, v2);
1661 >        final SubtractFunction r1 = new SubtractFunction(m);
1662 >        final SubtractFunction r2 = new SubtractFunction(m);
1663 >        final SubtractFunction r3 = new SubtractFunction(m);
1664 >
1665 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1666 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1667 >        final Callable<Boolean> complete1 = failFirst ?
1668 >            () -> fst.cancel(mayInterruptIfRunning) :
1669 >            () -> fst.complete(v1);
1670 >        final Callable<Boolean> complete2 = failFirst ?
1671 >            () -> snd.complete(v1) :
1672 >            () -> snd.cancel(mayInterruptIfRunning);
1673 >
1674 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1675 >        assertTrue(complete1.call());
1676 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1677 >        checkIncomplete(h1);
1678 >        checkIncomplete(h2);
1679 >        assertTrue(complete2.call());
1680 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1681 >
1682 >        checkCompletedWithWrappedCancellationException(h1);
1683 >        checkCompletedWithWrappedCancellationException(h2);
1684 >        checkCompletedWithWrappedCancellationException(h3);
1685 >        r1.assertNotInvoked();
1686 >        r2.assertNotInvoked();
1687 >        r3.assertNotInvoked();
1688 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1689 >        checkCancelled(failFirst ? fst : snd);
1690      }}
1691  
1692      /**
1693 <     * thenCombine result completes exceptionally if either source cancelled
1693 >     * thenCombine result completes exceptionally if action does
1694       */
1695 <    public void testThenCombine_sourceCancelled() {
1695 >    public void testThenCombine_actionFailed() {
1696          for (ExecutionMode m : ExecutionMode.values())
1332        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1333        for (boolean createIncomplete : new boolean[] { true, false })
1697          for (boolean fFirst : new boolean[] { true, false })
1698          for (Integer v1 : new Integer[] { 1, null })
1699 +        for (Integer v2 : new Integer[] { 2, null })
1700      {
1701          final CompletableFuture<Integer> f = new CompletableFuture<>();
1702          final CompletableFuture<Integer> g = new CompletableFuture<>();
1703 <        final SubtractFunction r = new SubtractFunction();
1704 <
1705 <        (fFirst ? f : g).complete(v1);
1706 <        if (!createIncomplete)
1707 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1708 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1709 <        if (createIncomplete) {
1710 <            checkIncomplete(h);
1711 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1712 <        }
1713 <
1714 <        checkCompletedWithWrappedCancellationException(h);
1715 <        checkCancelled(!fFirst ? f : g);
1716 <        assertEquals(0, r.invocationCount);
1717 <        checkCompletedNormally(fFirst ? f : g, v1);
1703 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1704 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1705 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1706 >
1707 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1708 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1709 >        final Integer w1 =  fFirst ? v1 : v2;
1710 >        final Integer w2 = !fFirst ? v1 : v2;
1711 >
1712 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1713 >        assertTrue(fst.complete(w1));
1714 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1715 >        assertTrue(snd.complete(w2));
1716 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1717 >
1718 >        checkCompletedWithWrappedCFException(h1);
1719 >        checkCompletedWithWrappedCFException(h2);
1720 >        checkCompletedWithWrappedCFException(h3);
1721 >        r1.assertInvoked();
1722 >        r2.assertInvoked();
1723 >        r3.assertInvoked();
1724 >        checkCompletedNormally(f, v1);
1725 >        checkCompletedNormally(g, v2);
1726      }}
1727  
1728      /**
# Line 1359 | Line 1731 | public class CompletableFutureTest exten
1731       */
1732      public void testThenAcceptBoth_normalCompletion() {
1733          for (ExecutionMode m : ExecutionMode.values())
1362        for (boolean createIncomplete : new boolean[] { true, false })
1734          for (boolean fFirst : new boolean[] { true, false })
1735          for (Integer v1 : new Integer[] { 1, null })
1736          for (Integer v2 : new Integer[] { 2, null })
1737      {
1738          final CompletableFuture<Integer> f = new CompletableFuture<>();
1739          final CompletableFuture<Integer> g = new CompletableFuture<>();
1740 <        final SubtractAction r = new SubtractAction();
1741 <
1742 <        if (fFirst) f.complete(v1); else g.complete(v2);
1743 <        if (!createIncomplete)
1744 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1745 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1746 <        if (createIncomplete) {
1747 <            checkIncomplete(h);
1748 <            assertEquals(0, r.invocationCount);
1749 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1750 <        }
1751 <
1752 <        checkCompletedNormally(h, null);
1753 <        assertEquals(subtract(v1, v2), r.value);
1740 >        final SubtractAction r1 = new SubtractAction(m);
1741 >        final SubtractAction r2 = new SubtractAction(m);
1742 >        final SubtractAction r3 = new SubtractAction(m);
1743 >
1744 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1745 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1746 >        final Integer w1 =  fFirst ? v1 : v2;
1747 >        final Integer w2 = !fFirst ? v1 : v2;
1748 >
1749 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1750 >        assertTrue(fst.complete(w1));
1751 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1752 >        checkIncomplete(h1);
1753 >        checkIncomplete(h2);
1754 >        r1.assertNotInvoked();
1755 >        r2.assertNotInvoked();
1756 >        assertTrue(snd.complete(w2));
1757 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1758 >
1759 >        checkCompletedNormally(h1, null);
1760 >        checkCompletedNormally(h2, null);
1761 >        checkCompletedNormally(h3, null);
1762 >        r1.assertValue(subtract(v1, v2));
1763 >        r2.assertValue(subtract(v1, v2));
1764 >        r3.assertValue(subtract(v1, v2));
1765          checkCompletedNormally(f, v1);
1766          checkCompletedNormally(g, v2);
1767      }}
# Line 1388 | Line 1770 | public class CompletableFutureTest exten
1770       * thenAcceptBoth result completes exceptionally after exceptional
1771       * completion of either source
1772       */
1773 <    public void testThenAcceptBoth_exceptionalCompletion() {
1773 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1774          for (ExecutionMode m : ExecutionMode.values())
1393        for (boolean createIncomplete : new boolean[] { true, false })
1775          for (boolean fFirst : new boolean[] { true, false })
1776 +        for (boolean failFirst : new boolean[] { true, false })
1777          for (Integer v1 : new Integer[] { 1, null })
1778      {
1779          final CompletableFuture<Integer> f = new CompletableFuture<>();
1780          final CompletableFuture<Integer> g = new CompletableFuture<>();
1781          final CFException ex = new CFException();
1782 <        final SubtractAction r = new SubtractAction();
1783 <
1784 <        (fFirst ? f : g).complete(v1);
1785 <        if (!createIncomplete)
1786 <            (!fFirst ? f : g).completeExceptionally(ex);
1787 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1788 <        if (createIncomplete) {
1789 <            checkIncomplete(h);
1790 <            (!fFirst ? f : g).completeExceptionally(ex);
1791 <        }
1792 <
1793 <        checkCompletedWithWrappedCFException(h, ex);
1794 <        assertEquals(0, r.invocationCount);
1795 <        checkCompletedNormally(fFirst ? f : g, v1);
1796 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1797 <    }}
1798 <
1799 <    /**
1800 <     * thenAcceptBoth result completes exceptionally if action does
1801 <     */
1802 <    public void testThenAcceptBoth_actionFailed() {
1803 <        for (ExecutionMode m : ExecutionMode.values())
1804 <        for (boolean fFirst : new boolean[] { true, false })
1805 <        for (Integer v1 : new Integer[] { 1, null })
1806 <        for (Integer v2 : new Integer[] { 2, null })
1807 <    {
1808 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1809 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1810 <        final FailingBiConsumer r = new FailingBiConsumer();
1429 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1430 <
1431 <        if (fFirst) {
1432 <            f.complete(v1);
1433 <            g.complete(v2);
1434 <        } else {
1435 <            g.complete(v2);
1436 <            f.complete(v1);
1437 <        }
1438 <
1439 <        checkCompletedWithWrappedCFException(h);
1440 <        checkCompletedNormally(f, v1);
1441 <        checkCompletedNormally(g, v2);
1782 >        final SubtractAction r1 = new SubtractAction(m);
1783 >        final SubtractAction r2 = new SubtractAction(m);
1784 >        final SubtractAction r3 = new SubtractAction(m);
1785 >
1786 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1787 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1788 >        final Callable<Boolean> complete1 = failFirst ?
1789 >            () -> fst.completeExceptionally(ex) :
1790 >            () -> fst.complete(v1);
1791 >        final Callable<Boolean> complete2 = failFirst ?
1792 >            () -> snd.complete(v1) :
1793 >            () -> snd.completeExceptionally(ex);
1794 >
1795 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1796 >        assertTrue(complete1.call());
1797 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1798 >        checkIncomplete(h1);
1799 >        checkIncomplete(h2);
1800 >        assertTrue(complete2.call());
1801 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1802 >
1803 >        checkCompletedWithWrappedException(h1, ex);
1804 >        checkCompletedWithWrappedException(h2, ex);
1805 >        checkCompletedWithWrappedException(h3, ex);
1806 >        r1.assertNotInvoked();
1807 >        r2.assertNotInvoked();
1808 >        r3.assertNotInvoked();
1809 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1810 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1811      }}
1812  
1813      /**
1814       * thenAcceptBoth result completes exceptionally if either source cancelled
1815       */
1816 <    public void testThenAcceptBoth_sourceCancelled() {
1816 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1817          for (ExecutionMode m : ExecutionMode.values())
1818          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1450        for (boolean createIncomplete : new boolean[] { true, false })
1819          for (boolean fFirst : new boolean[] { true, false })
1820 +        for (boolean failFirst : new boolean[] { true, false })
1821          for (Integer v1 : new Integer[] { 1, null })
1822      {
1823          final CompletableFuture<Integer> f = new CompletableFuture<>();
1824          final CompletableFuture<Integer> g = new CompletableFuture<>();
1825 <        final SubtractAction r = new SubtractAction();
1826 <
1827 <        (fFirst ? f : g).complete(v1);
1828 <        if (!createIncomplete)
1829 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1830 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1831 <        if (createIncomplete) {
1832 <            checkIncomplete(h);
1833 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1834 <        }
1835 <
1836 <        checkCompletedWithWrappedCancellationException(h);
1837 <        checkCancelled(!fFirst ? f : g);
1838 <        assertEquals(0, r.invocationCount);
1839 <        checkCompletedNormally(fFirst ? f : g, v1);
1825 >        final SubtractAction r1 = new SubtractAction(m);
1826 >        final SubtractAction r2 = new SubtractAction(m);
1827 >        final SubtractAction r3 = new SubtractAction(m);
1828 >
1829 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1830 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1831 >        final Callable<Boolean> complete1 = failFirst ?
1832 >            () -> fst.cancel(mayInterruptIfRunning) :
1833 >            () -> fst.complete(v1);
1834 >        final Callable<Boolean> complete2 = failFirst ?
1835 >            () -> snd.complete(v1) :
1836 >            () -> snd.cancel(mayInterruptIfRunning);
1837 >
1838 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1839 >        assertTrue(complete1.call());
1840 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1841 >        checkIncomplete(h1);
1842 >        checkIncomplete(h2);
1843 >        assertTrue(complete2.call());
1844 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1845 >
1846 >        checkCompletedWithWrappedCancellationException(h1);
1847 >        checkCompletedWithWrappedCancellationException(h2);
1848 >        checkCompletedWithWrappedCancellationException(h3);
1849 >        r1.assertNotInvoked();
1850 >        r2.assertNotInvoked();
1851 >        r3.assertNotInvoked();
1852 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1853 >        checkCancelled(failFirst ? fst : snd);
1854      }}
1855  
1856      /**
1857 <     * runAfterBoth result completes normally after normal
1475 <     * completion of sources
1857 >     * thenAcceptBoth result completes exceptionally if action does
1858       */
1859 <    public void testRunAfterBoth_normalCompletion1() {
1478 <        for (ExecutionMode m : ExecutionMode.values())
1479 <        for (Integer v1 : new Integer[] { 1, null })
1480 <        for (Integer v2 : new Integer[] { 2, null })
1481 <    {
1482 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1483 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1484 <        final Noop r = new Noop();
1485 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1486 <
1487 <        f.complete(v1);
1488 <        checkIncomplete(h);
1489 <        assertEquals(0, r.invocationCount);
1490 <        g.complete(v2);
1491 <
1492 <        checkCompletedNormally(h, null);
1493 <        assertEquals(1, r.invocationCount);
1494 <        checkCompletedNormally(f, v1);
1495 <        checkCompletedNormally(g, v2);
1496 <    }}
1497 <
1498 <    public void testRunAfterBoth_normalCompletion2() {
1499 <        for (ExecutionMode m : ExecutionMode.values())
1500 <        for (Integer v1 : new Integer[] { 1, null })
1501 <        for (Integer v2 : new Integer[] { 2, null })
1502 <    {
1503 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1504 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1505 <        final Noop r = new Noop();
1506 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1507 <
1508 <        g.complete(v2);
1509 <        checkIncomplete(h);
1510 <        assertEquals(0, r.invocationCount);
1511 <        f.complete(v1);
1512 <
1513 <        checkCompletedNormally(h, null);
1514 <        assertEquals(1, r.invocationCount);
1515 <        checkCompletedNormally(f, v1);
1516 <        checkCompletedNormally(g, v2);
1517 <    }}
1518 <
1519 <    public void testRunAfterBoth_normalCompletion3() {
1859 >    public void testThenAcceptBoth_actionFailed() {
1860          for (ExecutionMode m : ExecutionMode.values())
1861 +        for (boolean fFirst : new boolean[] { true, false })
1862          for (Integer v1 : new Integer[] { 1, null })
1863          for (Integer v2 : new Integer[] { 2, null })
1864      {
1865          final CompletableFuture<Integer> f = new CompletableFuture<>();
1866          final CompletableFuture<Integer> g = new CompletableFuture<>();
1867 <        final Noop r = new Noop();
1868 <
1869 <        g.complete(v2);
1870 <        f.complete(v1);
1871 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1872 <
1873 <        checkCompletedNormally(h, null);
1874 <        assertEquals(1, r.invocationCount);
1867 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1868 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1869 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1870 >
1871 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1872 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1873 >        final Integer w1 =  fFirst ? v1 : v2;
1874 >        final Integer w2 = !fFirst ? v1 : v2;
1875 >
1876 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1877 >        assertTrue(fst.complete(w1));
1878 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1879 >        assertTrue(snd.complete(w2));
1880 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1881 >
1882 >        checkCompletedWithWrappedCFException(h1);
1883 >        checkCompletedWithWrappedCFException(h2);
1884 >        checkCompletedWithWrappedCFException(h3);
1885 >        r1.assertInvoked();
1886 >        r2.assertInvoked();
1887 >        r3.assertInvoked();
1888          checkCompletedNormally(f, v1);
1889          checkCompletedNormally(g, v2);
1890      }}
1891  
1892 <    public void testRunAfterBoth_normalCompletion4() {
1892 >    /**
1893 >     * runAfterBoth result completes normally after normal
1894 >     * completion of sources
1895 >     */
1896 >    public void testRunAfterBoth_normalCompletion() {
1897          for (ExecutionMode m : ExecutionMode.values())
1898 +        for (boolean fFirst : new boolean[] { true, false })
1899          for (Integer v1 : new Integer[] { 1, null })
1900          for (Integer v2 : new Integer[] { 2, null })
1901      {
1902          final CompletableFuture<Integer> f = new CompletableFuture<>();
1903          final CompletableFuture<Integer> g = new CompletableFuture<>();
1904 <        final Noop r = new Noop();
1905 <
1906 <        f.complete(v1);
1907 <        g.complete(v2);
1908 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1909 <
1910 <        checkCompletedNormally(h, null);
1911 <        assertEquals(1, r.invocationCount);
1904 >        final Noop r1 = new Noop(m);
1905 >        final Noop r2 = new Noop(m);
1906 >        final Noop r3 = new Noop(m);
1907 >
1908 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1909 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1910 >        final Integer w1 =  fFirst ? v1 : v2;
1911 >        final Integer w2 = !fFirst ? v1 : v2;
1912 >
1913 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1914 >        assertTrue(fst.complete(w1));
1915 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1916 >        checkIncomplete(h1);
1917 >        checkIncomplete(h2);
1918 >        r1.assertNotInvoked();
1919 >        r2.assertNotInvoked();
1920 >        assertTrue(snd.complete(w2));
1921 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1922 >
1923 >        checkCompletedNormally(h1, null);
1924 >        checkCompletedNormally(h2, null);
1925 >        checkCompletedNormally(h3, null);
1926 >        r1.assertInvoked();
1927 >        r2.assertInvoked();
1928 >        r3.assertInvoked();
1929          checkCompletedNormally(f, v1);
1930          checkCompletedNormally(g, v2);
1931      }}
# Line 1558 | Line 1934 | public class CompletableFutureTest exten
1934       * runAfterBoth result completes exceptionally after exceptional
1935       * completion of either source
1936       */
1937 <    public void testRunAfterBoth_exceptionalCompletion1() {
1562 <        for (ExecutionMode m : ExecutionMode.values())
1563 <        for (Integer v1 : new Integer[] { 1, null })
1564 <    {
1565 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1566 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1567 <        final Noop r = new Noop();
1568 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1569 <        final CFException ex = new CFException();
1570 <
1571 <        f.completeExceptionally(ex);
1572 <        checkIncomplete(h);
1573 <        g.complete(v1);
1574 <
1575 <        checkCompletedWithWrappedCFException(h, ex);
1576 <        checkCompletedWithWrappedCFException(f, ex);
1577 <        assertEquals(0, r.invocationCount);
1578 <        checkCompletedNormally(g, v1);
1579 <    }}
1580 <
1581 <    public void testRunAfterBoth_exceptionalCompletion2() {
1582 <        for (ExecutionMode m : ExecutionMode.values())
1583 <        for (Integer v1 : new Integer[] { 1, null })
1584 <    {
1585 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1586 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1587 <        final Noop r = new Noop();
1588 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1589 <        final CFException ex = new CFException();
1590 <
1591 <        g.completeExceptionally(ex);
1592 <        checkIncomplete(h);
1593 <        f.complete(v1);
1594 <
1595 <        checkCompletedWithWrappedCFException(h, ex);
1596 <        checkCompletedWithWrappedCFException(g, ex);
1597 <        assertEquals(0, r.invocationCount);
1598 <        checkCompletedNormally(f, v1);
1599 <    }}
1600 <
1601 <    public void testRunAfterBoth_exceptionalCompletion3() {
1937 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1938          for (ExecutionMode m : ExecutionMode.values())
1939 +        for (boolean fFirst : new boolean[] { true, false })
1940 +        for (boolean failFirst : new boolean[] { true, false })
1941          for (Integer v1 : new Integer[] { 1, null })
1942      {
1943          final CompletableFuture<Integer> f = new CompletableFuture<>();
1944          final CompletableFuture<Integer> g = new CompletableFuture<>();
1607        final Noop r = new Noop();
1945          final CFException ex = new CFException();
1946 <
1947 <        g.completeExceptionally(ex);
1948 <        f.complete(v1);
1949 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1950 <
1951 <        checkCompletedWithWrappedCFException(h, ex);
1952 <        checkCompletedWithWrappedCFException(g, ex);
1953 <        assertEquals(0, r.invocationCount);
1954 <        checkCompletedNormally(f, v1);
1946 >        final Noop r1 = new Noop(m);
1947 >        final Noop r2 = new Noop(m);
1948 >        final Noop r3 = new Noop(m);
1949 >
1950 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1951 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1952 >        final Callable<Boolean> complete1 = failFirst ?
1953 >            () -> fst.completeExceptionally(ex) :
1954 >            () -> fst.complete(v1);
1955 >        final Callable<Boolean> complete2 = failFirst ?
1956 >            () -> snd.complete(v1) :
1957 >            () -> snd.completeExceptionally(ex);
1958 >
1959 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1960 >        assertTrue(complete1.call());
1961 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1962 >        checkIncomplete(h1);
1963 >        checkIncomplete(h2);
1964 >        assertTrue(complete2.call());
1965 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1966 >
1967 >        checkCompletedWithWrappedException(h1, ex);
1968 >        checkCompletedWithWrappedException(h2, ex);
1969 >        checkCompletedWithWrappedException(h3, ex);
1970 >        r1.assertNotInvoked();
1971 >        r2.assertNotInvoked();
1972 >        r3.assertNotInvoked();
1973 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1974 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1975      }}
1976  
1977 <    public void testRunAfterBoth_exceptionalCompletion4() {
1977 >    /**
1978 >     * runAfterBoth result completes exceptionally if either source cancelled
1979 >     */
1980 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1981          for (ExecutionMode m : ExecutionMode.values())
1982 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1983 +        for (boolean fFirst : new boolean[] { true, false })
1984 +        for (boolean failFirst : new boolean[] { true, false })
1985          for (Integer v1 : new Integer[] { 1, null })
1986      {
1987          final CompletableFuture<Integer> f = new CompletableFuture<>();
1988          final CompletableFuture<Integer> g = new CompletableFuture<>();
1989 <        final Noop r = new Noop();
1990 <        final CFException ex = new CFException();
1991 <
1992 <        f.completeExceptionally(ex);
1993 <        g.complete(v1);
1994 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1995 <
1996 <        checkCompletedWithWrappedCFException(h, ex);
1997 <        checkCompletedWithWrappedCFException(f, ex);
1998 <        assertEquals(0, r.invocationCount);
1999 <        checkCompletedNormally(g, v1);
1989 >        final Noop r1 = new Noop(m);
1990 >        final Noop r2 = new Noop(m);
1991 >        final Noop r3 = new Noop(m);
1992 >
1993 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1994 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1995 >        final Callable<Boolean> complete1 = failFirst ?
1996 >            () -> fst.cancel(mayInterruptIfRunning) :
1997 >            () -> fst.complete(v1);
1998 >        final Callable<Boolean> complete2 = failFirst ?
1999 >            () -> snd.complete(v1) :
2000 >            () -> snd.cancel(mayInterruptIfRunning);
2001 >
2002 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2003 >        assertTrue(complete1.call());
2004 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2005 >        checkIncomplete(h1);
2006 >        checkIncomplete(h2);
2007 >        assertTrue(complete2.call());
2008 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2009 >
2010 >        checkCompletedWithWrappedCancellationException(h1);
2011 >        checkCompletedWithWrappedCancellationException(h2);
2012 >        checkCompletedWithWrappedCancellationException(h3);
2013 >        r1.assertNotInvoked();
2014 >        r2.assertNotInvoked();
2015 >        r3.assertNotInvoked();
2016 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2017 >        checkCancelled(failFirst ? fst : snd);
2018      }}
2019  
2020      /**
2021       * runAfterBoth result completes exceptionally if action does
2022       */
2023 <    public void testRunAfterBoth_actionFailed1() {
1643 <        for (ExecutionMode m : ExecutionMode.values())
1644 <        for (Integer v1 : new Integer[] { 1, null })
1645 <        for (Integer v2 : new Integer[] { 2, null })
1646 <    {
1647 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1648 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1649 <        final FailingRunnable r = new FailingRunnable();
1650 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1651 <
1652 <        f.complete(v1);
1653 <        checkIncomplete(h);
1654 <        g.complete(v2);
1655 <
1656 <        checkCompletedWithWrappedCFException(h);
1657 <        checkCompletedNormally(f, v1);
1658 <        checkCompletedNormally(g, v2);
1659 <    }}
1660 <
1661 <    public void testRunAfterBoth_actionFailed2() {
2023 >    public void testRunAfterBoth_actionFailed() {
2024          for (ExecutionMode m : ExecutionMode.values())
2025 +        for (boolean fFirst : new boolean[] { true, false })
2026          for (Integer v1 : new Integer[] { 1, null })
2027          for (Integer v2 : new Integer[] { 2, null })
2028      {
2029          final CompletableFuture<Integer> f = new CompletableFuture<>();
2030          final CompletableFuture<Integer> g = new CompletableFuture<>();
2031 <        final FailingRunnable r = new FailingRunnable();
2032 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2033 <
2034 <        g.complete(v2);
2035 <        checkIncomplete(h);
2036 <        f.complete(v1);
2037 <
2038 <        checkCompletedWithWrappedCFException(h);
2031 >        final FailingRunnable r1 = new FailingRunnable(m);
2032 >        final FailingRunnable r2 = new FailingRunnable(m);
2033 >        final FailingRunnable r3 = new FailingRunnable(m);
2034 >
2035 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2036 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2037 >        final Integer w1 =  fFirst ? v1 : v2;
2038 >        final Integer w2 = !fFirst ? v1 : v2;
2039 >
2040 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2041 >        assertTrue(fst.complete(w1));
2042 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2043 >        assertTrue(snd.complete(w2));
2044 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2045 >
2046 >        checkCompletedWithWrappedCFException(h1);
2047 >        checkCompletedWithWrappedCFException(h2);
2048 >        checkCompletedWithWrappedCFException(h3);
2049 >        r1.assertInvoked();
2050 >        r2.assertInvoked();
2051 >        r3.assertInvoked();
2052          checkCompletedNormally(f, v1);
2053          checkCompletedNormally(g, v2);
2054      }}
2055  
2056      /**
1681     * runAfterBoth result completes exceptionally if either source cancelled
1682     */
1683    public void testRunAfterBoth_sourceCancelled1() {
1684        for (ExecutionMode m : ExecutionMode.values())
1685        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1686        for (Integer v1 : new Integer[] { 1, null })
1687    {
1688        final CompletableFuture<Integer> f = new CompletableFuture<>();
1689        final CompletableFuture<Integer> g = new CompletableFuture<>();
1690        final Noop r = new Noop();
1691        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1692
1693        assertTrue(f.cancel(mayInterruptIfRunning));
1694        checkIncomplete(h);
1695        g.complete(v1);
1696
1697        checkCompletedWithWrappedCancellationException(h);
1698        checkCancelled(f);
1699        assertEquals(0, r.invocationCount);
1700        checkCompletedNormally(g, v1);
1701    }}
1702
1703    public void testRunAfterBoth_sourceCancelled2() {
1704        for (ExecutionMode m : ExecutionMode.values())
1705        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1706        for (Integer v1 : new Integer[] { 1, null })
1707    {
1708        final CompletableFuture<Integer> f = new CompletableFuture<>();
1709        final CompletableFuture<Integer> g = new CompletableFuture<>();
1710        final Noop r = new Noop();
1711        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1712
1713        assertTrue(g.cancel(mayInterruptIfRunning));
1714        checkIncomplete(h);
1715        f.complete(v1);
1716
1717        checkCompletedWithWrappedCancellationException(h);
1718        checkCancelled(g);
1719        assertEquals(0, r.invocationCount);
1720        checkCompletedNormally(f, v1);
1721    }}
1722
1723    public void testRunAfterBoth_sourceCancelled3() {
1724        for (ExecutionMode m : ExecutionMode.values())
1725        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1726        for (Integer v1 : new Integer[] { 1, null })
1727    {
1728        final CompletableFuture<Integer> f = new CompletableFuture<>();
1729        final CompletableFuture<Integer> g = new CompletableFuture<>();
1730        final Noop r = new Noop();
1731
1732        assertTrue(g.cancel(mayInterruptIfRunning));
1733        f.complete(v1);
1734        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1735
1736        checkCompletedWithWrappedCancellationException(h);
1737        checkCancelled(g);
1738        assertEquals(0, r.invocationCount);
1739        checkCompletedNormally(f, v1);
1740    }}
1741
1742    public void testRunAfterBoth_sourceCancelled4() {
1743        for (ExecutionMode m : ExecutionMode.values())
1744        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1745        for (Integer v1 : new Integer[] { 1, null })
1746    {
1747        final CompletableFuture<Integer> f = new CompletableFuture<>();
1748        final CompletableFuture<Integer> g = new CompletableFuture<>();
1749        final Noop r = new Noop();
1750
1751        assertTrue(f.cancel(mayInterruptIfRunning));
1752        g.complete(v1);
1753        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1754
1755        checkCompletedWithWrappedCancellationException(h);
1756        checkCancelled(f);
1757        assertEquals(0, r.invocationCount);
1758        checkCompletedNormally(g, v1);
1759    }}
1760
1761    /**
2057       * applyToEither result completes normally after normal completion
2058       * of either source
2059       */
2060 <    public void testApplyToEither_normalCompletion1() {
2060 >    public void testApplyToEither_normalCompletion() {
2061          for (ExecutionMode m : ExecutionMode.values())
2062          for (Integer v1 : new Integer[] { 1, null })
2063          for (Integer v2 : new Integer[] { 2, null })
2064      {
2065          final CompletableFuture<Integer> f = new CompletableFuture<>();
2066          final CompletableFuture<Integer> g = new CompletableFuture<>();
2067 <        final IncFunction r = new IncFunction();
2068 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2067 >        final IncFunction[] rs = new IncFunction[6];
2068 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2069  
2070 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2071 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2072 +        checkIncomplete(h0);
2073 +        checkIncomplete(h1);
2074 +        rs[0].assertNotInvoked();
2075 +        rs[1].assertNotInvoked();
2076          f.complete(v1);
2077 <        checkCompletedNormally(h, inc(v1));
2078 <        g.complete(v2);
2079 <
2080 <        checkCompletedNormally(f, v1);
2081 <        checkCompletedNormally(g, v2);
2082 <        checkCompletedNormally(h, inc(v1));
1782 <    }}
1783 <
1784 <    public void testApplyToEither_normalCompletion2() {
1785 <        for (ExecutionMode m : ExecutionMode.values())
1786 <        for (Integer v1 : new Integer[] { 1, null })
1787 <        for (Integer v2 : new Integer[] { 2, null })
1788 <    {
1789 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1790 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1791 <        final IncFunction r = new IncFunction();
1792 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1793 <
2077 >        checkCompletedNormally(h0, inc(v1));
2078 >        checkCompletedNormally(h1, inc(v1));
2079 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2080 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2081 >        checkCompletedNormally(h2, inc(v1));
2082 >        checkCompletedNormally(h3, inc(v1));
2083          g.complete(v2);
1795        checkCompletedNormally(h, inc(v2));
1796        f.complete(v1);
2084  
2085 <        checkCompletedNormally(f, v1);
2086 <        checkCompletedNormally(g, v2);
2087 <        checkCompletedNormally(h, inc(v2));
2088 <        }}
2089 <
2090 <    public void testApplyToEither_normalCompletion3() {
2091 <        for (ExecutionMode m : ExecutionMode.values())
2092 <        for (Integer v1 : new Integer[] { 1, null })
2093 <        for (Integer v2 : new Integer[] { 2, null })
1807 <    {
1808 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1809 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1810 <        final IncFunction r = new IncFunction();
1811 <
1812 <        f.complete(v1);
1813 <        g.complete(v2);
1814 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2085 >        // unspecified behavior - both source completions available
2086 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2087 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2088 >        rs[4].assertValue(h4.join());
2089 >        rs[5].assertValue(h5.join());
2090 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2091 >                   Objects.equals(inc(v2), h4.join()));
2092 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2093 >                   Objects.equals(inc(v2), h5.join()));
2094  
2095          checkCompletedNormally(f, v1);
2096          checkCompletedNormally(g, v2);
2097 <
2098 <        // unspecified behavior
2099 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2100 <                   Objects.equals(h.join(), inc(v2)));
2101 <        assertEquals(1, r.invocationCount);
2097 >        checkCompletedNormally(h0, inc(v1));
2098 >        checkCompletedNormally(h1, inc(v1));
2099 >        checkCompletedNormally(h2, inc(v1));
2100 >        checkCompletedNormally(h3, inc(v1));
2101 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2102      }}
2103  
2104      /**
2105       * applyToEither result completes exceptionally after exceptional
2106       * completion of either source
2107       */
2108 <    public void testApplyToEither_exceptionalCompletion1() {
2108 >    public void testApplyToEither_exceptionalCompletion() {
2109          for (ExecutionMode m : ExecutionMode.values())
2110          for (Integer v1 : new Integer[] { 1, null })
2111      {
2112          final CompletableFuture<Integer> f = new CompletableFuture<>();
2113          final CompletableFuture<Integer> g = new CompletableFuture<>();
1835        final IncFunction r = new IncFunction();
1836        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2114          final CFException ex = new CFException();
2115 +        final IncFunction[] rs = new IncFunction[6];
2116 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2117  
2118 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2119 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2120 +        checkIncomplete(h0);
2121 +        checkIncomplete(h1);
2122 +        rs[0].assertNotInvoked();
2123 +        rs[1].assertNotInvoked();
2124          f.completeExceptionally(ex);
2125 <        checkCompletedWithWrappedCFException(h, ex);
2125 >        checkCompletedWithWrappedException(h0, ex);
2126 >        checkCompletedWithWrappedException(h1, ex);
2127 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2128 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2129 >        checkCompletedWithWrappedException(h2, ex);
2130 >        checkCompletedWithWrappedException(h3, ex);
2131          g.complete(v1);
2132  
2133 <        assertEquals(0, r.invocationCount);
2133 >        // unspecified behavior - both source completions available
2134 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2135 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2136 >        try {
2137 >            assertEquals(inc(v1), h4.join());
2138 >            rs[4].assertValue(inc(v1));
2139 >        } catch (CompletionException ok) {
2140 >            checkCompletedWithWrappedException(h4, ex);
2141 >            rs[4].assertNotInvoked();
2142 >        }
2143 >        try {
2144 >            assertEquals(inc(v1), h5.join());
2145 >            rs[5].assertValue(inc(v1));
2146 >        } catch (CompletionException ok) {
2147 >            checkCompletedWithWrappedException(h5, ex);
2148 >            rs[5].assertNotInvoked();
2149 >        }
2150 >
2151 >        checkCompletedExceptionally(f, ex);
2152          checkCompletedNormally(g, v1);
2153 <        checkCompletedWithWrappedCFException(f, ex);
2154 <        checkCompletedWithWrappedCFException(h, ex);
2153 >        checkCompletedWithWrappedException(h0, ex);
2154 >        checkCompletedWithWrappedException(h1, ex);
2155 >        checkCompletedWithWrappedException(h2, ex);
2156 >        checkCompletedWithWrappedException(h3, ex);
2157 >        checkCompletedWithWrappedException(h4, ex);
2158 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2159      }}
2160  
2161      public void testApplyToEither_exceptionalCompletion2() {
2162          for (ExecutionMode m : ExecutionMode.values())
2163 +        for (boolean fFirst : new boolean[] { true, false })
2164          for (Integer v1 : new Integer[] { 1, null })
2165      {
2166          final CompletableFuture<Integer> f = new CompletableFuture<>();
2167          final CompletableFuture<Integer> g = new CompletableFuture<>();
1855        final IncFunction r = new IncFunction();
1856        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1857        final CFException ex = new CFException();
1858
1859        g.completeExceptionally(ex);
1860        checkCompletedWithWrappedCFException(h, ex);
1861        f.complete(v1);
1862
1863        assertEquals(0, r.invocationCount);
1864        checkCompletedNormally(f, v1);
1865        checkCompletedWithWrappedCFException(g, ex);
1866        checkCompletedWithWrappedCFException(h, ex);
1867    }}
1868
1869    public void testApplyToEither_exceptionalCompletion3() {
1870        for (ExecutionMode m : ExecutionMode.values())
1871        for (Integer v1 : new Integer[] { 1, null })
1872    {
1873        final CompletableFuture<Integer> f = new CompletableFuture<>();
1874        final CompletableFuture<Integer> g = new CompletableFuture<>();
1875        final IncFunction r = new IncFunction();
2168          final CFException ex = new CFException();
2169 +        final IncFunction[] rs = new IncFunction[6];
2170 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2171  
2172 <        g.completeExceptionally(ex);
2173 <        f.complete(v1);
2174 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2172 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2173 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2174 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2175 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2176 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2177 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2178  
2179 <        // unspecified behavior
1883 <        Integer v;
2179 >        // unspecified behavior - both source completions available
2180          try {
2181 <            assertEquals(inc(v1), h.join());
2182 <            assertEquals(1, r.invocationCount);
2181 >            assertEquals(inc(v1), h0.join());
2182 >            rs[0].assertValue(inc(v1));
2183          } catch (CompletionException ok) {
2184 <            checkCompletedWithWrappedCFException(h, ex);
2185 <            assertEquals(0, r.invocationCount);
2184 >            checkCompletedWithWrappedException(h0, ex);
2185 >            rs[0].assertNotInvoked();
2186          }
1891
1892        checkCompletedWithWrappedCFException(g, ex);
1893        checkCompletedNormally(f, v1);
1894    }}
1895
1896    public void testApplyToEither_exceptionalCompletion4() {
1897        for (ExecutionMode m : ExecutionMode.values())
1898        for (Integer v1 : new Integer[] { 1, null })
1899    {
1900        final CompletableFuture<Integer> f = new CompletableFuture<>();
1901        final CompletableFuture<Integer> g = new CompletableFuture<>();
1902        final IncFunction r = new IncFunction();
1903        final CFException ex = new CFException();
1904
1905        f.completeExceptionally(ex);
1906        g.complete(v1);
1907        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1908
1909        // unspecified behavior
1910        Integer v;
2187          try {
2188 <            assertEquals(inc(v1), h.join());
2189 <            assertEquals(1, r.invocationCount);
2188 >            assertEquals(inc(v1), h1.join());
2189 >            rs[1].assertValue(inc(v1));
2190          } catch (CompletionException ok) {
2191 <            checkCompletedWithWrappedCFException(h, ex);
2192 <            assertEquals(0, r.invocationCount);
2191 >            checkCompletedWithWrappedException(h1, ex);
2192 >            rs[1].assertNotInvoked();
2193 >        }
2194 >        try {
2195 >            assertEquals(inc(v1), h2.join());
2196 >            rs[2].assertValue(inc(v1));
2197 >        } catch (CompletionException ok) {
2198 >            checkCompletedWithWrappedException(h2, ex);
2199 >            rs[2].assertNotInvoked();
2200 >        }
2201 >        try {
2202 >            assertEquals(inc(v1), h3.join());
2203 >            rs[3].assertValue(inc(v1));
2204 >        } catch (CompletionException ok) {
2205 >            checkCompletedWithWrappedException(h3, ex);
2206 >            rs[3].assertNotInvoked();
2207          }
2208  
1919        checkCompletedWithWrappedCFException(f, ex);
1920        checkCompletedNormally(g, v1);
1921    }}
1922
1923    /**
1924     * applyToEither result completes exceptionally if action does
1925     */
1926    public void testApplyToEither_actionFailed1() {
1927        for (ExecutionMode m : ExecutionMode.values())
1928        for (Integer v1 : new Integer[] { 1, null })
1929        for (Integer v2 : new Integer[] { 2, null })
1930    {
1931        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932        final CompletableFuture<Integer> g = new CompletableFuture<>();
1933        final FailingFunction r = new FailingFunction();
1934        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1935
1936        f.complete(v1);
1937        checkCompletedWithWrappedCFException(h);
1938        g.complete(v2);
1939        checkCompletedNormally(f, v1);
1940        checkCompletedNormally(g, v2);
1941    }}
1942
1943    public void testApplyToEither_actionFailed2() {
1944        for (ExecutionMode m : ExecutionMode.values())
1945        for (Integer v1 : new Integer[] { 1, null })
1946        for (Integer v2 : new Integer[] { 2, null })
1947    {
1948        final CompletableFuture<Integer> f = new CompletableFuture<>();
1949        final CompletableFuture<Integer> g = new CompletableFuture<>();
1950        final FailingFunction r = new FailingFunction();
1951        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1952
1953        g.complete(v2);
1954        checkCompletedWithWrappedCFException(h);
1955        f.complete(v1);
2209          checkCompletedNormally(f, v1);
2210 <        checkCompletedNormally(g, v2);
2210 >        checkCompletedExceptionally(g, ex);
2211      }}
2212  
2213      /**
2214       * applyToEither result completes exceptionally if either source cancelled
2215       */
2216 <    public void testApplyToEither_sourceCancelled1() {
2216 >    public void testApplyToEither_sourceCancelled() {
2217          for (ExecutionMode m : ExecutionMode.values())
2218          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2219          for (Integer v1 : new Integer[] { 1, null })
2220      {
2221          final CompletableFuture<Integer> f = new CompletableFuture<>();
2222          final CompletableFuture<Integer> g = new CompletableFuture<>();
2223 <        final IncFunction r = new IncFunction();
2224 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2223 >        final IncFunction[] rs = new IncFunction[6];
2224 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2225  
2226 <        assertTrue(f.cancel(mayInterruptIfRunning));
2227 <        checkCompletedWithWrappedCancellationException(h);
2226 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2227 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2228 >        checkIncomplete(h0);
2229 >        checkIncomplete(h1);
2230 >        rs[0].assertNotInvoked();
2231 >        rs[1].assertNotInvoked();
2232 >        f.cancel(mayInterruptIfRunning);
2233 >        checkCompletedWithWrappedCancellationException(h0);
2234 >        checkCompletedWithWrappedCancellationException(h1);
2235 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2236 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2237 >        checkCompletedWithWrappedCancellationException(h2);
2238 >        checkCompletedWithWrappedCancellationException(h3);
2239          g.complete(v1);
2240  
2241 +        // unspecified behavior - both source completions available
2242 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2243 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2244 +        try {
2245 +            assertEquals(inc(v1), h4.join());
2246 +            rs[4].assertValue(inc(v1));
2247 +        } catch (CompletionException ok) {
2248 +            checkCompletedWithWrappedCancellationException(h4);
2249 +            rs[4].assertNotInvoked();
2250 +        }
2251 +        try {
2252 +            assertEquals(inc(v1), h5.join());
2253 +            rs[5].assertValue(inc(v1));
2254 +        } catch (CompletionException ok) {
2255 +            checkCompletedWithWrappedCancellationException(h5);
2256 +            rs[5].assertNotInvoked();
2257 +        }
2258 +
2259          checkCancelled(f);
1978        assertEquals(0, r.invocationCount);
2260          checkCompletedNormally(g, v1);
2261 <        checkCompletedWithWrappedCancellationException(h);
2261 >        checkCompletedWithWrappedCancellationException(h0);
2262 >        checkCompletedWithWrappedCancellationException(h1);
2263 >        checkCompletedWithWrappedCancellationException(h2);
2264 >        checkCompletedWithWrappedCancellationException(h3);
2265 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2266      }}
2267  
2268      public void testApplyToEither_sourceCancelled2() {
2269          for (ExecutionMode m : ExecutionMode.values())
2270          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2271 +        for (boolean fFirst : new boolean[] { true, false })
2272          for (Integer v1 : new Integer[] { 1, null })
2273      {
2274          final CompletableFuture<Integer> f = new CompletableFuture<>();
2275          final CompletableFuture<Integer> g = new CompletableFuture<>();
2276 <        final IncFunction r = new IncFunction();
2277 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1992 <
1993 <        assertTrue(g.cancel(mayInterruptIfRunning));
1994 <        checkCompletedWithWrappedCancellationException(h);
1995 <        f.complete(v1);
1996 <
1997 <        checkCancelled(g);
1998 <        assertEquals(0, r.invocationCount);
1999 <        checkCompletedNormally(f, v1);
2000 <        checkCompletedWithWrappedCancellationException(h);
2001 <    }}
2002 <
2003 <    public void testApplyToEither_sourceCancelled3() {
2004 <        for (ExecutionMode m : ExecutionMode.values())
2005 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2006 <        for (Integer v1 : new Integer[] { 1, null })
2007 <    {
2008 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2009 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2010 <        final IncFunction r = new IncFunction();
2276 >        final IncFunction[] rs = new IncFunction[6];
2277 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2278  
2279 <        assertTrue(g.cancel(mayInterruptIfRunning));
2280 <        f.complete(v1);
2281 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2279 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2280 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2281 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2282 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2283 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2284 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2285  
2286 <        // unspecified behavior
2017 <        Integer v;
2286 >        // unspecified behavior - both source completions available
2287          try {
2288 <            assertEquals(inc(v1), h.join());
2289 <            assertEquals(1, r.invocationCount);
2288 >            assertEquals(inc(v1), h0.join());
2289 >            rs[0].assertValue(inc(v1));
2290          } catch (CompletionException ok) {
2291 <            checkCompletedWithWrappedCancellationException(h);
2292 <            assertEquals(0, r.invocationCount);
2291 >            checkCompletedWithWrappedCancellationException(h0);
2292 >            rs[0].assertNotInvoked();
2293          }
2025
2026        checkCancelled(g);
2027        checkCompletedNormally(f, v1);
2028    }}
2029
2030    public void testApplyToEither_sourceCancelled4() {
2031        for (ExecutionMode m : ExecutionMode.values())
2032        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2033        for (Integer v1 : new Integer[] { 1, null })
2034    {
2035        final CompletableFuture<Integer> f = new CompletableFuture<>();
2036        final CompletableFuture<Integer> g = new CompletableFuture<>();
2037        final IncFunction r = new IncFunction();
2038
2039        assertTrue(f.cancel(mayInterruptIfRunning));
2040        g.complete(v1);
2041        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2042
2043        // unspecified behavior
2044        Integer v;
2294          try {
2295 <            assertEquals(inc(v1), h.join());
2296 <            assertEquals(1, r.invocationCount);
2295 >            assertEquals(inc(v1), h1.join());
2296 >            rs[1].assertValue(inc(v1));
2297          } catch (CompletionException ok) {
2298 <            checkCompletedWithWrappedCancellationException(h);
2299 <            assertEquals(0, r.invocationCount);
2298 >            checkCompletedWithWrappedCancellationException(h1);
2299 >            rs[1].assertNotInvoked();
2300 >        }
2301 >        try {
2302 >            assertEquals(inc(v1), h2.join());
2303 >            rs[2].assertValue(inc(v1));
2304 >        } catch (CompletionException ok) {
2305 >            checkCompletedWithWrappedCancellationException(h2);
2306 >            rs[2].assertNotInvoked();
2307 >        }
2308 >        try {
2309 >            assertEquals(inc(v1), h3.join());
2310 >            rs[3].assertValue(inc(v1));
2311 >        } catch (CompletionException ok) {
2312 >            checkCompletedWithWrappedCancellationException(h3);
2313 >            rs[3].assertNotInvoked();
2314          }
2315  
2316 <        checkCancelled(f);
2317 <        checkCompletedNormally(g, v1);
2316 >        checkCompletedNormally(f, v1);
2317 >        checkCancelled(g);
2318      }}
2319  
2320      /**
2321 <     * acceptEither result completes normally after normal completion
2059 <     * of either source
2321 >     * applyToEither result completes exceptionally if action does
2322       */
2323 <    public void testAcceptEither_normalCompletion1() {
2323 >    public void testApplyToEither_actionFailed() {
2324          for (ExecutionMode m : ExecutionMode.values())
2325          for (Integer v1 : new Integer[] { 1, null })
2326          for (Integer v2 : new Integer[] { 2, null })
2327      {
2328          final CompletableFuture<Integer> f = new CompletableFuture<>();
2329          final CompletableFuture<Integer> g = new CompletableFuture<>();
2330 <        final IncAction r = new IncAction();
2331 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2330 >        final FailingFunction[] rs = new FailingFunction[6];
2331 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2332  
2333 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2334 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2335          f.complete(v1);
2336 <        checkCompletedNormally(h, null);
2337 <        assertEquals(inc(v1), r.value);
2336 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2337 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2338 >        checkCompletedWithWrappedCFException(h0);
2339 >        checkCompletedWithWrappedCFException(h1);
2340 >        checkCompletedWithWrappedCFException(h2);
2341 >        checkCompletedWithWrappedCFException(h3);
2342 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2343 >
2344          g.complete(v2);
2345  
2346 <        checkCompletedNormally(f, v1);
2347 <        checkCompletedNormally(g, v2);
2348 <        checkCompletedNormally(h, null);
2079 <    }}
2346 >        // unspecified behavior - both source completions available
2347 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2348 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2349  
2350 <    public void testAcceptEither_normalCompletion2() {
2351 <        for (ExecutionMode m : ExecutionMode.values())
2352 <        for (Integer v1 : new Integer[] { 1, null })
2353 <        for (Integer v2 : new Integer[] { 2, null })
2354 <    {
2355 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2087 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2088 <        final IncAction r = new IncAction();
2089 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2090 <
2091 <        g.complete(v2);
2092 <        checkCompletedNormally(h, null);
2093 <        assertEquals(inc(v2), r.value);
2094 <        f.complete(v1);
2350 >        checkCompletedWithWrappedCFException(h4);
2351 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2352 >                   Objects.equals(v2, rs[4].value));
2353 >        checkCompletedWithWrappedCFException(h5);
2354 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2355 >                   Objects.equals(v2, rs[5].value));
2356  
2357          checkCompletedNormally(f, v1);
2358          checkCompletedNormally(g, v2);
2098        checkCompletedNormally(h, null);
2359      }}
2360  
2361 <    public void testAcceptEither_normalCompletion3() {
2361 >    /**
2362 >     * acceptEither result completes normally after normal completion
2363 >     * of either source
2364 >     */
2365 >    public void testAcceptEither_normalCompletion() {
2366          for (ExecutionMode m : ExecutionMode.values())
2367          for (Integer v1 : new Integer[] { 1, null })
2368          for (Integer v2 : new Integer[] { 2, null })
2369      {
2370          final CompletableFuture<Integer> f = new CompletableFuture<>();
2371          final CompletableFuture<Integer> g = new CompletableFuture<>();
2372 <        final IncAction r = new IncAction();
2372 >        final NoopConsumer[] rs = new NoopConsumer[6];
2373 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2374  
2375 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2376 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2377 +        checkIncomplete(h0);
2378 +        checkIncomplete(h1);
2379 +        rs[0].assertNotInvoked();
2380 +        rs[1].assertNotInvoked();
2381          f.complete(v1);
2382 +        checkCompletedNormally(h0, null);
2383 +        checkCompletedNormally(h1, null);
2384 +        rs[0].assertValue(v1);
2385 +        rs[1].assertValue(v1);
2386 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2387 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2388 +        checkCompletedNormally(h2, null);
2389 +        checkCompletedNormally(h3, null);
2390 +        rs[2].assertValue(v1);
2391 +        rs[3].assertValue(v1);
2392          g.complete(v2);
2112        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2393  
2394 <        checkCompletedNormally(h, null);
2394 >        // unspecified behavior - both source completions available
2395 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2396 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2397 >        checkCompletedNormally(h4, null);
2398 >        checkCompletedNormally(h5, null);
2399 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2400 >                   Objects.equals(v2, rs[4].value));
2401 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2402 >                   Objects.equals(v2, rs[5].value));
2403 >
2404          checkCompletedNormally(f, v1);
2405          checkCompletedNormally(g, v2);
2406 <
2407 <        // unspecified behavior
2408 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2409 <                   Objects.equals(r.value, inc(v2)));
2406 >        checkCompletedNormally(h0, null);
2407 >        checkCompletedNormally(h1, null);
2408 >        checkCompletedNormally(h2, null);
2409 >        checkCompletedNormally(h3, null);
2410 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2411      }}
2412  
2413      /**
2414       * acceptEither result completes exceptionally after exceptional
2415       * completion of either source
2416       */
2417 <    public void testAcceptEither_exceptionalCompletion1() {
2417 >    public void testAcceptEither_exceptionalCompletion() {
2418          for (ExecutionMode m : ExecutionMode.values())
2419          for (Integer v1 : new Integer[] { 1, null })
2420      {
2421          final CompletableFuture<Integer> f = new CompletableFuture<>();
2422          final CompletableFuture<Integer> g = new CompletableFuture<>();
2133        final IncAction r = new IncAction();
2134        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2423          final CFException ex = new CFException();
2424 +        final NoopConsumer[] rs = new NoopConsumer[6];
2425 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2426  
2427 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2428 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2429 +        checkIncomplete(h0);
2430 +        checkIncomplete(h1);
2431 +        rs[0].assertNotInvoked();
2432 +        rs[1].assertNotInvoked();
2433          f.completeExceptionally(ex);
2434 <        checkCompletedWithWrappedCFException(h, ex);
2434 >        checkCompletedWithWrappedException(h0, ex);
2435 >        checkCompletedWithWrappedException(h1, ex);
2436 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2437 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2438 >        checkCompletedWithWrappedException(h2, ex);
2439 >        checkCompletedWithWrappedException(h3, ex);
2440 >
2441          g.complete(v1);
2442  
2443 <        assertEquals(0, r.invocationCount);
2443 >        // unspecified behavior - both source completions available
2444 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2445 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2446 >        try {
2447 >            assertNull(h4.join());
2448 >            rs[4].assertValue(v1);
2449 >        } catch (CompletionException ok) {
2450 >            checkCompletedWithWrappedException(h4, ex);
2451 >            rs[4].assertNotInvoked();
2452 >        }
2453 >        try {
2454 >            assertNull(h5.join());
2455 >            rs[5].assertValue(v1);
2456 >        } catch (CompletionException ok) {
2457 >            checkCompletedWithWrappedException(h5, ex);
2458 >            rs[5].assertNotInvoked();
2459 >        }
2460 >
2461 >        checkCompletedExceptionally(f, ex);
2462          checkCompletedNormally(g, v1);
2463 <        checkCompletedWithWrappedCFException(f, ex);
2464 <        checkCompletedWithWrappedCFException(h, ex);
2463 >        checkCompletedWithWrappedException(h0, ex);
2464 >        checkCompletedWithWrappedException(h1, ex);
2465 >        checkCompletedWithWrappedException(h2, ex);
2466 >        checkCompletedWithWrappedException(h3, ex);
2467 >        checkCompletedWithWrappedException(h4, ex);
2468 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2469      }}
2470  
2471      public void testAcceptEither_exceptionalCompletion2() {
2472          for (ExecutionMode m : ExecutionMode.values())
2473 +        for (boolean fFirst : new boolean[] { true, false })
2474          for (Integer v1 : new Integer[] { 1, null })
2475      {
2476          final CompletableFuture<Integer> f = new CompletableFuture<>();
2477          final CompletableFuture<Integer> g = new CompletableFuture<>();
2153        final IncAction r = new IncAction();
2154        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2155        final CFException ex = new CFException();
2156
2157        g.completeExceptionally(ex);
2158        checkCompletedWithWrappedCFException(h, ex);
2159        f.complete(v1);
2160
2161        assertEquals(0, r.invocationCount);
2162        checkCompletedNormally(f, v1);
2163        checkCompletedWithWrappedCFException(g, ex);
2164        checkCompletedWithWrappedCFException(h, ex);
2165    }}
2166
2167    public void testAcceptEither_exceptionalCompletion3() {
2168        for (ExecutionMode m : ExecutionMode.values())
2169        for (Integer v1 : new Integer[] { 1, null })
2170    {
2171        final CompletableFuture<Integer> f = new CompletableFuture<>();
2172        final CompletableFuture<Integer> g = new CompletableFuture<>();
2173        final IncAction r = new IncAction();
2478          final CFException ex = new CFException();
2479 +        final NoopConsumer[] rs = new NoopConsumer[6];
2480 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2481  
2482 <        g.completeExceptionally(ex);
2483 <        f.complete(v1);
2484 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2482 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2483 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2484 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2485 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2486 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2487 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2488  
2489 <        // unspecified behavior
2181 <        Integer v;
2489 >        // unspecified behavior - both source completions available
2490          try {
2491 <            assertNull(h.join());
2492 <            assertEquals(1, r.invocationCount);
2185 <            assertEquals(inc(v1), r.value);
2491 >            assertEquals(null, h0.join());
2492 >            rs[0].assertValue(v1);
2493          } catch (CompletionException ok) {
2494 <            checkCompletedWithWrappedCFException(h, ex);
2495 <            assertEquals(0, r.invocationCount);
2494 >            checkCompletedWithWrappedException(h0, ex);
2495 >            rs[0].assertNotInvoked();
2496          }
2190
2191        checkCompletedWithWrappedCFException(g, ex);
2192        checkCompletedNormally(f, v1);
2193    }}
2194
2195    public void testAcceptEither_exceptionalCompletion4() {
2196        for (ExecutionMode m : ExecutionMode.values())
2197        for (Integer v1 : new Integer[] { 1, null })
2198    {
2199        final CompletableFuture<Integer> f = new CompletableFuture<>();
2200        final CompletableFuture<Integer> g = new CompletableFuture<>();
2201        final IncAction r = new IncAction();
2202        final CFException ex = new CFException();
2203
2204        f.completeExceptionally(ex);
2205        g.complete(v1);
2206        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2207
2208        // unspecified behavior
2209        Integer v;
2497          try {
2498 <            assertNull(h.join());
2499 <            assertEquals(1, r.invocationCount);
2213 <            assertEquals(inc(v1), r.value);
2498 >            assertEquals(null, h1.join());
2499 >            rs[1].assertValue(v1);
2500          } catch (CompletionException ok) {
2501 <            checkCompletedWithWrappedCFException(h, ex);
2502 <            assertEquals(0, r.invocationCount);
2501 >            checkCompletedWithWrappedException(h1, ex);
2502 >            rs[1].assertNotInvoked();
2503 >        }
2504 >        try {
2505 >            assertEquals(null, h2.join());
2506 >            rs[2].assertValue(v1);
2507 >        } catch (CompletionException ok) {
2508 >            checkCompletedWithWrappedException(h2, ex);
2509 >            rs[2].assertNotInvoked();
2510 >        }
2511 >        try {
2512 >            assertEquals(null, h3.join());
2513 >            rs[3].assertValue(v1);
2514 >        } catch (CompletionException ok) {
2515 >            checkCompletedWithWrappedException(h3, ex);
2516 >            rs[3].assertNotInvoked();
2517          }
2518  
2219        checkCompletedWithWrappedCFException(f, ex);
2220        checkCompletedNormally(g, v1);
2221    }}
2222
2223    /**
2224     * acceptEither result completes exceptionally if action does
2225     */
2226    public void testAcceptEither_actionFailed1() {
2227        for (ExecutionMode m : ExecutionMode.values())
2228        for (Integer v1 : new Integer[] { 1, null })
2229        for (Integer v2 : new Integer[] { 2, null })
2230    {
2231        final CompletableFuture<Integer> f = new CompletableFuture<>();
2232        final CompletableFuture<Integer> g = new CompletableFuture<>();
2233        final FailingConsumer r = new FailingConsumer();
2234        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2235
2236        f.complete(v1);
2237        checkCompletedWithWrappedCFException(h);
2238        g.complete(v2);
2519          checkCompletedNormally(f, v1);
2520 <        checkCompletedNormally(g, v2);
2241 <    }}
2242 <
2243 <    public void testAcceptEither_actionFailed2() {
2244 <        for (ExecutionMode m : ExecutionMode.values())
2245 <        for (Integer v1 : new Integer[] { 1, null })
2246 <        for (Integer v2 : new Integer[] { 2, null })
2247 <    {
2248 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2249 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2250 <        final FailingConsumer r = new FailingConsumer();
2251 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2252 <
2253 <        g.complete(v2);
2254 <        checkCompletedWithWrappedCFException(h);
2255 <        f.complete(v1);
2256 <        checkCompletedNormally(f, v1);
2257 <        checkCompletedNormally(g, v2);
2520 >        checkCompletedExceptionally(g, ex);
2521      }}
2522  
2523      /**
2524       * acceptEither result completes exceptionally if either source cancelled
2525       */
2526 <    public void testAcceptEither_sourceCancelled1() {
2526 >    public void testAcceptEither_sourceCancelled() {
2527          for (ExecutionMode m : ExecutionMode.values())
2528          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2529          for (Integer v1 : new Integer[] { 1, null })
2530      {
2531          final CompletableFuture<Integer> f = new CompletableFuture<>();
2532          final CompletableFuture<Integer> g = new CompletableFuture<>();
2533 <        final IncAction r = new IncAction();
2534 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2272 <
2273 <        assertTrue(f.cancel(mayInterruptIfRunning));
2274 <        checkCompletedWithWrappedCancellationException(h);
2275 <        g.complete(v1);
2276 <
2277 <        checkCancelled(f);
2278 <        assertEquals(0, r.invocationCount);
2279 <        checkCompletedNormally(g, v1);
2280 <        checkCompletedWithWrappedCancellationException(h);
2281 <    }}
2282 <
2283 <    public void testAcceptEither_sourceCancelled2() {
2284 <        for (ExecutionMode m : ExecutionMode.values())
2285 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2286 <        for (Integer v1 : new Integer[] { 1, null })
2287 <    {
2288 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2289 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2290 <        final IncAction r = new IncAction();
2291 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2292 <
2293 <        assertTrue(g.cancel(mayInterruptIfRunning));
2294 <        checkCompletedWithWrappedCancellationException(h);
2295 <        f.complete(v1);
2296 <
2297 <        checkCancelled(g);
2298 <        assertEquals(0, r.invocationCount);
2299 <        checkCompletedNormally(f, v1);
2300 <        checkCompletedWithWrappedCancellationException(h);
2301 <    }}
2533 >        final NoopConsumer[] rs = new NoopConsumer[6];
2534 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2535  
2536 <    public void testAcceptEither_sourceCancelled3() {
2537 <        for (ExecutionMode m : ExecutionMode.values())
2538 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2539 <        for (Integer v1 : new Integer[] { 1, null })
2540 <    {
2541 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2542 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2543 <        final IncAction r = new IncAction();
2536 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2537 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2538 >        checkIncomplete(h0);
2539 >        checkIncomplete(h1);
2540 >        rs[0].assertNotInvoked();
2541 >        rs[1].assertNotInvoked();
2542 >        f.cancel(mayInterruptIfRunning);
2543 >        checkCompletedWithWrappedCancellationException(h0);
2544 >        checkCompletedWithWrappedCancellationException(h1);
2545 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2546 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2547 >        checkCompletedWithWrappedCancellationException(h2);
2548 >        checkCompletedWithWrappedCancellationException(h3);
2549  
2550 <        assertTrue(g.cancel(mayInterruptIfRunning));
2313 <        f.complete(v1);
2314 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2550 >        g.complete(v1);
2551  
2552 <        // unspecified behavior
2553 <        Integer v;
2552 >        // unspecified behavior - both source completions available
2553 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2554 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2555          try {
2556 <            assertNull(h.join());
2557 <            assertEquals(1, r.invocationCount);
2321 <            assertEquals(inc(v1), r.value);
2556 >            assertNull(h4.join());
2557 >            rs[4].assertValue(v1);
2558          } catch (CompletionException ok) {
2559 <            checkCompletedWithWrappedCancellationException(h);
2560 <            assertEquals(0, r.invocationCount);
2559 >            checkCompletedWithWrappedCancellationException(h4);
2560 >            rs[4].assertNotInvoked();
2561          }
2326
2327        checkCancelled(g);
2328        checkCompletedNormally(f, v1);
2329    }}
2330
2331    public void testAcceptEither_sourceCancelled4() {
2332        for (ExecutionMode m : ExecutionMode.values())
2333        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2334        for (Integer v1 : new Integer[] { 1, null })
2335    {
2336        final CompletableFuture<Integer> f = new CompletableFuture<>();
2337        final CompletableFuture<Integer> g = new CompletableFuture<>();
2338        final IncAction r = new IncAction();
2339
2340        assertTrue(f.cancel(mayInterruptIfRunning));
2341        g.complete(v1);
2342        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2343
2344        // unspecified behavior
2345        Integer v;
2562          try {
2563 <            assertNull(h.join());
2564 <            assertEquals(1, r.invocationCount);
2349 <            assertEquals(inc(v1), r.value);
2563 >            assertNull(h5.join());
2564 >            rs[5].assertValue(v1);
2565          } catch (CompletionException ok) {
2566 <            checkCompletedWithWrappedCancellationException(h);
2567 <            assertEquals(0, r.invocationCount);
2566 >            checkCompletedWithWrappedCancellationException(h5);
2567 >            rs[5].assertNotInvoked();
2568          }
2569  
2570          checkCancelled(f);
2571          checkCompletedNormally(g, v1);
2572 +        checkCompletedWithWrappedCancellationException(h0);
2573 +        checkCompletedWithWrappedCancellationException(h1);
2574 +        checkCompletedWithWrappedCancellationException(h2);
2575 +        checkCompletedWithWrappedCancellationException(h3);
2576 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2577      }}
2578  
2579      /**
2580 <     * runAfterEither result completes normally after normal completion
2361 <     * of either source
2580 >     * acceptEither result completes exceptionally if action does
2581       */
2582 <    public void testRunAfterEither_normalCompletion1() {
2582 >    public void testAcceptEither_actionFailed() {
2583          for (ExecutionMode m : ExecutionMode.values())
2584          for (Integer v1 : new Integer[] { 1, null })
2585          for (Integer v2 : new Integer[] { 2, null })
2586      {
2587          final CompletableFuture<Integer> f = new CompletableFuture<>();
2588          final CompletableFuture<Integer> g = new CompletableFuture<>();
2589 <        final Noop r = new Noop();
2590 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2589 >        final FailingConsumer[] rs = new FailingConsumer[6];
2590 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2591  
2592 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2593 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2594          f.complete(v1);
2595 <        checkCompletedNormally(h, null);
2596 <        assertEquals(1, r.invocationCount);
2595 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2596 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2597 >        checkCompletedWithWrappedCFException(h0);
2598 >        checkCompletedWithWrappedCFException(h1);
2599 >        checkCompletedWithWrappedCFException(h2);
2600 >        checkCompletedWithWrappedCFException(h3);
2601 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2602 >
2603          g.complete(v2);
2604  
2605 <        checkCompletedNormally(f, v1);
2606 <        checkCompletedNormally(g, v2);
2607 <        checkCompletedNormally(h, null);
2381 <        assertEquals(1, r.invocationCount);
2382 <    }}
2605 >        // unspecified behavior - both source completions available
2606 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2607 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2608  
2609 <    public void testRunAfterEither_normalCompletion2() {
2610 <        for (ExecutionMode m : ExecutionMode.values())
2611 <        for (Integer v1 : new Integer[] { 1, null })
2612 <        for (Integer v2 : new Integer[] { 2, null })
2613 <    {
2614 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2390 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final Noop r = new Noop();
2392 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2393 <
2394 <        g.complete(v2);
2395 <        checkCompletedNormally(h, null);
2396 <        assertEquals(1, r.invocationCount);
2397 <        f.complete(v1);
2609 >        checkCompletedWithWrappedCFException(h4);
2610 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2611 >                   Objects.equals(v2, rs[4].value));
2612 >        checkCompletedWithWrappedCFException(h5);
2613 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2614 >                   Objects.equals(v2, rs[5].value));
2615  
2616          checkCompletedNormally(f, v1);
2617          checkCompletedNormally(g, v2);
2618 <        checkCompletedNormally(h, null);
2402 <        assertEquals(1, r.invocationCount);
2403 <        }}
2618 >    }}
2619  
2620 <    public void testRunAfterEither_normalCompletion3() {
2620 >    /**
2621 >     * runAfterEither result completes normally after normal completion
2622 >     * of either source
2623 >     */
2624 >    public void testRunAfterEither_normalCompletion() {
2625          for (ExecutionMode m : ExecutionMode.values())
2626          for (Integer v1 : new Integer[] { 1, null })
2627          for (Integer v2 : new Integer[] { 2, null })
2628      {
2629          final CompletableFuture<Integer> f = new CompletableFuture<>();
2630          final CompletableFuture<Integer> g = new CompletableFuture<>();
2631 <        final Noop r = new Noop();
2631 >        final Noop[] rs = new Noop[6];
2632 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2633  
2634 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2635 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2636 +        checkIncomplete(h0);
2637 +        checkIncomplete(h1);
2638 +        rs[0].assertNotInvoked();
2639 +        rs[1].assertNotInvoked();
2640          f.complete(v1);
2641 +        checkCompletedNormally(h0, null);
2642 +        checkCompletedNormally(h1, null);
2643 +        rs[0].assertInvoked();
2644 +        rs[1].assertInvoked();
2645 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2646 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2647 +        checkCompletedNormally(h2, null);
2648 +        checkCompletedNormally(h3, null);
2649 +        rs[2].assertInvoked();
2650 +        rs[3].assertInvoked();
2651 +
2652          g.complete(v2);
2416        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2653  
2654 <        checkCompletedNormally(h, null);
2654 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2655 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2656 >
2657          checkCompletedNormally(f, v1);
2658          checkCompletedNormally(g, v2);
2659 <        assertEquals(1, r.invocationCount);
2659 >        checkCompletedNormally(h0, null);
2660 >        checkCompletedNormally(h1, null);
2661 >        checkCompletedNormally(h2, null);
2662 >        checkCompletedNormally(h3, null);
2663 >        checkCompletedNormally(h4, null);
2664 >        checkCompletedNormally(h5, null);
2665 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2666      }}
2667  
2668      /**
2669       * runAfterEither result completes exceptionally after exceptional
2670       * completion of either source
2671       */
2672 <    public void testRunAfterEither_exceptionalCompletion1() {
2672 >    public void testRunAfterEither_exceptionalCompletion() {
2673          for (ExecutionMode m : ExecutionMode.values())
2674          for (Integer v1 : new Integer[] { 1, null })
2675      {
2676          final CompletableFuture<Integer> f = new CompletableFuture<>();
2677          final CompletableFuture<Integer> g = new CompletableFuture<>();
2434        final Noop r = new Noop();
2435        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2678          final CFException ex = new CFException();
2679 +        final Noop[] rs = new Noop[6];
2680 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2681  
2682 <        f.completeExceptionally(ex);
2683 <        checkCompletedWithWrappedCFException(h, ex);
2684 <        g.complete(v1);
2682 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2683 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2684 >        checkIncomplete(h0);
2685 >        checkIncomplete(h1);
2686 >        rs[0].assertNotInvoked();
2687 >        rs[1].assertNotInvoked();
2688 >        assertTrue(f.completeExceptionally(ex));
2689 >        checkCompletedWithWrappedException(h0, ex);
2690 >        checkCompletedWithWrappedException(h1, ex);
2691 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2692 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2693 >        checkCompletedWithWrappedException(h2, ex);
2694 >        checkCompletedWithWrappedException(h3, ex);
2695  
2696 <        assertEquals(0, r.invocationCount);
2443 <        checkCompletedNormally(g, v1);
2444 <        checkCompletedWithWrappedCFException(f, ex);
2445 <        checkCompletedWithWrappedCFException(h, ex);
2446 <    }}
2447 <
2448 <    public void testRunAfterEither_exceptionalCompletion2() {
2449 <        for (ExecutionMode m : ExecutionMode.values())
2450 <        for (Integer v1 : new Integer[] { 1, null })
2451 <    {
2452 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2453 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2454 <        final Noop r = new Noop();
2455 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456 <        final CFException ex = new CFException();
2457 <
2458 <        g.completeExceptionally(ex);
2459 <        checkCompletedWithWrappedCFException(h, ex);
2460 <        f.complete(v1);
2461 <
2462 <        assertEquals(0, r.invocationCount);
2463 <        checkCompletedNormally(f, v1);
2464 <        checkCompletedWithWrappedCFException(g, ex);
2465 <        checkCompletedWithWrappedCFException(h, ex);
2466 <    }}
2467 <
2468 <    public void testRunAfterEither_exceptionalCompletion3() {
2469 <        for (ExecutionMode m : ExecutionMode.values())
2470 <        for (Integer v1 : new Integer[] { 1, null })
2471 <    {
2472 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474 <        final Noop r = new Noop();
2475 <        final CFException ex = new CFException();
2476 <
2477 <        g.completeExceptionally(ex);
2478 <        f.complete(v1);
2479 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2696 >        assertTrue(g.complete(v1));
2697  
2698 <        // unspecified behavior
2699 <        Integer v;
2698 >        // unspecified behavior - both source completions available
2699 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2700 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2701          try {
2702 <            assertNull(h.join());
2703 <            assertEquals(1, r.invocationCount);
2702 >            assertNull(h4.join());
2703 >            rs[4].assertInvoked();
2704          } catch (CompletionException ok) {
2705 <            checkCompletedWithWrappedCFException(h, ex);
2706 <            assertEquals(0, r.invocationCount);
2705 >            checkCompletedWithWrappedException(h4, ex);
2706 >            rs[4].assertNotInvoked();
2707          }
2490
2491        checkCompletedWithWrappedCFException(g, ex);
2492        checkCompletedNormally(f, v1);
2493    }}
2494
2495    public void testRunAfterEither_exceptionalCompletion4() {
2496        for (ExecutionMode m : ExecutionMode.values())
2497        for (Integer v1 : new Integer[] { 1, null })
2498    {
2499        final CompletableFuture<Integer> f = new CompletableFuture<>();
2500        final CompletableFuture<Integer> g = new CompletableFuture<>();
2501        final Noop r = new Noop();
2502        final CFException ex = new CFException();
2503
2504        f.completeExceptionally(ex);
2505        g.complete(v1);
2506        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2507
2508        // unspecified behavior
2509        Integer v;
2708          try {
2709 <            assertNull(h.join());
2710 <            assertEquals(1, r.invocationCount);
2709 >            assertNull(h5.join());
2710 >            rs[5].assertInvoked();
2711          } catch (CompletionException ok) {
2712 <            checkCompletedWithWrappedCFException(h, ex);
2713 <            assertEquals(0, r.invocationCount);
2712 >            checkCompletedWithWrappedException(h5, ex);
2713 >            rs[5].assertNotInvoked();
2714          }
2715  
2716 <        checkCompletedWithWrappedCFException(f, ex);
2716 >        checkCompletedExceptionally(f, ex);
2717          checkCompletedNormally(g, v1);
2718 +        checkCompletedWithWrappedException(h0, ex);
2719 +        checkCompletedWithWrappedException(h1, ex);
2720 +        checkCompletedWithWrappedException(h2, ex);
2721 +        checkCompletedWithWrappedException(h3, ex);
2722 +        checkCompletedWithWrappedException(h4, ex);
2723 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2724      }}
2725  
2726 <    /**
2523 <     * runAfterEither result completes exceptionally if action does
2524 <     */
2525 <    public void testRunAfterEither_actionFailed1() {
2726 >    public void testRunAfterEither_exceptionalCompletion2() {
2727          for (ExecutionMode m : ExecutionMode.values())
2728 +        for (boolean fFirst : new boolean[] { true, false })
2729          for (Integer v1 : new Integer[] { 1, null })
2528        for (Integer v2 : new Integer[] { 2, null })
2730      {
2731          final CompletableFuture<Integer> f = new CompletableFuture<>();
2732          final CompletableFuture<Integer> g = new CompletableFuture<>();
2733 <        final FailingRunnable r = new FailingRunnable();
2734 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2733 >        final CFException ex = new CFException();
2734 >        final Noop[] rs = new Noop[6];
2735 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2736  
2737 <        f.complete(v1);
2738 <        checkCompletedWithWrappedCFException(h);
2739 <        g.complete(v2);
2740 <        checkCompletedNormally(f, v1);
2741 <        checkCompletedNormally(g, v2);
2742 <    }}
2737 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2738 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2739 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2740 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2741 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2742 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2743  
2744 <    public void testRunAfterEither_actionFailed2() {
2745 <        for (ExecutionMode m : ExecutionMode.values())
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 FailingRunnable r = new FailingRunnable();
2752 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2744 >        // unspecified behavior - both source completions available
2745 >        try {
2746 >            assertEquals(null, h0.join());
2747 >            rs[0].assertInvoked();
2748 >        } catch (CompletionException ok) {
2749 >            checkCompletedWithWrappedException(h0, ex);
2750 >            rs[0].assertNotInvoked();
2751 >        }
2752 >        try {
2753 >            assertEquals(null, h1.join());
2754 >            rs[1].assertInvoked();
2755 >        } catch (CompletionException ok) {
2756 >            checkCompletedWithWrappedException(h1, ex);
2757 >            rs[1].assertNotInvoked();
2758 >        }
2759 >        try {
2760 >            assertEquals(null, h2.join());
2761 >            rs[2].assertInvoked();
2762 >        } catch (CompletionException ok) {
2763 >            checkCompletedWithWrappedException(h2, ex);
2764 >            rs[2].assertNotInvoked();
2765 >        }
2766 >        try {
2767 >            assertEquals(null, h3.join());
2768 >            rs[3].assertInvoked();
2769 >        } catch (CompletionException ok) {
2770 >            checkCompletedWithWrappedException(h3, ex);
2771 >            rs[3].assertNotInvoked();
2772 >        }
2773  
2552        g.complete(v2);
2553        checkCompletedWithWrappedCFException(h);
2554        f.complete(v1);
2774          checkCompletedNormally(f, v1);
2775 <        checkCompletedNormally(g, v2);
2775 >        checkCompletedExceptionally(g, ex);
2776      }}
2777  
2778      /**
2779       * runAfterEither result completes exceptionally if either source cancelled
2780       */
2781 <    public void testRunAfterEither_sourceCancelled1() {
2781 >    public void testRunAfterEither_sourceCancelled() {
2782          for (ExecutionMode m : ExecutionMode.values())
2783          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2784          for (Integer v1 : new Integer[] { 1, null })
2785      {
2786          final CompletableFuture<Integer> f = new CompletableFuture<>();
2787          final CompletableFuture<Integer> g = new CompletableFuture<>();
2788 <        final Noop r = new Noop();
2789 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2788 >        final Noop[] rs = new Noop[6];
2789 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2790  
2791 <        assertTrue(f.cancel(mayInterruptIfRunning));
2792 <        checkCompletedWithWrappedCancellationException(h);
2793 <        g.complete(v1);
2791 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2792 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2793 >        checkIncomplete(h0);
2794 >        checkIncomplete(h1);
2795 >        rs[0].assertNotInvoked();
2796 >        rs[1].assertNotInvoked();
2797 >        f.cancel(mayInterruptIfRunning);
2798 >        checkCompletedWithWrappedCancellationException(h0);
2799 >        checkCompletedWithWrappedCancellationException(h1);
2800 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2801 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2802 >        checkCompletedWithWrappedCancellationException(h2);
2803 >        checkCompletedWithWrappedCancellationException(h3);
2804  
2805 <        checkCancelled(f);
2577 <        assertEquals(0, r.invocationCount);
2578 <        checkCompletedNormally(g, v1);
2579 <        checkCompletedWithWrappedCancellationException(h);
2580 <    }}
2805 >        assertTrue(g.complete(v1));
2806  
2807 <    public void testRunAfterEither_sourceCancelled2() {
2808 <        for (ExecutionMode m : ExecutionMode.values())
2809 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2810 <        for (Integer v1 : new Integer[] { 1, null })
2811 <    {
2812 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2813 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2814 <        final Noop r = new Noop();
2815 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2816 <
2592 <        assertTrue(g.cancel(mayInterruptIfRunning));
2593 <        checkCompletedWithWrappedCancellationException(h);
2594 <        f.complete(v1);
2595 <
2596 <        checkCancelled(g);
2597 <        assertEquals(0, r.invocationCount);
2598 <        checkCompletedNormally(f, v1);
2599 <        checkCompletedWithWrappedCancellationException(h);
2600 <    }}
2601 <
2602 <    public void testRunAfterEither_sourceCancelled3() {
2603 <        for (ExecutionMode m : ExecutionMode.values())
2604 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2605 <        for (Integer v1 : new Integer[] { 1, null })
2606 <    {
2607 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2608 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2609 <        final Noop r = new Noop();
2610 <
2611 <        assertTrue(g.cancel(mayInterruptIfRunning));
2612 <        f.complete(v1);
2613 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2614 <
2615 <        // unspecified behavior
2616 <        Integer v;
2807 >        // unspecified behavior - both source completions available
2808 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2809 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2810 >        try {
2811 >            assertNull(h4.join());
2812 >            rs[4].assertInvoked();
2813 >        } catch (CompletionException ok) {
2814 >            checkCompletedWithWrappedCancellationException(h4);
2815 >            rs[4].assertNotInvoked();
2816 >        }
2817          try {
2818 <            assertNull(h.join());
2819 <            assertEquals(1, r.invocationCount);
2818 >            assertNull(h5.join());
2819 >            rs[5].assertInvoked();
2820          } catch (CompletionException ok) {
2821 <            checkCompletedWithWrappedCancellationException(h);
2822 <            assertEquals(0, r.invocationCount);
2821 >            checkCompletedWithWrappedCancellationException(h5);
2822 >            rs[5].assertNotInvoked();
2823          }
2824  
2825 <        checkCancelled(g);
2826 <        checkCompletedNormally(f, v1);
2825 >        checkCancelled(f);
2826 >        checkCompletedNormally(g, v1);
2827 >        checkCompletedWithWrappedCancellationException(h0);
2828 >        checkCompletedWithWrappedCancellationException(h1);
2829 >        checkCompletedWithWrappedCancellationException(h2);
2830 >        checkCompletedWithWrappedCancellationException(h3);
2831 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2832      }}
2833  
2834 <    public void testRunAfterEither_sourceCancelled4() {
2834 >    /**
2835 >     * runAfterEither result completes exceptionally if action does
2836 >     */
2837 >    public void testRunAfterEither_actionFailed() {
2838          for (ExecutionMode m : ExecutionMode.values())
2631        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2839          for (Integer v1 : new Integer[] { 1, null })
2840 +        for (Integer v2 : new Integer[] { 2, null })
2841      {
2842          final CompletableFuture<Integer> f = new CompletableFuture<>();
2843          final CompletableFuture<Integer> g = new CompletableFuture<>();
2844 <        final Noop r = new Noop();
2844 >        final FailingRunnable[] rs = new FailingRunnable[6];
2845 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2846  
2847 <        assertTrue(f.cancel(mayInterruptIfRunning));
2848 <        g.complete(v1);
2849 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2847 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2848 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2849 >        assertTrue(f.complete(v1));
2850 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2851 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2852 >        checkCompletedWithWrappedCFException(h0);
2853 >        checkCompletedWithWrappedCFException(h1);
2854 >        checkCompletedWithWrappedCFException(h2);
2855 >        checkCompletedWithWrappedCFException(h3);
2856 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2857 >        assertTrue(g.complete(v2));
2858 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2859 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2860 >        checkCompletedWithWrappedCFException(h4);
2861 >        checkCompletedWithWrappedCFException(h5);
2862  
2863 <        // unspecified behavior
2864 <        Integer v;
2865 <        try {
2645 <            assertNull(h.join());
2646 <            assertEquals(1, r.invocationCount);
2647 <        } catch (CompletionException ok) {
2648 <            checkCompletedWithWrappedCancellationException(h);
2649 <            assertEquals(0, r.invocationCount);
2650 <        }
2651 <
2652 <        checkCancelled(f);
2653 <        checkCompletedNormally(g, v1);
2863 >        checkCompletedNormally(f, v1);
2864 >        checkCompletedNormally(g, v2);
2865 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2866      }}
2867  
2868      /**
# Line 2662 | Line 2874 | public class CompletableFutureTest exten
2874          for (Integer v1 : new Integer[] { 1, null })
2875      {
2876          final CompletableFuture<Integer> f = new CompletableFuture<>();
2877 <        final CompletableFutureInc r = new CompletableFutureInc();
2878 <        if (!createIncomplete) f.complete(v1);
2879 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2880 <        if (createIncomplete) f.complete(v1);
2877 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2878 >        if (!createIncomplete) assertTrue(f.complete(v1));
2879 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2880 >        if (createIncomplete) assertTrue(f.complete(v1));
2881  
2882          checkCompletedNormally(g, inc(v1));
2883          checkCompletedNormally(f, v1);
2884 <        assertEquals(1, r.invocationCount);
2884 >        r.assertValue(v1);
2885      }}
2886  
2887      /**
# Line 2681 | Line 2893 | public class CompletableFutureTest exten
2893          for (boolean createIncomplete : new boolean[] { true, false })
2894      {
2895          final CFException ex = new CFException();
2896 <        final CompletableFutureInc r = new CompletableFutureInc();
2896 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2897          final CompletableFuture<Integer> f = new CompletableFuture<>();
2898          if (!createIncomplete) f.completeExceptionally(ex);
2899 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2899 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2900          if (createIncomplete) f.completeExceptionally(ex);
2901  
2902 <        checkCompletedWithWrappedCFException(g, ex);
2903 <        checkCompletedWithWrappedCFException(f, ex);
2904 <        assertEquals(0, r.invocationCount);
2902 >        checkCompletedWithWrappedException(g, ex);
2903 >        checkCompletedExceptionally(f, ex);
2904 >        r.assertNotInvoked();
2905      }}
2906  
2907      /**
# Line 2702 | Line 2914 | public class CompletableFutureTest exten
2914      {
2915          final CompletableFuture<Integer> f = new CompletableFuture<>();
2916          final FailingCompletableFutureFunction r
2917 <            = new FailingCompletableFutureFunction();
2918 <        if (!createIncomplete) f.complete(v1);
2919 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2920 <        if (createIncomplete) f.complete(v1);
2917 >            = new FailingCompletableFutureFunction(m);
2918 >        if (!createIncomplete) assertTrue(f.complete(v1));
2919 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2920 >        if (createIncomplete) assertTrue(f.complete(v1));
2921  
2922          checkCompletedWithWrappedCFException(g);
2923          checkCompletedNormally(f, v1);
# Line 2720 | Line 2932 | public class CompletableFutureTest exten
2932          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2933      {
2934          final CompletableFuture<Integer> f = new CompletableFuture<>();
2935 <        final CompletableFutureInc r = new CompletableFutureInc();
2935 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2936          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2937 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2937 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2938          if (createIncomplete) {
2939              checkIncomplete(g);
2940              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 2748 | Line 2960 | public class CompletableFutureTest exten
2960       * when all components complete normally
2961       */
2962      public void testAllOf_normal() throws Exception {
2963 <        for (int k = 1; k < 20; ++k) {
2964 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2965 <            for (int i = 0; i < k; ++i)
2963 >        for (int k = 1; k < 10; k++) {
2964 >            CompletableFuture<Integer>[] fs
2965 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2966 >            for (int i = 0; i < k; i++)
2967 >                fs[i] = new CompletableFuture<>();
2968 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2969 >            for (int i = 0; i < k; i++) {
2970 >                checkIncomplete(f);
2971 >                checkIncomplete(CompletableFuture.allOf(fs));
2972 >                fs[i].complete(one);
2973 >            }
2974 >            checkCompletedNormally(f, null);
2975 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2976 >        }
2977 >    }
2978 >
2979 >    public void testAllOf_backwards() throws Exception {
2980 >        for (int k = 1; k < 10; k++) {
2981 >            CompletableFuture<Integer>[] fs
2982 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2983 >            for (int i = 0; i < k; i++)
2984                  fs[i] = new CompletableFuture<>();
2985              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2986 <            for (int i = 0; i < k; ++i) {
2986 >            for (int i = k - 1; i >= 0; i--) {
2987                  checkIncomplete(f);
2988                  checkIncomplete(CompletableFuture.allOf(fs));
2989                  fs[i].complete(one);
# Line 2763 | Line 2993 | public class CompletableFutureTest exten
2993          }
2994      }
2995  
2996 +    public void testAllOf_exceptional() throws Exception {
2997 +        for (int k = 1; k < 10; k++) {
2998 +            CompletableFuture<Integer>[] fs
2999 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3000 +            CFException ex = new CFException();
3001 +            for (int i = 0; i < k; i++)
3002 +                fs[i] = new CompletableFuture<>();
3003 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3004 +            for (int i = 0; i < k; i++) {
3005 +                checkIncomplete(f);
3006 +                checkIncomplete(CompletableFuture.allOf(fs));
3007 +                if (i != k/2) {
3008 +                    fs[i].complete(i);
3009 +                    checkCompletedNormally(fs[i], i);
3010 +                } else {
3011 +                    fs[i].completeExceptionally(ex);
3012 +                    checkCompletedExceptionally(fs[i], ex);
3013 +                }
3014 +            }
3015 +            checkCompletedWithWrappedException(f, ex);
3016 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3017 +        }
3018 +    }
3019 +
3020      /**
3021       * anyOf(no component futures) returns an incomplete future
3022       */
3023      public void testAnyOf_empty() throws Exception {
3024 +        for (Integer v1 : new Integer[] { 1, null })
3025 +    {
3026          CompletableFuture<Object> f = CompletableFuture.anyOf();
3027          checkIncomplete(f);
3028 <    }
3028 >
3029 >        f.complete(v1);
3030 >        checkCompletedNormally(f, v1);
3031 >    }}
3032  
3033      /**
3034       * anyOf returns a future completed normally with a value when
3035       * a component future does
3036       */
3037      public void testAnyOf_normal() throws Exception {
3038 <        for (int k = 0; k < 10; ++k) {
3038 >        for (int k = 0; k < 10; k++) {
3039              CompletableFuture[] fs = new CompletableFuture[k];
3040 <            for (int i = 0; i < k; ++i)
3040 >            for (int i = 0; i < k; i++)
3041                  fs[i] = new CompletableFuture<>();
3042              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3043              checkIncomplete(f);
3044 <            for (int i = 0; i < k; ++i) {
3045 <                fs[i].complete(one);
3046 <                checkCompletedNormally(f, one);
3047 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3044 >            for (int i = 0; i < k; i++) {
3045 >                fs[i].complete(i);
3046 >                checkCompletedNormally(f, 0);
3047 >                int x = (int) CompletableFuture.anyOf(fs).join();
3048 >                assertTrue(0 <= x && x <= i);
3049 >            }
3050 >        }
3051 >    }
3052 >    public void testAnyOf_normal_backwards() throws Exception {
3053 >        for (int k = 0; k < 10; k++) {
3054 >            CompletableFuture[] fs = new CompletableFuture[k];
3055 >            for (int i = 0; i < k; i++)
3056 >                fs[i] = new CompletableFuture<>();
3057 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3058 >            checkIncomplete(f);
3059 >            for (int i = k - 1; i >= 0; i--) {
3060 >                fs[i].complete(i);
3061 >                checkCompletedNormally(f, k - 1);
3062 >                int x = (int) CompletableFuture.anyOf(fs).join();
3063 >                assertTrue(i <= x && x <= k - 1);
3064              }
3065          }
3066      }
# Line 2794 | Line 3069 | public class CompletableFutureTest exten
3069       * anyOf result completes exceptionally when any component does.
3070       */
3071      public void testAnyOf_exceptional() throws Exception {
3072 <        for (int k = 0; k < 10; ++k) {
3072 >        for (int k = 0; k < 10; k++) {
3073              CompletableFuture[] fs = new CompletableFuture[k];
3074 <            for (int i = 0; i < k; ++i)
3074 >            CFException[] exs = new CFException[k];
3075 >            for (int i = 0; i < k; i++) {
3076                  fs[i] = new CompletableFuture<>();
3077 +                exs[i] = new CFException();
3078 +            }
3079              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3080              checkIncomplete(f);
3081 <            for (int i = 0; i < k; ++i) {
3082 <                fs[i].completeExceptionally(new CFException());
3083 <                checkCompletedWithWrappedCFException(f);
3081 >            for (int i = 0; i < k; i++) {
3082 >                fs[i].completeExceptionally(exs[i]);
3083 >                checkCompletedWithWrappedException(f, exs[0]);
3084 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3085 >            }
3086 >        }
3087 >    }
3088 >
3089 >    public void testAnyOf_exceptional_backwards() throws Exception {
3090 >        for (int k = 0; k < 10; k++) {
3091 >            CompletableFuture[] fs = new CompletableFuture[k];
3092 >            CFException[] exs = new CFException[k];
3093 >            for (int i = 0; i < k; i++) {
3094 >                fs[i] = new CompletableFuture<>();
3095 >                exs[i] = new CFException();
3096 >            }
3097 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3098 >            checkIncomplete(f);
3099 >            for (int i = k - 1; i >= 0; i--) {
3100 >                fs[i].completeExceptionally(exs[i]);
3101 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3102                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3103              }
3104          }
# Line 2821 | Line 3117 | public class CompletableFutureTest exten
3117          Runnable[] throwingActions = {
3118              () -> CompletableFuture.supplyAsync(null),
3119              () -> CompletableFuture.supplyAsync(null, exec),
3120 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3120 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3121  
3122              () -> CompletableFuture.runAsync(null),
3123              () -> CompletableFuture.runAsync(null, exec),
# Line 2894 | Line 3190 | public class CompletableFutureTest exten
3190  
3191              () -> f.thenCompose(null),
3192              () -> f.thenComposeAsync(null),
3193 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3193 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3194              () -> f.thenComposeAsync(null, exec),
3195  
3196              () -> f.exceptionally(null),
# Line 2926 | Line 3222 | public class CompletableFutureTest exten
3222          assertSame(f, f.toCompletableFuture());
3223      }
3224  
3225 <    /**
2930 <     * whenComplete action executes on normal completion, propagating
2931 <     * source result.
2932 <     */
2933 <    public void testWhenComplete_normalCompletion1() {
2934 <        for (ExecutionMode m : ExecutionMode.values())
2935 <        for (boolean createIncomplete : new boolean[] { true, false })
2936 <        for (Integer v1 : new Integer[] { 1, null })
2937 <    {
2938 <        final AtomicInteger a = new AtomicInteger(0);
2939 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2940 <        if (!createIncomplete) f.complete(v1);
2941 <        final CompletableFuture<Integer> g = m.whenComplete
2942 <            (f,
2943 <             (Integer x, Throwable t) -> {
2944 <                threadAssertSame(x, v1);
2945 <                threadAssertNull(t);
2946 <                a.getAndIncrement();
2947 <            });
2948 <        if (createIncomplete) f.complete(v1);
3225 >    //--- tests of implementation details; not part of official tck ---
3226  
3227 <        checkCompletedNormally(g, v1);
3228 <        checkCompletedNormally(f, v1);
3229 <        assertEquals(1, a.get());
3230 <    }}
3227 >    Object resultOf(CompletableFuture<?> f) {
3228 >        try {
3229 >            java.lang.reflect.Field resultField
3230 >                = CompletableFuture.class.getDeclaredField("result");
3231 >            resultField.setAccessible(true);
3232 >            return resultField.get(f);
3233 >        } catch (Throwable t) { throw new AssertionError(t); }
3234 >    }
3235  
3236 <    /**
3237 <     * whenComplete action executes on exceptional completion, propagating
2957 <     * source result.
2958 <     */
2959 <    public void testWhenComplete_exceptionalCompletion() {
3236 >    public void testExceptionPropagationReusesResultObject() {
3237 >        if (!testImplementationDetails) return;
3238          for (ExecutionMode m : ExecutionMode.values())
2961        for (boolean createIncomplete : new boolean[] { true, false })
2962        for (Integer v1 : new Integer[] { 1, null })
3239      {
2964        final AtomicInteger a = new AtomicInteger(0);
3240          final CFException ex = new CFException();
3241 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3242 <        if (!createIncomplete) f.completeExceptionally(ex);
2968 <        final CompletableFuture<Integer> g = m.whenComplete
2969 <            (f,
2970 <             (Integer x, Throwable t) -> {
2971 <                threadAssertNull(x);
2972 <                threadAssertSame(t, ex);
2973 <                a.getAndIncrement();
2974 <            });
2975 <        if (createIncomplete) f.completeExceptionally(ex);
2976 <        checkCompletedWithWrappedCFException(f, ex);
2977 <        checkCompletedWithWrappedCFException(g, ex);
2978 <        assertEquals(1, a.get());
2979 <    }}
3241 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3242 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3243  
3244 <    /**
3245 <     * whenComplete action executes on cancelled source, propagating
2983 <     * CancellationException.
2984 <     */
2985 <    public void testWhenComplete_sourceCancelled() {
2986 <        for (ExecutionMode m : ExecutionMode.values())
2987 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2988 <        for (boolean createIncomplete : new boolean[] { true, false })
2989 <    {
2990 <        final AtomicInteger a = new AtomicInteger(0);
2991 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2992 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2993 <        final CompletableFuture<Integer> g = m.whenComplete
2994 <            (f,
2995 <             (Integer x, Throwable t) -> {
2996 <                threadAssertNull(x);
2997 <                threadAssertTrue(t instanceof CancellationException);
2998 <                a.getAndIncrement();
2999 <            });
3000 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3244 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3245 >            = new ArrayList<>();
3246  
3247 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3248 <        checkCompletedWithWrappedCancellationException(g);
3249 <        checkCancelled(f);
3005 <        assertEquals(1, a.get());
3006 <    }}
3247 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3248 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3249 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3250  
3251 <    /**
3252 <     * If a whenComplete action throws an exception when triggered by
3253 <     * a normal completion, it completes exceptionally
3011 <     */
3012 <    public void testWhenComplete_actionFailed() {
3013 <        for (boolean createIncomplete : new boolean[] { true, false })
3014 <        for (ExecutionMode m : ExecutionMode.values())
3015 <        for (Integer v1 : new Integer[] { 1, null })
3016 <    {
3017 <        final AtomicInteger a = new AtomicInteger(0);
3018 <        final CFException ex = new CFException();
3019 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3020 <        if (!createIncomplete) f.complete(v1);
3021 <        final CompletableFuture<Integer> g = m.whenComplete
3022 <            (f,
3023 <             (Integer x, Throwable t) -> {
3024 <                threadAssertSame(x, v1);
3025 <                threadAssertNull(t);
3026 <                a.getAndIncrement();
3027 <                throw ex;
3028 <            });
3029 <        if (createIncomplete) f.complete(v1);
3030 <        checkCompletedNormally(f, v1);
3031 <        checkCompletedWithWrappedCFException(g, ex);
3032 <        assertEquals(1, a.get());
3033 <    }}
3251 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3252 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3253 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3254  
3255 <    /**
3256 <     * If a whenComplete action throws an exception when triggered by
3257 <     * a source completion that also throws an exception, the source
3038 <     * exception takes precedence.
3039 <     */
3040 <    public void testWhenComplete_actionFailedSourceFailed() {
3041 <        for (boolean createIncomplete : new boolean[] { true, false })
3042 <        for (ExecutionMode m : ExecutionMode.values())
3043 <        for (Integer v1 : new Integer[] { 1, null })
3044 <    {
3045 <        final AtomicInteger a = new AtomicInteger(0);
3046 <        final CFException ex1 = new CFException();
3047 <        final CFException ex2 = new CFException();
3048 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3255 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3256 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3257 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3258  
3259 <        if (!createIncomplete) f.completeExceptionally(ex1);
3051 <        final CompletableFuture<Integer> g = m.whenComplete
3052 <            (f,
3053 <             (Integer x, Throwable t) -> {
3054 <                threadAssertSame(t, ex1);
3055 <                threadAssertNull(x);
3056 <                a.getAndIncrement();
3057 <                throw ex2;
3058 <            });
3059 <        if (createIncomplete) f.completeExceptionally(ex1);
3259 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3260  
3261 <        checkCompletedWithWrappedCFException(f, ex1);
3262 <        checkCompletedWithWrappedCFException(g, ex1);
3263 <        assertEquals(1, a.get());
3261 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3262 >
3263 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3264 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3265 >
3266 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3267 >                 fun : funs) {
3268 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3269 >            f.completeExceptionally(ex);
3270 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3271 >            checkCompletedWithWrappedException(src, ex);
3272 >            CompletableFuture<?> dep = fun.apply(src);
3273 >            checkCompletedWithWrappedException(dep, ex);
3274 >            assertSame(resultOf(src), resultOf(dep));
3275 >        }
3276 >
3277 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3278 >                 fun : funs) {
3279 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3280 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3281 >            CompletableFuture<?> dep = fun.apply(src);
3282 >            f.completeExceptionally(ex);
3283 >            checkCompletedWithWrappedException(src, ex);
3284 >            checkCompletedWithWrappedException(dep, ex);
3285 >            assertSame(resultOf(src), resultOf(dep));
3286 >        }
3287 >
3288 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3289 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3290 >                 fun : funs) {
3291 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3292 >            f.cancel(mayInterruptIfRunning);
3293 >            checkCancelled(f);
3294 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3295 >            checkCompletedWithWrappedCancellationException(src);
3296 >            CompletableFuture<?> dep = fun.apply(src);
3297 >            checkCompletedWithWrappedCancellationException(dep);
3298 >            assertSame(resultOf(src), resultOf(dep));
3299 >        }
3300 >
3301 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3302 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3303 >                 fun : funs) {
3304 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3305 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3306 >            CompletableFuture<?> dep = fun.apply(src);
3307 >            f.cancel(mayInterruptIfRunning);
3308 >            checkCancelled(f);
3309 >            checkCompletedWithWrappedCancellationException(src);
3310 >            checkCompletedWithWrappedCancellationException(dep);
3311 >            assertSame(resultOf(src), resultOf(dep));
3312 >        }
3313      }}
3314  
3315   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines