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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines