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.50 by jsr166, Mon Jun 2 19:32:57 2014 UTC vs.
Revision 1.89 by jsr166, Mon Jun 16 21:34:49 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines