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.100 by jsr166, Thu Jan 15 18:34:19 2015 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;
470 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
549 >    class CompletableFutureInc extends CheckedIntegerAction
550 >        implements Function<Integer, CompletableFuture<Integer>>
551 >    {
552 >        CompletableFutureInc(ExecutionMode m) { super(m); }
553          public CompletableFuture<Integer> apply(Integer x) {
554 <            m.checkExecutionMode();
555 <            invocationCount++;
554 >            invoked();
555 >            value = x;
556              CompletableFuture<Integer> f = new CompletableFuture<>();
557 <            f.complete(inc(x));
557 >            assertTrue(f.complete(inc(x)));
558              return f;
559          }
560      }
561  
562 <    static final class FailingCompletableFutureFunction
563 <        implements Function<Integer, CompletableFuture<Integer>> {
564 <        final ExecutionMode m;
565 <        int invocationCount = 0;
484 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
562 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
563 >        implements Function<Integer, CompletableFuture<Integer>>
564 >    {
565 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
566          public CompletableFuture<Integer> apply(Integer x) {
567 <            m.checkExecutionMode();
568 <            invocationCount++;
567 >            invoked();
568 >            value = x;
569              throw new CFException();
570          }
571      }
# Line 503 | Line 584 | public class CompletableFutureTest exten
584          }
585      }
586  
587 +    static final boolean defaultExecutorIsCommonPool
588 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
589 +
590      /**
591       * Permits the testing of parallel code for the 3 different
592 <     * execution modes without repeating all the testing code.
592 >     * execution modes without copy/pasting all the test methods.
593       */
594      enum ExecutionMode {
595 <        DEFAULT {
595 >        SYNC {
596              public void checkExecutionMode() {
597 +                assertFalse(ThreadExecutor.startedCurrentThread());
598                  assertNull(ForkJoinTask.getPool());
599              }
600              public CompletableFuture<Void> runAsync(Runnable a) {
# Line 583 | Line 668 | public class CompletableFutureTest exten
668  
669          ASYNC {
670              public void checkExecutionMode() {
671 <                assertSame(ForkJoinPool.commonPool(),
672 <                           ForkJoinTask.getPool());
671 >                assertEquals(defaultExecutorIsCommonPool,
672 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
673              }
674              public CompletableFuture<Void> runAsync(Runnable a) {
675                  return CompletableFuture.runAsync(a);
# Line 780 | Line 865 | public class CompletableFutureTest exten
865      {
866          final AtomicInteger a = new AtomicInteger(0);
867          final CompletableFuture<Integer> f = new CompletableFuture<>();
868 <        if (!createIncomplete) f.complete(v1);
868 >        if (!createIncomplete) assertTrue(f.complete(v1));
869          final CompletableFuture<Integer> g = f.exceptionally
870              ((Throwable t) -> {
871                  // Should not be called
872                  a.getAndIncrement();
873                  throw new AssertionError();
874              });
875 <        if (createIncomplete) f.complete(v1);
875 >        if (createIncomplete) assertTrue(f.complete(v1));
876  
877          checkCompletedNormally(g, v1);
878          checkCompletedNormally(f, v1);
879          assertEquals(0, a.get());
880      }}
881  
797
882      /**
883       * exceptionally action completes with function value on source
884       * exception
# Line 809 | Line 893 | public class CompletableFutureTest exten
893          if (!createIncomplete) f.completeExceptionally(ex);
894          final CompletableFuture<Integer> g = f.exceptionally
895              ((Throwable t) -> {
896 <                ExecutionMode.DEFAULT.checkExecutionMode();
896 >                ExecutionMode.SYNC.checkExecutionMode();
897                  threadAssertSame(t, ex);
898                  a.getAndIncrement();
899                  return v1;
# Line 831 | Line 915 | public class CompletableFutureTest exten
915          if (!createIncomplete) f.completeExceptionally(ex1);
916          final CompletableFuture<Integer> g = f.exceptionally
917              ((Throwable t) -> {
918 <                ExecutionMode.DEFAULT.checkExecutionMode();
918 >                ExecutionMode.SYNC.checkExecutionMode();
919                  threadAssertSame(t, ex1);
920                  a.getAndIncrement();
921                  throw ex2;
922              });
923          if (createIncomplete) f.completeExceptionally(ex1);
924  
925 <        checkCompletedWithWrappedCFException(g, ex2);
925 >        checkCompletedWithWrappedException(g, ex2);
926 >        assertEquals(1, a.get());
927 >    }}
928 >
929 >    /**
930 >     * whenComplete action executes on normal completion, propagating
931 >     * source result.
932 >     */
933 >    public void testWhenComplete_normalCompletion1() {
934 >        for (ExecutionMode m : ExecutionMode.values())
935 >        for (boolean createIncomplete : new boolean[] { true, false })
936 >        for (Integer v1 : new Integer[] { 1, null })
937 >    {
938 >        final AtomicInteger a = new AtomicInteger(0);
939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
940 >        if (!createIncomplete) assertTrue(f.complete(v1));
941 >        final CompletableFuture<Integer> g = m.whenComplete
942 >            (f,
943 >             (Integer x, Throwable t) -> {
944 >                m.checkExecutionMode();
945 >                threadAssertSame(x, v1);
946 >                threadAssertNull(t);
947 >                a.getAndIncrement();
948 >            });
949 >        if (createIncomplete) assertTrue(f.complete(v1));
950 >
951 >        checkCompletedNormally(g, v1);
952 >        checkCompletedNormally(f, v1);
953 >        assertEquals(1, a.get());
954 >    }}
955 >
956 >    /**
957 >     * whenComplete action executes on exceptional completion, propagating
958 >     * source result.
959 >     */
960 >    public void testWhenComplete_exceptionalCompletion() {
961 >        for (ExecutionMode m : ExecutionMode.values())
962 >        for (boolean createIncomplete : new boolean[] { true, false })
963 >        for (Integer v1 : new Integer[] { 1, null })
964 >    {
965 >        final AtomicInteger a = new AtomicInteger(0);
966 >        final CFException ex = new CFException();
967 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
968 >        if (!createIncomplete) f.completeExceptionally(ex);
969 >        final CompletableFuture<Integer> g = m.whenComplete
970 >            (f,
971 >             (Integer x, Throwable t) -> {
972 >                m.checkExecutionMode();
973 >                threadAssertNull(x);
974 >                threadAssertSame(t, ex);
975 >                a.getAndIncrement();
976 >            });
977 >        if (createIncomplete) f.completeExceptionally(ex);
978 >
979 >        checkCompletedWithWrappedException(g, ex);
980 >        checkCompletedExceptionally(f, ex);
981 >        assertEquals(1, a.get());
982 >    }}
983 >
984 >    /**
985 >     * whenComplete action executes on cancelled source, propagating
986 >     * CancellationException.
987 >     */
988 >    public void testWhenComplete_sourceCancelled() {
989 >        for (ExecutionMode m : ExecutionMode.values())
990 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
991 >        for (boolean createIncomplete : new boolean[] { true, false })
992 >    {
993 >        final AtomicInteger a = new AtomicInteger(0);
994 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
995 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
996 >        final CompletableFuture<Integer> g = m.whenComplete
997 >            (f,
998 >             (Integer x, Throwable t) -> {
999 >                m.checkExecutionMode();
1000 >                threadAssertNull(x);
1001 >                threadAssertTrue(t instanceof CancellationException);
1002 >                a.getAndIncrement();
1003 >            });
1004 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1005 >
1006 >        checkCompletedWithWrappedCancellationException(g);
1007 >        checkCancelled(f);
1008 >        assertEquals(1, a.get());
1009 >    }}
1010 >
1011 >    /**
1012 >     * If a whenComplete action throws an exception when triggered by
1013 >     * a normal completion, it completes exceptionally
1014 >     */
1015 >    public void testWhenComplete_actionFailed() {
1016 >        for (boolean createIncomplete : new boolean[] { true, false })
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >        for (Integer v1 : new Integer[] { 1, null })
1019 >    {
1020 >        final AtomicInteger a = new AtomicInteger(0);
1021 >        final CFException ex = new CFException();
1022 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1023 >        if (!createIncomplete) assertTrue(f.complete(v1));
1024 >        final CompletableFuture<Integer> g = m.whenComplete
1025 >            (f,
1026 >             (Integer x, Throwable t) -> {
1027 >                m.checkExecutionMode();
1028 >                threadAssertSame(x, v1);
1029 >                threadAssertNull(t);
1030 >                a.getAndIncrement();
1031 >                throw ex;
1032 >            });
1033 >        if (createIncomplete) assertTrue(f.complete(v1));
1034 >
1035 >        checkCompletedWithWrappedException(g, ex);
1036 >        checkCompletedNormally(f, v1);
1037 >        assertEquals(1, a.get());
1038 >    }}
1039 >
1040 >    /**
1041 >     * If a whenComplete action throws an exception when triggered by
1042 >     * a source completion that also throws an exception, the source
1043 >     * exception takes precedence.
1044 >     */
1045 >    public void testWhenComplete_actionFailedSourceFailed() {
1046 >        for (boolean createIncomplete : new boolean[] { true, false })
1047 >        for (ExecutionMode m : ExecutionMode.values())
1048 >        for (Integer v1 : new Integer[] { 1, null })
1049 >    {
1050 >        final AtomicInteger a = new AtomicInteger(0);
1051 >        final CFException ex1 = new CFException();
1052 >        final CFException ex2 = new CFException();
1053 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1054 >
1055 >        if (!createIncomplete) f.completeExceptionally(ex1);
1056 >        final CompletableFuture<Integer> g = m.whenComplete
1057 >            (f,
1058 >             (Integer x, Throwable t) -> {
1059 >                m.checkExecutionMode();
1060 >                threadAssertSame(t, ex1);
1061 >                threadAssertNull(x);
1062 >                a.getAndIncrement();
1063 >                throw ex2;
1064 >            });
1065 >        if (createIncomplete) f.completeExceptionally(ex1);
1066 >
1067 >        checkCompletedWithWrappedException(g, ex1);
1068 >        checkCompletedExceptionally(f, ex1);
1069          assertEquals(1, a.get());
1070      }}
1071  
# Line 853 | Line 1080 | public class CompletableFutureTest exten
1080      {
1081          final CompletableFuture<Integer> f = new CompletableFuture<>();
1082          final AtomicInteger a = new AtomicInteger(0);
1083 <        if (!createIncomplete) f.complete(v1);
1083 >        if (!createIncomplete) assertTrue(f.complete(v1));
1084          final CompletableFuture<Integer> g = m.handle
1085              (f,
1086               (Integer x, Throwable t) -> {
# Line 863 | Line 1090 | public class CompletableFutureTest exten
1090                  a.getAndIncrement();
1091                  return inc(v1);
1092              });
1093 <        if (createIncomplete) f.complete(v1);
1093 >        if (createIncomplete) assertTrue(f.complete(v1));
1094  
1095          checkCompletedNormally(g, inc(v1));
1096          checkCompletedNormally(f, v1);
# Line 895 | Line 1122 | public class CompletableFutureTest exten
1122          if (createIncomplete) f.completeExceptionally(ex);
1123  
1124          checkCompletedNormally(g, v1);
1125 <        checkCompletedWithWrappedCFException(f, ex);
1125 >        checkCompletedExceptionally(f, ex);
1126          assertEquals(1, a.get());
1127      }}
1128  
# Line 951 | Line 1178 | public class CompletableFutureTest exten
1178              });
1179          if (createIncomplete) f.completeExceptionally(ex1);
1180  
1181 <        checkCompletedWithWrappedCFException(g, ex2);
1182 <        checkCompletedWithWrappedCFException(f, ex1);
1181 >        checkCompletedWithWrappedException(g, ex2);
1182 >        checkCompletedExceptionally(f, ex1);
1183          assertEquals(1, a.get());
1184      }}
1185  
# Line 964 | Line 1191 | public class CompletableFutureTest exten
1191          final CompletableFuture<Integer> f = new CompletableFuture<>();
1192          final AtomicInteger a = new AtomicInteger(0);
1193          final CFException ex = new CFException();
1194 <        if (!createIncomplete) f.complete(v1);
1194 >        if (!createIncomplete) assertTrue(f.complete(v1));
1195          final CompletableFuture<Integer> g = m.handle
1196              (f,
1197               (Integer x, Throwable t) -> {
# Line 974 | Line 1201 | public class CompletableFutureTest exten
1201                  a.getAndIncrement();
1202                  throw ex;
1203              });
1204 <        if (createIncomplete) f.complete(v1);
1204 >        if (createIncomplete) assertTrue(f.complete(v1));
1205  
1206 <        checkCompletedWithWrappedCFException(g, ex);
1206 >        checkCompletedWithWrappedException(g, ex);
1207          checkCompletedNormally(f, v1);
1208          assertEquals(1, a.get());
1209      }}
# Line 995 | Line 1222 | public class CompletableFutureTest exten
1222          final CompletableFuture<Void> f = m.runAsync(r);
1223          assertNull(f.join());
1224          checkCompletedNormally(f, null);
1225 <        assertEquals(1, r.invocationCount);
1225 >        r.assertInvoked();
1226      }}
1227  
1228      /**
# Line 1011 | Line 1238 | public class CompletableFutureTest exten
1238          final FailingRunnable r = new FailingRunnable(m);
1239          final CompletableFuture<Void> f = m.runAsync(r);
1240          checkCompletedWithWrappedCFException(f);
1241 <        assertEquals(1, r.invocationCount);
1241 >        r.assertInvoked();
1242      }}
1243  
1244      /**
# Line 1029 | Line 1256 | public class CompletableFutureTest exten
1256          final CompletableFuture<Integer> f = m.supplyAsync(r);
1257          assertSame(v1, f.join());
1258          checkCompletedNormally(f, v1);
1259 <        assertEquals(1, r.invocationCount);
1259 >        r.assertInvoked();
1260      }}
1261  
1262      /**
# Line 1045 | Line 1272 | public class CompletableFutureTest exten
1272          FailingSupplier r = new FailingSupplier(m);
1273          CompletableFuture<Integer> f = m.supplyAsync(r);
1274          checkCompletedWithWrappedCFException(f);
1275 <        assertEquals(1, r.invocationCount);
1275 >        r.assertInvoked();
1276      }}
1277  
1278      // seq completion methods
# Line 1055 | Line 1282 | public class CompletableFutureTest exten
1282       */
1283      public void testThenRun_normalCompletion() {
1284          for (ExecutionMode m : ExecutionMode.values())
1058        for (boolean createIncomplete : new boolean[] { true, false })
1285          for (Integer v1 : new Integer[] { 1, null })
1286      {
1287          final CompletableFuture<Integer> f = new CompletableFuture<>();
1288 <        final Noop r = new Noop(m);
1289 <        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 <        }
1288 >        final Noop[] rs = new Noop[6];
1289 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1290  
1291 <        checkCompletedNormally(g, null);
1291 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1292 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1293 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1294 >        checkIncomplete(h0);
1295 >        checkIncomplete(h1);
1296 >        checkIncomplete(h2);
1297 >        assertTrue(f.complete(v1));
1298 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1299 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1300 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1301 >
1302 >        checkCompletedNormally(h0, null);
1303 >        checkCompletedNormally(h1, null);
1304 >        checkCompletedNormally(h2, null);
1305 >        checkCompletedNormally(h3, null);
1306 >        checkCompletedNormally(h4, null);
1307 >        checkCompletedNormally(h5, null);
1308          checkCompletedNormally(f, v1);
1309 <        assertEquals(1, r.invocationCount);
1309 >        for (Noop r : rs) r.assertInvoked();
1310      }}
1311  
1312      /**
# Line 1078 | Line 1315 | public class CompletableFutureTest exten
1315       */
1316      public void testThenRun_exceptionalCompletion() {
1317          for (ExecutionMode m : ExecutionMode.values())
1081        for (boolean createIncomplete : new boolean[] { true, false })
1318      {
1319          final CFException ex = new CFException();
1320          final CompletableFuture<Integer> f = new CompletableFuture<>();
1321 <        final Noop r = new Noop(m);
1322 <        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 <        }
1321 >        final Noop[] rs = new Noop[6];
1322 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1323  
1324 <        checkCompletedWithWrappedCFException(g, ex);
1325 <        checkCompletedWithWrappedCFException(f, ex);
1326 <        assertEquals(0, r.invocationCount);
1324 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1325 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1326 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1327 >        checkIncomplete(h0);
1328 >        checkIncomplete(h1);
1329 >        checkIncomplete(h2);
1330 >        assertTrue(f.completeExceptionally(ex));
1331 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1332 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1333 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1334 >
1335 >        checkCompletedWithWrappedException(h0, ex);
1336 >        checkCompletedWithWrappedException(h1, ex);
1337 >        checkCompletedWithWrappedException(h2, ex);
1338 >        checkCompletedWithWrappedException(h3, ex);
1339 >        checkCompletedWithWrappedException(h4, ex);
1340 >        checkCompletedWithWrappedException(h5, ex);
1341 >        checkCompletedExceptionally(f, ex);
1342 >        for (Noop r : rs) r.assertNotInvoked();
1343      }}
1344  
1345      /**
# Line 1100 | Line 1347 | public class CompletableFutureTest exten
1347       */
1348      public void testThenRun_sourceCancelled() {
1349          for (ExecutionMode m : ExecutionMode.values())
1103        for (boolean createIncomplete : new boolean[] { true, false })
1350          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1351      {
1352          final CompletableFuture<Integer> f = new CompletableFuture<>();
1353 <        final Noop r = new Noop(m);
1354 <        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 <        }
1353 >        final Noop[] rs = new Noop[6];
1354 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1355  
1356 <        checkCompletedWithWrappedCancellationException(g);
1356 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1357 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1358 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1359 >        checkIncomplete(h0);
1360 >        checkIncomplete(h1);
1361 >        checkIncomplete(h2);
1362 >        assertTrue(f.cancel(mayInterruptIfRunning));
1363 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1364 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1365 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1366 >
1367 >        checkCompletedWithWrappedCancellationException(h0);
1368 >        checkCompletedWithWrappedCancellationException(h1);
1369 >        checkCompletedWithWrappedCancellationException(h2);
1370 >        checkCompletedWithWrappedCancellationException(h3);
1371 >        checkCompletedWithWrappedCancellationException(h4);
1372 >        checkCompletedWithWrappedCancellationException(h5);
1373          checkCancelled(f);
1374 <        assertEquals(0, r.invocationCount);
1374 >        for (Noop r : rs) r.assertNotInvoked();
1375      }}
1376  
1377      /**
# Line 1122 | Line 1379 | public class CompletableFutureTest exten
1379       */
1380      public void testThenRun_actionFailed() {
1381          for (ExecutionMode m : ExecutionMode.values())
1125        for (boolean createIncomplete : new boolean[] { true, false })
1382          for (Integer v1 : new Integer[] { 1, null })
1383      {
1384          final CompletableFuture<Integer> f = new CompletableFuture<>();
1385 <        final FailingRunnable r = new FailingRunnable(m);
1386 <        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 <        }
1385 >        final FailingRunnable[] rs = new FailingRunnable[6];
1386 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1387  
1388 <        checkCompletedWithWrappedCFException(g);
1388 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1389 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1390 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1391 >        assertTrue(f.complete(v1));
1392 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1393 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1394 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1395 >
1396 >        checkCompletedWithWrappedCFException(h0);
1397 >        checkCompletedWithWrappedCFException(h1);
1398 >        checkCompletedWithWrappedCFException(h2);
1399 >        checkCompletedWithWrappedCFException(h3);
1400 >        checkCompletedWithWrappedCFException(h4);
1401 >        checkCompletedWithWrappedCFException(h5);
1402          checkCompletedNormally(f, v1);
1403      }}
1404  
# Line 1143 | Line 1407 | public class CompletableFutureTest exten
1407       */
1408      public void testThenApply_normalCompletion() {
1409          for (ExecutionMode m : ExecutionMode.values())
1146        for (boolean createIncomplete : new boolean[] { true, false })
1410          for (Integer v1 : new Integer[] { 1, null })
1411      {
1412          final CompletableFuture<Integer> f = new CompletableFuture<>();
1413 <        final IncFunction r = new IncFunction(m);
1414 <        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 <        }
1413 >        final IncFunction[] rs = new IncFunction[4];
1414 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1415  
1416 <        checkCompletedNormally(g, inc(v1));
1416 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1417 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1418 >        checkIncomplete(h0);
1419 >        checkIncomplete(h1);
1420 >        assertTrue(f.complete(v1));
1421 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1422 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1423 >
1424 >        checkCompletedNormally(h0, inc(v1));
1425 >        checkCompletedNormally(h1, inc(v1));
1426 >        checkCompletedNormally(h2, inc(v1));
1427 >        checkCompletedNormally(h3, inc(v1));
1428          checkCompletedNormally(f, v1);
1429 <        assertEquals(1, r.invocationCount);
1429 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1430      }}
1431  
1432      /**
# Line 1166 | Line 1435 | public class CompletableFutureTest exten
1435       */
1436      public void testThenApply_exceptionalCompletion() {
1437          for (ExecutionMode m : ExecutionMode.values())
1169        for (boolean createIncomplete : new boolean[] { true, false })
1438      {
1439          final CFException ex = new CFException();
1440          final CompletableFuture<Integer> f = new CompletableFuture<>();
1441 <        final IncFunction r = new IncFunction(m);
1442 <        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 <        }
1441 >        final IncFunction[] rs = new IncFunction[4];
1442 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1443  
1444 <        checkCompletedWithWrappedCFException(g, ex);
1445 <        checkCompletedWithWrappedCFException(f, ex);
1446 <        assertEquals(0, r.invocationCount);
1444 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1445 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1446 >        assertTrue(f.completeExceptionally(ex));
1447 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1448 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1449 >
1450 >        checkCompletedWithWrappedException(h0, ex);
1451 >        checkCompletedWithWrappedException(h1, ex);
1452 >        checkCompletedWithWrappedException(h2, ex);
1453 >        checkCompletedWithWrappedException(h3, ex);
1454 >        checkCompletedExceptionally(f, ex);
1455 >        for (IncFunction r : rs) r.assertNotInvoked();
1456      }}
1457  
1458      /**
# Line 1188 | Line 1460 | public class CompletableFutureTest exten
1460       */
1461      public void testThenApply_sourceCancelled() {
1462          for (ExecutionMode m : ExecutionMode.values())
1191        for (boolean createIncomplete : new boolean[] { true, false })
1463          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1464      {
1465          final CompletableFuture<Integer> f = new CompletableFuture<>();
1466 <        final IncFunction r = new IncFunction(m);
1467 <        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 <        }
1466 >        final IncFunction[] rs = new IncFunction[4];
1467 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1468  
1469 <        checkCompletedWithWrappedCancellationException(g);
1469 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1470 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1471 >        assertTrue(f.cancel(mayInterruptIfRunning));
1472 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1473 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1474 >
1475 >        checkCompletedWithWrappedCancellationException(h0);
1476 >        checkCompletedWithWrappedCancellationException(h1);
1477 >        checkCompletedWithWrappedCancellationException(h2);
1478 >        checkCompletedWithWrappedCancellationException(h3);
1479          checkCancelled(f);
1480 <        assertEquals(0, r.invocationCount);
1480 >        for (IncFunction r : rs) r.assertNotInvoked();
1481      }}
1482  
1483      /**
# Line 1210 | Line 1485 | public class CompletableFutureTest exten
1485       */
1486      public void testThenApply_actionFailed() {
1487          for (ExecutionMode m : ExecutionMode.values())
1213        for (boolean createIncomplete : new boolean[] { true, false })
1488          for (Integer v1 : new Integer[] { 1, null })
1489      {
1490          final CompletableFuture<Integer> f = new CompletableFuture<>();
1491 <        final FailingFunction r = new FailingFunction(m);
1492 <        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 <        }
1491 >        final FailingFunction[] rs = new FailingFunction[4];
1492 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1493  
1494 <        checkCompletedWithWrappedCFException(g);
1494 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1495 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1496 >        assertTrue(f.complete(v1));
1497 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1498 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1499 >
1500 >        checkCompletedWithWrappedCFException(h0);
1501 >        checkCompletedWithWrappedCFException(h1);
1502 >        checkCompletedWithWrappedCFException(h2);
1503 >        checkCompletedWithWrappedCFException(h3);
1504          checkCompletedNormally(f, v1);
1505      }}
1506  
# Line 1231 | Line 1509 | public class CompletableFutureTest exten
1509       */
1510      public void testThenAccept_normalCompletion() {
1511          for (ExecutionMode m : ExecutionMode.values())
1234        for (boolean createIncomplete : new boolean[] { true, false })
1512          for (Integer v1 : new Integer[] { 1, null })
1513      {
1514          final CompletableFuture<Integer> f = new CompletableFuture<>();
1515 <        final IncAction r = new IncAction();
1516 <        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 <        }
1515 >        final NoopConsumer[] rs = new NoopConsumer[4];
1516 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1517  
1518 <        checkCompletedNormally(g, null);
1518 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1519 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1520 >        checkIncomplete(h0);
1521 >        checkIncomplete(h1);
1522 >        assertTrue(f.complete(v1));
1523 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1524 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1525 >
1526 >        checkCompletedNormally(h0, null);
1527 >        checkCompletedNormally(h1, null);
1528 >        checkCompletedNormally(h2, null);
1529 >        checkCompletedNormally(h3, null);
1530          checkCompletedNormally(f, v1);
1531 <        assertEquals(1, r.invocationCount);
1249 <        assertEquals(inc(v1), r.value);
1531 >        for (NoopConsumer r : rs) r.assertValue(v1);
1532      }}
1533  
1534      /**
# Line 1255 | Line 1537 | public class CompletableFutureTest exten
1537       */
1538      public void testThenAccept_exceptionalCompletion() {
1539          for (ExecutionMode m : ExecutionMode.values())
1258        for (boolean createIncomplete : new boolean[] { true, false })
1540      {
1541          final CFException ex = new CFException();
1542          final CompletableFuture<Integer> f = new CompletableFuture<>();
1543 <        final IncAction r = new IncAction();
1544 <        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 <        }
1543 >        final NoopConsumer[] rs = new NoopConsumer[4];
1544 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1545  
1546 <        checkCompletedWithWrappedCFException(g, ex);
1547 <        checkCompletedWithWrappedCFException(f, ex);
1548 <        assertEquals(0, r.invocationCount);
1546 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1547 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1548 >        assertTrue(f.completeExceptionally(ex));
1549 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1550 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1551 >
1552 >        checkCompletedWithWrappedException(h0, ex);
1553 >        checkCompletedWithWrappedException(h1, ex);
1554 >        checkCompletedWithWrappedException(h2, ex);
1555 >        checkCompletedWithWrappedException(h3, ex);
1556 >        checkCompletedExceptionally(f, ex);
1557 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1558      }}
1559  
1560      /**
1561 <     * thenAccept result completes exceptionally if action does
1561 >     * thenAccept result completes exceptionally if source cancelled
1562       */
1563 <    public void testThenAccept_actionFailed() {
1563 >    public void testThenAccept_sourceCancelled() {
1564          for (ExecutionMode m : ExecutionMode.values())
1565 <        for (boolean createIncomplete : new boolean[] { true, false })
1281 <        for (Integer v1 : new Integer[] { 1, null })
1565 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1566      {
1567          final CompletableFuture<Integer> f = new CompletableFuture<>();
1568 <        final FailingConsumer r = new FailingConsumer(m);
1569 <        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 <        }
1568 >        final NoopConsumer[] rs = new NoopConsumer[4];
1569 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1570  
1571 <        checkCompletedWithWrappedCFException(g);
1572 <        checkCompletedNormally(f, v1);
1571 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1572 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1573 >        assertTrue(f.cancel(mayInterruptIfRunning));
1574 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1575 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1576 >
1577 >        checkCompletedWithWrappedCancellationException(h0);
1578 >        checkCompletedWithWrappedCancellationException(h1);
1579 >        checkCompletedWithWrappedCancellationException(h2);
1580 >        checkCompletedWithWrappedCancellationException(h3);
1581 >        checkCancelled(f);
1582 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1583      }}
1584  
1585      /**
1586 <     * thenAccept result completes exceptionally if source cancelled
1586 >     * thenAccept result completes exceptionally if action does
1587       */
1588 <    public void testThenAccept_sourceCancelled() {
1588 >    public void testThenAccept_actionFailed() {
1589          for (ExecutionMode m : ExecutionMode.values())
1590 <        for (boolean createIncomplete : new boolean[] { true, false })
1302 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1590 >        for (Integer v1 : new Integer[] { 1, null })
1591      {
1592          final CompletableFuture<Integer> f = new CompletableFuture<>();
1593 <        final IncAction r = new IncAction();
1594 <        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 <        }
1593 >        final FailingConsumer[] rs = new FailingConsumer[4];
1594 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1595  
1596 <        checkCompletedWithWrappedCancellationException(g);
1597 <        checkCancelled(f);
1598 <        assertEquals(0, r.invocationCount);
1596 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1597 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1598 >        assertTrue(f.complete(v1));
1599 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1600 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1601 >
1602 >        checkCompletedWithWrappedCFException(h0);
1603 >        checkCompletedWithWrappedCFException(h1);
1604 >        checkCompletedWithWrappedCFException(h2);
1605 >        checkCompletedWithWrappedCFException(h3);
1606 >        checkCompletedNormally(f, v1);
1607      }}
1608  
1609      /**
# Line 1321 | Line 1612 | public class CompletableFutureTest exten
1612       */
1613      public void testThenCombine_normalCompletion() {
1614          for (ExecutionMode m : ExecutionMode.values())
1324        for (boolean createIncomplete : new boolean[] { true, false })
1615          for (boolean fFirst : new boolean[] { true, false })
1616          for (Integer v1 : new Integer[] { 1, null })
1617          for (Integer v2 : new Integer[] { 2, null })
1618      {
1619          final CompletableFuture<Integer> f = new CompletableFuture<>();
1620          final CompletableFuture<Integer> g = new CompletableFuture<>();
1621 <        final SubtractFunction r = new SubtractFunction(m);
1621 >        final SubtractFunction[] rs = new SubtractFunction[6];
1622 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1623  
1624 <        if (fFirst) f.complete(v1); else g.complete(v2);
1625 <        if (!createIncomplete)
1626 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1627 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1628 <        if (createIncomplete) {
1629 <            checkIncomplete(h);
1630 <            assertEquals(0, r.invocationCount);
1631 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1632 <        }
1624 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1625 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1626 >        final Integer w1 =  fFirst ? v1 : v2;
1627 >        final Integer w2 = !fFirst ? v1 : v2;
1628 >
1629 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1630 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1631 >        assertTrue(fst.complete(w1));
1632 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1633 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1634 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1635 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1636 >        checkCompletedNormally(h1, subtract(w1, w1));
1637 >        checkCompletedNormally(h3, subtract(w1, w1));
1638 >        rs[1].assertValue(subtract(w1, w1));
1639 >        rs[3].assertValue(subtract(w1, w1));
1640 >        assertTrue(snd.complete(w2));
1641 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1642 >
1643 >        checkCompletedNormally(h0, subtract(v1, v2));
1644 >        checkCompletedNormally(h2, subtract(v1, v2));
1645 >        checkCompletedNormally(h4, subtract(v1, v2));
1646 >        rs[0].assertValue(subtract(v1, v2));
1647 >        rs[2].assertValue(subtract(v1, v2));
1648 >        rs[4].assertValue(subtract(v1, v2));
1649  
1343        checkCompletedNormally(h, subtract(v1, v2));
1650          checkCompletedNormally(f, v1);
1651          checkCompletedNormally(g, v2);
1346        assertEquals(1, r.invocationCount);
1652      }}
1653  
1654      /**
1655       * thenCombine result completes exceptionally after exceptional
1656       * completion of either source
1657       */
1658 <    public void testThenCombine_exceptionalCompletion() {
1658 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1659          for (ExecutionMode m : ExecutionMode.values())
1355        for (boolean createIncomplete : new boolean[] { true, false })
1660          for (boolean fFirst : new boolean[] { true, false })
1661 +        for (boolean failFirst : new boolean[] { true, false })
1662          for (Integer v1 : new Integer[] { 1, null })
1663      {
1664          final CompletableFuture<Integer> f = new CompletableFuture<>();
1665          final CompletableFuture<Integer> g = new CompletableFuture<>();
1666          final CFException ex = new CFException();
1667 <        final SubtractFunction r = new SubtractFunction(m);
1668 <
1669 <        (fFirst ? f : g).complete(v1);
1670 <        if (!createIncomplete)
1671 <            (!fFirst ? f : g).completeExceptionally(ex);
1672 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1673 <        if (createIncomplete) {
1674 <            checkIncomplete(h);
1675 <            (!fFirst ? f : g).completeExceptionally(ex);
1676 <        }
1677 <
1678 <        checkCompletedWithWrappedCFException(h, ex);
1679 <        assertEquals(0, r.invocationCount);
1680 <        checkCompletedNormally(fFirst ? f : g, v1);
1681 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1667 >        final SubtractFunction r1 = new SubtractFunction(m);
1668 >        final SubtractFunction r2 = new SubtractFunction(m);
1669 >        final SubtractFunction r3 = new SubtractFunction(m);
1670 >
1671 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1672 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1673 >        final Callable<Boolean> complete1 = failFirst ?
1674 >            () -> fst.completeExceptionally(ex) :
1675 >            () -> fst.complete(v1);
1676 >        final Callable<Boolean> complete2 = failFirst ?
1677 >            () -> snd.complete(v1) :
1678 >            () -> snd.completeExceptionally(ex);
1679 >
1680 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1681 >        assertTrue(complete1.call());
1682 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1683 >        checkIncomplete(h1);
1684 >        checkIncomplete(h2);
1685 >        assertTrue(complete2.call());
1686 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1687 >
1688 >        checkCompletedWithWrappedException(h1, ex);
1689 >        checkCompletedWithWrappedException(h2, ex);
1690 >        checkCompletedWithWrappedException(h3, ex);
1691 >        r1.assertNotInvoked();
1692 >        r2.assertNotInvoked();
1693 >        r3.assertNotInvoked();
1694 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1695 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1696      }}
1697  
1698      /**
1699 <     * thenCombine result completes exceptionally if action does
1699 >     * thenCombine result completes exceptionally if either source cancelled
1700       */
1701 <    public void testThenCombine_actionFailed() {
1701 >    public void testThenCombine_sourceCancelled() throws Throwable {
1702          for (ExecutionMode m : ExecutionMode.values())
1703 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1704          for (boolean fFirst : new boolean[] { true, false })
1705 +        for (boolean failFirst : new boolean[] { true, false })
1706          for (Integer v1 : new Integer[] { 1, null })
1386        for (Integer v2 : new Integer[] { 2, null })
1707      {
1708          final CompletableFuture<Integer> f = new CompletableFuture<>();
1709          final CompletableFuture<Integer> g = new CompletableFuture<>();
1710 <        final FailingBiFunction r = new FailingBiFunction(m);
1711 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1712 <
1713 <        if (fFirst) {
1714 <            f.complete(v1);
1715 <            g.complete(v2);
1716 <        } else {
1717 <            g.complete(v2);
1718 <            f.complete(v1);
1719 <        }
1720 <
1721 <        checkCompletedWithWrappedCFException(h);
1722 <        checkCompletedNormally(f, v1);
1723 <        checkCompletedNormally(g, v2);
1710 >        final SubtractFunction r1 = new SubtractFunction(m);
1711 >        final SubtractFunction r2 = new SubtractFunction(m);
1712 >        final SubtractFunction r3 = new SubtractFunction(m);
1713 >
1714 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1715 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1716 >        final Callable<Boolean> complete1 = failFirst ?
1717 >            () -> fst.cancel(mayInterruptIfRunning) :
1718 >            () -> fst.complete(v1);
1719 >        final Callable<Boolean> complete2 = failFirst ?
1720 >            () -> snd.complete(v1) :
1721 >            () -> snd.cancel(mayInterruptIfRunning);
1722 >
1723 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1724 >        assertTrue(complete1.call());
1725 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1726 >        checkIncomplete(h1);
1727 >        checkIncomplete(h2);
1728 >        assertTrue(complete2.call());
1729 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1730 >
1731 >        checkCompletedWithWrappedCancellationException(h1);
1732 >        checkCompletedWithWrappedCancellationException(h2);
1733 >        checkCompletedWithWrappedCancellationException(h3);
1734 >        r1.assertNotInvoked();
1735 >        r2.assertNotInvoked();
1736 >        r3.assertNotInvoked();
1737 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1738 >        checkCancelled(failFirst ? fst : snd);
1739      }}
1740  
1741      /**
1742 <     * thenCombine result completes exceptionally if either source cancelled
1742 >     * thenCombine result completes exceptionally if action does
1743       */
1744 <    public void testThenCombine_sourceCancelled() {
1744 >    public void testThenCombine_actionFailed() {
1745          for (ExecutionMode m : ExecutionMode.values())
1411        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1412        for (boolean createIncomplete : new boolean[] { true, false })
1746          for (boolean fFirst : new boolean[] { true, false })
1747          for (Integer v1 : new Integer[] { 1, null })
1748 +        for (Integer v2 : new Integer[] { 2, null })
1749      {
1750          final CompletableFuture<Integer> f = new CompletableFuture<>();
1751          final CompletableFuture<Integer> g = new CompletableFuture<>();
1752 <        final SubtractFunction r = new SubtractFunction(m);
1752 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1753 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1754 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1755 >
1756 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1757 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1758 >        final Integer w1 =  fFirst ? v1 : v2;
1759 >        final Integer w2 = !fFirst ? v1 : v2;
1760 >
1761 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1762 >        assertTrue(fst.complete(w1));
1763 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1764 >        assertTrue(snd.complete(w2));
1765 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1766  
1767 <        (fFirst ? f : g).complete(v1);
1768 <        if (!createIncomplete)
1769 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1770 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1771 <        if (createIncomplete) {
1772 <            checkIncomplete(h);
1773 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1774 <        }
1428 <
1429 <        checkCompletedWithWrappedCancellationException(h);
1430 <        checkCancelled(!fFirst ? f : g);
1431 <        assertEquals(0, r.invocationCount);
1432 <        checkCompletedNormally(fFirst ? f : g, v1);
1767 >        checkCompletedWithWrappedCFException(h1);
1768 >        checkCompletedWithWrappedCFException(h2);
1769 >        checkCompletedWithWrappedCFException(h3);
1770 >        r1.assertInvoked();
1771 >        r2.assertInvoked();
1772 >        r3.assertInvoked();
1773 >        checkCompletedNormally(f, v1);
1774 >        checkCompletedNormally(g, v2);
1775      }}
1776  
1777      /**
# Line 1438 | Line 1780 | public class CompletableFutureTest exten
1780       */
1781      public void testThenAcceptBoth_normalCompletion() {
1782          for (ExecutionMode m : ExecutionMode.values())
1441        for (boolean createIncomplete : new boolean[] { true, false })
1783          for (boolean fFirst : new boolean[] { true, false })
1784          for (Integer v1 : new Integer[] { 1, null })
1785          for (Integer v2 : new Integer[] { 2, null })
1786      {
1787          final CompletableFuture<Integer> f = new CompletableFuture<>();
1788          final CompletableFuture<Integer> g = new CompletableFuture<>();
1789 <        final SubtractAction r = new SubtractAction(m);
1790 <
1791 <        if (fFirst) f.complete(v1); else g.complete(v2);
1792 <        if (!createIncomplete)
1793 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1794 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1795 <        if (createIncomplete) {
1796 <            checkIncomplete(h);
1797 <            assertEquals(0, r.invocationCount);
1798 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1799 <        }
1800 <
1801 <        checkCompletedNormally(h, null);
1802 <        assertEquals(subtract(v1, v2), r.value);
1789 >        final SubtractAction r1 = new SubtractAction(m);
1790 >        final SubtractAction r2 = new SubtractAction(m);
1791 >        final SubtractAction r3 = new SubtractAction(m);
1792 >
1793 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1794 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1795 >        final Integer w1 =  fFirst ? v1 : v2;
1796 >        final Integer w2 = !fFirst ? v1 : v2;
1797 >
1798 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1799 >        assertTrue(fst.complete(w1));
1800 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1801 >        checkIncomplete(h1);
1802 >        checkIncomplete(h2);
1803 >        r1.assertNotInvoked();
1804 >        r2.assertNotInvoked();
1805 >        assertTrue(snd.complete(w2));
1806 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1807 >
1808 >        checkCompletedNormally(h1, null);
1809 >        checkCompletedNormally(h2, null);
1810 >        checkCompletedNormally(h3, null);
1811 >        r1.assertValue(subtract(v1, v2));
1812 >        r2.assertValue(subtract(v1, v2));
1813 >        r3.assertValue(subtract(v1, v2));
1814          checkCompletedNormally(f, v1);
1815          checkCompletedNormally(g, v2);
1816      }}
# Line 1467 | Line 1819 | public class CompletableFutureTest exten
1819       * thenAcceptBoth result completes exceptionally after exceptional
1820       * completion of either source
1821       */
1822 <    public void testThenAcceptBoth_exceptionalCompletion() {
1822 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1823          for (ExecutionMode m : ExecutionMode.values())
1472        for (boolean createIncomplete : new boolean[] { true, false })
1824          for (boolean fFirst : new boolean[] { true, false })
1825 +        for (boolean failFirst : new boolean[] { true, false })
1826          for (Integer v1 : new Integer[] { 1, null })
1827      {
1828          final CompletableFuture<Integer> f = new CompletableFuture<>();
1829          final CompletableFuture<Integer> g = new CompletableFuture<>();
1830          final CFException ex = new CFException();
1831 <        final SubtractAction r = new SubtractAction(m);
1832 <
1833 <        (fFirst ? f : g).complete(v1);
1834 <        if (!createIncomplete)
1835 <            (!fFirst ? f : g).completeExceptionally(ex);
1836 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1837 <        if (createIncomplete) {
1838 <            checkIncomplete(h);
1839 <            (!fFirst ? f : g).completeExceptionally(ex);
1840 <        }
1841 <
1842 <        checkCompletedWithWrappedCFException(h, ex);
1843 <        assertEquals(0, r.invocationCount);
1844 <        checkCompletedNormally(fFirst ? f : g, v1);
1845 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1831 >        final SubtractAction r1 = new SubtractAction(m);
1832 >        final SubtractAction r2 = new SubtractAction(m);
1833 >        final SubtractAction r3 = new SubtractAction(m);
1834 >
1835 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1836 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1837 >        final Callable<Boolean> complete1 = failFirst ?
1838 >            () -> fst.completeExceptionally(ex) :
1839 >            () -> fst.complete(v1);
1840 >        final Callable<Boolean> complete2 = failFirst ?
1841 >            () -> snd.complete(v1) :
1842 >            () -> snd.completeExceptionally(ex);
1843 >
1844 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1845 >        assertTrue(complete1.call());
1846 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1847 >        checkIncomplete(h1);
1848 >        checkIncomplete(h2);
1849 >        assertTrue(complete2.call());
1850 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1851 >
1852 >        checkCompletedWithWrappedException(h1, ex);
1853 >        checkCompletedWithWrappedException(h2, ex);
1854 >        checkCompletedWithWrappedException(h3, ex);
1855 >        r1.assertNotInvoked();
1856 >        r2.assertNotInvoked();
1857 >        r3.assertNotInvoked();
1858 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1859 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1860      }}
1861  
1862      /**
1863 <     * thenAcceptBoth result completes exceptionally if action does
1863 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1864       */
1865 <    public void testThenAcceptBoth_actionFailed() {
1865 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1866          for (ExecutionMode m : ExecutionMode.values())
1867 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1868          for (boolean fFirst : new boolean[] { true, false })
1869 +        for (boolean failFirst : new boolean[] { true, false })
1870          for (Integer v1 : new Integer[] { 1, null })
1503        for (Integer v2 : new Integer[] { 2, null })
1871      {
1872          final CompletableFuture<Integer> f = new CompletableFuture<>();
1873          final CompletableFuture<Integer> g = new CompletableFuture<>();
1874 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1875 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1876 <
1877 <        if (fFirst) {
1878 <            f.complete(v1);
1879 <            g.complete(v2);
1880 <        } else {
1881 <            g.complete(v2);
1882 <            f.complete(v1);
1883 <        }
1884 <
1885 <        checkCompletedWithWrappedCFException(h);
1886 <        checkCompletedNormally(f, v1);
1887 <        checkCompletedNormally(g, v2);
1874 >        final SubtractAction r1 = new SubtractAction(m);
1875 >        final SubtractAction r2 = new SubtractAction(m);
1876 >        final SubtractAction r3 = new SubtractAction(m);
1877 >
1878 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1879 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1880 >        final Callable<Boolean> complete1 = failFirst ?
1881 >            () -> fst.cancel(mayInterruptIfRunning) :
1882 >            () -> fst.complete(v1);
1883 >        final Callable<Boolean> complete2 = failFirst ?
1884 >            () -> snd.complete(v1) :
1885 >            () -> snd.cancel(mayInterruptIfRunning);
1886 >
1887 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1888 >        assertTrue(complete1.call());
1889 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1890 >        checkIncomplete(h1);
1891 >        checkIncomplete(h2);
1892 >        assertTrue(complete2.call());
1893 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1894 >
1895 >        checkCompletedWithWrappedCancellationException(h1);
1896 >        checkCompletedWithWrappedCancellationException(h2);
1897 >        checkCompletedWithWrappedCancellationException(h3);
1898 >        r1.assertNotInvoked();
1899 >        r2.assertNotInvoked();
1900 >        r3.assertNotInvoked();
1901 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1902 >        checkCancelled(failFirst ? fst : snd);
1903      }}
1904  
1905      /**
1906 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1906 >     * thenAcceptBoth result completes exceptionally if action does
1907       */
1908 <    public void testThenAcceptBoth_sourceCancelled() {
1908 >    public void testThenAcceptBoth_actionFailed() {
1909          for (ExecutionMode m : ExecutionMode.values())
1528        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1529        for (boolean createIncomplete : new boolean[] { true, false })
1910          for (boolean fFirst : new boolean[] { true, false })
1911          for (Integer v1 : new Integer[] { 1, null })
1912 +        for (Integer v2 : new Integer[] { 2, null })
1913      {
1914          final CompletableFuture<Integer> f = new CompletableFuture<>();
1915          final CompletableFuture<Integer> g = new CompletableFuture<>();
1916 <        final SubtractAction r = new SubtractAction(m);
1916 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1917 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1918 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1919 >
1920 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1921 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1922 >        final Integer w1 =  fFirst ? v1 : v2;
1923 >        final Integer w2 = !fFirst ? v1 : v2;
1924 >
1925 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1926 >        assertTrue(fst.complete(w1));
1927 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1928 >        assertTrue(snd.complete(w2));
1929 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1930  
1931 <        (fFirst ? f : g).complete(v1);
1932 <        if (!createIncomplete)
1933 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1934 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1935 <        if (createIncomplete) {
1936 <            checkIncomplete(h);
1937 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1938 <        }
1545 <
1546 <        checkCompletedWithWrappedCancellationException(h);
1547 <        checkCancelled(!fFirst ? f : g);
1548 <        assertEquals(0, r.invocationCount);
1549 <        checkCompletedNormally(fFirst ? f : g, v1);
1931 >        checkCompletedWithWrappedCFException(h1);
1932 >        checkCompletedWithWrappedCFException(h2);
1933 >        checkCompletedWithWrappedCFException(h3);
1934 >        r1.assertInvoked();
1935 >        r2.assertInvoked();
1936 >        r3.assertInvoked();
1937 >        checkCompletedNormally(f, v1);
1938 >        checkCompletedNormally(g, v2);
1939      }}
1940  
1941      /**
# Line 1555 | Line 1944 | public class CompletableFutureTest exten
1944       */
1945      public void testRunAfterBoth_normalCompletion() {
1946          for (ExecutionMode m : ExecutionMode.values())
1558        for (boolean createIncomplete : new boolean[] { true, false })
1947          for (boolean fFirst : new boolean[] { true, false })
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 Noop r = new Noop(m);
1954 <
1955 <        if (fFirst) f.complete(v1); else g.complete(v2);
1956 <        if (!createIncomplete)
1957 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1958 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1959 <        if (createIncomplete) {
1960 <            checkIncomplete(h);
1961 <            assertEquals(0, r.invocationCount);
1962 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1963 <        }
1964 <
1965 <        checkCompletedNormally(h, null);
1966 <        assertEquals(1, r.invocationCount);
1953 >        final Noop r1 = new Noop(m);
1954 >        final Noop r2 = new Noop(m);
1955 >        final Noop r3 = new Noop(m);
1956 >
1957 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1958 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1959 >        final Integer w1 =  fFirst ? v1 : v2;
1960 >        final Integer w2 = !fFirst ? v1 : v2;
1961 >
1962 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1963 >        assertTrue(fst.complete(w1));
1964 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1965 >        checkIncomplete(h1);
1966 >        checkIncomplete(h2);
1967 >        r1.assertNotInvoked();
1968 >        r2.assertNotInvoked();
1969 >        assertTrue(snd.complete(w2));
1970 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1971 >
1972 >        checkCompletedNormally(h1, null);
1973 >        checkCompletedNormally(h2, null);
1974 >        checkCompletedNormally(h3, null);
1975 >        r1.assertInvoked();
1976 >        r2.assertInvoked();
1977 >        r3.assertInvoked();
1978          checkCompletedNormally(f, v1);
1979          checkCompletedNormally(g, v2);
1980      }}
# Line 1584 | Line 1983 | public class CompletableFutureTest exten
1983       * runAfterBoth result completes exceptionally after exceptional
1984       * completion of either source
1985       */
1986 <    public void testRunAfterBoth_exceptionalCompletion() {
1986 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1987          for (ExecutionMode m : ExecutionMode.values())
1589        for (boolean createIncomplete : new boolean[] { true, false })
1988          for (boolean fFirst : new boolean[] { true, false })
1989 +        for (boolean failFirst : new boolean[] { true, false })
1990          for (Integer v1 : new Integer[] { 1, null })
1991      {
1992          final CompletableFuture<Integer> f = new CompletableFuture<>();
1993          final CompletableFuture<Integer> g = new CompletableFuture<>();
1994          final CFException ex = new CFException();
1995 <        final Noop r = new Noop(m);
1996 <
1997 <        (fFirst ? f : g).complete(v1);
1998 <        if (!createIncomplete)
1999 <            (!fFirst ? f : g).completeExceptionally(ex);
2000 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2001 <        if (createIncomplete) {
2002 <            checkIncomplete(h);
2003 <            (!fFirst ? f : g).completeExceptionally(ex);
2004 <        }
2005 <
2006 <        checkCompletedWithWrappedCFException(h, ex);
2007 <        assertEquals(0, r.invocationCount);
2008 <        checkCompletedNormally(fFirst ? f : g, v1);
2009 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
2010 <    }}
2011 <
2012 <    /**
2013 <     * runAfterBoth result completes exceptionally if action does
2014 <     */
2015 <    public void testRunAfterBoth_actionFailed() {
2016 <        for (ExecutionMode m : ExecutionMode.values())
2017 <        for (boolean fFirst : new boolean[] { true, false })
2018 <        for (Integer v1 : new Integer[] { 1, null })
2019 <        for (Integer v2 : new Integer[] { 2, null })
2020 <    {
2021 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2022 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2023 <        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);
1995 >        final Noop r1 = new Noop(m);
1996 >        final Noop r2 = new Noop(m);
1997 >        final Noop r3 = new Noop(m);
1998 >
1999 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2000 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2001 >        final Callable<Boolean> complete1 = failFirst ?
2002 >            () -> fst.completeExceptionally(ex) :
2003 >            () -> fst.complete(v1);
2004 >        final Callable<Boolean> complete2 = failFirst ?
2005 >            () -> snd.complete(v1) :
2006 >            () -> snd.completeExceptionally(ex);
2007 >
2008 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2009 >        assertTrue(complete1.call());
2010 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2011 >        checkIncomplete(h1);
2012 >        checkIncomplete(h2);
2013 >        assertTrue(complete2.call());
2014 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2015 >
2016 >        checkCompletedWithWrappedException(h1, ex);
2017 >        checkCompletedWithWrappedException(h2, ex);
2018 >        checkCompletedWithWrappedException(h3, ex);
2019 >        r1.assertNotInvoked();
2020 >        r2.assertNotInvoked();
2021 >        r3.assertNotInvoked();
2022 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2023 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2024      }}
2025  
2026      /**
2027       * runAfterBoth result completes exceptionally if either source cancelled
2028       */
2029 <    public void testRunAfterBoth_sourceCancelled() {
2029 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2030          for (ExecutionMode m : ExecutionMode.values())
2031          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1648        for (boolean createIncomplete : new boolean[] { true, false })
2032          for (boolean fFirst : new boolean[] { true, false })
2033 +        for (boolean failFirst : new boolean[] { true, false })
2034          for (Integer v1 : new Integer[] { 1, null })
2035      {
2036          final CompletableFuture<Integer> f = new CompletableFuture<>();
2037          final CompletableFuture<Integer> g = new CompletableFuture<>();
2038 <        final Noop r = new Noop(m);
2039 <
2040 <
2041 <        (fFirst ? f : g).complete(v1);
2042 <        if (!createIncomplete)
2043 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2044 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2045 <        if (createIncomplete) {
2046 <            checkIncomplete(h);
2047 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2048 <        }
2049 <
2050 <        checkCompletedWithWrappedCancellationException(h);
2051 <        checkCancelled(!fFirst ? f : g);
2052 <        assertEquals(0, r.invocationCount);
2053 <        checkCompletedNormally(fFirst ? f : g, v1);
2038 >        final Noop r1 = new Noop(m);
2039 >        final Noop r2 = new Noop(m);
2040 >        final Noop r3 = new Noop(m);
2041 >
2042 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2043 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2044 >        final Callable<Boolean> complete1 = failFirst ?
2045 >            () -> fst.cancel(mayInterruptIfRunning) :
2046 >            () -> fst.complete(v1);
2047 >        final Callable<Boolean> complete2 = failFirst ?
2048 >            () -> snd.complete(v1) :
2049 >            () -> snd.cancel(mayInterruptIfRunning);
2050 >
2051 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2052 >        assertTrue(complete1.call());
2053 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2054 >        checkIncomplete(h1);
2055 >        checkIncomplete(h2);
2056 >        assertTrue(complete2.call());
2057 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2058 >
2059 >        checkCompletedWithWrappedCancellationException(h1);
2060 >        checkCompletedWithWrappedCancellationException(h2);
2061 >        checkCompletedWithWrappedCancellationException(h3);
2062 >        r1.assertNotInvoked();
2063 >        r2.assertNotInvoked();
2064 >        r3.assertNotInvoked();
2065 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2066 >        checkCancelled(failFirst ? fst : snd);
2067      }}
2068  
2069      /**
2070 <     * applyToEither result completes normally after normal completion
1674 <     * of either source
2070 >     * runAfterBoth result completes exceptionally if action does
2071       */
2072 <    public void testApplyToEither_normalCompletion() {
2072 >    public void testRunAfterBoth_actionFailed() {
2073          for (ExecutionMode m : ExecutionMode.values())
1678        for (boolean createIncomplete : new boolean[] { true, false })
2074          for (boolean fFirst : new boolean[] { true, false })
2075          for (Integer v1 : new Integer[] { 1, null })
2076          for (Integer v2 : new Integer[] { 2, null })
2077      {
2078          final CompletableFuture<Integer> f = new CompletableFuture<>();
2079          final CompletableFuture<Integer> g = new CompletableFuture<>();
2080 <        final IncFunction r = new IncFunction(m);
2081 <
2082 <        if (!createIncomplete)
2083 <            if (fFirst) f.complete(v1); else g.complete(v2);
2084 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2085 <        if (createIncomplete) {
2086 <            checkIncomplete(h);
2087 <            assertEquals(0, r.invocationCount);
2088 <            if (fFirst) f.complete(v1); else g.complete(v2);
2089 <        }
2090 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
2091 <        if (!fFirst) f.complete(v1); else g.complete(v2);
2080 >        final FailingRunnable r1 = new FailingRunnable(m);
2081 >        final FailingRunnable r2 = new FailingRunnable(m);
2082 >        final FailingRunnable r3 = new FailingRunnable(m);
2083 >
2084 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2085 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2086 >        final Integer w1 =  fFirst ? v1 : v2;
2087 >        final Integer w2 = !fFirst ? v1 : v2;
2088 >
2089 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2090 >        assertTrue(fst.complete(w1));
2091 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2092 >        assertTrue(snd.complete(w2));
2093 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2094  
2095 +        checkCompletedWithWrappedCFException(h1);
2096 +        checkCompletedWithWrappedCFException(h2);
2097 +        checkCompletedWithWrappedCFException(h3);
2098 +        r1.assertInvoked();
2099 +        r2.assertInvoked();
2100 +        r3.assertInvoked();
2101          checkCompletedNormally(f, v1);
2102          checkCompletedNormally(g, v2);
1700        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
2103      }}
2104  
2105 <    public void testApplyToEither_normalCompletionBothAvailable() {
2105 >    /**
2106 >     * applyToEither result completes normally after normal completion
2107 >     * of either source
2108 >     */
2109 >    public void testApplyToEither_normalCompletion() {
2110          for (ExecutionMode m : ExecutionMode.values())
1705        for (boolean fFirst : new boolean[] { true, false })
2111          for (Integer v1 : new Integer[] { 1, null })
2112          for (Integer v2 : new Integer[] { 2, null })
2113      {
2114          final CompletableFuture<Integer> f = new CompletableFuture<>();
2115          final CompletableFuture<Integer> g = new CompletableFuture<>();
2116 <        final IncFunction r = new IncFunction(m);
2116 >        final IncFunction[] rs = new IncFunction[6];
2117 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2118  
2119 <        if (fFirst) {
2120 <            f.complete(v1);
2121 <            g.complete(v2);
2122 <        } else {
2123 <            g.complete(v2);
2124 <            f.complete(v1);
2125 <        }
2119 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2120 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2121 >        checkIncomplete(h0);
2122 >        checkIncomplete(h1);
2123 >        rs[0].assertNotInvoked();
2124 >        rs[1].assertNotInvoked();
2125 >        f.complete(v1);
2126 >        checkCompletedNormally(h0, inc(v1));
2127 >        checkCompletedNormally(h1, inc(v1));
2128 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2129 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2130 >        checkCompletedNormally(h2, inc(v1));
2131 >        checkCompletedNormally(h3, inc(v1));
2132 >        g.complete(v2);
2133  
2134 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2134 >        // unspecified behavior - both source completions available
2135 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2136 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2137 >        rs[4].assertValue(h4.join());
2138 >        rs[5].assertValue(h5.join());
2139 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2140 >                   Objects.equals(inc(v2), h4.join()));
2141 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2142 >                   Objects.equals(inc(v2), h5.join()));
2143  
2144          checkCompletedNormally(f, v1);
2145          checkCompletedNormally(g, v2);
2146 <
2147 <        // unspecified behavior
2148 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2149 <                   Objects.equals(h.join(), inc(v2)));
2150 <        assertEquals(1, r.invocationCount);
2146 >        checkCompletedNormally(h0, inc(v1));
2147 >        checkCompletedNormally(h1, inc(v1));
2148 >        checkCompletedNormally(h2, inc(v1));
2149 >        checkCompletedNormally(h3, inc(v1));
2150 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2151      }}
2152  
2153      /**
2154       * applyToEither result completes exceptionally after exceptional
2155       * completion of either source
2156       */
2157 <    public void testApplyToEither_exceptionalCompletion1() {
2157 >    public void testApplyToEither_exceptionalCompletion() {
2158          for (ExecutionMode m : ExecutionMode.values())
1738        for (boolean createIncomplete : new boolean[] { true, false })
1739        for (boolean fFirst : new boolean[] { true, false })
2159          for (Integer v1 : new Integer[] { 1, null })
2160      {
2161          final CompletableFuture<Integer> f = new CompletableFuture<>();
2162          final CompletableFuture<Integer> g = new CompletableFuture<>();
2163          final CFException ex = new CFException();
2164 <        final IncFunction r = new IncFunction(m);
2164 >        final IncFunction[] rs = new IncFunction[6];
2165 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2166  
2167 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
2168 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2169 <        if (createIncomplete) {
2170 <            checkIncomplete(h);
2171 <            assertEquals(0, r.invocationCount);
2172 <            (fFirst ? f : g).completeExceptionally(ex);
2167 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2168 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2169 >        checkIncomplete(h0);
2170 >        checkIncomplete(h1);
2171 >        rs[0].assertNotInvoked();
2172 >        rs[1].assertNotInvoked();
2173 >        f.completeExceptionally(ex);
2174 >        checkCompletedWithWrappedException(h0, ex);
2175 >        checkCompletedWithWrappedException(h1, ex);
2176 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2177 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2178 >        checkCompletedWithWrappedException(h2, ex);
2179 >        checkCompletedWithWrappedException(h3, ex);
2180 >        g.complete(v1);
2181 >
2182 >        // unspecified behavior - both source completions available
2183 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2184 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2185 >        try {
2186 >            assertEquals(inc(v1), h4.join());
2187 >            rs[4].assertValue(inc(v1));
2188 >        } catch (CompletionException ok) {
2189 >            checkCompletedWithWrappedException(h4, ex);
2190 >            rs[4].assertNotInvoked();
2191 >        }
2192 >        try {
2193 >            assertEquals(inc(v1), h5.join());
2194 >            rs[5].assertValue(inc(v1));
2195 >        } catch (CompletionException ok) {
2196 >            checkCompletedWithWrappedException(h5, ex);
2197 >            rs[5].assertNotInvoked();
2198          }
2199  
2200 <        checkCompletedWithWrappedCFException(h, ex);
2201 <        (!fFirst ? f : g).complete(v1);
2202 <
2203 <        assertEquals(0, r.invocationCount);
2204 <        checkCompletedNormally(!fFirst ? f : g, v1);
2205 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
2206 <        checkCompletedWithWrappedCFException(h, ex);
2200 >        checkCompletedExceptionally(f, ex);
2201 >        checkCompletedNormally(g, v1);
2202 >        checkCompletedWithWrappedException(h0, ex);
2203 >        checkCompletedWithWrappedException(h1, ex);
2204 >        checkCompletedWithWrappedException(h2, ex);
2205 >        checkCompletedWithWrappedException(h3, ex);
2206 >        checkCompletedWithWrappedException(h4, ex);
2207 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2208      }}
2209  
2210      public void testApplyToEither_exceptionalCompletion2() {
2211          for (ExecutionMode m : ExecutionMode.values())
1766        for (boolean reverseArgs : new boolean[] { true, false })
2212          for (boolean fFirst : new boolean[] { true, false })
2213          for (Integer v1 : new Integer[] { 1, null })
2214      {
2215          final CompletableFuture<Integer> f = new CompletableFuture<>();
2216          final CompletableFuture<Integer> g = new CompletableFuture<>();
1772        final IncFunction r1 = new IncFunction(m);
1773        final IncFunction r2 = new IncFunction(m);
2217          final CFException ex = new CFException();
2218 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
2219 <        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);
2218 >        final IncFunction[] rs = new IncFunction[6];
2219 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2220  
2221 <        // unspecified behavior
2221 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2222 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2223 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2224 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2225 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2226 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2227 >
2228 >        // unspecified behavior - both source completions available
2229 >        try {
2230 >            assertEquals(inc(v1), h0.join());
2231 >            rs[0].assertValue(inc(v1));
2232 >        } catch (CompletionException ok) {
2233 >            checkCompletedWithWrappedException(h0, ex);
2234 >            rs[0].assertNotInvoked();
2235 >        }
2236          try {
2237              assertEquals(inc(v1), h1.join());
2238 <            assertEquals(1, r1.invocationCount);
2238 >            rs[1].assertValue(inc(v1));
2239          } catch (CompletionException ok) {
2240 <            checkCompletedWithWrappedCFException(h1, ex);
2241 <            assertEquals(0, r1.invocationCount);
2240 >            checkCompletedWithWrappedException(h1, ex);
2241 >            rs[1].assertNotInvoked();
2242          }
1795
2243          try {
2244              assertEquals(inc(v1), h2.join());
2245 <            assertEquals(1, r2.invocationCount);
2245 >            rs[2].assertValue(inc(v1));
2246          } catch (CompletionException ok) {
2247 <            checkCompletedWithWrappedCFException(h2, ex);
2248 <            assertEquals(0, r2.invocationCount);
2247 >            checkCompletedWithWrappedException(h2, ex);
2248 >            rs[2].assertNotInvoked();
2249 >        }
2250 >        try {
2251 >            assertEquals(inc(v1), h3.join());
2252 >            rs[3].assertValue(inc(v1));
2253 >        } catch (CompletionException ok) {
2254 >            checkCompletedWithWrappedException(h3, ex);
2255 >            rs[3].assertNotInvoked();
2256          }
2257  
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);
2258          checkCompletedNormally(f, v1);
2259 <        checkCompletedNormally(g, v2);
2259 >        checkCompletedExceptionally(g, ex);
2260      }}
2261  
2262      /**
2263       * applyToEither result completes exceptionally if either source cancelled
2264       */
2265 <    public void testApplyToEither_sourceCancelled1() {
2265 >    public void testApplyToEither_sourceCancelled() {
2266          for (ExecutionMode m : ExecutionMode.values())
2267          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1851        for (boolean createIncomplete : new boolean[] { true, false })
1852        for (boolean fFirst : new boolean[] { true, false })
2268          for (Integer v1 : new Integer[] { 1, null })
2269      {
2270          final CompletableFuture<Integer> f = new CompletableFuture<>();
2271          final CompletableFuture<Integer> g = new CompletableFuture<>();
2272 <        final IncFunction r = new IncFunction(m);
2272 >        final IncFunction[] rs = new IncFunction[6];
2273 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2274  
2275 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2276 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2277 <        if (createIncomplete) {
2278 <            checkIncomplete(h);
2279 <            assertEquals(0, r.invocationCount);
2280 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2275 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2276 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2277 >        checkIncomplete(h0);
2278 >        checkIncomplete(h1);
2279 >        rs[0].assertNotInvoked();
2280 >        rs[1].assertNotInvoked();
2281 >        f.cancel(mayInterruptIfRunning);
2282 >        checkCompletedWithWrappedCancellationException(h0);
2283 >        checkCompletedWithWrappedCancellationException(h1);
2284 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2285 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2286 >        checkCompletedWithWrappedCancellationException(h2);
2287 >        checkCompletedWithWrappedCancellationException(h3);
2288 >        g.complete(v1);
2289 >
2290 >        // unspecified behavior - both source completions available
2291 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2292 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2293 >        try {
2294 >            assertEquals(inc(v1), h4.join());
2295 >            rs[4].assertValue(inc(v1));
2296 >        } catch (CompletionException ok) {
2297 >            checkCompletedWithWrappedCancellationException(h4);
2298 >            rs[4].assertNotInvoked();
2299 >        }
2300 >        try {
2301 >            assertEquals(inc(v1), h5.join());
2302 >            rs[5].assertValue(inc(v1));
2303 >        } catch (CompletionException ok) {
2304 >            checkCompletedWithWrappedCancellationException(h5);
2305 >            rs[5].assertNotInvoked();
2306          }
2307  
2308 <        checkCompletedWithWrappedCancellationException(h);
2309 <        (!fFirst ? f : g).complete(v1);
2310 <
2311 <        assertEquals(0, r.invocationCount);
2312 <        checkCompletedNormally(!fFirst ? f : g, v1);
2313 <        checkCancelled(fFirst ? f : g);
2314 <        checkCompletedWithWrappedCancellationException(h);
2308 >        checkCancelled(f);
2309 >        checkCompletedNormally(g, v1);
2310 >        checkCompletedWithWrappedCancellationException(h0);
2311 >        checkCompletedWithWrappedCancellationException(h1);
2312 >        checkCompletedWithWrappedCancellationException(h2);
2313 >        checkCompletedWithWrappedCancellationException(h3);
2314 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2315      }}
2316  
2317      public void testApplyToEither_sourceCancelled2() {
2318          for (ExecutionMode m : ExecutionMode.values())
2319          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1879        for (boolean reverseArgs : new boolean[] { true, false })
2320          for (boolean fFirst : new boolean[] { true, false })
2321          for (Integer v1 : new Integer[] { 1, null })
2322      {
2323          final CompletableFuture<Integer> f = new CompletableFuture<>();
2324          final CompletableFuture<Integer> g = new CompletableFuture<>();
2325 <        final IncFunction r1 = new IncFunction(m);
2326 <        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);
2325 >        final IncFunction[] rs = new IncFunction[6];
2326 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2327  
2328 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2329 <        if (fFirst) {
2330 <            f.complete(v1);
2331 <            assertTrue(g.cancel(mayInterruptIfRunning));
2332 <        } else {
2333 <            assertTrue(g.cancel(mayInterruptIfRunning));
1897 <            f.complete(v1);
1898 <        }
1899 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2328 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2329 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2330 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2331 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2332 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2333 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2334  
2335 <        // unspecified behavior
2335 >        // unspecified behavior - both source completions available
2336 >        try {
2337 >            assertEquals(inc(v1), h0.join());
2338 >            rs[0].assertValue(inc(v1));
2339 >        } catch (CompletionException ok) {
2340 >            checkCompletedWithWrappedCancellationException(h0);
2341 >            rs[0].assertNotInvoked();
2342 >        }
2343          try {
2344              assertEquals(inc(v1), h1.join());
2345 <            assertEquals(1, r1.invocationCount);
2345 >            rs[1].assertValue(inc(v1));
2346          } catch (CompletionException ok) {
2347              checkCompletedWithWrappedCancellationException(h1);
2348 <            assertEquals(0, r1.invocationCount);
2348 >            rs[1].assertNotInvoked();
2349          }
1909
2350          try {
2351              assertEquals(inc(v1), h2.join());
2352 <            assertEquals(1, r2.invocationCount);
2352 >            rs[2].assertValue(inc(v1));
2353          } catch (CompletionException ok) {
2354              checkCompletedWithWrappedCancellationException(h2);
2355 <            assertEquals(0, r2.invocationCount);
2355 >            rs[2].assertNotInvoked();
2356 >        }
2357 >        try {
2358 >            assertEquals(inc(v1), h3.join());
2359 >            rs[3].assertValue(inc(v1));
2360 >        } catch (CompletionException ok) {
2361 >            checkCompletedWithWrappedCancellationException(h3);
2362 >            rs[3].assertNotInvoked();
2363          }
2364  
1918        checkCancelled(g);
2365          checkCompletedNormally(f, v1);
2366 +        checkCancelled(g);
2367      }}
2368  
2369      /**
2370 <     * acceptEither result completes normally after normal completion
1924 <     * of either source
2370 >     * applyToEither result completes exceptionally if action does
2371       */
2372 <    public void testAcceptEither_normalCompletion1() {
2372 >    public void testApplyToEither_actionFailed() {
2373          for (ExecutionMode m : ExecutionMode.values())
2374          for (Integer v1 : new Integer[] { 1, null })
2375          for (Integer v2 : new Integer[] { 2, null })
2376      {
2377          final CompletableFuture<Integer> f = new CompletableFuture<>();
2378          final CompletableFuture<Integer> g = new CompletableFuture<>();
2379 <        final IncAction r = new IncAction();
2380 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2379 >        final FailingFunction[] rs = new FailingFunction[6];
2380 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2381  
2382 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2383 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2384          f.complete(v1);
2385 <        checkCompletedNormally(h, null);
2386 <        assertEquals(inc(v1), r.value);
2387 <        g.complete(v2);
2388 <
2389 <        checkCompletedNormally(f, v1);
2390 <        checkCompletedNormally(g, v2);
2391 <        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);
2385 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2386 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2387 >        checkCompletedWithWrappedCFException(h0);
2388 >        checkCompletedWithWrappedCFException(h1);
2389 >        checkCompletedWithWrappedCFException(h2);
2390 >        checkCompletedWithWrappedCFException(h3);
2391 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2392  
2393          g.complete(v2);
2394 <        checkCompletedNormally(h, null);
2395 <        assertEquals(inc(v2), r.value);
2396 <        f.complete(v1);
2394 >
2395 >        // unspecified behavior - both source completions available
2396 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2397 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2398 >
2399 >        checkCompletedWithWrappedCFException(h4);
2400 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2401 >                   Objects.equals(v2, rs[4].value));
2402 >        checkCompletedWithWrappedCFException(h5);
2403 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2404 >                   Objects.equals(v2, rs[5].value));
2405  
2406          checkCompletedNormally(f, v1);
2407          checkCompletedNormally(g, v2);
1963        checkCompletedNormally(h, null);
2408      }}
2409  
2410 <    public void testAcceptEither_normalCompletion3() {
2410 >    /**
2411 >     * acceptEither result completes normally after normal completion
2412 >     * of either source
2413 >     */
2414 >    public void testAcceptEither_normalCompletion() {
2415          for (ExecutionMode m : ExecutionMode.values())
2416          for (Integer v1 : new Integer[] { 1, null })
2417          for (Integer v2 : new Integer[] { 2, null })
2418      {
2419          final CompletableFuture<Integer> f = new CompletableFuture<>();
2420          final CompletableFuture<Integer> g = new CompletableFuture<>();
2421 <        final IncAction r = new IncAction();
2421 >        final NoopConsumer[] rs = new NoopConsumer[6];
2422 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2423  
2424 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2425 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2426 +        checkIncomplete(h0);
2427 +        checkIncomplete(h1);
2428 +        rs[0].assertNotInvoked();
2429 +        rs[1].assertNotInvoked();
2430          f.complete(v1);
2431 +        checkCompletedNormally(h0, null);
2432 +        checkCompletedNormally(h1, null);
2433 +        rs[0].assertValue(v1);
2434 +        rs[1].assertValue(v1);
2435 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2436 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2437 +        checkCompletedNormally(h2, null);
2438 +        checkCompletedNormally(h3, null);
2439 +        rs[2].assertValue(v1);
2440 +        rs[3].assertValue(v1);
2441          g.complete(v2);
1977        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2442  
2443 <        checkCompletedNormally(h, null);
2443 >        // unspecified behavior - both source completions available
2444 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2445 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2446 >        checkCompletedNormally(h4, null);
2447 >        checkCompletedNormally(h5, null);
2448 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2449 >                   Objects.equals(v2, rs[4].value));
2450 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2451 >                   Objects.equals(v2, rs[5].value));
2452 >
2453          checkCompletedNormally(f, v1);
2454          checkCompletedNormally(g, v2);
2455 <
2456 <        // unspecified behavior
2457 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2458 <                   Objects.equals(r.value, inc(v2)));
2455 >        checkCompletedNormally(h0, null);
2456 >        checkCompletedNormally(h1, null);
2457 >        checkCompletedNormally(h2, null);
2458 >        checkCompletedNormally(h3, null);
2459 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2460      }}
2461  
2462      /**
2463       * acceptEither result completes exceptionally after exceptional
2464       * completion of either source
2465       */
2466 <    public void testAcceptEither_exceptionalCompletion1() {
2466 >    public void testAcceptEither_exceptionalCompletion() {
2467          for (ExecutionMode m : ExecutionMode.values())
2468          for (Integer v1 : new Integer[] { 1, null })
2469      {
2470          final CompletableFuture<Integer> f = new CompletableFuture<>();
2471          final CompletableFuture<Integer> g = new CompletableFuture<>();
1998        final IncAction r = new IncAction();
1999        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2472          final CFException ex = new CFException();
2473 +        final NoopConsumer[] rs = new NoopConsumer[6];
2474 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2475  
2476 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2477 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2478 +        checkIncomplete(h0);
2479 +        checkIncomplete(h1);
2480 +        rs[0].assertNotInvoked();
2481 +        rs[1].assertNotInvoked();
2482          f.completeExceptionally(ex);
2483 <        checkCompletedWithWrappedCFException(h, ex);
2483 >        checkCompletedWithWrappedException(h0, ex);
2484 >        checkCompletedWithWrappedException(h1, ex);
2485 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2486 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2487 >        checkCompletedWithWrappedException(h2, ex);
2488 >        checkCompletedWithWrappedException(h3, ex);
2489 >
2490          g.complete(v1);
2491  
2492 <        assertEquals(0, r.invocationCount);
2492 >        // unspecified behavior - both source completions available
2493 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2494 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2495 >        try {
2496 >            assertNull(h4.join());
2497 >            rs[4].assertValue(v1);
2498 >        } catch (CompletionException ok) {
2499 >            checkCompletedWithWrappedException(h4, ex);
2500 >            rs[4].assertNotInvoked();
2501 >        }
2502 >        try {
2503 >            assertNull(h5.join());
2504 >            rs[5].assertValue(v1);
2505 >        } catch (CompletionException ok) {
2506 >            checkCompletedWithWrappedException(h5, ex);
2507 >            rs[5].assertNotInvoked();
2508 >        }
2509 >
2510 >        checkCompletedExceptionally(f, ex);
2511          checkCompletedNormally(g, v1);
2512 <        checkCompletedWithWrappedCFException(f, ex);
2513 <        checkCompletedWithWrappedCFException(h, ex);
2512 >        checkCompletedWithWrappedException(h0, ex);
2513 >        checkCompletedWithWrappedException(h1, ex);
2514 >        checkCompletedWithWrappedException(h2, ex);
2515 >        checkCompletedWithWrappedException(h3, ex);
2516 >        checkCompletedWithWrappedException(h4, ex);
2517 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2518      }}
2519  
2520      public void testAcceptEither_exceptionalCompletion2() {
2521          for (ExecutionMode m : ExecutionMode.values())
2522 +        for (boolean fFirst : new boolean[] { true, false })
2523          for (Integer v1 : new Integer[] { 1, null })
2524      {
2525          final CompletableFuture<Integer> f = new CompletableFuture<>();
2526          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();
2527          final CFException ex = new CFException();
2528 +        final NoopConsumer[] rs = new NoopConsumer[6];
2529 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2530  
2531 <        g.completeExceptionally(ex);
2532 <        f.complete(v1);
2533 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2531 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2532 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2533 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2534 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2535 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2536 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2537  
2538 <        // unspecified behavior
2046 <        Integer v;
2538 >        // unspecified behavior - both source completions available
2539          try {
2540 <            assertNull(h.join());
2541 <            assertEquals(1, r.invocationCount);
2050 <            assertEquals(inc(v1), r.value);
2540 >            assertEquals(null, h0.join());
2541 >            rs[0].assertValue(v1);
2542          } catch (CompletionException ok) {
2543 <            checkCompletedWithWrappedCFException(h, ex);
2544 <            assertEquals(0, r.invocationCount);
2543 >            checkCompletedWithWrappedException(h0, ex);
2544 >            rs[0].assertNotInvoked();
2545          }
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;
2546          try {
2547 <            assertNull(h.join());
2548 <            assertEquals(1, r.invocationCount);
2078 <            assertEquals(inc(v1), r.value);
2547 >            assertEquals(null, h1.join());
2548 >            rs[1].assertValue(v1);
2549          } catch (CompletionException ok) {
2550 <            checkCompletedWithWrappedCFException(h, ex);
2551 <            assertEquals(0, r.invocationCount);
2550 >            checkCompletedWithWrappedException(h1, ex);
2551 >            rs[1].assertNotInvoked();
2552 >        }
2553 >        try {
2554 >            assertEquals(null, h2.join());
2555 >            rs[2].assertValue(v1);
2556 >        } catch (CompletionException ok) {
2557 >            checkCompletedWithWrappedException(h2, ex);
2558 >            rs[2].assertNotInvoked();
2559 >        }
2560 >        try {
2561 >            assertEquals(null, h3.join());
2562 >            rs[3].assertValue(v1);
2563 >        } catch (CompletionException ok) {
2564 >            checkCompletedWithWrappedException(h3, ex);
2565 >            rs[3].assertNotInvoked();
2566          }
2567  
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);
2568          checkCompletedNormally(f, v1);
2569 <        checkCompletedNormally(g, v2);
2569 >        checkCompletedExceptionally(g, ex);
2570      }}
2571  
2572      /**
2573       * acceptEither result completes exceptionally if either source cancelled
2574       */
2575 <    public void testAcceptEither_sourceCancelled1() {
2575 >    public void testAcceptEither_sourceCancelled() {
2576          for (ExecutionMode m : ExecutionMode.values())
2577          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2578          for (Integer v1 : new Integer[] { 1, null })
2579      {
2580          final CompletableFuture<Integer> f = new CompletableFuture<>();
2581          final CompletableFuture<Integer> g = new CompletableFuture<>();
2582 <        final IncAction r = new IncAction();
2583 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2582 >        final NoopConsumer[] rs = new NoopConsumer[6];
2583 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2584  
2585 <        assertTrue(f.cancel(mayInterruptIfRunning));
2586 <        checkCompletedWithWrappedCancellationException(h);
2587 <        g.complete(v1);
2585 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2586 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2587 >        checkIncomplete(h0);
2588 >        checkIncomplete(h1);
2589 >        rs[0].assertNotInvoked();
2590 >        rs[1].assertNotInvoked();
2591 >        f.cancel(mayInterruptIfRunning);
2592 >        checkCompletedWithWrappedCancellationException(h0);
2593 >        checkCompletedWithWrappedCancellationException(h1);
2594 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2595 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2596 >        checkCompletedWithWrappedCancellationException(h2);
2597 >        checkCompletedWithWrappedCancellationException(h3);
2598  
2599 <        checkCancelled(f);
2143 <        assertEquals(0, r.invocationCount);
2144 <        checkCompletedNormally(g, v1);
2145 <        checkCompletedWithWrappedCancellationException(h);
2146 <    }}
2147 <
2148 <    public void testAcceptEither_sourceCancelled2() {
2149 <        for (ExecutionMode m : ExecutionMode.values())
2150 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2151 <        for (Integer v1 : new Integer[] { 1, null })
2152 <    {
2153 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2154 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2155 <        final IncAction r = new IncAction();
2156 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2157 <
2158 <        assertTrue(g.cancel(mayInterruptIfRunning));
2159 <        checkCompletedWithWrappedCancellationException(h);
2160 <        f.complete(v1);
2161 <
2162 <        checkCancelled(g);
2163 <        assertEquals(0, r.invocationCount);
2164 <        checkCompletedNormally(f, v1);
2165 <        checkCompletedWithWrappedCancellationException(h);
2166 <    }}
2167 <
2168 <    public void testAcceptEither_sourceCancelled3() {
2169 <        for (ExecutionMode m : ExecutionMode.values())
2170 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2171 <        for (Integer v1 : new Integer[] { 1, null })
2172 <    {
2173 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2174 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2175 <        final IncAction r = new IncAction();
2176 <
2177 <        assertTrue(g.cancel(mayInterruptIfRunning));
2178 <        f.complete(v1);
2179 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2599 >        g.complete(v1);
2600  
2601 <        // unspecified behavior
2602 <        Integer v;
2601 >        // unspecified behavior - both source completions available
2602 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2603 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2604          try {
2605 <            assertNull(h.join());
2606 <            assertEquals(1, r.invocationCount);
2186 <            assertEquals(inc(v1), r.value);
2605 >            assertNull(h4.join());
2606 >            rs[4].assertValue(v1);
2607          } catch (CompletionException ok) {
2608 <            checkCompletedWithWrappedCancellationException(h);
2609 <            assertEquals(0, r.invocationCount);
2608 >            checkCompletedWithWrappedCancellationException(h4);
2609 >            rs[4].assertNotInvoked();
2610          }
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;
2611          try {
2612 <            assertNull(h.join());
2613 <            assertEquals(1, r.invocationCount);
2214 <            assertEquals(inc(v1), r.value);
2612 >            assertNull(h5.join());
2613 >            rs[5].assertValue(v1);
2614          } catch (CompletionException ok) {
2615 <            checkCompletedWithWrappedCancellationException(h);
2616 <            assertEquals(0, r.invocationCount);
2615 >            checkCompletedWithWrappedCancellationException(h5);
2616 >            rs[5].assertNotInvoked();
2617          }
2618  
2619          checkCancelled(f);
2620          checkCompletedNormally(g, v1);
2621 +        checkCompletedWithWrappedCancellationException(h0);
2622 +        checkCompletedWithWrappedCancellationException(h1);
2623 +        checkCompletedWithWrappedCancellationException(h2);
2624 +        checkCompletedWithWrappedCancellationException(h3);
2625 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2626      }}
2627  
2628      /**
2629 <     * runAfterEither result completes normally after normal completion
2226 <     * of either source
2629 >     * acceptEither result completes exceptionally if action does
2630       */
2631 <    public void testRunAfterEither_normalCompletion1() {
2631 >    public void testAcceptEither_actionFailed() {
2632          for (ExecutionMode m : ExecutionMode.values())
2633          for (Integer v1 : new Integer[] { 1, null })
2634          for (Integer v2 : new Integer[] { 2, null })
2635      {
2636          final CompletableFuture<Integer> f = new CompletableFuture<>();
2637          final CompletableFuture<Integer> g = new CompletableFuture<>();
2638 <        final Noop r = new Noop(m);
2639 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2638 >        final FailingConsumer[] rs = new FailingConsumer[6];
2639 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2640  
2641 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2642 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2643          f.complete(v1);
2644 <        checkCompletedNormally(h, null);
2645 <        assertEquals(1, r.invocationCount);
2644 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2645 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2646 >        checkCompletedWithWrappedCFException(h0);
2647 >        checkCompletedWithWrappedCFException(h1);
2648 >        checkCompletedWithWrappedCFException(h2);
2649 >        checkCompletedWithWrappedCFException(h3);
2650 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2651 >
2652          g.complete(v2);
2653  
2654 +        // unspecified behavior - both source completions available
2655 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2656 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2657 +
2658 +        checkCompletedWithWrappedCFException(h4);
2659 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2660 +                   Objects.equals(v2, rs[4].value));
2661 +        checkCompletedWithWrappedCFException(h5);
2662 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2663 +                   Objects.equals(v2, rs[5].value));
2664 +
2665          checkCompletedNormally(f, v1);
2666          checkCompletedNormally(g, v2);
2245        checkCompletedNormally(h, null);
2246        assertEquals(1, r.invocationCount);
2667      }}
2668  
2669 <    public void testRunAfterEither_normalCompletion2() {
2669 >    /**
2670 >     * runAfterEither result completes normally after normal completion
2671 >     * of either source
2672 >     */
2673 >    public void testRunAfterEither_normalCompletion() {
2674          for (ExecutionMode m : ExecutionMode.values())
2675          for (Integer v1 : new Integer[] { 1, null })
2676          for (Integer v2 : new Integer[] { 2, null })
2677      {
2678          final CompletableFuture<Integer> f = new CompletableFuture<>();
2679          final CompletableFuture<Integer> g = new CompletableFuture<>();
2680 <        final Noop r = new Noop(m);
2681 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2680 >        final Noop[] rs = new Noop[6];
2681 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2682  
2683 <        g.complete(v2);
2684 <        checkCompletedNormally(h, null);
2685 <        assertEquals(1, r.invocationCount);
2683 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2684 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2685 >        checkIncomplete(h0);
2686 >        checkIncomplete(h1);
2687 >        rs[0].assertNotInvoked();
2688 >        rs[1].assertNotInvoked();
2689          f.complete(v1);
2690 +        checkCompletedNormally(h0, null);
2691 +        checkCompletedNormally(h1, null);
2692 +        rs[0].assertInvoked();
2693 +        rs[1].assertInvoked();
2694 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2695 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2696 +        checkCompletedNormally(h2, null);
2697 +        checkCompletedNormally(h3, null);
2698 +        rs[2].assertInvoked();
2699 +        rs[3].assertInvoked();
2700  
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);
2701          g.complete(v2);
2281        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2702  
2703 <        checkCompletedNormally(h, null);
2703 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2704 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2705 >
2706          checkCompletedNormally(f, v1);
2707          checkCompletedNormally(g, v2);
2708 <        assertEquals(1, r.invocationCount);
2708 >        checkCompletedNormally(h0, null);
2709 >        checkCompletedNormally(h1, null);
2710 >        checkCompletedNormally(h2, null);
2711 >        checkCompletedNormally(h3, null);
2712 >        checkCompletedNormally(h4, null);
2713 >        checkCompletedNormally(h5, null);
2714 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2715      }}
2716  
2717      /**
2718       * runAfterEither result completes exceptionally after exceptional
2719       * completion of either source
2720       */
2721 <    public void testRunAfterEither_exceptionalCompletion1() {
2721 >    public void testRunAfterEither_exceptionalCompletion() {
2722          for (ExecutionMode m : ExecutionMode.values())
2723          for (Integer v1 : new Integer[] { 1, null })
2724      {
2725          final CompletableFuture<Integer> f = new CompletableFuture<>();
2726          final CompletableFuture<Integer> g = new CompletableFuture<>();
2299        final Noop r = new Noop(m);
2300        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2727          final CFException ex = new CFException();
2728 +        final Noop[] rs = new Noop[6];
2729 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2730  
2731 <        f.completeExceptionally(ex);
2732 <        checkCompletedWithWrappedCFException(h, ex);
2733 <        g.complete(v1);
2731 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2732 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2733 >        checkIncomplete(h0);
2734 >        checkIncomplete(h1);
2735 >        rs[0].assertNotInvoked();
2736 >        rs[1].assertNotInvoked();
2737 >        assertTrue(f.completeExceptionally(ex));
2738 >        checkCompletedWithWrappedException(h0, ex);
2739 >        checkCompletedWithWrappedException(h1, ex);
2740 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2741 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2742 >        checkCompletedWithWrappedException(h2, ex);
2743 >        checkCompletedWithWrappedException(h3, ex);
2744  
2745 <        assertEquals(0, r.invocationCount);
2308 <        checkCompletedNormally(g, v1);
2309 <        checkCompletedWithWrappedCFException(f, ex);
2310 <        checkCompletedWithWrappedCFException(h, ex);
2311 <    }}
2745 >        assertTrue(g.complete(v1));
2746  
2747 <    public void testRunAfterEither_exceptionalCompletion2() {
2748 <        for (ExecutionMode m : ExecutionMode.values())
2749 <        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 <    }}
2332 <
2333 <    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);
2345 <
2346 <        // unspecified behavior
2347 <        Integer v;
2747 >        // unspecified behavior - both source completions available
2748 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2749 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2750          try {
2751 <            assertNull(h.join());
2752 <            assertEquals(1, r.invocationCount);
2751 >            assertNull(h4.join());
2752 >            rs[4].assertInvoked();
2753          } catch (CompletionException ok) {
2754 <            checkCompletedWithWrappedCFException(h, ex);
2755 <            assertEquals(0, r.invocationCount);
2754 >            checkCompletedWithWrappedException(h4, ex);
2755 >            rs[4].assertNotInvoked();
2756          }
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;
2757          try {
2758 <            assertNull(h.join());
2759 <            assertEquals(1, r.invocationCount);
2758 >            assertNull(h5.join());
2759 >            rs[5].assertInvoked();
2760          } catch (CompletionException ok) {
2761 <            checkCompletedWithWrappedCFException(h, ex);
2762 <            assertEquals(0, r.invocationCount);
2761 >            checkCompletedWithWrappedException(h5, ex);
2762 >            rs[5].assertNotInvoked();
2763          }
2764  
2765 <        checkCompletedWithWrappedCFException(f, ex);
2765 >        checkCompletedExceptionally(f, ex);
2766          checkCompletedNormally(g, v1);
2767 +        checkCompletedWithWrappedException(h0, ex);
2768 +        checkCompletedWithWrappedException(h1, ex);
2769 +        checkCompletedWithWrappedException(h2, ex);
2770 +        checkCompletedWithWrappedException(h3, ex);
2771 +        checkCompletedWithWrappedException(h4, ex);
2772 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2773      }}
2774  
2775 <    /**
2388 <     * runAfterEither result completes exceptionally if action does
2389 <     */
2390 <    public void testRunAfterEither_actionFailed1() {
2775 >    public void testRunAfterEither_exceptionalCompletion2() {
2776          for (ExecutionMode m : ExecutionMode.values())
2777 +        for (boolean fFirst : new boolean[] { true, false })
2778          for (Integer v1 : new Integer[] { 1, null })
2393        for (Integer v2 : new Integer[] { 2, null })
2779      {
2780          final CompletableFuture<Integer> f = new CompletableFuture<>();
2781          final CompletableFuture<Integer> g = new CompletableFuture<>();
2782 <        final FailingRunnable r = new FailingRunnable(m);
2783 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2782 >        final CFException ex = new CFException();
2783 >        final Noop[] rs = new Noop[6];
2784 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2785  
2786 <        f.complete(v1);
2787 <        checkCompletedWithWrappedCFException(h);
2788 <        g.complete(v2);
2789 <        checkCompletedNormally(f, v1);
2790 <        checkCompletedNormally(g, v2);
2791 <    }}
2786 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2787 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2788 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2789 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2790 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2791 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2792  
2793 <    public void testRunAfterEither_actionFailed2() {
2794 <        for (ExecutionMode m : ExecutionMode.values())
2795 <        for (Integer v1 : new Integer[] { 1, null })
2796 <        for (Integer v2 : new Integer[] { 2, null })
2797 <    {
2798 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2799 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2800 <        final FailingRunnable r = new FailingRunnable(m);
2801 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2793 >        // unspecified behavior - both source completions available
2794 >        try {
2795 >            assertEquals(null, h0.join());
2796 >            rs[0].assertInvoked();
2797 >        } catch (CompletionException ok) {
2798 >            checkCompletedWithWrappedException(h0, ex);
2799 >            rs[0].assertNotInvoked();
2800 >        }
2801 >        try {
2802 >            assertEquals(null, h1.join());
2803 >            rs[1].assertInvoked();
2804 >        } catch (CompletionException ok) {
2805 >            checkCompletedWithWrappedException(h1, ex);
2806 >            rs[1].assertNotInvoked();
2807 >        }
2808 >        try {
2809 >            assertEquals(null, h2.join());
2810 >            rs[2].assertInvoked();
2811 >        } catch (CompletionException ok) {
2812 >            checkCompletedWithWrappedException(h2, ex);
2813 >            rs[2].assertNotInvoked();
2814 >        }
2815 >        try {
2816 >            assertEquals(null, h3.join());
2817 >            rs[3].assertInvoked();
2818 >        } catch (CompletionException ok) {
2819 >            checkCompletedWithWrappedException(h3, ex);
2820 >            rs[3].assertNotInvoked();
2821 >        }
2822  
2417        g.complete(v2);
2418        checkCompletedWithWrappedCFException(h);
2419        f.complete(v1);
2823          checkCompletedNormally(f, v1);
2824 <        checkCompletedNormally(g, v2);
2824 >        checkCompletedExceptionally(g, ex);
2825      }}
2826  
2827      /**
2828       * runAfterEither result completes exceptionally if either source cancelled
2829       */
2830 <    public void testRunAfterEither_sourceCancelled1() {
2830 >    public void testRunAfterEither_sourceCancelled() {
2831          for (ExecutionMode m : ExecutionMode.values())
2832          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2833          for (Integer v1 : new Integer[] { 1, null })
2834      {
2835          final CompletableFuture<Integer> f = new CompletableFuture<>();
2836          final CompletableFuture<Integer> g = new CompletableFuture<>();
2837 <        final Noop r = new Noop(m);
2838 <        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() {
2448 <        for (ExecutionMode m : ExecutionMode.values())
2449 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2450 <        for (Integer v1 : new Integer[] { 1, null })
2451 <    {
2452 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2453 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2454 <        final Noop r = new Noop(m);
2455 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456 <
2457 <        assertTrue(g.cancel(mayInterruptIfRunning));
2458 <        checkCompletedWithWrappedCancellationException(h);
2459 <        f.complete(v1);
2460 <
2461 <        checkCancelled(g);
2462 <        assertEquals(0, r.invocationCount);
2463 <        checkCompletedNormally(f, v1);
2464 <        checkCompletedWithWrappedCancellationException(h);
2465 <    }}
2837 >        final Noop[] rs = new Noop[6];
2838 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2839  
2840 <    public void testRunAfterEither_sourceCancelled3() {
2841 <        for (ExecutionMode m : ExecutionMode.values())
2842 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2843 <        for (Integer v1 : new Integer[] { 1, null })
2844 <    {
2845 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2846 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2847 <        final Noop r = new Noop(m);
2848 <
2849 <        assertTrue(g.cancel(mayInterruptIfRunning));
2850 <        f.complete(v1);
2851 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2852 <
2853 <        // unspecified behavior
2854 <        Integer v;
2840 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2841 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2842 >        checkIncomplete(h0);
2843 >        checkIncomplete(h1);
2844 >        rs[0].assertNotInvoked();
2845 >        rs[1].assertNotInvoked();
2846 >        f.cancel(mayInterruptIfRunning);
2847 >        checkCompletedWithWrappedCancellationException(h0);
2848 >        checkCompletedWithWrappedCancellationException(h1);
2849 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2850 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2851 >        checkCompletedWithWrappedCancellationException(h2);
2852 >        checkCompletedWithWrappedCancellationException(h3);
2853 >
2854 >        assertTrue(g.complete(v1));
2855 >
2856 >        // unspecified behavior - both source completions available
2857 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2858 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2859 >        try {
2860 >            assertNull(h4.join());
2861 >            rs[4].assertInvoked();
2862 >        } catch (CompletionException ok) {
2863 >            checkCompletedWithWrappedCancellationException(h4);
2864 >            rs[4].assertNotInvoked();
2865 >        }
2866          try {
2867 <            assertNull(h.join());
2868 <            assertEquals(1, r.invocationCount);
2867 >            assertNull(h5.join());
2868 >            rs[5].assertInvoked();
2869          } catch (CompletionException ok) {
2870 <            checkCompletedWithWrappedCancellationException(h);
2871 <            assertEquals(0, r.invocationCount);
2870 >            checkCompletedWithWrappedCancellationException(h5);
2871 >            rs[5].assertNotInvoked();
2872          }
2873  
2874 <        checkCancelled(g);
2875 <        checkCompletedNormally(f, v1);
2874 >        checkCancelled(f);
2875 >        checkCompletedNormally(g, v1);
2876 >        checkCompletedWithWrappedCancellationException(h0);
2877 >        checkCompletedWithWrappedCancellationException(h1);
2878 >        checkCompletedWithWrappedCancellationException(h2);
2879 >        checkCompletedWithWrappedCancellationException(h3);
2880 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2881      }}
2882  
2883 <    public void testRunAfterEither_sourceCancelled4() {
2883 >    /**
2884 >     * runAfterEither result completes exceptionally if action does
2885 >     */
2886 >    public void testRunAfterEither_actionFailed() {
2887          for (ExecutionMode m : ExecutionMode.values())
2496        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2888          for (Integer v1 : new Integer[] { 1, null })
2889 +        for (Integer v2 : new Integer[] { 2, null })
2890      {
2891          final CompletableFuture<Integer> f = new CompletableFuture<>();
2892          final CompletableFuture<Integer> g = new CompletableFuture<>();
2893 <        final Noop r = new Noop(m);
2894 <
2503 <        assertTrue(f.cancel(mayInterruptIfRunning));
2504 <        g.complete(v1);
2505 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2893 >        final FailingRunnable[] rs = new FailingRunnable[6];
2894 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2895  
2896 <        // unspecified behavior
2897 <        Integer v;
2898 <        try {
2899 <            assertNull(h.join());
2900 <            assertEquals(1, r.invocationCount);
2901 <        } catch (CompletionException ok) {
2902 <            checkCompletedWithWrappedCancellationException(h);
2903 <            assertEquals(0, r.invocationCount);
2904 <        }
2896 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2897 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2898 >        assertTrue(f.complete(v1));
2899 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2900 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2901 >        checkCompletedWithWrappedCFException(h0);
2902 >        checkCompletedWithWrappedCFException(h1);
2903 >        checkCompletedWithWrappedCFException(h2);
2904 >        checkCompletedWithWrappedCFException(h3);
2905 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2906 >        assertTrue(g.complete(v2));
2907 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2908 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2909 >        checkCompletedWithWrappedCFException(h4);
2910 >        checkCompletedWithWrappedCFException(h5);
2911  
2912 <        checkCancelled(f);
2913 <        checkCompletedNormally(g, v1);
2912 >        checkCompletedNormally(f, v1);
2913 >        checkCompletedNormally(g, v2);
2914 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2915      }}
2916  
2917      /**
# Line 2528 | Line 2924 | public class CompletableFutureTest exten
2924      {
2925          final CompletableFuture<Integer> f = new CompletableFuture<>();
2926          final CompletableFutureInc r = new CompletableFutureInc(m);
2927 <        if (!createIncomplete) f.complete(v1);
2927 >        if (!createIncomplete) assertTrue(f.complete(v1));
2928          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2929 <        if (createIncomplete) f.complete(v1);
2929 >        if (createIncomplete) assertTrue(f.complete(v1));
2930  
2931          checkCompletedNormally(g, inc(v1));
2932          checkCompletedNormally(f, v1);
2933 <        assertEquals(1, r.invocationCount);
2933 >        r.assertValue(v1);
2934      }}
2935  
2936      /**
# Line 2552 | Line 2948 | public class CompletableFutureTest exten
2948          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2949          if (createIncomplete) f.completeExceptionally(ex);
2950  
2951 <        checkCompletedWithWrappedCFException(g, ex);
2952 <        checkCompletedWithWrappedCFException(f, ex);
2953 <        assertEquals(0, r.invocationCount);
2951 >        checkCompletedWithWrappedException(g, ex);
2952 >        checkCompletedExceptionally(f, ex);
2953 >        r.assertNotInvoked();
2954      }}
2955  
2956      /**
# Line 2568 | Line 2964 | public class CompletableFutureTest exten
2964          final CompletableFuture<Integer> f = new CompletableFuture<>();
2965          final FailingCompletableFutureFunction r
2966              = new FailingCompletableFutureFunction(m);
2967 <        if (!createIncomplete) f.complete(v1);
2967 >        if (!createIncomplete) assertTrue(f.complete(v1));
2968          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2969 <        if (createIncomplete) f.complete(v1);
2969 >        if (createIncomplete) assertTrue(f.complete(v1));
2970  
2971          checkCompletedWithWrappedCFException(g);
2972          checkCompletedNormally(f, v1);
# Line 2597 | Line 2993 | public class CompletableFutureTest exten
2993          checkCancelled(f);
2994      }}
2995  
2996 +    /**
2997 +     * thenCompose result completes exceptionally if the result of the action does
2998 +     */
2999 +    public void testThenCompose_actionReturnsFailingFuture() {
3000 +        for (ExecutionMode m : ExecutionMode.values())
3001 +        for (int order = 0; order < 6; order++)
3002 +        for (Integer v1 : new Integer[] { 1, null })
3003 +    {
3004 +        final CFException ex = new CFException();
3005 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3006 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3007 +        final CompletableFuture<Integer> h;
3008 +        // Test all permutations of orders
3009 +        switch (order) {
3010 +        case 0:
3011 +            assertTrue(f.complete(v1));
3012 +            assertTrue(g.completeExceptionally(ex));
3013 +            h = m.thenCompose(f, (x -> g));
3014 +            break;
3015 +        case 1:
3016 +            assertTrue(f.complete(v1));
3017 +            h = m.thenCompose(f, (x -> g));
3018 +            assertTrue(g.completeExceptionally(ex));
3019 +            break;
3020 +        case 2:
3021 +            assertTrue(g.completeExceptionally(ex));
3022 +            assertTrue(f.complete(v1));
3023 +            h = m.thenCompose(f, (x -> g));
3024 +            break;
3025 +        case 3:
3026 +            assertTrue(g.completeExceptionally(ex));
3027 +            h = m.thenCompose(f, (x -> g));
3028 +            assertTrue(f.complete(v1));
3029 +            break;
3030 +        case 4:
3031 +            h = m.thenCompose(f, (x -> g));
3032 +            assertTrue(f.complete(v1));
3033 +            assertTrue(g.completeExceptionally(ex));
3034 +            break;
3035 +        case 5:
3036 +            h = m.thenCompose(f, (x -> g));
3037 +            assertTrue(f.complete(v1));
3038 +            assertTrue(g.completeExceptionally(ex));
3039 +            break;
3040 +        default: throw new AssertionError();
3041 +        }
3042 +
3043 +        checkCompletedExceptionally(g, ex);
3044 +        checkCompletedWithWrappedException(h, ex);
3045 +        checkCompletedNormally(f, v1);
3046 +    }}
3047 +
3048      // other static methods
3049  
3050      /**
# Line 2613 | Line 3061 | public class CompletableFutureTest exten
3061       * when all components complete normally
3062       */
3063      public void testAllOf_normal() throws Exception {
3064 <        for (int k = 1; k < 20; ++k) {
3064 >        for (int k = 1; k < 10; k++) {
3065              CompletableFuture<Integer>[] fs
3066                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3067 <            for (int i = 0; i < k; ++i)
3067 >            for (int i = 0; i < k; i++)
3068                  fs[i] = new CompletableFuture<>();
3069              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3070 <            for (int i = 0; i < k; ++i) {
3070 >            for (int i = 0; i < k; i++) {
3071                  checkIncomplete(f);
3072                  checkIncomplete(CompletableFuture.allOf(fs));
3073                  fs[i].complete(one);
# Line 2630 | Line 3078 | public class CompletableFutureTest exten
3078      }
3079  
3080      public void testAllOf_backwards() throws Exception {
3081 <        for (int k = 1; k < 20; ++k) {
3081 >        for (int k = 1; k < 10; k++) {
3082              CompletableFuture<Integer>[] fs
3083                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3084 <            for (int i = 0; i < k; ++i)
3084 >            for (int i = 0; i < k; i++)
3085                  fs[i] = new CompletableFuture<>();
3086              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3087              for (int i = k - 1; i >= 0; i--) {
# Line 2646 | Line 3094 | public class CompletableFutureTest exten
3094          }
3095      }
3096  
3097 +    public void testAllOf_exceptional() throws Exception {
3098 +        for (int k = 1; k < 10; k++) {
3099 +            CompletableFuture<Integer>[] fs
3100 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3101 +            CFException ex = new CFException();
3102 +            for (int i = 0; i < k; i++)
3103 +                fs[i] = new CompletableFuture<>();
3104 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3105 +            for (int i = 0; i < k; i++) {
3106 +                checkIncomplete(f);
3107 +                checkIncomplete(CompletableFuture.allOf(fs));
3108 +                if (i != k/2) {
3109 +                    fs[i].complete(i);
3110 +                    checkCompletedNormally(fs[i], i);
3111 +                } else {
3112 +                    fs[i].completeExceptionally(ex);
3113 +                    checkCompletedExceptionally(fs[i], ex);
3114 +                }
3115 +            }
3116 +            checkCompletedWithWrappedException(f, ex);
3117 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3118 +        }
3119 +    }
3120 +
3121      /**
3122       * anyOf(no component futures) returns an incomplete future
3123       */
3124      public void testAnyOf_empty() throws Exception {
3125 +        for (Integer v1 : new Integer[] { 1, null })
3126 +    {
3127          CompletableFuture<Object> f = CompletableFuture.anyOf();
3128          checkIncomplete(f);
3129 <    }
3129 >
3130 >        f.complete(v1);
3131 >        checkCompletedNormally(f, v1);
3132 >    }}
3133  
3134      /**
3135       * anyOf returns a future completed normally with a value when
3136       * a component future does
3137       */
3138      public void testAnyOf_normal() throws Exception {
3139 <        for (int k = 0; k < 10; ++k) {
3139 >        for (int k = 0; k < 10; k++) {
3140              CompletableFuture[] fs = new CompletableFuture[k];
3141 <            for (int i = 0; i < k; ++i)
3141 >            for (int i = 0; i < k; i++)
3142                  fs[i] = new CompletableFuture<>();
3143              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3144              checkIncomplete(f);
3145 <            for (int i = 0; i < k; ++i) {
3146 <                fs[i].complete(one);
3147 <                checkCompletedNormally(f, one);
3148 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3145 >            for (int i = 0; i < k; i++) {
3146 >                fs[i].complete(i);
3147 >                checkCompletedNormally(f, 0);
3148 >                int x = (int) CompletableFuture.anyOf(fs).join();
3149 >                assertTrue(0 <= x && x <= i);
3150 >            }
3151 >        }
3152 >    }
3153 >    public void testAnyOf_normal_backwards() throws Exception {
3154 >        for (int k = 0; k < 10; k++) {
3155 >            CompletableFuture[] fs = new CompletableFuture[k];
3156 >            for (int i = 0; i < k; i++)
3157 >                fs[i] = new CompletableFuture<>();
3158 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3159 >            checkIncomplete(f);
3160 >            for (int i = k - 1; i >= 0; i--) {
3161 >                fs[i].complete(i);
3162 >                checkCompletedNormally(f, k - 1);
3163 >                int x = (int) CompletableFuture.anyOf(fs).join();
3164 >                assertTrue(i <= x && x <= k - 1);
3165              }
3166          }
3167      }
# Line 2677 | Line 3170 | public class CompletableFutureTest exten
3170       * anyOf result completes exceptionally when any component does.
3171       */
3172      public void testAnyOf_exceptional() throws Exception {
3173 <        for (int k = 0; k < 10; ++k) {
3173 >        for (int k = 0; k < 10; k++) {
3174 >            CompletableFuture[] fs = new CompletableFuture[k];
3175 >            CFException[] exs = new CFException[k];
3176 >            for (int i = 0; i < k; i++) {
3177 >                fs[i] = new CompletableFuture<>();
3178 >                exs[i] = new CFException();
3179 >            }
3180 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3181 >            checkIncomplete(f);
3182 >            for (int i = 0; i < k; i++) {
3183 >                fs[i].completeExceptionally(exs[i]);
3184 >                checkCompletedWithWrappedException(f, exs[0]);
3185 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3186 >            }
3187 >        }
3188 >    }
3189 >
3190 >    public void testAnyOf_exceptional_backwards() throws Exception {
3191 >        for (int k = 0; k < 10; k++) {
3192              CompletableFuture[] fs = new CompletableFuture[k];
3193 <            for (int i = 0; i < k; ++i)
3193 >            CFException[] exs = new CFException[k];
3194 >            for (int i = 0; i < k; i++) {
3195                  fs[i] = new CompletableFuture<>();
3196 +                exs[i] = new CFException();
3197 +            }
3198              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3199              checkIncomplete(f);
3200 <            for (int i = 0; i < k; ++i) {
3201 <                fs[i].completeExceptionally(new CFException());
3202 <                checkCompletedWithWrappedCFException(f);
3200 >            for (int i = k - 1; i >= 0; i--) {
3201 >                fs[i].completeExceptionally(exs[i]);
3202 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3203                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3204              }
3205          }
# Line 2704 | Line 3218 | public class CompletableFutureTest exten
3218          Runnable[] throwingActions = {
3219              () -> CompletableFuture.supplyAsync(null),
3220              () -> CompletableFuture.supplyAsync(null, exec),
3221 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3221 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3222  
3223              () -> CompletableFuture.runAsync(null),
3224              () -> CompletableFuture.runAsync(null, exec),
# Line 2809 | Line 3323 | public class CompletableFutureTest exten
3323          assertSame(f, f.toCompletableFuture());
3324      }
3325  
3326 <    /**
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);
3326 >    //--- tests of implementation details; not part of official tck ---
3327  
3328 <        checkCompletedNormally(g, v1);
3329 <        checkCompletedNormally(f, v1);
3330 <        assertEquals(1, a.get());
3331 <    }}
3328 >    Object resultOf(CompletableFuture<?> f) {
3329 >        try {
3330 >            java.lang.reflect.Field resultField
3331 >                = CompletableFuture.class.getDeclaredField("result");
3332 >            resultField.setAccessible(true);
3333 >            return resultField.get(f);
3334 >        } catch (Throwable t) { throw new AssertionError(t); }
3335 >    }
3336  
3337 <    /**
3338 <     * whenComplete action executes on exceptional completion, propagating
2840 <     * source result.
2841 <     */
2842 <    public void testWhenComplete_exceptionalCompletion() {
3337 >    public void testExceptionPropagationReusesResultObject() {
3338 >        if (!testImplementationDetails) return;
3339          for (ExecutionMode m : ExecutionMode.values())
2844        for (boolean createIncomplete : new boolean[] { true, false })
2845        for (Integer v1 : new Integer[] { 1, null })
3340      {
2847        final AtomicInteger a = new AtomicInteger(0);
3341          final CFException ex = new CFException();
3342 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3343 <        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 <    }}
3342 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3343 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3344  
3345 <    /**
3346 <     * 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));
3345 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3346 >            = new ArrayList<>();
3347  
3348 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3349 <        checkCompletedWithWrappedCancellationException(g);
3350 <        checkCancelled(f);
2888 <        assertEquals(1, a.get());
2889 <    }}
3348 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3349 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3350 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3351  
3352 <    /**
3353 <     * If a whenComplete action throws an exception when triggered by
3354 <     * 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 <    }}
3352 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3353 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3354 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3355  
3356 <    /**
3357 <     * If a whenComplete action throws an exception when triggered by
3358 <     * 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<>();
3356 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3357 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3358 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3359  
3360 <        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);
3360 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3361  
3362 <        checkCompletedWithWrappedCFException(f, ex1);
3363 <        checkCompletedWithWrappedCFException(g, ex1);
3364 <        assertEquals(1, a.get());
3362 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3363 >
3364 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3365 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3366 >
3367 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3368 >                 fun : funs) {
3369 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3370 >            f.completeExceptionally(ex);
3371 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3372 >            checkCompletedWithWrappedException(src, ex);
3373 >            CompletableFuture<?> dep = fun.apply(src);
3374 >            checkCompletedWithWrappedException(dep, ex);
3375 >            assertSame(resultOf(src), resultOf(dep));
3376 >        }
3377 >
3378 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3379 >                 fun : funs) {
3380 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3381 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3382 >            CompletableFuture<?> dep = fun.apply(src);
3383 >            f.completeExceptionally(ex);
3384 >            checkCompletedWithWrappedException(src, ex);
3385 >            checkCompletedWithWrappedException(dep, ex);
3386 >            assertSame(resultOf(src), resultOf(dep));
3387 >        }
3388 >
3389 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3390 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3391 >                 fun : funs) {
3392 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3393 >            f.cancel(mayInterruptIfRunning);
3394 >            checkCancelled(f);
3395 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3396 >            checkCompletedWithWrappedCancellationException(src);
3397 >            CompletableFuture<?> dep = fun.apply(src);
3398 >            checkCompletedWithWrappedCancellationException(dep);
3399 >            assertSame(resultOf(src), resultOf(dep));
3400 >        }
3401 >
3402 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3403 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3404 >                 fun : funs) {
3405 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3406 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3407 >            CompletableFuture<?> dep = fun.apply(src);
3408 >            f.cancel(mayInterruptIfRunning);
3409 >            checkCancelled(f);
3410 >            checkCompletedWithWrappedCancellationException(src);
3411 >            checkCompletedWithWrappedCancellationException(dep);
3412 >            assertSame(resultOf(src), resultOf(dep));
3413 >        }
3414      }}
3415  
3416   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines