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.79 by jsr166, Mon Jun 16 17:08:15 2014 UTC

# Line 105 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
108 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 >                                                      Throwable ex) {
110          try {
111              f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
# Line 131 | Line 131 | public class CompletableFutureTest exten
131          } catch (ExecutionException success) {
132              assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 206 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 +        for (Integer v1 : new Integer[] { 1, null })
231 +    {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233          checkIncomplete(f);
234 <        f.complete(one);
235 <        checkCompletedNormally(f, one);
236 <    }
234 >        assertTrue(f.complete(v1));
235 >        assertFalse(f.complete(v1));
236 >        checkCompletedNormally(f, v1);
237 >    }}
238  
239      /**
240       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 242 | public class CompletableFutureTest exten
242       */
243      public void testCompleteExceptionally() {
244          CompletableFuture<Integer> f = new CompletableFuture<>();
245 +        CFException ex = new CFException();
246          checkIncomplete(f);
247 <        f.completeExceptionally(new CFException());
248 <        checkCompletedWithWrappedCFException(f);
247 >        f.completeExceptionally(ex);
248 >        checkCompletedExceptionally(f, ex);
249      }
250  
251      /**
# Line 228 | Line 253 | public class CompletableFutureTest exten
253       * methods isDone, isCancelled, join, get, and getNow
254       */
255      public void testCancel() {
256 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
257 +    {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260          assertTrue(f.cancel(true));
261 +        assertTrue(f.cancel(true));
262          checkCancelled(f);
263 <    }
263 >    }}
264  
265      /**
266       * obtrudeValue forces completion with given value
# Line 240 | Line 268 | public class CompletableFutureTest exten
268      public void testObtrudeValue() {
269          CompletableFuture<Integer> f = new CompletableFuture<>();
270          checkIncomplete(f);
271 <        f.complete(one);
271 >        assertTrue(f.complete(one));
272          checkCompletedNormally(f, one);
273          f.obtrudeValue(three);
274          checkCompletedNormally(f, three);
# Line 261 | Line 289 | public class CompletableFutureTest exten
289       * obtrudeException forces completion with given exception
290       */
291      public void testObtrudeException() {
292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
293 <        checkIncomplete(f);
294 <        f.complete(one);
295 <        checkCompletedNormally(f, one);
296 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
292 >        for (Integer v1 : new Integer[] { 1, null })
293 >    {
294 >        CFException ex;
295 >        CompletableFuture<Integer> f;
296 >
297          f = new CompletableFuture<>();
298 <        f.obtrudeException(new CFException());
299 <        checkCompletedWithWrappedCFException(f);
298 >        assertTrue(f.complete(v1));
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304          f = new CompletableFuture<>();
305 +        for (int i = 0; i < 2; i++) {
306 +            f.obtrudeException(ex = new CFException());
307 +            checkCompletedExceptionally(f, ex);
308 +        }
309 +
310 +        f = new CompletableFuture<>();
311 +        f.completeExceptionally(ex = new CFException());
312 +        f.obtrudeValue(v1);
313 +        checkCompletedNormally(f, v1);
314 +        f.obtrudeException(ex = new CFException());
315 +        checkCompletedExceptionally(f, ex);
316          f.completeExceptionally(new CFException());
317 <        f.obtrudeValue(four);
318 <        checkCompletedNormally(f, four);
319 <        f.obtrudeException(new CFException());
320 <        checkCompletedWithWrappedCFException(f);
279 <    }
317 >        checkCompletedExceptionally(f, ex);
318 >        assertFalse(f.complete(v1));
319 >        checkCompletedExceptionally(f, ex);
320 >    }}
321  
322      /**
323       * getNumberOfDependents returns number of dependent tasks
324       */
325      public void testGetNumberOfDependents() {
326 +        for (ExecutionMode m : ExecutionMode.values())
327 +        for (Integer v1 : new Integer[] { 1, null })
328 +    {
329          CompletableFuture<Integer> f = new CompletableFuture<>();
330          assertEquals(0, f.getNumberOfDependents());
331 <        CompletableFuture g = f.thenRun(new Noop());
331 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
332          assertEquals(1, f.getNumberOfDependents());
333          assertEquals(0, g.getNumberOfDependents());
334 <        CompletableFuture h = f.thenRun(new Noop());
334 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
335          assertEquals(2, f.getNumberOfDependents());
336 <        f.complete(1);
336 >        assertEquals(0, h.getNumberOfDependents());
337 >        assertTrue(f.complete(v1));
338          checkCompletedNormally(g, null);
339 +        checkCompletedNormally(h, null);
340          assertEquals(0, f.getNumberOfDependents());
341          assertEquals(0, g.getNumberOfDependents());
342 <    }
342 >        assertEquals(0, h.getNumberOfDependents());
343 >    }}
344  
345      /**
346       * toString indicates current completion state
# Line 304 | Line 351 | public class CompletableFutureTest exten
351          f = new CompletableFuture<String>();
352          assertTrue(f.toString().contains("[Not completed]"));
353  
354 <        f.complete("foo");
354 >        assertTrue(f.complete("foo"));
355          assertTrue(f.toString().contains("[Completed normally]"));
356  
357          f = new CompletableFuture<String>();
358 <        f.completeExceptionally(new IndexOutOfBoundsException());
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359          assertTrue(f.toString().contains("[Completed exceptionally]"));
360 +
361 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
362 +            f = new CompletableFuture<String>();
363 +            assertTrue(f.cancel(mayInterruptIfRunning));
364 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
365 +        }
366      }
367  
368      /**
# Line 320 | Line 373 | public class CompletableFutureTest exten
373          checkCompletedNormally(f, "test");
374      }
375  
376 <    // Choose non-commutative actions for better coverage
376 >    abstract class CheckedAction {
377 >        int invocationCount = 0;
378 >        final ExecutionMode m;
379 >        CheckedAction(ExecutionMode m) { this.m = m; }
380 >        void invoked() {
381 >            m.checkExecutionMode();
382 >            assertEquals(0, invocationCount++);
383 >        }
384 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
385 >        void assertInvoked() { assertEquals(1, invocationCount); }
386 >    }
387  
388 <    // A non-commutative function that handles and produces null values as well.
389 <    static Integer subtract(Integer x, Integer y) {
390 <        return (x == null && y == null) ? null :
391 <            ((x == null) ? 42 : x.intValue())
392 <            - ((y == null) ? 99 : y.intValue());
388 >    abstract class CheckedIntegerAction extends CheckedAction {
389 >        Integer value;
390 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
391 >        void assertValue(Integer expected) {
392 >            assertInvoked();
393 >            assertEquals(expected, value);
394 >        }
395 >    }
396 >
397 >    class IntegerSupplier extends CheckedAction
398 >        implements Supplier<Integer>
399 >    {
400 >        final Integer value;
401 >        IntegerSupplier(ExecutionMode m, Integer value) {
402 >            super(m);
403 >            this.value = value;
404 >        }
405 >        public Integer get() {
406 >            invoked();
407 >            return value;
408 >        }
409      }
410  
411      // A function that handles and produces null values as well.
# Line 334 | Line 413 | public class CompletableFutureTest exten
413          return (x == null) ? null : x + 1;
414      }
415  
416 <    static final Supplier<Integer> supplyOne =
417 <        () -> Integer.valueOf(1);
418 <    static final Function<Integer, Integer> inc =
419 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
341 <    static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> subtract(x, y);
343 <    static final class IncAction implements Consumer<Integer> {
344 <        int invocationCount = 0;
345 <        Integer value;
416 >    class NoopConsumer extends CheckedIntegerAction
417 >        implements Consumer<Integer>
418 >    {
419 >        NoopConsumer(ExecutionMode m) { super(m); }
420          public void accept(Integer x) {
421 <            invocationCount++;
422 <            value = inc(x);
421 >            invoked();
422 >            value = x;
423          }
424      }
425 <    static final class IncFunction implements Function<Integer,Integer> {
426 <        int invocationCount = 0;
427 <        Integer value;
425 >
426 >    class IncFunction extends CheckedIntegerAction
427 >        implements Function<Integer,Integer>
428 >    {
429 >        IncFunction(ExecutionMode m) { super(m); }
430          public Integer apply(Integer x) {
431 <            invocationCount++;
431 >            invoked();
432              return value = inc(x);
433          }
434      }
435 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
436 <        int invocationCount = 0;
437 <        Integer value;
438 <        // Check this action was invoked exactly once when result is computed.
435 >
436 >    // Choose non-commutative actions for better coverage
437 >    // A non-commutative function that handles and produces null values as well.
438 >    static Integer subtract(Integer x, Integer y) {
439 >        return (x == null && y == null) ? null :
440 >            ((x == null) ? 42 : x.intValue())
441 >            - ((y == null) ? 99 : y.intValue());
442 >    }
443 >
444 >    class SubtractAction extends CheckedIntegerAction
445 >        implements BiConsumer<Integer, Integer>
446 >    {
447 >        SubtractAction(ExecutionMode m) { super(m); }
448          public void accept(Integer x, Integer y) {
449 <            invocationCount++;
449 >            invoked();
450              value = subtract(x, y);
451          }
452      }
453 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
454 <        int invocationCount = 0;
455 <        Integer value;
456 <        // Check this action was invoked exactly once when result is computed.
453 >
454 >    class SubtractFunction extends CheckedIntegerAction
455 >        implements BiFunction<Integer, Integer, Integer>
456 >    {
457 >        SubtractFunction(ExecutionMode m) { super(m); }
458          public Integer apply(Integer x, Integer y) {
459 <            invocationCount++;
459 >            invoked();
460              return value = subtract(x, y);
461          }
462      }
463 <    static final class Noop implements Runnable {
464 <        int invocationCount = 0;
463 >
464 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466          public void run() {
467 <            invocationCount++;
467 >            invoked();
468          }
469      }
470  
471 <    static final class FailingSupplier implements Supplier<Integer> {
472 <        int invocationCount = 0;
471 >    class FailingSupplier extends CheckedAction
472 >        implements Supplier<Integer>
473 >    {
474 >        FailingSupplier(ExecutionMode m) { super(m); }
475          public Integer get() {
476 <            invocationCount++;
476 >            invoked();
477              throw new CFException();
478          }
479      }
480 <    static final class FailingConsumer implements Consumer<Integer> {
481 <        int invocationCount = 0;
480 >
481 >    class FailingConsumer extends CheckedIntegerAction
482 >        implements Consumer<Integer>
483 >    {
484 >        FailingConsumer(ExecutionMode m) { super(m); }
485          public void accept(Integer x) {
486 <            invocationCount++;
486 >            invoked();
487 >            value = x;
488              throw new CFException();
489          }
490      }
491 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
492 <        int invocationCount = 0;
491 >
492 >    class FailingBiConsumer extends CheckedIntegerAction
493 >        implements BiConsumer<Integer, Integer>
494 >    {
495 >        FailingBiConsumer(ExecutionMode m) { super(m); }
496          public void accept(Integer x, Integer y) {
497 <            invocationCount++;
497 >            invoked();
498 >            value = subtract(x, y);
499              throw new CFException();
500          }
501      }
502 <    static final class FailingFunction implements Function<Integer, Integer> {
503 <        int invocationCount = 0;
502 >
503 >    class FailingFunction extends CheckedIntegerAction
504 >        implements Function<Integer, Integer>
505 >    {
506 >        FailingFunction(ExecutionMode m) { super(m); }
507          public Integer apply(Integer x) {
508 <            invocationCount++;
508 >            invoked();
509 >            value = x;
510              throw new CFException();
511          }
512      }
513 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
514 <        int invocationCount = 0;
513 >
514 >    class FailingBiFunction extends CheckedIntegerAction
515 >        implements BiFunction<Integer, Integer, Integer>
516 >    {
517 >        FailingBiFunction(ExecutionMode m) { super(m); }
518          public Integer apply(Integer x, Integer y) {
519 <            invocationCount++;
519 >            invoked();
520 >            value = subtract(x, y);
521              throw new CFException();
522          }
523      }
524 <    static final class FailingRunnable implements Runnable {
525 <        int invocationCount = 0;
524 >
525 >    class FailingRunnable extends CheckedAction implements Runnable {
526 >        FailingRunnable(ExecutionMode m) { super(m); }
527          public void run() {
528 <            invocationCount++;
528 >            invoked();
529              throw new CFException();
530          }
531      }
532  
533 <    static final class CompletableFutureInc
534 <        implements Function<Integer, CompletableFuture<Integer>> {
535 <        int invocationCount = 0;
533 >
534 >    class CompletableFutureInc extends CheckedIntegerAction
535 >        implements Function<Integer, CompletableFuture<Integer>>
536 >    {
537 >        CompletableFutureInc(ExecutionMode m) { super(m); }
538          public CompletableFuture<Integer> apply(Integer x) {
539 <            invocationCount++;
539 >            invoked();
540 >            value = x;
541              CompletableFuture<Integer> f = new CompletableFuture<>();
542 <            f.complete(inc(x));
542 >            assertTrue(f.complete(inc(x)));
543              return f;
544          }
545      }
546  
547 <    static final class FailingCompletableFutureFunction
548 <        implements Function<Integer, CompletableFuture<Integer>> {
549 <        int invocationCount = 0;
547 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
548 >        implements Function<Integer, CompletableFuture<Integer>>
549 >    {
550 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
551          public CompletableFuture<Integer> apply(Integer x) {
552 <            invocationCount++;
552 >            invoked();
553 >            value = x;
554              throw new CFException();
555          }
556      }
557  
558      // Used for explicit executor tests
559      static final class ThreadExecutor implements Executor {
560 <        AtomicInteger count = new AtomicInteger(0);
560 >        final AtomicInteger count = new AtomicInteger(0);
561 >        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
562 >        static boolean startedCurrentThread() {
563 >            return Thread.currentThread().getThreadGroup() == tg;
564 >        }
565  
566          public void execute(Runnable r) {
567              count.getAndIncrement();
568 <            new Thread(r).start();
568 >            new Thread(tg, r).start();
569          }
570      }
571  
572      /**
573       * Permits the testing of parallel code for the 3 different
574 <     * execution modes without repeating all the testing code.
574 >     * execution modes without copy/pasting all the test methods.
575       */
576      enum ExecutionMode {
577          DEFAULT {
578              public void checkExecutionMode() {
579 +                assertFalse(ThreadExecutor.startedCurrentThread());
580                  assertNull(ForkJoinTask.getPool());
581              }
582 +            public CompletableFuture<Void> runAsync(Runnable a) {
583 +                throw new UnsupportedOperationException();
584 +            }
585 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
586 +                throw new UnsupportedOperationException();
587 +            }
588              public <T> CompletableFuture<Void> thenRun
589                  (CompletableFuture<T> f, Runnable a) {
590                  return f.thenRun(a);
# Line 531 | Line 653 | public class CompletableFutureTest exten
653                  assertSame(ForkJoinPool.commonPool(),
654                             ForkJoinTask.getPool());
655              }
656 +            public CompletableFuture<Void> runAsync(Runnable a) {
657 +                return CompletableFuture.runAsync(a);
658 +            }
659 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
660 +                return CompletableFuture.supplyAsync(a);
661 +            }
662              public <T> CompletableFuture<Void> thenRun
663                  (CompletableFuture<T> f, Runnable a) {
664                  return f.thenRunAsync(a);
# Line 596 | Line 724 | public class CompletableFutureTest exten
724  
725          EXECUTOR {
726              public void checkExecutionMode() {
727 <                //TODO
727 >                assertTrue(ThreadExecutor.startedCurrentThread());
728 >            }
729 >            public CompletableFuture<Void> runAsync(Runnable a) {
730 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
731 >            }
732 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
733 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
734              }
735              public <T> CompletableFuture<Void> thenRun
736                  (CompletableFuture<T> f, Runnable a) {
# Line 662 | Line 796 | public class CompletableFutureTest exten
796          };
797  
798          public abstract void checkExecutionMode();
799 +        public abstract CompletableFuture<Void> runAsync(Runnable a);
800 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
801          public abstract <T> CompletableFuture<Void> thenRun
802              (CompletableFuture<T> f, Runnable a);
803          public abstract <T> CompletableFuture<Void> thenAccept
# Line 711 | Line 847 | public class CompletableFutureTest exten
847      {
848          final AtomicInteger a = new AtomicInteger(0);
849          final CompletableFuture<Integer> f = new CompletableFuture<>();
850 <        if (!createIncomplete) f.complete(v1);
850 >        if (!createIncomplete) assertTrue(f.complete(v1));
851          final CompletableFuture<Integer> g = f.exceptionally
852              ((Throwable t) -> {
853                  // Should not be called
854                  a.getAndIncrement();
855                  throw new AssertionError();
856              });
857 <        if (createIncomplete) f.complete(v1);
857 >        if (createIncomplete) assertTrue(f.complete(v1));
858  
859          checkCompletedNormally(g, v1);
860          checkCompletedNormally(f, v1);
861          assertEquals(0, a.get());
862      }}
863  
728
864      /**
865       * exceptionally action completes with function value on source
866       * exception
# Line 740 | Line 875 | public class CompletableFutureTest exten
875          if (!createIncomplete) f.completeExceptionally(ex);
876          final CompletableFuture<Integer> g = f.exceptionally
877              ((Throwable t) -> {
878 +                ExecutionMode.DEFAULT.checkExecutionMode();
879                  threadAssertSame(t, ex);
880                  a.getAndIncrement();
881                  return v1;
# Line 761 | Line 897 | public class CompletableFutureTest exten
897          if (!createIncomplete) f.completeExceptionally(ex1);
898          final CompletableFuture<Integer> g = f.exceptionally
899              ((Throwable t) -> {
900 +                ExecutionMode.DEFAULT.checkExecutionMode();
901 +                threadAssertSame(t, ex1);
902 +                a.getAndIncrement();
903 +                throw ex2;
904 +            });
905 +        if (createIncomplete) f.completeExceptionally(ex1);
906 +
907 +        checkCompletedWithWrappedException(g, ex2);
908 +        assertEquals(1, a.get());
909 +    }}
910 +
911 +    /**
912 +     * whenComplete action executes on normal completion, propagating
913 +     * source result.
914 +     */
915 +    public void testWhenComplete_normalCompletion1() {
916 +        for (ExecutionMode m : ExecutionMode.values())
917 +        for (boolean createIncomplete : new boolean[] { true, false })
918 +        for (Integer v1 : new Integer[] { 1, null })
919 +    {
920 +        final AtomicInteger a = new AtomicInteger(0);
921 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
922 +        if (!createIncomplete) assertTrue(f.complete(v1));
923 +        final CompletableFuture<Integer> g = m.whenComplete
924 +            (f,
925 +             (Integer x, Throwable t) -> {
926 +                m.checkExecutionMode();
927 +                threadAssertSame(x, v1);
928 +                threadAssertNull(t);
929 +                a.getAndIncrement();
930 +            });
931 +        if (createIncomplete) assertTrue(f.complete(v1));
932 +
933 +        checkCompletedNormally(g, v1);
934 +        checkCompletedNormally(f, v1);
935 +        assertEquals(1, a.get());
936 +    }}
937 +
938 +    /**
939 +     * whenComplete action executes on exceptional completion, propagating
940 +     * source result.
941 +     */
942 +    public void testWhenComplete_exceptionalCompletion() {
943 +        for (ExecutionMode m : ExecutionMode.values())
944 +        for (boolean createIncomplete : new boolean[] { true, false })
945 +        for (Integer v1 : new Integer[] { 1, null })
946 +    {
947 +        final AtomicInteger a = new AtomicInteger(0);
948 +        final CFException ex = new CFException();
949 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
950 +        if (!createIncomplete) f.completeExceptionally(ex);
951 +        final CompletableFuture<Integer> g = m.whenComplete
952 +            (f,
953 +             (Integer x, Throwable t) -> {
954 +                m.checkExecutionMode();
955 +                threadAssertNull(x);
956 +                threadAssertSame(t, ex);
957 +                a.getAndIncrement();
958 +            });
959 +        if (createIncomplete) f.completeExceptionally(ex);
960 +
961 +        checkCompletedWithWrappedException(g, ex);
962 +        checkCompletedExceptionally(f, ex);
963 +        assertEquals(1, a.get());
964 +    }}
965 +
966 +    /**
967 +     * whenComplete action executes on cancelled source, propagating
968 +     * CancellationException.
969 +     */
970 +    public void testWhenComplete_sourceCancelled() {
971 +        for (ExecutionMode m : ExecutionMode.values())
972 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
973 +        for (boolean createIncomplete : new boolean[] { true, false })
974 +    {
975 +        final AtomicInteger a = new AtomicInteger(0);
976 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 +        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978 +        final CompletableFuture<Integer> g = m.whenComplete
979 +            (f,
980 +             (Integer x, Throwable t) -> {
981 +                m.checkExecutionMode();
982 +                threadAssertNull(x);
983 +                threadAssertTrue(t instanceof CancellationException);
984 +                a.getAndIncrement();
985 +            });
986 +        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987 +
988 +        checkCompletedWithWrappedCancellationException(g);
989 +        checkCancelled(f);
990 +        assertEquals(1, a.get());
991 +    }}
992 +
993 +    /**
994 +     * If a whenComplete action throws an exception when triggered by
995 +     * a normal completion, it completes exceptionally
996 +     */
997 +    public void testWhenComplete_actionFailed() {
998 +        for (boolean createIncomplete : new boolean[] { true, false })
999 +        for (ExecutionMode m : ExecutionMode.values())
1000 +        for (Integer v1 : new Integer[] { 1, null })
1001 +    {
1002 +        final AtomicInteger a = new AtomicInteger(0);
1003 +        final CFException ex = new CFException();
1004 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1005 +        if (!createIncomplete) assertTrue(f.complete(v1));
1006 +        final CompletableFuture<Integer> g = m.whenComplete
1007 +            (f,
1008 +             (Integer x, Throwable t) -> {
1009 +                m.checkExecutionMode();
1010 +                threadAssertSame(x, v1);
1011 +                threadAssertNull(t);
1012 +                a.getAndIncrement();
1013 +                throw ex;
1014 +            });
1015 +        if (createIncomplete) assertTrue(f.complete(v1));
1016 +
1017 +        checkCompletedWithWrappedException(g, ex);
1018 +        checkCompletedNormally(f, v1);
1019 +        assertEquals(1, a.get());
1020 +    }}
1021 +
1022 +    /**
1023 +     * If a whenComplete action throws an exception when triggered by
1024 +     * a source completion that also throws an exception, the source
1025 +     * exception takes precedence.
1026 +     */
1027 +    public void testWhenComplete_actionFailedSourceFailed() {
1028 +        for (boolean createIncomplete : new boolean[] { true, false })
1029 +        for (ExecutionMode m : ExecutionMode.values())
1030 +        for (Integer v1 : new Integer[] { 1, null })
1031 +    {
1032 +        final AtomicInteger a = new AtomicInteger(0);
1033 +        final CFException ex1 = new CFException();
1034 +        final CFException ex2 = new CFException();
1035 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 +
1037 +        if (!createIncomplete) f.completeExceptionally(ex1);
1038 +        final CompletableFuture<Integer> g = m.whenComplete
1039 +            (f,
1040 +             (Integer x, Throwable t) -> {
1041 +                m.checkExecutionMode();
1042                  threadAssertSame(t, ex1);
1043 +                threadAssertNull(x);
1044                  a.getAndIncrement();
1045                  throw ex2;
1046              });
1047          if (createIncomplete) f.completeExceptionally(ex1);
1048  
1049 <        checkCompletedWithWrappedCFException(g, ex2);
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051          assertEquals(1, a.get());
1052      }}
1053  
# Line 782 | Line 1062 | public class CompletableFutureTest exten
1062      {
1063          final CompletableFuture<Integer> f = new CompletableFuture<>();
1064          final AtomicInteger a = new AtomicInteger(0);
1065 <        if (!createIncomplete) f.complete(v1);
1065 >        if (!createIncomplete) assertTrue(f.complete(v1));
1066          final CompletableFuture<Integer> g = m.handle
1067              (f,
1068               (Integer x, Throwable t) -> {
1069 +                m.checkExecutionMode();
1070                  threadAssertSame(x, v1);
1071                  threadAssertNull(t);
1072                  a.getAndIncrement();
1073                  return inc(v1);
1074              });
1075 <        if (createIncomplete) f.complete(v1);
1075 >        if (createIncomplete) assertTrue(f.complete(v1));
1076  
1077          checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
# Line 814 | Line 1095 | public class CompletableFutureTest exten
1095          final CompletableFuture<Integer> g = m.handle
1096              (f,
1097               (Integer x, Throwable t) -> {
1098 +                m.checkExecutionMode();
1099                  threadAssertNull(x);
1100                  threadAssertSame(t, ex);
1101                  a.getAndIncrement();
# Line 822 | Line 1104 | public class CompletableFutureTest exten
1104          if (createIncomplete) f.completeExceptionally(ex);
1105  
1106          checkCompletedNormally(g, v1);
1107 <        checkCompletedWithWrappedCFException(f, ex);
1107 >        checkCompletedExceptionally(f, ex);
1108          assertEquals(1, a.get());
1109      }}
1110  
# Line 842 | Line 1124 | public class CompletableFutureTest exten
1124          final CompletableFuture<Integer> g = m.handle
1125              (f,
1126               (Integer x, Throwable t) -> {
1127 +                m.checkExecutionMode();
1128                  threadAssertNull(x);
1129                  threadAssertTrue(t instanceof CancellationException);
1130                  a.getAndIncrement();
# Line 869 | Line 1152 | public class CompletableFutureTest exten
1152          final CompletableFuture<Integer> g = m.handle
1153              (f,
1154               (Integer x, Throwable t) -> {
1155 +                m.checkExecutionMode();
1156                  threadAssertNull(x);
1157                  threadAssertSame(ex1, t);
1158                  a.getAndIncrement();
# Line 876 | Line 1160 | public class CompletableFutureTest exten
1160              });
1161          if (createIncomplete) f.completeExceptionally(ex1);
1162  
1163 <        checkCompletedWithWrappedCFException(g, ex2);
1164 <        checkCompletedWithWrappedCFException(f, ex1);
1163 >        checkCompletedWithWrappedException(g, ex2);
1164 >        checkCompletedExceptionally(f, ex1);
1165          assertEquals(1, a.get());
1166      }}
1167  
# Line 889 | Line 1173 | public class CompletableFutureTest exten
1173          final CompletableFuture<Integer> f = new CompletableFuture<>();
1174          final AtomicInteger a = new AtomicInteger(0);
1175          final CFException ex = new CFException();
1176 <        if (!createIncomplete) f.complete(v1);
1176 >        if (!createIncomplete) assertTrue(f.complete(v1));
1177          final CompletableFuture<Integer> g = m.handle
1178              (f,
1179               (Integer x, Throwable t) -> {
1180 +                m.checkExecutionMode();
1181                  threadAssertSame(x, v1);
1182                  threadAssertNull(t);
1183                  a.getAndIncrement();
1184                  throw ex;
1185              });
1186 <        if (createIncomplete) f.complete(v1);
1186 >        if (createIncomplete) assertTrue(f.complete(v1));
1187  
1188 <        checkCompletedWithWrappedCFException(g, ex);
1188 >        checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
1190          assertEquals(1, a.get());
1191      }}
# Line 908 | Line 1193 | public class CompletableFutureTest exten
1193      /**
1194       * runAsync completes after running Runnable
1195       */
1196 <    public void testRunAsync() {
1197 <        Noop r = new Noop();
1198 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1199 <        assertNull(f.join());
1200 <        assertEquals(1, r.invocationCount);
1201 <        checkCompletedNormally(f, null);
1202 <    }
1203 <
1204 <    /**
920 <     * runAsync with executor completes after running Runnable
921 <     */
922 <    public void testRunAsync2() {
923 <        Noop r = new Noop();
924 <        ThreadExecutor exec = new ThreadExecutor();
925 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1196 >    public void testRunAsync_normalCompletion() {
1197 >        ExecutionMode[] executionModes = {
1198 >            ExecutionMode.ASYNC,
1199 >            ExecutionMode.EXECUTOR,
1200 >        };
1201 >        for (ExecutionMode m : executionModes)
1202 >    {
1203 >        final Noop r = new Noop(m);
1204 >        final CompletableFuture<Void> f = m.runAsync(r);
1205          assertNull(f.join());
927        assertEquals(1, r.invocationCount);
1206          checkCompletedNormally(f, null);
1207 <        assertEquals(1, exec.count.get());
1208 <    }
1207 >        r.assertInvoked();
1208 >    }}
1209  
1210      /**
1211       * failing runAsync completes exceptionally after running Runnable
1212       */
1213 <    public void testRunAsync3() {
1214 <        FailingRunnable r = new FailingRunnable();
1215 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1213 >    public void testRunAsync_exceptionalCompletion() {
1214 >        ExecutionMode[] executionModes = {
1215 >            ExecutionMode.ASYNC,
1216 >            ExecutionMode.EXECUTOR,
1217 >        };
1218 >        for (ExecutionMode m : executionModes)
1219 >    {
1220 >        final FailingRunnable r = new FailingRunnable(m);
1221 >        final CompletableFuture<Void> f = m.runAsync(r);
1222          checkCompletedWithWrappedCFException(f);
1223 <        assertEquals(1, r.invocationCount);
1224 <    }
1223 >        r.assertInvoked();
1224 >    }}
1225  
1226      /**
1227       * supplyAsync completes with result of supplier
1228       */
1229 <    public void testSupplyAsync() {
1230 <        CompletableFuture<Integer> f;
1231 <        f = CompletableFuture.supplyAsync(supplyOne);
1232 <        assertEquals(f.join(), one);
1233 <        checkCompletedNormally(f, one);
1234 <    }
1235 <
1236 <    /**
1237 <     * supplyAsync with executor completes with result of supplier
1238 <     */
1239 <    public void testSupplyAsync2() {
1240 <        CompletableFuture<Integer> f;
1241 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1242 <        assertEquals(f.join(), one);
959 <        checkCompletedNormally(f, one);
960 <    }
1229 >    public void testSupplyAsync_normalCompletion() {
1230 >        ExecutionMode[] executionModes = {
1231 >            ExecutionMode.ASYNC,
1232 >            ExecutionMode.EXECUTOR,
1233 >        };
1234 >        for (ExecutionMode m : executionModes)
1235 >        for (Integer v1 : new Integer[] { 1, null })
1236 >    {
1237 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1238 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1239 >        assertSame(v1, f.join());
1240 >        checkCompletedNormally(f, v1);
1241 >        r.assertInvoked();
1242 >    }}
1243  
1244      /**
1245       * Failing supplyAsync completes exceptionally
1246       */
1247 <    public void testSupplyAsync3() {
1248 <        FailingSupplier r = new FailingSupplier();
1249 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1247 >    public void testSupplyAsync_exceptionalCompletion() {
1248 >        ExecutionMode[] executionModes = {
1249 >            ExecutionMode.ASYNC,
1250 >            ExecutionMode.EXECUTOR,
1251 >        };
1252 >        for (ExecutionMode m : executionModes)
1253 >    {
1254 >        FailingSupplier r = new FailingSupplier(m);
1255 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1256          checkCompletedWithWrappedCFException(f);
1257 <        assertEquals(1, r.invocationCount);
1258 <    }
1257 >        r.assertInvoked();
1258 >    }}
1259  
1260      // seq completion methods
1261  
# Line 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);
1520 >        }
1521  
1522 <        checkCompletedNormally(h, subtract(v1, v2));
1522 >        checkCompletedWithWrappedCFException(g);
1523          checkCompletedNormally(f, v1);
1240        checkCompletedNormally(g, v2);
1241        assertEquals(1, r.invocationCount);
1524      }}
1525  
1526      /**
1527 <     * thenCombine result completes exceptionally after exceptional
1528 <     * 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);
1300 <
1301 <        checkCompletedWithWrappedCFException(h, ex);
1302 <        checkCompletedWithWrappedCFException(g, ex);
1303 <        assertEquals(0, r.invocationCount);
1304 <        checkCompletedNormally(f, v1);
1305 <    }}
1306 <
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 <
1326 <    /**
1327 <     * 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          checkCompletedNormally(f, v1);
1684          checkCompletedNormally(g, v2);
1685      }}
1686  
1687 <    public void testThenAcceptBoth_normalCompletion4() {
1687 >    /**
1688 >     * thenAcceptBoth result completes normally after normal
1689 >     * completion of sources
1690 >     */
1691 >    public void testThenAcceptBoth_normalCompletion() {
1692          for (ExecutionMode m : ExecutionMode.values())
1693 +        for (boolean createIncomplete : new boolean[] { true, false })
1694 +        for (boolean fFirst : new boolean[] { true, false })
1695          for (Integer v1 : new Integer[] { 1, null })
1696          for (Integer v2 : new Integer[] { 2, null })
1697      {
1698          final CompletableFuture<Integer> f = new CompletableFuture<>();
1699          final CompletableFuture<Integer> g = new CompletableFuture<>();
1700 <        final SubtractAction r = new SubtractAction();
1700 >        final SubtractAction r = new SubtractAction(m);
1701  
1702 <        f.complete(v1);
1703 <        g.complete(v2);
1702 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1703 >        if (!createIncomplete)
1704 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1705          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1706 +        if (createIncomplete) {
1707 +            checkIncomplete(h);
1708 +            r.assertNotInvoked();
1709 +            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1710 +        }
1711  
1712          checkCompletedNormally(h, null);
1713 <        assertEquals(subtract(v1, v2), r.value);
1713 >        r.assertValue(subtract(v1, v2));
1714          checkCompletedNormally(f, v1);
1715          checkCompletedNormally(g, v2);
1716      }}
# Line 1533 | Line 1719 | public class CompletableFutureTest exten
1719       * thenAcceptBoth result completes exceptionally after exceptional
1720       * completion of either source
1721       */
1722 <    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() {
1722 >    public void testThenAcceptBoth_exceptionalCompletion() {
1723          for (ExecutionMode m : ExecutionMode.values())
1724 +        for (boolean createIncomplete : new boolean[] { true, false })
1725 +        for (boolean fFirst : new boolean[] { true, false })
1726          for (Integer v1 : new Integer[] { 1, null })
1727      {
1728          final CompletableFuture<Integer> f = new CompletableFuture<>();
1729          final CompletableFuture<Integer> g = new CompletableFuture<>();
1582        final SubtractAction r = new SubtractAction();
1730          final CFException ex = new CFException();
1731 +        final SubtractAction r = new SubtractAction(m);
1732  
1733 <        g.completeExceptionally(ex);
1734 <        f.complete(v1);
1733 >        assertTrue((fFirst ? f : g).complete(v1));
1734 >        if (!createIncomplete)
1735 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1736          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1737 +        if (createIncomplete) {
1738 +            checkIncomplete(h);
1739 +            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1740 +        }
1741  
1742 <        checkCompletedWithWrappedCFException(h, ex);
1743 <        checkCompletedWithWrappedCFException(g, ex);
1744 <        assertEquals(0, r.invocationCount);
1745 <        checkCompletedNormally(f, v1);
1742 >        checkCompletedWithWrappedException(h, ex);
1743 >        r.assertNotInvoked();
1744 >        checkCompletedNormally(fFirst ? f : g, v1);
1745 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1746      }}
1747  
1748 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1748 >    /**
1749 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1750 >     */
1751 >    public void testThenAcceptBoth_sourceCancelled() {
1752          for (ExecutionMode m : ExecutionMode.values())
1753 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1754 +        for (boolean createIncomplete : new boolean[] { true, false })
1755 +        for (boolean fFirst : new boolean[] { true, false })
1756          for (Integer v1 : new Integer[] { 1, null })
1757      {
1758          final CompletableFuture<Integer> f = new CompletableFuture<>();
1759          final CompletableFuture<Integer> g = new CompletableFuture<>();
1760 <        final SubtractAction r = new SubtractAction();
1602 <        final CFException ex = new CFException();
1760 >        final SubtractAction r = new SubtractAction(m);
1761  
1762 <        f.completeExceptionally(ex);
1763 <        g.complete(v1);
1762 >        assertTrue((fFirst ? f : g).complete(v1));
1763 >        if (!createIncomplete)
1764 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1765          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1766 +        if (createIncomplete) {
1767 +            checkIncomplete(h);
1768 +            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1769 +        }
1770  
1771 <        checkCompletedWithWrappedCFException(h, ex);
1772 <        checkCompletedWithWrappedCFException(f, ex);
1773 <        assertEquals(0, r.invocationCount);
1774 <        checkCompletedNormally(g, v1);
1771 >        checkCompletedWithWrappedCancellationException(h);
1772 >        checkCancelled(!fFirst ? f : g);
1773 >        r.assertNotInvoked();
1774 >        checkCompletedNormally(fFirst ? f : g, v1);
1775      }}
1776  
1777      /**
1778       * thenAcceptBoth result completes exceptionally if action does
1779       */
1780 <    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() {
1780 >    public void testThenAcceptBoth_actionFailed() {
1781          for (ExecutionMode m : ExecutionMode.values())
1782 +        for (boolean fFirst : new boolean[] { true, false })
1783          for (Integer v1 : new Integer[] { 1, null })
1784          for (Integer v2 : new Integer[] { 2, null })
1785      {
1786          final CompletableFuture<Integer> f = new CompletableFuture<>();
1787          final CompletableFuture<Integer> g = new CompletableFuture<>();
1788 <        final FailingBiConsumer r = new FailingBiConsumer();
1788 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1789          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1790  
1791 <        g.complete(v2);
1792 <        checkIncomplete(h);
1648 <        f.complete(v1);
1791 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1792 >        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1793  
1794          checkCompletedWithWrappedCFException(h);
1795          checkCompletedNormally(f, v1);
# Line 1653 | Line 1797 | public class CompletableFutureTest exten
1797      }}
1798  
1799      /**
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    /**
1800       * runAfterBoth result completes normally after normal
1801       * completion of sources
1802       */
1803 <    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() {
1803 >    public void testRunAfterBoth_normalCompletion() {
1804          for (ExecutionMode m : ExecutionMode.values())
1805 +        for (boolean createIncomplete : new boolean[] { true, false })
1806 +        for (boolean fFirst : new boolean[] { true, false })
1807          for (Integer v1 : new Integer[] { 1, null })
1808          for (Integer v2 : new Integer[] { 2, null })
1809      {
1810          final CompletableFuture<Integer> f = new CompletableFuture<>();
1811          final CompletableFuture<Integer> g = new CompletableFuture<>();
1812 <        final Noop r = new Noop();
1812 >        final Noop r = new Noop(m);
1813  
1814 <        f.complete(v1);
1815 <        g.complete(v2);
1814 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1815 >        if (!createIncomplete)
1816 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1817          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1818 +        if (createIncomplete) {
1819 +            checkIncomplete(h);
1820 +            r.assertNotInvoked();
1821 +            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1822 +        }
1823  
1824          checkCompletedNormally(h, null);
1825 <        assertEquals(1, r.invocationCount);
1825 >        r.assertInvoked();
1826          checkCompletedNormally(f, v1);
1827          checkCompletedNormally(g, v2);
1828      }}
# Line 1821 | Line 1831 | public class CompletableFutureTest exten
1831       * runAfterBoth result completes exceptionally after exceptional
1832       * completion of either source
1833       */
1834 <    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() {
1845 <        for (ExecutionMode m : ExecutionMode.values())
1846 <        for (Integer v1 : new Integer[] { 1, null })
1847 <    {
1848 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1849 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1850 <        final Noop r = new Noop();
1851 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1852 <        final CFException ex = new CFException();
1853 <
1854 <        g.completeExceptionally(ex);
1855 <        checkIncomplete(h);
1856 <        f.complete(v1);
1857 <
1858 <        checkCompletedWithWrappedCFException(h, ex);
1859 <        checkCompletedWithWrappedCFException(g, ex);
1860 <        assertEquals(0, r.invocationCount);
1861 <        checkCompletedNormally(f, v1);
1862 <    }}
1863 <
1864 <    public void testRunAfterBoth_exceptionalCompletion3() {
1834 >    public void testRunAfterBoth_exceptionalCompletion() {
1835          for (ExecutionMode m : ExecutionMode.values())
1836 +        for (boolean createIncomplete : new boolean[] { true, false })
1837 +        for (boolean fFirst : new boolean[] { true, false })
1838          for (Integer v1 : new Integer[] { 1, null })
1839      {
1840          final CompletableFuture<Integer> f = new CompletableFuture<>();
1841          final CompletableFuture<Integer> g = new CompletableFuture<>();
1870        final Noop r = new Noop();
1842          final CFException ex = new CFException();
1843 +        final Noop r = new Noop(m);
1844  
1845 <        g.completeExceptionally(ex);
1846 <        f.complete(v1);
1845 >        assertTrue((fFirst ? f : g).complete(v1));
1846 >        if (!createIncomplete)
1847 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1848          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1849 +        if (createIncomplete) {
1850 +            checkIncomplete(h);
1851 +            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1852 +        }
1853  
1854 <        checkCompletedWithWrappedCFException(h, ex);
1855 <        checkCompletedWithWrappedCFException(g, ex);
1856 <        assertEquals(0, r.invocationCount);
1857 <        checkCompletedNormally(f, v1);
1881 <    }}
1882 <
1883 <    public void testRunAfterBoth_exceptionalCompletion4() {
1884 <        for (ExecutionMode m : ExecutionMode.values())
1885 <        for (Integer v1 : new Integer[] { 1, null })
1886 <    {
1887 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1888 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1889 <        final Noop r = new Noop();
1890 <        final CFException ex = new CFException();
1891 <
1892 <        f.completeExceptionally(ex);
1893 <        g.complete(v1);
1894 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1895 <
1896 <        checkCompletedWithWrappedCFException(h, ex);
1897 <        checkCompletedWithWrappedCFException(f, ex);
1898 <        assertEquals(0, r.invocationCount);
1899 <        checkCompletedNormally(g, v1);
1900 <    }}
1901 <
1902 <    /**
1903 <     * runAfterBoth result completes exceptionally if action does
1904 <     */
1905 <    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() {
1925 <        for (ExecutionMode m : ExecutionMode.values())
1926 <        for (Integer v1 : new Integer[] { 1, null })
1927 <        for (Integer v2 : new Integer[] { 2, null })
1928 <    {
1929 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1930 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 <        final FailingRunnable r = new FailingRunnable();
1932 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1933 <
1934 <        g.complete(v2);
1935 <        checkIncomplete(h);
1936 <        f.complete(v1);
1937 <
1938 <        checkCompletedWithWrappedCFException(h);
1939 <        checkCompletedNormally(f, v1);
1940 <        checkCompletedNormally(g, v2);
1854 >        checkCompletedWithWrappedException(h, ex);
1855 >        r.assertNotInvoked();
1856 >        checkCompletedNormally(fFirst ? f : g, v1);
1857 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1858      }}
1859  
1860      /**
1861       * runAfterBoth result completes exceptionally if either source cancelled
1862       */
1863 <    public void testRunAfterBoth_sourceCancelled1() {
1863 >    public void testRunAfterBoth_sourceCancelled() {
1864          for (ExecutionMode m : ExecutionMode.values())
1865          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1866 +        for (boolean createIncomplete : new boolean[] { true, false })
1867 +        for (boolean fFirst : new boolean[] { true, false })
1868          for (Integer v1 : new Integer[] { 1, null })
1869      {
1870          final CompletableFuture<Integer> f = new CompletableFuture<>();
1871          final CompletableFuture<Integer> g = new CompletableFuture<>();
1872 <        final Noop r = new Noop();
1954 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1872 >        final Noop r = new Noop(m);
1873  
1874 <        assertTrue(f.cancel(mayInterruptIfRunning));
1875 <        checkIncomplete(h);
1876 <        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();
1874 >        assertTrue((fFirst ? f : g).complete(v1));
1875 >        if (!createIncomplete)
1876 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1877          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1878 <
1879 <        assertTrue(g.cancel(mayInterruptIfRunning));
1880 <        checkIncomplete(h);
1881 <        f.complete(v1);
1878 >        if (createIncomplete) {
1879 >            checkIncomplete(h);
1880 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1881 >        }
1882  
1883          checkCompletedWithWrappedCancellationException(h);
1884 <        checkCancelled(g);
1885 <        assertEquals(0, r.invocationCount);
1886 <        checkCompletedNormally(f, v1);
1884 >        checkCancelled(!fFirst ? f : g);
1885 >        r.assertNotInvoked();
1886 >        checkCompletedNormally(fFirst ? f : g, v1);
1887      }}
1888  
1889 <    public void testRunAfterBoth_sourceCancelled3() {
1889 >    /**
1890 >     * runAfterBoth result completes exceptionally if action does
1891 >     */
1892 >    public void testRunAfterBoth_actionFailed() {
1893          for (ExecutionMode m : ExecutionMode.values())
1894 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1894 >        for (boolean fFirst : new boolean[] { true, false })
1895          for (Integer v1 : new Integer[] { 1, null })
1896 +        for (Integer v2 : new Integer[] { 2, null })
1897      {
1898          final CompletableFuture<Integer> f = new CompletableFuture<>();
1899          final CompletableFuture<Integer> g = new CompletableFuture<>();
1900 <        final Noop r = new Noop();
1900 >        final FailingRunnable r1 = new FailingRunnable(m);
1901 >        final FailingRunnable r2 = new FailingRunnable(m);
1902  
1903 <        assertTrue(g.cancel(mayInterruptIfRunning));
1904 <        f.complete(v1);
1905 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1903 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1904 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1905 >        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1906 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1907  
1908 <        checkCompletedWithWrappedCancellationException(h);
1909 <        checkCancelled(g);
2001 <        assertEquals(0, r.invocationCount);
1908 >        checkCompletedWithWrappedCFException(h1);
1909 >        checkCompletedWithWrappedCFException(h2);
1910          checkCompletedNormally(f, v1);
1911 <    }}
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);
1911 >        checkCompletedNormally(g, v2);
1912      }}
1913  
1914      /**
1915       * applyToEither result completes normally after normal completion
1916       * of either source
1917       */
1918 <    public void testApplyToEither_normalCompletion1() {
1918 >    public void testApplyToEither_normalCompletion() {
1919          for (ExecutionMode m : ExecutionMode.values())
1920          for (Integer v1 : new Integer[] { 1, null })
1921          for (Integer v2 : new Integer[] { 2, null })
1922      {
1923          final CompletableFuture<Integer> f = new CompletableFuture<>();
1924          final CompletableFuture<Integer> g = new CompletableFuture<>();
1925 <        final IncFunction r = new IncFunction();
1926 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1925 >        final IncFunction[] rs = new IncFunction[6];
1926 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1927  
1928 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1929 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1930 +        checkIncomplete(h0);
1931 +        checkIncomplete(h1);
1932 +        rs[0].assertNotInvoked();
1933 +        rs[1].assertNotInvoked();
1934          f.complete(v1);
1935 <        checkCompletedNormally(h, inc(v1));
1936 <        g.complete(v2);
1937 <
1938 <        checkCompletedNormally(f, v1);
1939 <        checkCompletedNormally(g, v2);
1940 <        checkCompletedNormally(h, inc(v1));
2045 <    }}
2046 <
2047 <    public void testApplyToEither_normalCompletion2() {
2048 <        for (ExecutionMode m : ExecutionMode.values())
2049 <        for (Integer v1 : new Integer[] { 1, null })
2050 <        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 <
1935 >        checkCompletedNormally(h0, inc(v1));
1936 >        checkCompletedNormally(h1, inc(v1));
1937 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1938 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1939 >        checkCompletedNormally(h2, inc(v1));
1940 >        checkCompletedNormally(h3, inc(v1));
1941          g.complete(v2);
2058        checkCompletedNormally(h, inc(v2));
2059        f.complete(v1);
1942  
1943 <        checkCompletedNormally(f, v1);
1944 <        checkCompletedNormally(g, v2);
1945 <        checkCompletedNormally(h, inc(v2));
1946 <        }}
1947 <
1948 <    public void testApplyToEither_normalCompletion3() {
1949 <        for (ExecutionMode m : ExecutionMode.values())
1950 <        for (Integer v1 : new Integer[] { 1, null })
1951 <        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);
1943 >        // unspecified behavior - both source completions available
1944 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1945 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1946 >        rs[4].assertValue(h4.join());
1947 >        rs[5].assertValue(h5.join());
1948 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1949 >                   Objects.equals(inc(v2), h4.join()));
1950 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1951 >                   Objects.equals(inc(v2), h5.join()));
1952  
1953          checkCompletedNormally(f, v1);
1954          checkCompletedNormally(g, v2);
1955 <
1956 <        // unspecified behavior
1957 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1958 <                   Objects.equals(h.join(), inc(v2)));
1959 <        assertEquals(1, r.invocationCount);
1955 >        checkCompletedNormally(h0, inc(v1));
1956 >        checkCompletedNormally(h1, inc(v1));
1957 >        checkCompletedNormally(h2, inc(v1));
1958 >        checkCompletedNormally(h3, inc(v1));
1959 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1960      }}
1961  
1962      /**
1963       * applyToEither result completes exceptionally after exceptional
1964       * completion of either source
1965       */
1966 <    public void testApplyToEither_exceptionalCompletion1() {
1966 >    public void testApplyToEither_exceptionalCompletion() {
1967          for (ExecutionMode m : ExecutionMode.values())
1968          for (Integer v1 : new Integer[] { 1, null })
1969      {
1970          final CompletableFuture<Integer> f = new CompletableFuture<>();
1971          final CompletableFuture<Integer> g = new CompletableFuture<>();
2098        final IncFunction r = new IncFunction();
2099        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1972          final CFException ex = new CFException();
1973 +        final IncFunction[] rs = new IncFunction[6];
1974 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1975  
1976 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1977 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1978 +        checkIncomplete(h0);
1979 +        checkIncomplete(h1);
1980 +        rs[0].assertNotInvoked();
1981 +        rs[1].assertNotInvoked();
1982          f.completeExceptionally(ex);
1983 <        checkCompletedWithWrappedCFException(h, ex);
1983 >        checkCompletedWithWrappedException(h0, ex);
1984 >        checkCompletedWithWrappedException(h1, ex);
1985 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1986 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1987 >        checkCompletedWithWrappedException(h2, ex);
1988 >        checkCompletedWithWrappedException(h3, ex);
1989          g.complete(v1);
1990  
1991 <        assertEquals(0, r.invocationCount);
1991 >        // unspecified behavior - both source completions available
1992 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1993 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1994 >        try {
1995 >            assertEquals(inc(v1), h4.join());
1996 >            rs[4].assertValue(inc(v1));
1997 >        } catch (CompletionException ok) {
1998 >            checkCompletedWithWrappedException(h4, ex);
1999 >            rs[4].assertNotInvoked();
2000 >        }
2001 >        try {
2002 >            assertEquals(inc(v1), h5.join());
2003 >            rs[5].assertValue(inc(v1));
2004 >        } catch (CompletionException ok) {
2005 >            checkCompletedWithWrappedException(h5, ex);
2006 >            rs[5].assertNotInvoked();
2007 >        }
2008 >
2009 >        checkCompletedExceptionally(f, ex);
2010          checkCompletedNormally(g, v1);
2011 <        checkCompletedWithWrappedCFException(f, ex);
2012 <        checkCompletedWithWrappedCFException(h, ex);
2011 >        checkCompletedWithWrappedException(h0, ex);
2012 >        checkCompletedWithWrappedException(h1, ex);
2013 >        checkCompletedWithWrappedException(h2, ex);
2014 >        checkCompletedWithWrappedException(h3, ex);
2015 >        checkCompletedWithWrappedException(h4, ex);
2016 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2017      }}
2018  
2019      public void testApplyToEither_exceptionalCompletion2() {
2020          for (ExecutionMode m : ExecutionMode.values())
2021 +        for (boolean fFirst : new boolean[] { true, false })
2022          for (Integer v1 : new Integer[] { 1, null })
2023      {
2024          final CompletableFuture<Integer> f = new CompletableFuture<>();
2025          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();
2026          final CFException ex = new CFException();
2027 +        final IncFunction[] rs = new IncFunction[6];
2028 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2029  
2030 <        g.completeExceptionally(ex);
2031 <        f.complete(v1);
2032 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2030 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2031 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2032 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2033 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2034 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2035 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2036  
2037 <        // unspecified behavior
2146 <        Integer v;
2037 >        // unspecified behavior - both source completions available
2038          try {
2039 <            assertEquals(inc(v1), h.join());
2040 <            assertEquals(1, r.invocationCount);
2039 >            assertEquals(inc(v1), h0.join());
2040 >            rs[0].assertValue(inc(v1));
2041          } catch (CompletionException ok) {
2042 <            checkCompletedWithWrappedCFException(h, ex);
2043 <            assertEquals(0, r.invocationCount);
2042 >            checkCompletedWithWrappedException(h0, ex);
2043 >            rs[0].assertNotInvoked();
2044          }
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;
2045          try {
2046 <            assertEquals(inc(v1), h.join());
2047 <            assertEquals(1, r.invocationCount);
2046 >            assertEquals(inc(v1), h1.join());
2047 >            rs[1].assertValue(inc(v1));
2048          } catch (CompletionException ok) {
2049 <            checkCompletedWithWrappedCFException(h, ex);
2050 <            assertEquals(0, r.invocationCount);
2049 >            checkCompletedWithWrappedException(h1, ex);
2050 >            rs[1].assertNotInvoked();
2051 >        }
2052 >        try {
2053 >            assertEquals(inc(v1), h2.join());
2054 >            rs[2].assertValue(inc(v1));
2055 >        } catch (CompletionException ok) {
2056 >            checkCompletedWithWrappedException(h2, ex);
2057 >            rs[2].assertNotInvoked();
2058 >        }
2059 >        try {
2060 >            assertEquals(inc(v1), h3.join());
2061 >            rs[3].assertValue(inc(v1));
2062 >        } catch (CompletionException ok) {
2063 >            checkCompletedWithWrappedException(h3, ex);
2064 >            rs[3].assertNotInvoked();
2065          }
2066  
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);
2067          checkCompletedNormally(f, v1);
2068 <        checkCompletedNormally(g, v2);
2068 >        checkCompletedExceptionally(g, ex);
2069      }}
2070  
2071      /**
2072       * applyToEither result completes exceptionally if either source cancelled
2073       */
2074 <    public void testApplyToEither_sourceCancelled1() {
2074 >    public void testApplyToEither_sourceCancelled() {
2075          for (ExecutionMode m : ExecutionMode.values())
2076          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2077          for (Integer v1 : new Integer[] { 1, null })
2078      {
2079          final CompletableFuture<Integer> f = new CompletableFuture<>();
2080          final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 <        final IncFunction r = new IncFunction();
2082 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2081 >        final IncFunction[] rs = new IncFunction[6];
2082 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2083  
2084 <        assertTrue(f.cancel(mayInterruptIfRunning));
2085 <        checkCompletedWithWrappedCancellationException(h);
2084 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2085 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2086 >        checkIncomplete(h0);
2087 >        checkIncomplete(h1);
2088 >        rs[0].assertNotInvoked();
2089 >        rs[1].assertNotInvoked();
2090 >        f.cancel(mayInterruptIfRunning);
2091 >        checkCompletedWithWrappedCancellationException(h0);
2092 >        checkCompletedWithWrappedCancellationException(h1);
2093 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2094 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2095 >        checkCompletedWithWrappedCancellationException(h2);
2096 >        checkCompletedWithWrappedCancellationException(h3);
2097          g.complete(v1);
2098  
2099 +        // unspecified behavior - both source completions available
2100 +        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2101 +        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2102 +        try {
2103 +            assertEquals(inc(v1), h4.join());
2104 +            rs[4].assertValue(inc(v1));
2105 +        } catch (CompletionException ok) {
2106 +            checkCompletedWithWrappedCancellationException(h4);
2107 +            rs[4].assertNotInvoked();
2108 +        }
2109 +        try {
2110 +            assertEquals(inc(v1), h5.join());
2111 +            rs[5].assertValue(inc(v1));
2112 +        } catch (CompletionException ok) {
2113 +            checkCompletedWithWrappedCancellationException(h5);
2114 +            rs[5].assertNotInvoked();
2115 +        }
2116 +
2117          checkCancelled(f);
2241        assertEquals(0, r.invocationCount);
2118          checkCompletedNormally(g, v1);
2119 <        checkCompletedWithWrappedCancellationException(h);
2119 >        checkCompletedWithWrappedCancellationException(h0);
2120 >        checkCompletedWithWrappedCancellationException(h1);
2121 >        checkCompletedWithWrappedCancellationException(h2);
2122 >        checkCompletedWithWrappedCancellationException(h3);
2123 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2124      }}
2125  
2126      public void testApplyToEither_sourceCancelled2() {
2127          for (ExecutionMode m : ExecutionMode.values())
2128          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2129 +        for (boolean fFirst : new boolean[] { true, false })
2130          for (Integer v1 : new Integer[] { 1, null })
2131      {
2132          final CompletableFuture<Integer> f = new CompletableFuture<>();
2133          final CompletableFuture<Integer> g = new CompletableFuture<>();
2134 <        final IncFunction r = new IncFunction();
2135 <        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();
2134 >        final IncFunction[] rs = new IncFunction[6];
2135 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2136  
2137 <        assertTrue(g.cancel(mayInterruptIfRunning));
2138 <        f.complete(v1);
2139 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2137 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2138 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2139 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2140 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2141 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2142 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2143  
2144 <        // unspecified behavior
2280 <        Integer v;
2144 >        // unspecified behavior - both source completions available
2145          try {
2146 <            assertEquals(inc(v1), h.join());
2147 <            assertEquals(1, r.invocationCount);
2146 >            assertEquals(inc(v1), h0.join());
2147 >            rs[0].assertValue(inc(v1));
2148          } catch (CompletionException ok) {
2149 <            checkCompletedWithWrappedCancellationException(h);
2150 <            assertEquals(0, r.invocationCount);
2149 >            checkCompletedWithWrappedCancellationException(h0);
2150 >            rs[0].assertNotInvoked();
2151          }
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;
2152          try {
2153 <            assertEquals(inc(v1), h.join());
2154 <            assertEquals(1, r.invocationCount);
2153 >            assertEquals(inc(v1), h1.join());
2154 >            rs[1].assertValue(inc(v1));
2155          } catch (CompletionException ok) {
2156 <            checkCompletedWithWrappedCancellationException(h);
2157 <            assertEquals(0, r.invocationCount);
2156 >            checkCompletedWithWrappedCancellationException(h1);
2157 >            rs[1].assertNotInvoked();
2158 >        }
2159 >        try {
2160 >            assertEquals(inc(v1), h2.join());
2161 >            rs[2].assertValue(inc(v1));
2162 >        } catch (CompletionException ok) {
2163 >            checkCompletedWithWrappedCancellationException(h2);
2164 >            rs[2].assertNotInvoked();
2165 >        }
2166 >        try {
2167 >            assertEquals(inc(v1), h3.join());
2168 >            rs[3].assertValue(inc(v1));
2169 >        } catch (CompletionException ok) {
2170 >            checkCompletedWithWrappedCancellationException(h3);
2171 >            rs[3].assertNotInvoked();
2172          }
2173  
2174 <        checkCancelled(f);
2175 <        checkCompletedNormally(g, v1);
2174 >        checkCompletedNormally(f, v1);
2175 >        checkCancelled(g);
2176      }}
2177  
2178      /**
2179 <     * acceptEither result completes normally after normal completion
2322 <     * of either source
2179 >     * applyToEither result completes exceptionally if action does
2180       */
2181 <    public void testAcceptEither_normalCompletion1() {
2181 >    public void testApplyToEither_actionFailed() {
2182          for (ExecutionMode m : ExecutionMode.values())
2183          for (Integer v1 : new Integer[] { 1, null })
2184          for (Integer v2 : new Integer[] { 2, null })
2185      {
2186          final CompletableFuture<Integer> f = new CompletableFuture<>();
2187          final CompletableFuture<Integer> g = new CompletableFuture<>();
2188 <        final IncAction r = new IncAction();
2189 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2188 >        final FailingFunction[] rs = new FailingFunction[6];
2189 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2190  
2191 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2192 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2193          f.complete(v1);
2194 <        checkCompletedNormally(h, null);
2195 <        assertEquals(inc(v1), r.value);
2194 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2195 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2196 >        checkCompletedWithWrappedCFException(h0);
2197 >        checkCompletedWithWrappedCFException(h1);
2198 >        checkCompletedWithWrappedCFException(h2);
2199 >        checkCompletedWithWrappedCFException(h3);
2200 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2201 >
2202          g.complete(v2);
2203  
2204 <        checkCompletedNormally(f, v1);
2205 <        checkCompletedNormally(g, v2);
2206 <        checkCompletedNormally(h, null);
2342 <    }}
2204 >        // unspecified behavior - both source completions available
2205 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2206 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2207  
2208 <    public void testAcceptEither_normalCompletion2() {
2209 <        for (ExecutionMode m : ExecutionMode.values())
2210 <        for (Integer v1 : new Integer[] { 1, null })
2211 <        for (Integer v2 : new Integer[] { 2, null })
2212 <    {
2213 <        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);
2353 <
2354 <        g.complete(v2);
2355 <        checkCompletedNormally(h, null);
2356 <        assertEquals(inc(v2), r.value);
2357 <        f.complete(v1);
2208 >        checkCompletedWithWrappedCFException(h4);
2209 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2210 >                   Objects.equals(v2, rs[4].value));
2211 >        checkCompletedWithWrappedCFException(h5);
2212 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2213 >                   Objects.equals(v2, rs[5].value));
2214  
2215          checkCompletedNormally(f, v1);
2216          checkCompletedNormally(g, v2);
2361        checkCompletedNormally(h, null);
2217      }}
2218  
2219 <    public void testAcceptEither_normalCompletion3() {
2219 >    /**
2220 >     * acceptEither result completes normally after normal completion
2221 >     * of either source
2222 >     */
2223 >    public void testAcceptEither_normalCompletion() {
2224          for (ExecutionMode m : ExecutionMode.values())
2225          for (Integer v1 : new Integer[] { 1, null })
2226          for (Integer v2 : new Integer[] { 2, null })
2227      {
2228          final CompletableFuture<Integer> f = new CompletableFuture<>();
2229          final CompletableFuture<Integer> g = new CompletableFuture<>();
2230 <        final IncAction r = new IncAction();
2230 >        final NoopConsumer[] rs = new NoopConsumer[6];
2231 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2232  
2233 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2234 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2235 +        checkIncomplete(h0);
2236 +        checkIncomplete(h1);
2237 +        rs[0].assertNotInvoked();
2238 +        rs[1].assertNotInvoked();
2239          f.complete(v1);
2240 +        checkCompletedNormally(h0, null);
2241 +        checkCompletedNormally(h1, null);
2242 +        rs[0].assertValue(v1);
2243 +        rs[1].assertValue(v1);
2244 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2245 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2246 +        checkCompletedNormally(h2, null);
2247 +        checkCompletedNormally(h3, null);
2248 +        rs[2].assertValue(v1);
2249 +        rs[3].assertValue(v1);
2250          g.complete(v2);
2375        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2251  
2252 <        checkCompletedNormally(h, null);
2252 >        // unspecified behavior - both source completions available
2253 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2254 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2255 >        checkCompletedNormally(h4, null);
2256 >        checkCompletedNormally(h5, null);
2257 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2258 >                   Objects.equals(v2, rs[4].value));
2259 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2260 >                   Objects.equals(v2, rs[5].value));
2261 >
2262          checkCompletedNormally(f, v1);
2263          checkCompletedNormally(g, v2);
2264 <
2265 <        // unspecified behavior
2266 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2267 <                   Objects.equals(r.value, inc(v2)));
2264 >        checkCompletedNormally(h0, null);
2265 >        checkCompletedNormally(h1, null);
2266 >        checkCompletedNormally(h2, null);
2267 >        checkCompletedNormally(h3, null);
2268 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2269      }}
2270  
2271      /**
2272       * acceptEither result completes exceptionally after exceptional
2273       * completion of either source
2274       */
2275 <    public void testAcceptEither_exceptionalCompletion1() {
2275 >    public void testAcceptEither_exceptionalCompletion() {
2276          for (ExecutionMode m : ExecutionMode.values())
2277          for (Integer v1 : new Integer[] { 1, null })
2278      {
2279          final CompletableFuture<Integer> f = new CompletableFuture<>();
2280          final CompletableFuture<Integer> g = new CompletableFuture<>();
2396        final IncAction r = new IncAction();
2397        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2281          final CFException ex = new CFException();
2282 +        final NoopConsumer[] rs = new NoopConsumer[6];
2283 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2284  
2285 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2286 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2287 +        checkIncomplete(h0);
2288 +        checkIncomplete(h1);
2289 +        rs[0].assertNotInvoked();
2290 +        rs[1].assertNotInvoked();
2291          f.completeExceptionally(ex);
2292 <        checkCompletedWithWrappedCFException(h, ex);
2292 >        checkCompletedWithWrappedException(h0, ex);
2293 >        checkCompletedWithWrappedException(h1, ex);
2294 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2295 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2296 >        checkCompletedWithWrappedException(h2, ex);
2297 >        checkCompletedWithWrappedException(h3, ex);
2298 >
2299          g.complete(v1);
2300  
2301 <        assertEquals(0, r.invocationCount);
2301 >        // unspecified behavior - both source completions available
2302 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2303 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2304 >        try {
2305 >            assertNull(h4.join());
2306 >            rs[4].assertValue(v1);
2307 >        } catch (CompletionException ok) {
2308 >            checkCompletedWithWrappedException(h4, ex);
2309 >            rs[4].assertNotInvoked();
2310 >        }
2311 >        try {
2312 >            assertNull(h5.join());
2313 >            rs[5].assertValue(v1);
2314 >        } catch (CompletionException ok) {
2315 >            checkCompletedWithWrappedException(h5, ex);
2316 >            rs[5].assertNotInvoked();
2317 >        }
2318 >
2319 >        checkCompletedExceptionally(f, ex);
2320          checkCompletedNormally(g, v1);
2321 <        checkCompletedWithWrappedCFException(f, ex);
2322 <        checkCompletedWithWrappedCFException(h, ex);
2321 >        checkCompletedWithWrappedException(h0, ex);
2322 >        checkCompletedWithWrappedException(h1, ex);
2323 >        checkCompletedWithWrappedException(h2, ex);
2324 >        checkCompletedWithWrappedException(h3, ex);
2325 >        checkCompletedWithWrappedException(h4, ex);
2326 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2327      }}
2328  
2329      public void testAcceptEither_exceptionalCompletion2() {
2330          for (ExecutionMode m : ExecutionMode.values())
2331 +        for (boolean fFirst : new boolean[] { true, false })
2332          for (Integer v1 : new Integer[] { 1, null })
2333      {
2334          final CompletableFuture<Integer> f = new CompletableFuture<>();
2335          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();
2336          final CFException ex = new CFException();
2337 +        final NoopConsumer[] rs = new NoopConsumer[6];
2338 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2339  
2340 <        g.completeExceptionally(ex);
2341 <        f.complete(v1);
2342 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2340 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2341 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2342 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2343 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2344 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2345 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2346  
2347 <        // unspecified behavior
2444 <        Integer v;
2347 >        // unspecified behavior - both source completions available
2348          try {
2349 <            assertNull(h.join());
2350 <            assertEquals(1, r.invocationCount);
2448 <            assertEquals(inc(v1), r.value);
2349 >            assertEquals(null, h0.join());
2350 >            rs[0].assertValue(v1);
2351          } catch (CompletionException ok) {
2352 <            checkCompletedWithWrappedCFException(h, ex);
2353 <            assertEquals(0, r.invocationCount);
2352 >            checkCompletedWithWrappedException(h0, ex);
2353 >            rs[0].assertNotInvoked();
2354          }
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;
2355          try {
2356 <            assertNull(h.join());
2357 <            assertEquals(1, r.invocationCount);
2476 <            assertEquals(inc(v1), r.value);
2356 >            assertEquals(null, h1.join());
2357 >            rs[1].assertValue(v1);
2358          } catch (CompletionException ok) {
2359 <            checkCompletedWithWrappedCFException(h, ex);
2360 <            assertEquals(0, r.invocationCount);
2359 >            checkCompletedWithWrappedException(h1, ex);
2360 >            rs[1].assertNotInvoked();
2361 >        }
2362 >        try {
2363 >            assertEquals(null, h2.join());
2364 >            rs[2].assertValue(v1);
2365 >        } catch (CompletionException ok) {
2366 >            checkCompletedWithWrappedException(h2, ex);
2367 >            rs[2].assertNotInvoked();
2368 >        }
2369 >        try {
2370 >            assertEquals(null, h3.join());
2371 >            rs[3].assertValue(v1);
2372 >        } catch (CompletionException ok) {
2373 >            checkCompletedWithWrappedException(h3, ex);
2374 >            rs[3].assertNotInvoked();
2375          }
2376  
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);
2377          checkCompletedNormally(f, v1);
2378 <        checkCompletedNormally(g, v2);
2378 >        checkCompletedExceptionally(g, ex);
2379      }}
2380  
2381      /**
2382       * acceptEither result completes exceptionally if either source cancelled
2383       */
2384 <    public void testAcceptEither_sourceCancelled1() {
2527 <        for (ExecutionMode m : ExecutionMode.values())
2528 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2529 <        for (Integer v1 : new Integer[] { 1, null })
2530 <    {
2531 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2532 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2533 <        final IncAction r = new IncAction();
2534 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2535 <
2536 <        assertTrue(f.cancel(mayInterruptIfRunning));
2537 <        checkCompletedWithWrappedCancellationException(h);
2538 <        g.complete(v1);
2539 <
2540 <        checkCancelled(f);
2541 <        assertEquals(0, r.invocationCount);
2542 <        checkCompletedNormally(g, v1);
2543 <        checkCompletedWithWrappedCancellationException(h);
2544 <    }}
2545 <
2546 <    public void testAcceptEither_sourceCancelled2() {
2384 >    public void testAcceptEither_sourceCancelled() {
2385          for (ExecutionMode m : ExecutionMode.values())
2386          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2387          for (Integer v1 : new Integer[] { 1, null })
2388      {
2389          final CompletableFuture<Integer> f = new CompletableFuture<>();
2390          final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final IncAction r = new IncAction();
2392 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2391 >        final NoopConsumer[] rs = new NoopConsumer[6];
2392 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2393  
2394 <        assertTrue(g.cancel(mayInterruptIfRunning));
2395 <        checkCompletedWithWrappedCancellationException(h);
2396 <        f.complete(v1);
2394 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2395 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2396 >        checkIncomplete(h0);
2397 >        checkIncomplete(h1);
2398 >        rs[0].assertNotInvoked();
2399 >        rs[1].assertNotInvoked();
2400 >        f.cancel(mayInterruptIfRunning);
2401 >        checkCompletedWithWrappedCancellationException(h0);
2402 >        checkCompletedWithWrappedCancellationException(h1);
2403 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2404 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2405 >        checkCompletedWithWrappedCancellationException(h2);
2406 >        checkCompletedWithWrappedCancellationException(h3);
2407  
2408 <        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);
2408 >        g.complete(v1);
2409  
2410 <        // unspecified behavior
2411 <        Integer v;
2410 >        // unspecified behavior - both source completions available
2411 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2412 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2413          try {
2414 <            assertNull(h.join());
2415 <            assertEquals(1, r.invocationCount);
2584 <            assertEquals(inc(v1), r.value);
2414 >            assertNull(h4.join());
2415 >            rs[4].assertValue(v1);
2416          } catch (CompletionException ok) {
2417 <            checkCompletedWithWrappedCancellationException(h);
2418 <            assertEquals(0, r.invocationCount);
2417 >            checkCompletedWithWrappedCancellationException(h4);
2418 >            rs[4].assertNotInvoked();
2419          }
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;
2420          try {
2421 <            assertNull(h.join());
2422 <            assertEquals(1, r.invocationCount);
2612 <            assertEquals(inc(v1), r.value);
2421 >            assertNull(h5.join());
2422 >            rs[5].assertValue(v1);
2423          } catch (CompletionException ok) {
2424 <            checkCompletedWithWrappedCancellationException(h);
2425 <            assertEquals(0, r.invocationCount);
2424 >            checkCompletedWithWrappedCancellationException(h5);
2425 >            rs[5].assertNotInvoked();
2426          }
2427  
2428          checkCancelled(f);
2429          checkCompletedNormally(g, v1);
2430 +        checkCompletedWithWrappedCancellationException(h0);
2431 +        checkCompletedWithWrappedCancellationException(h1);
2432 +        checkCompletedWithWrappedCancellationException(h2);
2433 +        checkCompletedWithWrappedCancellationException(h3);
2434 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2435      }}
2436  
2437      /**
2438 <     * runAfterEither result completes normally after normal completion
2624 <     * of either source
2438 >     * acceptEither result completes exceptionally if action does
2439       */
2440 <    public void testRunAfterEither_normalCompletion1() {
2440 >    public void testAcceptEither_actionFailed() {
2441          for (ExecutionMode m : ExecutionMode.values())
2442          for (Integer v1 : new Integer[] { 1, null })
2443          for (Integer v2 : new Integer[] { 2, null })
2444      {
2445          final CompletableFuture<Integer> f = new CompletableFuture<>();
2446          final CompletableFuture<Integer> g = new CompletableFuture<>();
2447 <        final Noop r = new Noop();
2448 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2447 >        final FailingConsumer[] rs = new FailingConsumer[6];
2448 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2449  
2450 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2451 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2452          f.complete(v1);
2453 <        checkCompletedNormally(h, null);
2454 <        assertEquals(1, r.invocationCount);
2455 <        g.complete(v2);
2453 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2454 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2455 >        checkCompletedWithWrappedCFException(h0);
2456 >        checkCompletedWithWrappedCFException(h1);
2457 >        checkCompletedWithWrappedCFException(h2);
2458 >        checkCompletedWithWrappedCFException(h3);
2459 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2460  
2461 <        checkCompletedNormally(f, v1);
2642 <        checkCompletedNormally(g, v2);
2643 <        checkCompletedNormally(h, null);
2644 <        assertEquals(1, r.invocationCount);
2645 <    }}
2461 >        g.complete(v2);
2462  
2463 <    public void testRunAfterEither_normalCompletion2() {
2464 <        for (ExecutionMode m : ExecutionMode.values())
2465 <        for (Integer v1 : new Integer[] { 1, null })
2650 <        for (Integer v2 : new Integer[] { 2, null })
2651 <    {
2652 <        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);
2463 >        // unspecified behavior - both source completions available
2464 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2465 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2466  
2467 <        g.complete(v2);
2468 <        checkCompletedNormally(h, null);
2469 <        assertEquals(1, r.invocationCount);
2470 <        f.complete(v1);
2467 >        checkCompletedWithWrappedCFException(h4);
2468 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2469 >                   Objects.equals(v2, rs[4].value));
2470 >        checkCompletedWithWrappedCFException(h5);
2471 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2472 >                   Objects.equals(v2, rs[5].value));
2473  
2474          checkCompletedNormally(f, v1);
2475          checkCompletedNormally(g, v2);
2476 <        checkCompletedNormally(h, null);
2665 <        assertEquals(1, r.invocationCount);
2666 <        }}
2476 >    }}
2477  
2478 <    public void testRunAfterEither_normalCompletion3() {
2478 >    /**
2479 >     * runAfterEither result completes normally after normal completion
2480 >     * of either source
2481 >     */
2482 >    public void testRunAfterEither_normalCompletion() {
2483          for (ExecutionMode m : ExecutionMode.values())
2484          for (Integer v1 : new Integer[] { 1, null })
2485          for (Integer v2 : new Integer[] { 2, null })
2486      {
2487          final CompletableFuture<Integer> f = new CompletableFuture<>();
2488          final CompletableFuture<Integer> g = new CompletableFuture<>();
2489 <        final Noop r = new Noop();
2489 >        final Noop[] rs = new Noop[6];
2490 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2491  
2492 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2493 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2494 +        checkIncomplete(h0);
2495 +        checkIncomplete(h1);
2496 +        rs[0].assertNotInvoked();
2497 +        rs[1].assertNotInvoked();
2498          f.complete(v1);
2499 +        checkCompletedNormally(h0, null);
2500 +        checkCompletedNormally(h1, null);
2501 +        rs[0].assertInvoked();
2502 +        rs[1].assertInvoked();
2503 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2504 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2505 +        checkCompletedNormally(h2, null);
2506 +        checkCompletedNormally(h3, null);
2507 +        rs[2].assertInvoked();
2508 +        rs[3].assertInvoked();
2509 +
2510          g.complete(v2);
2679        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2511  
2512 <        checkCompletedNormally(h, null);
2512 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2513 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2514 >
2515          checkCompletedNormally(f, v1);
2516          checkCompletedNormally(g, v2);
2517 <        assertEquals(1, r.invocationCount);
2517 >        checkCompletedNormally(h0, null);
2518 >        checkCompletedNormally(h1, null);
2519 >        checkCompletedNormally(h2, null);
2520 >        checkCompletedNormally(h3, null);
2521 >        checkCompletedNormally(h4, null);
2522 >        checkCompletedNormally(h5, null);
2523 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2524      }}
2525  
2526      /**
2527       * runAfterEither result completes exceptionally after exceptional
2528       * completion of either source
2529       */
2530 <    public void testRunAfterEither_exceptionalCompletion1() {
2530 >    public void testRunAfterEither_exceptionalCompletion() {
2531          for (ExecutionMode m : ExecutionMode.values())
2532          for (Integer v1 : new Integer[] { 1, null })
2533      {
2534          final CompletableFuture<Integer> f = new CompletableFuture<>();
2535          final CompletableFuture<Integer> g = new CompletableFuture<>();
2697        final Noop r = new Noop();
2698        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2536          final CFException ex = new CFException();
2537 +        final Noop[] rs = new Noop[6];
2538 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2539  
2540 <        f.completeExceptionally(ex);
2541 <        checkCompletedWithWrappedCFException(h, ex);
2542 <        g.complete(v1);
2540 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2541 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2542 >        checkIncomplete(h0);
2543 >        checkIncomplete(h1);
2544 >        rs[0].assertNotInvoked();
2545 >        rs[1].assertNotInvoked();
2546 >        assertTrue(f.completeExceptionally(ex));
2547 >        checkCompletedWithWrappedException(h0, ex);
2548 >        checkCompletedWithWrappedException(h1, ex);
2549 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2550 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2551 >        checkCompletedWithWrappedException(h2, ex);
2552 >        checkCompletedWithWrappedException(h3, ex);
2553  
2554 <        assertEquals(0, r.invocationCount);
2706 <        checkCompletedNormally(g, v1);
2707 <        checkCompletedWithWrappedCFException(f, ex);
2708 <        checkCompletedWithWrappedCFException(h, ex);
2709 <    }}
2554 >        assertTrue(g.complete(v1));
2555  
2556 <    public void testRunAfterEither_exceptionalCompletion2() {
2557 <        for (ExecutionMode m : ExecutionMode.values())
2558 <        for (Integer v1 : new Integer[] { 1, null })
2714 <    {
2715 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2716 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2717 <        final Noop r = new Noop();
2718 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2719 <        final CFException ex = new CFException();
2720 <
2721 <        g.completeExceptionally(ex);
2722 <        checkCompletedWithWrappedCFException(h, ex);
2723 <        f.complete(v1);
2724 <
2725 <        assertEquals(0, r.invocationCount);
2726 <        checkCompletedNormally(f, v1);
2727 <        checkCompletedWithWrappedCFException(g, ex);
2728 <        checkCompletedWithWrappedCFException(h, ex);
2729 <    }}
2730 <
2731 <    public void testRunAfterEither_exceptionalCompletion3() {
2732 <        for (ExecutionMode m : ExecutionMode.values())
2733 <        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();
2739 <
2740 <        g.completeExceptionally(ex);
2741 <        f.complete(v1);
2742 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2743 <
2744 <        // unspecified behavior
2745 <        Integer v;
2556 >        // unspecified behavior - both source completions available
2557 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2558 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2559          try {
2560 <            assertNull(h.join());
2561 <            assertEquals(1, r.invocationCount);
2560 >            assertNull(h4.join());
2561 >            rs[4].assertInvoked();
2562          } catch (CompletionException ok) {
2563 <            checkCompletedWithWrappedCFException(h, ex);
2564 <            assertEquals(0, r.invocationCount);
2563 >            checkCompletedWithWrappedException(h4, ex);
2564 >            rs[4].assertNotInvoked();
2565          }
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;
2566          try {
2567 <            assertNull(h.join());
2568 <            assertEquals(1, r.invocationCount);
2567 >            assertNull(h5.join());
2568 >            rs[5].assertInvoked();
2569          } catch (CompletionException ok) {
2570 <            checkCompletedWithWrappedCFException(h, ex);
2571 <            assertEquals(0, r.invocationCount);
2570 >            checkCompletedWithWrappedException(h5, ex);
2571 >            rs[5].assertNotInvoked();
2572          }
2573  
2574 <        checkCompletedWithWrappedCFException(f, ex);
2574 >        checkCompletedExceptionally(f, ex);
2575          checkCompletedNormally(g, v1);
2576 +        checkCompletedWithWrappedException(h0, ex);
2577 +        checkCompletedWithWrappedException(h1, ex);
2578 +        checkCompletedWithWrappedException(h2, ex);
2579 +        checkCompletedWithWrappedException(h3, ex);
2580 +        checkCompletedWithWrappedException(h4, ex);
2581 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2582      }}
2583  
2584 <    /**
2786 <     * runAfterEither result completes exceptionally if action does
2787 <     */
2788 <    public void testRunAfterEither_actionFailed1() {
2584 >    public void testRunAfterEither_exceptionalCompletion2() {
2585          for (ExecutionMode m : ExecutionMode.values())
2586 +        for (boolean fFirst : new boolean[] { true, false })
2587          for (Integer v1 : new Integer[] { 1, null })
2791        for (Integer v2 : new Integer[] { 2, null })
2588      {
2589          final CompletableFuture<Integer> f = new CompletableFuture<>();
2590          final CompletableFuture<Integer> g = new CompletableFuture<>();
2591 <        final FailingRunnable r = new FailingRunnable();
2592 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2591 >        final CFException ex = new CFException();
2592 >        final Noop[] rs = new Noop[6];
2593 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2594  
2595 <        f.complete(v1);
2596 <        checkCompletedWithWrappedCFException(h);
2597 <        g.complete(v2);
2598 <        checkCompletedNormally(f, v1);
2599 <        checkCompletedNormally(g, v2);
2600 <    }}
2595 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2596 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2597 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2598 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2599 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2600 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2601  
2602 <    public void testRunAfterEither_actionFailed2() {
2603 <        for (ExecutionMode m : ExecutionMode.values())
2604 <        for (Integer v1 : new Integer[] { 1, null })
2605 <        for (Integer v2 : new Integer[] { 2, null })
2606 <    {
2607 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2608 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2609 <        final FailingRunnable r = new FailingRunnable();
2610 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2602 >        // unspecified behavior - both source completions available
2603 >        try {
2604 >            assertEquals(null, h0.join());
2605 >            rs[0].assertInvoked();
2606 >        } catch (CompletionException ok) {
2607 >            checkCompletedWithWrappedException(h0, ex);
2608 >            rs[0].assertNotInvoked();
2609 >        }
2610 >        try {
2611 >            assertEquals(null, h1.join());
2612 >            rs[1].assertInvoked();
2613 >        } catch (CompletionException ok) {
2614 >            checkCompletedWithWrappedException(h1, ex);
2615 >            rs[1].assertNotInvoked();
2616 >        }
2617 >        try {
2618 >            assertEquals(null, h2.join());
2619 >            rs[2].assertInvoked();
2620 >        } catch (CompletionException ok) {
2621 >            checkCompletedWithWrappedException(h2, ex);
2622 >            rs[2].assertNotInvoked();
2623 >        }
2624 >        try {
2625 >            assertEquals(null, h3.join());
2626 >            rs[3].assertInvoked();
2627 >        } catch (CompletionException ok) {
2628 >            checkCompletedWithWrappedException(h3, ex);
2629 >            rs[3].assertNotInvoked();
2630 >        }
2631  
2815        g.complete(v2);
2816        checkCompletedWithWrappedCFException(h);
2817        f.complete(v1);
2632          checkCompletedNormally(f, v1);
2633 <        checkCompletedNormally(g, v2);
2633 >        checkCompletedExceptionally(g, ex);
2634      }}
2635  
2636      /**
2637       * runAfterEither result completes exceptionally if either source cancelled
2638       */
2639 <    public void testRunAfterEither_sourceCancelled1() {
2826 <        for (ExecutionMode m : ExecutionMode.values())
2827 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2828 <        for (Integer v1 : new Integer[] { 1, null })
2829 <    {
2830 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2831 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2832 <        final Noop r = new Noop();
2833 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2834 <
2835 <        assertTrue(f.cancel(mayInterruptIfRunning));
2836 <        checkCompletedWithWrappedCancellationException(h);
2837 <        g.complete(v1);
2838 <
2839 <        checkCancelled(f);
2840 <        assertEquals(0, r.invocationCount);
2841 <        checkCompletedNormally(g, v1);
2842 <        checkCompletedWithWrappedCancellationException(h);
2843 <    }}
2844 <
2845 <    public void testRunAfterEither_sourceCancelled2() {
2639 >    public void testRunAfterEither_sourceCancelled() {
2640          for (ExecutionMode m : ExecutionMode.values())
2641          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2642          for (Integer v1 : new Integer[] { 1, null })
2643      {
2644          final CompletableFuture<Integer> f = new CompletableFuture<>();
2645          final CompletableFuture<Integer> g = new CompletableFuture<>();
2646 <        final Noop r = new Noop();
2647 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2646 >        final Noop[] rs = new Noop[6];
2647 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2648  
2649 <        assertTrue(g.cancel(mayInterruptIfRunning));
2650 <        checkCompletedWithWrappedCancellationException(h);
2651 <        f.complete(v1);
2649 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2650 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2651 >        checkIncomplete(h0);
2652 >        checkIncomplete(h1);
2653 >        rs[0].assertNotInvoked();
2654 >        rs[1].assertNotInvoked();
2655 >        f.cancel(mayInterruptIfRunning);
2656 >        checkCompletedWithWrappedCancellationException(h0);
2657 >        checkCompletedWithWrappedCancellationException(h1);
2658 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2659 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2660 >        checkCompletedWithWrappedCancellationException(h2);
2661 >        checkCompletedWithWrappedCancellationException(h3);
2662  
2663 <        checkCancelled(g);
2860 <        assertEquals(0, r.invocationCount);
2861 <        checkCompletedNormally(f, v1);
2862 <        checkCompletedWithWrappedCancellationException(h);
2863 <    }}
2663 >        assertTrue(g.complete(v1));
2664  
2665 <    public void testRunAfterEither_sourceCancelled3() {
2666 <        for (ExecutionMode m : ExecutionMode.values())
2667 <        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;
2665 >        // unspecified behavior - both source completions available
2666 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2667 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2668          try {
2669 <            assertNull(h.join());
2670 <            assertEquals(1, r.invocationCount);
2669 >            assertNull(h4.join());
2670 >            rs[4].assertInvoked();
2671          } catch (CompletionException ok) {
2672 <            checkCompletedWithWrappedCancellationException(h);
2673 <            assertEquals(0, r.invocationCount);
2672 >            checkCompletedWithWrappedCancellationException(h4);
2673 >            rs[4].assertNotInvoked();
2674 >        }
2675 >        try {
2676 >            assertNull(h5.join());
2677 >            rs[5].assertInvoked();
2678 >        } catch (CompletionException ok) {
2679 >            checkCompletedWithWrappedCancellationException(h5);
2680 >            rs[5].assertNotInvoked();
2681          }
2682  
2683 <        checkCancelled(g);
2684 <        checkCompletedNormally(f, v1);
2683 >        checkCancelled(f);
2684 >        checkCompletedNormally(g, v1);
2685 >        checkCompletedWithWrappedCancellationException(h0);
2686 >        checkCompletedWithWrappedCancellationException(h1);
2687 >        checkCompletedWithWrappedCancellationException(h2);
2688 >        checkCompletedWithWrappedCancellationException(h3);
2689 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2690      }}
2691  
2692 <    public void testRunAfterEither_sourceCancelled4() {
2692 >    /**
2693 >     * runAfterEither result completes exceptionally if action does
2694 >     */
2695 >    public void testRunAfterEither_actionFailed() {
2696          for (ExecutionMode m : ExecutionMode.values())
2894        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2697          for (Integer v1 : new Integer[] { 1, null })
2698 +        for (Integer v2 : new Integer[] { 2, null })
2699      {
2700          final CompletableFuture<Integer> f = new CompletableFuture<>();
2701          final CompletableFuture<Integer> g = new CompletableFuture<>();
2702 <        final Noop r = new Noop();
2702 >        final FailingRunnable[] rs = new FailingRunnable[6];
2703 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2704  
2705 <        assertTrue(f.cancel(mayInterruptIfRunning));
2706 <        g.complete(v1);
2707 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2708 <
2709 <        // unspecified behavior
2710 <        Integer v;
2711 <        try {
2712 <            assertNull(h.join());
2713 <            assertEquals(1, r.invocationCount);
2714 <        } catch (CompletionException ok) {
2715 <            checkCompletedWithWrappedCancellationException(h);
2716 <            assertEquals(0, r.invocationCount);
2717 <        }
2705 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2706 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2707 >        assertTrue(f.complete(v1));
2708 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2709 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2710 >        checkCompletedWithWrappedCFException(h0);
2711 >        checkCompletedWithWrappedCFException(h1);
2712 >        checkCompletedWithWrappedCFException(h2);
2713 >        checkCompletedWithWrappedCFException(h3);
2714 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2715 >        assertTrue(g.complete(v2));
2716 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2717 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2718 >        checkCompletedWithWrappedCFException(h4);
2719 >        checkCompletedWithWrappedCFException(h5);
2720  
2721 <        checkCancelled(f);
2722 <        checkCompletedNormally(g, v1);
2721 >        checkCompletedNormally(f, v1);
2722 >        checkCompletedNormally(g, v2);
2723 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2724      }}
2725  
2726      /**
# Line 2925 | Line 2732 | public class CompletableFutureTest exten
2732          for (Integer v1 : new Integer[] { 1, null })
2733      {
2734          final CompletableFuture<Integer> f = new CompletableFuture<>();
2735 <        final CompletableFutureInc r = new CompletableFutureInc();
2736 <        if (!createIncomplete) f.complete(v1);
2737 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2738 <        if (createIncomplete) f.complete(v1);
2735 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2736 >        if (!createIncomplete) assertTrue(f.complete(v1));
2737 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2738 >        if (createIncomplete) assertTrue(f.complete(v1));
2739  
2740          checkCompletedNormally(g, inc(v1));
2741          checkCompletedNormally(f, v1);
2742 <        assertEquals(1, r.invocationCount);
2742 >        r.assertValue(v1);
2743      }}
2744  
2745      /**
# Line 2944 | Line 2751 | public class CompletableFutureTest exten
2751          for (boolean createIncomplete : new boolean[] { true, false })
2752      {
2753          final CFException ex = new CFException();
2754 <        final CompletableFutureInc r = new CompletableFutureInc();
2754 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2755          final CompletableFuture<Integer> f = new CompletableFuture<>();
2756          if (!createIncomplete) f.completeExceptionally(ex);
2757 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2757 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2758          if (createIncomplete) f.completeExceptionally(ex);
2759  
2760 <        checkCompletedWithWrappedCFException(g, ex);
2761 <        checkCompletedWithWrappedCFException(f, ex);
2762 <        assertEquals(0, r.invocationCount);
2760 >        checkCompletedWithWrappedException(g, ex);
2761 >        checkCompletedExceptionally(f, ex);
2762 >        r.assertNotInvoked();
2763      }}
2764  
2765      /**
# Line 2965 | Line 2772 | public class CompletableFutureTest exten
2772      {
2773          final CompletableFuture<Integer> f = new CompletableFuture<>();
2774          final FailingCompletableFutureFunction r
2775 <            = new FailingCompletableFutureFunction();
2776 <        if (!createIncomplete) f.complete(v1);
2777 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2778 <        if (createIncomplete) f.complete(v1);
2775 >            = new FailingCompletableFutureFunction(m);
2776 >        if (!createIncomplete) assertTrue(f.complete(v1));
2777 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2778 >        if (createIncomplete) assertTrue(f.complete(v1));
2779  
2780          checkCompletedWithWrappedCFException(g);
2781          checkCompletedNormally(f, v1);
# Line 2983 | Line 2790 | public class CompletableFutureTest exten
2790          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2791      {
2792          final CompletableFuture<Integer> f = new CompletableFuture<>();
2793 <        final CompletableFutureInc r = new CompletableFutureInc();
2793 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2794          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2795 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2795 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2796          if (createIncomplete) {
2797              checkIncomplete(g);
2798              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 3012 | Line 2819 | public class CompletableFutureTest exten
2819       */
2820      public void testAllOf_normal() throws Exception {
2821          for (int k = 1; k < 20; ++k) {
2822 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2822 >            CompletableFuture<Integer>[] fs
2823 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2824              for (int i = 0; i < k; ++i)
2825                  fs[i] = new CompletableFuture<>();
2826              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3026 | Line 2834 | public class CompletableFutureTest exten
2834          }
2835      }
2836  
2837 +    public void testAllOf_backwards() throws Exception {
2838 +        for (int k = 1; k < 20; ++k) {
2839 +            CompletableFuture<Integer>[] fs
2840 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2841 +            for (int i = 0; i < k; ++i)
2842 +                fs[i] = new CompletableFuture<>();
2843 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2844 +            for (int i = k - 1; i >= 0; i--) {
2845 +                checkIncomplete(f);
2846 +                checkIncomplete(CompletableFuture.allOf(fs));
2847 +                fs[i].complete(one);
2848 +            }
2849 +            checkCompletedNormally(f, null);
2850 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2851 +        }
2852 +    }
2853 +
2854      /**
2855       * anyOf(no component futures) returns an incomplete future
2856       */
# Line 3084 | Line 2909 | public class CompletableFutureTest exten
2909          Runnable[] throwingActions = {
2910              () -> CompletableFuture.supplyAsync(null),
2911              () -> CompletableFuture.supplyAsync(null, exec),
2912 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2912 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2913  
2914              () -> CompletableFuture.runAsync(null),
2915              () -> CompletableFuture.runAsync(null, exec),
# Line 3157 | Line 2982 | public class CompletableFutureTest exten
2982  
2983              () -> f.thenCompose(null),
2984              () -> f.thenComposeAsync(null),
2985 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
2985 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2986              () -> f.thenComposeAsync(null, exec),
2987  
2988              () -> f.exceptionally(null),
# Line 3189 | Line 3014 | public class CompletableFutureTest exten
3014          assertSame(f, f.toCompletableFuture());
3015      }
3016  
3017 <    /**
3018 <     * whenComplete action executes on normal completion, propagating
3019 <     * source result.
3020 <     */
3021 <    public void testWhenComplete_normalCompletion1() {
3022 <        for (ExecutionMode m : ExecutionMode.values())
3023 <        for (boolean createIncomplete : new boolean[] { true, false })
3024 <        for (Integer v1 : new Integer[] { 1, null })
3025 <    {
3026 <        final AtomicInteger a = new AtomicInteger(0);
3027 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3028 <        if (!createIncomplete) f.complete(v1);
3029 <        final CompletableFuture<Integer> g = m.whenComplete
3030 <            (f,
3031 <             (Integer x, Throwable t) -> {
3032 <                threadAssertSame(x, v1);
3033 <                threadAssertNull(t);
3209 <                a.getAndIncrement();
3210 <            });
3211 <        if (createIncomplete) f.complete(v1);
3212 <
3213 <        checkCompletedNormally(g, v1);
3214 <        checkCompletedNormally(f, v1);
3215 <        assertEquals(1, a.get());
3216 <    }}
3217 <
3218 <    /**
3219 <     * whenComplete action executes on exceptional completion, propagating
3220 <     * source result.
3221 <     */
3222 <    public void testWhenComplete_exceptionalCompletion() {
3223 <        for (ExecutionMode m : ExecutionMode.values())
3224 <        for (boolean createIncomplete : new boolean[] { true, false })
3225 <        for (Integer v1 : new Integer[] { 1, null })
3226 <    {
3227 <        final AtomicInteger a = new AtomicInteger(0);
3228 <        final CFException ex = new CFException();
3229 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3230 <        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 <    }}
3243 <
3244 <    /**
3245 <     * 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));
3264 <
3265 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3266 <        checkCompletedWithWrappedCancellationException(g);
3267 <        checkCancelled(f);
3268 <        assertEquals(1, a.get());
3269 <    }}
3270 <
3271 <    /**
3272 <     * If a whenComplete action throws an exception when triggered by
3273 <     * 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 <    }}
3297 <
3298 <    /**
3299 <     * If a whenComplete action throws an exception when triggered by
3300 <     * 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<>();
3312 <
3313 <        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);
3323 <
3324 <        checkCompletedWithWrappedCFException(f, ex1);
3325 <        checkCompletedWithWrappedCFException(g, ex1);
3326 <        assertEquals(1, a.get());
3327 <    }}
3017 > //     public void testRunAfterEither_resultDeterminedAtTimeOfCreation() {
3018 > //         for (ExecutionMode m : ExecutionMode.values())
3019 > //         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3020 > //         for (Integer v1 : new Integer[] { 1, null })
3021 > //     {
3022 > //         final CompletableFuture<Integer> f = new CompletableFuture<>();
3023 > //         final CompletableFuture<Integer> g = new CompletableFuture<>();
3024 > //         final Noop[] rs = new Noop[2];
3025 > //         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
3026 > //         f.complete(v1);
3027 > //         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3028 > //         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3029 > //         assertTrue(g.cancel(mayInterruptIfRunning));
3030 > //         checkCompletedNormally(h0, null);
3031 > //         checkCompletedNormally(h1, null);
3032 > //         for (Noop r : rs) r.assertInvoked();
3033 > //     }}
3034  
3035   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines