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.78 by jsr166, Sat Jun 7 23:32:17 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines