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.59 by jsr166, Tue Jun 3 03:54:14 2014 UTC vs.
Revision 1.98 by jsr166, Wed Dec 31 19:05:42 2014 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import junit.framework.*;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 > import static java.util.concurrent.TimeUnit.SECONDS;
10 >
11 > import java.util.ArrayList;
12 > import java.util.List;
13 > import java.util.Objects;
14   import java.util.concurrent.Callable;
10 import java.util.concurrent.Executor;
11 import java.util.concurrent.ExecutorService;
12 import java.util.concurrent.Executors;
15   import java.util.concurrent.CancellationException;
14 import java.util.concurrent.CountDownLatch;
15 import java.util.concurrent.ExecutionException;
16 import java.util.concurrent.Future;
16   import java.util.concurrent.CompletableFuture;
17   import java.util.concurrent.CompletionException;
18   import java.util.concurrent.CompletionStage;
19 + import java.util.concurrent.ExecutionException;
20 + import java.util.concurrent.Executor;
21   import java.util.concurrent.ForkJoinPool;
22   import java.util.concurrent.ForkJoinTask;
23   import java.util.concurrent.TimeoutException;
24   import java.util.concurrent.atomic.AtomicInteger;
24 import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 import static java.util.concurrent.TimeUnit.SECONDS;
26 import java.util.*;
27 import java.util.function.Supplier;
28 import java.util.function.Consumer;
25   import java.util.function.BiConsumer;
30 import java.util.function.Function;
26   import java.util.function.BiFunction;
27 + import java.util.function.Consumer;
28 + import java.util.function.Function;
29 + import java.util.function.Supplier;
30 +
31 + import junit.framework.Test;
32 + import junit.framework.TestSuite;
33  
34   public class CompletableFutureTest extends JSR166TestCase {
35  
# Line 57 | Line 58 | public class CompletableFutureTest exten
58      }
59  
60      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
61 <        try {
62 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
61 >        checkTimedGet(f, value);
62 >
63          try {
64              assertEquals(value, f.join());
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 76 | Line 76 | public class CompletableFutureTest exten
76      }
77  
78      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
79 +        long startTime = System.nanoTime();
80 +        long timeoutMillis = LONG_DELAY_MS;
81          try {
82 <            f.get(LONG_DELAY_MS, MILLISECONDS);
82 >            f.get(timeoutMillis, MILLISECONDS);
83              shouldThrow();
84          } catch (ExecutionException success) {
85              assertTrue(success.getCause() instanceof CFException);
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
88 +
89          try {
90              f.join();
91              shouldThrow();
# Line 105 | Line 109 | public class CompletableFutureTest exten
109          assertTrue(f.toString().contains("[Completed exceptionally]"));
110      }
111  
112 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
113 <                                              CFException ex) {
112 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
113 >                                                      Throwable ex) {
114 >        long startTime = System.nanoTime();
115 >        long timeoutMillis = LONG_DELAY_MS;
116          try {
117 <            f.get(LONG_DELAY_MS, MILLISECONDS);
117 >            f.get(timeoutMillis, MILLISECONDS);
118              shouldThrow();
119          } catch (ExecutionException success) {
120              assertSame(ex, success.getCause());
121          } catch (Throwable fail) { threadUnexpectedException(fail); }
122 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
123 +
124          try {
125              f.join();
126              shouldThrow();
# Line 131 | Line 139 | public class CompletableFutureTest exten
139          } catch (ExecutionException success) {
140              assertSame(ex, success.getCause());
141          } catch (Throwable fail) { threadUnexpectedException(fail); }
142 +
143          assertTrue(f.isDone());
144          assertFalse(f.isCancelled());
145          assertTrue(f.toString().contains("[Completed exceptionally]"));
146      }
147  
148 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
149 +                                                Throwable ex) {
150 +        checkCompletedExceptionallyWithRootCause(f, ex);
151 +        try {
152 +            CompletableFuture<Throwable> spy = f.handle
153 +                ((U u, Throwable t) -> t);
154 +            assertTrue(spy.join() instanceof CompletionException);
155 +            assertSame(ex, spy.join().getCause());
156 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
157 +    }
158 +
159 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
160 +        checkCompletedExceptionallyWithRootCause(f, ex);
161 +        try {
162 +            CompletableFuture<Throwable> spy = f.handle
163 +                ((U u, Throwable t) -> t);
164 +            assertSame(ex, spy.join());
165 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
166 +    }
167 +
168      void checkCancelled(CompletableFuture<?> f) {
169 +        long startTime = System.nanoTime();
170 +        long timeoutMillis = LONG_DELAY_MS;
171          try {
172 <            f.get(LONG_DELAY_MS, MILLISECONDS);
172 >            f.get(timeoutMillis, MILLISECONDS);
173              shouldThrow();
174          } catch (CancellationException success) {
175          } catch (Throwable fail) { threadUnexpectedException(fail); }
176 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
177 +
178          try {
179              f.join();
180              shouldThrow();
# Line 162 | Line 195 | public class CompletableFutureTest exten
195      }
196  
197      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
198 +        long startTime = System.nanoTime();
199 +        long timeoutMillis = LONG_DELAY_MS;
200          try {
201 <            f.get(LONG_DELAY_MS, MILLISECONDS);
201 >            f.get(timeoutMillis, MILLISECONDS);
202              shouldThrow();
203          } catch (ExecutionException success) {
204              assertTrue(success.getCause() instanceof CancellationException);
205          } catch (Throwable fail) { threadUnexpectedException(fail); }
206 +        assertTrue(millisElapsedSince(startTime) < timeoutMillis/2);
207 +
208          try {
209              f.join();
210              shouldThrow();
# Line 206 | Line 243 | public class CompletableFutureTest exten
243       * isCancelled, join, get, and getNow
244       */
245      public void testComplete() {
246 +        for (Integer v1 : new Integer[] { 1, null })
247 +    {
248          CompletableFuture<Integer> f = new CompletableFuture<>();
249          checkIncomplete(f);
250 <        f.complete(one);
251 <        checkCompletedNormally(f, one);
252 <    }
250 >        assertTrue(f.complete(v1));
251 >        assertFalse(f.complete(v1));
252 >        checkCompletedNormally(f, v1);
253 >    }}
254  
255      /**
256       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 258 | public class CompletableFutureTest exten
258       */
259      public void testCompleteExceptionally() {
260          CompletableFuture<Integer> f = new CompletableFuture<>();
261 +        CFException ex = new CFException();
262          checkIncomplete(f);
263 <        f.completeExceptionally(new CFException());
264 <        checkCompletedWithWrappedCFException(f);
263 >        f.completeExceptionally(ex);
264 >        checkCompletedExceptionally(f, ex);
265      }
266  
267      /**
# Line 228 | Line 269 | public class CompletableFutureTest exten
269       * methods isDone, isCancelled, join, get, and getNow
270       */
271      public void testCancel() {
272 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
273 +    {
274          CompletableFuture<Integer> f = new CompletableFuture<>();
275          checkIncomplete(f);
276          assertTrue(f.cancel(true));
277 +        assertTrue(f.cancel(true));
278          checkCancelled(f);
279 <    }
279 >    }}
280  
281      /**
282       * obtrudeValue forces completion with given value
# Line 240 | Line 284 | public class CompletableFutureTest exten
284      public void testObtrudeValue() {
285          CompletableFuture<Integer> f = new CompletableFuture<>();
286          checkIncomplete(f);
287 <        f.complete(one);
287 >        assertTrue(f.complete(one));
288          checkCompletedNormally(f, one);
289          f.obtrudeValue(three);
290          checkCompletedNormally(f, three);
# Line 261 | Line 305 | public class CompletableFutureTest exten
305       * obtrudeException forces completion with given exception
306       */
307      public void testObtrudeException() {
308 <        CompletableFuture<Integer> f = new CompletableFuture<>();
309 <        checkIncomplete(f);
310 <        f.complete(one);
311 <        checkCompletedNormally(f, one);
312 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
308 >        for (Integer v1 : new Integer[] { 1, null })
309 >    {
310 >        CFException ex;
311 >        CompletableFuture<Integer> f;
312 >
313          f = new CompletableFuture<>();
314 <        f.obtrudeException(new CFException());
315 <        checkCompletedWithWrappedCFException(f);
314 >        assertTrue(f.complete(v1));
315 >        for (int i = 0; i < 2; i++) {
316 >            f.obtrudeException(ex = new CFException());
317 >            checkCompletedExceptionally(f, ex);
318 >        }
319 >
320          f = new CompletableFuture<>();
321 +        for (int i = 0; i < 2; i++) {
322 +            f.obtrudeException(ex = new CFException());
323 +            checkCompletedExceptionally(f, ex);
324 +        }
325 +
326 +        f = new CompletableFuture<>();
327 +        f.completeExceptionally(ex = new CFException());
328 +        f.obtrudeValue(v1);
329 +        checkCompletedNormally(f, v1);
330 +        f.obtrudeException(ex = new CFException());
331 +        checkCompletedExceptionally(f, ex);
332          f.completeExceptionally(new CFException());
333 <        f.obtrudeValue(four);
334 <        checkCompletedNormally(f, four);
335 <        f.obtrudeException(new CFException());
336 <        checkCompletedWithWrappedCFException(f);
279 <    }
333 >        checkCompletedExceptionally(f, ex);
334 >        assertFalse(f.complete(v1));
335 >        checkCompletedExceptionally(f, ex);
336 >    }}
337  
338      /**
339       * getNumberOfDependents returns number of dependent tasks
340       */
341      public void testGetNumberOfDependents() {
342 +        for (ExecutionMode m : ExecutionMode.values())
343 +        for (Integer v1 : new Integer[] { 1, null })
344 +    {
345          CompletableFuture<Integer> f = new CompletableFuture<>();
346          assertEquals(0, f.getNumberOfDependents());
347 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
347 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
348          assertEquals(1, f.getNumberOfDependents());
349          assertEquals(0, g.getNumberOfDependents());
350 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
350 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
351          assertEquals(2, f.getNumberOfDependents());
352 <        f.complete(1);
352 >        assertEquals(0, h.getNumberOfDependents());
353 >        assertTrue(f.complete(v1));
354          checkCompletedNormally(g, null);
355 +        checkCompletedNormally(h, null);
356          assertEquals(0, f.getNumberOfDependents());
357          assertEquals(0, g.getNumberOfDependents());
358 <    }
358 >        assertEquals(0, h.getNumberOfDependents());
359 >    }}
360  
361      /**
362       * toString indicates current completion state
# Line 304 | Line 367 | public class CompletableFutureTest exten
367          f = new CompletableFuture<String>();
368          assertTrue(f.toString().contains("[Not completed]"));
369  
370 <        f.complete("foo");
370 >        assertTrue(f.complete("foo"));
371          assertTrue(f.toString().contains("[Completed normally]"));
372  
373          f = new CompletableFuture<String>();
374 <        f.completeExceptionally(new IndexOutOfBoundsException());
374 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
375          assertTrue(f.toString().contains("[Completed exceptionally]"));
376 +
377 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
378 +            f = new CompletableFuture<String>();
379 +            assertTrue(f.cancel(mayInterruptIfRunning));
380 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
381 +        }
382      }
383  
384      /**
# Line 320 | Line 389 | public class CompletableFutureTest exten
389          checkCompletedNormally(f, "test");
390      }
391  
392 <    // Choose non-commutative actions for better coverage
393 <
394 <    // A non-commutative function that handles and produces null values as well.
395 <    static Integer subtract(Integer x, Integer y) {
396 <        return (x == null && y == null) ? null :
397 <            ((x == null) ? 42 : x.intValue())
398 <            - ((y == null) ? 99 : y.intValue());
392 >    abstract class CheckedAction {
393 >        int invocationCount = 0;
394 >        final ExecutionMode m;
395 >        CheckedAction(ExecutionMode m) { this.m = m; }
396 >        void invoked() {
397 >            m.checkExecutionMode();
398 >            assertEquals(0, invocationCount++);
399 >        }
400 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
401 >        void assertInvoked() { assertEquals(1, invocationCount); }
402      }
403  
404 <    // A function that handles and produces null values as well.
405 <    static Integer inc(Integer x) {
406 <        return (x == null) ? null : x + 1;
404 >    abstract class CheckedIntegerAction extends CheckedAction {
405 >        Integer value;
406 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
407 >        void assertValue(Integer expected) {
408 >            assertInvoked();
409 >            assertEquals(expected, value);
410 >        }
411      }
412  
413 <    static final class IntegerSupplier implements Supplier<Integer> {
414 <        final ExecutionMode m;
415 <        int invocationCount = 0;
413 >    class IntegerSupplier extends CheckedAction
414 >        implements Supplier<Integer>
415 >    {
416          final Integer value;
417          IntegerSupplier(ExecutionMode m, Integer value) {
418 <            this.m = m;
418 >            super(m);
419              this.value = value;
420          }
421          public Integer get() {
422 <            m.checkExecutionMode();
347 <            invocationCount++;
422 >            invoked();
423              return value;
424          }
425      }
426 <        
427 <    static final class IncAction implements Consumer<Integer> {
428 <        int invocationCount = 0;
429 <        Integer value;
426 >
427 >    // A function that handles and produces null values as well.
428 >    static Integer inc(Integer x) {
429 >        return (x == null) ? null : x + 1;
430 >    }
431 >
432 >    class NoopConsumer extends CheckedIntegerAction
433 >        implements Consumer<Integer>
434 >    {
435 >        NoopConsumer(ExecutionMode m) { super(m); }
436          public void accept(Integer x) {
437 <            invocationCount++;
438 <            value = inc(x);
437 >            invoked();
438 >            value = x;
439          }
440      }
441 <    static final class IncFunction implements Function<Integer,Integer> {
442 <        final ExecutionMode m;
443 <        int invocationCount = 0;
444 <        Integer value;
445 <        IncFunction(ExecutionMode m) { this.m = m; }
441 >
442 >    class IncFunction extends CheckedIntegerAction
443 >        implements Function<Integer,Integer>
444 >    {
445 >        IncFunction(ExecutionMode m) { super(m); }
446          public Integer apply(Integer x) {
447 <            m.checkExecutionMode();
367 <            invocationCount++;
447 >            invoked();
448              return value = inc(x);
449          }
450      }
451 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
452 <        final ExecutionMode m;
453 <        int invocationCount = 0;
454 <        Integer value;
455 <        // Check this action was invoked exactly once when result is computed.
456 <        SubtractAction(ExecutionMode m) { this.m = m; }
451 >
452 >    // Choose non-commutative actions for better coverage
453 >    // A non-commutative function that handles and produces null values as well.
454 >    static Integer subtract(Integer x, Integer y) {
455 >        return (x == null && y == null) ? null :
456 >            ((x == null) ? 42 : x.intValue())
457 >            - ((y == null) ? 99 : y.intValue());
458 >    }
459 >
460 >    class SubtractAction extends CheckedIntegerAction
461 >        implements BiConsumer<Integer, Integer>
462 >    {
463 >        SubtractAction(ExecutionMode m) { super(m); }
464          public void accept(Integer x, Integer y) {
465 <            m.checkExecutionMode();
379 <            invocationCount++;
465 >            invoked();
466              value = subtract(x, y);
467          }
468      }
469 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
470 <        final ExecutionMode m;
471 <        int invocationCount = 0;
472 <        Integer value;
473 <        // Check this action was invoked exactly once when result is computed.
388 <        SubtractFunction(ExecutionMode m) { this.m = m; }
469 >
470 >    class SubtractFunction extends CheckedIntegerAction
471 >        implements BiFunction<Integer, Integer, Integer>
472 >    {
473 >        SubtractFunction(ExecutionMode m) { super(m); }
474          public Integer apply(Integer x, Integer y) {
475 <            m.checkExecutionMode();
391 <            invocationCount++;
475 >            invoked();
476              return value = subtract(x, y);
477          }
478      }
479 <    static final class Noop implements Runnable {
480 <        final ExecutionMode m;
481 <        int invocationCount = 0;
398 <        Noop(ExecutionMode m) { this.m = m; }
479 >
480 >    class Noop extends CheckedAction implements Runnable {
481 >        Noop(ExecutionMode m) { super(m); }
482          public void run() {
483 <            m.checkExecutionMode();
401 <            invocationCount++;
483 >            invoked();
484          }
485      }
486  
487 <    static final class FailingSupplier implements Supplier<Integer> {
488 <        final ExecutionMode m;
489 <        int invocationCount = 0;
490 <        FailingSupplier(ExecutionMode m) { this.m = m; }
487 >    class FailingSupplier extends CheckedAction
488 >        implements Supplier<Integer>
489 >    {
490 >        FailingSupplier(ExecutionMode m) { super(m); }
491          public Integer get() {
492 <            m.checkExecutionMode();
411 <            invocationCount++;
492 >            invoked();
493              throw new CFException();
494          }
495      }
496 <    static final class FailingConsumer implements Consumer<Integer> {
497 <        final ExecutionMode m;
498 <        int invocationCount = 0;
499 <        FailingConsumer(ExecutionMode m) { this.m = m; }
496 >
497 >    class FailingConsumer extends CheckedIntegerAction
498 >        implements Consumer<Integer>
499 >    {
500 >        FailingConsumer(ExecutionMode m) { super(m); }
501          public void accept(Integer x) {
502 <            m.checkExecutionMode();
503 <            invocationCount++;
502 >            invoked();
503 >            value = x;
504              throw new CFException();
505          }
506      }
507 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
508 <        final ExecutionMode m;
509 <        int invocationCount = 0;
510 <        FailingBiConsumer(ExecutionMode m) { this.m = m; }
507 >
508 >    class FailingBiConsumer extends CheckedIntegerAction
509 >        implements BiConsumer<Integer, Integer>
510 >    {
511 >        FailingBiConsumer(ExecutionMode m) { super(m); }
512          public void accept(Integer x, Integer y) {
513 <            m.checkExecutionMode();
514 <            invocationCount++;
513 >            invoked();
514 >            value = subtract(x, y);
515              throw new CFException();
516          }
517      }
518 <    static final class FailingFunction implements Function<Integer, Integer> {
519 <        final ExecutionMode m;
520 <        int invocationCount = 0;
521 <        FailingFunction(ExecutionMode m) { this.m = m; }
518 >
519 >    class FailingFunction extends CheckedIntegerAction
520 >        implements Function<Integer, Integer>
521 >    {
522 >        FailingFunction(ExecutionMode m) { super(m); }
523          public Integer apply(Integer x) {
524 <            m.checkExecutionMode();
525 <            invocationCount++;
524 >            invoked();
525 >            value = x;
526              throw new CFException();
527          }
528      }
529 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
530 <        final ExecutionMode m;
531 <        int invocationCount = 0;
532 <        FailingBiFunction(ExecutionMode m) { this.m = m; }
529 >
530 >    class FailingBiFunction extends CheckedIntegerAction
531 >        implements BiFunction<Integer, Integer, Integer>
532 >    {
533 >        FailingBiFunction(ExecutionMode m) { super(m); }
534          public Integer apply(Integer x, Integer y) {
535 <            m.checkExecutionMode();
536 <            invocationCount++;
535 >            invoked();
536 >            value = subtract(x, y);
537              throw new CFException();
538          }
539      }
540 <    static final class FailingRunnable implements Runnable {
541 <        final ExecutionMode m;
542 <        int invocationCount = 0;
458 <        FailingRunnable(ExecutionMode m) { this.m = m; }
540 >
541 >    class FailingRunnable extends CheckedAction implements Runnable {
542 >        FailingRunnable(ExecutionMode m) { super(m); }
543          public void run() {
544 <            m.checkExecutionMode();
461 <            invocationCount++;
544 >            invoked();
545              throw new CFException();
546          }
547      }
548  
549 <    static final class CompletableFutureInc
550 <        implements Function<Integer, CompletableFuture<Integer>> {
551 <        final ExecutionMode m;
552 <        int invocationCount = 0;
553 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
549 >
550 >    class CompletableFutureInc extends CheckedIntegerAction
551 >        implements Function<Integer, CompletableFuture<Integer>>
552 >    {
553 >        CompletableFutureInc(ExecutionMode m) { super(m); }
554          public CompletableFuture<Integer> apply(Integer x) {
555 <            m.checkExecutionMode();
556 <            invocationCount++;
555 >            invoked();
556 >            value = x;
557              CompletableFuture<Integer> f = new CompletableFuture<>();
558 <            f.complete(inc(x));
558 >            assertTrue(f.complete(inc(x)));
559              return f;
560          }
561      }
562  
563 <    static final class FailingCompletableFutureFunction
564 <        implements Function<Integer, CompletableFuture<Integer>> {
565 <        final ExecutionMode m;
566 <        int invocationCount = 0;
484 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
563 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
564 >        implements Function<Integer, CompletableFuture<Integer>>
565 >    {
566 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
567          public CompletableFuture<Integer> apply(Integer x) {
568 <            m.checkExecutionMode();
569 <            invocationCount++;
568 >            invoked();
569 >            value = x;
570              throw new CFException();
571          }
572      }
# Line 503 | Line 585 | public class CompletableFutureTest exten
585          }
586      }
587  
588 +    static final boolean defaultExecutorIsCommonPool
589 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
590 +
591      /**
592       * Permits the testing of parallel code for the 3 different
593 <     * execution modes without repeating all the testing code.
593 >     * execution modes without copy/pasting all the test methods.
594       */
595      enum ExecutionMode {
596 <        DEFAULT {
596 >        SYNC {
597              public void checkExecutionMode() {
598 +                assertFalse(ThreadExecutor.startedCurrentThread());
599                  assertNull(ForkJoinTask.getPool());
600              }
601              public CompletableFuture<Void> runAsync(Runnable a) {
# Line 583 | Line 669 | public class CompletableFutureTest exten
669  
670          ASYNC {
671              public void checkExecutionMode() {
672 <                assertSame(ForkJoinPool.commonPool(),
673 <                           ForkJoinTask.getPool());
672 >                assertEquals(defaultExecutorIsCommonPool,
673 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
674              }
675              public CompletableFuture<Void> runAsync(Runnable a) {
676                  return CompletableFuture.runAsync(a);
# Line 780 | Line 866 | public class CompletableFutureTest exten
866      {
867          final AtomicInteger a = new AtomicInteger(0);
868          final CompletableFuture<Integer> f = new CompletableFuture<>();
869 <        if (!createIncomplete) f.complete(v1);
869 >        if (!createIncomplete) assertTrue(f.complete(v1));
870          final CompletableFuture<Integer> g = f.exceptionally
871              ((Throwable t) -> {
872                  // Should not be called
873                  a.getAndIncrement();
874                  throw new AssertionError();
875              });
876 <        if (createIncomplete) f.complete(v1);
876 >        if (createIncomplete) assertTrue(f.complete(v1));
877  
878          checkCompletedNormally(g, v1);
879          checkCompletedNormally(f, v1);
880          assertEquals(0, a.get());
881      }}
882  
797
883      /**
884       * exceptionally action completes with function value on source
885       * exception
# Line 809 | Line 894 | public class CompletableFutureTest exten
894          if (!createIncomplete) f.completeExceptionally(ex);
895          final CompletableFuture<Integer> g = f.exceptionally
896              ((Throwable t) -> {
897 <                ExecutionMode.DEFAULT.checkExecutionMode();
897 >                ExecutionMode.SYNC.checkExecutionMode();
898                  threadAssertSame(t, ex);
899                  a.getAndIncrement();
900                  return v1;
# Line 831 | Line 916 | public class CompletableFutureTest exten
916          if (!createIncomplete) f.completeExceptionally(ex1);
917          final CompletableFuture<Integer> g = f.exceptionally
918              ((Throwable t) -> {
919 <                ExecutionMode.DEFAULT.checkExecutionMode();
919 >                ExecutionMode.SYNC.checkExecutionMode();
920                  threadAssertSame(t, ex1);
921                  a.getAndIncrement();
922                  throw ex2;
923              });
924          if (createIncomplete) f.completeExceptionally(ex1);
925  
926 <        checkCompletedWithWrappedCFException(g, ex2);
926 >        checkCompletedWithWrappedException(g, ex2);
927 >        assertEquals(1, a.get());
928 >    }}
929 >
930 >    /**
931 >     * whenComplete action executes on normal completion, propagating
932 >     * source result.
933 >     */
934 >    public void testWhenComplete_normalCompletion1() {
935 >        for (ExecutionMode m : ExecutionMode.values())
936 >        for (boolean createIncomplete : new boolean[] { true, false })
937 >        for (Integer v1 : new Integer[] { 1, null })
938 >    {
939 >        final AtomicInteger a = new AtomicInteger(0);
940 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
941 >        if (!createIncomplete) assertTrue(f.complete(v1));
942 >        final CompletableFuture<Integer> g = m.whenComplete
943 >            (f,
944 >             (Integer x, Throwable t) -> {
945 >                m.checkExecutionMode();
946 >                threadAssertSame(x, v1);
947 >                threadAssertNull(t);
948 >                a.getAndIncrement();
949 >            });
950 >        if (createIncomplete) assertTrue(f.complete(v1));
951 >
952 >        checkCompletedNormally(g, v1);
953 >        checkCompletedNormally(f, v1);
954 >        assertEquals(1, a.get());
955 >    }}
956 >
957 >    /**
958 >     * whenComplete action executes on exceptional completion, propagating
959 >     * source result.
960 >     */
961 >    public void testWhenComplete_exceptionalCompletion() {
962 >        for (ExecutionMode m : ExecutionMode.values())
963 >        for (boolean createIncomplete : new boolean[] { true, false })
964 >        for (Integer v1 : new Integer[] { 1, null })
965 >    {
966 >        final AtomicInteger a = new AtomicInteger(0);
967 >        final CFException ex = new CFException();
968 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
969 >        if (!createIncomplete) f.completeExceptionally(ex);
970 >        final CompletableFuture<Integer> g = m.whenComplete
971 >            (f,
972 >             (Integer x, Throwable t) -> {
973 >                m.checkExecutionMode();
974 >                threadAssertNull(x);
975 >                threadAssertSame(t, ex);
976 >                a.getAndIncrement();
977 >            });
978 >        if (createIncomplete) f.completeExceptionally(ex);
979 >
980 >        checkCompletedWithWrappedException(g, ex);
981 >        checkCompletedExceptionally(f, ex);
982 >        assertEquals(1, a.get());
983 >    }}
984 >
985 >    /**
986 >     * whenComplete action executes on cancelled source, propagating
987 >     * CancellationException.
988 >     */
989 >    public void testWhenComplete_sourceCancelled() {
990 >        for (ExecutionMode m : ExecutionMode.values())
991 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
992 >        for (boolean createIncomplete : new boolean[] { true, false })
993 >    {
994 >        final AtomicInteger a = new AtomicInteger(0);
995 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
996 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
997 >        final CompletableFuture<Integer> g = m.whenComplete
998 >            (f,
999 >             (Integer x, Throwable t) -> {
1000 >                m.checkExecutionMode();
1001 >                threadAssertNull(x);
1002 >                threadAssertTrue(t instanceof CancellationException);
1003 >                a.getAndIncrement();
1004 >            });
1005 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1006 >
1007 >        checkCompletedWithWrappedCancellationException(g);
1008 >        checkCancelled(f);
1009 >        assertEquals(1, a.get());
1010 >    }}
1011 >
1012 >    /**
1013 >     * If a whenComplete action throws an exception when triggered by
1014 >     * a normal completion, it completes exceptionally
1015 >     */
1016 >    public void testWhenComplete_actionFailed() {
1017 >        for (boolean createIncomplete : new boolean[] { true, false })
1018 >        for (ExecutionMode m : ExecutionMode.values())
1019 >        for (Integer v1 : new Integer[] { 1, null })
1020 >    {
1021 >        final AtomicInteger a = new AtomicInteger(0);
1022 >        final CFException ex = new CFException();
1023 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1024 >        if (!createIncomplete) assertTrue(f.complete(v1));
1025 >        final CompletableFuture<Integer> g = m.whenComplete
1026 >            (f,
1027 >             (Integer x, Throwable t) -> {
1028 >                m.checkExecutionMode();
1029 >                threadAssertSame(x, v1);
1030 >                threadAssertNull(t);
1031 >                a.getAndIncrement();
1032 >                throw ex;
1033 >            });
1034 >        if (createIncomplete) assertTrue(f.complete(v1));
1035 >
1036 >        checkCompletedWithWrappedException(g, ex);
1037 >        checkCompletedNormally(f, v1);
1038 >        assertEquals(1, a.get());
1039 >    }}
1040 >
1041 >    /**
1042 >     * If a whenComplete action throws an exception when triggered by
1043 >     * a source completion that also throws an exception, the source
1044 >     * exception takes precedence.
1045 >     */
1046 >    public void testWhenComplete_actionFailedSourceFailed() {
1047 >        for (boolean createIncomplete : new boolean[] { true, false })
1048 >        for (ExecutionMode m : ExecutionMode.values())
1049 >        for (Integer v1 : new Integer[] { 1, null })
1050 >    {
1051 >        final AtomicInteger a = new AtomicInteger(0);
1052 >        final CFException ex1 = new CFException();
1053 >        final CFException ex2 = new CFException();
1054 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1055 >
1056 >        if (!createIncomplete) f.completeExceptionally(ex1);
1057 >        final CompletableFuture<Integer> g = m.whenComplete
1058 >            (f,
1059 >             (Integer x, Throwable t) -> {
1060 >                m.checkExecutionMode();
1061 >                threadAssertSame(t, ex1);
1062 >                threadAssertNull(x);
1063 >                a.getAndIncrement();
1064 >                throw ex2;
1065 >            });
1066 >        if (createIncomplete) f.completeExceptionally(ex1);
1067 >
1068 >        checkCompletedWithWrappedException(g, ex1);
1069 >        checkCompletedExceptionally(f, ex1);
1070          assertEquals(1, a.get());
1071      }}
1072  
# Line 853 | Line 1081 | public class CompletableFutureTest exten
1081      {
1082          final CompletableFuture<Integer> f = new CompletableFuture<>();
1083          final AtomicInteger a = new AtomicInteger(0);
1084 <        if (!createIncomplete) f.complete(v1);
1084 >        if (!createIncomplete) assertTrue(f.complete(v1));
1085          final CompletableFuture<Integer> g = m.handle
1086              (f,
1087               (Integer x, Throwable t) -> {
# Line 863 | Line 1091 | public class CompletableFutureTest exten
1091                  a.getAndIncrement();
1092                  return inc(v1);
1093              });
1094 <        if (createIncomplete) f.complete(v1);
1094 >        if (createIncomplete) assertTrue(f.complete(v1));
1095  
1096          checkCompletedNormally(g, inc(v1));
1097          checkCompletedNormally(f, v1);
# Line 895 | Line 1123 | public class CompletableFutureTest exten
1123          if (createIncomplete) f.completeExceptionally(ex);
1124  
1125          checkCompletedNormally(g, v1);
1126 <        checkCompletedWithWrappedCFException(f, ex);
1126 >        checkCompletedExceptionally(f, ex);
1127          assertEquals(1, a.get());
1128      }}
1129  
# Line 951 | Line 1179 | public class CompletableFutureTest exten
1179              });
1180          if (createIncomplete) f.completeExceptionally(ex1);
1181  
1182 <        checkCompletedWithWrappedCFException(g, ex2);
1183 <        checkCompletedWithWrappedCFException(f, ex1);
1182 >        checkCompletedWithWrappedException(g, ex2);
1183 >        checkCompletedExceptionally(f, ex1);
1184          assertEquals(1, a.get());
1185      }}
1186  
# Line 964 | Line 1192 | public class CompletableFutureTest exten
1192          final CompletableFuture<Integer> f = new CompletableFuture<>();
1193          final AtomicInteger a = new AtomicInteger(0);
1194          final CFException ex = new CFException();
1195 <        if (!createIncomplete) f.complete(v1);
1195 >        if (!createIncomplete) assertTrue(f.complete(v1));
1196          final CompletableFuture<Integer> g = m.handle
1197              (f,
1198               (Integer x, Throwable t) -> {
# Line 974 | Line 1202 | public class CompletableFutureTest exten
1202                  a.getAndIncrement();
1203                  throw ex;
1204              });
1205 <        if (createIncomplete) f.complete(v1);
1205 >        if (createIncomplete) assertTrue(f.complete(v1));
1206  
1207 <        checkCompletedWithWrappedCFException(g, ex);
1207 >        checkCompletedWithWrappedException(g, ex);
1208          checkCompletedNormally(f, v1);
1209          assertEquals(1, a.get());
1210      }}
# Line 995 | Line 1223 | public class CompletableFutureTest exten
1223          final CompletableFuture<Void> f = m.runAsync(r);
1224          assertNull(f.join());
1225          checkCompletedNormally(f, null);
1226 <        assertEquals(1, r.invocationCount);
1226 >        r.assertInvoked();
1227      }}
1228  
1229      /**
# Line 1011 | Line 1239 | public class CompletableFutureTest exten
1239          final FailingRunnable r = new FailingRunnable(m);
1240          final CompletableFuture<Void> f = m.runAsync(r);
1241          checkCompletedWithWrappedCFException(f);
1242 <        assertEquals(1, r.invocationCount);
1242 >        r.assertInvoked();
1243      }}
1244  
1245      /**
# Line 1029 | Line 1257 | public class CompletableFutureTest exten
1257          final CompletableFuture<Integer> f = m.supplyAsync(r);
1258          assertSame(v1, f.join());
1259          checkCompletedNormally(f, v1);
1260 <        assertEquals(1, r.invocationCount);
1260 >        r.assertInvoked();
1261      }}
1262  
1263      /**
# Line 1045 | Line 1273 | public class CompletableFutureTest exten
1273          FailingSupplier r = new FailingSupplier(m);
1274          CompletableFuture<Integer> f = m.supplyAsync(r);
1275          checkCompletedWithWrappedCFException(f);
1276 <        assertEquals(1, r.invocationCount);
1276 >        r.assertInvoked();
1277      }}
1278  
1279      // seq completion methods
# Line 1055 | Line 1283 | public class CompletableFutureTest exten
1283       */
1284      public void testThenRun_normalCompletion() {
1285          for (ExecutionMode m : ExecutionMode.values())
1058        for (boolean createIncomplete : new boolean[] { true, false })
1286          for (Integer v1 : new Integer[] { 1, null })
1287      {
1288          final CompletableFuture<Integer> f = new CompletableFuture<>();
1289 <        final Noop r = new Noop(m);
1290 <        if (!createIncomplete) f.complete(v1);
1064 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1065 <        if (createIncomplete) {
1066 <            checkIncomplete(g);
1067 <            f.complete(v1);
1068 <        }
1289 >        final Noop[] rs = new Noop[6];
1290 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1291  
1292 <        checkCompletedNormally(g, null);
1292 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1293 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1294 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1295 >        checkIncomplete(h0);
1296 >        checkIncomplete(h1);
1297 >        checkIncomplete(h2);
1298 >        assertTrue(f.complete(v1));
1299 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1300 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1301 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1302 >
1303 >        checkCompletedNormally(h0, null);
1304 >        checkCompletedNormally(h1, null);
1305 >        checkCompletedNormally(h2, null);
1306 >        checkCompletedNormally(h3, null);
1307 >        checkCompletedNormally(h4, null);
1308 >        checkCompletedNormally(h5, null);
1309          checkCompletedNormally(f, v1);
1310 <        assertEquals(1, r.invocationCount);
1310 >        for (Noop r : rs) r.assertInvoked();
1311      }}
1312  
1313      /**
# Line 1078 | Line 1316 | public class CompletableFutureTest exten
1316       */
1317      public void testThenRun_exceptionalCompletion() {
1318          for (ExecutionMode m : ExecutionMode.values())
1081        for (boolean createIncomplete : new boolean[] { true, false })
1319      {
1320          final CFException ex = new CFException();
1321          final CompletableFuture<Integer> f = new CompletableFuture<>();
1322 <        final Noop r = new Noop(m);
1323 <        if (!createIncomplete) f.completeExceptionally(ex);
1087 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1088 <        if (createIncomplete) {
1089 <            checkIncomplete(g);
1090 <            f.completeExceptionally(ex);
1091 <        }
1322 >        final Noop[] rs = new Noop[6];
1323 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1324  
1325 <        checkCompletedWithWrappedCFException(g, ex);
1326 <        checkCompletedWithWrappedCFException(f, ex);
1327 <        assertEquals(0, r.invocationCount);
1325 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1326 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1327 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1328 >        checkIncomplete(h0);
1329 >        checkIncomplete(h1);
1330 >        checkIncomplete(h2);
1331 >        assertTrue(f.completeExceptionally(ex));
1332 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1333 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1334 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1335 >
1336 >        checkCompletedWithWrappedException(h0, ex);
1337 >        checkCompletedWithWrappedException(h1, ex);
1338 >        checkCompletedWithWrappedException(h2, ex);
1339 >        checkCompletedWithWrappedException(h3, ex);
1340 >        checkCompletedWithWrappedException(h4, ex);
1341 >        checkCompletedWithWrappedException(h5, ex);
1342 >        checkCompletedExceptionally(f, ex);
1343 >        for (Noop r : rs) r.assertNotInvoked();
1344      }}
1345  
1346      /**
# Line 1100 | Line 1348 | public class CompletableFutureTest exten
1348       */
1349      public void testThenRun_sourceCancelled() {
1350          for (ExecutionMode m : ExecutionMode.values())
1103        for (boolean createIncomplete : new boolean[] { true, false })
1351          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1352      {
1353          final CompletableFuture<Integer> f = new CompletableFuture<>();
1354 <        final Noop r = new Noop(m);
1355 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1109 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1110 <        if (createIncomplete) {
1111 <            checkIncomplete(g);
1112 <            assertTrue(f.cancel(mayInterruptIfRunning));
1113 <        }
1354 >        final Noop[] rs = new Noop[6];
1355 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1356  
1357 <        checkCompletedWithWrappedCancellationException(g);
1357 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1358 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1359 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1360 >        checkIncomplete(h0);
1361 >        checkIncomplete(h1);
1362 >        checkIncomplete(h2);
1363 >        assertTrue(f.cancel(mayInterruptIfRunning));
1364 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1365 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1366 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1367 >
1368 >        checkCompletedWithWrappedCancellationException(h0);
1369 >        checkCompletedWithWrappedCancellationException(h1);
1370 >        checkCompletedWithWrappedCancellationException(h2);
1371 >        checkCompletedWithWrappedCancellationException(h3);
1372 >        checkCompletedWithWrappedCancellationException(h4);
1373 >        checkCompletedWithWrappedCancellationException(h5);
1374          checkCancelled(f);
1375 <        assertEquals(0, r.invocationCount);
1375 >        for (Noop r : rs) r.assertNotInvoked();
1376      }}
1377  
1378      /**
# Line 1122 | Line 1380 | public class CompletableFutureTest exten
1380       */
1381      public void testThenRun_actionFailed() {
1382          for (ExecutionMode m : ExecutionMode.values())
1125        for (boolean createIncomplete : new boolean[] { true, false })
1383          for (Integer v1 : new Integer[] { 1, null })
1384      {
1385          final CompletableFuture<Integer> f = new CompletableFuture<>();
1386 <        final FailingRunnable r = new FailingRunnable(m);
1387 <        if (!createIncomplete) f.complete(v1);
1131 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1132 <        if (createIncomplete) {
1133 <            checkIncomplete(g);
1134 <            f.complete(v1);
1135 <        }
1386 >        final FailingRunnable[] rs = new FailingRunnable[6];
1387 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1388  
1389 <        checkCompletedWithWrappedCFException(g);
1389 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1390 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1391 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1392 >        assertTrue(f.complete(v1));
1393 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1394 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1395 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1396 >
1397 >        checkCompletedWithWrappedCFException(h0);
1398 >        checkCompletedWithWrappedCFException(h1);
1399 >        checkCompletedWithWrappedCFException(h2);
1400 >        checkCompletedWithWrappedCFException(h3);
1401 >        checkCompletedWithWrappedCFException(h4);
1402 >        checkCompletedWithWrappedCFException(h5);
1403          checkCompletedNormally(f, v1);
1404      }}
1405  
# Line 1143 | Line 1408 | public class CompletableFutureTest exten
1408       */
1409      public void testThenApply_normalCompletion() {
1410          for (ExecutionMode m : ExecutionMode.values())
1146        for (boolean createIncomplete : new boolean[] { true, false })
1411          for (Integer v1 : new Integer[] { 1, null })
1412      {
1413          final CompletableFuture<Integer> f = new CompletableFuture<>();
1414 <        final IncFunction r = new IncFunction(m);
1415 <        if (!createIncomplete) f.complete(v1);
1152 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1153 <        if (createIncomplete) {
1154 <            checkIncomplete(g);
1155 <            f.complete(v1);
1156 <        }
1414 >        final IncFunction[] rs = new IncFunction[4];
1415 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1416  
1417 <        checkCompletedNormally(g, inc(v1));
1417 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1418 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1419 >        checkIncomplete(h0);
1420 >        checkIncomplete(h1);
1421 >        assertTrue(f.complete(v1));
1422 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1423 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1424 >
1425 >        checkCompletedNormally(h0, inc(v1));
1426 >        checkCompletedNormally(h1, inc(v1));
1427 >        checkCompletedNormally(h2, inc(v1));
1428 >        checkCompletedNormally(h3, inc(v1));
1429          checkCompletedNormally(f, v1);
1430 <        assertEquals(1, r.invocationCount);
1430 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1431      }}
1432  
1433      /**
# Line 1166 | Line 1436 | public class CompletableFutureTest exten
1436       */
1437      public void testThenApply_exceptionalCompletion() {
1438          for (ExecutionMode m : ExecutionMode.values())
1169        for (boolean createIncomplete : new boolean[] { true, false })
1439      {
1440          final CFException ex = new CFException();
1441          final CompletableFuture<Integer> f = new CompletableFuture<>();
1442 <        final IncFunction r = new IncFunction(m);
1443 <        if (!createIncomplete) f.completeExceptionally(ex);
1175 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1176 <        if (createIncomplete) {
1177 <            checkIncomplete(g);
1178 <            f.completeExceptionally(ex);
1179 <        }
1442 >        final IncFunction[] rs = new IncFunction[4];
1443 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1444  
1445 <        checkCompletedWithWrappedCFException(g, ex);
1446 <        checkCompletedWithWrappedCFException(f, ex);
1447 <        assertEquals(0, r.invocationCount);
1445 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1446 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1447 >        assertTrue(f.completeExceptionally(ex));
1448 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1449 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1450 >
1451 >        checkCompletedWithWrappedException(h0, ex);
1452 >        checkCompletedWithWrappedException(h1, ex);
1453 >        checkCompletedWithWrappedException(h2, ex);
1454 >        checkCompletedWithWrappedException(h3, ex);
1455 >        checkCompletedExceptionally(f, ex);
1456 >        for (IncFunction r : rs) r.assertNotInvoked();
1457      }}
1458  
1459      /**
# Line 1188 | Line 1461 | public class CompletableFutureTest exten
1461       */
1462      public void testThenApply_sourceCancelled() {
1463          for (ExecutionMode m : ExecutionMode.values())
1191        for (boolean createIncomplete : new boolean[] { true, false })
1464          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1465      {
1466          final CompletableFuture<Integer> f = new CompletableFuture<>();
1467 <        final IncFunction r = new IncFunction(m);
1468 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1197 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1198 <        if (createIncomplete) {
1199 <            checkIncomplete(g);
1200 <            assertTrue(f.cancel(mayInterruptIfRunning));
1201 <        }
1467 >        final IncFunction[] rs = new IncFunction[4];
1468 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1469  
1470 <        checkCompletedWithWrappedCancellationException(g);
1470 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1471 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1472 >        assertTrue(f.cancel(mayInterruptIfRunning));
1473 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1474 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1475 >
1476 >        checkCompletedWithWrappedCancellationException(h0);
1477 >        checkCompletedWithWrappedCancellationException(h1);
1478 >        checkCompletedWithWrappedCancellationException(h2);
1479 >        checkCompletedWithWrappedCancellationException(h3);
1480          checkCancelled(f);
1481 <        assertEquals(0, r.invocationCount);
1481 >        for (IncFunction r : rs) r.assertNotInvoked();
1482      }}
1483  
1484      /**
# Line 1210 | Line 1486 | public class CompletableFutureTest exten
1486       */
1487      public void testThenApply_actionFailed() {
1488          for (ExecutionMode m : ExecutionMode.values())
1213        for (boolean createIncomplete : new boolean[] { true, false })
1489          for (Integer v1 : new Integer[] { 1, null })
1490      {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final FailingFunction r = new FailingFunction(m);
1493 <        if (!createIncomplete) f.complete(v1);
1219 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1220 <        if (createIncomplete) {
1221 <            checkIncomplete(g);
1222 <            f.complete(v1);
1223 <        }
1492 >        final FailingFunction[] rs = new FailingFunction[4];
1493 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1494  
1495 <        checkCompletedWithWrappedCFException(g);
1495 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1496 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1497 >        assertTrue(f.complete(v1));
1498 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1499 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1500 >
1501 >        checkCompletedWithWrappedCFException(h0);
1502 >        checkCompletedWithWrappedCFException(h1);
1503 >        checkCompletedWithWrappedCFException(h2);
1504 >        checkCompletedWithWrappedCFException(h3);
1505          checkCompletedNormally(f, v1);
1506      }}
1507  
# Line 1231 | Line 1510 | public class CompletableFutureTest exten
1510       */
1511      public void testThenAccept_normalCompletion() {
1512          for (ExecutionMode m : ExecutionMode.values())
1234        for (boolean createIncomplete : new boolean[] { true, false })
1513          for (Integer v1 : new Integer[] { 1, null })
1514      {
1515          final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 <        final IncAction r = new IncAction();
1517 <        if (!createIncomplete) f.complete(v1);
1240 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1241 <        if (createIncomplete) {
1242 <            checkIncomplete(g);
1243 <            f.complete(v1);
1244 <        }
1516 >        final NoopConsumer[] rs = new NoopConsumer[4];
1517 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1518  
1519 <        checkCompletedNormally(g, null);
1519 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1520 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1521 >        checkIncomplete(h0);
1522 >        checkIncomplete(h1);
1523 >        assertTrue(f.complete(v1));
1524 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1525 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1526 >
1527 >        checkCompletedNormally(h0, null);
1528 >        checkCompletedNormally(h1, null);
1529 >        checkCompletedNormally(h2, null);
1530 >        checkCompletedNormally(h3, null);
1531          checkCompletedNormally(f, v1);
1532 <        assertEquals(1, r.invocationCount);
1249 <        assertEquals(inc(v1), r.value);
1532 >        for (NoopConsumer r : rs) r.assertValue(v1);
1533      }}
1534  
1535      /**
# Line 1255 | Line 1538 | public class CompletableFutureTest exten
1538       */
1539      public void testThenAccept_exceptionalCompletion() {
1540          for (ExecutionMode m : ExecutionMode.values())
1258        for (boolean createIncomplete : new boolean[] { true, false })
1541      {
1542          final CFException ex = new CFException();
1543          final CompletableFuture<Integer> f = new CompletableFuture<>();
1544 <        final IncAction r = new IncAction();
1545 <        if (!createIncomplete) f.completeExceptionally(ex);
1264 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1265 <        if (createIncomplete) {
1266 <            checkIncomplete(g);
1267 <            f.completeExceptionally(ex);
1268 <        }
1544 >        final NoopConsumer[] rs = new NoopConsumer[4];
1545 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1546  
1547 <        checkCompletedWithWrappedCFException(g, ex);
1548 <        checkCompletedWithWrappedCFException(f, ex);
1549 <        assertEquals(0, r.invocationCount);
1547 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1548 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1549 >        assertTrue(f.completeExceptionally(ex));
1550 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1551 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1552 >
1553 >        checkCompletedWithWrappedException(h0, ex);
1554 >        checkCompletedWithWrappedException(h1, ex);
1555 >        checkCompletedWithWrappedException(h2, ex);
1556 >        checkCompletedWithWrappedException(h3, ex);
1557 >        checkCompletedExceptionally(f, ex);
1558 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1559      }}
1560  
1561      /**
1562 <     * thenAccept result completes exceptionally if action does
1562 >     * thenAccept result completes exceptionally if source cancelled
1563       */
1564 <    public void testThenAccept_actionFailed() {
1564 >    public void testThenAccept_sourceCancelled() {
1565          for (ExecutionMode m : ExecutionMode.values())
1566 <        for (boolean createIncomplete : new boolean[] { true, false })
1281 <        for (Integer v1 : new Integer[] { 1, null })
1566 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1567      {
1568          final CompletableFuture<Integer> f = new CompletableFuture<>();
1569 <        final FailingConsumer r = new FailingConsumer(m);
1570 <        if (!createIncomplete) f.complete(v1);
1286 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1287 <        if (createIncomplete) {
1288 <            checkIncomplete(g);
1289 <            f.complete(v1);
1290 <        }
1569 >        final NoopConsumer[] rs = new NoopConsumer[4];
1570 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1571  
1572 <        checkCompletedWithWrappedCFException(g);
1573 <        checkCompletedNormally(f, v1);
1572 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1573 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1574 >        assertTrue(f.cancel(mayInterruptIfRunning));
1575 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1576 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1577 >
1578 >        checkCompletedWithWrappedCancellationException(h0);
1579 >        checkCompletedWithWrappedCancellationException(h1);
1580 >        checkCompletedWithWrappedCancellationException(h2);
1581 >        checkCompletedWithWrappedCancellationException(h3);
1582 >        checkCancelled(f);
1583 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1584      }}
1585  
1586      /**
1587 <     * thenAccept result completes exceptionally if source cancelled
1587 >     * thenAccept result completes exceptionally if action does
1588       */
1589 <    public void testThenAccept_sourceCancelled() {
1589 >    public void testThenAccept_actionFailed() {
1590          for (ExecutionMode m : ExecutionMode.values())
1591 <        for (boolean createIncomplete : new boolean[] { true, false })
1302 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1591 >        for (Integer v1 : new Integer[] { 1, null })
1592      {
1593          final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 <        final IncAction r = new IncAction();
1595 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1307 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1308 <        if (createIncomplete) {
1309 <            checkIncomplete(g);
1310 <            assertTrue(f.cancel(mayInterruptIfRunning));
1311 <        }
1594 >        final FailingConsumer[] rs = new FailingConsumer[4];
1595 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1596  
1597 <        checkCompletedWithWrappedCancellationException(g);
1598 <        checkCancelled(f);
1599 <        assertEquals(0, r.invocationCount);
1597 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1598 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1599 >        assertTrue(f.complete(v1));
1600 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1601 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1602 >
1603 >        checkCompletedWithWrappedCFException(h0);
1604 >        checkCompletedWithWrappedCFException(h1);
1605 >        checkCompletedWithWrappedCFException(h2);
1606 >        checkCompletedWithWrappedCFException(h3);
1607 >        checkCompletedNormally(f, v1);
1608      }}
1609  
1610      /**
# Line 1321 | Line 1613 | public class CompletableFutureTest exten
1613       */
1614      public void testThenCombine_normalCompletion() {
1615          for (ExecutionMode m : ExecutionMode.values())
1324        for (boolean createIncomplete : new boolean[] { true, false })
1616          for (boolean fFirst : new boolean[] { true, false })
1617          for (Integer v1 : new Integer[] { 1, null })
1618          for (Integer v2 : new Integer[] { 2, null })
1619      {
1620          final CompletableFuture<Integer> f = new CompletableFuture<>();
1621          final CompletableFuture<Integer> g = new CompletableFuture<>();
1622 <        final SubtractFunction r = new SubtractFunction(m);
1622 >        final SubtractFunction[] rs = new SubtractFunction[6];
1623 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1624  
1625 <        if (fFirst) f.complete(v1); else g.complete(v2);
1626 <        if (!createIncomplete)
1627 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1628 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1629 <        if (createIncomplete) {
1630 <            checkIncomplete(h);
1631 <            assertEquals(0, r.invocationCount);
1632 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1633 <        }
1625 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1626 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1627 >        final Integer w1 =  fFirst ? v1 : v2;
1628 >        final Integer w2 = !fFirst ? v1 : v2;
1629 >
1630 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1631 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1632 >        assertTrue(fst.complete(w1));
1633 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1634 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1635 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1636 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1637 >        checkCompletedNormally(h1, subtract(w1, w1));
1638 >        checkCompletedNormally(h3, subtract(w1, w1));
1639 >        rs[1].assertValue(subtract(w1, w1));
1640 >        rs[3].assertValue(subtract(w1, w1));
1641 >        assertTrue(snd.complete(w2));
1642 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1643 >
1644 >        checkCompletedNormally(h0, subtract(v1, v2));
1645 >        checkCompletedNormally(h2, subtract(v1, v2));
1646 >        checkCompletedNormally(h4, subtract(v1, v2));
1647 >        rs[0].assertValue(subtract(v1, v2));
1648 >        rs[2].assertValue(subtract(v1, v2));
1649 >        rs[4].assertValue(subtract(v1, v2));
1650  
1343        checkCompletedNormally(h, subtract(v1, v2));
1651          checkCompletedNormally(f, v1);
1652          checkCompletedNormally(g, v2);
1346        assertEquals(1, r.invocationCount);
1653      }}
1654  
1655      /**
1656       * thenCombine result completes exceptionally after exceptional
1657       * completion of either source
1658       */
1659 <    public void testThenCombine_exceptionalCompletion() {
1659 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1660          for (ExecutionMode m : ExecutionMode.values())
1355        for (boolean createIncomplete : new boolean[] { true, false })
1661          for (boolean fFirst : new boolean[] { true, false })
1662 +        for (boolean failFirst : new boolean[] { true, false })
1663          for (Integer v1 : new Integer[] { 1, null })
1664      {
1665          final CompletableFuture<Integer> f = new CompletableFuture<>();
1666          final CompletableFuture<Integer> g = new CompletableFuture<>();
1667          final CFException ex = new CFException();
1668 <        final SubtractFunction r = new SubtractFunction(m);
1669 <
1670 <        (fFirst ? f : g).complete(v1);
1671 <        if (!createIncomplete)
1672 <            (!fFirst ? f : g).completeExceptionally(ex);
1673 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1674 <        if (createIncomplete) {
1675 <            checkIncomplete(h);
1676 <            (!fFirst ? f : g).completeExceptionally(ex);
1677 <        }
1678 <
1679 <        checkCompletedWithWrappedCFException(h, ex);
1680 <        assertEquals(0, r.invocationCount);
1681 <        checkCompletedNormally(fFirst ? f : g, v1);
1682 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1668 >        final SubtractFunction r1 = new SubtractFunction(m);
1669 >        final SubtractFunction r2 = new SubtractFunction(m);
1670 >        final SubtractFunction r3 = new SubtractFunction(m);
1671 >
1672 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1673 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1674 >        final Callable<Boolean> complete1 = failFirst ?
1675 >            () -> fst.completeExceptionally(ex) :
1676 >            () -> fst.complete(v1);
1677 >        final Callable<Boolean> complete2 = failFirst ?
1678 >            () -> snd.complete(v1) :
1679 >            () -> snd.completeExceptionally(ex);
1680 >
1681 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1682 >        assertTrue(complete1.call());
1683 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1684 >        checkIncomplete(h1);
1685 >        checkIncomplete(h2);
1686 >        assertTrue(complete2.call());
1687 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1688 >
1689 >        checkCompletedWithWrappedException(h1, ex);
1690 >        checkCompletedWithWrappedException(h2, ex);
1691 >        checkCompletedWithWrappedException(h3, ex);
1692 >        r1.assertNotInvoked();
1693 >        r2.assertNotInvoked();
1694 >        r3.assertNotInvoked();
1695 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1696 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1697      }}
1698  
1699      /**
1700 <     * thenCombine result completes exceptionally if action does
1700 >     * thenCombine result completes exceptionally if either source cancelled
1701       */
1702 <    public void testThenCombine_actionFailed() {
1702 >    public void testThenCombine_sourceCancelled() throws Throwable {
1703          for (ExecutionMode m : ExecutionMode.values())
1704 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1705          for (boolean fFirst : new boolean[] { true, false })
1706 +        for (boolean failFirst : new boolean[] { true, false })
1707          for (Integer v1 : new Integer[] { 1, null })
1386        for (Integer v2 : new Integer[] { 2, null })
1708      {
1709          final CompletableFuture<Integer> f = new CompletableFuture<>();
1710          final CompletableFuture<Integer> g = new CompletableFuture<>();
1711 <        final FailingBiFunction r = new FailingBiFunction(m);
1712 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1713 <
1714 <        if (fFirst) {
1715 <            f.complete(v1);
1716 <            g.complete(v2);
1717 <        } else {
1718 <            g.complete(v2);
1719 <            f.complete(v1);
1720 <        }
1721 <
1722 <        checkCompletedWithWrappedCFException(h);
1723 <        checkCompletedNormally(f, v1);
1724 <        checkCompletedNormally(g, v2);
1711 >        final SubtractFunction r1 = new SubtractFunction(m);
1712 >        final SubtractFunction r2 = new SubtractFunction(m);
1713 >        final SubtractFunction r3 = new SubtractFunction(m);
1714 >
1715 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1716 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1717 >        final Callable<Boolean> complete1 = failFirst ?
1718 >            () -> fst.cancel(mayInterruptIfRunning) :
1719 >            () -> fst.complete(v1);
1720 >        final Callable<Boolean> complete2 = failFirst ?
1721 >            () -> snd.complete(v1) :
1722 >            () -> snd.cancel(mayInterruptIfRunning);
1723 >
1724 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1725 >        assertTrue(complete1.call());
1726 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1727 >        checkIncomplete(h1);
1728 >        checkIncomplete(h2);
1729 >        assertTrue(complete2.call());
1730 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1731 >
1732 >        checkCompletedWithWrappedCancellationException(h1);
1733 >        checkCompletedWithWrappedCancellationException(h2);
1734 >        checkCompletedWithWrappedCancellationException(h3);
1735 >        r1.assertNotInvoked();
1736 >        r2.assertNotInvoked();
1737 >        r3.assertNotInvoked();
1738 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1739 >        checkCancelled(failFirst ? fst : snd);
1740      }}
1741  
1742      /**
1743 <     * thenCombine result completes exceptionally if either source cancelled
1743 >     * thenCombine result completes exceptionally if action does
1744       */
1745 <    public void testThenCombine_sourceCancelled() {
1745 >    public void testThenCombine_actionFailed() {
1746          for (ExecutionMode m : ExecutionMode.values())
1411        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1412        for (boolean createIncomplete : new boolean[] { true, false })
1747          for (boolean fFirst : new boolean[] { true, false })
1748          for (Integer v1 : new Integer[] { 1, null })
1749 +        for (Integer v2 : new Integer[] { 2, null })
1750      {
1751          final CompletableFuture<Integer> f = new CompletableFuture<>();
1752          final CompletableFuture<Integer> g = new CompletableFuture<>();
1753 <        final SubtractFunction r = new SubtractFunction(m);
1754 <
1755 <        (fFirst ? f : g).complete(v1);
1756 <        if (!createIncomplete)
1757 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1758 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1759 <        if (createIncomplete) {
1760 <            checkIncomplete(h);
1761 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1762 <        }
1753 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1754 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1755 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1756 >
1757 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1758 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1759 >        final Integer w1 =  fFirst ? v1 : v2;
1760 >        final Integer w2 = !fFirst ? v1 : v2;
1761 >
1762 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1763 >        assertTrue(fst.complete(w1));
1764 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1765 >        assertTrue(snd.complete(w2));
1766 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1767  
1768 <        checkCompletedWithWrappedCancellationException(h);
1769 <        checkCancelled(!fFirst ? f : g);
1770 <        assertEquals(0, r.invocationCount);
1771 <        checkCompletedNormally(fFirst ? f : g, v1);
1768 >        checkCompletedWithWrappedCFException(h1);
1769 >        checkCompletedWithWrappedCFException(h2);
1770 >        checkCompletedWithWrappedCFException(h3);
1771 >        r1.assertInvoked();
1772 >        r2.assertInvoked();
1773 >        r3.assertInvoked();
1774 >        checkCompletedNormally(f, v1);
1775 >        checkCompletedNormally(g, v2);
1776      }}
1777  
1778      /**
# Line 1438 | Line 1781 | public class CompletableFutureTest exten
1781       */
1782      public void testThenAcceptBoth_normalCompletion() {
1783          for (ExecutionMode m : ExecutionMode.values())
1441        for (boolean createIncomplete : new boolean[] { true, false })
1784          for (boolean fFirst : new boolean[] { true, false })
1785          for (Integer v1 : new Integer[] { 1, null })
1786          for (Integer v2 : new Integer[] { 2, null })
1787      {
1788          final CompletableFuture<Integer> f = new CompletableFuture<>();
1789          final CompletableFuture<Integer> g = new CompletableFuture<>();
1790 <        final SubtractAction r = new SubtractAction(m);
1791 <
1792 <        if (fFirst) f.complete(v1); else g.complete(v2);
1793 <        if (!createIncomplete)
1794 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1795 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1796 <        if (createIncomplete) {
1797 <            checkIncomplete(h);
1798 <            assertEquals(0, r.invocationCount);
1799 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1800 <        }
1801 <
1802 <        checkCompletedNormally(h, null);
1803 <        assertEquals(subtract(v1, v2), r.value);
1790 >        final SubtractAction r1 = new SubtractAction(m);
1791 >        final SubtractAction r2 = new SubtractAction(m);
1792 >        final SubtractAction r3 = new SubtractAction(m);
1793 >
1794 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1795 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1796 >        final Integer w1 =  fFirst ? v1 : v2;
1797 >        final Integer w2 = !fFirst ? v1 : v2;
1798 >
1799 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1800 >        assertTrue(fst.complete(w1));
1801 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1802 >        checkIncomplete(h1);
1803 >        checkIncomplete(h2);
1804 >        r1.assertNotInvoked();
1805 >        r2.assertNotInvoked();
1806 >        assertTrue(snd.complete(w2));
1807 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1808 >
1809 >        checkCompletedNormally(h1, null);
1810 >        checkCompletedNormally(h2, null);
1811 >        checkCompletedNormally(h3, null);
1812 >        r1.assertValue(subtract(v1, v2));
1813 >        r2.assertValue(subtract(v1, v2));
1814 >        r3.assertValue(subtract(v1, v2));
1815          checkCompletedNormally(f, v1);
1816          checkCompletedNormally(g, v2);
1817      }}
# Line 1467 | Line 1820 | public class CompletableFutureTest exten
1820       * thenAcceptBoth result completes exceptionally after exceptional
1821       * completion of either source
1822       */
1823 <    public void testThenAcceptBoth_exceptionalCompletion() {
1823 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1824          for (ExecutionMode m : ExecutionMode.values())
1472        for (boolean createIncomplete : new boolean[] { true, false })
1825          for (boolean fFirst : new boolean[] { true, false })
1826 +        for (boolean failFirst : new boolean[] { true, false })
1827          for (Integer v1 : new Integer[] { 1, null })
1828      {
1829          final CompletableFuture<Integer> f = new CompletableFuture<>();
1830          final CompletableFuture<Integer> g = new CompletableFuture<>();
1831          final CFException ex = new CFException();
1832 <        final SubtractAction r = new SubtractAction(m);
1833 <
1834 <        (fFirst ? f : g).complete(v1);
1835 <        if (!createIncomplete)
1836 <            (!fFirst ? f : g).completeExceptionally(ex);
1837 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1838 <        if (createIncomplete) {
1839 <            checkIncomplete(h);
1840 <            (!fFirst ? f : g).completeExceptionally(ex);
1841 <        }
1842 <
1843 <        checkCompletedWithWrappedCFException(h, ex);
1844 <        assertEquals(0, r.invocationCount);
1845 <        checkCompletedNormally(fFirst ? f : g, v1);
1846 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1832 >        final SubtractAction r1 = new SubtractAction(m);
1833 >        final SubtractAction r2 = new SubtractAction(m);
1834 >        final SubtractAction r3 = new SubtractAction(m);
1835 >
1836 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1837 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1838 >        final Callable<Boolean> complete1 = failFirst ?
1839 >            () -> fst.completeExceptionally(ex) :
1840 >            () -> fst.complete(v1);
1841 >        final Callable<Boolean> complete2 = failFirst ?
1842 >            () -> snd.complete(v1) :
1843 >            () -> snd.completeExceptionally(ex);
1844 >
1845 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1846 >        assertTrue(complete1.call());
1847 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1848 >        checkIncomplete(h1);
1849 >        checkIncomplete(h2);
1850 >        assertTrue(complete2.call());
1851 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1852 >
1853 >        checkCompletedWithWrappedException(h1, ex);
1854 >        checkCompletedWithWrappedException(h2, ex);
1855 >        checkCompletedWithWrappedException(h3, ex);
1856 >        r1.assertNotInvoked();
1857 >        r2.assertNotInvoked();
1858 >        r3.assertNotInvoked();
1859 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1860 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1861      }}
1862  
1863      /**
1864 <     * thenAcceptBoth result completes exceptionally if action does
1864 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1865       */
1866 <    public void testThenAcceptBoth_actionFailed() {
1866 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1867          for (ExecutionMode m : ExecutionMode.values())
1868 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1869          for (boolean fFirst : new boolean[] { true, false })
1870 +        for (boolean failFirst : new boolean[] { true, false })
1871          for (Integer v1 : new Integer[] { 1, null })
1503        for (Integer v2 : new Integer[] { 2, null })
1872      {
1873          final CompletableFuture<Integer> f = new CompletableFuture<>();
1874          final CompletableFuture<Integer> g = new CompletableFuture<>();
1875 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1876 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1877 <
1878 <        if (fFirst) {
1879 <            f.complete(v1);
1880 <            g.complete(v2);
1881 <        } else {
1882 <            g.complete(v2);
1883 <            f.complete(v1);
1884 <        }
1885 <
1886 <        checkCompletedWithWrappedCFException(h);
1887 <        checkCompletedNormally(f, v1);
1888 <        checkCompletedNormally(g, v2);
1875 >        final SubtractAction r1 = new SubtractAction(m);
1876 >        final SubtractAction r2 = new SubtractAction(m);
1877 >        final SubtractAction r3 = new SubtractAction(m);
1878 >
1879 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1880 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1881 >        final Callable<Boolean> complete1 = failFirst ?
1882 >            () -> fst.cancel(mayInterruptIfRunning) :
1883 >            () -> fst.complete(v1);
1884 >        final Callable<Boolean> complete2 = failFirst ?
1885 >            () -> snd.complete(v1) :
1886 >            () -> snd.cancel(mayInterruptIfRunning);
1887 >
1888 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1889 >        assertTrue(complete1.call());
1890 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1891 >        checkIncomplete(h1);
1892 >        checkIncomplete(h2);
1893 >        assertTrue(complete2.call());
1894 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1895 >
1896 >        checkCompletedWithWrappedCancellationException(h1);
1897 >        checkCompletedWithWrappedCancellationException(h2);
1898 >        checkCompletedWithWrappedCancellationException(h3);
1899 >        r1.assertNotInvoked();
1900 >        r2.assertNotInvoked();
1901 >        r3.assertNotInvoked();
1902 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1903 >        checkCancelled(failFirst ? fst : snd);
1904      }}
1905  
1906      /**
1907 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1907 >     * thenAcceptBoth result completes exceptionally if action does
1908       */
1909 <    public void testThenAcceptBoth_sourceCancelled() {
1909 >    public void testThenAcceptBoth_actionFailed() {
1910          for (ExecutionMode m : ExecutionMode.values())
1528        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1529        for (boolean createIncomplete : new boolean[] { true, false })
1911          for (boolean fFirst : new boolean[] { true, false })
1912          for (Integer v1 : new Integer[] { 1, null })
1913 +        for (Integer v2 : new Integer[] { 2, null })
1914      {
1915          final CompletableFuture<Integer> f = new CompletableFuture<>();
1916          final CompletableFuture<Integer> g = new CompletableFuture<>();
1917 <        final SubtractAction r = new SubtractAction(m);
1918 <
1919 <        (fFirst ? f : g).complete(v1);
1920 <        if (!createIncomplete)
1921 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1922 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1923 <        if (createIncomplete) {
1924 <            checkIncomplete(h);
1925 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1926 <        }
1917 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1918 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1919 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1920 >
1921 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1922 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1923 >        final Integer w1 =  fFirst ? v1 : v2;
1924 >        final Integer w2 = !fFirst ? v1 : v2;
1925 >
1926 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1927 >        assertTrue(fst.complete(w1));
1928 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1929 >        assertTrue(snd.complete(w2));
1930 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1931  
1932 <        checkCompletedWithWrappedCancellationException(h);
1933 <        checkCancelled(!fFirst ? f : g);
1934 <        assertEquals(0, r.invocationCount);
1935 <        checkCompletedNormally(fFirst ? f : g, v1);
1932 >        checkCompletedWithWrappedCFException(h1);
1933 >        checkCompletedWithWrappedCFException(h2);
1934 >        checkCompletedWithWrappedCFException(h3);
1935 >        r1.assertInvoked();
1936 >        r2.assertInvoked();
1937 >        r3.assertInvoked();
1938 >        checkCompletedNormally(f, v1);
1939 >        checkCompletedNormally(g, v2);
1940      }}
1941  
1942      /**
# Line 1555 | Line 1945 | public class CompletableFutureTest exten
1945       */
1946      public void testRunAfterBoth_normalCompletion() {
1947          for (ExecutionMode m : ExecutionMode.values())
1558        for (boolean createIncomplete : new boolean[] { true, false })
1948          for (boolean fFirst : new boolean[] { true, false })
1949          for (Integer v1 : new Integer[] { 1, null })
1950          for (Integer v2 : new Integer[] { 2, null })
1951      {
1952          final CompletableFuture<Integer> f = new CompletableFuture<>();
1953          final CompletableFuture<Integer> g = new CompletableFuture<>();
1954 <        final Noop r = new Noop(m);
1955 <
1956 <        if (fFirst) f.complete(v1); else g.complete(v2);
1957 <        if (!createIncomplete)
1958 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1959 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1960 <        if (createIncomplete) {
1961 <            checkIncomplete(h);
1962 <            assertEquals(0, r.invocationCount);
1963 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1964 <        }
1965 <
1966 <        checkCompletedNormally(h, null);
1967 <        assertEquals(1, r.invocationCount);
1954 >        final Noop r1 = new Noop(m);
1955 >        final Noop r2 = new Noop(m);
1956 >        final Noop r3 = new Noop(m);
1957 >
1958 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1959 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1960 >        final Integer w1 =  fFirst ? v1 : v2;
1961 >        final Integer w2 = !fFirst ? v1 : v2;
1962 >
1963 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1964 >        assertTrue(fst.complete(w1));
1965 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1966 >        checkIncomplete(h1);
1967 >        checkIncomplete(h2);
1968 >        r1.assertNotInvoked();
1969 >        r2.assertNotInvoked();
1970 >        assertTrue(snd.complete(w2));
1971 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1972 >
1973 >        checkCompletedNormally(h1, null);
1974 >        checkCompletedNormally(h2, null);
1975 >        checkCompletedNormally(h3, null);
1976 >        r1.assertInvoked();
1977 >        r2.assertInvoked();
1978 >        r3.assertInvoked();
1979          checkCompletedNormally(f, v1);
1980          checkCompletedNormally(g, v2);
1981      }}
# Line 1584 | Line 1984 | public class CompletableFutureTest exten
1984       * runAfterBoth result completes exceptionally after exceptional
1985       * completion of either source
1986       */
1987 <    public void testRunAfterBoth_exceptionalCompletion() {
1987 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1988          for (ExecutionMode m : ExecutionMode.values())
1589        for (boolean createIncomplete : new boolean[] { true, false })
1989          for (boolean fFirst : new boolean[] { true, false })
1990 +        for (boolean failFirst : new boolean[] { true, false })
1991          for (Integer v1 : new Integer[] { 1, null })
1992      {
1993          final CompletableFuture<Integer> f = new CompletableFuture<>();
1994          final CompletableFuture<Integer> g = new CompletableFuture<>();
1995          final CFException ex = new CFException();
1996 <        final Noop r = new Noop(m);
1997 <
1998 <        (fFirst ? f : g).complete(v1);
1999 <        if (!createIncomplete)
2000 <            (!fFirst ? f : g).completeExceptionally(ex);
2001 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2002 <        if (createIncomplete) {
2003 <            checkIncomplete(h);
2004 <            (!fFirst ? f : g).completeExceptionally(ex);
2005 <        }
2006 <
2007 <        checkCompletedWithWrappedCFException(h, ex);
2008 <        assertEquals(0, r.invocationCount);
2009 <        checkCompletedNormally(fFirst ? f : g, v1);
2010 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
2011 <    }}
2012 <
2013 <    /**
2014 <     * runAfterBoth result completes exceptionally if action does
2015 <     */
2016 <    public void testRunAfterBoth_actionFailed() {
2017 <        for (ExecutionMode m : ExecutionMode.values())
2018 <        for (boolean fFirst : new boolean[] { true, false })
2019 <        for (Integer v1 : new Integer[] { 1, null })
2020 <        for (Integer v2 : new Integer[] { 2, null })
2021 <    {
2022 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2023 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2024 <        final FailingRunnable r = new FailingRunnable(m);
1625 <
1626 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1627 <        if (fFirst) {
1628 <            f.complete(v1);
1629 <            g.complete(v2);
1630 <        } else {
1631 <            g.complete(v2);
1632 <            f.complete(v1);
1633 <        }
1634 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1635 <
1636 <        checkCompletedWithWrappedCFException(h1);
1637 <        checkCompletedWithWrappedCFException(h2);
1638 <        checkCompletedNormally(f, v1);
1639 <        checkCompletedNormally(g, v2);
1996 >        final Noop r1 = new Noop(m);
1997 >        final Noop r2 = new Noop(m);
1998 >        final Noop r3 = new Noop(m);
1999 >
2000 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2001 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2002 >        final Callable<Boolean> complete1 = failFirst ?
2003 >            () -> fst.completeExceptionally(ex) :
2004 >            () -> fst.complete(v1);
2005 >        final Callable<Boolean> complete2 = failFirst ?
2006 >            () -> snd.complete(v1) :
2007 >            () -> snd.completeExceptionally(ex);
2008 >
2009 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2010 >        assertTrue(complete1.call());
2011 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2012 >        checkIncomplete(h1);
2013 >        checkIncomplete(h2);
2014 >        assertTrue(complete2.call());
2015 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2016 >
2017 >        checkCompletedWithWrappedException(h1, ex);
2018 >        checkCompletedWithWrappedException(h2, ex);
2019 >        checkCompletedWithWrappedException(h3, ex);
2020 >        r1.assertNotInvoked();
2021 >        r2.assertNotInvoked();
2022 >        r3.assertNotInvoked();
2023 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2024 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2025      }}
2026  
2027      /**
2028       * runAfterBoth result completes exceptionally if either source cancelled
2029       */
2030 <    public void testRunAfterBoth_sourceCancelled() {
2030 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2031          for (ExecutionMode m : ExecutionMode.values())
2032          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1648        for (boolean createIncomplete : new boolean[] { true, false })
2033          for (boolean fFirst : new boolean[] { true, false })
2034 +        for (boolean failFirst : new boolean[] { true, false })
2035          for (Integer v1 : new Integer[] { 1, null })
2036      {
2037          final CompletableFuture<Integer> f = new CompletableFuture<>();
2038          final CompletableFuture<Integer> g = new CompletableFuture<>();
2039 <        final Noop r = new Noop(m);
2040 <
2041 <
2042 <        (fFirst ? f : g).complete(v1);
2043 <        if (!createIncomplete)
2044 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2045 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2046 <        if (createIncomplete) {
2047 <            checkIncomplete(h);
2048 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2049 <        }
2050 <
2051 <        checkCompletedWithWrappedCancellationException(h);
2052 <        checkCancelled(!fFirst ? f : g);
2053 <        assertEquals(0, r.invocationCount);
2054 <        checkCompletedNormally(fFirst ? f : g, v1);
2039 >        final Noop r1 = new Noop(m);
2040 >        final Noop r2 = new Noop(m);
2041 >        final Noop r3 = new Noop(m);
2042 >
2043 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2044 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2045 >        final Callable<Boolean> complete1 = failFirst ?
2046 >            () -> fst.cancel(mayInterruptIfRunning) :
2047 >            () -> fst.complete(v1);
2048 >        final Callable<Boolean> complete2 = failFirst ?
2049 >            () -> snd.complete(v1) :
2050 >            () -> snd.cancel(mayInterruptIfRunning);
2051 >
2052 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2053 >        assertTrue(complete1.call());
2054 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2055 >        checkIncomplete(h1);
2056 >        checkIncomplete(h2);
2057 >        assertTrue(complete2.call());
2058 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2059 >
2060 >        checkCompletedWithWrappedCancellationException(h1);
2061 >        checkCompletedWithWrappedCancellationException(h2);
2062 >        checkCompletedWithWrappedCancellationException(h3);
2063 >        r1.assertNotInvoked();
2064 >        r2.assertNotInvoked();
2065 >        r3.assertNotInvoked();
2066 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2067 >        checkCancelled(failFirst ? fst : snd);
2068      }}
2069  
2070      /**
2071 <     * applyToEither result completes normally after normal completion
1674 <     * of either source
2071 >     * runAfterBoth result completes exceptionally if action does
2072       */
2073 <    public void testApplyToEither_normalCompletion() {
2073 >    public void testRunAfterBoth_actionFailed() {
2074          for (ExecutionMode m : ExecutionMode.values())
1678        for (boolean createIncomplete : new boolean[] { true, false })
2075          for (boolean fFirst : new boolean[] { true, false })
2076          for (Integer v1 : new Integer[] { 1, null })
2077          for (Integer v2 : new Integer[] { 2, null })
2078      {
2079          final CompletableFuture<Integer> f = new CompletableFuture<>();
2080          final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 <        final IncFunction r = new IncFunction(m);
2082 <
2083 <        if (!createIncomplete)
2084 <            if (fFirst) f.complete(v1); else g.complete(v2);
2085 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2086 <        if (createIncomplete) {
2087 <            checkIncomplete(h);
2088 <            assertEquals(0, r.invocationCount);
2089 <            if (fFirst) f.complete(v1); else g.complete(v2);
2090 <        }
2091 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
2092 <        if (!fFirst) f.complete(v1); else g.complete(v2);
2081 >        final FailingRunnable r1 = new FailingRunnable(m);
2082 >        final FailingRunnable r2 = new FailingRunnable(m);
2083 >        final FailingRunnable r3 = new FailingRunnable(m);
2084 >
2085 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2086 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2087 >        final Integer w1 =  fFirst ? v1 : v2;
2088 >        final Integer w2 = !fFirst ? v1 : v2;
2089 >
2090 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2091 >        assertTrue(fst.complete(w1));
2092 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2093 >        assertTrue(snd.complete(w2));
2094 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2095  
2096 +        checkCompletedWithWrappedCFException(h1);
2097 +        checkCompletedWithWrappedCFException(h2);
2098 +        checkCompletedWithWrappedCFException(h3);
2099 +        r1.assertInvoked();
2100 +        r2.assertInvoked();
2101 +        r3.assertInvoked();
2102          checkCompletedNormally(f, v1);
2103          checkCompletedNormally(g, v2);
1700        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
2104      }}
2105  
2106 <    public void testApplyToEither_normalCompletionBothAvailable() {
2106 >    /**
2107 >     * applyToEither result completes normally after normal completion
2108 >     * of either source
2109 >     */
2110 >    public void testApplyToEither_normalCompletion() {
2111          for (ExecutionMode m : ExecutionMode.values())
1705        for (boolean fFirst : new boolean[] { true, false })
2112          for (Integer v1 : new Integer[] { 1, null })
2113          for (Integer v2 : new Integer[] { 2, null })
2114      {
2115          final CompletableFuture<Integer> f = new CompletableFuture<>();
2116          final CompletableFuture<Integer> g = new CompletableFuture<>();
2117 <        final IncFunction r = new IncFunction(m);
2117 >        final IncFunction[] rs = new IncFunction[6];
2118 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2119  
2120 <        if (fFirst) {
2121 <            f.complete(v1);
2122 <            g.complete(v2);
2123 <        } else {
2124 <            g.complete(v2);
2125 <            f.complete(v1);
2126 <        }
2120 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2121 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2122 >        checkIncomplete(h0);
2123 >        checkIncomplete(h1);
2124 >        rs[0].assertNotInvoked();
2125 >        rs[1].assertNotInvoked();
2126 >        f.complete(v1);
2127 >        checkCompletedNormally(h0, inc(v1));
2128 >        checkCompletedNormally(h1, inc(v1));
2129 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2130 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2131 >        checkCompletedNormally(h2, inc(v1));
2132 >        checkCompletedNormally(h3, inc(v1));
2133 >        g.complete(v2);
2134  
2135 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2135 >        // unspecified behavior - both source completions available
2136 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2137 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2138 >        rs[4].assertValue(h4.join());
2139 >        rs[5].assertValue(h5.join());
2140 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2141 >                   Objects.equals(inc(v2), h4.join()));
2142 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2143 >                   Objects.equals(inc(v2), h5.join()));
2144  
2145          checkCompletedNormally(f, v1);
2146          checkCompletedNormally(g, v2);
2147 <
2148 <        // unspecified behavior
2149 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2150 <                   Objects.equals(h.join(), inc(v2)));
2151 <        assertEquals(1, r.invocationCount);
2147 >        checkCompletedNormally(h0, inc(v1));
2148 >        checkCompletedNormally(h1, inc(v1));
2149 >        checkCompletedNormally(h2, inc(v1));
2150 >        checkCompletedNormally(h3, inc(v1));
2151 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2152      }}
2153  
2154      /**
2155       * applyToEither result completes exceptionally after exceptional
2156       * completion of either source
2157       */
2158 <    public void testApplyToEither_exceptionalCompletion1() {
2158 >    public void testApplyToEither_exceptionalCompletion() {
2159          for (ExecutionMode m : ExecutionMode.values())
1738        for (boolean createIncomplete : new boolean[] { true, false })
1739        for (boolean fFirst : new boolean[] { true, false })
2160          for (Integer v1 : new Integer[] { 1, null })
2161      {
2162          final CompletableFuture<Integer> f = new CompletableFuture<>();
2163          final CompletableFuture<Integer> g = new CompletableFuture<>();
2164          final CFException ex = new CFException();
2165 <        final IncFunction r = new IncFunction(m);
2165 >        final IncFunction[] rs = new IncFunction[6];
2166 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2167  
2168 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
2169 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2170 <        if (createIncomplete) {
2171 <            checkIncomplete(h);
2172 <            assertEquals(0, r.invocationCount);
2173 <            (fFirst ? f : g).completeExceptionally(ex);
2168 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2169 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2170 >        checkIncomplete(h0);
2171 >        checkIncomplete(h1);
2172 >        rs[0].assertNotInvoked();
2173 >        rs[1].assertNotInvoked();
2174 >        f.completeExceptionally(ex);
2175 >        checkCompletedWithWrappedException(h0, ex);
2176 >        checkCompletedWithWrappedException(h1, ex);
2177 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2178 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2179 >        checkCompletedWithWrappedException(h2, ex);
2180 >        checkCompletedWithWrappedException(h3, ex);
2181 >        g.complete(v1);
2182 >
2183 >        // unspecified behavior - both source completions available
2184 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2185 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2186 >        try {
2187 >            assertEquals(inc(v1), h4.join());
2188 >            rs[4].assertValue(inc(v1));
2189 >        } catch (CompletionException ok) {
2190 >            checkCompletedWithWrappedException(h4, ex);
2191 >            rs[4].assertNotInvoked();
2192 >        }
2193 >        try {
2194 >            assertEquals(inc(v1), h5.join());
2195 >            rs[5].assertValue(inc(v1));
2196 >        } catch (CompletionException ok) {
2197 >            checkCompletedWithWrappedException(h5, ex);
2198 >            rs[5].assertNotInvoked();
2199          }
2200  
2201 <        checkCompletedWithWrappedCFException(h, ex);
2202 <        (!fFirst ? f : g).complete(v1);
2203 <
2204 <        assertEquals(0, r.invocationCount);
2205 <        checkCompletedNormally(!fFirst ? f : g, v1);
2206 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
2207 <        checkCompletedWithWrappedCFException(h, ex);
2201 >        checkCompletedExceptionally(f, ex);
2202 >        checkCompletedNormally(g, v1);
2203 >        checkCompletedWithWrappedException(h0, ex);
2204 >        checkCompletedWithWrappedException(h1, ex);
2205 >        checkCompletedWithWrappedException(h2, ex);
2206 >        checkCompletedWithWrappedException(h3, ex);
2207 >        checkCompletedWithWrappedException(h4, ex);
2208 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2209      }}
2210  
2211      public void testApplyToEither_exceptionalCompletion2() {
2212          for (ExecutionMode m : ExecutionMode.values())
1766        for (boolean reverseArgs : new boolean[] { true, false })
2213          for (boolean fFirst : new boolean[] { true, false })
2214          for (Integer v1 : new Integer[] { 1, null })
2215      {
2216          final CompletableFuture<Integer> f = new CompletableFuture<>();
2217          final CompletableFuture<Integer> g = new CompletableFuture<>();
1772        final IncFunction r1 = new IncFunction(m);
1773        final IncFunction r2 = new IncFunction(m);
2218          final CFException ex = new CFException();
2219 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
2220 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1777 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1778 <        if (fFirst) {
1779 <            f.complete(v1);
1780 <            g.completeExceptionally(ex);
1781 <        } else {
1782 <            g.completeExceptionally(ex);
1783 <            f.complete(v1);
1784 <        }
1785 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2219 >        final IncFunction[] rs = new IncFunction[6];
2220 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2221  
2222 <        // unspecified behavior
2222 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2223 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2224 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2225 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2226 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2227 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2228 >
2229 >        // unspecified behavior - both source completions available
2230 >        try {
2231 >            assertEquals(inc(v1), h0.join());
2232 >            rs[0].assertValue(inc(v1));
2233 >        } catch (CompletionException ok) {
2234 >            checkCompletedWithWrappedException(h0, ex);
2235 >            rs[0].assertNotInvoked();
2236 >        }
2237          try {
2238              assertEquals(inc(v1), h1.join());
2239 <            assertEquals(1, r1.invocationCount);
2239 >            rs[1].assertValue(inc(v1));
2240          } catch (CompletionException ok) {
2241 <            checkCompletedWithWrappedCFException(h1, ex);
2242 <            assertEquals(0, r1.invocationCount);
2241 >            checkCompletedWithWrappedException(h1, ex);
2242 >            rs[1].assertNotInvoked();
2243          }
1795
2244          try {
2245              assertEquals(inc(v1), h2.join());
2246 <            assertEquals(1, r2.invocationCount);
2246 >            rs[2].assertValue(inc(v1));
2247          } catch (CompletionException ok) {
2248 <            checkCompletedWithWrappedCFException(h2, ex);
2249 <            assertEquals(0, r2.invocationCount);
2248 >            checkCompletedWithWrappedException(h2, ex);
2249 >            rs[2].assertNotInvoked();
2250 >        }
2251 >        try {
2252 >            assertEquals(inc(v1), h3.join());
2253 >            rs[3].assertValue(inc(v1));
2254 >        } catch (CompletionException ok) {
2255 >            checkCompletedWithWrappedException(h3, ex);
2256 >            rs[3].assertNotInvoked();
2257          }
2258  
1804        checkCompletedWithWrappedCFException(g, ex);
1805        checkCompletedNormally(f, v1);
1806    }}
1807
1808    /**
1809     * applyToEither result completes exceptionally if action does
1810     */
1811    public void testApplyToEither_actionFailed1() {
1812        for (ExecutionMode m : ExecutionMode.values())
1813        for (Integer v1 : new Integer[] { 1, null })
1814        for (Integer v2 : new Integer[] { 2, null })
1815    {
1816        final CompletableFuture<Integer> f = new CompletableFuture<>();
1817        final CompletableFuture<Integer> g = new CompletableFuture<>();
1818        final FailingFunction r = new FailingFunction(m);
1819        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1820
1821        f.complete(v1);
1822        checkCompletedWithWrappedCFException(h);
1823        g.complete(v2);
1824        checkCompletedNormally(f, v1);
1825        checkCompletedNormally(g, v2);
1826    }}
1827
1828    public void testApplyToEither_actionFailed2() {
1829        for (ExecutionMode m : ExecutionMode.values())
1830        for (Integer v1 : new Integer[] { 1, null })
1831        for (Integer v2 : new Integer[] { 2, null })
1832    {
1833        final CompletableFuture<Integer> f = new CompletableFuture<>();
1834        final CompletableFuture<Integer> g = new CompletableFuture<>();
1835        final FailingFunction r = new FailingFunction(m);
1836        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1837
1838        g.complete(v2);
1839        checkCompletedWithWrappedCFException(h);
1840        f.complete(v1);
2259          checkCompletedNormally(f, v1);
2260 <        checkCompletedNormally(g, v2);
2260 >        checkCompletedExceptionally(g, ex);
2261      }}
2262  
2263      /**
2264       * applyToEither result completes exceptionally if either source cancelled
2265       */
2266 <    public void testApplyToEither_sourceCancelled1() {
2266 >    public void testApplyToEither_sourceCancelled() {
2267          for (ExecutionMode m : ExecutionMode.values())
2268          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1851        for (boolean createIncomplete : new boolean[] { true, false })
1852        for (boolean fFirst : 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(m);
2273 >        final IncFunction[] rs = new IncFunction[6];
2274 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2275  
2276 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2277 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2278 <        if (createIncomplete) {
2279 <            checkIncomplete(h);
2280 <            assertEquals(0, r.invocationCount);
2281 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2276 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2277 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2278 >        checkIncomplete(h0);
2279 >        checkIncomplete(h1);
2280 >        rs[0].assertNotInvoked();
2281 >        rs[1].assertNotInvoked();
2282 >        f.cancel(mayInterruptIfRunning);
2283 >        checkCompletedWithWrappedCancellationException(h0);
2284 >        checkCompletedWithWrappedCancellationException(h1);
2285 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2286 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2287 >        checkCompletedWithWrappedCancellationException(h2);
2288 >        checkCompletedWithWrappedCancellationException(h3);
2289 >        g.complete(v1);
2290 >
2291 >        // unspecified behavior - both source completions available
2292 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2293 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2294 >        try {
2295 >            assertEquals(inc(v1), h4.join());
2296 >            rs[4].assertValue(inc(v1));
2297 >        } catch (CompletionException ok) {
2298 >            checkCompletedWithWrappedCancellationException(h4);
2299 >            rs[4].assertNotInvoked();
2300 >        }
2301 >        try {
2302 >            assertEquals(inc(v1), h5.join());
2303 >            rs[5].assertValue(inc(v1));
2304 >        } catch (CompletionException ok) {
2305 >            checkCompletedWithWrappedCancellationException(h5);
2306 >            rs[5].assertNotInvoked();
2307          }
2308  
2309 <        checkCompletedWithWrappedCancellationException(h);
2310 <        (!fFirst ? f : g).complete(v1);
2311 <
2312 <        assertEquals(0, r.invocationCount);
2313 <        checkCompletedNormally(!fFirst ? f : g, v1);
2314 <        checkCancelled(fFirst ? f : g);
2315 <        checkCompletedWithWrappedCancellationException(h);
2309 >        checkCancelled(f);
2310 >        checkCompletedNormally(g, v1);
2311 >        checkCompletedWithWrappedCancellationException(h0);
2312 >        checkCompletedWithWrappedCancellationException(h1);
2313 >        checkCompletedWithWrappedCancellationException(h2);
2314 >        checkCompletedWithWrappedCancellationException(h3);
2315 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2316      }}
2317  
2318      public void testApplyToEither_sourceCancelled2() {
2319          for (ExecutionMode m : ExecutionMode.values())
2320          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1879        for (boolean reverseArgs : new boolean[] { true, false })
2321          for (boolean fFirst : new boolean[] { true, false })
2322          for (Integer v1 : new Integer[] { 1, null })
2323      {
2324          final CompletableFuture<Integer> f = new CompletableFuture<>();
2325          final CompletableFuture<Integer> g = new CompletableFuture<>();
2326 <        final IncFunction r1 = new IncFunction(m);
2327 <        final IncFunction r2 = new IncFunction(m);
1887 <        final CFException ex = new CFException();
1888 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1889 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2326 >        final IncFunction[] rs = new IncFunction[6];
2327 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2328  
2329 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2330 <        if (fFirst) {
2331 <            f.complete(v1);
2332 <            assertTrue(g.cancel(mayInterruptIfRunning));
2333 <        } else {
2334 <            assertTrue(g.cancel(mayInterruptIfRunning));
1897 <            f.complete(v1);
1898 <        }
1899 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2329 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2330 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2331 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2332 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2333 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2334 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2335  
2336 <        // unspecified behavior
2336 >        // unspecified behavior - both source completions available
2337 >        try {
2338 >            assertEquals(inc(v1), h0.join());
2339 >            rs[0].assertValue(inc(v1));
2340 >        } catch (CompletionException ok) {
2341 >            checkCompletedWithWrappedCancellationException(h0);
2342 >            rs[0].assertNotInvoked();
2343 >        }
2344          try {
2345              assertEquals(inc(v1), h1.join());
2346 <            assertEquals(1, r1.invocationCount);
2346 >            rs[1].assertValue(inc(v1));
2347          } catch (CompletionException ok) {
2348              checkCompletedWithWrappedCancellationException(h1);
2349 <            assertEquals(0, r1.invocationCount);
2349 >            rs[1].assertNotInvoked();
2350          }
1909
2351          try {
2352              assertEquals(inc(v1), h2.join());
2353 <            assertEquals(1, r2.invocationCount);
2353 >            rs[2].assertValue(inc(v1));
2354          } catch (CompletionException ok) {
2355              checkCompletedWithWrappedCancellationException(h2);
2356 <            assertEquals(0, r2.invocationCount);
2356 >            rs[2].assertNotInvoked();
2357 >        }
2358 >        try {
2359 >            assertEquals(inc(v1), h3.join());
2360 >            rs[3].assertValue(inc(v1));
2361 >        } catch (CompletionException ok) {
2362 >            checkCompletedWithWrappedCancellationException(h3);
2363 >            rs[3].assertNotInvoked();
2364          }
2365  
1918        checkCancelled(g);
2366          checkCompletedNormally(f, v1);
2367 +        checkCancelled(g);
2368      }}
2369  
2370      /**
2371 <     * acceptEither result completes normally after normal completion
1924 <     * of either source
2371 >     * applyToEither result completes exceptionally if action does
2372       */
2373 <    public void testAcceptEither_normalCompletion1() {
2373 >    public void testApplyToEither_actionFailed() {
2374          for (ExecutionMode m : ExecutionMode.values())
2375          for (Integer v1 : new Integer[] { 1, null })
2376          for (Integer v2 : new Integer[] { 2, null })
2377      {
2378          final CompletableFuture<Integer> f = new CompletableFuture<>();
2379          final CompletableFuture<Integer> g = new CompletableFuture<>();
2380 <        final IncAction r = new IncAction();
2381 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2380 >        final FailingFunction[] rs = new FailingFunction[6];
2381 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2382  
2383 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2384 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2385          f.complete(v1);
2386 <        checkCompletedNormally(h, null);
2387 <        assertEquals(inc(v1), r.value);
2388 <        g.complete(v2);
2389 <
2390 <        checkCompletedNormally(f, v1);
2391 <        checkCompletedNormally(g, v2);
2392 <        checkCompletedNormally(h, null);
1944 <    }}
1945 <
1946 <    public void testAcceptEither_normalCompletion2() {
1947 <        for (ExecutionMode m : ExecutionMode.values())
1948 <        for (Integer v1 : new Integer[] { 1, null })
1949 <        for (Integer v2 : new Integer[] { 2, null })
1950 <    {
1951 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1952 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1953 <        final IncAction r = new IncAction();
1954 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2386 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2387 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2388 >        checkCompletedWithWrappedCFException(h0);
2389 >        checkCompletedWithWrappedCFException(h1);
2390 >        checkCompletedWithWrappedCFException(h2);
2391 >        checkCompletedWithWrappedCFException(h3);
2392 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2393  
2394          g.complete(v2);
2395 <        checkCompletedNormally(h, null);
2396 <        assertEquals(inc(v2), r.value);
2397 <        f.complete(v1);
2395 >
2396 >        // unspecified behavior - both source completions available
2397 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2398 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2399 >
2400 >        checkCompletedWithWrappedCFException(h4);
2401 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2402 >                   Objects.equals(v2, rs[4].value));
2403 >        checkCompletedWithWrappedCFException(h5);
2404 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2405 >                   Objects.equals(v2, rs[5].value));
2406  
2407          checkCompletedNormally(f, v1);
2408          checkCompletedNormally(g, v2);
1963        checkCompletedNormally(h, null);
2409      }}
2410  
2411 <    public void testAcceptEither_normalCompletion3() {
2411 >    /**
2412 >     * acceptEither result completes normally after normal completion
2413 >     * of either source
2414 >     */
2415 >    public void testAcceptEither_normalCompletion() {
2416          for (ExecutionMode m : ExecutionMode.values())
2417          for (Integer v1 : new Integer[] { 1, null })
2418          for (Integer v2 : new Integer[] { 2, null })
2419      {
2420          final CompletableFuture<Integer> f = new CompletableFuture<>();
2421          final CompletableFuture<Integer> g = new CompletableFuture<>();
2422 <        final IncAction r = new IncAction();
2422 >        final NoopConsumer[] rs = new NoopConsumer[6];
2423 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2424  
2425 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2426 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2427 +        checkIncomplete(h0);
2428 +        checkIncomplete(h1);
2429 +        rs[0].assertNotInvoked();
2430 +        rs[1].assertNotInvoked();
2431          f.complete(v1);
2432 +        checkCompletedNormally(h0, null);
2433 +        checkCompletedNormally(h1, null);
2434 +        rs[0].assertValue(v1);
2435 +        rs[1].assertValue(v1);
2436 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2437 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2438 +        checkCompletedNormally(h2, null);
2439 +        checkCompletedNormally(h3, null);
2440 +        rs[2].assertValue(v1);
2441 +        rs[3].assertValue(v1);
2442          g.complete(v2);
1977        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2443  
2444 <        checkCompletedNormally(h, null);
2444 >        // unspecified behavior - both source completions available
2445 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2446 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2447 >        checkCompletedNormally(h4, null);
2448 >        checkCompletedNormally(h5, null);
2449 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2450 >                   Objects.equals(v2, rs[4].value));
2451 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2452 >                   Objects.equals(v2, rs[5].value));
2453 >
2454          checkCompletedNormally(f, v1);
2455          checkCompletedNormally(g, v2);
2456 <
2457 <        // unspecified behavior
2458 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2459 <                   Objects.equals(r.value, inc(v2)));
2456 >        checkCompletedNormally(h0, null);
2457 >        checkCompletedNormally(h1, null);
2458 >        checkCompletedNormally(h2, null);
2459 >        checkCompletedNormally(h3, null);
2460 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2461      }}
2462  
2463      /**
2464       * acceptEither result completes exceptionally after exceptional
2465       * completion of either source
2466       */
2467 <    public void testAcceptEither_exceptionalCompletion1() {
2467 >    public void testAcceptEither_exceptionalCompletion() {
2468          for (ExecutionMode m : ExecutionMode.values())
2469          for (Integer v1 : new Integer[] { 1, null })
2470      {
2471          final CompletableFuture<Integer> f = new CompletableFuture<>();
2472          final CompletableFuture<Integer> g = new CompletableFuture<>();
1998        final IncAction r = new IncAction();
1999        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2473          final CFException ex = new CFException();
2474 +        final NoopConsumer[] rs = new NoopConsumer[6];
2475 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2476  
2477 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2478 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2479 +        checkIncomplete(h0);
2480 +        checkIncomplete(h1);
2481 +        rs[0].assertNotInvoked();
2482 +        rs[1].assertNotInvoked();
2483          f.completeExceptionally(ex);
2484 <        checkCompletedWithWrappedCFException(h, ex);
2484 >        checkCompletedWithWrappedException(h0, ex);
2485 >        checkCompletedWithWrappedException(h1, ex);
2486 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2487 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2488 >        checkCompletedWithWrappedException(h2, ex);
2489 >        checkCompletedWithWrappedException(h3, ex);
2490 >
2491          g.complete(v1);
2492  
2493 <        assertEquals(0, r.invocationCount);
2493 >        // unspecified behavior - both source completions available
2494 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2495 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2496 >        try {
2497 >            assertNull(h4.join());
2498 >            rs[4].assertValue(v1);
2499 >        } catch (CompletionException ok) {
2500 >            checkCompletedWithWrappedException(h4, ex);
2501 >            rs[4].assertNotInvoked();
2502 >        }
2503 >        try {
2504 >            assertNull(h5.join());
2505 >            rs[5].assertValue(v1);
2506 >        } catch (CompletionException ok) {
2507 >            checkCompletedWithWrappedException(h5, ex);
2508 >            rs[5].assertNotInvoked();
2509 >        }
2510 >
2511 >        checkCompletedExceptionally(f, ex);
2512          checkCompletedNormally(g, v1);
2513 <        checkCompletedWithWrappedCFException(f, ex);
2514 <        checkCompletedWithWrappedCFException(h, ex);
2513 >        checkCompletedWithWrappedException(h0, ex);
2514 >        checkCompletedWithWrappedException(h1, ex);
2515 >        checkCompletedWithWrappedException(h2, ex);
2516 >        checkCompletedWithWrappedException(h3, ex);
2517 >        checkCompletedWithWrappedException(h4, ex);
2518 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2519      }}
2520  
2521      public void testAcceptEither_exceptionalCompletion2() {
2522          for (ExecutionMode m : ExecutionMode.values())
2523 +        for (boolean fFirst : new boolean[] { true, false })
2524          for (Integer v1 : new Integer[] { 1, null })
2525      {
2526          final CompletableFuture<Integer> f = new CompletableFuture<>();
2527          final CompletableFuture<Integer> g = new CompletableFuture<>();
2018        final IncAction r = new IncAction();
2019        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2020        final CFException ex = new CFException();
2021
2022        g.completeExceptionally(ex);
2023        checkCompletedWithWrappedCFException(h, ex);
2024        f.complete(v1);
2025
2026        assertEquals(0, r.invocationCount);
2027        checkCompletedNormally(f, v1);
2028        checkCompletedWithWrappedCFException(g, ex);
2029        checkCompletedWithWrappedCFException(h, ex);
2030    }}
2031
2032    public void testAcceptEither_exceptionalCompletion3() {
2033        for (ExecutionMode m : ExecutionMode.values())
2034        for (Integer v1 : new Integer[] { 1, null })
2035    {
2036        final CompletableFuture<Integer> f = new CompletableFuture<>();
2037        final CompletableFuture<Integer> g = new CompletableFuture<>();
2038        final IncAction r = new IncAction();
2528          final CFException ex = new CFException();
2529 +        final NoopConsumer[] rs = new NoopConsumer[6];
2530 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2531  
2532 <        g.completeExceptionally(ex);
2533 <        f.complete(v1);
2534 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2532 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2533 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2534 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2535 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2536 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2537 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2538  
2539 <        // unspecified behavior
2046 <        Integer v;
2539 >        // unspecified behavior - both source completions available
2540          try {
2541 <            assertNull(h.join());
2542 <            assertEquals(1, r.invocationCount);
2050 <            assertEquals(inc(v1), r.value);
2541 >            assertEquals(null, h0.join());
2542 >            rs[0].assertValue(v1);
2543          } catch (CompletionException ok) {
2544 <            checkCompletedWithWrappedCFException(h, ex);
2545 <            assertEquals(0, r.invocationCount);
2544 >            checkCompletedWithWrappedException(h0, ex);
2545 >            rs[0].assertNotInvoked();
2546          }
2055
2056        checkCompletedWithWrappedCFException(g, ex);
2057        checkCompletedNormally(f, v1);
2058    }}
2059
2060    public void testAcceptEither_exceptionalCompletion4() {
2061        for (ExecutionMode m : ExecutionMode.values())
2062        for (Integer v1 : new Integer[] { 1, null })
2063    {
2064        final CompletableFuture<Integer> f = new CompletableFuture<>();
2065        final CompletableFuture<Integer> g = new CompletableFuture<>();
2066        final IncAction r = new IncAction();
2067        final CFException ex = new CFException();
2068
2069        f.completeExceptionally(ex);
2070        g.complete(v1);
2071        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2072
2073        // unspecified behavior
2074        Integer v;
2547          try {
2548 <            assertNull(h.join());
2549 <            assertEquals(1, r.invocationCount);
2078 <            assertEquals(inc(v1), r.value);
2548 >            assertEquals(null, h1.join());
2549 >            rs[1].assertValue(v1);
2550          } catch (CompletionException ok) {
2551 <            checkCompletedWithWrappedCFException(h, ex);
2552 <            assertEquals(0, r.invocationCount);
2551 >            checkCompletedWithWrappedException(h1, ex);
2552 >            rs[1].assertNotInvoked();
2553 >        }
2554 >        try {
2555 >            assertEquals(null, h2.join());
2556 >            rs[2].assertValue(v1);
2557 >        } catch (CompletionException ok) {
2558 >            checkCompletedWithWrappedException(h2, ex);
2559 >            rs[2].assertNotInvoked();
2560 >        }
2561 >        try {
2562 >            assertEquals(null, h3.join());
2563 >            rs[3].assertValue(v1);
2564 >        } catch (CompletionException ok) {
2565 >            checkCompletedWithWrappedException(h3, ex);
2566 >            rs[3].assertNotInvoked();
2567          }
2568  
2084        checkCompletedWithWrappedCFException(f, ex);
2085        checkCompletedNormally(g, v1);
2086    }}
2087
2088    /**
2089     * acceptEither result completes exceptionally if action does
2090     */
2091    public void testAcceptEither_actionFailed1() {
2092        for (ExecutionMode m : ExecutionMode.values())
2093        for (Integer v1 : new Integer[] { 1, null })
2094        for (Integer v2 : new Integer[] { 2, null })
2095    {
2096        final CompletableFuture<Integer> f = new CompletableFuture<>();
2097        final CompletableFuture<Integer> g = new CompletableFuture<>();
2098        final FailingConsumer r = new FailingConsumer(m);
2099        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2100
2101        f.complete(v1);
2102        checkCompletedWithWrappedCFException(h);
2103        g.complete(v2);
2104        checkCompletedNormally(f, v1);
2105        checkCompletedNormally(g, v2);
2106    }}
2107
2108    public void testAcceptEither_actionFailed2() {
2109        for (ExecutionMode m : ExecutionMode.values())
2110        for (Integer v1 : new Integer[] { 1, null })
2111        for (Integer v2 : new Integer[] { 2, null })
2112    {
2113        final CompletableFuture<Integer> f = new CompletableFuture<>();
2114        final CompletableFuture<Integer> g = new CompletableFuture<>();
2115        final FailingConsumer r = new FailingConsumer(m);
2116        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2117
2118        g.complete(v2);
2119        checkCompletedWithWrappedCFException(h);
2120        f.complete(v1);
2569          checkCompletedNormally(f, v1);
2570 <        checkCompletedNormally(g, v2);
2570 >        checkCompletedExceptionally(g, ex);
2571      }}
2572  
2573      /**
2574       * acceptEither result completes exceptionally if either source cancelled
2575       */
2576 <    public void testAcceptEither_sourceCancelled1() {
2129 <        for (ExecutionMode m : ExecutionMode.values())
2130 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2131 <        for (Integer v1 : new Integer[] { 1, null })
2132 <    {
2133 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2134 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2135 <        final IncAction r = new IncAction();
2136 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2137 <
2138 <        assertTrue(f.cancel(mayInterruptIfRunning));
2139 <        checkCompletedWithWrappedCancellationException(h);
2140 <        g.complete(v1);
2141 <
2142 <        checkCancelled(f);
2143 <        assertEquals(0, r.invocationCount);
2144 <        checkCompletedNormally(g, v1);
2145 <        checkCompletedWithWrappedCancellationException(h);
2146 <    }}
2147 <
2148 <    public void testAcceptEither_sourceCancelled2() {
2576 >    public void testAcceptEither_sourceCancelled() {
2577          for (ExecutionMode m : ExecutionMode.values())
2578          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2579          for (Integer v1 : new Integer[] { 1, null })
2580      {
2581          final CompletableFuture<Integer> f = new CompletableFuture<>();
2582          final CompletableFuture<Integer> g = new CompletableFuture<>();
2583 <        final IncAction r = new IncAction();
2584 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2157 <
2158 <        assertTrue(g.cancel(mayInterruptIfRunning));
2159 <        checkCompletedWithWrappedCancellationException(h);
2160 <        f.complete(v1);
2583 >        final NoopConsumer[] rs = new NoopConsumer[6];
2584 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2585  
2586 <        checkCancelled(g);
2587 <        assertEquals(0, r.invocationCount);
2588 <        checkCompletedNormally(f, v1);
2589 <        checkCompletedWithWrappedCancellationException(h);
2590 <    }}
2591 <
2592 <    public void testAcceptEither_sourceCancelled3() {
2593 <        for (ExecutionMode m : ExecutionMode.values())
2594 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2595 <        for (Integer v1 : new Integer[] { 1, null })
2596 <    {
2597 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2598 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2175 <        final IncAction r = new IncAction();
2586 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2587 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2588 >        checkIncomplete(h0);
2589 >        checkIncomplete(h1);
2590 >        rs[0].assertNotInvoked();
2591 >        rs[1].assertNotInvoked();
2592 >        f.cancel(mayInterruptIfRunning);
2593 >        checkCompletedWithWrappedCancellationException(h0);
2594 >        checkCompletedWithWrappedCancellationException(h1);
2595 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2596 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2597 >        checkCompletedWithWrappedCancellationException(h2);
2598 >        checkCompletedWithWrappedCancellationException(h3);
2599  
2600 <        assertTrue(g.cancel(mayInterruptIfRunning));
2178 <        f.complete(v1);
2179 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2600 >        g.complete(v1);
2601  
2602 <        // unspecified behavior
2603 <        Integer v;
2602 >        // unspecified behavior - both source completions available
2603 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2604 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2605          try {
2606 <            assertNull(h.join());
2607 <            assertEquals(1, r.invocationCount);
2186 <            assertEquals(inc(v1), r.value);
2606 >            assertNull(h4.join());
2607 >            rs[4].assertValue(v1);
2608          } catch (CompletionException ok) {
2609 <            checkCompletedWithWrappedCancellationException(h);
2610 <            assertEquals(0, r.invocationCount);
2609 >            checkCompletedWithWrappedCancellationException(h4);
2610 >            rs[4].assertNotInvoked();
2611          }
2191
2192        checkCancelled(g);
2193        checkCompletedNormally(f, v1);
2194    }}
2195
2196    public void testAcceptEither_sourceCancelled4() {
2197        for (ExecutionMode m : ExecutionMode.values())
2198        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2199        for (Integer v1 : new Integer[] { 1, null })
2200    {
2201        final CompletableFuture<Integer> f = new CompletableFuture<>();
2202        final CompletableFuture<Integer> g = new CompletableFuture<>();
2203        final IncAction r = new IncAction();
2204
2205        assertTrue(f.cancel(mayInterruptIfRunning));
2206        g.complete(v1);
2207        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2208
2209        // unspecified behavior
2210        Integer v;
2612          try {
2613 <            assertNull(h.join());
2614 <            assertEquals(1, r.invocationCount);
2214 <            assertEquals(inc(v1), r.value);
2613 >            assertNull(h5.join());
2614 >            rs[5].assertValue(v1);
2615          } catch (CompletionException ok) {
2616 <            checkCompletedWithWrappedCancellationException(h);
2617 <            assertEquals(0, r.invocationCount);
2616 >            checkCompletedWithWrappedCancellationException(h5);
2617 >            rs[5].assertNotInvoked();
2618          }
2619  
2620          checkCancelled(f);
2621          checkCompletedNormally(g, v1);
2622 +        checkCompletedWithWrappedCancellationException(h0);
2623 +        checkCompletedWithWrappedCancellationException(h1);
2624 +        checkCompletedWithWrappedCancellationException(h2);
2625 +        checkCompletedWithWrappedCancellationException(h3);
2626 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2627      }}
2628  
2629      /**
2630 <     * runAfterEither result completes normally after normal completion
2226 <     * of either source
2630 >     * acceptEither result completes exceptionally if action does
2631       */
2632 <    public void testRunAfterEither_normalCompletion1() {
2632 >    public void testAcceptEither_actionFailed() {
2633          for (ExecutionMode m : ExecutionMode.values())
2634          for (Integer v1 : new Integer[] { 1, null })
2635          for (Integer v2 : new Integer[] { 2, null })
2636      {
2637          final CompletableFuture<Integer> f = new CompletableFuture<>();
2638          final CompletableFuture<Integer> g = new CompletableFuture<>();
2639 <        final Noop r = new Noop(m);
2640 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2639 >        final FailingConsumer[] rs = new FailingConsumer[6];
2640 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2641  
2642 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2643 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2644          f.complete(v1);
2645 <        checkCompletedNormally(h, null);
2646 <        assertEquals(1, r.invocationCount);
2645 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2646 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2647 >        checkCompletedWithWrappedCFException(h0);
2648 >        checkCompletedWithWrappedCFException(h1);
2649 >        checkCompletedWithWrappedCFException(h2);
2650 >        checkCompletedWithWrappedCFException(h3);
2651 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2652 >
2653          g.complete(v2);
2654  
2655 +        // unspecified behavior - both source completions available
2656 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2657 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2658 +
2659 +        checkCompletedWithWrappedCFException(h4);
2660 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2661 +                   Objects.equals(v2, rs[4].value));
2662 +        checkCompletedWithWrappedCFException(h5);
2663 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2664 +                   Objects.equals(v2, rs[5].value));
2665 +
2666          checkCompletedNormally(f, v1);
2667          checkCompletedNormally(g, v2);
2245        checkCompletedNormally(h, null);
2246        assertEquals(1, r.invocationCount);
2668      }}
2669  
2670 <    public void testRunAfterEither_normalCompletion2() {
2670 >    /**
2671 >     * runAfterEither result completes normally after normal completion
2672 >     * of either source
2673 >     */
2674 >    public void testRunAfterEither_normalCompletion() {
2675          for (ExecutionMode m : ExecutionMode.values())
2676          for (Integer v1 : new Integer[] { 1, null })
2677          for (Integer v2 : new Integer[] { 2, null })
2678      {
2679          final CompletableFuture<Integer> f = new CompletableFuture<>();
2680          final CompletableFuture<Integer> g = new CompletableFuture<>();
2681 <        final Noop r = new Noop(m);
2682 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2681 >        final Noop[] rs = new Noop[6];
2682 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2683  
2684 <        g.complete(v2);
2685 <        checkCompletedNormally(h, null);
2686 <        assertEquals(1, r.invocationCount);
2684 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2685 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2686 >        checkIncomplete(h0);
2687 >        checkIncomplete(h1);
2688 >        rs[0].assertNotInvoked();
2689 >        rs[1].assertNotInvoked();
2690          f.complete(v1);
2691 +        checkCompletedNormally(h0, null);
2692 +        checkCompletedNormally(h1, null);
2693 +        rs[0].assertInvoked();
2694 +        rs[1].assertInvoked();
2695 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2696 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2697 +        checkCompletedNormally(h2, null);
2698 +        checkCompletedNormally(h3, null);
2699 +        rs[2].assertInvoked();
2700 +        rs[3].assertInvoked();
2701  
2264        checkCompletedNormally(f, v1);
2265        checkCompletedNormally(g, v2);
2266        checkCompletedNormally(h, null);
2267        assertEquals(1, r.invocationCount);
2268        }}
2269
2270    public void testRunAfterEither_normalCompletion3() {
2271        for (ExecutionMode m : ExecutionMode.values())
2272        for (Integer v1 : new Integer[] { 1, null })
2273        for (Integer v2 : new Integer[] { 2, null })
2274    {
2275        final CompletableFuture<Integer> f = new CompletableFuture<>();
2276        final CompletableFuture<Integer> g = new CompletableFuture<>();
2277        final Noop r = new Noop(m);
2278
2279        f.complete(v1);
2702          g.complete(v2);
2281        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2703  
2704 <        checkCompletedNormally(h, null);
2704 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2705 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2706 >
2707          checkCompletedNormally(f, v1);
2708          checkCompletedNormally(g, v2);
2709 <        assertEquals(1, r.invocationCount);
2709 >        checkCompletedNormally(h0, null);
2710 >        checkCompletedNormally(h1, null);
2711 >        checkCompletedNormally(h2, null);
2712 >        checkCompletedNormally(h3, null);
2713 >        checkCompletedNormally(h4, null);
2714 >        checkCompletedNormally(h5, null);
2715 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2716      }}
2717  
2718      /**
2719       * runAfterEither result completes exceptionally after exceptional
2720       * completion of either source
2721       */
2722 <    public void testRunAfterEither_exceptionalCompletion1() {
2722 >    public void testRunAfterEither_exceptionalCompletion() {
2723          for (ExecutionMode m : ExecutionMode.values())
2724          for (Integer v1 : new Integer[] { 1, null })
2725      {
2726          final CompletableFuture<Integer> f = new CompletableFuture<>();
2727          final CompletableFuture<Integer> g = new CompletableFuture<>();
2299        final Noop r = new Noop(m);
2300        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2728          final CFException ex = new CFException();
2729 +        final Noop[] rs = new Noop[6];
2730 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2731  
2732 <        f.completeExceptionally(ex);
2733 <        checkCompletedWithWrappedCFException(h, ex);
2734 <        g.complete(v1);
2735 <
2736 <        assertEquals(0, r.invocationCount);
2737 <        checkCompletedNormally(g, v1);
2738 <        checkCompletedWithWrappedCFException(f, ex);
2739 <        checkCompletedWithWrappedCFException(h, ex);
2740 <    }}
2741 <
2742 <    public void testRunAfterEither_exceptionalCompletion2() {
2743 <        for (ExecutionMode m : ExecutionMode.values())
2744 <        for (Integer v1 : new Integer[] { 1, null })
2316 <    {
2317 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2318 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2319 <        final Noop r = new Noop(m);
2320 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2321 <        final CFException ex = new CFException();
2322 <
2323 <        g.completeExceptionally(ex);
2324 <        checkCompletedWithWrappedCFException(h, ex);
2325 <        f.complete(v1);
2326 <
2327 <        assertEquals(0, r.invocationCount);
2328 <        checkCompletedNormally(f, v1);
2329 <        checkCompletedWithWrappedCFException(g, ex);
2330 <        checkCompletedWithWrappedCFException(h, ex);
2331 <    }}
2732 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2733 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2734 >        checkIncomplete(h0);
2735 >        checkIncomplete(h1);
2736 >        rs[0].assertNotInvoked();
2737 >        rs[1].assertNotInvoked();
2738 >        assertTrue(f.completeExceptionally(ex));
2739 >        checkCompletedWithWrappedException(h0, ex);
2740 >        checkCompletedWithWrappedException(h1, ex);
2741 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2742 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2743 >        checkCompletedWithWrappedException(h2, ex);
2744 >        checkCompletedWithWrappedException(h3, ex);
2745  
2746 <    public void testRunAfterEither_exceptionalCompletion3() {
2334 <        for (ExecutionMode m : ExecutionMode.values())
2335 <        for (Integer v1 : new Integer[] { 1, null })
2336 <    {
2337 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2338 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2339 <        final Noop r = new Noop(m);
2340 <        final CFException ex = new CFException();
2341 <
2342 <        g.completeExceptionally(ex);
2343 <        f.complete(v1);
2344 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2746 >        assertTrue(g.complete(v1));
2747  
2748 <        // unspecified behavior
2749 <        Integer v;
2748 >        // unspecified behavior - both source completions available
2749 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2750 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2751          try {
2752 <            assertNull(h.join());
2753 <            assertEquals(1, r.invocationCount);
2752 >            assertNull(h4.join());
2753 >            rs[4].assertInvoked();
2754          } catch (CompletionException ok) {
2755 <            checkCompletedWithWrappedCFException(h, ex);
2756 <            assertEquals(0, r.invocationCount);
2755 >            checkCompletedWithWrappedException(h4, ex);
2756 >            rs[4].assertNotInvoked();
2757          }
2355
2356        checkCompletedWithWrappedCFException(g, ex);
2357        checkCompletedNormally(f, v1);
2358    }}
2359
2360    public void testRunAfterEither_exceptionalCompletion4() {
2361        for (ExecutionMode m : ExecutionMode.values())
2362        for (Integer v1 : new Integer[] { 1, null })
2363    {
2364        final CompletableFuture<Integer> f = new CompletableFuture<>();
2365        final CompletableFuture<Integer> g = new CompletableFuture<>();
2366        final Noop r = new Noop(m);
2367        final CFException ex = new CFException();
2368
2369        f.completeExceptionally(ex);
2370        g.complete(v1);
2371        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2372
2373        // unspecified behavior
2374        Integer v;
2758          try {
2759 <            assertNull(h.join());
2760 <            assertEquals(1, r.invocationCount);
2759 >            assertNull(h5.join());
2760 >            rs[5].assertInvoked();
2761          } catch (CompletionException ok) {
2762 <            checkCompletedWithWrappedCFException(h, ex);
2763 <            assertEquals(0, r.invocationCount);
2762 >            checkCompletedWithWrappedException(h5, ex);
2763 >            rs[5].assertNotInvoked();
2764          }
2765  
2766 <        checkCompletedWithWrappedCFException(f, ex);
2766 >        checkCompletedExceptionally(f, ex);
2767          checkCompletedNormally(g, v1);
2768 +        checkCompletedWithWrappedException(h0, ex);
2769 +        checkCompletedWithWrappedException(h1, ex);
2770 +        checkCompletedWithWrappedException(h2, ex);
2771 +        checkCompletedWithWrappedException(h3, ex);
2772 +        checkCompletedWithWrappedException(h4, ex);
2773 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2774      }}
2775  
2776 <    /**
2388 <     * runAfterEither result completes exceptionally if action does
2389 <     */
2390 <    public void testRunAfterEither_actionFailed1() {
2776 >    public void testRunAfterEither_exceptionalCompletion2() {
2777          for (ExecutionMode m : ExecutionMode.values())
2778 +        for (boolean fFirst : new boolean[] { true, false })
2779          for (Integer v1 : new Integer[] { 1, null })
2393        for (Integer v2 : new Integer[] { 2, null })
2780      {
2781          final CompletableFuture<Integer> f = new CompletableFuture<>();
2782          final CompletableFuture<Integer> g = new CompletableFuture<>();
2783 <        final FailingRunnable r = new FailingRunnable(m);
2784 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2783 >        final CFException ex = new CFException();
2784 >        final Noop[] rs = new Noop[6];
2785 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2786  
2787 <        f.complete(v1);
2788 <        checkCompletedWithWrappedCFException(h);
2789 <        g.complete(v2);
2790 <        checkCompletedNormally(f, v1);
2791 <        checkCompletedNormally(g, v2);
2792 <    }}
2787 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2788 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2789 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2790 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2791 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2792 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2793  
2794 <    public void testRunAfterEither_actionFailed2() {
2795 <        for (ExecutionMode m : ExecutionMode.values())
2796 <        for (Integer v1 : new Integer[] { 1, null })
2797 <        for (Integer v2 : new Integer[] { 2, null })
2798 <    {
2799 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2800 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2801 <        final FailingRunnable r = new FailingRunnable(m);
2802 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2794 >        // unspecified behavior - both source completions available
2795 >        try {
2796 >            assertEquals(null, h0.join());
2797 >            rs[0].assertInvoked();
2798 >        } catch (CompletionException ok) {
2799 >            checkCompletedWithWrappedException(h0, ex);
2800 >            rs[0].assertNotInvoked();
2801 >        }
2802 >        try {
2803 >            assertEquals(null, h1.join());
2804 >            rs[1].assertInvoked();
2805 >        } catch (CompletionException ok) {
2806 >            checkCompletedWithWrappedException(h1, ex);
2807 >            rs[1].assertNotInvoked();
2808 >        }
2809 >        try {
2810 >            assertEquals(null, h2.join());
2811 >            rs[2].assertInvoked();
2812 >        } catch (CompletionException ok) {
2813 >            checkCompletedWithWrappedException(h2, ex);
2814 >            rs[2].assertNotInvoked();
2815 >        }
2816 >        try {
2817 >            assertEquals(null, h3.join());
2818 >            rs[3].assertInvoked();
2819 >        } catch (CompletionException ok) {
2820 >            checkCompletedWithWrappedException(h3, ex);
2821 >            rs[3].assertNotInvoked();
2822 >        }
2823  
2417        g.complete(v2);
2418        checkCompletedWithWrappedCFException(h);
2419        f.complete(v1);
2824          checkCompletedNormally(f, v1);
2825 <        checkCompletedNormally(g, v2);
2825 >        checkCompletedExceptionally(g, ex);
2826      }}
2827  
2828      /**
2829       * runAfterEither result completes exceptionally if either source cancelled
2830       */
2831 <    public void testRunAfterEither_sourceCancelled1() {
2428 <        for (ExecutionMode m : ExecutionMode.values())
2429 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2430 <        for (Integer v1 : new Integer[] { 1, null })
2431 <    {
2432 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434 <        final Noop r = new Noop(m);
2435 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2436 <
2437 <        assertTrue(f.cancel(mayInterruptIfRunning));
2438 <        checkCompletedWithWrappedCancellationException(h);
2439 <        g.complete(v1);
2440 <
2441 <        checkCancelled(f);
2442 <        assertEquals(0, r.invocationCount);
2443 <        checkCompletedNormally(g, v1);
2444 <        checkCompletedWithWrappedCancellationException(h);
2445 <    }}
2446 <
2447 <    public void testRunAfterEither_sourceCancelled2() {
2831 >    public void testRunAfterEither_sourceCancelled() {
2832          for (ExecutionMode m : ExecutionMode.values())
2833          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2834          for (Integer v1 : new Integer[] { 1, null })
2835      {
2836          final CompletableFuture<Integer> f = new CompletableFuture<>();
2837          final CompletableFuture<Integer> g = new CompletableFuture<>();
2838 <        final Noop r = new Noop(m);
2839 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2838 >        final Noop[] rs = new Noop[6];
2839 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2840  
2841 <        assertTrue(g.cancel(mayInterruptIfRunning));
2842 <        checkCompletedWithWrappedCancellationException(h);
2843 <        f.complete(v1);
2844 <
2845 <        checkCancelled(g);
2846 <        assertEquals(0, r.invocationCount);
2847 <        checkCompletedNormally(f, v1);
2848 <        checkCompletedWithWrappedCancellationException(h);
2849 <    }}
2850 <
2851 <    public void testRunAfterEither_sourceCancelled3() {
2852 <        for (ExecutionMode m : ExecutionMode.values())
2853 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2854 <        for (Integer v1 : new Integer[] { 1, null })
2855 <    {
2856 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2858 <        final Noop r = new Noop(m);
2859 <
2476 <        assertTrue(g.cancel(mayInterruptIfRunning));
2477 <        f.complete(v1);
2478 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2479 <
2480 <        // unspecified behavior
2481 <        Integer v;
2841 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2842 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2843 >        checkIncomplete(h0);
2844 >        checkIncomplete(h1);
2845 >        rs[0].assertNotInvoked();
2846 >        rs[1].assertNotInvoked();
2847 >        f.cancel(mayInterruptIfRunning);
2848 >        checkCompletedWithWrappedCancellationException(h0);
2849 >        checkCompletedWithWrappedCancellationException(h1);
2850 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2851 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2852 >        checkCompletedWithWrappedCancellationException(h2);
2853 >        checkCompletedWithWrappedCancellationException(h3);
2854 >
2855 >        assertTrue(g.complete(v1));
2856 >
2857 >        // unspecified behavior - both source completions available
2858 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2859 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2860          try {
2861 <            assertNull(h.join());
2862 <            assertEquals(1, r.invocationCount);
2861 >            assertNull(h4.join());
2862 >            rs[4].assertInvoked();
2863          } catch (CompletionException ok) {
2864 <            checkCompletedWithWrappedCancellationException(h);
2865 <            assertEquals(0, r.invocationCount);
2864 >            checkCompletedWithWrappedCancellationException(h4);
2865 >            rs[4].assertNotInvoked();
2866 >        }
2867 >        try {
2868 >            assertNull(h5.join());
2869 >            rs[5].assertInvoked();
2870 >        } catch (CompletionException ok) {
2871 >            checkCompletedWithWrappedCancellationException(h5);
2872 >            rs[5].assertNotInvoked();
2873          }
2874  
2875 <        checkCancelled(g);
2876 <        checkCompletedNormally(f, v1);
2875 >        checkCancelled(f);
2876 >        checkCompletedNormally(g, v1);
2877 >        checkCompletedWithWrappedCancellationException(h0);
2878 >        checkCompletedWithWrappedCancellationException(h1);
2879 >        checkCompletedWithWrappedCancellationException(h2);
2880 >        checkCompletedWithWrappedCancellationException(h3);
2881 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2882      }}
2883  
2884 <    public void testRunAfterEither_sourceCancelled4() {
2884 >    /**
2885 >     * runAfterEither result completes exceptionally if action does
2886 >     */
2887 >    public void testRunAfterEither_actionFailed() {
2888          for (ExecutionMode m : ExecutionMode.values())
2496        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2889          for (Integer v1 : new Integer[] { 1, null })
2890 +        for (Integer v2 : new Integer[] { 2, null })
2891      {
2892          final CompletableFuture<Integer> f = new CompletableFuture<>();
2893          final CompletableFuture<Integer> g = new CompletableFuture<>();
2894 <        final Noop r = new Noop(m);
2894 >        final FailingRunnable[] rs = new FailingRunnable[6];
2895 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2896  
2897 <        assertTrue(f.cancel(mayInterruptIfRunning));
2898 <        g.complete(v1);
2899 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2900 <
2901 <        // unspecified behavior
2902 <        Integer v;
2903 <        try {
2904 <            assertNull(h.join());
2905 <            assertEquals(1, r.invocationCount);
2906 <        } catch (CompletionException ok) {
2907 <            checkCompletedWithWrappedCancellationException(h);
2908 <            assertEquals(0, r.invocationCount);
2909 <        }
2897 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2898 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2899 >        assertTrue(f.complete(v1));
2900 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2901 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2902 >        checkCompletedWithWrappedCFException(h0);
2903 >        checkCompletedWithWrappedCFException(h1);
2904 >        checkCompletedWithWrappedCFException(h2);
2905 >        checkCompletedWithWrappedCFException(h3);
2906 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2907 >        assertTrue(g.complete(v2));
2908 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2909 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2910 >        checkCompletedWithWrappedCFException(h4);
2911 >        checkCompletedWithWrappedCFException(h5);
2912  
2913 <        checkCancelled(f);
2914 <        checkCompletedNormally(g, v1);
2913 >        checkCompletedNormally(f, v1);
2914 >        checkCompletedNormally(g, v2);
2915 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2916      }}
2917  
2918      /**
# Line 2528 | Line 2925 | public class CompletableFutureTest exten
2925      {
2926          final CompletableFuture<Integer> f = new CompletableFuture<>();
2927          final CompletableFutureInc r = new CompletableFutureInc(m);
2928 <        if (!createIncomplete) f.complete(v1);
2928 >        if (!createIncomplete) assertTrue(f.complete(v1));
2929          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2930 <        if (createIncomplete) f.complete(v1);
2930 >        if (createIncomplete) assertTrue(f.complete(v1));
2931  
2932          checkCompletedNormally(g, inc(v1));
2933          checkCompletedNormally(f, v1);
2934 <        assertEquals(1, r.invocationCount);
2934 >        r.assertValue(v1);
2935      }}
2936  
2937      /**
# Line 2552 | Line 2949 | public class CompletableFutureTest exten
2949          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2950          if (createIncomplete) f.completeExceptionally(ex);
2951  
2952 <        checkCompletedWithWrappedCFException(g, ex);
2953 <        checkCompletedWithWrappedCFException(f, ex);
2954 <        assertEquals(0, r.invocationCount);
2952 >        checkCompletedWithWrappedException(g, ex);
2953 >        checkCompletedExceptionally(f, ex);
2954 >        r.assertNotInvoked();
2955      }}
2956  
2957      /**
# Line 2568 | Line 2965 | public class CompletableFutureTest exten
2965          final CompletableFuture<Integer> f = new CompletableFuture<>();
2966          final FailingCompletableFutureFunction r
2967              = new FailingCompletableFutureFunction(m);
2968 <        if (!createIncomplete) f.complete(v1);
2968 >        if (!createIncomplete) assertTrue(f.complete(v1));
2969          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2970 <        if (createIncomplete) f.complete(v1);
2970 >        if (createIncomplete) assertTrue(f.complete(v1));
2971  
2972          checkCompletedWithWrappedCFException(g);
2973          checkCompletedNormally(f, v1);
# Line 2613 | Line 3010 | public class CompletableFutureTest exten
3010       * when all components complete normally
3011       */
3012      public void testAllOf_normal() throws Exception {
3013 <        for (int k = 1; k < 20; ++k) {
3013 >        for (int k = 1; k < 10; k++) {
3014              CompletableFuture<Integer>[] fs
3015                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3016 <            for (int i = 0; i < k; ++i)
3016 >            for (int i = 0; i < k; i++)
3017                  fs[i] = new CompletableFuture<>();
3018              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3019 <            for (int i = 0; i < k; ++i) {
3019 >            for (int i = 0; i < k; i++) {
3020                  checkIncomplete(f);
3021                  checkIncomplete(CompletableFuture.allOf(fs));
3022                  fs[i].complete(one);
# Line 2630 | Line 3027 | public class CompletableFutureTest exten
3027      }
3028  
3029      public void testAllOf_backwards() throws Exception {
3030 <        for (int k = 1; k < 20; ++k) {
3030 >        for (int k = 1; k < 10; k++) {
3031              CompletableFuture<Integer>[] fs
3032                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3033 <            for (int i = 0; i < k; ++i)
3033 >            for (int i = 0; i < k; i++)
3034                  fs[i] = new CompletableFuture<>();
3035              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3036              for (int i = k - 1; i >= 0; i--) {
# Line 2646 | Line 3043 | public class CompletableFutureTest exten
3043          }
3044      }
3045  
3046 +    public void testAllOf_exceptional() throws Exception {
3047 +        for (int k = 1; k < 10; k++) {
3048 +            CompletableFuture<Integer>[] fs
3049 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3050 +            CFException ex = new CFException();
3051 +            for (int i = 0; i < k; i++)
3052 +                fs[i] = new CompletableFuture<>();
3053 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3054 +            for (int i = 0; i < k; i++) {
3055 +                checkIncomplete(f);
3056 +                checkIncomplete(CompletableFuture.allOf(fs));
3057 +                if (i != k/2) {
3058 +                    fs[i].complete(i);
3059 +                    checkCompletedNormally(fs[i], i);
3060 +                } else {
3061 +                    fs[i].completeExceptionally(ex);
3062 +                    checkCompletedExceptionally(fs[i], ex);
3063 +                }
3064 +            }
3065 +            checkCompletedWithWrappedException(f, ex);
3066 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3067 +        }
3068 +    }
3069 +
3070      /**
3071       * anyOf(no component futures) returns an incomplete future
3072       */
3073      public void testAnyOf_empty() throws Exception {
3074 +        for (Integer v1 : new Integer[] { 1, null })
3075 +    {
3076          CompletableFuture<Object> f = CompletableFuture.anyOf();
3077          checkIncomplete(f);
3078 <    }
3078 >
3079 >        f.complete(v1);
3080 >        checkCompletedNormally(f, v1);
3081 >    }}
3082  
3083      /**
3084       * anyOf returns a future completed normally with a value when
3085       * a component future does
3086       */
3087      public void testAnyOf_normal() throws Exception {
3088 <        for (int k = 0; k < 10; ++k) {
3088 >        for (int k = 0; k < 10; k++) {
3089              CompletableFuture[] fs = new CompletableFuture[k];
3090 <            for (int i = 0; i < k; ++i)
3090 >            for (int i = 0; i < k; i++)
3091                  fs[i] = new CompletableFuture<>();
3092              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3093              checkIncomplete(f);
3094 <            for (int i = 0; i < k; ++i) {
3095 <                fs[i].complete(one);
3096 <                checkCompletedNormally(f, one);
3097 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3094 >            for (int i = 0; i < k; i++) {
3095 >                fs[i].complete(i);
3096 >                checkCompletedNormally(f, 0);
3097 >                int x = (int) CompletableFuture.anyOf(fs).join();
3098 >                assertTrue(0 <= x && x <= i);
3099 >            }
3100 >        }
3101 >    }
3102 >    public void testAnyOf_normal_backwards() throws Exception {
3103 >        for (int k = 0; k < 10; k++) {
3104 >            CompletableFuture[] fs = new CompletableFuture[k];
3105 >            for (int i = 0; i < k; i++)
3106 >                fs[i] = new CompletableFuture<>();
3107 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3108 >            checkIncomplete(f);
3109 >            for (int i = k - 1; i >= 0; i--) {
3110 >                fs[i].complete(i);
3111 >                checkCompletedNormally(f, k - 1);
3112 >                int x = (int) CompletableFuture.anyOf(fs).join();
3113 >                assertTrue(i <= x && x <= k - 1);
3114              }
3115          }
3116      }
# Line 2677 | Line 3119 | public class CompletableFutureTest exten
3119       * anyOf result completes exceptionally when any component does.
3120       */
3121      public void testAnyOf_exceptional() throws Exception {
3122 <        for (int k = 0; k < 10; ++k) {
3122 >        for (int k = 0; k < 10; k++) {
3123              CompletableFuture[] fs = new CompletableFuture[k];
3124 <            for (int i = 0; i < k; ++i)
3124 >            CFException[] exs = new CFException[k];
3125 >            for (int i = 0; i < k; i++) {
3126                  fs[i] = new CompletableFuture<>();
3127 +                exs[i] = new CFException();
3128 +            }
3129              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3130              checkIncomplete(f);
3131 <            for (int i = 0; i < k; ++i) {
3132 <                fs[i].completeExceptionally(new CFException());
3133 <                checkCompletedWithWrappedCFException(f);
3131 >            for (int i = 0; i < k; i++) {
3132 >                fs[i].completeExceptionally(exs[i]);
3133 >                checkCompletedWithWrappedException(f, exs[0]);
3134 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3135 >            }
3136 >        }
3137 >    }
3138 >
3139 >    public void testAnyOf_exceptional_backwards() throws Exception {
3140 >        for (int k = 0; k < 10; k++) {
3141 >            CompletableFuture[] fs = new CompletableFuture[k];
3142 >            CFException[] exs = new CFException[k];
3143 >            for (int i = 0; i < k; i++) {
3144 >                fs[i] = new CompletableFuture<>();
3145 >                exs[i] = new CFException();
3146 >            }
3147 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3148 >            checkIncomplete(f);
3149 >            for (int i = k - 1; i >= 0; i--) {
3150 >                fs[i].completeExceptionally(exs[i]);
3151 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3152                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3153              }
3154          }
# Line 2704 | Line 3167 | public class CompletableFutureTest exten
3167          Runnable[] throwingActions = {
3168              () -> CompletableFuture.supplyAsync(null),
3169              () -> CompletableFuture.supplyAsync(null, exec),
3170 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3170 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3171  
3172              () -> CompletableFuture.runAsync(null),
3173              () -> CompletableFuture.runAsync(null, exec),
# Line 2809 | Line 3272 | public class CompletableFutureTest exten
3272          assertSame(f, f.toCompletableFuture());
3273      }
3274  
3275 <    /**
2813 <     * whenComplete action executes on normal completion, propagating
2814 <     * source result.
2815 <     */
2816 <    public void testWhenComplete_normalCompletion1() {
2817 <        for (ExecutionMode m : ExecutionMode.values())
2818 <        for (boolean createIncomplete : new boolean[] { true, false })
2819 <        for (Integer v1 : new Integer[] { 1, null })
2820 <    {
2821 <        final AtomicInteger a = new AtomicInteger(0);
2822 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2823 <        if (!createIncomplete) f.complete(v1);
2824 <        final CompletableFuture<Integer> g = m.whenComplete
2825 <            (f,
2826 <             (Integer x, Throwable t) -> {
2827 <                threadAssertSame(x, v1);
2828 <                threadAssertNull(t);
2829 <                a.getAndIncrement();
2830 <            });
2831 <        if (createIncomplete) f.complete(v1);
3275 >    //--- tests of implementation details; not part of official tck ---
3276  
3277 <        checkCompletedNormally(g, v1);
3278 <        checkCompletedNormally(f, v1);
3279 <        assertEquals(1, a.get());
3280 <    }}
3277 >    Object resultOf(CompletableFuture<?> f) {
3278 >        try {
3279 >            java.lang.reflect.Field resultField
3280 >                = CompletableFuture.class.getDeclaredField("result");
3281 >            resultField.setAccessible(true);
3282 >            return resultField.get(f);
3283 >        } catch (Throwable t) { throw new AssertionError(t); }
3284 >    }
3285  
3286 <    /**
3287 <     * whenComplete action executes on exceptional completion, propagating
2840 <     * source result.
2841 <     */
2842 <    public void testWhenComplete_exceptionalCompletion() {
3286 >    public void testExceptionPropagationReusesResultObject() {
3287 >        if (!testImplementationDetails) return;
3288          for (ExecutionMode m : ExecutionMode.values())
2844        for (boolean createIncomplete : new boolean[] { true, false })
2845        for (Integer v1 : new Integer[] { 1, null })
3289      {
2847        final AtomicInteger a = new AtomicInteger(0);
3290          final CFException ex = new CFException();
3291 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3292 <        if (!createIncomplete) f.completeExceptionally(ex);
2851 <        final CompletableFuture<Integer> g = m.whenComplete
2852 <            (f,
2853 <             (Integer x, Throwable t) -> {
2854 <                threadAssertNull(x);
2855 <                threadAssertSame(t, ex);
2856 <                a.getAndIncrement();
2857 <            });
2858 <        if (createIncomplete) f.completeExceptionally(ex);
2859 <        checkCompletedWithWrappedCFException(f, ex);
2860 <        checkCompletedWithWrappedCFException(g, ex);
2861 <        assertEquals(1, a.get());
2862 <    }}
3291 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3292 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3293  
3294 <    /**
3295 <     * whenComplete action executes on cancelled source, propagating
2866 <     * CancellationException.
2867 <     */
2868 <    public void testWhenComplete_sourceCancelled() {
2869 <        for (ExecutionMode m : ExecutionMode.values())
2870 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2871 <        for (boolean createIncomplete : new boolean[] { true, false })
2872 <    {
2873 <        final AtomicInteger a = new AtomicInteger(0);
2874 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2875 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2876 <        final CompletableFuture<Integer> g = m.whenComplete
2877 <            (f,
2878 <             (Integer x, Throwable t) -> {
2879 <                threadAssertNull(x);
2880 <                threadAssertTrue(t instanceof CancellationException);
2881 <                a.getAndIncrement();
2882 <            });
2883 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3294 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3295 >            = new ArrayList<>();
3296  
3297 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3298 <        checkCompletedWithWrappedCancellationException(g);
3299 <        checkCancelled(f);
2888 <        assertEquals(1, a.get());
2889 <    }}
3297 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3298 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3299 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3300  
3301 <    /**
3302 <     * If a whenComplete action throws an exception when triggered by
3303 <     * a normal completion, it completes exceptionally
2894 <     */
2895 <    public void testWhenComplete_actionFailed() {
2896 <        for (boolean createIncomplete : new boolean[] { true, false })
2897 <        for (ExecutionMode m : ExecutionMode.values())
2898 <        for (Integer v1 : new Integer[] { 1, null })
2899 <    {
2900 <        final AtomicInteger a = new AtomicInteger(0);
2901 <        final CFException ex = new CFException();
2902 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2903 <        if (!createIncomplete) f.complete(v1);
2904 <        final CompletableFuture<Integer> g = m.whenComplete
2905 <            (f,
2906 <             (Integer x, Throwable t) -> {
2907 <                threadAssertSame(x, v1);
2908 <                threadAssertNull(t);
2909 <                a.getAndIncrement();
2910 <                throw ex;
2911 <            });
2912 <        if (createIncomplete) f.complete(v1);
2913 <        checkCompletedNormally(f, v1);
2914 <        checkCompletedWithWrappedCFException(g, ex);
2915 <        assertEquals(1, a.get());
2916 <    }}
3301 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3302 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3303 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3304  
3305 <    /**
3306 <     * If a whenComplete action throws an exception when triggered by
3307 <     * a source completion that also throws an exception, the source
2921 <     * exception takes precedence.
2922 <     */
2923 <    public void testWhenComplete_actionFailedSourceFailed() {
2924 <        for (boolean createIncomplete : new boolean[] { true, false })
2925 <        for (ExecutionMode m : ExecutionMode.values())
2926 <        for (Integer v1 : new Integer[] { 1, null })
2927 <    {
2928 <        final AtomicInteger a = new AtomicInteger(0);
2929 <        final CFException ex1 = new CFException();
2930 <        final CFException ex2 = new CFException();
2931 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3305 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3306 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3307 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3308  
3309 <        if (!createIncomplete) f.completeExceptionally(ex1);
2934 <        final CompletableFuture<Integer> g = m.whenComplete
2935 <            (f,
2936 <             (Integer x, Throwable t) -> {
2937 <                threadAssertSame(t, ex1);
2938 <                threadAssertNull(x);
2939 <                a.getAndIncrement();
2940 <                throw ex2;
2941 <            });
2942 <        if (createIncomplete) f.completeExceptionally(ex1);
3309 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3310  
3311 <        checkCompletedWithWrappedCFException(f, ex1);
3312 <        checkCompletedWithWrappedCFException(g, ex1);
3313 <        assertEquals(1, a.get());
3311 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3312 >
3313 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3314 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3315 >
3316 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3317 >                 fun : funs) {
3318 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3319 >            f.completeExceptionally(ex);
3320 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3321 >            checkCompletedWithWrappedException(src, ex);
3322 >            CompletableFuture<?> dep = fun.apply(src);
3323 >            checkCompletedWithWrappedException(dep, ex);
3324 >            assertSame(resultOf(src), resultOf(dep));
3325 >        }
3326 >
3327 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3328 >                 fun : funs) {
3329 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3330 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3331 >            CompletableFuture<?> dep = fun.apply(src);
3332 >            f.completeExceptionally(ex);
3333 >            checkCompletedWithWrappedException(src, ex);
3334 >            checkCompletedWithWrappedException(dep, ex);
3335 >            assertSame(resultOf(src), resultOf(dep));
3336 >        }
3337 >
3338 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3339 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3340 >                 fun : funs) {
3341 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3342 >            f.cancel(mayInterruptIfRunning);
3343 >            checkCancelled(f);
3344 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3345 >            checkCompletedWithWrappedCancellationException(src);
3346 >            CompletableFuture<?> dep = fun.apply(src);
3347 >            checkCompletedWithWrappedCancellationException(dep);
3348 >            assertSame(resultOf(src), resultOf(dep));
3349 >        }
3350 >
3351 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3352 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3353 >                 fun : funs) {
3354 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3355 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3356 >            CompletableFuture<?> dep = fun.apply(src);
3357 >            f.cancel(mayInterruptIfRunning);
3358 >            checkCancelled(f);
3359 >            checkCompletedWithWrappedCancellationException(src);
3360 >            checkCompletedWithWrappedCancellationException(dep);
3361 >            assertSame(resultOf(src), resultOf(dep));
3362 >        }
3363      }}
3364  
3365   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines